Merge remote-tracking branch 'origin/master'

src/views/jy/project/OutInstanceForm.vue

@@ -4,99 +4,95 @@
 				 label-width="170px" @submit.native.prevent>
 
 			<el-row  :gutter="15">
-				<el-row  :gutter="15">
-					<el-col :span="24" >
-						<el-divider content-position="left"><i class="el-icon-document"></i>
-							合同信息
-						</el-divider>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同名称" prop="contractName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同金额(元)" prop="contractAmount"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额(元)"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="委托方" prop="primaryLinkman"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.primaryLinkman" placeholder="请填写委托方"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同类型(大类)" prop="contractTypeFirst"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同类型(小类)" prop="contractType"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
+				<el-col :span="24" >
+					<el-divider content-position="left"><i class="el-icon-document"></i>
+						合同信息
+					</el-divider>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同名称" prop="contractName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同金额(元)" prop="contractAmount"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额(元)"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="委托方" prop="primaryLinkman"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.primaryLinkman" placeholder="请填写委托方"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同类型(大类)" prop="contractTypeFirst"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同类型(小类)" prop="contractType"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
+					</el-form-item>
+				</el-col>
 			</el-row>
 			<el-row  :gutter="15">
-				<el-row  :gutter="15">
-					<el-col :span="24" >
-						<el-divider content-position="left"><i class="el-icon-document"></i>
-							项目基本信息
-						</el-divider>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目名称" prop="projectName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.projectName" placeholder="请填写项目名称"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目所在地" prop="projectPlace"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.projectPlace" placeholder="请填写项目所在地"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="建设地点" prop="buildPlace"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.buildPlace" placeholder="请填写建设地点"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目负责人" prop="projectLeader"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.projectLeader" placeholder="请填写项目负责人"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="创建人" prop="createByName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.createByName" placeholder="请填写创建人"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="创建时间" prop="createTime"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.createTime" placeholder="请填写创建时间"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
+				<el-col :span="24" >
+					<el-divider content-position="left"><i class="el-icon-document"></i>
+						项目基本信息
+					</el-divider>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目名称" prop="projectName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.projectName" placeholder="请填写项目名称"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目所在地" prop="projectPlace"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.projectPlace" placeholder="请填写项目所在地"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="建设地点" prop="buildPlace"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.buildPlace" placeholder="请填写建设地点"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目负责人" prop="projectLeader"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.projectLeader" placeholder="请填写项目负责人"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="创建人" prop="createByName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.createByName" placeholder="请填写创建人"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="创建时间" prop="createTime"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.createTime" placeholder="请填写创建时间"></el-input>
+					</el-form-item>
+				</el-col>
 
 			</el-row>
 			<el-row  :gutter="15">

src/views/jy/project/ProjectArchiveForm.vue

@@ -4,99 +4,95 @@
 				 label-width="170px" @submit.native.prevent>
 
 			<el-row  :gutter="15">
-				<el-row  :gutter="15">
-					<el-col :span="24" >
-						<el-divider content-position="left"><i class="el-icon-document"></i>
-							合同信息
-						</el-divider>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同名称" prop="contractName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同金额(元)" prop="contractAmount"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额(元)"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="委托方" prop="primaryLinkman"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.primaryLinkman" placeholder="请填写委托方"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同类型(大类)" prop="contractTypeFirst"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同类型(小类)" prop="contractType"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
+				<el-col :span="24" >
+					<el-divider content-position="left"><i class="el-icon-document"></i>
+						合同信息
+					</el-divider>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同名称" prop="contractName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同金额(元)" prop="contractAmount"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额(元)"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="委托方" prop="primaryLinkman"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.primaryLinkman" placeholder="请填写委托方"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同类型(大类)" prop="contractTypeFirst"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同类型(小类)" prop="contractType"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
+					</el-form-item>
+				</el-col>
 			</el-row>
 			<el-row  :gutter="15">
