src/views/order/base/orderGroup/orderGroupDetailData.vue

@@ -44,7 +44,7 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">加工平方数(平方米)</div>
-            <div class="lightTip">{{orderGroupMsg.planArea}}</div>
+            <div class="lightTip">{{orderGroupMsg.actualArea}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">状态</div>
@@ -114,7 +114,7 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">加工平方数(平方米)</div>
-            <div class="lightTip">{{item.planArea}}</div>
+            <div class="lightTip">{{item.actualArea}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">预计用时(时)</div>
@@ -247,7 +247,7 @@ export default {
       orderGroupId: '',
       tableProps,
       orderMsg: [],
-      tableH: 150,
+      tableH: this.tableHeight(510) / 2,
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -257,6 +257,9 @@ export default {
     }
   },
   mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(510) / 2
+    })
     this.orderGroupId = location.href.split('?')[1].split('=')[1]
     this.getMsg()
   },

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

@@ -202,8 +202,8 @@ export default {
       processFlowList: [],
       productLineList: [],
       workOrderTypeList: [
-        {id: 1,name:'普通'},
+        {id: 1,name:'标准工单'},
-        {id: 2, name:'特殊'}
+        {id: 2, name:'特殊工单'}
       ],
       planStartTime: '',
       planFinishTime: '',
@@ -291,12 +291,12 @@ export default {
                   _this.$modal.msgSuccess("操作成功")
                   let name = this.form.name
                   _this.$emit('addWorkOrderSubmit')
-                  // // 询问是否添加预使用主原料
+                  // 询问是否添加预使用主原料
-                  // _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
+                  _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
-                  //     _this.$router.push({
+                      _this.$router.push({
-                  //       path: '/core/core-work-order?workOrderName='+encodeURI(name)
+                        path: '/core/core-work-order?workOrderName='+encodeURI(name)
-                  //     })
+                      })
-                  //   })
+                    })
                 }
               })
           } else {