修改签字注师流程,客户登记拥有人

src/api/cw/reportManagement/ProjectReportService.js

@@ -87,6 +87,14 @@ export default {
     })
   },
 
+saveSignatureAnnotator: function (inputForm) {
+	return request({
+		url: prefix + '/cwProjectReport/saveSignatureAnnotator',
+		method: 'post',
+		data: inputForm
+	})
+},
+
   exportExcel: function (params) {
     return request({
       url: prefix + '/cwProjectReport/export',
@@ -159,5 +167,12 @@ export default {
       method: 'get',
       params: {reportId: id}
     })
+  },
+  findByReportId:function (id) {
+	return request({
+		url: prefix + '/cwProjectReport/getSignatureAnnotatorList',
+		method: 'get',
+		params: {reportId: id}
+	})
   }
 }

src/views/cw/reportManagement/ReportManagementList.vue

@@ -174,6 +174,14 @@
               </el-button>
             </template>
           </vxe-column>
+			<vxe-column  min-width="120px" align="center" fixed="right" title="修改注师" field="signatureAnnotatorStatus" >
+				<template #default="scope">
+					<el-button @click="detailSig(scope.row)" effect="dark"
+							   :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.signatureAnnotatorStatus, '-')">
+						{{$dictUtils.getDictLabel("cw_status", scope.row.signatureAnnotatorStatus, '-')}}
+					</el-button>
+				</template>
+			</vxe-column>
 
           <vxe-column title="操作" width="200px" fixed="right" align="center">
             <template  #default="scope">
@@ -242,6 +250,24 @@
                           (scope.row.signatureType === '3' && scope.row.status3 === '4')
                           )
                           && scope.row.createById === $store.state.user.id" @click="adjustSign(scope.row)"   text type="primary" >驳回调整</el-button>
+				<!--			   	修改签字注师流程-->
+			    <el-button
+					v-if="scope.row.reviewStatus === '5'&&(scope.row.status1 === '5' || scope.row.status3 === '5')"
+					text type="primary"
+					@click="updateSignatureAnnotator(scope.row)"
+				>修改签字注师</el-button>
+				<!--				  审核-->
+				  <el-button
+					  v-if="scope.row.signatureAnnotatorStatus === '2'&& checkIsAuditSign(scope.row)"
+					  text type="primary"
+					  @click="pushSig(scope.row)"
+				  >签字注师审核</el-button>
+				  <!--				  被驳回后当前申请人重新调整-->
+				  <el-button
+					  v-if="scope.row.signatureAnnotatorStatus === '4'&& scope.row.createById === $store.state.user.id"
+					  text type="primary"
+					  @click="adjustSig(scope.row)"
+				  >签字注师驳回调整</el-button>
               </div>
             </template>
           </vxe-column>
@@ -317,7 +343,9 @@
         procDefSKey2: '',
         processDefinitionSId3: '',
         procDefSKey3: '',
-        haveProjectIds: ''
+        haveProjectIds: '',
+	    processDefinitionSigId: '',
+	    procDefSigKey: '',
       }
     },
     reportReviewService: null,
@@ -439,6 +467,12 @@
             this.procDefSKey3 = data.key
           }
         })
+	    processService.getByName('报告-修改签字注师').then((data) => {
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionSigId = data.id
+				  this.procDefSigKey = data.key
+			  }
+	    })
       },
       // 当前页
       currentChangeHandle ({ currentPage, pageSize }) {
@@ -1045,7 +1079,133 @@
           }
         }
         return false
