财务-报告修改

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

@@ -89,7 +89,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+          <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
             <el-form-item label="签字注师1" prop="signatureAnnotator1"
                           :rules="[
                    ]">
@@ -98,7 +98,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+          <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
             <el-form-item label="签字注师2" prop="signatureAnnotator2"
                           :rules="[
                    ]">
@@ -107,7 +107,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col v-if="inputForm.signatureType === '2'" :span="12">
+          <el-col v-if="inputForm.signatureType === '2' || inputForm.signatureType === '3'" :span="12">
             <el-form-item label="签字注师1" prop="signatureAnnotator1"
                           :rules="[
                               {required: true, message:'签字注师1不能为空', trigger:'blur'}
@@ -117,7 +117,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col v-if="inputForm.signatureType === '2'" :span="12">
+          <el-col v-if="inputForm.signatureType === '2' || inputForm.signatureType === '3'" :span="12">
             <el-form-item label="签字注师2" prop="signatureAnnotator2"
                           :rules="[
                               {required: true, message:'签字注师2不能为空', trigger:'blur'}
@@ -375,8 +375,14 @@
             <el-form-item label="是否数据证券业务" prop="securityBusiness"
                           :rules="[
                    ]">
-              <el-input v-model="inputForm.securityBusiness" placeholder="请填写是否数据证券业务" clearable>
-              </el-input>
+              <el-select v-model="inputForm.securityBusiness" placeholder="请选择报告类别" style="width:100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('cw_report_negotiable')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -458,9 +464,13 @@
 
       </el-form>
       <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
-        <el-tab-pane label="签章文件" name="archiveFile">
-          <!--        签章文件-->
-          <UpLoadComponent ref="archiveFile"></UpLoadComponent>
+<!--        <el-tab-pane label="签章文件" name="archiveFile">-->
+<!--          &lt;!&ndash;        签章文件&ndash;&gt;-->
+<!--          <UpLoadComponent ref="archiveFile"></UpLoadComponent>-->
+<!--        </el-tab-pane>-->
+        <el-tab-pane label="附件" name="enclosure">
+          <!--        附件-->
+          <UpLoadComponent ref="enclosure"></UpLoadComponent>
         </el-tab-pane>
       </el-tabs>
     </el-row>
@@ -476,7 +486,8 @@
 
 <script>
   import ReportReviewService from '@/api/cw/reportManagement/ReportReviewService'
-  import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
+  // import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
+  import UpLoadComponent from '@/views/common/UpLoadComponent'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import UserSelect from '../workClientInfo/clientUserSelect'
@@ -544,12 +555,13 @@
           projectMasterName: '',
           cwProjectInfoList: [],
           cwFileInfoList: [],
+          cwFileInfoList2: [],
           servedUnitId: '',
           status: '',
           realCreate: ''
         },
         keyWatch: '',
-        activeName: 'archiveFile',
+        activeName: 'enclosure',
         tableKey: '',
         tableKeyClient: '1',
         visible: false
