默认设备

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

@@ -334,31 +334,31 @@
             );
           }
         }
-      },
-      infoData: {
-        immediate: true,
-        handler() {
-          if (
-            this.infoData.id &&
-            this.currentInfo.code == this.firstInfo.code
-          ) {
-            // 设备
-            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,
-                sourceInstanceId: this.infoData.sourceInstanceId,
-                specification: this.infoData.specification
-              }
-            );
-          }
-        }
       }
+      // infoData: {
+      //   immediate: true,
+      //   handler() {
+      //     if (
+      //       this.infoData.id &&
+      //       this.currentInfo.code == this.firstInfo.code
+      //     ) {
+      //       // 设备
+      //       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,
+      //           sourceInstanceId: this.infoData.sourceInstanceId,
+      //           specification: this.infoData.specification
+      //         }
+      //       );
+      //     }
+      //   }
+      // }
     },
     methods: {
       multiply,

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

@@ -416,31 +416,31 @@
             );
           }
         }
-      },
-      infoData: {
-        immediate: true,
-        handler() {
-          if (
-            this.infoData.id &&
-            this.currentInfo.code == this.firstInfo.code
-          ) {
-            // 设备
-            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,
-                sourceInstanceId: this.infoData.sourceInstanceId,
-                specification: this.infoData.specification
-              }
-            );
-          }
-        }
       }
+      // infoData: {
+      //   immediate: true,
+      //   handler() {
+      //     if (
+      //       this.infoData.id &&
+      //       this.currentInfo.code == this.firstInfo.code
+      //     ) {
+      //       // 设备
+      //       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,
+      //           sourceInstanceId: this.infoData.sourceInstanceId,
+      //           specification: this.infoData.specification
+      //         }
+      //       );
+      //     }
+      //   }
+      // }
     },
     created() {
       this.workReport.executorId = this.$store.state.user.info?.userId;

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

@@ -39,7 +39,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>
@@ -73,8 +73,12 @@
           workReportDeviceList.model
         }}</el-descriptions-item>
         <el-descriptions-item label="烧结曲线">
-			<el-input clearable v-model="workReportDeviceList.extraField.sinteringCurve" placeholder="请输入"/>
-		</el-descriptions-item>
+          <el-input
+            clearable
+            v-model="workReportDeviceList.extraField.sinteringCurve"
+            placeholder="请输入"
+          />
+        </el-descriptions-item>
         <el-descriptions-item label="设备位置">{{
           workReportDeviceList.path
         }}</el-descriptions-item>
@@ -103,20 +107,20 @@
         type: Object,
         default: () => ({})
       },
-	  formData: {
-	    type: Object,
-	    default: () => ({})
-	  },
-		firstInfo:{
-		  type: Object,
-		  default: () => ({})
-		},
-		currentInfo:{
-			type: Object,
-			default: () => ({}) 
-		}
+      formData: {
+        type: Object,
+        default: () => ({})
+      },
+      firstInfo: {
+        type: Object,
+        default: () => ({})
+      },
+      currentInfo: {
+        type: Object,
+        default: () => ({})
+      }
     },
