样式修改

src/views/batchRecord/components/detialsModal.vue

@@ -49,10 +49,11 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="工序名称">
-            <el-input :value="details.taskTypeName" disabled></el-input>
+            <el-input :value="details.produceTaskName" disabled></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8"> </el-col>
+      </el-row>
+      <el-row style="margin-bottom: 20px">
         <el-col :span="8">
           <el-form-item label="产品编码">
             <el-input :value="details.productCode" disabled></el-input>
@@ -70,6 +71,8 @@
               disabled
             ></el-input> </el-form-item
         ></el-col>
+      </el-row>
+      <el-row style="margin-bottom: 20px">
         <el-col :span="8">
           <el-form-item label="规格">
             <el-input :value="details.specification" disabled></el-input>
@@ -88,72 +91,79 @@
       </el-row>
       <header-title title="基本信息"></header-title>
       <!-- 记录规则 -->
-      <el-row v-if="details.executeMethod == 2" style="margin-bottom: 20px">
-        <el-col :span="8">
-          <el-form-item label="记录规则名称">
-            <el-input :value="details.productModel" disabled></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="记录规则分类">
-            <DictSelection
-              dictName="记录规则类型"
-              clearable
-              v-model="details.recordRulesClassify"
-              disabled
-            >
-            </DictSelection>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="车间区域">
-            <el-input
-              :value="details.workshopArea"
-              disabled
-            ></el-input> </el-form-item
-        ></el-col>
-        <el-col :span="8">
-          <el-form-item label="检查完成时间">
-            <el-input
-              :value="details.checkFinishTime"
-              disabled
-            ></el-input> </el-form-item
-        ></el-col>
-        <el-col :span="8">
-          <el-form-item label="检查有效期">
-            <el-input
-              placeholder="请输入"
-              v-model="details.checkValidity"
-              type="text"
-              disabled
-            >
-              <template slot="append">
-                <div style="width: 40px; box-sizing: border-box">
-                  <el-form-item required>
-                    <DictSelection
-                      dictName="检查有效期单位"
-                      clearable
-                      v-model="details.checkValidityUnit"
-                      placeholder="单位"
-                      style="width: auto; box-sizing: border-box; height: 36px"
-                      disabled
-                    >
-                    </DictSelection>
-                  </el-form-item>
-                </div>
-              </template>
-            </el-input> </el-form-item
-        ></el-col>
-        <el-col :span="8">
-          <el-form-item label="结论">
-            <el-radio-group v-model="details.conclution" disabled>
-              <el-radio :label="1">合格</el-radio>
-              <el-radio :label="2">不合格</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8"> </el-col>
-      </el-row>
+      <template v-if="details.executeMethod == 2">
+        <el-row style="margin-bottom: 20px">
+          <el-col :span="8">
+            <el-form-item label="记录规则名称">
+              <el-input :value="details.ruleName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="记录规则分类">
+              <DictSelection
+                dictName="记录规则类型"
+                clearable
+                v-model="details.recordRulesClassify"
+                disabled
+              >
+              </DictSelection>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="车间区域">
+              <el-input
+                :value="details.workshopArea"
+                disabled
+              ></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row style="margin-bottom: 20px">
+          <el-col :span="8">
+            <el-form-item label="检查完成时间">
+              <el-input
+                :value="details.checkFinishTime"
+                disabled
+              ></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8">
+            <el-form-item label="检查有效期">
+              <el-input
+                placeholder="请输入"
+                v-model="details.checkValidity"
+                type="text"
+                disabled
+              >
+                <template slot="append">
+                  <div style="width: 40px; box-sizing: border-box">
+                    <el-form-item required>
+                      <DictSelection
+                        dictName="检查有效期单位"
+                        clearable
+                        v-model="details.checkValidityUnit"
+                        placeholder="单位"
+                        style="
+                          width: auto;
+                          box-sizing: border-box;
+                          height: 36px;
+                        "
+                        disabled
+                      >
+                      </DictSelection>
+                    </el-form-item>
+                  </div>
+                </template>
+              </el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8">
+            <el-form-item label="结论">
+              <el-radio-group v-model="details.conclution" disabled>
+                <el-radio :label="1">合格</el-radio>
+                <el-radio :label="2">不合格</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </template>
 
       <header-title
         v-if="details.executeMethod == 2"

src/views/batchRecord/components/list.vue

@@ -7,7 +7,7 @@
       :columns="columns"
       :datasource="datasource"
       cacheKey="batchRecordBefore"
-      :cache-key="'batchRecordTableRules-reportWorkType-' + reportWorkType"
+      :cache-key="cacheKeyUrl"
       autoAmendPage
       :pageSize="20"
     >
@@ -312,6 +312,9 @@
             ]
           }
         ];
+      },
+      cacheKeyUrl() {
+        return `mes-batchRecordTableRules-reportWorkType-${this.reportWorkType}`;
       }
     },
     created() {

src/views/batchRecord/components/tables/workOrderTable.vue

@@ -1,10 +1,10 @@
 <template>
   <ele-pro-table
     ref="table"
-    row-key="workOrderId"
+    row-key="id"
     :columns="columns"
     :datasource="datasource"
-    cache-key="batch-record-list"
+    :cache-key="cacheKeyUrl"
     autoAmendPage
   >
   </ele-pro-table>
@@ -36,16 +36,44 @@
             label: '序号'
           },
           {
-            slot: 'code',
+            prop: 'code',
             label: '生产工单号',
             align: 'center',
             minWidth: 110,
             showOverflowTooltip: true
           },
           {
-            prop: 'taskName',
+            prop: 'scheduleStatus',
             label: '工序进度',
-            align: 'center'
+            align: 'center',
+            formatter: (row) => {
+              switch (row.scheduleStatus) {
+                case 10:
+                  return '待排产';
+                case 20:
+                  return '待发布';
+                case 30:
+                  return '发布失败';
+                case 40:
+                  return '待生产';
+                case 50:
+                  return '生产中';
+                case 60:
+                  return '已完成';
+                case 70:
+                  return '已延期';
+                case 80:
+                  return '待下达';
+                case 90:
+                  return '已暂停';
+                case 100:
+                  return '已终止';
+                case 110:
+                  return '已委外';
+                default:
+                  return '';
+              }
+            }
           },
           {
             prop: 'planStartTime',
@@ -66,9 +94,31 @@
             label: '工单状态',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 150
+            minWidth: 150,
+            formatter: (row) => {
+              switch (row.status) {
+                case 4:
+                  return '待生产';
+                case 5:
+                  return '生产中';
+                case 6:
+                  return '已完成';
+                case 7:
+                  return '已延期';
+                case 8:
+                  return '待下达';
+                case 9:
+                  return '暂停';
+                case 10:
+                  return '终止';
+
+                default:
+                  return '';
+              }
+            }
           }
-        ]
+        ],
+        cacheKeyUrl: 'mes-922194-work-order-table'
       };
     },
     computed: {},

src/views/batchRecord/index.vue

@@ -251,10 +251,10 @@
     methods: {
       // 刷新表格数据
       reload() {
-        this.$refs.tableRef.reload();
+        this.$refs.tableRef?.reload();
       },
       search(where) {
-        this.$refs.tableRef.reload(where);
+        this.$refs.tableRef?.reload(where);
       },
       // 获取产品和批次号
       async getAllProductInWorkOrder() {