@@ -568,7 +580,8 @@
     computed: {
       bus: {
         get () {
-          this.$refs.archiveFile.setDividerName('签章文件', false)
+          this.$refs.enclosure.setDividerName('附件', false)
+          // this.$refs.archiveFile.setDividerName('签章文件', false)
           return this.businessId
         },
         set (val) {
@@ -612,7 +625,6 @@
           })
         } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator2) && this.inputForm.projectMasterId !== this.inputForm.signatureAnnotator2 &&
           this.inputForm.projectMasterId !== value && this.commonJS.isNotEmpty(value)) {
-          console.log('this.inputForm.projectMasterId', this.inputForm.signatureAnnotator2)
           this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator1 = ''
@@ -635,8 +647,6 @@
           })
         } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator1) && this.inputForm.projectMasterId !== this.inputForm.signatureAnnotator1 &&
           this.inputForm.projectMasterId !== value && this.commonJS.isNotEmpty(value)) {
-          console.log('this.inputForm.projectMasterId', value)
-          console.log('this.inputForm.projectMasterId', this.inputForm.projectMasterId)
           this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator2 = ''
@@ -650,7 +660,8 @@
       },
       init (method, id) {
         this.visible = true
-        this.activeName = 'archiveFile'
+        this.activeName = 'enclosure'
+        // this.activeName = 'archiveFile'
         this.reportReviewService = new ReportReviewService()
         this.projectRecordsService = new ProjectRecordsService()
         this.projectReportService = new ProjectReportService()
@@ -677,7 +688,7 @@
           reportDate: '',
           servedUnitName: '', // 被服务单位
           registerAddress: '',
-          securityBusiness: '否',
+          securityBusiness: '2',
           businessLocation: '',
           auditFees: '',
           projectId: '',
@@ -712,8 +723,10 @@
           if (this.commonJS.isEmpty(this.inputForm.realCreate)) {
             this.inputForm.realCreate = JSON.parse(localStorage.getItem('user')).id
           }
-          this.$refs.archiveFile.clearUpload()
-          this.$refs.archiveFile.newUpload(this.method, [], 'cwProjectReport', null, null, null, null, false)
+          this.$refs.enclosure.clearUpload()
+          this.$refs.enclosure.newUpload(this.method, [], 'cwProjectReport', null, null, null, null, false)
+          // this.$refs.archiveFile.clearUpload()
+          // this.$refs.archiveFile.newUpload(this.method, [], 'cwProjectReport', null, null, null, null, false)
           // this.$refs.inputForm.resetFields()
           // this.loading = true
           /* this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
@@ -748,7 +761,6 @@
         }
       },
       getContract (row) {
-        console.log('row', row)
         this.inputForm.projectName = row.projectName // 项目名称
         this.inputForm.projectId = row.id // 项目id
         this.inputForm.projectNumber = row.projectNumber // 项目编号
@@ -798,7 +810,6 @@
           this.loading = true
           this.$refs['inputForm'].validate((valid) => {
             if (valid) {
-              console.log('进来了2')
               this.loading = true
               let _this = this
               let _num = 0
@@ -818,28 +829,29 @@
                     _num = 1
                     _this.loading = false
                   }
-                  _this.$refs.archiveFile.getDataList().then((data) => {
-                    _this.inputForm.cwFileInfoList = data
-                    if (_this.commonJS.isNotEmpty(_this.inputForm.cwFileInfoList)) {
-                      _this.inputForm.cwFileInfoList.forEach((item, index) => {
-                        if (_this.commonJS.isEmpty(item.fileType)) {
-                          _this.$message.error('签章文件中，第' + (index + 1) + '条数据的“文件类型”未填写')
-                          _num = 1
-                          _this.loading = false
-                          throw new Error('签章文件中，第' + (index + 1) + '条数据的“文件类型”未填写')
-                        } else if (_this.commonJS.isEmpty(item.sealType)) {
-                          _this.$message.error('签章文件中，第' + (index + 1) + '条数据的“盖章类型”未填写')
-                          _num = 1
-                          _this.loading = false
-                          throw new Error('签章文件中，第' + (index + 1) + '条数据的“盖章类型”未填写')
-                        }
-                      })
-                    } else {
-                      _this.$message.error('最少有一条签章文件数据！')
-                      _num = 1
-                      _this.loading = false
-                    }
-                  })
+                  _this.inputForm.cwFileInfoList2 = _this.$refs.enclosure.getDataList()
+                  // _this.$refs.archiveFile.getDataList().then((data) => {
+                  //   _this.inputForm.cwFileInfoList = data
+                  //   if (_this.commonJS.isNotEmpty(_this.inputForm.cwFileInfoList)) {
+                  //     _this.inputForm.cwFileInfoList.forEach((item, index) => {
+                  //       if (_this.commonJS.isEmpty(item.fileType)) {
+                  //         _this.$message.error('签章文件中，第' + (index + 1) + '条数据的“文件类型”未填写')
+                  //         _num = 1
+                  //         _this.loading = false
+                  //         throw new Error('签章文件中，第' + (index + 1) + '条数据的“文件类型”未填写')
+                  //       } else if (_this.commonJS.isEmpty(item.sealType)) {
+                  //         _this.$message.error('签章文件中，第' + (index + 1) + '条数据的“盖章类型”未填写')
+                  //         _num = 1
+                  //         _this.loading = false
+                  //         throw new Error('签章文件中，第' + (index + 1) + '条数据的“盖章类型”未填写')
+                  //       }
+                  //     })
+                  //   } else {
+                  //     _this.$message.error('最少有一条签章文件数据！')
+                  //     _num = 1
+                  //     _this.loading = false
+                  //   }
+                  // })
                   resolve()
                 })
               }
@@ -849,9 +861,9 @@
                     this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
                   }
                   this.projectReportService.saveForm(this.inputForm).then(({data}) => {
+                    this.$emit('refreshList')
                     callback(data.businessTable, data.businessId, this.inputForm)
                     this.close()
-                    this.$emit('refreshList')
                     this.loading = false
                   }).catch(() => {
                     this.close()
@@ -878,32 +890,33 @@
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+            // eslint-disable-next-line no-unused-vars
             let _this = this
             let _num = 0
             const wait = function () {
               return new Promise((resolve, reject) => {
-                _this.$refs.archiveFile.getDataList().then((data) => {
-                  _this.inputForm.cwFileInfoList = data
-                  if (_this.commonJS.isNotEmpty(_this.inputForm.cwFileInfoList)) {
-                    _this.inputForm.cwFileInfoList.forEach((item, index) => {
-                      if (_this.commonJS.isEmpty(item.fileType)) {
-                        _this.$message.error('签章文件中，第' + (index + 1) + '条数据的“文件类型”未填写')
-                        _num = 1
-                        _this.loading = false
-                        throw new Error('签章文件中，第' + (index + 1) + '条数据的“文件类型”未填写')
-                      } else if (_this.commonJS.isEmpty(item.sealType)) {
-                        _this.$message.error('签章文件中，第' + (index + 1) + '条数据的“盖章类型”未填写')
-                        _num = 1
-                        _this.loading = false
-                        throw new Error('签章文件中，第' + (index + 1) + '条数据的“盖章类型”未填写')
-                      }
-                    })
-                  } else {
-                    _this.$message.error('最少有一条签章文件数据！')
-                    _num = 1
-                    _this.loading = false
-                  }
-                })
+                // _this.$refs.archiveFile.getDataList().then((data) => {
+                //   _this.inputForm.cwFileInfoList = data
+                //   if (_this.commonJS.isNotEmpty(_this.inputForm.cwFileInfoList)) {
+                //     _this.inputForm.cwFileInfoList.forEach((item, index) => {
+                //       if (_this.commonJS.isEmpty(item.fileType)) {
+                //         _this.$message.error('签章文件中，第' + (index + 1) + '条数据的“文件类型”未填写')
+                //         _num = 1
+                //         _this.loading = false
+                //         throw new Error('签章文件中，第' + (index + 1) + '条数据的“文件类型”未填写')
+                //       } else if (_this.commonJS.isEmpty(item.sealType)) {
+                //         _this.$message.error('签章文件中，第' + (index + 1) + '条数据的“盖章类型”未填写')
+                //         _num = 1
+                //         _this.loading = false
+                //         throw new Error('签章文件中，第' + (index + 1) + '条数据的“盖章类型”未填写')
+                //       }
+                //     })
+                //   } else {
+                //     _this.$message.error('最少有一条签章文件数据！')
+                //     _num = 1
+                //     _this.loading = false
+                //   }
+                // })
                 resolve()
               })
             }
@@ -914,6 +927,7 @@
                 }
                 this.projectReportService.saveForm(this.inputForm).then(({data}) => {
                   callback(data.businessTable, data.businessId, this.inputForm)
+                  this.$emit('refreshList')
                   this.loading = false
                 }).catch(() => {
                   this.loading = false
@@ -969,6 +983,26 @@
       }, */
       close () {
         this.inputForm = {
+          reportReviewNo: '',
+          allPrintNum: '',
+          issueNum: '',
+          placeOnFileNum: '',
+          printedBy: '',
+          checkAutograph: '',
+          computerNo: '',
+          opinionType: '',
+          reportNo: '',
+          reportNumber: '',
+          reportType: '',
+          businessType: '',
+          auditBusinessType: '',
+          reportDate: '',
+          servedUnitName: '', // 被服务单位
+          registerAddress: '',
+          securityBusiness: '',
+          businessLocation: '',
+          auditFees: '',
+          projectId: '',
           id: '',
           createDate: '',
           createBy: {
@@ -978,15 +1012,22 @@
           remarks: '',
           documentNo: '',
           projectName: '',
-          officeId: '',
           projectNumber: '',
+          officeId: '',
           signatureAnnotator1: '',
           signatureAnnotator2: '',
           signatureType: '',
+          projectMasterId: '',
           projectMasterName: '',
+          cwProjectInfoList: [],
+          cwFileInfoList: [],
+          cwFileInfoList2: [],
+          servedUnitId: '',
+          status: '',
           realCreate: ''
         }
-        this.$refs.archiveFile.clearUpload()
+        this.$refs.enclosure.clearUpload()
+        // this.$refs.archiveFile.clearUpload()
         this.$refs.inputForm.resetFields()
         this.visible = false
       },

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

@@ -105,7 +105,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col v-if="inputForm.signatureType === '2'" :span="12">
+              <el-col v-if="inputForm.signatureType === '2' || inputForm.signatureType === '3'" :span="12">
                 <el-form-item label="签字注师1" prop="signatureAnnotator1"
                               :rules="[
                               {required: true, message:'签字注师1不能为空', trigger:'blur'}
@@ -114,7 +114,7 @@
                   <UserSelect size="medium" ref="userSelect1" :disabled="method === 'view'" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
                 </el-form-item>
               </el-col>
-              <el-col v-if="inputForm.signatureType === '2'" :span="12">
+              <el-col v-if="inputForm.signatureType === '2' || inputForm.signatureType === '3'" :span="12">
                 <el-form-item label="签字注师2" prop="signatureAnnotator2"
                               :rules="[
                               {required: true, message:'签字注师2不能为空', trigger:'blur'}
@@ -371,8 +371,16 @@
                 <el-form-item label="是否数据证券业务" prop="securityBusiness"
                               :rules="[
                    ]">
-                  <el-input v-model="inputForm.securityBusiness" placeholder="请填写是否数据证券业务" clearable>
-                  </el-input>
+                  <el-select v-model="inputForm.securityBusiness" placeholder="请选择报告类别" style="width:100%;">
+                    <el-option
+                      v-for="item in $dictUtils.getDictList('cw_report_negotiable')"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+<!--                  <el-input v-model="inputForm.securityBusiness" placeholder="请填写是否数据证券业务" clearable>-->
+<!--                  </el-input>-->
                 </el-form-item>
               </el-col>
             </el-row>
@@ -567,9 +575,13 @@
                 </el-form>
               </el-row>
             </el-tab-pane>-->
-            <el-tab-pane label="签章文件" name="archiveFile">
-              <!--        签章文件-->
-              <UpLoadComponent ref="archiveFile"></UpLoadComponent>
+<!--            <el-tab-pane label="签章文件" name="archiveFile">-->
+<!--              &lt;!&ndash;        签章文件&ndash;&gt;-->
+<!--              <UpLoadComponent ref="archiveFile"></UpLoadComponent>-->
+<!--            </el-tab-pane>-->
+            <el-tab-pane label="附件" name="enclosure">
+              <!--        附件-->
+              <UpLoadComponent2 ref="enclosure"></UpLoadComponent2>
             </el-tab-pane>
             <el-tab-pane label="已签章附件" name="signatureFile">
               <!--        附件-->
@@ -701,6 +713,7 @@
         method: '',
         loading: false,
         inputForm: {
+          projectMasterId: '',
           reviewStatus: '',
           taskName: '',
           sealType: '',
@@ -736,13 +749,14 @@
           projectMasterName: '',
           cwProjectInfoList: [],
           cwFileInfoList: [],
+          cwFileInfoList2: [],
           signatureFileList: [],
           servedUnitId: '',
           status: '',
           realCreate: ''
         },
         keyWatch: '',
-        activeName: 'archiveFile',
+        activeName: 'enclosure',
         tableKey: '',
         tableKeyClient: '1',
         tableKeyContact: '2',
@@ -762,7 +776,8 @@
     computed: {
       bus: {
         get () {
-          this.$refs.uploadComponent.setDividerName('附件', false)
+          this.$refs.enclosure.setDividerName('附件', false)
+          // this.$refs.uploadComponent.setDividerName('附件', false)
           return this.businessId
         },
         set (val) {
@@ -804,7 +819,6 @@
       //   this.$refs.upLoadComponentDialog.newUpload('view', this.inputForm.cwWorkClientContactDTOList[index].cwFileInfoList, null, null, null, null, null, false, index)
       // },
       seeFileInfoTwo (index) {
-        console.log('进来了')
         if (this.commonJS.isEmpty(this.inputForm.cwWorkClientContactDTOList[index].cwFileInfoList)) {
           this.inputForm.cwWorkClientContactDTOList[index].cwFileInfoList = []
         }
@@ -823,12 +837,13 @@
           this.title = '报告详情'
           this.method = 'view'
         }
-        this.activeName = 'archiveFile'
+        this.activeName = 'enclosure'
         this.reportReviewService = new ReportReviewService()
         this.projectRecordsService = new ProjectRecordsService()
         this.projectReportService = new ProjectReportService()
         this.method = method
         this.inputForm = {
+          projectMasterId: '',
           auditBusinessType: '',
           opinionType: '',
           reportNo: '',
@@ -857,6 +872,7 @@
           projectMasterName: '',
           cwProjectInfoList: [],
           cwFileInfoList: [],
+          cwFileInfoList2: [],
           signatureFileList: [],
           servedUnitId: '',
           status: '',
@@ -888,18 +904,18 @@
         //   // })
         // })
         this.$nextTick(() => {
-          this.$refs.archiveFile.clearUpload()
+          this.$refs.enclosure.clearUpload()
           this.$refs.signatureFile.clearUpload()
           this.$refs.inputForm.resetFields()
           this.loading = true
           this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
             this.inputForm.status = data.status
-            console.log('this.inputForm.servedUnitName', data)
+            // console.log('this.inputForm.servedUnitName', data)
             // console.log('this.inputForm.status', this.inputForm.status)
             // this.$refs.uploadComponent.clearUpload()
             this.inputForm = this.recover(this.inputForm, data)
             this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
-            console.log('this.inputForm.cwWorkClientContactDTOList', data.cwWorkClientContactDTOList)
+            // console.log('this.inputForm.cwWorkClientContactDTOList', data.cwWorkClientContactDTOList)
             if (this.commonJS.isEmpty(this.inputForm.createDate)) {
               this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
             }
@@ -912,7 +928,8 @@
             if (this.formReadOnly) {
               method = 'view'
             }
-            this.$refs.archiveFile.newUpload(method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
+            this.$refs.enclosure.newUpload(method, data.cwFileInfoList2, 'cwWorkContract', null, null, null, null, false)
+            // this.$refs.archiveFile.newUpload(method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             this.$refs.signatureFile.newUpload(method, data.signatureFileList, 'cwWorkContract', null, null, null, null, false)
             this.loading = false
           })
@@ -958,9 +975,10 @@
           // 暂存
           // this.inputForm.status = '1'
           this.loading = true
-          this.$refs.archiveFile.getDataList().then((data) => {
-            this.inputForm.cwFileInfoList = data
-          })
+          this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
+          // this.$refs.archiveFile.getDataList().then((data) => {
+          //   this.inputForm.cwFileInfoList = data
+          // })
           if (this.commonJS.isNotEmpty(this.$refs.signatureFile.getDataList())) {
             this.$refs.signatureFile.getDataList().then((data) => {
               this.inputForm.signatureFileList = data
@@ -1005,9 +1023,10 @@
               this.loading = false
               throw new Error('报告类型不能为空')
             }
-            this.$refs.archiveFile.getDataList().then((data) => {
-              this.inputForm.cwFileInfoList = data
-            })
+            this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
+            // this.$refs.archiveFile.getDataList().then((data) => {
+            //   this.inputForm.cwFileInfoList = data
+            // })
             this.$refs.signatureFile.getDataList().then((data) => {
               this.inputForm.signatureFileList = data
             })
@@ -1142,14 +1161,28 @@
           })
         })
       },
+      clearClientList () {
+        // 项目直接对接联系人列表清除
+        this.inputForm.clientList = []
+        this.$forceUpdate()
+      },
       getContract (row) {
-        this.inputForm.contractName = row.contractName
-        this.inputForm.contractAmount = row.contractAmount
-        this.inputForm.contractNum = row.contractNum
-        this.inputForm.payerSubject = row.payerSubject
-        this.inputForm.paymentMethod = row.paymentMethod
-        this.inputForm.contractId = row.id
+        this.inputForm.projectName = row.projectName // 项目名称
+        this.inputForm.projectId = row.id // 项目id
+        this.inputForm.projectNumber = row.projectNumber // 项目编号
+        this.inputForm.projectMasterName = row.projectMasterName // 项目经理
+        this.inputForm.projectMasterId = row.projectMasterId // 项目经理id
+        this.clearClientList()
+        this.$forceUpdate()
         this.inputForm.cwProjectInfoList = []
+        // this.inputForm.contractName = row.contractName
+        // this.inputForm.contractAmount = row.contractAmount
+        // this.inputForm.contractNum = row.contractNum
+        // this.inputForm.payerSubject = row.payerSubject
+        // this.inputForm.paymentMethod = row.paymentMethod
+        // this.inputForm.projectMasterId = row.projectMasterId // 项目经理id
+        // this.inputForm.contractId = row.id
+        // this.inputForm.cwProjectInfoList = []
       },
       openContract () {
         this.$refs.workContractChooseCom.init()
@@ -1194,6 +1227,50 @@
           // console.log('list.length', list.length)
           // console.log(list)
         })
+      },
+      changeSignatory1 (value) {
+        if (this.inputForm.signatureAnnotator2 === value && this.commonJS.isNotEmpty(value)) {
+          this.$message.warning('首次发行签字注师1和首次发行签字注师2不可以相同')
+          this.$nextTick(() => {
+            this.inputForm.signatureAnnotator1 = ''
+            this.$refs.userSelect1.changeNameValue('')
+            this.$refs.userSelect1.clearSelectData()
+            this.$forceUpdate()
+          })
+        } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator2) && this.inputForm.projectMasterId !== this.inputForm.signatureAnnotator2 &&
+          this.inputForm.projectMasterId !== value && this.commonJS.isNotEmpty(value)) {
+          this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
+          this.$nextTick(() => {
+            this.inputForm.signatureAnnotator1 = ''
+            this.$refs.userSelect1.changeNameValue('')
+            this.$refs.userSelect1.clearSelectData()
+            this.$forceUpdate()
+          })
+        } else {
+          this.inputForm.signatureAnnotator1 = value
+        }
+      },
+      changeSignatory2 (value) {
+        if (this.inputForm.signatureAnnotator1 === value && this.commonJS.isNotEmpty(value)) {
+          this.$message.warning('首次发行签字注师1和首次发行签字注师2不可以相同')
+          this.$nextTick(() => {
+            this.inputForm.signatureAnnotator2 = ''
+            this.$refs.userSelect2.changeNameValue('')
+            this.$refs.userSelect2.clearSelectData()
+            this.$forceUpdate()
+          })
+        } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator1) && this.inputForm.projectMasterId !== this.inputForm.signatureAnnotator1 &&
+          this.inputForm.projectMasterId !== value && this.commonJS.isNotEmpty(value)) {
+          this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
+          this.$nextTick(() => {
+            this.inputForm.signatureAnnotator2 = ''
+            this.$refs.userSelect2.changeNameValue('')
+            this.$refs.userSelect2.clearSelectData()
+            this.$forceUpdate()
+          })
+        } else {
+          this.inputForm.signatureAnnotator2 = value
+        }
       }
     }
   }

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

