bug调整

src/views/jy/daily/MeetingRoomForm.vue

@@ -41,7 +41,7 @@
 				<el-col :span="12">
 					<el-form-item label="会议时长" prop="duration"
 								  :rules="[
-							 {required: true, message:'会议时长不能为空', trigger:'blur'}
+							 {required: true, message:'会议时长不能为空', trigger:'change'}
 							]">
 						<el-select style="width:100%;" v-model="inputForm.duration" class="m-2" placeholder="请选择" clearable>
 							<el-option   label="30分钟" value="30"></el-option>

src/views/jy/driveMaintain/DriveMaintainAddForm.vue

@@ -255,9 +255,9 @@
 					// 暂存
 					this.loading = true
 					this.inputForm.status = '1'
-					if (this.maintainDates !== undefined ||this.maintainDates !== null || this.maintainDates.length !== 0){
-						this.inputForm.startTime=this.maintainDates[0]
-						this.inputForm.endTime=this.maintainDates[1]
+					if (this.inputForm.maintainDates !== undefined ||this.inputForm.maintainDates !== null || this.inputForm.maintainDates.length !== 0){
+						this.inputForm.startTime=this.inputForm.maintainDates[0]
+						this.inputForm.endTime=this.inputForm.maintainDates[1]
 					}
 					if (this.$refs.uploadComponent.checkProgress()) {
 						this.loading = false

src/views/jy/monthly/MonthlyList.vue

@@ -94,8 +94,8 @@
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
 							<div v-if="isAdmin">
-								<el-button text type="primary" size="small" v-if="scope.row.status==='0' || scope.row.status==='5'" @click="del(scope.row.id)">删除</el-button>
 								<el-button  size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button text type="primary" size="small" v-if="scope.row.status==='0' || scope.row.status==='5'" @click="del(scope.row.id)">删除</el-button>
 							</div>
 							<div v-else>
 								<el-button text type="primary" size="small"  @click="del(scope.row.id)">删除</el-button>

src/views/jy/project/ProjectArchiveForm.vue

@@ -96,7 +96,7 @@
 
 			</el-row>
 			<el-row  :gutter="15">
-				<el-button  type="primary"  icon="el-icon-plus" @click="add()">新建</el-button>
+<!--				<el-button  type="primary"  icon="el-icon-plus" @click="add()">新建</el-button>-->
 					<el-col :span="24">
 						<el-form-item label="备注" prop="remarks"
 									  :rules="[
@@ -207,6 +207,7 @@
 	import UserSelectSignatory from '../workClientInfo/clientUserSelect'
 	import FileForm from './FileForm'
 	import UpLoadComponent from '@/views/common/JyArchiveUpLoadComponent'
+	import CommonApi from '@/api/cw/common/CommonApi'
 	import OSSSerivce, {
 		// eslint-disable-next-line no-unused-vars
 		beforeAvatarUpload,
@@ -252,7 +253,8 @@
 					fileList:[],
 					status:'',
 					projectId:'',
-					remarks:''
+					remarks:'',
+					procInsId:''
 				},
 				keyWatch: '',
 				tabName:'',
@@ -261,10 +263,11 @@
 			}
 		},
 		ProjectInfoService:null,
-
+		commonApi: null,
 		created () {
 			this.projectInfoService=new ProjectInfoService()
 			this.ossService = new OSSSerivce()
+			this.commonApi = new CommonApi()
 
 		},
 		computed: {
@@ -332,7 +335,8 @@
 					fileList:[],
 					status:'',
 					projectId:'',
-					remarks:''
+					remarks:'',
+					procInsId:''
 				}
 				this.inputForm.id = id
 				this.visible = true
@@ -446,7 +450,16 @@
 						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 						throw new Error()
 					} else {
-						this.doSubmit('agree', callback)
+						this.inputForm.status = '2'
+						this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data)=> {
+							if (this.commonJS.isNotEmpty(data)) {
+								if (data === '办公室审核') {
+									this.inputForm.status = '5'
+								}
+							}
+							this.doSubmit('agree', callback)
+						})
+
 					}
 				})
 			},
