项目登记

src/views/jy/project/ProjectList.vue

@@ -11,14 +11,14 @@
 			<el-form-item v-if="showHideItem" label="登记人" prop="createById">
 				<UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value) => {searchForm.createById = value}'></UserSelect>
 			</el-form-item>
-			<el-form-item v-if="showHideItem" label="项目负责人" prop="projectManagerName">
-				<el-input v-model="searchForm.projectManagerName" placeholder="请输入项目负责人" clearable></el-input>
+			<el-form-item v-if="showHideItem" label="项目负责人" prop="projectLeader">
+				<el-input v-model="searchForm.projectLeader" placeholder="请输入项目负责人" clearable></el-input>
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="合同名称" prop="contractName">
 				<el-input v-model="searchForm.contractName" placeholder="请输入合同名称" clearable></el-input>
 			</el-form-item>
-			<el-form-item v-if="showHideItem" label="委托方" prop="clientName">
-				<el-input v-model="searchForm.clientName" placeholder="请输入委托方" clearable></el-input>
+			<el-form-item v-if="showHideItem" label="委托方" prop="primaryLinkman">
+				<el-input v-model="searchForm.primaryLinkman" placeholder="请输入委托方" clearable></el-input>
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="创建时间" prop="createDates">
 				<el-date-picker
@@ -42,8 +42,8 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item v-if="showHideItem" label="一级校审状态" prop="status1">
-				<el-select v-model="searchForm.status1" placeholder="请选择" style="width:100%;" clearable>
+			<el-form-item v-if="showHideItem" label="一级校审状态" prop="firstInstanceStatus">
+				<el-select v-model="searchForm.firstInstanceStatus" placeholder="请选择" style="width:100%;" clearable>
 					<el-option
 						v-for="item in $dictUtils.getDictList('program_project_list_info_status')"
 						:key="item.value"
@@ -52,8 +52,8 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item v-if="showHideItem" label="二级校审状态" prop="status2">
-				<el-select v-model="searchForm.status2" placeholder="请选择" style="width:100%;" clearable>
+			<el-form-item v-if="showHideItem" label="二级校审状态" prop="secondInstanceStatus">
+				<el-select v-model="searchForm.secondInstanceStatus" placeholder="请选择" style="width:100%;" clearable>
 					<el-option
 						v-for="item in $dictUtils.getDictList('program_project_list_info_status')"
 						:key="item.value"
@@ -62,8 +62,8 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item v-if="showHideItem" label="三级校审状态" prop="status3">
-				<el-select v-model="searchForm.status3" placeholder="请选择" style="width:100%;" clearable>
+			<el-form-item v-if="showHideItem" label="三级校审状态" prop="thirdInstanceStatus">
+				<el-select v-model="searchForm.thirdInstanceStatus" placeholder="请选择" style="width:100%;" clearable>
 					<el-option
 						v-for="item in $dictUtils.getDictList('program_project_list_info_status')"
 						:key="item.value"
@@ -72,8 +72,8 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item v-if="showHideItem" label="签发单状态" prop="issuedStatus">
-				<el-select v-model="searchForm.issuedStatus" placeholder="请选择" style="width:100%;" clearable>
+			<el-form-item v-if="showHideItem" label="报告签发" prop="reportIssuance">
+				<el-select v-model="searchForm.reportIssuance" placeholder="请选择" style="width:100%;" clearable>
 					<el-option
 						v-for="item in $dictUtils.getDictList('program_project_list_info_status')"
 						:key="item.value"
@@ -82,8 +82,28 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item v-if="showHideItem" label="归档状态" prop="archiveStatus">
-				<el-select v-model="searchForm.archiveStatus" placeholder="请选择" style="width:100%;" clearable>
+			<el-form-item v-if="showHideItem" label="外审" prop="outInstance">
+				<el-select v-model="searchForm.outInstance" placeholder="请选择" style="width:100%;" clearable>
+					<el-option
+						v-for="item in $dictUtils.getDictList('program_project_list_info_status')"
+						:key="item.value"
+						:label="item.label"
+						:value="item.value">
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="报批签发" prop="reportsSubmit">
+				<el-select v-model="searchForm.reportsSubmit" placeholder="请选择" style="width:100%;" clearable>
+					<el-option
+						v-for="item in $dictUtils.getDictList('program_project_list_info_status')"
+						:key="item.value"
+						:label="item.label"
+						:value="item.value">
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="归档状态" prop="revicewStatus">
+				<el-select v-model="searchForm.revicewStatus" placeholder="请选择" style="width:100%;" clearable>
 					<el-option
 						v-for="item in $dictUtils.getDictList('program_project_archive_list_info_status')"
 						:key="item.value"
@@ -146,9 +166,9 @@
 					<vxe-column min-width="100" align="center" title="项目编号" field="no"></vxe-column>
 					<vxe-column min-width="180" align="center" title="合同名称" field="contractName">
 						<template #default="scope">
+<!--							<el-link  type="primary" :underline="false" v-if="scope.row.contractStatus ==='1'" @click="viewContract(scope.row.contractId)">{{scope.row.contractName}}</el-link>-->
 							<el-link  type="primary" :underline="false" v-if="hasPermission('jy_project:info:view')" @click="viewContract(scope.row.contractId)">{{scope.row.contractName}}</el-link>
-							<el-link  type="primary" :underline="false" v-else-if="hasPermission('jy_project:info:view')" @click="viewContract(scope.row.contractId)">{{scope.row.contractName}}</el-link>
-							<span v-else>{{scope.row.name}}</span>
+							<span v-else-if="scope.row.contractStatus ==='0'">暂无合同</span>
 						</template>
 					</vxe-column>
 					<vxe-column min-width="100" align="center" title="负责人" field="projectLeader"></vxe-column>
@@ -308,6 +328,7 @@
 	import pick from 'lodash.pick'
 	import ProjectDia from './ProjectDia'
 	import ContractAddForm from '../workContractInfo/ContractAddForm'
+	import UserSelect from '@/components/userSelect'
 export default {
 	data(){
 		return {
@@ -324,11 +345,11 @@ export default {
 				projectLeader:'',//项目负责人
 				createDates: [],
 				status: '',
-				firstInstance: '',  // 一级校审状态
-				secondInstance: '',	// 二级校审状态
-				thirdInstance: '',	// 三级校审状态
+				firstInstanceStatus: '',  // 一级校审状态
+				secondInstanceStatus: '',	// 二级校审状态
+				thirdInstanceStatus: '',	// 三级校审状态
 				reportIssuance: '',	// 报告签发
-				outIssuance:'',//外审
+				outInstance:'',//外审
 				reportsSubmit:'',//报批签发
 				reviewStatus:'',//归档状态
 			},
@@ -353,7 +374,8 @@ export default {
 	},
 	components:{
 		ProjectDia,
-		ContractAddForm
+		ContractAddForm,
+		UserSelect
 	},
 	mounted(){
 		this.$nextTick(() => {