Merge remote-tracking branch 'origin/master'

src/views/human/depart/handover/ComputerArrearsAddForm.vue

@@ -218,27 +218,32 @@
 						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 						throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 					} else {
-						this.loading = true
-						this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
-							if (this.commonJS.isNotEmpty(data)) {
-								if (data === '欠款回收') {
-									this.inputForm.type = '5'
-								}
-								if (data === '电脑款项检查' || data === '欠款校核') {
-									this.inputForm.assignee = this.inputForm.assigneeId
-								}
-							}
-							if (this.inputForm.imprestAmountArrears == 0) {
-								this.inputForm.type = '5'
+						this.$refs['inputForm'].validate(async (valid) => {
+							if (valid) {
+								this.loading = true
+								this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
+									if (this.commonJS.isNotEmpty(data)) {
+										if (data === '欠款回收') {
+											this.inputForm.type = '5'
+										}
+										if (data === '电脑款项检查' || data === '欠款校核') {
+											this.inputForm.assignee = this.inputForm.assigneeId
+										}
+									}
+									if (data === '电脑款项检查' & this.inputForm.imprestAmountArrears === 0) {
+										this.inputForm.type = '5'
+									}
+									handoverComputerService.save(this.inputForm).then((data) => {
+										callback(data.businessTable, data.businessId, this.inputForm)
+										this.loading = false
+									}).catch(() => {
+										this.loading = false
+									})
+								})
 							}
-							handoverComputerService.save(this.inputForm).then((data) => {
-								callback(data.businessTable, data.businessId, this.inputForm)
-								this.loading = false
-							}).catch(() => {
-								this.loading = false
-							})
 						})
 
+
 					}
 				})
 			},

src/views/human/depart/handover/HandoverAccountsAddForm.vue

@@ -219,27 +219,34 @@
 						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 						throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 					} else {
-						this.loading = true
-						this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
-							if (this.commonJS.isNotEmpty(data)) {
-								if (data === '欠款回收') {
-									this.inputForm.type = '5'
-								}
-								if (data === '检查应收账款' || data === '欠款校核') {
-									this.inputForm.assignee = this.inputForm.assigneeId
-								}
-							}
-							if (this.inputForm.imprestAmountArrears == 0) {
-								this.inputForm.type = '5'
+
+						this.$refs['inputForm'].validate(async (valid) => {
+							if (valid) {
+								this.loading = true
+								this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
+									if (this.commonJS.isNotEmpty(data)) {
+										if (data === '欠款回收') {
+											this.inputForm.type = '5'
+										}
+										if (data === '检查应收账款' || data === '欠款校核') {
+											this.inputForm.assignee = this.inputForm.assigneeId
+										}
+									}
+									if (data === '检查应收账款' & this.inputForm.imprestAmountArrears === 0) {
+										this.inputForm.type = '5'
+									}
+									handoverAccountsService.save(this.inputForm).then((data) => {
+										callback(data.businessTable, data.businessId, this.inputForm)
+										this.loading = false
+									}).catch(() => {
+										this.loading = false
+									})
+								})
 							}
-							handoverAccountsService.save(this.inputForm).then((data) => {
-								callback(data.businessTable, data.businessId, this.inputForm)
-								this.loading = false
-							}).catch(() => {
-								this.loading = false
-							})
 						})
 
+
+
 					}
 				})
 			},

src/views/human/depart/handover/HandoverImprestAddForm.vue

@@ -218,25 +218,30 @@
 						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 						throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 					} else {
-						this.loading = true
-						this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
-							if (this.commonJS.isNotEmpty(data)) {
-								if (data === '欠款回收') {
-									this.inputForm.type = '5'
-								}
-								if (data === '备用金检查' || data === '欠款校核') {
-									this.inputForm.assignee = this.inputForm.assigneeId
-								}
-							}
-							if (this.inputForm.imprestAmountArrears == 0) {
-								this.inputForm.type = '5'
+
+						this.$refs['inputForm'].validate(async (valid) => {
+							if (valid) {
+								this.loading = true
+								this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
+									if (this.commonJS.isNotEmpty(data)) {
+										if (data === '欠款回收') {
+											this.inputForm.type = '5'
+										}
+										if (data === '备用金检查' || data === '欠款校核') {
+											this.inputForm.assignee = this.inputForm.assigneeId
+										}
+									}
+									if (data === '备用金检查' & this.inputForm.imprestAmountArrears === 0) {
+										this.inputForm.type = '5'
+									}
+									handoverImprestService.save(this.inputForm).then((data) => {
+										callback(data.businessTable, data.businessId, this.inputForm)
+										this.loading = false
+									}).catch(() => {
+										this.loading = false
+									})
+								})
 							}
-							handoverImprestService.save(this.inputForm).then((data) => {
-								callback(data.businessTable, data.businessId, this.inputForm)
-								this.loading = false
-							}).catch(() => {
-								this.loading = false
-							})
 						})
 
 					}

src/views/human/depart/handover/HandoverRecoveryAddForm.vue

