quwangxin пре 2 година
родитељ
комит
e2d52abf23

+ 251 - 92
src/components/print/OrderPrint.vue

@@ -50,7 +50,9 @@
               v-for="(t, i) in extrusion"
               :key="i + '-' + idx"
             >
-              {{ t.label }}:{{ itm[t.key] }}
+              {{ t.label }}:{{
+                (item.formatter && item.formatter(itm)) || itm[t.key]
+              }}
             </el-col>
           </template>
           <el-col :span="24" v-if="!(item.list && item.list.length)">
@@ -74,7 +76,9 @@
               v-for="(t, i) in drying"
               :key="i + '-' + idx"
             >
-              {{ t.label }}:{{ itm[t.key] }}
+              {{ t.label }}:{{
+                (item.formatter && item.formatter(itm)) || itm[t.key]
+              }}
             </el-col>
           </template>
           <el-col :span="24" v-if="!(item.list && item.list.length)">
@@ -98,7 +102,9 @@
               v-for="(t, i) in temperature"
               :key="i + '-' + idx"
             >
-              {{ t.label }}:{{ itm[t.key] }}
+              {{ t.label }}:{{
+                (item.formatter && item.formatter(itm)) || itm[t.key]
+              }}
             </el-col>
           </template>
           <el-col :span="24" v-if="!(item.list && item.list.length)">
@@ -121,7 +127,9 @@
               v-for="(t, i) in halflong"
               :key="i + '-' + idx"
             >
-              {{ t.label }}:{{ itm[t.key] }}
+              {{ t.label }}:{{
+                (item.formatter && item.formatter(itm)) || itm[t.key]
+              }}
             </el-col>
           </template>
           <el-col :span="24" v-if="!(item.list && item.list.length)">
@@ -144,7 +152,9 @@
               v-for="(t, i) in furnace"
               :key="i + '-' + idx"
             >
-              {{ t.label }}:{{ itm[t.key] }}
+              {{ t.label }}:{{
+                (item.formatter && item.formatter(itm)) || itm[t.key]
+              }}
             </el-col>
           </template>
           <el-col :span="24" v-if="!(item.list && item.list.length)">
@@ -167,7 +177,9 @@
               v-for="(t, i) in sinter"
               :key="i + '-' + idx"
             >
-              {{ t.label }}:{{ itm[t.key] }}
+              {{ t.label }}:{{
+                (item.formatter && item.formatter(itm)) || itm[t.key]
+              }}
             </el-col>
           </template>
           <el-col :span="24" v-if="!(item.list && item.list.length)">
@@ -190,7 +202,9 @@
               v-for="(t, i) in quality"
               :key="i + '-' + idx"
             >
-              {{ t.label }}:{{ itm[t.key] }}
+              {{ t.label }}:{{
+                (item.formatter && item.formatter(itm)) || itm[t.key]
+              }}
             </el-col>
           </template>
           <el-col :span="24" v-if="!(item.list && item.list.length)">
@@ -213,7 +227,9 @@
               v-for="(t, i) in packageOpt"
               :key="i + '-' + idx"
             >
-              {{ t.label }}:{{ itm[t.key] }}
+              {{ t.label }}:{{
+                (item.formatter && item.formatter(itm)) || itm[t.key]
+              }}
             </el-col>
           </template>
           <el-col :span="24" v-if="!(item.list && item.list.length)">
@@ -236,7 +252,9 @@
               v-for="(t, i) in preStorage"
               :key="i + '-' + idx"
             >
-              {{ t.label }}:{{ itm[t.key] }}
+              {{ t.label }}:{{
+                (item.formatter && item.formatter(itm)) || itm[t.key]
+              }}
             </el-col>
           </template>
           <el-col :span="24" v-if="!(item.list && item.list.length)">
@@ -262,7 +280,9 @@
               v-for="(t, i) in deepProcesse"
               :key="i + '-' + idx"
             >