-				<el-row  :gutter="15">
-					<el-col :span="24" >
-						<el-divider content-position="left"><i class="el-icon-document"></i>
-							项目基本信息
-						</el-divider>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目名称" prop="projectName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.projectName" placeholder="请填写项目名称"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目所在地" prop="projectPlace"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.projectPlace" placeholder="请填写项目所在地"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="建设地点" prop="buildPlace"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.buildPlace" placeholder="请填写建设地点"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目负责人" prop="projectLeader"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.projectLeader" placeholder="请填写项目负责人"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="创建人" prop="createByName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.createByName" placeholder="请填写创建人"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="创建时间" prop="createTime"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.createTime" placeholder="请填写创建时间"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
+				<el-col :span="24" >
+					<el-divider content-position="left"><i class="el-icon-document"></i>
+						项目基本信息
+					</el-divider>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目名称" prop="projectName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.projectName" placeholder="请填写项目名称"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目所在地" prop="projectPlace"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.projectPlace" placeholder="请填写项目所在地"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="建设地点" prop="buildPlace"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.buildPlace" placeholder="请填写建设地点"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目负责人" prop="projectLeader"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.projectLeader" placeholder="请填写项目负责人"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="创建人" prop="createByName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.createByName" placeholder="请填写创建人"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="创建时间" prop="createTime"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.createTime" placeholder="请填写创建时间"></el-input>
+					</el-form-item>
+				</el-col>
 
 			</el-row>
 			<el-row  :gutter="15">

src/views/jy/project/ProjectAuditForm.vue

@@ -9,146 +9,140 @@
 				 label-width="170px" @submit.native.prevent>
 
 			<el-row  :gutter="15">
-				<el-row  :gutter="15">
-					<el-col :span="24" >
-						<el-divider content-position="left"><i class="el-icon-document"></i>
-							合同信息
-						</el-divider>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同名称" prop="contractName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同金额(元)" prop="contractAmount"
-									  :rules="[
-                 ]">
-							  <el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额(元)"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="委托方" prop="primaryLinkman"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.primaryLinkman" placeholder="请填写委托方"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同类型(大类)" prop="contractTypeFirst"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同类型(小类)" prop="contractType"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
+				<el-col :span="24" >
+					<el-divider content-position="left"><i class="el-icon-document"></i>
+						合同信息
+					</el-divider>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同名称" prop="contractName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同金额(元)" prop="contractAmount"
+								  :rules="[
+			 ]">
+						  <el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额(元)"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="委托方" prop="primaryLinkman"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.primaryLinkman" placeholder="请填写委托方"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同类型(大类)" prop="contractTypeFirst"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同类型(小类)" prop="contractType"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
+					</el-form-item>
+				</el-col>
 			</el-row>
 			<el-row  :gutter="15">
-				<el-row  :gutter="15">
-					<el-col :span="24" >
-						<el-divider content-position="left"><i class="el-icon-document"></i>
-							项目基本信息
-						</el-divider>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目名称" prop="projectName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.projectName" placeholder="请填写项目名称"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目所在地" prop="projectPlace"
-									  :rules="[
-                 ]">
-							  <el-input :disabled="true" v-model="inputForm.projectPlace" placeholder="请填写项目所在地"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="建设地点" prop="buildPlace"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.buildPlace" placeholder="请填写建设地点"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目负责人" prop="projectLeader"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.projectLeader" placeholder="请填写项目负责人"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="创建人" prop="createByName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.createByName" placeholder="请填写创建人"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="创建时间" prop="createTime"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.createTime" placeholder="请填写创建时间"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
+				<el-col :span="24" >
+					<el-divider content-position="left"><i class="el-icon-document"></i>
+						项目基本信息
+					</el-divider>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目名称" prop="projectName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.projectName" placeholder="请填写项目名称"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目所在地" prop="projectPlace"
+								  :rules="[
+			 ]">
+						  <el-input :disabled="true" v-model="inputForm.projectPlace" placeholder="请填写项目所在地"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="建设地点" prop="buildPlace"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.buildPlace" placeholder="请填写建设地点"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目负责人" prop="projectLeader"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.projectLeader" placeholder="请填写项目负责人"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="创建人" prop="createByName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.createByName" placeholder="请填写创建人"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="创建时间" prop="createTime"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.createTime" placeholder="请填写创建时间"></el-input>
+					</el-form-item>
+				</el-col>
 
 			</el-row>
 			<el-row  :gutter="15">
