bug修改

src/views/common/UpLoadComponentV3.1.vue

@@ -20,8 +20,6 @@
       <el-table
         ref="uploadTable"
         :key="tableKey"
-        @row-click="tableRowClick"
-        :row-class-name="tableRowClassName"
         :data="dataListNew">
         <el-table-column type="seq" width="40"></el-table-column>
         <el-table-column label="文件名称" prop="name" align="center">

src/views/modules/cw/projectRecords/ProjectRecordsTaskForm.vue

@@ -497,7 +497,7 @@
             if (this.commonJS.isEmpty(this.inputForm.officeId)) {
               this.inputForm.officeId = JSON.parse(localStorage.getItem('user')).officeDTO.id
             }
-            if (this.formReadOnly) {
+            if (this.status === 'audit' || this.status === 'taskFormDetail') {
               this.method = 'view'
             }
             this.$refs.uploadComponent.newUpload(this.method, this.inputForm.workAttachmentDtoList, 'cw_project_records', null, null, null, null, false)
@@ -758,10 +758,11 @@
         })
       },
       getContract (row) {
+        console.log('111')
         // 首先删除之前合同与被服务单位的关联（委托方联系人）
         let _this = this
         const waitDelClient = function () {
-          return new Promise((resolve, reject) => {
+          return new Promise(async (resolve, reject) => {
             if (_this.commonJS.isNotEmpty(_this.inputForm.contractId)) {
               // 根据合同id查询合同信息
               _this.contractInfoService.findById(_this.inputForm.contractId).then(({data}) => {
@@ -774,14 +775,22 @@
                         if (item.no === client.data.no) {
                           _this.$refs.clientTable.remove(item)
                           _this.inputForm.cwProjectClientInfoDTOList.splice(index, 1)
+                          setTimeout(() => {
+                            resolve()
+                          }, 100)
                         }
                       })
+                    } else {
+                      resolve()
                     }
                   })
+                } else {
+                  resolve()
                 }
               })
+            } else {
+              resolve()
             }
-            resolve()
           })
         }
         waitDelClient().then(() => {

src/views/modules/cw/projectReportArchive/ProjectReportArchiveTaskForm.vue

@@ -520,7 +520,7 @@
                     if (_this.inputForm.isNumber !== _this.inputForm.number) {
                       _this.$message.error('“案卷号”与“确认案卷号”不一致，请重新填写')
                       _this.loading = false
-                      reject(new Error('“案卷号”与“确认案卷号”不一致，请重新填写'))
+                      throw new Error('“案卷号”与“确认案卷号”不一致，请重新填写')
                     }
                   }
                   await _this.$refs.uploadComponent.getDataList().then((list) => {
@@ -529,7 +529,8 @@
                     list.forEach(item => {
                       if (_this.commonJS.isEmpty(item.fileType)) {
                         _this.$message.error('附件中的文件类型不可以为空')
-                        reject(new Error('附件中的文件类型不可以为空'))
+                        _this.loading = false
+                        throw new Error('附件中的文件类型不可以为空')
                       }
                     })
                   })
@@ -540,7 +541,6 @@
                 })
               }
               wait().then(() => {
-                console.log('123')
                 this.projectReportArchiveService.saveForm(this.inputForm).then(({data}) => {
                   callback(data.businessTable, data.businessId, this.inputForm)
                   this.loading = false
@@ -548,10 +548,6 @@
                   this.loading = false
                   throw new Error()
                 })
-              }).catch(() => {
-                console.log('456')
-                this.loading = false
-                throw new Error()
               })
             }
           }

src/views/modules/cw/reportManagement/ReportManagementTaskForm.vue

@@ -484,8 +484,8 @@
             if (this.commonJS.isEmpty(this.inputForm.realCreate)) {
               this.inputForm.realCreate = JSON.parse(localStorage.getItem('user')).id
             }