@@ -471,11 +484,7 @@
 					this.inputForm.status = '2'
 				} else if (status === 'agree') {
 					// 审核同意
-					if (this.$store.state.user.office.name ==='办公室'){
-						this.inputForm.status = '5'
-					}else {
-						this.inputForm.status = '2'
-					}
+
 				}
 				this.$refs['inputForm'].validate((valid) => {
 					if (valid) {

src/views/jy/project/ProjectDia.vue

@@ -308,7 +308,7 @@
 				  <OutInstanceForm ref="outInstanceForm" :formReadOnly="true"></OutInstanceForm>
 			  </el-tab-pane>
 			  <el-tab-pane label="报批签发" name="reportsSubmit">
-				  <ReportsInstanceForm ref="reportsSubmit" :formReadOnly="true"></ReportsInstanceForm>
+				  <ReportsInstanceForm ref="reportsInstanceForm" :formReadOnly="true"></ReportsInstanceForm>
 			  </el-tab-pane>
 			  <el-tab-pane label="归档" name="archive">
 				  <ProjectArchiveForm ref="projectArchiveForm" :formReadOnly="true"></ProjectArchiveForm>
@@ -550,6 +550,7 @@
 			}
 		},
 		init (method, id,auditId1, auditId2, auditId3,sealId,outInstanceId,reportsSubmitId,archiveId,eiaId) {
+			console.log('this.reportsSubmitId',reportsSubmitId)
 			this.auditIdfirst = auditId1
 			this.auditIdsecond = auditId2
 			this.auditIdthird = auditId3
@@ -906,8 +907,10 @@
 				}
 			}
 			if (paneName === 'reportsSubmit') {
+				console.log('this.reportsSubmitId',this.reportsSubmitId)
 				if (this.commonJS.isNotEmpty(this.reportsSubmitId)) {
-					this.$refs.reportsSubmit.init('view',this.reportsSubmitId)
+
+					this.$refs.reportsInstanceForm.init('view',this.reportsSubmitId)
 				}
 			}
 			if (paneName === 'archive') {

src/views/jy/project/ProjectList.vue

@@ -227,9 +227,9 @@
 						<template  #default="scope">
 							<el-button v-if="hasPermission('jy_project:info:edit')&&(scope.row.status === '1' || scope.row.status === '3')&&scope.row.createBy === $store.state.user.id" text type="primary"  @click="registeredPush(scope.row)">修改</el-button>
 							<!--管理员角色登记完成后可修改-->
-							<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '5' && isAdmin" text type="primary"  @click="edit(scope.row.id)">修改</el-button>
+							<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '5' && isAdmin" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
 							<!--项目负责人修改-->
-							<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '5' && scope.row.projectLeader === $store.state.user.id" text type="primary"  @click="edit(scope.row.id)">修改</el-button>
+							<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '5' && scope.row.projectLeader === $store.state.user.name" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
 							<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '2'&&scope.row.createBy === $store.state.user.id" text type="primary"  @click="registeredReback(scope.row)">撤回</el-button>
 							<!--项目登记  审核-->
 							<el-button v-if="scope.row.status==='2' && checkIsAudit(scope.row)" text type="primary"   @click="examine(scope.row)">登记审核</el-button>
@@ -280,10 +280,10 @@
 
 
 							<!--							&lt;!&ndash;报批签发发起&ndash;&gt;-->
-							<el-button v-if="hasPermission('jy_project:info:edit')&&(scope.row.createBy === $store.state.user.id ||haveProjectIds.includes(scope.row.id)) &&scope.row.outInstance === '5' && (scope.row.reportsSubmit === null ||scope.row.reportsSubmit === undefined ||scope.row.reportsSubmit === '' ||scope.row.reportsSubmit === '0')" text type="primary"  @click="reportsDoSubmit(scope.row)">报批签发</el-button>
+							<el-button v-if="hasPermission('jy_project:info:edit')&&(scope.row.createBy === $store.state.user.id ||haveProjectIds.includes(scope.row.id)) &&scope.row.outInstance === '5' && (scope.row.reportsSubmit === null ||scope.row.reportsSubmit === undefined ||scope.row.reportsSubmit === '' ||scope.row.reportsSubmit === '0' || scope.row.reportsSubmit === '1'|| scope.row.reportsSubmit === '3')" text type="primary"  @click="reportsDoSubmit(scope.row)">报批签发</el-button>
 							<!--							&lt;!&ndash;报批签发撤回&ndash;&gt;-->
 							<el-button v-if="hasPermission('jy_project:info:edit')&&(scope.row.createBy === $store.state.user.id ||haveProjectIds.includes(scope.row.id)) && scope.row.reportsSubmit === '2'" text type="primary"  @click="reportsSubmitReback(scope.row)">报批签发撤回</el-button>
-							<el-button v-if="scope.row.reportsSubmit === '1'|| scope.row.reportsSubmit === '3' &&(scope.row.createBy === $store.state.user.id|| haveProjectIds.includes(scope.row.id))" text type="primary"  @click="edit(scope.row)">报批签发修改</el-button>
+<!--							<el-button v-if="scope.row.reportsSubmit === '1'|| scope.row.reportsSubmit === '3' &&(scope.row.createBy === $store.state.user.id|| haveProjectIds.includes(scope.row.id))" text type="primary"  @click="edit(scope.row)">报批签发修改</el-button>-->
 							<!--							&lt;!&ndash; 报批签发  审核&ndash;&gt;-->
 							<el-button v-if="scope.row.reportsSubmit==='2' && checkIsAuditIssued(scope.row)" text type="primary"  @click="reportsSubmitCheck(scope.row)">报批签发审核</el-button>
 							<!--							&lt;!&ndash; 报批签发  被驳回后当前申请人重新调整&ndash;&gt;-->
@@ -459,11 +459,11 @@ export default {
 			this.$refs.projectForm.init('add', '')
 		},
 		// 修改
-		edit (id) {
-			id = id || this.$refs.typeDictTable.getCheckboxRecords().map(item => {
-				return item.id
-			})[0]
-			this.$refs.projectFormUpdate.init('edit', id)
+		adminEdit (row) {
+			// id = row.id || this.$refs.typeDictTable.getCheckboxRecords().map(item => {
+			// 	return item.id
+			// })[0]
+			this.$refs.projectDia.init('edit', row.id,row.auditId1, row.auditId2, row.auditId3,row.sealId,row.outInstanceId,row.reportsSubmitId,row.archiveId,row.eiaId)
 		},
 		// 查看
 		view (row) {

src/views/jy/project/ReportsInstanceForm.vue

@@ -1,6 +1,6 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
 	<div>
-		<el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'"
+		<el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'"
 				 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>关联项目
@@ -132,6 +132,7 @@
 				title: '',
 				method: '',
 				loading: false,
+				visible: false,
 				inputForm:{
 					id:'',
 					projectList:[],
@@ -209,6 +210,7 @@
 			},
 			init(method, id) {
 				this.method = method
+				console.log('method',method)
 				this.inputForm={
 					id:'',
 					projectList:[],
@@ -229,6 +231,15 @@
 					option.disabled = false
 				})
 				this.inputForm.id = id
+				this.visible = true
+				if (method === 'add') {
+					// this.inputForm.id = 'add'
+					this.title = `新建项目`
+				} else if (method === 'edit') {
+					this.title = '修改项目'
+				} else if (method === 'view') {
+					this.title = '查看项目详情'
+				}
 				this.loading = false
 				this.$nextTick(() => {
 					this.$refs.inputForm.resetFields()