送检优化

src/views/module_cmms/submission/modulesFK/SubmissionEquipmentFormFK.vue

@@ -153,7 +153,7 @@ export default {
         {
           title:'设备',
           align:"center",
-          dataIndex: 'equipmentid_dictText'
+          dataIndex: 'equipmentname'
         },
         {
           title:'检定日期',
@@ -212,6 +212,7 @@ export default {
         fk: "/cmmsSubmissionEquipment/cmmsSubmissionEquipment/fk",
         deviceList: "cmmsSubmissionEquipment/cmmsSubmissionEquipment/listByCmmsSubmissionId",
         queryById: "/cmmsSubmission/cmmsSubmission/queryById",
+        deviceData: "/cmmsSubmissionEquipment/cmmsSubmissionEquipment/voListByCmmsSubmissionId"
       },
     }
   },
@@ -225,13 +226,17 @@ export default {
       // })
       // 获取工单详情
       getAction(this.url.queryById, {id:cmmsSubmissionId}).then((res) => {
-        console.log(444,res)
+        console.log(1111,res)
         this.formModel.submissionEquipmentList = res.result.submissionEquipmentList
         const b = res.result.uploadFileList.map((res) => {
           return res.url
         })
         this.formModel.uploadFileList = b.join(',')
       })
+      // // 获取设备送检列表
+      // getAction(this.url.deviceData, {cmmsSubmissionId:cmmsSubmissionId}).then((res) => {
+      //   this.formModel.submissionEquipmentList = res.result
+      // })
       // 获取设备下拉列表
       getAction(this.url.deviceList, {cmmsSubmissionId:cmmsSubmissionId}).then((res) => {
         this.deviceOption = res.result.map((res) => {
@@ -244,15 +249,15 @@ export default {
     },
     getSJSBOptions2() {
       this.queryParam.cmmsSubmissionId = this.csId
-      getAction(this.url.list, this.queryParam).then((res) => {
-        this.formModel.submissionEquipmentList = res.result.records
+      getAction(this.url.deviceData, this.queryParam).then((res) => {
+        this.formModel.submissionEquipmentList = res.result
       })
     },
     getSJSBOptions3() {
       this.queryParam = {}
       this.queryParam.cmmsSubmissionId = this.csId
-      getAction(this.url.list, this.queryParam).then((res) => {
-        this.formModel.submissionEquipmentList = res.result.records
+      getAction(this.url.deviceData, this.queryParam).then((res) => {
+        this.formModel.submissionEquipmentList = res.result
       })
     },
     submitForm () {
@@ -284,16 +289,16 @@ export default {
           }
           // console.log("this.formModel.submissionEquipmentList",this.formModel.submissionEquipmentList)
           console.log(this.formModel)
-          // httpAction(httpurl,this.formModel.submissionEquipmentList,method).then((res)=>{
-          //   if(res.success){
-          //     that.$message.success(res.message);
-          //     that.$emit('ok');
-          //   }else{
-          //     that.$message.warning(res.message);
-          //   }
-          // }).finally(() => {
-          //   that.confirmLoading = false;
-          // })
+          httpAction(httpurl,this.formModel,method).then((res)=>{
+            if(res.success){
+              that.$message.success(res.message);
+              that.$emit('ok');
+            }else{
+              that.$message.warning(res.message);
+            }
+          }).finally(() => {
+            that.confirmLoading = false;
+          })
         }
 
       })