408249787 2 жил өмнө
parent
commit
0895860209

+ 19 - 26
src/views/hidden/hidden/modules/RepairBaseForm.vue

@@ -543,9 +543,9 @@ export default {
         return
       }
       this.modalTitle = '编辑'
-      this.applicationFileList = record.applicationFileList
+      this.applicationFileList = record.beforeImageList
       this.repairFileList = record.repairFileList
-      this.reportFileList = record.reportFileList
+      this.reportFileList = record.fileList
       this.defaultApplicationFileList = this.BaseTool.UPLOAD.transImg(this.applicationFileList)
       this.defaultRepairFileList = this.BaseTool.UPLOAD.transImg(this.repairFileList)
       this.defaultCheckFileList = this.BaseTool.UPLOAD.transImg(this.reportFileList)
@@ -554,7 +554,7 @@ export default {
       }
       const { form: { setFieldsValue } } = this
       // 日期处理
-      record.applyTime = this.BaseTool.Moment(record.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      // record.applyTime = this.BaseTool.Moment(record.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
       if (record.limitDate != null) {
         record.limitDate = this.BaseTool.Moment(record.limitDate, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
         this.$nextTick(() => {
@@ -565,7 +565,6 @@ export default {
       }
       this.$nextTick(() => {
         setFieldsValue(Object.assign(pick(record, [
-          'id',
           'sbId',
           'sbCph',
           'partId',
@@ -635,9 +634,11 @@ ${record.hiddenRisk}`
           this.confirmLoading = false
           return
         }
+        console.log(values)
+
         // 日期处理
-        values.applyTime = this.BaseTool.Date.formatter(values.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
-        values.limitDate = BaseTool.Date.formatter(values.limitDate, BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+        // values.applyTime = this.BaseTool.Date.formatter(values.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+        // values.limitDate = BaseTool.Date.formatter(values.limitDate, BaseTool.Date.PICKER_NORM_DATE_PATTERN)
         values.planStartTime = BaseTool.Date.formatter(values.planStartTime, BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
         values.planEndTime = BaseTool.Date.formatter(values.planEndTime, BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
         // 上传文件
@@ -646,30 +647,22 @@ ${record.hiddenRisk}`
         values.repairType = values.repairType.join(',')
         values.applicationFileList = this.applicationFileList
         values.reportFileList = this.reportFileList
-        values.sbPosition = values.sbPosition.join('->')
-        console.log(values)
+        // values.sbPosition = values.sbPosition.join('->')
         if (values.partId === undefined) {
           values.partId = ''
         }
-        if (this.BaseTool.String.isBlank(values.id)) {
-          addRepairApplicationForm(values)
-            .then(() => {
-              this.$notification.success({
-                message: '报修成功!',
-                duration: 3
-              })
-              this.handleCancel(values)
-            }).catch(() => {
-              this.confirmLoading = false
-            })
-        } else {
-          updateRepairApplicationForm(values)
-            .then(() => {
-              this.handleCancel(values)
-            }).catch(() => {
-              this.confirmLoading = false
+        console.log(values)
+
+        addRepairApplicationForm(values)
+          .then(() => {
+            this.$notification.success({
+              message: '报修成功!',
+              duration: 3
             })
-        }
+            this.handleCancel(values)
+          }).catch(() => {
+            this.confirmLoading = false
+          })
       })
     },
     changePlanFlag (value) {