@@ -1,5 +1,6 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
 	<div>
+		<span style="color: red;">因离职，需将门禁卡上交</span>
 	</div>
 </template>
 

src/views/human/depart/handover/HandoverSocialSecurityAddForm.vue

@@ -219,25 +219,30 @@
 						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 						throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 					} else {
-						this.loading = true
-						this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
-							if (this.commonJS.isNotEmpty(data)) {
-								if (data === '欠款回收') {
-									this.inputForm.type = '5'
-								}
-								if (data === '社保账款检查' || data === '欠款校核') {
-									this.inputForm.assignee = this.inputForm.assigneeId
-								}
-							}
-							if (this.inputForm.imprestAmountArrears == 0) {
-								this.inputForm.type = '5'
+
+						this.$refs['inputForm'].validate(async (valid) => {
+							if (valid) {
+								this.loading = true
+								this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
+									if (this.commonJS.isNotEmpty(data)) {
+										if (data === '欠款回收') {
+											this.inputForm.type = '5'
+										}
+										if (data === '社保账款检查' || data === '欠款校核') {
+											this.inputForm.assignee = this.inputForm.assigneeId
+										}
+									}
+									if (data === '社保账款检查' & this.inputForm.imprestAmountArrears === 0) {
+										this.inputForm.type = '5'
+									}
+									handoverSocialSecurityService.save(this.inputForm).then((data) => {
+										callback(data.businessTable, data.businessId, this.inputForm)
+										this.loading = false
+									}).catch(() => {
+										this.loading = false
+									})
+								})
 							}
-							handoverSocialSecurityService.save(this.inputForm).then((data) => {
-								callback(data.businessTable, data.businessId, this.inputForm)
-								this.loading = false
-							}).catch(() => {
-								this.loading = false
-							})
 						})
 
 					}

src/views/human/enrollment/registration/EnrollmentRegistrationAddForm.vue

@@ -109,7 +109,6 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="开始时间" prop="startTime" :rules="[
-                  {required: true, message:'请填写开始时间', trigger: 'blur'}
                ]">
 						<el-date-picker
 							style="width: 100%"
@@ -122,7 +121,6 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="毕业时间" prop="endTime" :rules="[
-                  {required: true, message:'请填写毕业时间', trigger: 'blur'}
                ]">
 						<el-date-picker
 							style="width: 100%"
@@ -220,6 +218,21 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
+							<el-form-item label="员工类型" prop="onJobStatus" :rules="[
+								{required: true, message:'请选择员工类型', trigger: 'blur'}
+							]">
+								<!--						<el-input v-model="inputForm.politicalOutlook"></el-input>-->
+								<el-select v-model="inputForm.onJobStatus" placeholder="请选择员工类型" style="width:100%;">
+									<el-option
+										v-for="item in $dictUtils.getDictList('on_job_status')"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value">
+									</el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
 							<el-form-item label="进所日期" prop="entryDate" :rules="[
                   {required: true, message:'请填写进所日期', trigger: 'blur'}
                ]">
@@ -269,6 +282,19 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
+							<el-form-item label="员工类型" prop="onJobStatus" :rules="[]">
+								<!--						<el-input v-model="inputForm.politicalOutlook"></el-input>-->
+								<el-select v-model="inputForm.onJobStatus" placeholder="请选择员工类型" style="width:100%;">
+									<el-option
+										v-for="item in $dictUtils.getDictList('on_job_status')"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value">
+									</el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
 							<el-form-item label="进所日期" prop="entryDate" :rules="[
                ]">
 								<el-date-picker
@@ -578,6 +604,7 @@
 					contractStartDate: '',
 					remarks: '',
 					type: '',
+					onJobStatus: '',
 					socialSecurityNumber: '',
 					socialSecurityBankNumber: '',
 					socialSecurityPictureFront: '',
@@ -715,6 +742,7 @@
 					contractStartDate: '',
 					remarks: '',
 					type: '',
+					onJobStatus: '',
 					socialSecurityNumber: '',
 					socialSecurityBankNumber: '',
 					socialSecurityPictureFront: '',

src/views/human/enrollment/registration/EnrollmentRegistrationEditForm.vue

@@ -120,7 +120,6 @@
 							</el-col>
 							<el-col :span="12">
 								<el-form-item label="开始时间" prop="startTime" :rules="[
-                  {required: true, message:'请填写开始时间', trigger: 'blur'}
                ]">
 									<el-date-picker
 										style="width: 100%"
@@ -133,7 +132,6 @@
 							</el-col>
 							<el-col :span="12">
 								<el-form-item label="毕业时间" prop="endTime" :rules="[
-                  {required: true, message:'请填写毕业时间', trigger: 'blur'}
                ]">
 									<el-date-picker
 										style="width: 100%"
@@ -231,6 +229,21 @@
 										</el-form-item>
 									</el-col>
 									<el-col :span="12">
