Merge pull request '返修优化' (#104) from feature_supplier into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT/pulls/104
Reviewed-by: Liwei <wei.li@le-it.com.cn>

package.json

@@ -40,7 +40,6 @@
     "axios": "0.18.1",
     "clipboard": "2.0.4",
     "core-js": "^2.6.11",
-    "dhtmlx-gantt": "^7.0.10",
     "echarts": "4.2.1",
     "element-china-area-data": "^5.0.2",
     "element-ui": "2.11.1",

src/views/productplan/workbench/order.vue

@@ -590,8 +590,8 @@ export default {
 				this.detailsTimeHeaders = [
 					'OM_SerialOrder-PlanStartTime',
 					'OM_SerialOrder-PlanEndTime',
-					'OM_SerialOrder-ActStartTime',
-					'OM_SerialOrder-ActEndTime',
+					// 'OM_SerialOrder-ActStartTime',
+					// 'OM_SerialOrder-ActEndTime',
 				]
 				this.detailsLoading = false
 			})

src/views/productplan/workbench/schedule.vue

@@ -285,7 +285,7 @@
 <script>
   import {
     gantt
-  } from 'dhtmlx-gantt'
+  } from '@/utils/dhtmlxgantt'
   import moment from 'moment'
   import {
     getWorklineTree,
@@ -1315,7 +1315,7 @@ ul li {
 }
 </style>
 <style lang="scss" scoped>
-@import '~dhtmlx-gantt/codebase/dhtmlxgantt.css';
+@import '../../../assets/css/dhtmlxgantt.css';
 
 .el-progress-bar__innerText {
   color: #222;

src/views/quality/component/login.vue

@@ -150,6 +150,10 @@ export default {
 		// 关闭返修弹框
 		closeRepair() {
 			this.open = false
+			this.newImgSrc = [] // 返修弹框图片地址
+			this.repairCodeEcho = '' //调角器条码回显
+			this.productCodeEcho = '' //产品条码回显
+			this.echoInfo = null // 回显的信息
 		},
 		// 调角器条码回车出发按钮
 		enterRepairPress() {
@@ -168,6 +172,10 @@ export default {
 		},
 		// 点击调角器--完成按钮
 		confirmRepair() {
+			if (!this.repairCodeEcho) {
+				this.msgInfo('请先输入调角器条码查询相关信息')
+				return
+			}
 			this.$confirm('确认进行完成操作吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',