-      }
+      },
+		//发起修改签字注师流程
+		updateSignatureAnnotator(row){
+			// 读取流程表单
+			let title = `发起流程【报告-修改签字注师】`
+			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告-修改签字注师]`
+			let status = 'startAndClose'
+			 if (row.status === '4') {
+				status = 'reapply'
+			}
+			taskService.getTaskDef({ procDefId: this.processDefinitionSigId,
+				businessId: row.id,
+				businessTable: 'cw_project_report'}).then((data) => {
+					console.log(data)
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						procDefId: this.processDefinitionSigId,
+						procDefKey: this.procDefSigKey,
+						title: title,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessTable: 'cw_work_client_base',
+						businessId: row.id,
+						isShow: 'false',
+						status: status,
+						routePath: '/cw/reportManagement/ReportManagementList'
+					}
+				})
+			})
+		},
+		//查看报告-修改签字注师流程信息
+		detailSig(row){
+      	console.log(row)
+			if (row.signatureAnnotatorStatus !== '0' && row.signatureAnnotatorStatus !== '1') {
+				// eslint-disable-next-line eqeqeq
+				taskService.getTaskDef({
+					procInsId: row.procInsId,
+					procDefId: this.processDefinitionSigId
+				}).then((data) => {
+					this.$router.push({
+						path: '/flowable/task/TaskFormDetail',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+							isShow: 'false',
+							readOnly: true,
+							title: '报告-修改签字注师' + '流程详情',
+							formTitle: '报告-修改签字注师' + '流程详情',
+							businessId: row.id,
+							status: 'reback',
+							sigId:row.id
+						}
+					})
+				})
+			}
+		},
+		//审核报告-修改签字注师
+		pushSig(row){
+			let title = ' '
+			if (!row.documentNo) {
+				title = ' ' + row.projectName
+			} else {
+				title = ' ' + row.documentNo + ' - ' + row.projectName
+			}
+			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了` + title + '[报告-修改签字注师]'
+			let status = 'startAndClose'
+			if (row.reviewStatus === '3') {
+				status = 'startAndClose'
+			} else if (row.reviewStatus === '4') {
+				status = 'reapplyFlag'
+			}
+			taskService.getTaskDef({ procDefId: this.processDefinitionSigId,
+				businessId: row.id,
+				businessTable: 'cw_project_report'}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						procDefId: this.processDefinitionSigId,
+						procDefKey: this.procDefSigKey,
+						title: title,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessTable: 'cw_project_report',
+						businessId: row.id,
+						isShow: 'false',
+						status: status,
+						routePath: '/cw/reportManagement/ReportManagementList'
+					}
+				})
+			})
+		},
+		//修改签字注师驳回后调整
+		adjustSig(row){
+			projectReportService.queryById(row.id).then((data) => {
+				if (data.signatureAnnotatorStatus !== '4') { // status的值不等于“驳回”，就弹出提示
+					this.$message.error('数据已发生改变或不存在，请刷新数据')
+					this.refreshList()
+				} else {
+					this.updateSignatureAnnotator(row)
+				}
+			})
+  		},
+		//驳回后重新调整
+		todoSig(row){
+      	console.log(row)
+			let cUser = false
+			taskService.getTaskDefInfo({
+				taskId: row.taskId
+			}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId'),
+						isShow: false,
+						formReadOnly: true,
+						formTitle: `${data.taskName}`,
+						cUser: cUser,
+						title: `审批【${data.taskName || ''}】`,
+						routePath: '/cw/reportManagement/ReportManagementList'   // 数据处理后需要跳转的页面路径
+					}
+				})
+			})
+		}
     }
   }
 </script>

src/views/cw/workClientInfo/WorkClientList.vue

@@ -165,7 +165,7 @@
           <vxe-column min-width="120" align="center" title="拥有人" fixed="right" field="updateUserName">
             <template #default="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cw_work_client:info:view')" @click="updateLog(scope.row.id)">{{scope.row.updateUserName}}</el-link>
-              <span v-else>{{scope.row.updateUserName}}</span>
+<!--              <span v-else>{{scope.row.updateUserName}}</span>-->
             </template>
           </vxe-column>
           <vxe-column  min-width="100px" align="center" fixed="right" title="修改申请状态" field="status" >

src/views/flowable/task/TaskForm.vue