-				<el-row  :gutter="15">
-					<el-col :span="24" >
-						<el-divider content-position="left"><i class="el-icon-document"></i>
-							审核人及审核和修改意见
-						</el-divider>
-					</el-col>
-					<el-col :span="12" >
-						<el-form-item label="审核人" prop="auditPeople"
-									  :rules="[
-                 ]">
-							<UserSelectSignatory style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'|| method ==='view'"
-												 :readonly="true" :limit='1' :modelValue="inputForm.auditPeople"
-												 @update:modelValue='(value) => {inputForm.auditPeople = value}'></UserSelectSignatory>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" >
-						<el-form-item label="审核意见" prop="initialAuditOpinion"
-									  :rules="[
-                 ]">
-							<el-input type="textarea" id="auditData"  :rows="4" :disabled="true" show-word-limit maxlength="500" v-model="inputForm.initialAuditOpinion" placeholder="请填写审核意见"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" >
-						<el-form-item label="修改意见" prop="initialEditOpinion"
-									  :rules="[
-                 ]">
-							  <el-input type="textarea" id="editData"  :rows="4" :disabled="true" show-word-limit maxlength="500" v-model="inputForm.initialEditOpinion" placeholder="请填写修改意见"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-show="inputForm.status === '2' && status ==='audit'?true:false">
-						<el-form-item label="审核意见" prop="auditOpinion"
-									  :rules="[
-                 ]">
-							<el-input :rows="4"  show-word-limit maxlength="500" type="textarea" v-model="inputForm.auditOpinion" placeholder="请填写审核意见"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-show="inputForm.status === '4' && status !=='audit'?true:false">
-						<el-form-item label="修改意见" prop="editOpinion"
-									  :rules="[
-                 ]">
-							<el-input :rows="4"  show-word-limit maxlength="500" type="textarea" v-model="inputForm.editOpinion" placeholder="请填写修改意见"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
+				<el-col :span="24" >
+					<el-divider content-position="left"><i class="el-icon-document"></i>
+						审核人及审核和修改意见
+					</el-divider>
+				</el-col>
+				<el-col :span="12" >
+					<el-form-item label="审核人" prop="auditPeople"
+								  :rules="[
+			 ]">
+						<UserSelectSignatory style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'|| method ==='view'"
+											 :readonly="true" :limit='1' :modelValue="inputForm.auditPeople"
+											 @update:modelValue='(value) => {inputForm.auditPeople = value}'></UserSelectSignatory>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" >
+					<el-form-item label="审核意见" prop="initialAuditOpinion"
+								  :rules="[
+			 ]">
+						<el-input type="textarea" id="auditData"  :rows="4" :disabled="true" show-word-limit maxlength="500" v-model="inputForm.initialAuditOpinion" placeholder="请填写审核意见"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" >
+					<el-form-item label="修改意见" prop="initialEditOpinion"
+								  :rules="[
+			 ]">
+						  <el-input type="textarea" id="editData"  :rows="4" :disabled="true" show-word-limit maxlength="500" v-model="inputForm.initialEditOpinion" placeholder="请填写修改意见"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-show="inputForm.status === '2' && status ==='audit'?true:false">
+					<el-form-item label="审核意见" prop="auditOpinion"
+								  :rules="[
+			 ]">
+						<el-input :rows="4"  show-word-limit maxlength="500" type="textarea" v-model="inputForm.auditOpinion" placeholder="请填写审核意见"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-show="inputForm.status === '4' && status !=='audit'?true:false">
+					<el-form-item label="修改意见" prop="editOpinion"
+								  :rules="[
+			 ]">
+						<el-input :rows="4"  show-word-limit maxlength="500" type="textarea" v-model="inputForm.editOpinion" placeholder="请填写修改意见"></el-input>
+					</el-form-item>
+				</el-col>
 			</el-row>
 
 		</el-form>

src/views/jy/project/ProjectEiaForm.vue

@@ -4,99 +4,95 @@
 				 label-width="170px" @submit.native.prevent>
 
 			<el-row  :gutter="15">
-				<el-row  :gutter="15">
-					<el-col :span="24" >
-						<el-divider content-position="left"><i class="el-icon-document"></i>
-							合同信息
-						</el-divider>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同名称" prop="contractName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同金额(元)" prop="contractAmount"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额(元)"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="委托方" prop="primaryLinkman"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.primaryLinkman" placeholder="请填写委托方"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同类型(大类)" prop="contractTypeFirst"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合同类型(小类)" prop="contractType"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
+				<el-col :span="24" >
+					<el-divider content-position="left"><i class="el-icon-document"></i>
+						合同信息
+					</el-divider>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同名称" prop="contractName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同金额(元)" prop="contractAmount"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额(元)"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="委托方" prop="primaryLinkman"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.primaryLinkman" placeholder="请填写委托方"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同类型(大类)" prop="contractTypeFirst"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同类型(小类)" prop="contractType"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
+					</el-form-item>
+				</el-col>
 			</el-row>
 			<el-row  :gutter="15">