@@ -535,7 +535,7 @@
       // }
       // 发起复核流程
       pushF (row) {
-        console.log('row', row)
+        // console.log('row', row)
         // 读取流程表单
         let title = `发起流程【报告复核】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告复核]`

src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -335,8 +335,16 @@
               <el-form-item label="是否数据证券业务" prop="securityBusiness"
                             :rules="[
                    ]">
-                <el-input :disabled="true" v-model="inputForm.securityBusiness" placeholder="请填写是否数据证券业务" clearable>
-                </el-input>
+                <el-select v-model="inputForm.securityBusiness" placeholder="请选择报告类别" style="width:100%;">
+                  <el-option
+                    v-for="item in $dictUtils.getDictList('cw_report_negotiable')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+<!--                <el-input :disabled="true" v-model="inputForm.securityBusiness" placeholder="请填写是否数据证券业务" clearable>-->
+<!--                </el-input>-->
               </el-form-item>
             </el-col>
           </el-row>
@@ -566,9 +574,13 @@
           </el-form>
         </el-form>
         <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
-          <el-tab-pane label="签章文件" name="archiveFile">
-            <!--        签章文件-->
-            <UpLoadComponent ref="archiveFile"></UpLoadComponent>
+<!--          <el-tab-pane label="签章文件" name="archiveFile">-->
+<!--            &lt;!&ndash;        签章文件&ndash;&gt;-->
+<!--            <UpLoadComponent ref="archiveFile"></UpLoadComponent>-->
+<!--          </el-tab-pane>-->
+          <el-tab-pane label="附件" name="enclosure">
+            <!--        附件-->
+            <UpLoadComponent ref="enclosure"></UpLoadComponent>
           </el-tab-pane>
         </el-tabs>
       </el-col>