+										<el-form-item label="员工类型" prop="onJobStatus" :rules="[
+											{required: true, message:'请选择员工类型', trigger: 'blur'}
+										]">
+											<!--						<el-input v-model="inputForm.politicalOutlook"></el-input>-->
+											<el-select v-model="inputForm.onJobStatus" placeholder="请选择员工类型" style="width:100%;">
+												<el-option
+													v-for="item in $dictUtils.getDictList('on_job_status')"
+													:key="item.value"
+													:label="item.label"
+													:value="item.value">
+												</el-option>
+											</el-select>
+										</el-form-item>
+									</el-col>
+									<el-col :span="12">
 										<el-form-item label="进所日期" prop="entryDate" :rules="[
                   {required: true, message:'请填写进所日期', trigger: 'blur'}
                ]">
@@ -280,6 +293,20 @@
 										</el-form-item>
 									</el-col>
 									<el-col :span="12">
+										<el-form-item label="员工类型" prop="onJobStatus" :rules="[
+										]">
+											<!--						<el-input v-model="inputForm.politicalOutlook"></el-input>-->
+											<el-select v-model="inputForm.onJobStatus" placeholder="请选择员工类型" style="width:100%;">
+												<el-option
+													v-for="item in $dictUtils.getDictList('on_job_status')"
+													:key="item.value"
+													:label="item.label"
+													:value="item.value">
+												</el-option>
+											</el-select>
+										</el-form-item>
+									</el-col>
+									<el-col :span="12">
 										<el-form-item label="进所日期" prop="entryDate" :rules="[
                ]">
 											<el-date-picker
@@ -597,6 +624,7 @@
 					contractStartDate: '',
 					remarks: '',
 					type: '',
+					onJobStatus: '',
 					socialSecurityNumber: '',
 					socialSecurityBankNumber: '',
 					socialSecurityPictureFront: '',
@@ -734,6 +762,7 @@
 					contractStartDate: '',
 					remarks: '',
 					type: '',
+					onJobStatus: '',
 					socialSecurityNumber: '',
 					socialSecurityBankNumber: '',
 					socialSecurityPictureFront: '',

src/views/human/enrollment/registration/SocialSecurityInfoAddForm.vue

@@ -6,17 +6,23 @@
 			<el-divider content-position="left"><i class="el-icon-document"></i> 社保信息</el-divider>
 			<el-row :gutter="26" v-if="status === 'audit' || status === 'taskFormDetail'">
 				<el-col :span="12">
-					<el-form-item label="社保编号" prop="socialSecurityNumber" :rules="[]">
+					<el-form-item label="社保编号" prop="socialSecurityNumber" :rules="[
+						{required: true, message: '社保编号不能为空', trigger: 'blur'}
+					]">
 						<el-input v-model="inputForm.socialSecurityNumber" maxlength="10" @input="validateInput"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="社保银行卡号" prop="socialSecurityBankNumber" :rules="[]">
+					<el-form-item label="社保银行卡号" prop="socialSecurityBankNumber" :rules="[
+						{required: true, message: '社保银行卡号不能为空', trigger: 'blur'}
+					]">
 						<el-input v-model="inputForm.socialSecurityBankNumber" @change="checkBankNumber(inputForm.socialSecurityBankNumber)" maxlength="19"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="社保卡照片正面" prop="socialSecurityPictureFront" :rules="[]">
+					<el-form-item label="社保卡照片正面" prop="socialSecurityPictureFront" :rules="[
+						{required: true, message: '社保卡照片正面不能为空', trigger: 'blur'}
+					]">
 						<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
 								   :limit="limitNum"
 								   :disabled="hideUploadEdit"
@@ -63,7 +69,9 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="社保卡照片反面" prop="socialSecurityPictureOpposite" :rules="[]">
+					<el-form-item label="社保卡照片反面" prop="socialSecurityPictureOpposite" :rules="[
+						{required: true, message: '社保卡照片反面不能为空', trigger: 'blur'}
+					]">
 						<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
 								   :limit="limitNum"
 								   :disabled="hideUploadEdit2"

src/views/human/practice/reimburseRegister/ReimburseRegisterAddForm.vue

@@ -48,7 +48,7 @@
 						</el-form-item>
 					</el-col>
 				</el-form>
-				<el-form v-else style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
+				<el-form v-else-if="this.commonJS.isNotEmpty(this.inputForm.type) & this.inputForm.type !== '4'" style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
 						 :disabled="true" label-width="110px" @submit.native.prevent>
 					<el-col :span="12">
 						<el-form-item label="是否实习结束" prop="completePractice" :rules="[{required: true, message: '是否实习结束不能为空', trigger: 'change'}]">
@@ -184,6 +184,7 @@
 					allReimbursementAmount: '',
 					reimbuserName: '',
 					completePractice: '',
+					type: '',
 					detailList: [],
 				},
 				keyWatch: '',
@@ -248,6 +249,7 @@
 					allReimbursementAmount: '',
 					reimbuserName: '',
 					completePractice: '',
+					type: '',
 					detailList: [],
 				}
 				if (method === 'add') {