-				<el-row  :gutter="15">
-					<el-col :span="24" >
-						<el-divider content-position="left"><i class="el-icon-document"></i>
-							项目基本信息
-						</el-divider>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目名称" prop="projectName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.projectName" placeholder="请填写项目名称"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目所在地" prop="projectPlace"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.projectPlace" placeholder="请填写项目所在地"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="建设地点" prop="buildPlace"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.buildPlace" placeholder="请填写建设地点"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目负责人" prop="projectLeader"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.projectLeader" placeholder="请填写项目负责人"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="创建人" prop="createByName"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.createByName" placeholder="请填写创建人"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="创建时间" prop="createTime"
-									  :rules="[
-                 ]">
-							<el-input :disabled="true" v-model="inputForm.createTime" placeholder="请填写创建时间"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
+				<el-col :span="24" >
+					<el-divider content-position="left"><i class="el-icon-document"></i>
+						项目基本信息
+					</el-divider>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目名称" prop="projectName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.projectName" placeholder="请填写项目名称"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目所在地" prop="projectPlace"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.projectPlace" placeholder="请填写项目所在地"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="建设地点" prop="buildPlace"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.buildPlace" placeholder="请填写建设地点"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目负责人" prop="projectLeader"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.projectLeader" placeholder="请填写项目负责人"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="创建人" prop="createByName"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.createByName" placeholder="请填写创建人"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="创建时间" prop="createTime"
+								  :rules="[
+			 ]">
+						<el-input :disabled="true" v-model="inputForm.createTime" placeholder="请填写创建时间"></el-input>
+					</el-form-item>
+				</el-col>
 
 			</el-row>
 			<el-row  :gutter="15">
@@ -418,11 +414,11 @@
 											if (item.jyFileType === '3'){
 												count2++
 											}
-											if (count2 === 0){
+											/*if (count2 === 0){
 												this.$message.error('请上传文件资质')
 												this.loading = false
 												throw new Error('请上传文件资质')
-											}
+											}*/
 										}
 										// if (list.length < 2){
 										// 	this.$message.error('承诺书或信息表未上传')
@@ -436,11 +432,11 @@
 										if (item.jyFileType === '2'){
 											count1++
 										}
-										if (count === 0 || count1 === 0){
+										/*if (count === 0 || count1 === 0){
 											this.$message.error('承诺书或信息表未上传')
 											this.loading = false
 											throw new Error('承诺书或信息表未上传')
-										}
+										}*/
 									})
 								}else {
 									this.$message.error('请上传文件')

src/views/jy/project/ProjectList.vue

@@ -208,11 +208,6 @@
 							<span v-else  style="color: red">无需登记</span>
 						</template>
 					</vxe-column>
-					<vxe-column min-width="120" align="center" title="项目归档" field="reviewStatus">
-						<template #default="scope">
-							<el-button @click="archiveDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.reviewStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_archive_list_info_status", scope.row.reviewStatus, '未登记')}} </el-button>
-						</template>
-					</vxe-column>
 					<vxe-column min-width="120" align="center" title="外审" field="outInstance">
 						<template #default="scope">
 							<el-button @click="outInstanceDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.outInstance, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.outInstance, '未登记')}} </el-button>
@@ -223,6 +218,11 @@
 							<el-button @click="reportsSubmitDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.reportsSubmit, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.reportsSubmit, '未登记')}} </el-button>
 						</template>
 					</vxe-column>
+					<vxe-column min-width="120" align="center" title="项目归档" field="reviewStatus">
+						<template #default="scope">
+							<el-button @click="archiveDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.reviewStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_archive_list_info_status", scope.row.reviewStatus, '未登记')}} </el-button>
+						</template>
+					</vxe-column>
 					<vxe-column title="操作" min-width="200px" fixed="right" align="center">
 						<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>

src/views/jy/workClientInfo/WorkClientForm.vue

@@ -55,7 +55,7 @@
 				</el-form-item>
 			</el-col>
           <el-col :span="12" >
-            <el-form-item style="margin-left: 8px" label="所在地区" prop="workClientInfo.areaId"
+            <el-form-item label="所在地区" prop="workClientInfo.areaId"
                           :rules="[
                    {required: true, message:'请选择所在地区', trigger:'blur'}
                  ]">
