From 76cdc34af132d5f6d69feaa17cee7963f9cf4b9d Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Wed, 15 Nov 2023 10:13:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../energy/base/energyPlcConnect/index.vue    |  3 ++-
 .../groupClasses/components/groupClassAdd.vue | 17 +++--------------
 .../orderManage/components/addWorkOrder.vue   | 19 ++++++++++++++-----
 .../orderCompletionMonitoring/index.vue       |  4 ++--
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/views/energy/base/energyPlcConnect/index.vue b/src/views/energy/base/energyPlcConnect/index.vue
index cfbe6dcf..7316665e 100644
--- a/src/views/energy/base/energyPlcConnect/index.vue
+++ b/src/views/energy/base/energyPlcConnect/index.vue
@@ -67,7 +67,8 @@ const tableProps = [
   },
   {
     prop: 'plcTableCode',
-    label: '关联表编码'
+    label: '关联表编码',
+    showOverflowtooltip: true
   },
   {
     prop: 'cnName',
diff --git a/src/views/group/base/groupClasses/components/groupClassAdd.vue b/src/views/group/base/groupClasses/components/groupClassAdd.vue
index 52272a1e..cd2f0fe6 100644
--- a/src/views/group/base/groupClasses/components/groupClassAdd.vue
+++ b/src/views/group/base/groupClasses/components/groupClassAdd.vue
@@ -116,6 +116,7 @@ export default {
         getGroupClasses(id).then((res) => {
           if (res.code === 0) {
             this.form = res.data
+            this.form.disableTime = res.data.disableTime || ''
           }
         })
       } else {
@@ -145,22 +146,10 @@ export default {
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          let obj = {}
-          if (this.form.disableTime) {
-            obj = this.form
-          } else {
-            obj.id = this.form.id
-            obj.name = this.form.name
-            obj.code = this.form.code
-            obj.enableTime = this.form.enableTime
-            obj.startTime = this.form.startTime
-            obj.endTime = this.form.endTime
-            obj.daySpan = this.form.daySpan
-            obj.remark = this.form.remark
-          }
+          this.form.disableTime = this.form.disableTime || ''
           if (this.isEdit) {
             //编辑
-            updateGroupClasses({ ...obj }).then((res) => {
+            updateGroupClasses({ ...this.form }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功");
                 this.$emit('successSubmit')
diff --git a/src/views/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue
index 69d9904c..9fa71500 100644
--- a/src/views/order/base/orderManage/components/addWorkOrder.vue
+++ b/src/views/order/base/orderManage/components/addWorkOrder.vue
@@ -203,6 +203,7 @@ export default {
   methods: {
     init(data, param) {
       this.form.orderId = data.id
+      this.form.orderName = data.name
       this.getList()
       if (param === 'add') {
         this.isBind = false
@@ -253,12 +254,20 @@ export default {
             })
           } else {
             // 新增工单
-            this.form.planStartTime = this.planStartTime ? new Date(this.planStartTime).valueOf() : ''
-            this.form.planFinishTime = this.planFinishTime ? new Date(this.planFinishTime).valueOf() : ''
-            orderIssue({ ...this.form }).then(res => {
+            let _this = this
+            _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
+            _this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
+            orderIssue({ ..._this.form }).then(res => {
               if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功")
-                this.$emit('addWorkOrderSubmit')
+                _this.$modal.msgSuccess("操作成功")
+                let name = this.form.orderName
+                _this.$emit('addWorkOrderSubmit')
+                // 询问是否添加预使用主原料
+                _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
+                    _this.$router.push({
+                      path: '/core/core-work-order?orderName='+encodeURI(name)
+                    })
+                  })
               }
             })
           }
diff --git a/src/views/order/monitoring/orderCompletionMonitoring/index.vue b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
index b4feb234..d1efb9f8 100644
--- a/src/views/order/monitoring/orderCompletionMonitoring/index.vue
+++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
@@ -350,12 +350,12 @@ export default {
       switch (val.type) {
         case 'orderDetail':
           this.$router.push({
-            path: '/base/coreWorkOrder/detail?orderId='+val.data.orderid
+            path: '/core/core-work-order-detail?woIdString='+val.data.woIdString
           })
           break
         case 'qualityDetail':
           this.$router.push({
-            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString='+val.data.woIdString,
+            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString='+val.data.woIdString
           })
           break
         default:
-- 
2.45.2