-    data () {
+    data() {
       return {
         categoryMsg: {
           batchNo: '',
@@ -146,9 +150,9 @@
           model: '',
           rootCategoryLevelId: '',
           specification: '',
-		  extraField: {
-		    sinteringCurve: ''
-		  }
+          extraField: {
+            sinteringCurve: ''
+          }
         },
         countMsg: {}
       };
@@ -156,48 +160,52 @@
     watch: {
       taskInfo: {
         immediate: true,
-        handler () {
+        handler() {
           if (this.taskInfo.code) {
             this.getReportCount();
           }
         }
       },
-	  formData: {
-	    immediate: true,
-	    handler () {
-	      if (this.formData.dateType==2) {
-	        this.$set(this.workReport,'executeTime',this.formData.appointTime);
-	      }
-	    }
-	  },
-      infoData: {
+      formData: {
         immediate: true,
-        handler () {
-          if (this.infoData.id&& this.currentInfo.code == this.firstInfo.code) {
-            // 设备
-            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,
-                sourceInstanceId: this.infoData.sourceInstanceId,
-                specification: this.infoData.specification
-              }
+        handler() {
+          if (this.formData.dateType == 2) {
+            this.$set(
+              this.workReport,
+              'executeTime',
+              this.formData.appointTime
             );
           }
         }
       }
+      // infoData: {
+      //   immediate: true,
+      //   handler () {
+      //     if (this.infoData.id&& this.currentInfo.code == this.firstInfo.code) {
+      //       // 设备
+      //       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,
+      //           sourceInstanceId: this.infoData.sourceInstanceId,
+      //           specification: this.infoData.specification
+      //         }
+      //       );
+      //     }
+      //   }
+      // }
     },
-    created () {
+    created() {
       this.workReport.executorId = this.$store.state.user.info?.userId;
       this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
     },
     methods: {
-      async getReportCount () {
+      async getReportCount() {
         const res = await reportCount({
           taskCode: this.taskInfo.code,
           lastTaskCode: this.taskInfo.lastTaskCode,
@@ -206,7 +214,7 @@
 
         this.countMsg = res;
       },
-      getEquip () {
+      getEquip() {
         this.$refs.equipmentRef.openSingle(
           [this.workReportDeviceList],
           (res) => {
@@ -223,7 +231,7 @@
           }
         );
       },
-      report (fun) {
+      report(fun) {
         this.$refs.formRef.validate((value) => {
           if (value) {
             if (!this.workReportDeviceList.code) {

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

@@ -345,30 +345,30 @@
           }
         }
       },
-      infoData: {
-        immediate: true,
-        handler() {
-          if (
-            this.infoData.id &&
-            this.currentInfo.code == this.firstInfo.code
-          ) {
-            // 设备
-            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,
-                sourceInstanceId: this.infoData.sourceInstanceId,
-                specification: this.infoData.specification
-              }
-            );
-          }
-        }
-      },
+      // infoData: {
+      //   immediate: true,
+      //   handler() {
+      //     if (
+      //       this.infoData.id &&
+      //       this.currentInfo.code == this.firstInfo.code
+      //     ) {
+      //       // 设备
+      //       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,
+      //           sourceInstanceId: this.infoData.sourceInstanceId,
+      //           specification: this.infoData.specification
+      //         }
+      //       );
+      //     }
+      //   }
+      // },
       formData: {
         immediate: true,
         handler() {

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

@@ -354,30 +354,30 @@
           }
         }
       },
-      infoData: {
-        immediate: true,
-        handler() {
-          if (
-            this.infoData.id &&
-            this.currentInfo.code == this.firstInfo.code
-          ) {
-            // 设备
-            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,
-                sourceInstanceId: this.infoData.sourceInstanceId,
-                specification: this.infoData.specification
-              }
-            );
-          }
-        }
-      },
+      // infoData: {
+      //   immediate: true,
+      //   handler() {
+      //     if (
+      //       this.infoData.id &&
+      //       this.currentInfo.code == this.firstInfo.code
+      //     ) {
+      //       // 设备
+      //       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,
+      //           sourceInstanceId: this.infoData.sourceInstanceId,
+      //           specification: this.infoData.specification
+      //         }
+      //       );
+      //     }
+      //   }
+      // },
       formData: {
         immediate: true,
         handler() {

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

@@ -95,20 +95,20 @@
         type: Object,
         default: () => ({})
       },
-		formData: {
-		  type: Object,
-		  default: () => ({})
-		},
-		firstInfo:{
-		  type: Object,
-		  default: () => ({})
-		},
-		currentInfo:{
-			type: Object,
-			default: () => ({}) 
-		}
+      formData: {
+        type: Object,
+        default: () => ({})
+      },
+      firstInfo: {
+        type: Object,
+        default: () => ({})
+      },
+      currentInfo: {
+        type: Object,
+        default: () => ({})
+      }
     },
-    data () {
+    data() {
       return {
         workReport: {
           executorId: '',
@@ -137,36 +137,36 @@
     watch: {
       taskInfo: {
         immediate: true,
-        handler () {
+        handler() {
           if (this.taskInfo.code) {
             this.getReportCount();
           }
         }
-      },
-      infoData: {
-        immediate: true,
-        handler () {
-          if (this.infoData.id && this.currentInfo.code == this.firstInfo.code) {
-            // 设备
-            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,
-                sourceInstanceId: this.infoData.sourceInstanceId,
-                specification: this.infoData.specification
-              }
-            );
-          }
-        }
       }
+      // infoData: {
+      //   immediate: true,
+      //   handler () {
+      //     if (this.infoData.id && this.currentInfo.code == this.firstInfo.code) {
+      //       // 设备
+      //       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,
+      //           sourceInstanceId: this.infoData.sourceInstanceId,
+      //           specification: this.infoData.specification
+      //         }
+      //       );
+      //     }
+      //   }
+      // }
     },
     methods: {
-      async getReportCount () {
+      async getReportCount() {
         const res = await reportCount({
           taskCode: this.taskInfo.code,
           workOrderId: this.infoData.id
@@ -174,7 +174,7 @@
 
         this.countMsg = res;
       },
-      getEquip () {
+      getEquip() {
         this.$refs.equipmentRef.openSingle(
           [this.workReportDeviceList],
           (res) => {
@@ -184,8 +184,8 @@
           }
         );
       },
-      getMsg () {},
-      report (fun) {
+      getMsg() {},
+      report(fun) {
         this.$refs.formRef.validate((value) => {
           if (value) {
             if (!this.workReportDeviceList.code) {