调整代码提交

src/views/jy/holiday/HolidayForm.vue

@@ -269,7 +269,7 @@
 						throw new Error()
 					} else {
 						this.inputForm.status= '2'
-						if (this.inputForm.days>2){
+						if (this.inputForm.days >= 2){
 							this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((da)=>{
 								if (this.commonJS.isNotEmpty(da)) {
 									if (da === '总经理审核') {

src/views/jy/humanResources/EntryDia.vue

@@ -473,7 +473,7 @@
 					this.$refs.idCards.setDividerName('身份证')
 					this.$refs.trainings.setDividerName('培训证书')
 					this.$refs.professional.setDividerName('职称')
-					this.$refs.resignation.setDividerName('离职证明')
+					this.$refs.resignation.setDividerName('上家单位的离职证明')
 					return this.businessId
 				},
 				set (val) {
@@ -630,7 +630,7 @@
 						this.$refs.idCards.newUpload(method, this.inputForm.idCards, 'idCards',null,'身份证')
 						this.$refs.trainings.newUpload(method, this.inputForm.trainings, 'trainings',null,'培训证书')
 						this.$refs.professional.newUpload(method, this.inputForm.professional, 'professional',null,'职称')
-						this.$refs.resignation.newUpload(method, this.inputForm.resignation, 'resignation',null,'离职证明')
+						this.$refs.resignation.newUpload(method, this.inputForm.resignation, 'resignation',null,'上家单位的离职证明')
 						this.loading = false
 					})
 					roleService.list2({current: 1, size: -1}).then((data) => {

src/views/jy/humanResources/EntryForm.vue

@@ -459,7 +459,7 @@
 					this.$refs.idCards.setDividerName('身份证')
 					this.$refs.trainings.setDividerName('培训证书')
 					this.$refs.professional.setDividerName('职称')
-					this.$refs.resignation.setDividerName('离职证明')
+					this.$refs.resignation.setDividerName('上家单位的离职证明')
 					return this.businessId
 				},
 				set (val) {
@@ -614,7 +614,7 @@
 						this.$refs.idCards.newUpload(method, this.inputForm.idCards, 'idCards',null,'身份证')
 						this.$refs.trainings.newUpload(method, this.inputForm.trainings, 'trainings',null,'培训证书')
 						this.$refs.professional.newUpload(method, this.inputForm.professional, 'professional',null,'职称')
-						this.$refs.resignation.newUpload(method, this.inputForm.resignation, 'resignation',null,'离职证明')
+						this.$refs.resignation.newUpload(method, this.inputForm.resignation, 'resignation',null,'上家单位的离职证明')
 						this.loading = false
 					})
 					roleService.list2({current: 1, size: -1}).then((data) => {

src/views/jy/inscription/InscriptionForm.vue

@@ -565,6 +565,7 @@
 						console.log('page',page)
 						if (page <0){
 							this.$message.error('彩页数量不正确或上传文件不正确')
+							this.inputForm.colorPage = ''
 						}else {
 							this.inputForm.normalPage=page
 						}

src/views/jy/workContractInfo/JyWorkContractList.vue

@@ -117,7 +117,6 @@
 <!--					<vxe-column type="checkbox" width="50px"></vxe-column>-->
 
 					<vxe-column min-width="200px" title="合同编号" field="no" align="center"></vxe-column>
-					<vxe-column min-width="200px" title="合同类型" field="contractType" align="center"></vxe-column>
 					<vxe-column min-width="200px" title="合同名称" field="name" align="center">
 						<template #default="scope">
 							<el-link  type="primary" :underline="false" v-if="hasPermission('jy_work_contract:info:edit')" @click="view(scope.row.id)">{{scope.row.name}}</el-link>
@@ -125,6 +124,7 @@
 							<span v-else>{{scope.row.name}}</span>
 						</template>
 					</vxe-column>
+					<vxe-column min-width="200px" title="合同类型" field="contractType" align="center"></vxe-column>
 					<vxe-column min-width="200px" title="客户名称" field="primaryLinkman" align="center"></vxe-column>
 					<vxe-column min-width="100px" title="合同金额(元)" field="contractAmount" align="center"></vxe-column>
 					<vxe-column min-width="100px" title="创建人" field="createName" align="center"></vxe-column>