@@ -232,13 +232,12 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="开户行信息" prop="bankInfos">
-          <vxe-toolbar>
-            <template #buttons>
-              <vxe-button status="primary" :disabled="method==='view'" size="small" @click="insertEvent('bank')">新增</vxe-button>
-            </template>
-          </vxe-toolbar>
-        </el-form-item>
+		  <el-divider content-position="left"><i class="el-icon-document"></i>
+			  开户行信息
+			  <el-button style="margin-left: 20px" type="primary" :disabled="method==='view'"  size="small" @click="insertEvent('bank')" plain>
+				  新增
+			  </el-button>
+		  </el-divider>
 
         <vxe-table
 			:key="tableKey"
@@ -276,13 +275,12 @@
           </vxe-table-column>
         </vxe-table>
 
-        <el-form-item style="margin-top: 20px" label="联系人信息" prop="linkmanInfos">
-          <vxe-toolbar >
-            <template #buttons>
-              <vxe-button 	 status="primary" :disabled="method==='view'" size="small" @click="insertEvent('linkman')">新增</vxe-button>
-            </template>
-          </vxe-toolbar>
-        </el-form-item>
+		  <el-divider content-position="left"><i class="el-icon-document"></i>
+			  联系人信息
+			  <el-button style="margin-left: 20px" type="primary" :disabled="method==='view'"  size="small" @click="insertEvent('linkman')" plain>
+				  新增
+			  </el-button>
+		  </el-divider>
 
         <vxe-table
 			:key="tableKey"

src/views/jy/workClientInfo/WorkClientList.vue

@@ -7,7 +7,7 @@
          </el-form-item>
 
         <el-form-item  label="客户性质" prop="companyType">
-          <el-select v-model="searchForm.companyType" placeholder="请选择" style="width:100%;">
+          <el-select v-model="searchForm.companyType" placeholder="请选择" style="width:100%;" clearable>
             <el-option
               v-for="item in $dictUtils.getDictList('customer_nature')"
               :key="item.value"
@@ -34,7 +34,7 @@
             @getValue="(value) => {searchForm.areaId=value}"/>
         </el-form-item>
 
-        <el-form-item v-if="showHideItem" label="创建时间" prop="createDates">
+        <el-form-item v-if="showHideItem" label="创建时间" prop="createDates" clearable>
           <el-date-picker
             placement="bottom-start"
             v-model="searchForm.createDates"
@@ -47,7 +47,7 @@
         </el-form-item>
 
         <el-form-item v-if="showHideItem" label="客户行业" prop="companyIndustry">
-          <el-select v-model="searchForm.companyIndustry" placeholder="请选择" style="width:100%;">
+          <el-select v-model="searchForm.companyIndustry" placeholder="请选择" style="width:100%;" clearable>
             <el-option
               v-for="item in $dictUtils.getDictList('industry')"
               :key="item.value"
@@ -58,7 +58,7 @@
         </el-form-item>
 
         <el-form-item v-if="showHideItem" label="客户类型" prop="clientType">
-          <el-select v-model="searchForm.clientType" placeholder="请选择" style="width:100%;">
+          <el-select v-model="searchForm.clientType" placeholder="请选择" style="width:100%;" clearable>
             <el-option
               v-for="item in $dictUtils.getDictList('customer_type')"
               :key="item.value"

src/views/jy/workContractInfo/WorkContractForm.vue

@@ -172,11 +172,11 @@
 					</el-col>
 
 					<el-col :span="12" v-if="$store.state.user.office.name ==='办公室'">
-						<el-form-item label="盒号" prop="filedNo"
+						<el-form-item label="归档盒号" prop="filedNo"
 									  :rules="[
-											  {required: true, message:'请输入盒号', trigger:'blur'}
+											  {required: true, message:'请输入归档盒号', trigger:'blur'}
 										   ]">
-							<el-input :disabled="false" :readonly="false" maxlength="15" v-model="inputForm.filedNo"  placeholder="请输入盒号"></el-input>
+							<el-input :disabled="false" :readonly="false" maxlength="15" v-model="inputForm.filedNo"  placeholder="请输入归档盒号"></el-input>
 						</el-form-item>
 					</el-col>
 

src/views/materialManagement/userSeal/SignetList.vue

@@ -100,8 +100,8 @@
                 <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" v-if="scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3'" @click="del(scope.row.id)">删除</el-button>
 				  <el-button v-if="scope.row.status === '1'|| scope.row.status === '3'" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
+				  <el-button text type="primary" size="small" v-if="scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3'" @click="del(scope.row.id)">删除</el-button>
 				  <!--              当前申请人撤回-->
                 <el-button v-if="scope.row.createById === $store.state.user.id && scope.row.status==='2'" text type="primary" size="small" @click="reback(scope.row)">撤回</el-button>