@@ -582,7 +594,8 @@
 <script>
   import ProjectRecoredChooseCom from '../../projectRecords/ProjectRecordsChooseCom'
   import ReportServiceUnitForm from '../ReportServiceUnitForm'
-  import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
+  import UpLoadComponent from '@/views/common/UpLoadComponent'
+  // import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import UserSelect from '../../workClientInfo/clientUserSelect'
@@ -672,7 +685,7 @@
           taskName: ''
         },
         keyWatch: '',
-        activeName: 'archiveFile',
+        activeName: 'enclosure',
         tableKey: '',
         tableKeyClient: '1',
         tableKeyClient2: '1',
@@ -696,7 +709,7 @@
     computed: {
       bus: {
         get () {
-          this.$refs.archiveFile.setDividerName('签章文件', false)
+          this.$refs.enclosure.setDividerName('附件', false)
           return this.businessId
         },
         set (val) {
@@ -731,7 +744,7 @@
         this.keyWatch = keyWatch
       },
       init (method, id) {
-        this.activeName = 'archiveFile'
+        this.activeName = 'enclosure'
         // this.projectReportService = new ProjectReportService()
         this.reportCancellApplyService = new ReportCancellApplyService()
         this.reportReviewService = new ReportReviewService()
@@ -798,7 +811,7 @@
         }
         this.inputForm.id = id
         this.loading = false
-        this.$refs.archiveFile.clearUpload()
+        this.$refs.enclosure.clearUpload()
         this.reviewBys = []
         this.$nextTick(() => {
           // this.$refs.inputForm.resetFields()
@@ -827,7 +840,8 @@
               }
               this.reviewBys.push(va)
             })
-            this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
+            this.$refs.enclosure.newUpload('view', data.cwFileInfoList2, 'cwWorkContract', null, null, null, null, false)
+            // this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             this.loading = false
           })
         })
