瀏覽代碼

人力资源页面调整

user5 1 年之前
父節點
當前提交
ec07df7181

+ 1 - 1
src/views/human/depart/handover/ComputerArrearsAddForm.vue

@@ -235,7 +235,7 @@
 											this.inputForm.assignee = this.inputForm.assigneeId
 										}
 									}
-									if (data === '电脑款项检查' & this.inputForm.imprestAmountArrears === 0) {
+									if (data === '电脑款项检查' & this.inputForm.imprestAmountArrears === '0') {
 										this.inputForm.type = '5'
 									}
 									handoverComputerService.save(this.inputForm).then((data) => {

+ 1 - 1
src/views/human/depart/handover/HandoverAccountsAddForm.vue

@@ -237,7 +237,7 @@
 											this.inputForm.assignee = this.inputForm.assigneeId
 										}
 									}
-									if (data === '检查应收账款' & this.inputForm.imprestAmountArrears === 0) {
+									if (data === '检查应收账款' & this.inputForm.imprestAmountArrears === '0') {
 										this.inputForm.type = '5'
 									}
 									handoverAccountsService.save(this.inputForm).then((data) => {

+ 1 - 1
src/views/human/depart/handover/HandoverImprestAddForm.vue

@@ -236,7 +236,7 @@
 											this.inputForm.assignee = this.inputForm.assigneeId
 										}
 									}
-									if (data === '备用金检查' & this.inputForm.imprestAmountArrears === 0) {
+									if (data === '备用金检查' & this.inputForm.imprestAmountArrears === '0') {
 										this.inputForm.type = '5'
 									}
 									handoverImprestService.save(this.inputForm).then((data) => {

+ 1 - 1
src/views/human/depart/handover/HandoverSocialSecurityAddForm.vue

@@ -237,7 +237,7 @@
 											this.inputForm.assignee = this.inputForm.assigneeId
 										}
 									}
-									if (data === '社保账款检查' & this.inputForm.imprestAmountArrears === 0) {
+									if (data === '社保账款检查' & this.inputForm.imprestAmountArrears === '0') {
 										this.inputForm.type = '5'
 									}
 									handoverSocialSecurityService.save(this.inputForm).then((data) => {

+ 1 - 1
src/views/human/depart/registration/DepartRegistrationList.vue

@@ -148,7 +148,7 @@
 					<el-button v-if="scope.row.createById === $store.state.user.id && scope.row.type === '5'&& scope.row.handoverType === '4'" text type="primary"  @click="adjustHandover(scope.row)">驳回调整</el-button>
 
 
-					<el-button v-if="scope.row.handoverType === '5' && (scope.row.createById === $store.state.user.id)" text type="primary" @click="toHref(scope.row)">离职证明下载</el-button>
+					<el-button v-if="scope.row.recoveryType === '5' && (scope.row.createById === $store.state.user.id)" text type="primary" @click="toHref(scope.row)">离职证明下载</el-button>
 
 				</div>
             </template>

+ 1 - 1
src/views/human/enrollment/registration/EnrollmentRegistrationList.vue

@@ -67,7 +67,7 @@
 
           <vxe-column title="操作" width="200px" fixed="right" align="center">
             <template  #default="scope">
-              <div v-if="isAdmin">
+              <div v-if="hasPermission('enrollmentRegistration:edit')">
                 <el-button v-if="
                       scope.row.type === '5' || scope.row.type === '4' || scope.row.type === '3'" text type="primary" @click="edit(scope.row.id)">修改</el-button>
                 <el-button v-if="

+ 2 - 2
src/views/human/practice/register/RegistrationBankAddForm.vue

@@ -7,12 +7,12 @@
 			<el-row :gutter="26">
 				<el-col :span="12">
 					<el-form-item label="姓名" prop="name" :rules="[{required: true, message: '姓名不能为空', trigger: 'blur'}]">
-						<el-input v-model="inputForm.name"></el-input>
+						<el-input :disabled="true" v-model="inputForm.name"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="银行卡号" prop="bankCardNumber" :rules="[{required: true, message: '银行卡号不能为空', trigger: 'blur'}]">
-						<el-input v-model="inputForm.bankCardNumber" @change="checkBankNumber(inputForm.bankCardNumber)"></el-input>
+						<el-input v-model="inputForm.bankCardNumber" maxlength="19" @change="checkBankNumber(inputForm.bankCardNumber)"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">

+ 1 - 1
src/views/human/practice/register/RegistrationList.vue

@@ -84,7 +84,7 @@
 
           <vxe-column title="操作" width="200px" fixed="right" align="center">
             <template  #default="scope">
-              <div v-if="isAdmin">
+              <div v-if="hasPermission('register:edit')">
                 <el-button v-if="
                       scope.row.type === '5' || scope.row.type === '4' || scope.row.type === '3'" text type="primary" @click="edit(scope.row.id)">修改</el-button>
                 <el-button v-if="

+ 2 - 2
src/views/human/practice/reimburseRegister/ReimburseRegisterAddForm.vue

@@ -48,7 +48,7 @@
 						</el-form-item>
 					</el-col>
 				</el-form>
-				<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':''"
+				<el-form v-else-if="this.commonJS.isNotEmpty(this.inputForm.type) && this.inputForm.type !== '4' && this.inputForm.type !== '3'" 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'}]">
@@ -112,7 +112,7 @@
 						</vxe-table-column>
 						<vxe-table-column   field="reimbursementAmount" align="center"   title="报销金额(元)" :edit-render="{}">
 							<template v-slot:edit="scope">
-								<el-input
+								<el-input :disabled="true"
 									v-on:input="scope.row.reimbursementAmount=scope.row.reimbursementAmount.replace(/[^\d.]/g,'')
 							  .replace(/^\./g,'')
 							  .replace(/\.{2,}/g,'.')