Merge branch 'dev' of http://192.168.2.241:3000/tengmingxue/dcWaterService into dev

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

@@ -66,7 +66,6 @@
         <el-col :span="8">
           <el-form-item label="质量等级：">
             {{ form.zldj }}
-
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -333,7 +332,7 @@ export default {
               this.fileList = JSON.parse(e.fieldDataValue).filter(item => item.fileName).map((e) => {
                 return {
                   name: e.fileName,
-                  url: `${IP}base/file/downloadFile?fileName=${e.fileName}&remotePath=${e.filePath
+                  url: `${IP}/base/file/downloadFile?fileName=${e.fileName}&remotePath=${e.filePath
                   }&access_token=${sessionStorage.getItem('token')}`,
                   fileFormat: e.fileFormat,
                   fileName: e.fileName,

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

@@ -469,7 +469,7 @@ export default {
         this.fileList = JSON.parse(this.data.annex).map((e) => {
           return {
             name: e.fileName,
-            url: `${IP}base/file/downloadFile?fileName=${
+            url: `${IP}/base/file/downloadFile?fileName=${
               e.fileName
             }&remotePath=${e.filePath}&access_token=${sessionStorage.getItem(
               'token'

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

@@ -367,7 +367,7 @@ export default {
               this.fileList = JSON.parse(e.fieldDataValue).filter(item => item.fileName).map((e) => {
                 return {
                   name: e.fileName,
-                  url: `${IP}base/file/downloadFile?fileName=${e.fileName}&remotePath=${e.filePath
+                  url: `${IP}/base/file/downloadFile?fileName=${e.fileName}&remotePath=${e.filePath
                   }&access_token=${sessionStorage.getItem('token')}`,
                   fileFormat: e.fileFormat,
                   fileName: e.fileName,

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

@@ -379,7 +379,7 @@ export default {
               this.fileList = JSON.parse(e.fieldDataValue).filter(item => item.fileName).map((e) => {
                 return {
                   name: e.fileName,
-                  url: `${IP}base/file/downloadFile?fileName=${e.fileName}&remotePath=${e.filePath
+                  url: `${IP}/base/file/downloadFile?fileName=${e.fileName}&remotePath=${e.filePath
                   }&access_token=${sessionStorage.getItem('token')}`,
                   fileFormat: e.fileFormat,
                   fileName: e.fileName,

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

@@ -542,7 +542,7 @@ export default {
       this.paymentFormId = this.checkData[6].formId
       this.constructionFormId = this.checkData[7].formId
       this.acceptanceInspectionFormId = this.checkData[8].formId
-      this.settlementAccountFormId = this.checkData[9].formId || 0
+      this.settlementAccountFormId = this.checkData[9].formId
       this.accountWorkOrderFormId = this.checkData[10].formId
       // this.accountWorkOrderAuditFormId = this.checkData[11].formId
       this.steps = this.processData.map((e) => {

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

@@ -527,7 +527,7 @@ export default {
               this.fileList = JSON.parse(e.fieldDataValue).filter(item => item.fileName).map((e) => {
                 return {
                   name: e.fileName,
-                  url: `${IP}base/file/downloadFile?fileName=${e.fileName}&remotePath=${e.filePath
+                  url: `${IP}/base/file/downloadFile?fileName=${e.fileName}&remotePath=${e.filePath
                   }&access_token=${sessionStorage.getItem('token')}`,
                   fileFormat: e.fileFormat,
                   fileName: e.fileName,

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

@@ -116,7 +116,7 @@
       </el-row>
       <el-row v-else>
         <el-col :span="6">
-          <el-form-item label="材料费" prop="materialCosts">
+          <el-form-item label="材料费">
             {{ settlementAccountForm.materialCosts || 0 }}
             <template>
               <span style="width:20px">元</span>
@@ -124,7 +124,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="工时费" prop="mainHourCosts">
+          <el-form-item label="工时费">
             {{ settlementAccountForm.mainHourCosts || 0 }}
             <template>
               <span style="width:20px">元</span>
@@ -132,7 +132,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label-width="125px" label="公共官网维护费" prop="maintenanceCosts">
+          <el-form-item label-width="125px" label="公共官网维护费">
             {{ settlementAccountForm.maintenanceCosts || 0 }}
             <template>
               <span style="width:20px">元</span>
@@ -140,25 +140,20 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="费用合计" prop="sumCosts">
+          <el-form-item label="费用合计">
             {{ sumCosts() }}
             <template>
               <span style="width:20px">元</span>
             </template>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="收款时间">
             {{ settlementAccountForm.collectionTime }}
           </el-form-item>
         </el-col>
-        <el-col v-if="approvalPersonOptions.length" :span="8">
-          <el-form-item label="下一步审核人" prop="auditPersonName" label-width="100px">
-            {{ settlementAccountForm.auditPersonName }}
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
+          <el-form-item label="备注">
             {{ settlementAccountForm.remark }}
           </el-form-item>
         </el-col>
@@ -321,7 +316,7 @@ export default {
     // 获取数据
     async getData() {
       // 初始化数据
-      this.settlementAccountForm = {}
+      const settlementAccountForm = {}
 
       // 调用接口
       const form = await queryFormData(this.settlementAccountFormId)
@@ -334,34 +329,34 @@ export default {
         switch (e.fieldName) {
           // 审核人
           case 'auditPersonId':
-            this.settlementAccountForm.auditPersonId = e.fieldDataValue
+            settlementAccountForm.auditPersonId = e.fieldDataValue
             break
           case 'auditPersonName':
-            this.settlementAccountForm.auditPersonName = e.fieldDataValue
+            settlementAccountForm.auditPersonName = e.fieldDataValue
             break
           // 材料
           case 'materialCosts':
-            this.settlementAccountForm.materialCosts = +e.fieldDataValue || 0
+            settlementAccountForm.materialCosts = +e.fieldDataValue || 0
             break
           // 工时
           case 'mainHourCosts':
-            this.settlementAccountForm.mainHourCosts = +e.fieldDataValue || 0
+            settlementAccountForm.mainHourCosts = +e.fieldDataValue || 0
             break
             // 维护
           case 'maintenanceCosts':
-            this.settlementAccountForm.maintenanceCosts = +e.fieldDataValue || 0
+            settlementAccountForm.maintenanceCosts = +e.fieldDataValue || 0
             break
             // 总计
           case 'sumCosts':
-            this.settlementAccountForm.sumCosts = +e.sumCosts || 0
+            settlementAccountForm.sumCosts = +e.sumCosts || 0
             break
             // 收款
           case 'collectionTime':
-            this.settlementAccountForm.collectionTime = moment(this.value).format('YYYY-MM-DD HH:mm:ss')
+            settlementAccountForm.collectionTime = moment(this.value).format('YYYY-MM-DD HH:mm:ss')
             break
           // 备注
           case 'remark':
-            this.settlementAccountForm.remark = e.fieldDataValue
+            settlementAccountForm.remark = e.fieldDataValue
             break
           // 附件
           case 'checkFiles':
@@ -369,7 +364,7 @@ export default {
               this.fileList = JSON.parse(e.fieldDataValue).filter(item => item.fileName).map((e) => {
                 return {
                   name: e.fileName,
-                  url: `${IP}base/file/downloadFile?fileName=${e.fileName}&remotePath=${e.filePath
+                  url: `${IP}/base/file/downloadFile?fileName=${e.fileName}&remotePath=${e.filePath
                   }&access_token=${sessionStorage.getItem('token')}`,
                   fileFormat: e.fileFormat,
                   fileName: e.fileName,
@@ -384,6 +379,9 @@ export default {
             break
         }
       })
+      this.settlementAccountForm = {
+        ...settlementAccountForm
+      }
     },
 
     // 重置