@@ -689,6 +689,7 @@ export default {
 		// Process_1667894339167 会计-合同登记
 		// Process_1678692643340 会计-项目报告归档-苏州分部
 		// Process_1683767097901 物资管理-领用退回申请
+		// Process_1694762268070 报告-修改签字注师
 
 		// 驳回
 		reject(vars) {
@@ -726,7 +727,8 @@ export default {
 				this.procDefId.includes('Process_1673924346231') ||
 				this.procDefId.includes('Process_1667894339167') ||
 				this.procDefId.includes('Process_1678692643340') ||
-				this.procDefId.includes('Process_1683767097901')
+				this.procDefId.includes('Process_1683767097901') ||
+				this.procDefId.includes('Process_1694762268070')
 			) {
 				console.log('进入新版驳回')
 				this.$confirm(`确定驳回流程吗?`, '提示', {

src/views/flowable/task/TaskFormDetail.vue

@@ -134,6 +134,22 @@
 					</vxe-column>
 				</vxe-table>
 			</el-tab-pane>
+			<el-tab-pane label="修改签字注师历史" v-if="sigId" name="form-eighth">
+				<vxe-table
+					ref="sigTable"
+					border="inner"
+					:key="111"
+					size="small"
+					class="vxe-table-element"
+					max-height="1000px"
+					:data="sigHiCollect">
+					<vxe-column type="seq" width="60" title="序号"></vxe-column>
+					<vxe-column min-width="160" align="center" title="签字注师1" field="signatureAnnotator1"></vxe-column>
+					<vxe-column min-width="160" align="center" title="签字注师2" field="signatureAnnotator2"></vxe-column>
+					<vxe-column min-width="160" align="center" title="修改人" field="userName"></vxe-column>
+					<vxe-column min-width="160" align="center" title="创建时间" field="createTime"></vxe-column>
+				</vxe-table>
+			</el-tab-pane>
 		</el-tabs>
 		<WareHouseHi ref="wareHouseHi"></WareHouseHi>
 		<CollectReturnHi ref="collectReturnHi"></CollectReturnHi>
@@ -154,6 +170,7 @@ import WareHouseHi from '@/views/materialManagement/wareHouse/WareHouseHi'
 import CollectReturnHi from '@/views/materialManagement/collect/CollectReturnHiForm'
 import CollectService from '@/api/materialManagement/CollectService'
 import WareHouseService from '@/api/materialManagement/WareHouseService'
+import projectReportService from '@/api/cw/reportManagement/ProjectReportService'
 export default {
 	collectService: null,
 	wareHouseService: null,
@@ -241,8 +258,8 @@ export default {
 			this.procInsId = this.$route.query.procInsId;
 			this.returnId = this.$route.query.returnId
 			this.wareHouseId = this.$route.query.wareHouseId
+			this.sigId=this.$route.query.sigId
 			this.formReadOnly = true;
-
 			let _this = this
 			setTimeout(function () {
 				try {
@@ -270,6 +287,13 @@ export default {
 					})
 				}
 			}
+			if (event.props.name === 'form-eighth') {
+				if (this.commonJS.isNotEmpty(this.sigId)) {
+					projectReportService.findByReportId(this.sigId).then((data) => {
+						this.sigHiCollect = data
+					})
+				}
+			}
 		},
 		// 打开入库修改历史详情页
 		hiDetail (row) {
@@ -305,7 +329,9 @@ export default {
 			returnId: "",
 			wareHouseId: '',
 			dataListHi: [],
-			dataListHiCollect: []
+			dataListHiCollect: [],
+			sigId:'',
+			sigHiCollect:[],
 		};
 	},
 };

src/views/flowable/task/TodoList.vue

@@ -208,6 +208,12 @@ export default {
 			visible: false,
 			currentTask: null,
 			processInstanceId: "",
+			searchParams:{
+				title: "",
+				assigneeId: "",
+				searchDates: "",
+				// pageSize:JSON.parse(sessionStorage.getItem('nowPageData'))?.pageSize || 1
+			}
 		};
 	},
 	activated() {
@@ -257,6 +263,18 @@ export default {
 					this.loading = false;
 				});
 			console.log(this.searchForm.assigneeId)
+			//判断sessionStorage中是否有值
+			if (JSON.stringify(sessionStorage)!=='{}'){
+				//从sessionStorage中取出值
+				let _obj = JSON.parse(sessionStorage.getItem('nowPageData'));
+				//对sessionStorage中的值进行遍历
+				Object.keys(this.searchParams).forEach((key) => {
+					//将遍历后的值赋给当前页的筛选项
+					this.searchParams[key] = _obj[key] || this.searchParams[key];
+				});
+				// 数据存放之后，清除缓存
+				sessionStorage.removeItem('nowPageData');
+			}
 		},
 		// 当前页
 		currentChangeHandle({ currentPage, pageSize }) {
@@ -265,6 +283,9 @@ export default {
 			this.refreshList();
 		},
 		todo(row) {
+			//页面跳转后返回当前页筛选项仍保留
+			let _data = Object.assign(this.searchParams, {});//将筛选项存入到data中
+			sessionStorage.setItem('nowPageData', JSON.stringify(_data));//存入到sessionStorage中
 			taskService
 				.getTaskDef({
 					taskId: row.task.id,

src/views/workClient/WorkClientForm.vue

@@ -85,8 +85,9 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="统一社会信用代码" prop="workClientInfo.uscCode" v-if="inputForm.workClientInfo.hasUscc === '1'">
+          <el-col :span="12" v-if="inputForm.workClientInfo.hasUscc === '1'">
+            <el-form-item label="统一社会信用代码"
+						  prop="workClientInfo.uscCode">
               <el-input maxlength="64" v-model="inputForm.workClientInfo.uscCode" placeholder="请输入统一社会信用代码"></el-input>
             </el-form-item>
           </el-col>
@@ -349,7 +350,7 @@
   export default {
     data () {
       let checkUscCode = (rule, value, callback) => {
-        this.haveUscCode(value, callback)
+			this.haveUscCode(value, callback)
       }
       let checkWorkClient = (rule, value, callback) => {
         this.haveWorkClient(value, callback)
@@ -683,16 +684,18 @@
       },
       // 表单提交
       doSubmit () {
-        if (!this.commonJS.isEmpty(this.inputForm.workClientInfo.uscCode)) {
-          this.workClientService.haveUscCode(this.inputForm.id, this.inputForm.workClientInfo.uscCode).then((data) => {
-            if (!data) {
-              this.$message.error('该统一社会信用代码已存在')
-            }
-          })
-        } else {
-          this.$message.error('统一社会信用代码为空')
-          return
-        }
+      	if (this.inputForm.workClientInfo.hasUscc === '1'){
+			if (!this.commonJS.isEmpty(this.inputForm.workClientInfo.uscCode)) {
+				this.workClientService.haveUscCode(this.inputForm.id, this.inputForm.workClientInfo.uscCode).then((data) => {
+					if (!data) {
+						this.$message.error('该统一社会信用代码已存在')
+					}
+				})
+			} else {
+				this.$message.error('统一社会信用代码为空')
+				return
+			}
+		}
         if (!this.commonJS.isEmpty(this.inputForm.workClientInfo.name)) {
           this.workClientService.haveWorkClient(this.inputForm.id, this.inputForm.workClientInfo.name).then((data) => {
             if (!data) {