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

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

@@ -240,10 +240,18 @@
         type: Object,
         default: () => ({})
       },
-	  formData: {
-	    type: Object,
-	    default: () => ({})
-	  }
+	formData: {
+		type: Object,
+		default: () => ({})
+	},
+	firstInfo:{
+	  type: Object,
+	  default: () => ({})
+	},
+	currentInfo:{
+		type: Object,
+		default: () => ({}) 
+	}
     },
     data () {
       return {
@@ -307,7 +315,7 @@
       infoData: {
         immediate: true,
         handler () {
-          if (this.infoData.id) {
+          if (this.infoData.id && this.currentInfo.code == this.firstInfo.code ) {
             // 设备
             this.workReportDeviceList = Object.assign(
               {},

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

@@ -89,10 +89,16 @@
               class="w100"
               :value="
                 (categoryMsg.totalWeight =
-                  categoryMsg.number * (infoData.productUnitWeight || 1))
+                  categoryMsg.number === ''
+                    ? ''
+                    : categoryMsg.number * (infoData.productUnitWeight || 1))
               "
               clearable
             ></el-input>
+            <!-- 	:value="
+				  (categoryMsg.totalWeight =
+					categoryMsg.number * (infoData.productUnitWeight || 1))
+				" -->
           </el-form-item>
         </el-descriptions-item>
         <el-descriptions-item label="舟皿编号/名称" :span="2"
@@ -260,6 +266,14 @@
       formData: {
         type: Object,
         default: () => ({})
+      },
+      firstInfo: {
+        type: Object,
+        default: () => ({})
+      },
+      currentInfo: {
+        type: Object,
+        default: () => ({})
       }
     },
     data () {

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

@@ -305,7 +305,15 @@
       taskInfo: {
         type: Object,
         default: () => ({})
-      }
+      },
+	  firstInfo:{
+        type: Object,
+        default: () => ({})
+      },
+	  currentInfo:{
+		 type: Object,
+		 default: () => ({}) 
+	  }
     },
     data () {
       return {
@@ -395,7 +403,7 @@
       infoData: {
         immediate: true,
         handler () {
-          if (this.infoData.id) {
+          if (this.infoData.id && this.currentInfo.code == this.firstInfo.code) {
             // 设备
             this.workReportDeviceList = Object.assign(
               {},
@@ -413,6 +421,7 @@
           }
         }
       }
+	  
     },
     created () {
       this.workReport.executorId = this.$store.state.user.info?.userId;

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

@@ -104,7 +104,15 @@
 	  formData: {
 	    type: Object,
 	    default: () => ({})
-	  }
+	  },
+		firstInfo:{
+		  type: Object,
+		  default: () => ({})
+		},
+		currentInfo:{
+			type: Object,
+			default: () => ({}) 
+		}
     },
     data () {
       return {
@@ -160,7 +168,7 @@
       infoData: {
         immediate: true,
         handler () {
-          if (this.infoData.id) {
+          if (this.infoData.id&& this.currentInfo.code == this.firstInfo.code) {
             // 设备
             this.workReportDeviceList = Object.assign(
               {},

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

@@ -257,7 +257,15 @@
 	  formData: {
 	    type: Object,
 	    default: () => ({})
-	  }
+	  },
+		firstInfo:{
+		  type: Object,
+		  default: () => ({})
+		},
+		currentInfo:{
+			type: Object,
+			default: () => ({}) 
+		}
     },
     data () {
       return {
@@ -321,7 +329,7 @@
       infoData: {
         immediate: true,
         handler () {
-          if (this.infoData.id) {
+          if (this.infoData.id && this.currentInfo.code == this.firstInfo.code) {
             // 设备
             this.workReportDeviceList = Object.assign(
               {},

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

@@ -263,7 +263,15 @@
       formData: {
         type: Object,
         default: () => ({})
-      }
+      },
+		firstInfo:{
+		  type: Object,
+		  default: () => ({})
+		},
+		currentInfo:{
+			type: Object,
+			default: () => ({}) 
+		}
     },
     data () {
       return {
@@ -330,7 +338,7 @@
       infoData: {
         immediate: true,
         handler () {
-          if (this.infoData.id) {
+          if (this.infoData.id && this.currentInfo.code == this.firstInfo.code) {
             // 设备
             this.workReportDeviceList = Object.assign(
               {},

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

@@ -179,7 +179,15 @@
 	  formData: {
 	  	  type: Object,
 	  	  default: () => ({})
-	  	}
+	  	},
+			firstInfo:{
+			  type: Object,
+			  default: () => ({})
+			},
+			currentInfo:{
+				type: Object,
+				default: () => ({}) 
+			}
 	  
     },
     data () {
@@ -223,7 +231,7 @@
             label: '最小包装单元',
             prop: 'index',
             formatter: (row) =>
-              `${row.netWeightUnit}${row.measuringUnit}/${row.packingUnit}`
+              `${row.measuringUnit}/${row.packingUnit}`
           },
           {
             label: '数量',

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

@@ -98,6 +98,14 @@
 		formData: {
 		  type: Object,
 		  default: () => ({})
+		},
+		firstInfo:{
+		  type: Object,
+		  default: () => ({})
+		},
+		currentInfo:{
+			type: Object,
+			default: () => ({}) 
 		}
     },
     data () {
@@ -138,7 +146,7 @@
       infoData: {
         immediate: true,
         handler () {
-          if (this.infoData.id) {
+          if (this.infoData.id && this.currentInfo.code == this.firstInfo.code) {
             // 设备
             this.workReportDeviceList = Object.assign(
               {},

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

@@ -132,6 +132,14 @@
 		formData: {
 		  type: Object,
 		  default: () => ({})
+		},
+		firstInfo:{
+		  type: Object,
+		  default: () => ({})
+		},
+		currentInfo:{
+			type: Object,
+			default: () => ({}) 
 		}
     },
     data () {

src/views/produceOrder/report.vue

@@ -123,6 +123,8 @@
         :key="activeName + isUpdate"
         :infoData="infoData"
         :formData="formData"
+		:firstInfo="tabList[0]"
+		:currentInfo="tabList[activeName]"
         :taskInfo="{
           ...tabList[activeName],
           lastTaskCode:
@@ -259,7 +261,8 @@
         this.tabList = res1;
         this.tabList.push({
           name: '入库',
-          code: '999999'
+          code: '999999',
+		  sortNum:99
         });
         this.activeName = '0';
       },