-            if (this.formReadOnly) {
-              method = 'view'
+            if (this.status === 'audit' || this.status === 'taskFormDetail') {
+              this.method = 'view'
             }
             this.$refs.archiveFile.newUpload(method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             this.loading = false

src/views/modules/cw/workClientInfo/WorkClientForm.vue

@@ -442,14 +442,14 @@
                   <el-form-item label="首次发行签字注师1" prop="cwWorkClientTypeDTO.signatory1"
                                 :rules="[
                    ]">
-                    <UserSelect size="medium" ref="userSelect1" :disabled="method==='view'" :readonly="true" :limit='10' :value="inputForm.cwWorkClientTypeDTO.signatory1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+                    <UserSelect size="medium" ref="userSelect1" :disabled="method==='view'" :readonly="true" :limit='1' :value="inputForm.cwWorkClientTypeDTO.signatory1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="首次发行签字注师2" prop="cwWorkClientTypeDTO.signatory2"
                                 :rules="[
                    ]">
-                    <UserSelect size="medium" ref="userSelect2" :disabled="method==='view'" :readonly="true" :limit='10' :value="inputForm.cwWorkClientTypeDTO.signatory2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                    <UserSelect size="medium" ref="userSelect2" :disabled="method==='view'" :readonly="true" :limit='1' :value="inputForm.cwWorkClientTypeDTO.signatory2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -1011,7 +1011,8 @@
           mobile: '',
           isUscCode: '',
           manageLevelTypeName: '',
-          organizationTypeName: ''
+          organizationTypeName: '',
+          remarks: ''
         },
         keyWatch: '',
         activeName: 'base',
@@ -1225,7 +1226,8 @@
           mobile: '',
           isUscCode: '',
           manageLevelTypeName: '',
-          organizationTypeName: ''
+          organizationTypeName: '',
+          remarks: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -1509,7 +1511,8 @@
           mobile: '',
           isUscCode: '',
           manageLevelTypeName: '',
-          organizationTypeName: ''
+          organizationTypeName: '',
+          remarks: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()

src/views/modules/cw/workClientInfo/WorkClientTaskForm.vue

@@ -432,14 +432,14 @@
                     <el-form-item label="首次发行签字注师1" prop="cwWorkClientTypeDTO.signatory1"
                                   :rules="[
                    ]">
-                      <UserSelect size="medium" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='10' :value="inputForm.cwWorkClientTypeDTO.signatory1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+                      <UserSelect size="medium" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :value="inputForm.cwWorkClientTypeDTO.signatory1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="首次发行签字注师2" prop="cwWorkClientTypeDTO.signatory2"
                                   :rules="[
                    ]">
-                      <UserSelect size="medium" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='10' :value="inputForm.cwWorkClientTypeDTO.signatory2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                      <UserSelect size="medium" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :value="inputForm.cwWorkClientTypeDTO.signatory2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -547,7 +547,7 @@
                   >
                     <vxe-table-column align="center" field="companyName" title="公司名称" :edit-render="{}">
                       <template v-slot:edit="scope">
-                        <vxe-input v-model="scope.row.companyName" placeholder="公司名称" clearable></vxe-input>
+                        <el-input v-model="scope.row.companyName" placeholder="公司名称" clearable></el-input>
                       </template>
                     </vxe-table-column>
                     <vxe-table-column align="center" field="isTaxpayerIdentificationNo" title="是否有纳税人识别号" :edit-render="{name: '$select', options: $dictUtils.getDictList('yes_no')}">
@@ -795,7 +795,8 @@
           mobile: '',
           isUscCode: '',
           manageLevelTypeName: '',
-          organizationTypeName: ''
+          organizationTypeName: '',
+          remarks: ''
         },
         keyWatch: '',
         activeName: 'base',
@@ -968,7 +969,8 @@
           mobile: '',
           isUscCode: '',
           manageLevelTypeName: '',
-          organizationTypeName: ''
+          organizationTypeName: '',
+          remarks: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -1236,7 +1238,8 @@
           mobile: '',
           isUscCode: '',
           manageLevelTypeName: '',
-          organizationTypeName: ''
+          organizationTypeName: '',
+          remarks: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()