@@ -933,7 +947,7 @@
             if (this.commonJS.isEmpty(this.inputForm.createDate)) {
               this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
             }
-            console.log('this.inputForm.reviewBy', this.inputForm.reviewBy)
+            // console.log('this.inputForm.reviewBy', this.inputForm.reviewBy)
             this.inputForm.assignee = this.inputForm.reviewBy
             // 列表处理
             this.inputForm.details = []
@@ -968,14 +982,14 @@
                   }
                 })
                 param = {reviewStatus: this.inputForm.reviewStatus, id: this.inputForm.id}
-                this.reportReviewService.updateStatusById(param).then(() => {
+                this.reportReviewService.updateReviewStatysByReportId(param).then(() => {
                   callback()
                 })
               }
               if (type === 'reback') {
                 // 撤回
                 let param = {reviewStatus: '3', id: this.inputForm.id}
-                this.reportReviewService.updateStatusById(param)
+                this.reportReviewService.updateReviewStatysByReportId(param)
               }
             }
           })
@@ -987,7 +1001,7 @@
             } else {
               // 终止
               let param = {reviewStatus: '1', id: this.inputForm.id}
-              this.reportReviewService.updateStatusById(param).then(() => {
+              this.reportReviewService.updateReviewStatysByReportId(param).then(() => {
                 callback()
               })
             }
@@ -1022,7 +1036,7 @@
         this.reviewBys = []
         // this.$refs.uploadComponent.clearUpload()
         // this.$refs.inputForm.resetFields()
-        this.$refs.archiveFile.clearUpload()
+        this.$refs.enclosure.clearUpload()
       },
       tabHandleClick (event) {
         // console.log(event)

src/views/modules/cw/workContract/ContractRegistration.vue

@@ -55,16 +55,16 @@
           @getValue="(value) => {searchForm.department=value}"/>
       </el-form-item>
 
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="searchForm.status" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in $dictUtils.getDictList('cw_status')"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="状态" prop="status">-->
+<!--        <el-select v-model="searchForm.status" placeholder="请选择" style="width:100%;">-->
+<!--          <el-option-->
+<!--            v-for="item in $dictUtils.getDictList('cw_status')"-->
+<!--            :key="item.value"-->
+<!--            :label="item.label"-->
+<!--            :value="item.value">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
 
 <!--      <el-form-item label="电子归档" prop="filedType">-->
 <!--        <el-select v-model="searchForm.filedType" placeholder="请选择" style="width:100%;">-->
@@ -135,11 +135,11 @@
           <vxe-column width="200px" title="所属部门" field="departmentName"></vxe-column>
           <vxe-column width="200px" title="创建人" field="createBy"></vxe-column>
           <vxe-column width="200px" title="创建日期" field="createDate"></vxe-column>
-          <vxe-column width="200px" title="状态" field="status">
-            <template slot-scope="scope">
-              <el-button  type="text" @click="detail(scope.row)" :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("cw_status", scope.row.status, '-')}} </el-button>
-            </template>
-          </vxe-column>
+<!--          <vxe-column width="200px" title="状态" field="status">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button  type="text" @click="detail(scope.row)" :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("cw_status", scope.row.status, '-')}} </el-button>-->
+<!--            </template>-->
+<!--          </vxe-column>-->
 <!--          <vxe-column width="200px" title="电子归档" field="filedType">-->
 <!--            <template slot-scope="scope">-->
 <!--              <el-button  type="text" @click="detailFiled(scope.row)" :type="$dictUtils.getDictLabel('filed_type_status', scope.row.filedType, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("filed_type", scope.row.filedType, '未归档')}} </el-button>-->
