报告签发

src/views/flowable/task/TaskForm.vue

@@ -700,6 +700,7 @@ export default {
 		// Process_1697679946239 嘉溢-项目一级校审
 		// Process_1697680274149 嘉溢-项目二级校审
 		// Process_1697680423391 嘉溢-项目三级校审
+		// Process_1698644849993 嘉溢-项目外审
 
 		// 驳回
 		reject(vars) {
@@ -744,7 +745,8 @@ export default {
 				this.procDefId.includes('Process_1697425720571') ||
 				this.procDefId.includes('Process_1697679946239') ||
 				this.procDefId.includes('Process_1697680274149') ||
-				this.procDefId.includes('Process_1697680423391')
+				this.procDefId.includes('Process_1697680423391') ||
+				this.procDefId.includes('Process_1698644849993')
 			) {
 				console.log('进入新版驳回')
 				this.$confirm(`确定驳回流程吗?`, '提示', {

src/views/jy/project/ProjectAuditForm.vue

@@ -425,6 +425,10 @@
 					this.loading = true
 					this.inputForm.status = '1'
 					this.inputForm.workAttachmentDtoList = this.$refs.uploadComponent.getDataList()
+					if (this.commonJS.isEmpty(this.inputForm.auditPeople)) {
+						this.$message.error('请选择审核人')
+						this.loading = false
+					}
 					this.projectInfoService.saveFormThree(this.inputForm).then((data) => {
 						this.inputForm.assignee = this.inputForm.auditPeople
 						callback(data.businessTable, data.businessId, this.inputForm)
@@ -445,6 +449,10 @@
 					if (valid) {
 						this.loading = true
 						this.inputForm.workAttachmentDtoList = this.$refs.uploadComponent.getDataList()
+						if (this.commonJS.isEmpty(this.inputForm.auditPeople)) {
+							this.$message.error('请选择审核人')
+							this.loading = false
+						}
 						this.projectInfoService.saveFormThree(this.inputForm).then((data) => {
 							this.inputForm.assignee = this.inputForm.auditPeople
 							this.inputForm.id = data.businessId
@@ -525,6 +533,7 @@
 				this.loading = true
 				if (this.tabName === '一级校审') {
 					this.projectInfoService.downloadFirstAuditTpl(this.inputForm.id, this.inputForm.projectId).then((res) => {
+						console.log('hh',res)
 						// 将二进制流文件写入excel表，以下为重要步骤
 						this.$utils.downloadWord(res, this.tabName)
 						this.loading = false

src/views/jy/project/ProjectDia.vue

@@ -306,6 +306,9 @@
 			  <el-tab-pane label="三级校审" name="thirdAudit" >
 				  <ProjectAuditForm ref="thirdAudit3" :formReadOnly="true"></ProjectAuditForm>
 			  </el-tab-pane>
+			  <el-tab-pane label="报告签发" name="reportIssuance">
+				  <SignetAddForm ref="signetAddForm" :formReadOnly="true"></SignetAddForm>
+			  </el-tab-pane>
 		  </el-tabs>
 		  <template #footer>
 			<span class="dialog-footer">
@@ -331,6 +334,7 @@
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	import userService from '@/api/sys/UserService'
 	import ProjectAuditForm from './ProjectAuditForm'
+	import SignetAddForm from '@/views/materialManagement/userSeal/SignetAddForm'
   export default {
     props: {
       businessId: {
@@ -354,6 +358,7 @@
 		  loading: false,
 		  typeDictList: [],
 		  activeName: 'programDetail',
+		  showReportIssuance:false,
 		  inputForm: {
 			  id: '', // 主键值（新增不传，修改必传）
 			  no: '', // 编号（新增不传，修改必传）
@@ -392,7 +397,8 @@
 		  archiveId: '',
 		  provience:'',
 		  city:'',
-		  con:''
+		  con:'',
+		  sealId:''
       }
     },
 	  ProjectInfoService:null,
@@ -417,7 +423,8 @@
 		SelectTree,
 		SelectUserTree,
 		UpLoadComponent,
-		ProjectAuditForm
+		ProjectAuditForm,
+		SignetAddForm
     },
     methods: {
 		getKeyWatch (keyWatch) {
@@ -523,10 +530,11 @@
 				this.inputForm.clientList.splice(rowIndex, 1)
 			}
 		},
-		init (method, id,auditId1, auditId2, auditId3) {
+		init (method, id,auditId1, auditId2, auditId3,sealId) {
 			this.auditIdfirst = auditId1
 			this.auditIdsecond = auditId2
 			this.auditIdthird = auditId3
+			this.sealId=sealId
 			this.method = method
 			// console.log('method', method)
 			this.inputForm = {
@@ -862,10 +870,10 @@
 					this.$refs.thirdAudit3.init('view', this.auditIdthird, '三级校审')
 				}
 			}
-			if (paneName === 'archive') {
-				if (this.commonJS.isNotEmpty(this.archiveIdA)) {
+			if (paneName === 'reportIssuance') {
+				if (this.commonJS.isNotEmpty(this.sealId)) {
 					console.log('建立了')
-					this.$refs.projectArchiveForm.init('view', this.archiveIdA)
+					this.$refs.signetAddForm.init('view', this.sealId)
 				}
 			}
 			if (paneName === 'freadBrowse') {

src/views/jy/project/ProjectList.vue

@@ -330,6 +330,7 @@
 	import ProjectDia from './ProjectDia'
 	import ContractAddForm from '../workContractInfo/ContractAddForm'
 	import UserSelect from '@/components/userSelect'
+	import SignetService from "@/api/jy/SignetService"
 export default {
 	data(){
 		return {
@@ -376,8 +377,10 @@ export default {
 		}
 	},
 	ProjectInfoService:null,
+	SignetService: null,
 	created(){
 		this.projectInfoService=new ProjectInfoService()
+		this.signetService = new SignetService()
 	},
 	components:{
 		ProjectDia,
@@ -431,7 +434,7 @@ export default {
 		},
 		// 查看
 		view (row) {
-			this.$refs.projectDia.init('view', row.id,row.auditId1, row.auditId2, row.auditId3)
+			this.$refs.projectDia.init('view', row.id,row.auditId1, row.auditId2, row.auditId3,row.sealId)
 		},
 		// 获取数据列表
 		refreshList () {
@@ -1105,6 +1108,32 @@ export default {
 			}
 			return false
 		},
+		//查询用印信息
+		issuedDetail(row){
+			if (row.reportIssuance !== '0' && row.reportIssuance !== '1') {
+				this.signetService.queryById(row.sealId).then((da)=>{
+					// eslint-disable-next-line eqeqeq
+					taskService.getTaskDef({
+						procInsId: da.procInsId,
+						procDefId: da.processDefinitionId
+					}).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.sealId,
+								status: 'reback',
+								method: 'view'
+							}
+						})
+					})
+				})
+			}
+		}
 
 	}
 }

src/views/materialManagement/userSeal/ProjectForm.vue

@@ -312,6 +312,7 @@
           'orders': this.tablePage.orders,
           ...this.searchForm
         }).then((data) => {
+        	console.log('aa',data.records)
           this.dataList = data.records
           this.tablePage.total = data.total
           this.loading = false

src/views/materialManagement/userSeal/SignetAddForm.vue

@@ -4,7 +4,7 @@
 				 label-width="160px" @submit.native.prevent>
 			<el-divider content-position="left"><i class="el-icon-document"></i>
 				<span style="color: red;border-top: 20px">*</span>关联项目
-				<el-button style="margin-left: 20px" type="primary" :disabled="status === 'audit' || status === 'taskFormDetail'" @click="insertEvent('base')"  plain>
+				<el-button style="margin-left: 20px" type="primary" :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" @click="insertEvent('base')"  plain>
 					新增
 				</el-button>
 			</el-divider>
@@ -23,13 +23,14 @@
 						@cell-click=""
 						@edit-closed=""
 						keep-source
+						:readonly="true"
 						highlight-current-row
 						:edit-rules="tableRules"
 						:edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true, icon: '-'}"
 					>
 						<vxe-table-column field="name" align="center" title="项目名称" :edit-render="{}" show-overflow="title">
 							<template v-slot:edit="scope">
-								<el-input  :disabled="status === 'audit' || status === 'taskFormDetail'" @focus="openProgramPageForm(scope.$rowIndex)" placeholder="请填写项目名称" :readonly="true" v-model="scope.row.name"/>
+								<el-input  :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" @focus="openProgramPageForm(scope.$rowIndex)" placeholder="请填写项目名称" :readonly="true" v-model="scope.row.name"/>
 							</template>
 						</vxe-table-column>
 						<vxe-table-column field="no" align="center" title="项目编号" :edit-render="{}">
@@ -37,9 +38,9 @@
 								<el-input :disabled="true" :readonly="true" placeholder="请填写项目编号" v-model="scope.row.no"/>
 							</template>
 						</vxe-table-column>
-						<vxe-table-column field="projectLeader" align="center" title="项目负责人" :edit-render="{}">
+						<vxe-table-column field="leader" align="center" title="项目负责人" :edit-render="{}">
 							<template v-slot:edit="scope">
-								<el-input :disabled="true" placeholder="请填写项目负责人" v-model="scope.row.projectLeader"/>
+								<el-input :disabled="true" placeholder="请填写项目负责人" v-model="scope.row.leader"/>
 							</template>
 						</vxe-table-column>
 						<vxe-table-column field="createTime" align="center" title="创建时间" :edit-render="{}">
@@ -49,7 +50,7 @@
 						</vxe-table-column>
 						<vxe-table-column title="操作" align="center" width="100">
 							<template v-slot="scope">
-								<el-button type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'base')">删除</el-button>
+								<el-button :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'base')">删除</el-button>
 							</template>
 						</vxe-table-column>
 					</vxe-table>
@@ -76,7 +77,7 @@
 								  :rules="[
 							 {required: true, message:'用印类型不能为空', trigger:'blur'}
 							]">
-						<el-cascader style="width: 100%" v-model="inputForm.types" :options="typeData" @change="handleChange" placeholder="请选择"  clearable />
+						<el-cascader :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'"   style="width: 100%" v-model="inputForm.types" :options="typeData" @change="handleChange" placeholder="请选择"  clearable />
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
@@ -85,7 +86,7 @@
 							 {required: true, message:'用印份数不能为空', trigger:'blur'}
 
 							]">
-						<el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="status === 'audit' || status === 'taskFormDetail'" v-model="inputForm.number" placeholder="请输入用印份数" ></el-input>
+						<el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" v-model="inputForm.number" placeholder="请输入用印份数" ></el-input>
 					</el-form-item>
 				</el-col>
 
@@ -94,7 +95,7 @@
 								  :rules="[
                         {required: true, message:'说明不能为空', trigger:'blur'}
                ]">
-						<el-input type="textarea" placeholder="请输入说明"  maxlength="500"  style="width:100%" v-model="inputForm.remarks" show-word-limit></el-input>
+						<el-input :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="textarea" placeholder="请输入说明"  maxlength="500"  style="width:100%" v-model="inputForm.remarks" show-word-limit></el-input>
 					</el-form-item>
 				</el-col>
 			</el-row>

src/views/materialManagement/userSeal/SignetList.vue

@@ -509,7 +509,7 @@ export default {
 		},
 		//查看项目信息
 		openProject(row){
-			this.$refs.projectDia.init('view', row.id,row.auditId1, row.auditId2, row.auditId3)
+			this.$refs.projectDia.init('view', row.id,row.auditId1, row.auditId2, row.auditId3,row.sealId)
 		}
     }
   }