bug调整

src/api/sys/userService.js

@@ -119,6 +119,12 @@ export default {
 			method: "get",
 		});
 	},
+	isRsb:function() {
+		return request({
+			url: prefix + "/sys/user/isRsb",
+			method: "get",
+		});
+	},
 
 	queryDetailList(ids) {
 		return request({

src/views/jy/evection/EvectionForm.vue

@@ -396,20 +396,15 @@
 			},
 			close() {
 				this.inputForm = {
-					id:'',
+					id: '',
+					useMen:'',
+					useReason: '',
+					useDate:[],
+					remarks: '',
 					projectList:[],
-					name:'',
-					no:'',
-					projectLeader:'',
-					projectCreateDate:'',
-					createById:'',
-					createByName:'',
-					createDate:'',
-					remarks:'',
 					files: [], // 附件信息
-					types:[], //用印类型
-					number:'', //用印份数
-					projectId:'',
+					procInsId: '',
+					targetCity:'',
 				}
 				this.visible = false
 			},

src/views/jy/evection/EvectionList.vue

@@ -5,11 +5,11 @@
 			<el-form-item label="关联项目" prop="projectName">
 				<el-input :limit="1" @focus="openProgramPageForm" placeholder="请填写项目名称" :readonly="true" :modelValue="searchForm.projectName"/>
 			</el-form-item>
-			<el-form-item v-if="showHideItem" label="出差人员" prop="evectionMen">
+			<el-form-item  label="出差人员" prop="evectionMen">
 				<UserSelectSignatory style="width: 100%" ref="userSelect2" :limit="1"
 									 :readonly="true" :modelValue="searchForm.evectionMen"
 									 @update:modelValue='(value) => {searchForm.evectionMen = value}'></UserSelectSignatory>			</el-form-item>
-			<el-form-item v-if="showHideItem" label="申请人" prop="createById">
+			<el-form-item  label="申请人" prop="createById">
 				<UserSelectSignatory style="width: 100%" ref="userSelect2" :limit="1"
 									 :readonly="true" :modelValue="searchForm.createById"
 									 @update:modelValue='(value) => {searchForm.createById = value}'></UserSelectSignatory>			</el-form-item>

src/views/jy/goOut/GoOutList.vue

@@ -5,11 +5,11 @@
 			<el-form-item label="关联项目" prop="projectName">
 				<el-input :limit="1" @focus="openProgramPageForm" placeholder="请填写项目名称" :readonly="true" :modelValue="searchForm.projectName"/>
 			</el-form-item>
-			<el-form-item v-if="showHideItem" label="出差人员" prop="outMen">
+			<el-form-item  label="出差人员" prop="outMen">
 				<UserSelectSignatory style="width: 100%" ref="userSelect2" :limit="1"
 									 :readonly="true" :modelValue="searchForm.outMen"
 									 @update:modelValue='(value) => {searchForm.outMen = value}'></UserSelectSignatory>			</el-form-item>
-			<el-form-item v-if="showHideItem" label="申请人" prop="createById">
+			<el-form-item  label="申请人" prop="createById">
 				<UserSelectSignatory style="width: 100%" ref="userSelect2" :limit="1"
 									 :readonly="true" :modelValue="searchForm.createById"
 									 @update:modelValue='(value) => {searchForm.createById = value}'></UserSelectSignatory>			</el-form-item>

src/views/jy/holiday/HolidayForm.vue

@@ -332,15 +332,37 @@
 					if (valid) {
 						this.loading = true
 						console.log('form',this.inputForm)
-						this.inputForm=JSON.parse(JSON.stringify(this.inputForm))
-						this.holidayService.saveForm(this.inputForm).then((data) => {
-							callback(data.businessTable, data.businessId, this.inputForm)
-							this.$refs.inputForm.resetFields()
-							this.loading = false
-						}).catch(() => {
-							this.$refs.inputForm.resetFields()
-							this.loading = false
-						})
+						if (this.inputForm.type === '1'){
+							this.holidayService.checkType(this.inputForm).then((data)=>{
+								let day=data.split(",")
+								if (!day[0].includes(this.inputForm.days)){
+									this.loading = false
+									this.$message.error(data)
+									return
+								}else {
+									this.inputForm=JSON.parse(JSON.stringify(this.inputForm))
+									this.holidayService.saveForm(this.inputForm).then((data) => {
+										callback(data.businessTable, data.businessId, this.inputForm)
+										this.$refs.inputForm.resetFields()
+										this.loading = false
+									}).catch(() => {
+										this.$refs.inputForm.resetFields()
+										this.loading = false
+									})
+								}
+							})
+						}else {
+							this.inputForm=JSON.parse(JSON.stringify(this.inputForm))
+							this.holidayService.saveForm(this.inputForm).then((data) => {
+								callback(data.businessTable, data.businessId, this.inputForm)
+								this.$refs.inputForm.resetFields()
+								this.loading = false
+							}).catch(() => {
+								this.$refs.inputForm.resetFields()
+								this.loading = false
+							})
+						}
+
 					} else {
 						this.loading = false
 					}
@@ -414,14 +436,17 @@
 
 			},
 			checkType(){
-				if (this.inputForm.type === '1'){
-					this.holidayService.checkType(this.inputForm).then((data)=>{
+				if (this.commonJS.isEmpty(this.inputForm.startDay) || this.commonJS.isEmpty(this.inputForm.beginTime) || this.commonJS.isEmpty(this.inputForm.endDay) || this.commonJS.isEmpty(this.inputForm.endTime)){
+					this.$message.error('请选择请假时间')
+				}else {
+					if (this.inputForm.type === '1'){
+						this.holidayService.checkType(this.inputForm).then((data)=>{
 							console.log('data',data)
-						this.$message.error(data)
-						throw new Error()
-
-					})
+							this.$message.error(data)
+						})
+					}
 				}
+
 			},
 			checkTime(){
 				let differenceInDays =''

src/views/jy/holiday/HolidayList.vue

@@ -12,11 +12,11 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item v-if="showHideItem" label="请假人" prop="createById">
+			<el-form-item  label="请假人" prop="createById">
 				<UserSelectSignatory style="width: 100%" ref="userSelect2" :limit="1"
 									 :readonly="true" :modelValue="searchForm.createById"
 									 @update:modelValue='(value) => {searchForm.createById = value}'></UserSelectSignatory>			</el-form-item>
-			<el-form-item v-if="showHideItem"  prop="officeId" label="请假人部门">
+			<el-form-item   prop="officeId" label="请假人部门">
 				<SelectTree
 					ref="officeTree"
 					:props="{

src/views/jy/humanResources/DimissionForm.vue

@@ -217,7 +217,7 @@
 								}
 								let param = {status: this.inputForm.status, id: this.inputForm.id}
 								this.inputForm=JSON.stringify(this.inputForm)
-								this.dimissionService.updateStatusById(param).then(() => {
+								this.dimissionService.saveForm(this.inputForm).then(() => {
 									callback(data.businessTable, data.businessId, this.inputForm,data.days)
 									this.loading = false
 								}).catch(() => {

src/views/jy/humanResources/DimissionList.vue

@@ -2,11 +2,11 @@
 	<div class="page">
 		<el-form :inline="true"  v-if="searchVisible" class="query-form m-b-10" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
 			<!-- 搜索框-->
-			<el-form-item v-if="showHideItem" label="创建人" prop="createById">
+			<el-form-item  label="创建人" prop="createById">
 				<UserSelectSignatory style="width: 100%" ref="userSelect2" :limit="1"
 									 :readonly="true" :modelValue="searchForm.createById"
 									 @update:modelValue='(value) => {searchForm.createById = value}'></UserSelectSignatory>			</el-form-item>
-			<el-form-item v-if="showHideItem"  prop="officeId" label="部门">
+			<el-form-item   prop="officeId" label="部门">
 				<SelectTree
 					ref="officeTree"
 					:props="{
@@ -22,7 +22,7 @@
 					@getValue="(value) => {searchForm.officeId=value}"/>
 			</el-form-item>
 
-			<el-form-item v-if="showHideItem" label="离职时间" prop="dates">
+			<el-form-item label="离职时间" prop="dates">
 				<el-date-picker
 					placement="bottom-start"
 					format="YYYY-MM-DD"

src/views/jy/humanResources/EntryForm.vue

@@ -26,7 +26,7 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="出生日期" prop="birthday" :rules="[
-                  {required: true, message:'请填写出生日期', trigger: 'blur'}
+                  {required: true, message:'请填写出生日期', trigger: 'blur'},{required: true, message:'请填写出生日期', trigger: 'change'}
                ]">
 						<el-date-picker
 							style="width: 100%"

src/views/jy/humanResources/EntryList.vue

@@ -18,7 +18,7 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item label="员工状态" prop="loginFlag">
+			<el-form-item v-if="showHideItem" label="员工状态" prop="loginFlag">
 				<el-select v-model="searchForm.loginFlag" placeholder="请选择" style="width:100%;" clearable>
 					<el-option value="1" label="正常"></el-option>
 					<el-option value="0" label="冻结"></el-option>
@@ -124,8 +124,10 @@
 								<el-button text type="primary" size="small" v-if="scope.row.type==='0' || scope.row.type==='5'" @click="del(scope.row.id)">删除</el-button>
 								<el-button  size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
 							</div>
+							<div v-else-if="isRsb">
+								<el-button   size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
+							</div>
 							<div v-else>
-								<el-button v-if="hasPermission('entry:edit') "  size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('entry:del') && scope.row.type==='0' || scope.row.type==='1'|| scope.row.type==='3'" @click="del(scope.row.id)">删除</el-button>
 								<el-button v-if="hasPermission('entry:edit')&&(scope.row.type === '0'||scope.row.type === '1'|| scope.row.type === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
 								<!--              当前申请人撤回-->
@@ -196,6 +198,7 @@
 				processDefinitionId: '',
 				procDefKey: '',
 				isAdmin: false,
+				isRsb: false,
 				create: '',
 				gridData:[],
 				typeData:[]
@@ -303,6 +306,12 @@
 					this.isAdmin = data
 				})
 			},
+			//查询当前登录人的岗位是否是人事部
+			checkIsRsb(){
+				userService.isRsb().then((data)=>{
+					this.isRsb = data
+				})
+			},
 			// 获取数据列表
 			refreshList () {
 				this.loading = true
@@ -312,13 +321,14 @@
 					'orders': this.tablePage.orders,
 					...this.searchForm
 				}).then((data) => {
-					console.log('x',data.records)
+					console.log('x',this.$store.state.user)
 					this.dataList = data.records
 					this.tablePage.total = data.total
 					this.tableKey = Math.random()
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsRsb()
 				processService.getByName('嘉溢-入职申请').then((data) => {
 					console.log('data',data)
 					if (!this.commonJS.isEmpty(data.id)) {

src/views/jy/humanResources/HeirForm.vue

@@ -185,7 +185,7 @@
 					procInsId:'',
 				}
 				this.inputForm.id = id
-				console.log('this.inputForm.id', this.inputForm.id)
+				console.log('this.inputForm.id', this.status)
 				this.loading = false
 				this.$nextTick(() => {
 					this.$refs.inputForm.resetFields()
@@ -198,7 +198,7 @@
 							})
 							this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((da)=> {
 								if (this.commonJS.isNotEmpty(da)) {
-									if (da === '部门主任审核' && this.status === 'audit') {
+									if ((da === '部门主任审核' && this.status === 'audit') || ( this.status !== 'taskFormDetail' && this.status !== 'audit') ) {
 										this.isLeader = false
 									}else {
 										if (this.status === 'taskFormDetail' || this.status === 'audit' || da !== '部门主任审核' || method === 'view'){

src/views/jy/inscription/InscriptionForm.vue

@@ -304,17 +304,21 @@
 						throw new Error()
 					} else {
 						this.inputForm.status= '2'
-						if (this.commonJS.isEmpty(this.inputForm.examiner) && this.commonJS.isNotEmpty(this.inputForm.minister)){
-							this.inputForm.examiner=this.$store.state.user.id
-						}
-						if (this.commonJS.isEmpty(this.inputForm.minister)){
-							this.inputForm.minister=this.$store.state.user.id
-						}
+						// if (this.commonJS.isEmpty(this.inputForm.examiner) && this.commonJS.isNotEmpty(this.inputForm.minister)){
+						// 	this.inputForm.examiner=this.$store.state.user.id
+						// }
+						// if (this.commonJS.isEmpty(this.inputForm.minister)){
+						// 	this.inputForm.minister=this.$store.state.user.id
+						// }
 						this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data)=>{
 							if (this.commonJS.isNotEmpty(data)) {
 								if (data === '副总经理审核') {
 									this.inputForm.status = '5'
 									this.inputForm.approver=this.$store.state.user.id
+								}else if (data === '部门主任审核'){
+									this.inputForm.minister=this.$store.state.user.id
+								}else if (data === '办公室审核'){
+									this.inputForm.examiner=this.$store.state.user.id
 								}
 							}
 							let param = {status: this.inputForm.status, id: this.inputForm.id}
@@ -534,16 +538,23 @@
 				this.programRow = ''
 				// this.inputForm.reconciliationArea = this.inputForm.financeInvoiceBaseDTOList[0].location
 			},
-			updateSealType(files){
-				this.inputForm.files = files
-				let page=''
-				this.inscriptionService.getPageTotal(this.inputForm).then((data)=>{
-					console.log('datqa',data)
-					page=data-this.inputForm.colorPage
-					console.log('page',page)
-					this.inputForm.normalPage=page
-				})
-				console.log('file1',this.inputForm.normalPage)
+			updateSealType(){
+				this.inputForm.files = this.$refs.uploadComponent.getDataList()
+				console.log('this.inputForm.files',this.inputForm.files)
+				if (this.inputForm.files.length === 0 || this.commonJS.isEmpty(this.inputForm.files)){
+					this.$message.error('请先上传附件')
+					return
+				}else {
+					let page=''
+					this.inscriptionService.getPageTotal(this.inputForm).then((data)=>{
+						console.log('datqa',data)
+						page=data-this.inputForm.colorPage
+						console.log('page',page)
+						this.inputForm.normalPage=page
+					})
+					console.log('file1',this.inputForm.normalPage)
+				}
+
 			},
 
 

src/views/jy/inscription/InscriptionList.vue

@@ -5,11 +5,11 @@
 			<el-form-item label="关联项目" prop="projectName">
 				<el-input  placeholder="请填写项目名称"  v-model="searchForm.projectName"/>
 			</el-form-item>
-			<el-form-item v-if="showHideItem" label="申请人" prop="createById">
+			<el-form-item  label="申请人" prop="createById">
 				<UserSelectSignatory style="width: 100%" ref="userSelect2" :limit="1"
 									 :readonly="true" :modelValue="searchForm.createById"
 									 @update:modelValue='(value) => {searchForm.createById = value}'></UserSelectSignatory>			</el-form-item>
-			<el-form-item v-if="showHideItem"  prop="officeId" label="申请人部门">
+			<el-form-item  prop="officeId" label="申请人部门">
 				<SelectTree
 					ref="officeTree"
 					:props="{
@@ -97,8 +97,8 @@
 								<el-button  size="small" text type="primary"  @click="adminEdit(scope.row)">修改</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 === '0'||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>
 

src/views/jy/knowledgeShare/InfoForm.vue

@@ -136,9 +136,9 @@
 
         <KnowledgeShareTypePageForm ref="knowledgeShareTypePageForm" @getProgram="getProgram"></KnowledgeShareTypePageForm>
       </el-form>
-      <span slot="footer" class="dialog-footer">
-      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
-      <el-button size="small" type="primary" v-if="method != 'view'" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+      <span slot="footer" class="dialog-footer" style="float: right">
+      <el-button size="primary" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="primary" type="primary" v-if="method != 'view'" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
     </span>
     </el-dialog>
   </div>
@@ -358,7 +358,7 @@
           content: this.inputForm.content
         }
         this.loading = true
-        this.knowledgeShareInfoService.addComment(this.commentForm).then(({data}) => {
+        this.knowledgeShareInfoService.addComment(this.commentForm).then((data) => {
           this.init('view', this.inputForm.id)
           this.$message.success(data)
           this.loading = false

src/views/jy/knowledgeShare/InfoList.vue

@@ -18,8 +18,8 @@
     <div class="jp-table top" style="">
       <vxe-toolbar :refresh="{query: refreshList}" custom>
         <template #buttons>
-          <el-button v-if="hasPermission('knowledgeShare:InfoList:add')" type="primary" size="default" icon="el-icon-plus" @click="add()">新建</el-button>
-          <el-button v-if="hasPermission('knowledgeShare:InfoList:del')" type="danger"   size="default" icon="el-icon-delete" @click="del()" :disabled="$refs.typeTable && $refs.typeTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+          <el-button v-if="hasPermission('knowledgeShare:InfoList:add')"  size="primary" icon="el-icon-plus" @click="add()">新建</el-button>
+          <el-button v-if="hasPermission('knowledgeShare:InfoList:del')"    size="primary" icon="el-icon-delete" @click="del()" :disabled="$refs.typeTable && $refs.typeTable.getCheckboxRecords().length === 0" plain>删除</el-button>
         </template>
       </vxe-toolbar>
 

src/views/jy/project/ProjectMemberList.vue

@@ -63,8 +63,8 @@
 <!--          <vxe-column type="checkbox" width="60" ></vxe-column>-->
 			<vxe-column min-width="170" align="center" title="项目名称" field="name" >
 				<template #default="scope">
-					<el-link  type="primary" :underline="false" v-if="hasPermission('jy_project:info:view')" @click="view(scope.row)">{{scope.row.name}}</el-link>
-					<el-link  type="primary" :underline="false" v-else-if="hasPermission('jy_project:info:view')" @click="view(scope.row)">{{scope.row.name}}</el-link>
+					<el-link  type="primary" :underline="false" v-if="hasPermission('jyProjectRecord:list')" @click="view(scope.row)">{{scope.row.name}}</el-link>
+					<el-link  type="primary" :underline="false" v-else-if="hasPermission('jyProjectRecord:list')" @click="view(scope.row)">{{scope.row.name}}</el-link>
 					<span v-else>{{scope.row.name}}</span>
 				</template>
 			</vxe-column>
@@ -90,7 +90,7 @@
               (
               isAdmin ||
               $store.state.user.id === scope.row.createBy ||
-              $store.state.user.id === scope.row.projectLeader
+              $store.state.user.id === scope.row.projectLeader || haveProjectIds.includes(scope.row.id)
               )" text type="primary"  size="small" @click="edit(scope.row.id)">编辑</el-button>
 
             </template>

src/views/jy/workContractInfo/JyWorkContractList.vue

@@ -83,7 +83,7 @@
 		<div class="jp-table">
 			<vxe-toolbar ref="toolbarRef" :refresh="{query: refreshList}" custom>
 				<template #buttons>
-					<el-button v-if="hasPermission('jy_work_contract:info:add')" type="primary" icon="el-icon-plus" @click="add()">新建</el-button>
+					<el-button v-if="hasPermission('jy_work_contract:info:add')" :disabled="isAdmin" type="primary" icon="el-icon-plus" @click="add()">新建</el-button>
 <!--					<el-button v-if="hasPermission('jy_work_contract:info:del')" type="danger"   icon="el-icon-delete" @click="del()" :disabled="$refs.workContractTable && $refs.workContractTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
 				</template>
 			</vxe-toolbar>
@@ -134,16 +134,22 @@
 
 					<vxe-column title="操作" width="200px" fixed="right" align="center">
 						<template  #default="scope">
-							<!--归档暂存修改-->
-							<el-button v-if="hasPermission('jy_work_contract:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.filedType === '0' || scope.row.filedType === '1' ||scope.row.filedType === '3')" text type="primary"  @click="updateFiled(scope.row)">修改</el-button>
-							<!--归档撤回-->
-							<el-button v-if="hasPermission('jy_work_contract:info:back') && scope.row.filedType === '2'  && scope.row.createId === $store.state.user.id" text type="primary"   @click="rebackFiled(scope.row)">撤回</el-button>
-							<!--              合同归档  审核-->
-							<el-button v-if="scope.row.filedType==='2' && checkIsAudit(scope.row)" text type="primary"   @click="examineFiled(scope.row)">审核</el-button>
-							<!--              合同归档  被驳回后当前申请人重新调整-->
-							<el-button v-if="hasPermission('jy_work_contract:info:edit')&&scope.row.createId === $store.state.user.id&&scope.row.filedType === '4'" text type="primary"   @click="adjustFiled(scope.row)">驳回调整</el-button>
-<!--							删除-->
-							<el-button v-if="hasPermission('jy_work_contract:info:del')&&(scope.row.filedType === '0' || scope.row.filedType === '1' || scope.row.filedType === '3') &&scope.row.createId === $store.state.user.id" text type="primary"  @click="deleteById(scope.row.id)">删除</el-button>
+							<div v-if="isAdmin">
+								<el-button  text type="primary"  @click="editForm(scope.row)">修改</el-button>
+								<el-button  text type="primary"  @click="deleteById(scope.row.id)">删除</el-button>
+							</div>
+							<div v-else>
+								<!--归档暂存修改-->
+								<el-button v-if="hasPermission('jy_work_contract:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.filedType === '0' || scope.row.filedType === '1' ||scope.row.filedType === '3')" text type="primary"  @click="updateFiled(scope.row)">修改</el-button>
+								<!--归档撤回-->
+								<el-button v-if="hasPermission('jy_work_contract:info:back') && scope.row.filedType === '2'  && scope.row.createId === $store.state.user.id" text type="primary"   @click="rebackFiled(scope.row)">撤回</el-button>
+								<!--              合同归档  审核-->
+								<el-button v-if="scope.row.filedType==='2' && checkIsAudit(scope.row)" text type="primary"   @click="examineFiled(scope.row)">审核</el-button>
+								<!--              合同归档  被驳回后当前申请人重新调整-->
+								<el-button v-if="hasPermission('jy_work_contract:info:edit')&&scope.row.createId === $store.state.user.id&&scope.row.filedType === '4'" text type="primary"   @click="adjustFiled(scope.row)">驳回调整</el-button>
+								<!--							删除-->
+								<el-button v-if="hasPermission('jy_work_contract:info:del')&&(scope.row.filedType === '0' || scope.row.filedType === '1' || scope.row.filedType === '3') &&scope.row.createId === $store.state.user.id" text type="primary"  @click="deleteById(scope.row.id)">删除</el-button>
+							</div>
 							</template>
 					</vxe-column>
 				</vxe-table>
@@ -333,11 +339,8 @@
 				})
 			},
 			// 管理员修改
-			editForm (id) {
-				id = id || this.$refs.workClientTable.getCheckboxRecords().map(item => {
-					return item.id
-				})[0]
-				this.$refs.workContractForm2.init('edit', id)
+			editForm (row) {
+				this.$refs.contractAddForm.init('edit', row.id)
 			},
 			// 查看
 			view (id) {

src/views/jy/workContractInfo/WorkContractForm.vue

@@ -1017,6 +1017,9 @@
 						this.inputForm.workAttachmentList = this.$refs.uploadComponent.getDataList()
 						this.inputForm.filedType = '2'
 						console.log('3',this.inputForm)
+						if (this.commonJS.isNotEmpty(this.inputForm.contractNo)){
+							this.inputForm.contractTypes=[]
+						}
 						this.contractService.save(this.inputForm).then((data) => {
 							this.inputForm.id = data.businessId
 							this.contractService.findContractById(this.inputForm.id).then((da)=>{

src/views/materialManagement/userSeal/SignetAddForm.vue

@@ -38,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="{}">
@@ -113,6 +113,7 @@
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	import ProjectForm from './ProjectForm'
 	import dictService from "@/api/sys/dictService";
+	import CommonApi from '@/api/cw/common/CommonApi'
 	export default {
 		props: {
 			businessId: {
@@ -148,6 +149,7 @@
 					types:[], //用印类型
 					number:'', //用印份数
 					projectId:'',
+					procInsId: '',
 				},
 				programRow:'',
 				baseKey:'',
@@ -157,9 +159,11 @@
 			}
 		},
 		SignetService: null,
+		commonApi: null,
 		created () {
 			console.log('jld ')
 			this.signetService = new SignetService()
+			this.commonApi = new CommonApi()
 			this.getTypeList()
 		},
 		mounted () {
@@ -225,6 +229,7 @@
 					types:[], //用印类型
 					number:'', //用印份数
 					projectId:'',
+					procInsId: '',
 				}
 				this.typeData.forEach(option => {
 					option.disabled = false
@@ -247,6 +252,9 @@
 							if (this.commonJS.isEmpty(this.inputForm.createDate)) {
 								this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD')
 							}
+							if (this.commonJS.isEmpty(this.inputForm.projectList)) {
+								this.inputForm.projectList = []
+							}
 							if (this.status === 'audit' || this.status === 'taskFormDetail') {
 								method = 'view'
 							}
@@ -284,19 +292,22 @@
 						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 						throw new Error()
 					} else {
-						if (this.$store.state.user.name==='leader'){
-							this.inputForm.status= '5'
-						}else {
-							this.inputForm.status= '2'
-						}
+						this.inputForm.status= '2'
+						this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data)=> {
+							if (this.commonJS.isNotEmpty(data)) {
+								if (data === '总经理审核') {
+									this.inputForm.status = '5'
+								}
+							}
 							let param = {status: this.inputForm.status, id: this.inputForm.id}
-							this.inputForm=JSON.stringify(this.inputForm)
+							this.inputForm = JSON.stringify(this.inputForm)
 							this.signetService.updateStatusById(param).then(() => {
 								callback(data.businessTable, data.businessId, this.inputForm)
 								this.loading = false
 							}).catch(() => {
 								this.loading = false
 							})
+						})
 					}
 				})
 			},
@@ -431,7 +442,7 @@
 						r.projectId=item.id
 						r.name = item.name
 						r.no = item.no
-						r.projectLeader = item.projectLeader
+						r.leader = item.projectLeader
 						r.createTime = item.createTime
 						console.log('2',this.inputForm.projectList[this.programRow])
 					} else {
@@ -439,7 +450,7 @@
 							projectId: item.id,
 							name: item.name,
 							no: item.no,
-							projectLeader: item.projectLeader,
+							leader: item.projectLeader,
 							createTime: item.createTime,
 						}
 						this.$refs.baseTable.insertAt(r)