@@ -173,11 +173,11 @@
               <!--归档撤回-->
 <!--              <el-button v-if="hasPermission('cw:workContract:back') && scope.row.status === '5' && scope.row.filedType === '2'" type="text"  size="small" @click="rebackFiled(scope.row)">撤回</el-button>-->
               <!--合同借用-->
-              <el-button v-if="hasPermission('cw:workContract:borrow') && scope.row.status === '5' && (scope.row.borrowType === undefined || scope.row.borrowType === '0' || scope.row.borrowType === '1')" type="text" size="small" @click="borrow(scope.row.id)">借用</el-button>
+              <el-button v-if="hasPermission('cw:workContract:borrow') && scope.row.status === '5' && scope.row.filedPaperType === '5' && (scope.row.borrowType === undefined || scope.row.borrowType === '0' || scope.row.borrowType === '1')" type="text" size="small" @click="borrow(scope.row.id)">借用</el-button>
               <!--借用撤回-->
-              <el-button v-if="hasPermission('cw:workContract:back') && scope.row.status === '5' && scope.row.borrowType === '2'" type="text" size="small" @click="rebackBorrow(scope.row)">撤回</el-button>
+              <el-button v-if="hasPermission('cw:workContract:back') && scope.row.status === '5' && scope.row.filedPaperType === '5' && scope.row.borrowType === '2'" type="text" size="small" @click="rebackBorrow(scope.row)">撤回</el-button>
               <!--借用归还-->
