Преглед изворни кода

Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

LAPTOP-16IUEB3P\Lenovo пре 2 година
родитељ
комит
dbf96aa1e4

+ 15 - 15
src/components/material/ChooseMaterial.vue

@@ -16,7 +16,7 @@
               <el-col :span="6">
                 <el-input
                   v-model.trim="searchKey"
-                  placeholder="输入设备编码或名称"
+                  placeholder="输入编码或名称"
                   size="small"
                 ></el-input>
               </el-col>
@@ -67,7 +67,7 @@
     components: {
       AssetTree
     },
-    data() {
+    data () {
       return {
         materialdialog: false,
         selectionList: [],
@@ -119,8 +119,7 @@
       };
     },
     watch: {
-      selectionList(newVal, oldVal) {
-        console.log(newVal, oldVal);
+      selectionList (newVal, oldVal) {
         if (newVal.length < oldVal.length) {
           const arr = oldVal.filter(
             (item) => !newVal.find((p) => p.id === item.id)
@@ -133,22 +132,22 @@
       }
     },
     methods: {
-      open(memoList) {
+      open (memoList) {
         this.memoList = memoList;
         this.materialdialog = true;
         if (this.current?.id) {
           this.reload();
         }
       },
-      handleNodeClick(info) {
+      handleNodeClick (info) {
         this.current = info;
         this.reload();
       },
       // 获取根节点id
-      setRootId(id) {
+      setRootId (id) {
         this.rootId = id;
       },
-      handleDone({ data }) {
+      handleDone ({ data }) {
         if (this.memoList.length && data.length) {
           this.$nextTick(() => {
             this.$refs.table.setSelectedRowKeys(
@@ -157,34 +156,35 @@
           });
         }
       },
-      selectionChange(...rest) {
+      selectionChange (...rest) {
         console.log(rest);
       },
-      handleClose() {
+      handleClose () {
         this.materialdialog = false;
         this.searchKey = '';
       },
 
-      datasource({ page, limit }) {
+      datasource ({ page, limit }) {
         return getList({
           pageNum: page,
           size: limit,
+          categoryLevelId: this.current.id,
           searchKey: this.searchKey
         });
       },
-      reload() {
+      reload () {
         this.$refs.table.reload();
       },
       // 弹窗 - 按关键字搜索
-      searchByKeyWords() {
+      searchByKeyWords () {
         this.reload();
       },
       // 重置
-      reset() {
+      reset () {
         this.searchKey = '';
         this.reload();
       },
-      selected() {
+      selected () {
         if (!this.selectionList.length) {
           return this.$message.error('请选择物料!');
         }

+ 1 - 0
src/main.js

@@ -60,6 +60,7 @@ export async function bootstrap () {
 
 export async function mount (props) {
   console.log('[vue] props from main framework', props);
+  Vue.prototype.$portalStore = props.store;
 
   initParentStore(props.store);
   props.onGlobalStateChange((state, prev) => {

+ 37 - 5
src/views/produceOrder/components/report/Common.vue

@@ -38,12 +38,16 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
-            format="yyyy-MM-dd HH:mm"
+            format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择"
           ></el-date-picker
         ></el-form-item>
@@ -150,7 +154,8 @@
             :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.noStandardNum * (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum *
+                (infoData.productUnitWeight || 1))
             "
             :min="0"
             clearable
@@ -238,7 +243,7 @@
           qualityItem: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
           remark: '',
           productInfo: {
             standardNum: '',
@@ -270,6 +275,27 @@
             this.getReportCount();
           }
         }
+      },
+      infoData: {
+        immediate: true,
+        handler () {
+          if (this.infoData.id) {
+            // 设备
+            this.workReportDeviceList = Object.assign(
+              {},
+              this.workReportDeviceList,
+              {
+                code: this.infoData.deviceCode,
+                name: this.infoData.deviceName,
+                rootCategoryLevelId: this.infoData.rootCategoryLevelId,
+                path: this.infoData.path[0]?.pathName,
+                model: this.infoData.model,
+                sourceCategoryId: this.infoData.sourceCategoryId,
+                specification: this.infoData.specification
+              }
+            );
+          }
+        }
       }
     },
     methods: {
@@ -299,6 +325,10 @@
       report (fun) {
         this.$refs.formRef.validate((value) => {
           if (value) {
+            if (!this.workReportDeviceList.code) {
+              return this.$message.error('请选择设备');
+            }
+
             this.$confirm('是否确定要报工?', '提示').then(() => {
               this.categoryMsg = Object.assign(this.categoryMsg, {
                 brandNum: this.infoData.brandNo,
@@ -316,6 +346,8 @@
                 this.getReportCount();
               });
             });
+          } else {
+            this.$message.error('请输入必填项!');
           }
         });
       }

+ 12 - 5
src/views/produceOrder/components/report/Drying.vue

@@ -39,12 +39,16 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
-            format="yyyy-MM-dd HH:mm"
+            format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择"
           ></el-date-picker
         ></el-form-item>
@@ -163,7 +167,8 @@
             :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.noStandardNum * (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum *
+                (infoData.productUnitWeight || 1))
             "
             :min="0"
             clearable
@@ -257,7 +262,7 @@
           qualityItem: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
           remark: '',
           productInfo: {
             standardNum: '',
@@ -350,6 +355,8 @@
                 this.getReportCount();
               });
             });
+          } else {
+            this.$message.error('请输入必填项!');
           }
         });
       }

+ 38 - 6
src/views/produceOrder/components/report/Extrusion.vue

@@ -34,12 +34,16 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
-            format="yyyy-MM-dd HH:mm"
+            format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择"
           ></el-date-picker
         ></el-form-item>
@@ -162,7 +166,8 @@
             :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.noStandardNum * (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum *
+                (infoData.productUnitWeight || 1))
             "
             :min="0"
             clearable
@@ -305,7 +310,7 @@
           qualityStandard: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
           remark: '',
           productInfo: {
             standardNum: '',
@@ -359,6 +364,27 @@
             this.getReportCount();
           }
         }
+      },
+      infoData: {
+        immediate: true,
+        handler () {
+          if (this.infoData.id) {
+            // 设备
+            this.workReportDeviceList = Object.assign(
+              {},
+              this.workReportDeviceList,
+              {
+                code: this.infoData.deviceCode,
+                name: this.infoData.deviceName,
+                rootCategoryLevelId: this.infoData.rootCategoryLevelId,
+                path: this.infoData.path[0]?.pathName,
+                model: this.infoData.model,
+                sourceCategoryId: this.infoData.sourceCategoryId,
+                specification: this.infoData.specification
+              }
+            );
+          }
+        }
       }
     },
     created () {
@@ -420,8 +446,12 @@
         this.countMsg = res;
       },
       report (fun) {
-        this.$refs.formRef.validate((value) => {
+        this.$refs.formRef.validate((value, error) => {
           if (value) {
+            if (!this.workReportDeviceList.code) {
+              return this.$message.error('请选择设备');
+            }
+
             this.$confirm('是否确定要报工?', '提示').then(() => {
               const workReportDeviceList = [];
               if (this.workReportDeviceList.code) {
@@ -443,6 +473,8 @@
                 this.getReportCount();
               });
             });
+          } else {
+            this.$message.error('请输入必填项!');
           }
         });
       }

+ 35 - 4
src/views/produceOrder/components/report/Furnace.vue

@@ -28,12 +28,16 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
-            format="yyyy-MM-dd HH:mm"
+            format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择"
           ></el-date-picker
         ></el-form-item>
@@ -115,7 +119,7 @@
         workReport: {
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
           productInfo: {
             standardNum: '',
             standardWeight: '',
@@ -142,6 +146,27 @@
             this.getReportCount();
           }
         }
+      },
+      infoData: {
+        immediate: true,
+        handler () {
+          if (this.infoData.id) {
+            // 设备
+            this.workReportDeviceList = Object.assign(
+              {},
+              this.workReportDeviceList,
+              {
+                code: this.infoData.deviceCode,
+                name: this.infoData.deviceName,
+                rootCategoryLevelId: this.infoData.rootCategoryLevelId,
+                path: this.infoData.path[0]?.pathName,
+                model: this.infoData.model,
+                sourceCategoryId: this.infoData.sourceCategoryId,
+                specification: this.infoData.specification
+              }
+            );
+          }
+        }
       }
     },
     created () {
@@ -176,6 +201,10 @@
       report (fun) {
         this.$refs.formRef.validate((value) => {
           if (value) {
+            if (!this.workReportDeviceList.code) {
+              return this.$message.error('请选择设备');
+            }
+
             this.$confirm('是否确定要报工?', '提示').then(() => {
               this.categoryMsg = Object.assign(this.categoryMsg, {
                 brandNum: this.infoData.brandNo,
@@ -193,6 +222,8 @@
                 this.getReportCount();
               });
             });
+          } else {
+            this.$message.error('请输入必填项!');
           }
         });
       }

+ 36 - 5
src/views/produceOrder/components/report/HalfAdded.vue

@@ -38,12 +38,16 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
-            format="yyyy-MM-dd HH:mm"
+            format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择"
           ></el-date-picker
         ></el-form-item>
@@ -162,7 +166,8 @@
             :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.noStandardNum * (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum *
+                (infoData.productUnitWeight || 1))
             "
             :min="0"
             clearable
@@ -252,7 +257,7 @@
           qualityItem: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
           remark: '',
           productInfo: {
             standardNum: '',
@@ -292,6 +297,27 @@
             this.getReportCount();
           }
         }
+      },
+      infoData: {
+        immediate: true,
+        handler () {
+          if (this.infoData.id) {
+            // 设备
+            this.workReportDeviceList = Object.assign(
+              {},
+              this.workReportDeviceList,
+              {
+                code: this.infoData.deviceCode,
+                name: this.infoData.deviceName,
+                rootCategoryLevelId: this.infoData.rootCategoryLevelId,
+                path: this.infoData.path[0]?.pathName,
+                model: this.infoData.model,
+                sourceCategoryId: this.infoData.sourceCategoryId,
+                specification: this.infoData.specification
+              }
+            );
+          }
+        }
       }
     },
     created () {
@@ -340,6 +366,9 @@
       report (fun) {
         this.$refs.formRef.validate((value) => {
           if (value) {
+            if (!this.workReportDeviceList.code) {
+              return this.$message.error('请选择设备');
+            }
             this.$confirm('是否确定要报工?', '提示').then(() => {
               this.categoryMsg = Object.assign(this.categoryMsg, {
                 brandNum: this.infoData.brandNo,
@@ -357,6 +386,8 @@
                 this.getReportCount();
               });
             });
+          } else {
+            this.$message.error('请输入必填项!');
           }
         });
       }

+ 36 - 5
src/views/produceOrder/components/report/Heating.vue

@@ -38,12 +38,16 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
-            format="yyyy-MM-dd HH:mm"
+            format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择"
           ></el-date-picker
         ></el-form-item>
@@ -162,7 +166,8 @@
             :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.noStandardNum * (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum *
+                (infoData.productUnitWeight || 1))
             "
             :min="0"
             clearable
@@ -258,7 +263,7 @@
           qualityStandard: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
           remark: '',
           productInfo: {
             standardNum: '',
@@ -301,6 +306,27 @@
             this.getReportCount();
           }
         }
+      },
+      infoData: {
+        immediate: true,
+        handler () {
+          if (this.infoData.id) {
+            // 设备
+            this.workReportDeviceList = Object.assign(
+              {},
+              this.workReportDeviceList,
+              {
+                code: this.infoData.deviceCode,
+                name: this.infoData.deviceName,
+                rootCategoryLevelId: this.infoData.rootCategoryLevelId,
+                path: this.infoData.path[0]?.pathName,
+                model: this.infoData.model,
+                sourceCategoryId: this.infoData.sourceCategoryId,
+                specification: this.infoData.specification
+              }
+            );
+          }
+        }
       }
     },
     created () {
@@ -349,6 +375,9 @@
       report (fun) {
         this.$refs.formRef.validate((value) => {
           if (value) {
+            if (!this.workReportDeviceList.code) {
+              return this.$message.error('请选择设备');
+            }
             this.$confirm('是否确定要报工?', '提示').then(() => {
               this.categoryMsg = Object.assign(this.categoryMsg, {
                 brandNum: this.infoData.brandNo,
@@ -366,6 +395,8 @@
                 this.getReportCount();
               });
             });
+          } else {
+            this.$message.error('请输入必填项!');
           }
         });
       }

+ 10 - 4
src/views/produceOrder/components/report/Package.vue

@@ -37,12 +37,16 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
-            format="yyyy-MM-dd HH:mm"
+            format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择"
           ></el-date-picker
         ></el-form-item>
@@ -234,7 +238,7 @@
         workReport: {
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
           packInfo: {
             packUnit: '',
             minPackNum: '',
@@ -351,6 +355,8 @@
                 this.getReportCount();
               });
             });
+          } else {
+            this.$message.error('请输入必填项!');
           }
         });
       }

