报装相关修改

src/views/dcSystem/installationProcess/process/acceptanceInspection/formDialog.vue

@@ -256,7 +256,7 @@ export default {
         ysrq: '',
         zldj: 1,
         ysqk: '',
-        remark: ''
+        remark: '无'
       },
       disabled: '',
       fileList: [],
@@ -370,7 +370,7 @@ export default {
     // 文件下载
     fileDown(file) {
       window.open(
-        `${IP}base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
+        `${IP}/base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
       )
     },
 
@@ -424,7 +424,7 @@ export default {
               {
                 formId: this.acceptanceInspectionFormId,
                 fieldName: 'checkRemark', // 备注
-                fieldDataValue: this.form.remark
+                fieldDataValue: this.form.remark || '无'
               }
             ],
             processId: checkData.processId || '',

src/views/dcSystem/installationProcess/process/accountWorkOrder/formDialog.vue

@@ -306,7 +306,8 @@ export default {
       form: {
         workOrderTitle: '',
         workOrderDate: '',
-        workOrderTitleRemark: ''
+        workOrderTitleRemark: '',
+        workOrderRemark: '无'
       },
       disabled: '',
       tableData: [],
@@ -434,7 +435,7 @@ export default {
               {
                 formId: this.accountWorkOrderFormId,
                 fieldName: 'workOrderRemark', // 立户供电备注
-                fieldDataValue: this.form.workOrderRemark
+                fieldDataValue: this.form.workOrderRemark || '无'
               },
               {
                 formId: this.accountWorkOrderFormId,

src/views/dcSystem/installationProcess/process/accountWorkOrderAudit/formDialog.vue

@@ -21,7 +21,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="处理意见" prop="approvalSuggest">
-            <el-input v-model="accountWorkOrderAuditFrom.approvalSuggest" maxlength="200" rows="3" resize="none" show-word-limit type="textarea" placeholder="请输入备注信息" />
+            <el-input v-model="accountWorkOrderAuditFrom.approvalSuggest" maxlength="200" rows="3" resize="none" show-word-limit type="textarea" placeholder="请输入处理意见" />
           </el-form-item>
         </el-col>
       </el-row>

src/views/dcSystem/installationProcess/process/apply/formDialog.vue

@@ -505,7 +505,7 @@ export default {
     // 文件下载
     fileDown(file) {
       window.open(
-        `${IP}base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
+        `${IP}/base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
       )
     },
     // 电话号码验证规则

src/views/dcSystem/installationProcess/process/construction/formDialog.vue

@@ -404,7 +404,7 @@ export default {
     // 文件下载
     fileDown(file) {
       window.open(
-        `${IP}base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
+        `${IP}/base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
       )
     },
 

src/views/dcSystem/installationProcess/process/deptmentAudit/formDialog.vue

@@ -39,7 +39,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="处理意见" prop="approvalSuggest">
-            <el-input v-model="deptmentAuditFrom.approvalSuggest" maxlength="200" rows="3" resize="none" show-word-limit type="textarea" placeholder="请输入备注信息" />
+            <el-input v-model="deptmentAuditFrom.approvalSuggest" maxlength="200" rows="3" resize="none" show-word-limit type="textarea" placeholder="请输入处理意见" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -211,7 +211,6 @@ export default {
       _this.$refs.deptmentAuditFrom.validate((valid) => {
         if (valid) {
           const checkData = _this.checkData[1]
-          debugger
           const data = {
             formData: [
               {
@@ -254,7 +253,6 @@ export default {
       this.loading = true
       _this.$emit('remind', '2')
       const checkData = this.checkData[1]
-      debugger
       if (_this.approvalPersonOptions.length > 1 && _this.checkData[_this.active + 1]) {
       // 动态改变节点审批人
         const params = [{

src/views/dcSystem/installationProcess/process/directorInstructions/formDialog.vue

@@ -47,7 +47,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="处理意见" prop="approvalSuggest">
-            <el-input v-model="directorInstructionsForm.approvalSuggest" maxlength="200" rows="3" resize="none" show-word-limit type="textarea" placeholder="请输入备注信息" />
+            <el-input v-model="directorInstructionsForm.approvalSuggest" maxlength="200" rows="3" resize="none" show-word-limit type="textarea" placeholder="请输入处理意见" />
           </el-form-item>
         </el-col>
       </el-row>

src/views/dcSystem/installationProcess/process/headViews/formDialog.vue

@@ -46,7 +46,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="处理意见" prop="approvalSuggest">
-            <el-input v-model="headViewsForm.approvalSuggest" maxlength="200" rows="3" resize="none" show-word-limit type="textarea" placeholder="请输入备注信息" />
+            <el-input v-model="headViewsForm.approvalSuggest" maxlength="200" rows="3" resize="none" show-word-limit type="textarea" placeholder="请输入处理意见" />
           </el-form-item>
         </el-col>
       </el-row>

src/views/dcSystem/installationProcess/process/managerInstructions/formDialog.vue

@@ -47,7 +47,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="处理意见" prop="approvalSuggest">
-            <el-input v-model="managerInstructionsForm.approvalSuggest" maxlength="200" rows="3" resize="none" show-word-limit type="textarea" placeholder="请输入备注信息" />
+            <el-input v-model="managerInstructionsForm.approvalSuggest" maxlength="200" rows="3" resize="none" show-word-limit type="textarea" placeholder="请输入处理意见" />
           </el-form-item>
         </el-col>
       </el-row>

src/views/dcSystem/installationProcess/process/payment/formDialog.vue

@@ -297,7 +297,7 @@ export default {
         sfry: '',
         fkrxm: '',
         fkrlxfs: '',
-        bz: ''
+        bz: '无'
       },
       loading: false,
       disabled: false,
@@ -327,7 +327,7 @@ export default {
       this.disabled = false
       this.getData()
     }
-    if (this.active > 6) {
+    if (this.active >= 6) {
       const yszj = await queryFormData(this.reconnoiterFormId)
       yszj.result.map(e => {
         if (e.fieldName == 'budgetPrice') {
@@ -413,7 +413,7 @@ export default {
     // 文件下载
     fileDown(file) {
       window.open(
-        `${IP}base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
+        `${IP}/base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
       )
     },
 
@@ -469,7 +469,7 @@ export default {
               {
                 formId: this.paymentFormId,
                 fieldName: 'chargeRemark', // 备注
-                fieldDataValue: this.form.bz
+                fieldDataValue: this.form.bz || '无'
               },
               {
                 formId: this.paymentFormId,

src/views/dcSystem/installationProcess/process/processDetails/index.vue

@@ -447,7 +447,6 @@ export default {
           e.histroy = histroy.result
         })
       }
-      debugger
       this.deptmentAuditFormId = this.checkData[1].formId
       this.headViewsFormId = this.checkData[2].formId
       this.directorInstructionsFormId = this.checkData[3].formId

src/views/dcSystem/installationProcess/process/processDetails/indexTabs.vue

@@ -534,7 +534,6 @@ export default {
       this.checkData.map((e) => {
         e.histroy = histroy.result
       })
-      debugger
       this.deptmentAuditFormId = this.checkData[1].formId
       this.headViewsFormId = this.checkData[2].formId
       this.directorInstructionsFormId = this.checkData[3].formId

src/views/dcSystem/installationProcess/process/reconnoiter/formDialog.vue

@@ -448,7 +448,7 @@ export default {
         kcrq: '',
         kcry: '',
         yszj: '',
-        bz: ''
+        bz: '无'
       },
       disabled: false,
       fileList: [],
@@ -634,7 +634,7 @@ export default {
     // 文件下载
     fileDown(file) {
       window.open(
-        `${IP}base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
+        `${IP}/base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
       )
     },
 
@@ -689,7 +689,7 @@ export default {
               {
                 formId: this.reconnoiterFormId,
                 fieldName: 'surveyRemark', // 备注
-                fieldDataValue: this.form.bz
+                fieldDataValue: this.form.bz || '无'
               },
               {
                 formId: this.reconnoiterFormId,

src/views/dcSystem/installationProcess/process/settlementAccount/formDialog.vue

@@ -310,6 +310,7 @@ export default {
         })
       }
     }
+    this.settlementAccountForm.remark = this.settlementAccountForm.remark || '无'
   },
   // 生命周期 - 挂载完成（访问DOM元素）
   mounted() {
@@ -453,7 +454,7 @@ export default {
               {
                 formId: this.settlementAccountFormId,
                 fieldName: 'remark', // 备注
-                fieldDataValue: this.settlementAccountForm.remark
+                fieldDataValue: this.settlementAccountForm.remark || '无'
               }
             ],
             processId: checkData.processId || '',
@@ -583,7 +584,7 @@ export default {
     // 文件下载
     fileDown(file) {
       window.open(
-        `${IP}base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
+        `${IP}/base/file/downloadFile?fileName=${file.name}&remotePath=${file.filePath}&access_token=${this.$store.state.user.token}`
       )
     }
   }