From bd78a800a69315e07677584da0d18b6d8291b583 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 21 Jul 2023 09:43:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97(=E4=BA=A7=E7=BA=BF=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E6=9C=BA=E5=9E=8B)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                      |  2 +-
 src/views/mes/pro/order/index.vue | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 44d027e7..5bdc0f6e 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "author": "OpenPlatform",
   "license": "MIT",
   "scripts": {
-			  "###": "高版本node请使用如下配置启动 SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "###": "高版本node请使用如下配置启动 SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
diff --git a/src/views/mes/pro/order/index.vue b/src/views/mes/pro/order/index.vue
index f272cde2..c5aeec9b 100644
--- a/src/views/mes/pro/order/index.vue
+++ b/src/views/mes/pro/order/index.vue
@@ -154,8 +154,8 @@
         <el-row>
           <!-- 选择产线 -->
           <el-col :span="6">
-            <el-form-item label="选择产线:">
-              <el-select size="small" v-model="form.prodLineCode" placeholder="请选择产线">
+            <el-form-item label="选择机型:">
+              <el-select size="small" v-model="form.prodLineCode" placeholder="请选择成型机">
                 <el-option v-for="item in proline" :key="item.key" :label="item.label" :value="item.key"></el-option>
               </el-select>
             </el-form-item>
@@ -224,7 +224,7 @@
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
         >
         <el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
-        <el-table-column width="120" align="center" prop="prodLineCode" label="产线"></el-table-column>
+        <el-table-column width="120" align="center" prop="prodLineCode" label="成型机"></el-table-column>
         <el-table-column width="300" align="center" prop="workorderCode" label="工单号"></el-table-column>
         <el-table-column width="120" align="center" prop="quantitySplit" label="数量"></el-table-column>
         <el-table-column align="center" prop="batchCodeList" label="批次号"></el-table-column>
@@ -378,7 +378,10 @@
           shiftId: null,
           formFields: [],
         }
-        this.formFields = [],
+        this.formFields = [{
+          batchCode: '',
+          batchQuantity: ''
+        }],
         // 获取该订单下最新订单列表
         getOrderList(id).then(response => {
           if(response.code == 500){
@@ -403,7 +406,14 @@
           };
           // 设置最新数据
           this.splitData = response.data;
-
+          // 在获取到新的数据后执行以下代码
+          this.workerLoading = true; // 设置加载状态为true，表示正在加载
+          this.refreshWorkerTable = false; // 先将refreshProTable设置为false，隐藏表格
+          this.$nextTick(() => {
+            // 使用$nextTick来等待DOM更新完成
+            this.refreshWorkerTable = true; // 立即将refreshProTable设置为true，显示表格
+            this.workerLoading = false; // 设置加载状态为false，表示加载完成
+          });
         })
 
 
@@ -644,7 +654,7 @@
         });
         //初始化日期为默认今天
         this.form.productDate = new Date();
-        //获取线体和班次
+        //获取成型机和班次
         getprodLineShift().then(response => {
           this.proline = response.data.lines;
           this.workShift = response.data.shifts;