+ 25 - 1
src/views/produceOrder/components/report/Sinter.vue

@@ -101,7 +101,7 @@
         workReport: {
           executorId: '',
           executorJobNum: '',
-          executorTime: '',
+          executeTime: '',
           packInfo: {
             packNum: '',
             netWeight: ''
@@ -130,6 +130,27 @@
             this.getReportCount();
           }
         }
+      },
+      infoData: {
+        immediate: true,
+        handler () {
+          if (this.infoData.id) {
+            // 设备
+            this.workReportDeviceList = Object.assign(
+              {},
+              this.workReportDeviceList,
+              {
+                code: this.infoData.deviceCode,
+                name: this.infoData.deviceName,
+                rootCategoryLevelId: this.infoData.rootCategoryLevelId,
+                path: this.infoData.path[0]?.pathName,
+                model: this.infoData.model,
+                sourceCategoryId: this.infoData.sourceCategoryId,
+                specification: this.infoData.specification
+              }
+            );
+          }
+        }
       }
     },
     methods: {
@@ -155,6 +176,9 @@
       report (fun) {
         this.$refs.formRef.validate((value) => {
           if (value) {
+            if (!this.workReportDeviceList.code) {
+              return this.$message.error('请选择设备');
+            }
             this.$confirm('是否确定要报工?', '提示').then(() => {
               fun({
                 checkState: 1,

+ 11 - 5
src/views/produceOrder/components/report/Warehousing.vue

@@ -21,7 +21,7 @@
       <div class="right">
         <el-form-item
           label="执行人工号"
-          prop="workReport.executorJobNum"
+          prop="workReport.executorId"
           required
           label-width="100px"
           ><personSelectRemote
@@ -31,12 +31,16 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
-            format="yyyy-MM-dd HH:mm"
+            format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择"
           ></el-date-picker
         ></el-form-item>
@@ -133,7 +137,7 @@
         workReport: {
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
           storageInfo: {
             batchNum: '',
             inStorageNum: '',
@@ -197,6 +201,8 @@
                 this.getReportCount();
               });
             });
+          } else {
+            this.$message.error('请输入必填项!');
           }
         });
       }

+ 31 - 29
src/views/produceOrder/index.vue

@@ -118,10 +118,10 @@
         isBindPlan: false,
         statusOpt: {
           first: [
-            { label: '所有状态', value: '5,4,7' },
+            { label: '所有状态', value: '5,4' },
             { label: '待生产', value: '4' },
-            { label: '生产中', value: '5' },
-            { label: '已延期', value: '7' }
+            { label: '生产中', value: '5' }
+            // { label: '已延期', value: '7' }
           ],
           second: [{ label: '已完成', value: '6' }]
         },
@@ -184,12 +184,12 @@
             align: 'center',
             minWidth: 110
           },
-		 {
-			  prop: 'originalCode',
-			  label: '原始工单号',
-			  align: 'center',
-			  minWidth: 110
-		  },
+          {
+            prop: 'originalCode',
+            label: '原始工单号',
+            align: 'center',
+            minWidth: 110
+          },
           {
             prop: 'productionPlanCode',
             label: '计划编号',
@@ -199,12 +199,10 @@
             prop: 'planType',
             label: '计划类型',
             align: 'center',
-			formatter: (row) => {
-			  const obj = this.planType.find(
-			    (i) => i.value == row.planType
-			  );
-			  return obj && obj.label;
-			}
+            formatter: (row) => {
+              const obj = this.planType.find((i) => i.value == row.planType);
+              return obj && obj.label;
+            }
           },
           {
             prop: 'produceVersionName',
@@ -366,19 +364,23 @@
           this.selection.map((item) => {
             ids.push(item.id);
           });
-		  const h = this.$createElement;
-           this.$msgbox({
-			  title: '提醒',
-			  message: h('p', null, [
-				h('span', null, '是否要完结 '),
-				h('span', { style: 'color: #70B603' }, `${this.selection.length}`),
-				h('span', null, ' 条工单?'),
-			  ]),
-			  showCancelButton: true,
-			  confirmButtonText: '确认',
-			  cancelButtonText: '取消',
-			  type: 'warning'
-			})
+          const h = this.$createElement;
+          this.$msgbox({
+            title: '提醒',
+            message: h('p', null, [
+              h('span', null, '是否要完结 '),
+              h(
+                'span',
+                { style: 'color: #70B603' },
+                `${this.selection.length}`
+              ),
+              h('span', null, ' 条工单?')
+            ]),
+            showCancelButton: true,
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
             .then(() => {
               batchCompletion(ids).then((res) => {
                 this.$message.success('成功');
@@ -420,7 +422,7 @@
           path: '/produceOrder/detail',
           query: {
             id: row.id,
-			produceVersionId: row.produceVersionId
+            produceVersionId: row.produceVersionId
           }
         });
       },

+ 15 - 2
src/views/produceOrder/report.vue

@@ -119,7 +119,7 @@
       <components
         v-if="tabList.length"
         ref="reportRef"
-        :is="componentsList[tabList[activeName].name] || 'Common'"
+        :is="componentName"
         :key="activeName"
         :infoData="infoData"
         :taskInfo="{
@@ -180,7 +180,7 @@
           挤压成型: 'Extrusion',
           自然干燥: 'Drying',
           升温干燥: 'Heating',
-          半加定长: 'HalfAdded',
+          半加: 'HalfAdded',
           备炉: 'Furnace',
           烧结: 'Common', //'Sinter',
           深加工: 'Common',
@@ -189,6 +189,19 @@
         }
       };
     },
+    computed: {
+      componentName () {
+        const { name } = this.tabList[this.activeName];
+
+        if (name.includes('半加')) {
+          return 'HalfAdded';
+        }
+
+        return (
+          this.componentsList[this.tabList[this.activeName].name] || 'Common'
+        );
+      }
+    },
     created () {
       this.getDetail(this.$route.query.id);
     },