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

src/views/produceOrder/components/progressBox.vue

@@ -40,7 +40,7 @@
     data () {
       return {
         stepList: [],
-		active:-1
+		    active:-1
       };
     },
 	watch: {
@@ -54,6 +54,8 @@
 			const active = this.stepList.findIndex((item) => item.number === 0)
 			if(active==-1){
 				this.active = this.stepList.length-1
+			}else{
+				this.active = active - 1
 			}
 	      }
 	    },

src/views/produceOrder/components/report/Furnace.vue

@@ -72,7 +72,9 @@
         <el-descriptions-item label="型号">{{
           workReportDeviceList.model
         }}</el-descriptions-item>
-
+        <el-descriptions-item label="烧结曲线">
+			<el-input clearable v-model="workReportDeviceList.extraField.sinteringCurve" placeholder="请输入"/>
+		</el-descriptions-item>
         <el-descriptions-item label="设备位置">{{
           workReportDeviceList.path
         }}</el-descriptions-item>
@@ -143,7 +145,10 @@
           path: '',
           model: '',
           rootCategoryLevelId: '',
-          specification: ''
+          specification: '',
+		  extraField: {
+		    sinteringCurve: ''
+		  }
         },
         countMsg: {}
       };

src/views/produceOrder/detail.vue

@@ -638,15 +638,15 @@
               minWidth: 100,
               align: 'center'
             },
-            {
-              label: '交接数量',
-              prop: 'handoverQuantity',
-              minWidth: 100,
-              align: 'center'
-            },
+            // {
+            //   label: '交接数量',
+            //   prop: 'handoverQuantity',
+            //   minWidth: 100,
+            //   align: 'center'
+            // },
             {
               label: '实际数量',
-              prop: 'actualQuantity',
+              prop: 'billOfMaterials',
               minWidth: 100,
               align: 'center'
             },
@@ -812,14 +812,14 @@
               minWidth: 120,
               align: 'center'
             },
-            {
-              label: '交接数量',
-              prop: 'handoverQuantity'
-            },
-            {
-              label: '实际数量',
-              prop: 'actualQuantity'
-            },
+            // {
+            //   label: '交接数量',
+            //   prop: 'handoverQuantity'
+            // },
+            // {
+            //   label: '实际数量',
+            //   prop: 'billOfMaterials'
+            // },
             {
               label: '投料时间',
               prop: 'feedingTime',
@@ -910,15 +910,15 @@
               minWidth: 100,
               align: 'center'
             },
-            {
-              label: '交接数量',
-              prop: 'handoverQuantity',
-              minWidth: 100,
-              align: 'center'
-            },
+            // {
+            //   label: '交接数量',
+            //   prop: 'handoverQuantity',
+            //   minWidth: 100,
+            //   align: 'center'
+            // },
             {
               label: '实际数量',
-              prop: 'actualQuantity',
+              prop: 'billOfMaterials',
               minWidth: 100,
               align: 'center'
             },
@@ -983,15 +983,15 @@
               minWidth: 100,
               align: 'center'
             },
-            {
-              label: '交接数量',
-              prop: 'handoverQuantity',
-              minWidth: 100,
-              align: 'center'
-            },
+            // {
+            //   label: '交接数量',
+            //   prop: 'handoverQuantity',
+            //   minWidth: 100,
+            //   align: 'center'
+            // },
             {
               label: '实际数量',
-              prop: 'actualQuantity',
+              prop: 'billOfMaterials',
               minWidth: 100,
               align: 'center'
             },