From 3e89f4066fc9e8990e113bb0783817f49b4a3e37 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Mon, 26 Feb 2024 13:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/orderGroup/orderGroupDetailData.vue     |  9 +++------
 .../base/orderManage/components/addWorkOrder.vue | 16 ++++++++--------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/views/order/base/orderGroup/orderGroupDetailData.vue b/src/views/order/base/orderGroup/orderGroupDetailData.vue
index ca0e3132..ae2dae38 100644
--- a/src/views/order/base/orderGroup/orderGroupDetailData.vue
+++ b/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.actualArea}}</div>
+            <div class="lightTip">{{orderGroupMsg.planArea}}</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.actualArea}}</div>
+            <div class="lightTip">{{item.planArea}}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">预计用时(时)</div>
@@ -247,7 +247,7 @@ export default {
       orderGroupId: '',
       tableProps,
       orderMsg: [],
-      tableH: this.tableHeight(510) / 2,
+      tableH: 150,
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -257,9 +257,6 @@ export default {
     }
   },
   mounted() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(510) / 2
-    })
     this.orderGroupId = location.href.split('?')[1].split('=')[1]
     this.getMsg()
   },
diff --git a/src/views/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue
index 27420779..ea46e766 100644
--- a/src/views/order/base/orderManage/components/addWorkOrder.vue
+++ b/src/views/order/base/orderManage/components/addWorkOrder.vue
@@ -202,8 +202,8 @@ export default {
       processFlowList: [],
       productLineList: [],
       workOrderTypeList: [
-        {id: 1,name:'标准工单'},
-        {id: 2, name:'特殊工单'}
+        {id: 1,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.$router.push({
-                        path: '/core/core-work-order?workOrderName='+encodeURI(name)
-                      })
-                    })
+                  // // 询问是否添加预使用主原料
+                  // _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
+                  //     _this.$router.push({
+                  //       path: '/core/core-work-order?workOrderName='+encodeURI(name)
+                  //     })
+                  //   })
                 }
               })
           } else {