safecheck-client 3.0.30-62-t6 → 3.0.30-62-t8

package/src/components/NewDefectList/DefectListNew.vue

@@ -190,7 +190,14 @@
         </div>
         <div v-if="solveModal.preData.type == 'solve'" class="col-sm-12" style="margin-bottom: 10px">
           <label class="font_normal_body">处理后图片</label>
-          <avatar-upload :width="200" :height="200" :img-src.sync="solveModal.uploadData.imgSrc" :filename.sync="solveModal.uploadData.filename" v-ref:imginfo></avatar-upload>
+         <safecheck-file-upload
+           :issearch="false"
+           :isupload="true"
+           :blodid="check.id"
+           :isdelete="true"
+           flag="safeCheck"
+           @filename="getfile"
+         ></safecheck-file-upload>
         </div>
         <div v-if="solveModal.preData.state == '已处理'" class="col-sm-12" style="margin-bottom: 10px">
           <p> <label class="font_normal_body">处理后图片</label></p>
@@ -345,7 +352,7 @@ const sendRepair = function* (self) {
   uploadData.model.f_repairitems = repairitems
   //tag)
   // 调工单接口
-  let result = yield self.$resetpost('/api/af-safecheck/logic/callerSend', uploadData)
+  let result = yield self.$resetpost('/af-telephone/rs/logic/callerSend', uploadData)
   //tag)
   if (result.data.f_service_id) {
     const data = {
@@ -369,6 +376,7 @@ export default {
       model: new PagedList('api/af-safecheck/sql/GetDefectByPaperIdNew', 100, {
         f_paper_id: 'this.f_paper_id',f_item_value: 'this.f_item_value'
       }),
+      fileInfoData:[],
       showSolveModal: false,
       showToRepairModal: false,
       showDefectModal: false,
@@ -472,6 +480,9 @@ export default {
     this.getEmp()
   },
   methods: {
+    getfile(res){
+      this.solveModal.uploadData.filename=res.f_filename
+    },
     //审核通过
     auditsure(info){
       // 拿到t_devices_items 的ID，给f_audit_results中存入通过   如果未通过，需要可以再次派单，对隐患进行处理
@@ -491,8 +502,9 @@ export default {
         }
       })
     },
-    solveDefect(row, type) {
+    async solveDefect(row, type) {
       console.log(row)
+      await this.getrelafile(this.check.id)
       this.solveModal.preData.defectImg = ''
       this.solveModal.preData.f_repair_path = ''
       this.solveModal.preData.repairedImg = ''
@@ -501,10 +513,10 @@ export default {
       this.solveModal.preData.repairedImg3 = ''
       this.solveModal.preData.repairedImg4 = ''
       this.solveModal.preData.repairedImg5 = ''
-      this.solveModal.preData.defectImg = row.f_path?'/rs/image/file/' + row.f_path:''
-      this.solveModal.preData.defectImg1 = row.f_p1_path?'/rs/image/file/' + row.f_p1_path:''
-      this.solveModal.preData.defectImg2 = row.f_p2_path?'/rs/image/file/' + row.f_p2_path:''
-      this.solveModal.preData.defectImg3 = row.f_p3_path?'/rs/image/file/' + row.f_p3_path:''
+      this.solveModal.preData.defectImg = row.f_path ? '/rs/image/file/' + row.f_path : ''
+      this.solveModal.preData.defectImg1 = row.f_p1_path ? '/rs/image/file/' + row.f_p1_path : ''
+      this.solveModal.preData.defectImg2 = row.f_p2_path ? '/rs/image/file/' + row.f_p2_path : ''
+      this.solveModal.preData.defectImg3 = row.f_p3_path ? '/rs/image/file/' + row.f_p3_path : ''
       this.solveModal.uploadData.id = row.id
       this.solveModal.preData.type = type
       this.solveModal.preData.state = row.f_repaire_state
@@ -515,10 +527,10 @@ export default {
           this.solveModal.preData.repairedImg = row.f_repair_path
           this.solveModal.preData.repairedImg1 = row.f_repair1_path
         } else {
-          this.solveModal.preData.f_repair_path = row.f_repair_path? '/rs/image/file/' + row.f_repair_path:null
-          this.solveModal.preData.repairedImg = row.f_repair_path? '/rs/image/file/' + row.f_repair_path:null
-          this.solveModal.preData.repairedImg1 = row.f_other_dealpath1? '/rs/image/file/' + row.f_other_dealpath1:null
-          this.solveModal.preData.repairedImg2 = row.f_other_dealpath2? '/rs/image/file/' + row.f_other_dealpath2:null
+          this.solveModal.preData.f_repair_path =this.fileInfoData[0] ?this.fileInfoData[0].f_downloadURL: null
+          this.solveModal.preData.repairedImg = this.fileInfoData[0] ?this.fileInfoData[0].f_downloadURL: null
+          this.solveModal.preData.repairedImg1 = row.f_other_dealpath1 ? '/rs/image/file/' + row.f_other_dealpath1 : null
+          this.solveModal.preData.repairedImg2 = row.f_other_dealpath2 ? '/rs/image/file/' + row.f_other_dealpath2 : null
           this.solveModal.preData.repairedImg3 = row.f_repair2_path ? ('/rs/image/file/' + row.f_repair2_path) : ''
           this.solveModal.preData.repairedImg4 = row.f_repair3_path ? ('/rs/image/file/' + row.f_repair3_path) : ''
           this.solveModal.preData.repairedImg5 = row.f_repair4_path ? ('/rs/image/file/' + row.f_repair4_path) : ''
@@ -529,7 +541,7 @@ export default {
         } else {
           this.solveModal.uploadData.f_repairman = row.f_repairman
           this.solveModal.uploadData.f_repair_date = row.f_repair_date
-          this.$set('solveModal.f_audit_results',row.f_audit_results)
+          this.$set('solveModal.f_audit_results', row.f_audit_results)
         }
       } else {
         this.solveModal.uploadData.f_repairman = this.$login.f.name
@@ -537,6 +549,34 @@ export default {
       }
       this.showSolveModal = !this.showSolveModal
     },
+    async getrelafile(id) {
+      let http = new HttpResetClass()
+      let condition = `f_blobid= '${id}' and  fusetype ='safeCheck'`
+      let data = {
+        items: '*',
+        tablename: 't_files',
+        condition: condition,
+        orderitem: 'id'
+      }
+      let getFile = await http.load('POST', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+      for (var i = 0; i < getFile.data.length; i++) {
+        // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
+        if (getFile.data[i].fusetype && (getFile.data[i].fusetype.includes('execl导入'))) {
+          getFile.data.splice(i, 1)
+          i--
+          continue
+        }
+        this.fileInfoData = []
+        if( getFile.data.length>0){
+          let temp = getFile.data[i].f_realpath
+          getFile.data[i].f_downloadURL = "http://" + location.host + temp
+          this.fileInfoData = getFile.data
+        }
+      }
+    },
     ok() {
       if (!(this.solveModal.uploadData.filename && this.solveModal.uploadData.filename.length > 0)) {
         this.$showMessage('请录入处理后照片')