-              <el-button v-if="hasPermission('cw:workContract:reture') && scope.row.status === '5'  && scope.row.borrowType === '5'" type="text" size="small" @click="retureBorrow(scope.row)">归还合同</el-button>
+              <el-button v-if="hasPermission('cw:workContract:reture') && scope.row.status === '5' && scope.row.filedPaperType === '5'  && scope.row.borrowType === '5'" type="text" size="small" @click="retureBorrow(scope.row)">归还合同</el-button>
 
               <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && (scope.row.filedPaperType === '0' || scope.row.filedPaperType === undefined)" type="text" size="small" @click="paperFiled(scope.row.id)">纸质归档</el-button>
               <!--纸质归档暂存修改-->
@@ -203,7 +203,7 @@
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <ContractNameForm ref="contractNameForm"></ContractNameForm>
-    <ContractAddForm ref="contractAddForm"></ContractAddForm>
+    <ContractAddForm ref="contractAddForm" @refreshDataList="refreshList"></ContractAddForm>
     <WorkClientForm ref="workClientForm" @refreshDataList="refreshList"></WorkClientForm>
     <WorkContractBorrowMessageForm ref="workContractBorrowMessageForm" @refreshDataList="refreshList"></WorkContractBorrowMessageForm>
   </div>

src/views/modules/cw/workContract/contractRegisitionAddForm/ContractAddForm.vue

@@ -566,7 +566,7 @@
         }
         this.inputForm.id = id
         if (method === 'add') {
-          this.title = `新建合同登记`
+          this.title = `合同登记新建`
         } else if (method === 'edit') {
           this.title = '修改合同登记'
         } else if (method === 'view') {
@@ -643,6 +643,7 @@
               // this.inputForm.contractInfoList = this.$refs.archiveFile.getDataList()
               this.contractInfoService.save(this.inputForm).then(({data}) => {
                 this.loading = false
+                this.$emit('refreshDataList')
                 this.close()
               }).catch(() => {
                 this.$refs.inputForm.resetFields()