src/views/energy/base/energyPlcConnect/index.vue

@@ -67,8 +67,7 @@ const tableProps = [
   },
   {
     prop: 'plcTableCode',
-    label: '关联表编码',
+    label: '关联表编码'
-    showOverflowtooltip: true
   },
   {
     prop: 'cnName',

src/views/group/base/groupClasses/components/groupClassAdd.vue

@@ -116,7 +116,6 @@ export default {
         getGroupClasses(id).then((res) => {
           if (res.code === 0) {
             this.form = res.data
-            this.form.disableTime = res.data.disableTime || ''
           }
         })
       } else {
@@ -146,10 +145,22 @@ export default {
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.form.disableTime = this.form.disableTime || ''
+          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
+          }
           if (this.isEdit) {
             //编辑
-            updateGroupClasses({ ...this.form }).then((res) => {
+            updateGroupClasses({ ...obj }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功");
                 this.$emit('successSubmit')

src/views/order/base/orderManage/components/addWorkOrder.vue

@@ -203,7 +203,6 @@ export default {
   methods: {
     init(data, param) {
       this.form.orderId = data.id
-      this.form.orderName = data.name
       this.getList()
       if (param === 'add') {
         this.isBind = false
@@ -254,20 +253,12 @@ export default {
             })
           } else {
             // 新增工单
-            let _this = this
+            this.form.planStartTime = this.planStartTime ? new Date(this.planStartTime).valueOf() : ''
-            _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
+            this.form.planFinishTime = this.planFinishTime ? new Date(this.planFinishTime).valueOf() : ''
-            _this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
+            orderIssue({ ...this.form }).then(res => {
-            orderIssue({ ..._this.form }).then(res => {
               if (res.code === 0) {
-                _this.$modal.msgSuccess("操作成功")
+                this.$modal.msgSuccess("操作成功")
-                let name = this.form.orderName
+                this.$emit('addWorkOrderSubmit')
-                _this.$emit('addWorkOrderSubmit')
-                // 询问是否添加预使用主原料
-                _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
-                    _this.$router.push({
-                      path: '/core/core-work-order?orderName='+encodeURI(name)
-                    })
-                  })
               }
             })
           }

src/views/order/monitoring/orderCompletionMonitoring/index.vue

@@ -350,12 +350,12 @@ export default {
       switch (val.type) {
         case 'orderDetail':
           this.$router.push({
-            path: '/core/core-work-order-detail?woIdString='+val.data.woIdString
+            path: '/base/coreWorkOrder/detail?orderId='+val.data.orderid
           })
           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: