签章流程修改

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

@@ -82,7 +82,6 @@
           <el-col :span="12">
             <el-form-item label="盖章类型" prop="signatureType"
                           :rules="[
-                              {required: true, message: '盖章类型不能为空', trigger: 'change'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureType" placeholder="请填写盖章类型" clearable></el-input>-->
               <el-select v-model="inputForm.signatureType" placeholder="请选择盖章类型" clearable style="width: 100%;">

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

@@ -144,49 +144,44 @@
                           :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status1, '-')">
                 {{$dictUtils.getDictLabel("cw_status", scope.row.status1, '-')}}
               </el-button>
-              <el-button v-if="scope.row.signatureType === '2'" type="text" @click="detailS2(scope.row)" effect="dark" size="mini"
+              <el-button v-else-if="scope.row.signatureType === '2'" type="text" @click="detailS2(scope.row)" effect="dark" size="mini"
                           :type="$dictUtils.getDictLabel('cw_project_report_sign_status_flag', scope.row.status2, '-')">
                 {{$dictUtils.getDictLabel("cw_project_report_sign_status", scope.row.status2, '-')}}
               </el-button>
-              <el-button v-if="scope.row.signatureType === '3'" type="text" @click="detailS3(scope.row)" effect="dark" size="mini"
-                         :type="$dictUtils.getDictLabel('cw_project_report_sign_status_flag', scope.row.status3, '-')">
-                {{$dictUtils.getDictLabel("cw_project_report_sign_status", scope.row.status3, '-')}}
+              <el-button v-else-if="scope.row.signatureType === '3'" type="text" @click="detailS3(scope.row)" effect="dark" size="mini"
+                         :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status3, '-')">
+                {{$dictUtils.getDictLabel("cw_status", scope.row.status3, '-')}}
+              </el-button>
+              <el-button v-else effect="dark" size="mini" >
+                未发起
               </el-button>
             </template>
           </vxe-column>
 
           <vxe-column title="操作" width="200px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="isAdmin" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="isAdmin && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
               <el-button v-else-if="hasPermission('cwProjectReport:edit')&&
                               (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId))&&
                               scope.row.status === '5'&&
-                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '5' || commonJS.isEmpty(scope.row.reviewStatus)) &&
-                              (
-                              (scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3' )) ||
-                              (scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3' )) ||
-                              (scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3' ))
-                              )
-                              " type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-if="isAdmin" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))"
+                         type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+
+              <el-button v-if="isAdmin && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
               <el-button v-else-if="hasPermission('cwProjectReport:del')&&
                               (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId))&&
                               scope.row.status === '5'&&
-                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '5' || commonJS.isEmpty(scope.row.reviewStatus)) &&
-                              (
-                              (scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3' )) ||
-                              (scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3' )) ||
-                              (scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3' ))
-                              )
-                              " type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))"
+                         type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+
 <!--              复核流程-->
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" type="text" size="small" @click="pushF(scope.row)">复核</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& scope.row.reviewStatus === '2'" type="text" size="small" @click="rebackF(scope.row)">撤回复核申请</el-button>
 <!--              公章流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3')" type="text" size="small" @click="pushS(scope.row)">公章</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3')" type="text" size="small" @click="pushS(scope.row)">签章</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && scope.row.status1 === '2'" type="text" size="small" @click="rebackS(scope.row)">撤回签章申请</el-button>
 <!--              实体章流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3')" type="text" size="small" @click="pushS3(scope.row)">实体章</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3')" type="text" size="small" @click="pushS3(scope.row)">签章</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '2' || scope.row.status3 === '6' || scope.row.status3 === '7')" type="text" size="small" @click="rebackS3(scope.row)">撤回签章申请</el-button>
 <!--              公章+执业章流程-->
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3')" type="text" size="small" @click="pushS2(scope.row)">公章+执业章</el-button>
@@ -256,6 +251,8 @@
         procDefSKey: '',
         processDefinitionSId2: '',
         procDefSKey2: '',
+        processDefinitionSId3: '',
+        procDefSKey3: '',
         haveProjectIds: ''
       }
     },
@@ -366,6 +363,12 @@
             this.procDefSKey2 = data.key
           }
         })
+        this.processService.getByName('财务-报告签章-实体章').then(({data}) => {
+          if (!this.commonJS.isEmpty(data.id)) {
+            this.processDefinitionSId3 = data.id
+            this.procDefSKey3 = data.key
+          }
+        })
       },
       // 当前页
       currentChangeHandle ({ currentPage, pageSize }) {
@@ -625,23 +628,23 @@
       },
       pushS3 (row) {
         // 读取流程表单
-        let title = `发起流程【报告签章-实体章】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-实体章]`
+        let title = `发起流程【报告签章-实体公章】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-实体公章]`
         let status = 'startAndClose'
         if (row.status3 === '3') {
           status = 'startAndClose'
         } else if (row.status3 === '4') {
           status = 'reapplyFlag'
         }
-        this.taskService.getTaskDef({ procDefId: this.processDefinitionSId2,
+        this.taskService.getTaskDef({ procDefId: this.processDefinitionSId3,
           businessId: row.sid3,
           businessTable: 'cw_project_report_signature'}).then((data) => {
             this.$router.push({
               path: '/flowable/task/TaskForm',
               query: {
                 ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
-                procDefId: this.processDefinitionSId2,
-                procDefKey: this.procDefSKey2,
+                procDefId: this.processDefinitionSId3,
+                procDefKey: this.procDefSKey3,
                 title: title,
                 formType: data.data.formType,
                 formUrl: data.data.formUrl,
@@ -684,7 +687,7 @@
           // eslint-disable-next-line eqeqeq
           this.taskService.getTaskDef({
             procInsId: row.procInsIds3,
-            procDefId: this.processDefinitionSId2
+            procDefId: this.processDefinitionSId3
           }).then(({data}) => {
             this.$router.push({
               path: '/flowable/task/TaskFormDetail',
@@ -692,8 +695,8 @@
                 ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
-                title: '报告签章-实体章' + '流程详情',
-                formTitle: '报告签章-实体章' + '流程详情',
+                title: '报告签章-实体公章' + '流程详情',
+                formTitle: '报告签章-实体公章' + '流程详情',
                 businessId: row.sid3,
                 status: 'reback'
               }

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

@@ -753,8 +753,10 @@
               this.method = 'false'
             }
             if (this.commonJS.isNotEmpty(this.inputForm.signatureContractId) && this.status === 'audit' && this.commonJS.isNotEmpty(sFiles) && this.inputForm.signatureType !== '3') {
+              // 签章按钮展示
               this.$refs.archiveFile.newUpload(this.method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false, 'audit')
             } else {
+              // 签章按钮隐藏
               this.$refs.archiveFile.newUpload(this.method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             }
             this.loading = false
@@ -815,7 +817,7 @@
                 let da = {cwFileInfoList: this.inputForm.cwFileInfoList, id: this.inputForm.id}
                 this.projectReportService.saveSignFiles(da).then(() => {
                   this.projectReportService.saveData(this.inputForm).then(({data}) => {
-                    if (this.inputForm.signatureType === '2' || this.inputForm.signatureType === '3') {
+                    if (this.inputForm.signatureType === '2') {
                       this.inputForm.assignee = this.inputForm.signatureAnnotator1
                     }
                     callback(data.businessTable, data.businessId, this.inputForm)
@@ -936,27 +938,13 @@
                       let da = {cwFileInfoList: this.inputForm.cwFileInfoList, id: this.inputForm.id}
                       this.projectReportService.saveSignFiles(da).then(() => {
                         this.projectReportService.getAuditNodeByReportId(this.inputForm.sid3).then(({data}) => {
-                          if (data.signatureType === '签字注师1审核') {
-                            let param = {status: '6', id: this.inputForm.sid3}
-                            this.projectReportService.updateSignatureStatusById(param)
-                            this.inputForm.assignee = this.inputForm.signatureAnnotator2
-                            let table = 'cw_project_report_signature'
-                            callback(table, this.inputForm.sid3, this.inputForm)
-                          }
-                          if (data.signatureType === '签字注师2审核') {
-                            let param = {status: '7', id: this.inputForm.sid3}
-                            this.projectReportService.updateSignatureStatusById(param)
-                            callback()
-                          }
-                          if (data.signatureType === '签章管理人审核') {
-                            console.log('签章管理人审核')
-                            let param = {status: '5', id: this.inputForm.sid3}
-                            this.projectReportService.updateSignatureStatusById(param).then(() => {
-                              this.projectReportService.saveReportArchive(this.inputForm.id).then(() => {
-                                callback()
-                              })
+                          let param = {status: '5', id: this.inputForm.sid3}
+                          this.projectReportService.updateSignatureStatusById(param).then(() => {
+                            this.projectReportService.saveReportArchive(this.inputForm.id).then(() => {
+                              let table = 'cw_project_report_signature'
+                              callback(table, this.inputForm.sid3, this.inputForm)
                             })
-                          }
+                          })
                         })
                       })
                     })

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

@@ -71,6 +71,7 @@
             <el-col :span="12">
               <el-form-item label="盖章类型" prop="signatureType"
                             :rules="[
+                            {required: true, message: '盖章类型不能为空', trigger: 'change'}
                    ]">
                 <!--                <el-input v-model="inputForm.signatureType" placeholder="请填写盖章类型" clearable></el-input>-->
                 <el-select  v-model="inputForm.signatureType" placeholder="请选择盖章类型" clearable style="width: 100%;">

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

@@ -44,7 +44,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="委托方电话" prop="clientContactsPhone"
-                              :rules="[{required: true, message: '委托方电话', trigger: 'blur'}
+                              :rules="[
                        ]">
                   <el-input maxlength="15" :disabled="true" v-model="inputForm.clientContactsPhone" placeholder="请输入委托方电话"
                             @keyup.native="inputForm.clientContactsPhone = twoDecimalPlaces(inputForm.clientContactsPhone)"
@@ -895,9 +895,9 @@
           throw new Error()
         } else {
           if (status === 'save') {
-            this.loading = true
             this.$refs['inputForm'].validate((valid) => {
               if (valid) {
+                this.loading = true
                 if (this.inputForm.filedPaperType !== '0' & this.inputForm.filedPaperType !== '') {
                   if (this.inputForm.filedNo === '' || this.inputForm.filedNo === undefined) {
                     this.loading = false

src/views/modules/flowable/task/TaskForm.vue

@@ -469,6 +469,7 @@
       // Process_1665383385070 评估-报销申请
       // Process_1665628043339 评估-发票作废
       // Process_1665458731435 评估-发票申请
+      // Process_1673332958749 财务-报告签章-实体章
       // 驳回
       reject (vars) {
         if (this.procDefId.includes('Process_1667978088459') ||
@@ -495,7 +496,8 @@
           this.procDefId.includes('Process_1666332258192') ||
           this.procDefId.includes('Process_1665383385070') ||
           this.procDefId.includes('Process_1665628043339') ||
-          this.procDefId.includes('Process_1665458731435')
+          this.procDefId.includes('Process_1665458731435') ||
+          this.procDefId.includes('Process_1673332958749')
         ) {
           console.log('进入新版驳回')
           this.$confirm(`确定驳回流程吗?`, '提示', {