-              {{ t.label }}:{{ itm[t.key] }}
+              {{ t.label }}:{{
+                (item.formatter && item.formatter(itm)) || itm[t.key]
+              }}
             </el-col>
           </template>
           <el-col :span="24" v-if="!(item.list && item.list.length)">
@@ -310,73 +330,118 @@
             label: '原料牌号',
             key: 'brandNo',
             span: 8,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              return itm.workReportCategoryList[0]?.brandNum;
+            }
           },
           {
             label: '原料批号',
             key: 'xxx',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              return itm.workReportCategoryList[0]?.batchNo;
+            }
           },
           {
             label: '投料重量(KG)',
             key: 'feedingWeight',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              return itm.workReportCategoryList[0]?.number;
+            }
           },
           {
             label: '合格数',
             key: 'standardNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.standardNum;
+            }
           },
           {
             label: '不合格数',
             key: 'noStandardNum',
             span: 4,
-            class: 'border-dashed-bottom'
+            class: 'border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.noStandardNum;
+            }
           },
 
           {
             label: '设备号',
             key: 'deviceCode',
             span: 8,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 4
+              );
+              return obj?.code;
+            }
           },
           {
             label: '模具编号/型号',
             key: 'xxx',
             span: 8,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 5
+              );
+              return obj?.code + '/' + obj?.model;
+            }
           },
           {
             label: '舟皿名称',
             key: 'xxx',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 8
+              );
+              return obj?.name;
+            }
           },
           {
             label: '舟皿数量',
             key: 'boatNum',
             span: 4,
-            class: 'border-dashed-bottom'
+            class: 'border-dashed-bottom',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 8
+              );
+              return obj?.extraField?.boatNum;
+            }
           },
 
           {
             label: '冲压次数',
             key: 'stampingTimes',
             span: 4,
-            class: 'border-dashed-right'
+            class: 'border-dashed-right',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 5
+              );
+              return obj?.extraField?.stampingTimes;
+            }
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
+            key: 'executorJobNum',
             span: 4,
             class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
+            key: 'executeTime',
             span: 4,
             class: 'border-dashed-right'
           },
@@ -398,43 +463,62 @@
             label: '干燥时长(分钟)',
             key: 'dryingDuration',
             span: 8,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              return itm.workReportArea?.extraField?.dryTime;
+            }
           },
           {
             label: '合格数',
             key: 'standardNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.standardNum;
+            }
           },
           {
             label: '不合格数',
             key: 'noStandardNum',
             span: 4,
-            class: ' border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.noStandardNum;
+            }
           },
           {
             label: '区域编号',
             key: 'areaCode',
             span: 8,
-            class: 'border-dashed-bottom'
+            class: 'border-dashed-bottom',
+            formatter (itm) {
+              return itm.workReportArea?.code;
+            }
           },
 
           {
-            label: '周转车编码',
+            label: '舟皿编码',
             key: 'xxx',
             span: 8,
-            class: 'border-dashed-right '
+            class: 'border-dashed-right ',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 8
+              );
+              return obj?.code;
+            }
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
+            key: 'executorJobNum',
             span: 4,
-            class: 'border-dashed-right '
+            class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
-            span: 8
+            key: 'executeTime',
+            span: 4,
+            class: 'border-dashed-right'
           },
           {
             label: '备注',
@@ -461,19 +545,31 @@
             label: '合格数',
             key: 'standardNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.standardNum;
+            }
           },
           {
             label: '不合格数',
             key: 'noStandardNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.noStandardNum;
+            }
           },
           {
             label: '设备号',
             key: 'deviceCode',
             span: 4,
-            class: ' border-dashed-bottom'
+            class: ' border-dashed-bottom',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 4
+              );
+              return obj?.code;
+            }
           },
 
           {
@@ -484,14 +580,15 @@
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
+            key: 'executorJobNum',
             span: 4,
             class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
-            span: 8
+            key: 'executeTime',
+            span: 4,
+            class: 'border-dashed-right'
           },
           {
             label: '备注',
@@ -512,43 +609,68 @@
             label: '合格数',
             key: 'standardNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.standardNum;
+            }
           },
           {
             label: '不合格数',
             key: 'noStandardNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.noStandardNum;
+            }
           },
           {
             label: '设备号',
             key: 'deviceCode',
             span: 8,
-            class: ' border-dashed-bottom'
+            class: ' border-dashed-bottom',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 4
+              );
+              return obj?.code;
+            }
           },
 
           {
             label: '舟皿名称',
             key: 'xxx',
             span: 4,
-            class: 'border-dashed-right'
+            class: 'border-dashed-right',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 8
+              );
+              return obj?.name;
+            }
           },
           {
             label: '舟皿数量',
             key: 'boatNum',
             span: 4,
-            class: 'border-dashed-right'
+            class: 'border-dashed-right',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 8
+              );
+              return obj?.extraField?.boatNum;
+            }
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
+            key: 'executorJobNum',
             span: 4,
             class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
-            span: 8
+            key: 'executeTime',
+            span: 4,
+            class: 'border-dashed-right'
           },
           {
             label: '备注',
@@ -569,19 +691,25 @@
             label: '设备号',
             key: 'deviceCode',
             span: 4,
-            class: 'border-dashed-right'
+            class: 'border-dashed-right',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 4
+              );
+              return obj?.code;
+            }
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
+            key: 'executorJobNum',
             span: 4,
             class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
-            span: 8,
-            class: ' '
+            key: 'executeTime',
+            span: 4,
+            class: 'border-dashed-right'
           },
           {
             label: '备注',
@@ -602,31 +730,43 @@
             label: '合格数',
             key: 'standardNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.standardNum;
+            }
           },
           {
             label: '不合格数',
             key: 'noStandardNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.noStandardNum;
+            }
           },
           {
             label: '设备号',
             key: 'deviceCode',
             span: 8,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 4
+              );
+              return obj?.code;
+            }
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
+            key: 'executorJobNum',
             span: 4,
             class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
-            span: 8,
-            class: ''
+            key: 'executeTime',
+            span: 4,
+            class: 'border-dashed-right'
           },
           {
             label: '备注',
@@ -645,15 +785,15 @@
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
+            key: 'executorJobNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
-            span: 8,
-            class: 'border-dashed-bottom'
+            key: 'executeTime',
+            span: 4,
+            class: 'border-dashed-right'
           },
           {
             label: '成检结果',
@@ -663,15 +803,15 @@
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
+            key: 'executorJobNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
-            span: 8,
-            class: 'border-dashed-bottom'
+            key: 'executeTime',
+            span: 4,
+            class: 'border-dashed-right'
           },
           {
             label: '外径',
@@ -759,15 +899,15 @@
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
+            key: 'executorJobNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
-            span: 12,
-            class: 'border-dashed-bottom'
+            key: 'executeTime',
+            span: 4,
+            class: 'border-dashed-right'
           },
           {
             label: '备注',
@@ -781,32 +921,44 @@
           {
             label: '合格数',
             key: 'standardNum',
-            span: 8,
-            class: 'border-dashed-right'
+            span: 4,
+            class: 'border-dashed-right border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.standardNum;
+            }
           },
           {
             label: '不合格数',
             key: 'noStandardNum',
             span: 4,
-            class: 'border-dashed-right'
+            class: 'border-dashed-bottom',
+            formatter (itm) {
+              return itm.productInfo?.noStandardNum;
+            }
           },
           {
             label: '设备号',
             key: 'deviceCode',
             span: 4,
-            class: 'border-dashed-right'
+            class: 'border-dashed-right',
+            formatter (itm) {
+              const obj = itm.workReportDeviceList.find(
+                (i) => i.rootCategoryLevelId == 4
+              );
+              return obj?.code;
+            }
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
+            key: 'executorJobNum',
             span: 4,
             class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
+            key: 'executeTime',
             span: 4,
-            class: ' '
+            class: 'border-dashed-right'
           },
           {
             label: '备注',
@@ -897,15 +1049,15 @@
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
-            span: 8,
-            class: 'border-dashed-right border-dashed-bottom'
+            key: 'executorJobNum',
+            span: 4,
+            class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
+            key: 'executeTime',
             span: 4,
-            class: 'border-dashed-bottom'
+            class: 'border-dashed-right'
           },
           {
             label: '备注',
@@ -924,15 +1076,15 @@
           },
           {
             label: '员工号',
-            key: 'reportingOperator',
+            key: 'executorJobNum',
             span: 4,
-            class: 'border-dashed-right border-dashed-bottom'
+            class: 'border-dashed-right'
           },
           {
             label: '日期',
-            key: 'reportWorkTime',
-            span: 16,
-            class: ' border-dashed-bottom'
+            key: 'executeTime',
+            span: 4,
+            class: 'border-dashed-right'
           },
           {
             label: '备注',
@@ -951,8 +1103,15 @@
       },
       init () {
         printWorkOrderInfo(this.workOrderId).then((res) => {
-          console.log(res);
-          // this.$set(p, 'list', res.list || []);
+          for (const t of res.taskInfo) {
+            for (const p of this.processList) {
+              if (!p.list) {
+                this.$set(p, 'list', t || []);
+              } else if (t.taskName === p.taskTypeName) {
+                p.list.push(t);
+              }
+            }
+          }
         });
       },
       cancel () {

+ 30 - 18
src/views/produceOrder/components/report/Drying.vue

@@ -50,7 +50,7 @@
             type="datetime"
             format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择"
-			:disabled="formData.dateType==2"
+            :disabled="formData.dateType == 2"
           ></el-date-picker
         ></el-form-item>
       </div>
@@ -104,7 +104,7 @@
         <el-descriptions-item label="舟皿数量" :span="3"
           ><el-input
             placeholder="请输入"
-            v-model="boatMsg.extraField.num"
+            v-model="boatMsg.extraField.boatMsg"
           ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="质检项" :span="2">
@@ -257,10 +257,10 @@
         type: Object,
         default: () => ({})
       },
-		formData: {
-		  type: Object,
-		  default: () => ({})
-		}
+      formData: {
+        type: Object,
+        default: () => ({})
+      }
     },
     data () {
       return {
@@ -310,7 +310,7 @@
           rootCategoryLevelId: '',
           specification: '',
           extraField: {
-            num: ''
+            boatMsg: ''
           }
         }
       };
@@ -320,15 +320,19 @@
       this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
     },
     watch: {
-			formData: {
-			  immediate: true,
-			  handler () {
-			    if (this.formData.dateType==2) {
-			      this.$set(this.workReport,'executeTime',this.formData.appointTime);
-			    }
-			  }
-			}
-		},
+      formData: {
+        immediate: true,
+        handler () {
+          if (this.formData.dateType == 2) {
+            this.$set(
+              this.workReport,
+              'executeTime',
+              this.formData.appointTime
+            );
+          }
+        }
+      }
+    },
     methods: {
       getCategory (id, memo) {
         this.$refs.catogaryDialogRef.open(id, this[memo], (res) => {
@@ -372,11 +376,19 @@
                 name: this.infoData.productName,
                 code: this.infoData.productCode
               });
+
+              const workReportCategoryList = [this.categoryMsg];
+              if (this.boatMsg.code) {
+                workReportCategoryList.push(this.boatMsg);
+              }
               fun({
                 checkState: 1,
+                workReportArea: this.workReportArea,
                 workReport: this.workReport,
-                workReportDeviceList: this.workReportDeviceList?[this.workReportDeviceList]:[],
-                workReportCategoryList: [this.categoryMsg]
+                workReportDeviceList: this.workReportDeviceList
+                  ? [this.workReportDeviceList]
+                  : [],
+                workReportCategoryList
               }).then((res) => {
                 // this.$message.success('报工成功!');
                 // this.getReportCount();

+ 20 - 16
src/views/produceOrder/components/report/Extrusion.vue

@@ -45,7 +45,7 @@
             type="datetime"
             format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择"
-			:disabled="formData.dateType==2"
+            :disabled="formData.dateType == 2"
           ></el-date-picker
         ></el-form-item>
       </div>
@@ -256,11 +256,11 @@
         <el-descriptions-item label="规格">{{
           boatMsg.specification
         }}</el-descriptions-item>
-        <el-descriptions-item label="槽数">{{slotNum}}</el-descriptions-item>
+        <el-descriptions-item label="槽数">{{ slotNum }}</el-descriptions-item>
         <el-descriptions-item label="数量"
           ><el-input
             placeholder="请输入"
-            v-model="boatMsg.extraField.num"
+            v-model="boatMsg.extraField.boatNum"
           ></el-input
         ></el-descriptions-item>
       </el-descriptions>
@@ -284,7 +284,7 @@
   import equipmentDailog from '@/components/EquipmentDailog/report-equipment';
   import materialDialog from '../materialDialog.vue';
   import catogaryDialog from '../catogaryDialog.vue';
-  import { reportCount , getSoltNum } from '@/api/produceOrder';
+  import { reportCount, getSoltNum } from '@/api/produceOrder';
   import dayjs from 'dayjs';
   export default {
     components: {
@@ -298,7 +298,7 @@
         type: Object,
         default: () => ({})
       },
-	  formData: {
+      formData: {
         type: Object,
         default: () => ({})
       },
@@ -364,11 +364,11 @@
           rootCategoryLevelId: '',
           specification: '',
           extraField: {
-            num: ''
+            boatNum: ''
           }
         },
         batchList: [],
-		slotNum:''
+        slotNum: ''
       };
     },
     watch: {
@@ -380,11 +380,15 @@
           }
         }
       },
-	  formData: {
+      formData: {
         immediate: true,
         handler () {
-          if (this.formData.dateType==2) {
-            this.$set(this.workReport,'executeTime',this.formData.appointTime);
+          if (this.formData.dateType == 2) {
+            this.$set(
+              this.workReport,
+              'executeTime',
+              this.formData.appointTime
+            );
           }
         }
       },
@@ -417,11 +421,11 @@
     methods: {
       getCategory (id, memo) {
         this.$refs.catogaryDialogRef.open(id, this[memo], (res) => {
-			if(id=='8'){
-				getSoltNum(res.id).then(r=>{
-					this.slotNum = r.slotNum
-				})
-			}
+          if (id == '8') {
+            getSoltNum(res.id).then((r) => {
+              this.slotNum = r.slotNum;
+            });
+          }
           this[memo].rootCategoryLevelId = res.categoryLevelId;
           this[memo].code = res.code;
           this[memo].name = res.name;
@@ -431,7 +435,7 @@
             this[memo].model = res.modelType;
             this[memo].extraField.stampingTimes = '';
           } else {
-            this[memo].extraField.num = '';
+            this[memo].extraField.boatNum = '';
           }
         });
       },

+ 2 - 2
src/views/produceOrder/components/report/Heating.vue

@@ -226,7 +226,7 @@
         <el-descriptions-item label="升温曲线">
           <el-input
             placeholder="请输入"
-            v-model="workReportDeviceList.extraField.temperatureCurve"
+            v-model="workReportDeviceList.extraField.temperatureRamp"
           ></el-input>
         </el-descriptions-item>
 
@@ -300,7 +300,7 @@
           rootCategoryLevelId: '',
           specification: '',
           extraField: {
-            temperatureCurve: ''
+            temperatureRamp: ''
           }
         },
         countMsg: {},