Browse Source

入职社保与银行卡完善调整

wangqiang 1 year ago
parent
commit
202a623671

+ 26 - 0
src/api/human/enrollment/EnrollmentWageCardService.js

@@ -0,0 +1,26 @@
+import request from "@/utils/httpRequest";
+import { REGISTER_PATH as prefix } from "../../AppPath";
+
+export default {
+	saveWageCard (inputForm) {
+		return request({
+			url: prefix +  `/enrollmentWageCard/saveWageCard`,
+			method: 'post',
+			data: inputForm
+		})
+	},
+	findWageCardById (id) {
+		return request({
+			url: prefix + '/enrollmentWageCard/findWageCardById',
+			method: 'get',
+			params: {id: id}
+		})
+	},
+	updateWageCardStatusById (param) {
+		return request({
+			url: prefix + '/enrollmentWageCard/updateWageCardStatusById',
+			method: 'post',
+			data: param
+		})
+	},
+}

+ 71 - 0
src/views/cw/reimbursementApproval/info/InfoForm.vue

@@ -509,6 +509,73 @@
 			</el-col>
           </el-row>
         </div>
+		  <div v-if="inputForm.sourceType === '6'">
+			  <el-divider content-position="left"><i class="el-icon-document"></i>
+				  实习报销详情
+				  <el-button size="default" style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' || this.formReadOnly" @click="insertEvent('human')" plain>
+					  新增
+				  </el-button>
+			  </el-divider>
+			  <el-row  :gutter="15" >
+				  <el-col :span="24">
+					  <vxe-table
+						  border
+						  show-footer
+						  show-overflow
+						  :footer-method="footerMethod"
+						  ref="humanTableProcured"
+						  class="vxe-table-element"
+						  :data="inputForm.humanInfoProcured"
+						  style="margin-left: 5em"
+						  :key="humanKeyProcured"
+						  highlight-current-row
+						  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
+						  :edit-rules="validRules"
+					  >
+						  <vxe-table-column field="userName" title="报销人" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销人', trigger:'blur'}]">
+							  <template v-slot:edit="scope">
+								  <el-input v-model="scope.row.userName" @focus="userPullListForm6(scope.$rowIndex)"></el-input>
+							  </template>
+						  </vxe-table-column>
+						  <vxe-table-column field="deptName" title="报销部门" :edit-render="{}" show-overflow="title">
+							  <template v-slot:edit="scope">
+								  <el-input :disabled='true' v-model="scope.row.deptName" ></el-input>
+							  </template>
+						  </vxe-table-column>
+						  <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
+							  <template #edit="scope">
+								  <el-input v-model="scope.row.typeName" @focus="typePullForm6(scope.$rowIndex, scope.row.deptId)"></el-input>
+							  </template>
+						  </vxe-table-column>
+						  <vxe-table-column field="reimbuserName" title="报销登记名称" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请填写报销登记名称', trigger:'blur'}]">
+							  <template v-slot:edit="scope">
+								  <el-input v-model="scope.row.reimbuserName" @focus="openProgramPageForm6(scope.$rowIndex, scope.row)"></el-input>
+							  </template>
+						  </vxe-table-column>
+						  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
+							  <template v-slot:edit="scope">
+								  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							  </template>
+						  </vxe-table-column>
+						  <vxe-table-column field="bankCardNumber" title="银行卡号" :edit-render="{}" show-overflow="title">
+							  <template v-slot:edit="scope">
+								  <el-input :disabled='true' v-model="scope.row.bankCardNumber" ></el-input>
+							  </template>
+						  </vxe-table-column>
+						  <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title">
+							  <template v-slot:edit="scope">
+								  <el-input v-model="scope.row.content" ></el-input>
+							  </template>
+						  </vxe-table-column>
+						  <vxe-table-column title="操作" width="100">
+							  <template v-slot="scope">
+								  <el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'procured')">删除</el-button>
+							  </template>
+						  </vxe-table-column>
+					  </vxe-table>
+				  </el-col>
+			  </el-row>
+		  </div>
 
 		  <div v-if="inputForm.reimbursementType === '0'">
         <el-divider content-position="left"><i class="el-icon-document"></i>
@@ -679,6 +746,7 @@
         method: '',
         visible: false,
         loading: false,
+		  humanKeyProcured: '',
         inputForm: {
 			reimbursementType: '0',
           userName: '',
@@ -691,6 +759,7 @@
           detailInfoReports: [],
           detailInfoOthers: [],
           detailInfoProcured: [],
+			humanInfoProcured: [],
 			invoiceReimbursements: [],
 			invoiceReimbursementFiles: [], // 电子发票附件信息
           amountInfos: [],
@@ -737,6 +806,7 @@
           detailInfoReports: [],
           detailInfoOthers: [],
           detailInfoProcured: [],
+			humanInfoProcured: [],
           sourceType: '',
           preList: [],
           purchaseNo: '',
@@ -849,6 +919,7 @@
         this.inputForm.detailInfoReports = []
         this.inputForm.detailInfoOthers = []
         this.inputForm.detailInfoProcured = []
+		  humanInfoProcured: [],
         this.inputForm.purchaseNo = ''
         this.inputForm.preList = ''
         this.inputForm.purchaseId = ''

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

@@ -963,7 +963,7 @@
 			handleAvatarSuccess2 (res, file, fileList, index, val) {
 				console.log('foleList', fileList)
 				if (val === 'front') {
-					this.inputForm.socialSecurityPictureOpposite = res.url
+					this.inputForm.socialSecurityPictureOpposite = '/' + res.url
 					this.inputForm.socialSecurityPictureOppositeUrl = res.lsUrl
 				}
 				this.hideUploadEdit = true

File diff suppressed because it is too large
+ 1030 - 0
src/views/human/enrollment/registration/EnrollmentRegistrationEditForm.vue


+ 23 - 7
src/views/human/enrollment/registration/EnrollmentRegistrationList.vue

@@ -2,9 +2,12 @@
   <div class="page">
     <el-form :inline="true" class="query-form m-b-10" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
       <!-- 搜索框-->
-      <el-form-item label="项目编号" prop="projectNumber">
-        <el-input v-model="searchForm.projectNumber" placeholder="请输入项目编号" clearable></el-input>
-      </el-form-item>
+		<el-form-item label="姓名" prop="name">
+			<el-input v-model="searchForm.name" placeholder="请输入姓名" clearable></el-input>
+		</el-form-item>
+		<el-form-item label="联系电话" prop="mobilePhone">
+			<el-input v-model="searchForm.mobilePhone" placeholder="请输入联系电话" clearable></el-input>
+		</el-form-item>
 
       <el-form-item>
         <el-button type="primary" @click="refreshList()" icon="el-icon-search">查询</el-button>
@@ -43,7 +46,11 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
-          <vxe-column min-width="160" align="center" title="姓名" field="name"></vxe-column>
+          <vxe-column min-width="160" align="center" title="姓名" field="name">
+			  <template #default="scope">
+				  <el-link  type="primary" :underline="false" @click="view(scope.row.id)">{{scope.row.name}}</el-link>
+			  </template>
+		  </vxe-column>
           <vxe-column min-width="160" align="center" title="政治面貌" field="politicalOutlook">
 			  <template #default="scope">
 				  {{$dictUtils.getDictLabel('political_outlook', scope.row.politicalOutlook, '')}}
@@ -61,8 +68,8 @@
           <vxe-column title="操作" width="200px" fixed="right" align="center">
             <template  #default="scope">
               <div v-if="isAdmin">
-<!--                <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="
+                      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="
                       scope.row.type === '5' || scope.row.type === '4' || scope.row.type === '3'" text type="primary" @click="del(scope.row.id)">删除</el-button>
               </div>
@@ -80,10 +87,12 @@
         </vxe-pager>
       </div>
     </div>
+	  <EnrollmentRegistrationEditForm ref="enrollmentRegistrationEditForm" @refreshList="refreshList"></EnrollmentRegistrationEditForm>
   </div>
 </template>
 
 <script>
+	import EnrollmentRegistrationEditForm from './EnrollmentRegistrationEditForm'
   import enrollmentRegistrationService from '@/api/human/enrollment/EnrollmentRegistrationService'
   import processService from '@/api/flowable/ProcessService'
   import userService from '@/api/sys/UserService'
@@ -94,7 +103,8 @@
       return {
         num: 0,
         searchForm: {
-          projectNumber: '',
+          name: '',
+			mobilePhone: '',
         },
         dataList: [],
         tablePage: {
@@ -115,6 +125,7 @@
     created () {
     },
     components: {
+		EnrollmentRegistrationEditForm,
     },
     computed: {
       userName () {
@@ -141,11 +152,16 @@
       // 新增
       add () {
       },
+		// 查看
+		view (id) {
+			this.$refs.enrollmentRegistrationEditForm.init('view', id)
+		},
       // 修改
       edit (id) {
         id = id || this.$refs.clientTable.getCheckboxRecords().map(item => {
           return item.id
         })[0]
+		  this.$refs.enrollmentRegistrationEditForm.init('edit', id)
       },
       // 查询当前用户是否是管理员用户
       checkIsAdmin () {

+ 131 - 9
src/views/human/enrollment/registration/SocialSecurityInfoAddForm.vue

@@ -4,14 +4,120 @@
 				 label-width="100px" @submit.native.prevent>
 
 			<el-divider content-position="left"><i class="el-icon-document"></i> 社保信息</el-divider>
-			<el-row :gutter="26">
+			<el-row :gutter="26" v-if="status === 'audit' || status === 'taskFormDetail'">
 				<el-col :span="12">
-					<el-form-item label="社保编号" prop="socialSecurityNumber" :rules="[{required: true, message: '社保编号不能为空', trigger: 'blur'}]">
-						<el-input v-model="inputForm.socialSecurityNumber" maxlength="10"></el-input>
+					<el-form-item label="社保编号" prop="socialSecurityNumber" :rules="[]">
+						<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="[{required: true, message: '社保银行卡号不能为空', trigger: 'blur'}]">
+					<el-form-item label="社保银行卡号" prop="socialSecurityBankNumber" :rules="[]">
+						<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-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
+								   :limit="limitNum"
+								   :disabled="hideUploadEdit"
+								   list-type="picture-card"
+								   :auto-upload="true"
+								   :on-success="handleUploadSuccess"
+								   v-model:file-list="fileList"
+						>
+							<el-icon><Plus /></el-icon>
+
+							<template #file="{ file }">
+								<div>
+									<img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
+									<span class="el-upload-list__item-actions">
+										  <span
+											  class="el-upload-list__item-preview"
+											  @click="handlePictureCardPreview(file)"
+										  >
+											<el-icon><zoom-in /></el-icon>
+										  </span>
+										  <span
+											  v-if="!disabled"
+											  class="el-upload-list__item-delete"
+											  @click="handleDownload(file)"
+										  >
+											<el-icon><Download /></el-icon>
+										  </span>
+										  <span
+											  v-if="!disabled"
+											  style="display:none;"
+											  class="el-upload-list__item-delete"
+											  @click="handleRemove(file,fileList)"
+										  >
+											<el-icon><Delete /></el-icon>
+										  </span>
+									</span>
+								</div>
+							</template>
+						</el-upload>
+						<el-dialog v-model="dialogVisible">
+							<img w-full :src="inputForm.socialSecurityPictureFrontUrl" alt="Preview Image" :style="{ maxWidth: '100%', maxHeight: '100%' }"/>
+						</el-dialog>
+
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="社保卡照片反面" prop="socialSecurityPictureOpposite" :rules="[]">
+						<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
+								   :limit="limitNum"
+								   :disabled="hideUploadEdit2"
+								   list-type="picture-card"
+								   :auto-upload="true"
+								   :on-success="handleUploadSuccess2"
+								   v-model:file-list="fileList2"
+						>
+							<el-icon><Plus /></el-icon>
+
+							<template #file="{ file }">
+								<div>
+									<img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
+									<span class="el-upload-list__item-actions">
+										  <span
+											  class="el-upload-list__item-preview"
+											  @click="handlePictureCardPreview2(file)"
+										  >
+											<el-icon><zoom-in /></el-icon>
+										  </span>
+										  <span
+											  v-if="!disabled"
+											  class="el-upload-list__item-delete"
+											  @click="handleDownload2(file)"
+										  >
+											<el-icon><Download /></el-icon>
+										  </span>
+										  <span
+											  v-if="!disabled"
+											  style="display:none;"
+											  class="el-upload-list__item-delete"
+											  @click="handleRemove2(file,fileList2)"
+										  >
+											<el-icon><Delete /></el-icon>
+										  </span>
+									</span>
+								</div>
+							</template>
+						</el-upload>
+						<el-dialog v-model="dialogVisible2">
+							<img w-full :src="inputForm.socialSecurityPictureOppositeUrl" alt="Preview Image" :style="{ maxWidth: '100%', maxHeight: '100%' }"/>
+						</el-dialog>
+
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="26" v-else>
+				<el-col :span="12">
+					<el-form-item label="社保编号" prop="socialSecurityNumber" :rules="[]">
+						<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-input v-model="inputForm.socialSecurityBankNumber" @change="checkBankNumber(inputForm.socialSecurityBankNumber)" maxlength="19"></el-input>
 					</el-form-item>
 				</el-col>
@@ -140,6 +246,7 @@
 		data () {
 			return {
 				testFlag: false,
+				disabled: false,
 				limitNum: 1,
 				fileList: [],
 				fileList2: [],
@@ -226,15 +333,26 @@
 				}
 			},
 			handleDownload(file) {
-				toHref(file)
+				let file2 = {
+					url: this.inputForm.socialSecurityPictureFront
+				}
+				toHref(file2)
 			},
 			handleDownload2(file) {
-				toHref(file)
+				let file2 = {
+					url: this.inputForm.socialSecurityPictureOpposite
+				}
+				toHref(file2)
 			},
 			handlePictureCardPreview(file) {
+				this.dialogImageUrl = file.url;
+				this.inputForm.socialSecurityPictureFrontUrl = file.url
+				console.log('file.url1', file.url)
 				this.dialogVisible = true;
 			},
 			handlePictureCardPreview2(file) {
+				this.dialogImageUrl = file.url;
+				this.inputForm.socialSecurityPictureOppositeUrl = file.url
 				this.dialogVisible2 = true;
 			},
 			handleUploadSuccess(response, file,fileList) {
@@ -246,7 +364,7 @@
 			handleAvatarSuccess (res, file, fileList, index, val) {
 				console.log('foleList', fileList)
 				if (val === 'front') {
-					this.inputForm.socialSecurityPictureFront = res.url
+					this.inputForm.socialSecurityPictureFront = '/' + res.url
 					this.inputForm.socialSecurityPictureFrontUrl = res.lsUrl
 				}
 				this.hideUploadEdit = true
@@ -255,7 +373,7 @@
 			handleAvatarSuccess2 (res, file, fileList, index, val) {
 				console.log('foleList', fileList)
 				if (val === 'front') {
-					this.inputForm.socialSecurityPictureOpposite = res.url
+					this.inputForm.socialSecurityPictureOpposite = '/' + res.url
 					this.inputForm.socialSecurityPictureOppositeUrl = res.lsUrl
 				}
 				this.hideUploadEdit = true
@@ -395,7 +513,7 @@
 			async agreeForm (callback) {
 				this.loading = true
 				enrollmentRegistrationService.findSocialCardById(this.inputForm.id).then((data) => {
-					if (data.type !== '2') { // 审核状态不是“审核中”,就弹出提示
+					if (data.type !== '2' & data) { // 审核状态不是“审核中”,就弹出提示
 						this.loading = false
 						this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
 						throw new Error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
@@ -459,6 +577,10 @@
 					})
 				}
 			},
+			validateInput() {
+				// 使用正则表达式验证输入内容,禁止中文
+				this.inputForm.socialSecurityNumber = this.inputForm.socialSecurityNumber.replace(/[\u4e00-\u9fa5]/g, '');
+			}
 		}
 	}
 </script>

+ 40 - 20
src/views/human/enrollment/registration/WageCardInfoAddForm.vue

@@ -250,7 +250,7 @@
 </template>
 
 <script>
-	import enrollmentRegistrationService from '@/api/human/enrollment/EnrollmentRegistrationService'
+	import enrollmentWageCardService from '@/api/human/enrollment/EnrollmentWageCardService'
 	import CommonApi from '@/api/cw/common/CommonApi'
 	import OSSSerivce, {
 		httpRequest,
@@ -388,27 +388,47 @@
 				}
 			},
 			handleDownload(file) {
-				toHref(file)
+				let file2 = {
+					url: this.inputForm.accountHolderFront
+				}
+				toHref(file2)
 			},
 			handleDownload2(file) {
-				toHref(file)
+				let file2 = {
+					url: this.inputForm.accountHolderOpposite
+				}
+				toHref(file2)
 			},
 			gsHandleDownload(file) {
-				toHref(file)
+				let file2 = {
+					url: this.inputForm.gsAccountHolderFront
+				}
+				toHref(file2)
 			},
 			gsHandleDownload2(file) {
-				toHref(file)
+				let file2 = {
+					url: this.inputForm.gsAccountHolderOpposite
+				}
+				toHref(file2)
 			},
 			handlePictureCardPreview(file) {
+				this.dialogImageUrl = file.url;
+				this.inputForm.accountHolderFrontUrl = file.url
 				this.dialogVisible = true;
 			},
 			handlePictureCardPreview2(file) {
+				this.dialogImageUrl = file.url;
+				this.inputForm.accountHolderOppositeUrl = file.url
 				this.dialogVisible2 = true;
 			},
 			gsHandlePictureCardPreview(file) {
+				this.dialogImageUrl = file.url;
+				this.inputForm.gsAccountHolderFrontUrl = file.url
 				this.gsDialogVisible = true;
 			},
 			gsHandlePictureCardPreview2(file) {
+				this.dialogImageUrl = file.url;
+				this.inputForm.gsAccountHolderOppositeUrl = file.url
 				this.gsDialogVisible2 = true;
 			},
 			handleUploadSuccess(response, file,fileList) {
@@ -425,7 +445,7 @@
 			},
 			handleAvatarSuccess (res, file, fileList, index, val) {
 				if (val === 'front') {
-					this.inputForm.accountHolderFront = res.url
+					this.inputForm.accountHolderFront = '/' +res.url
 					this.inputForm.accountHolderFrontUrl = res.lsUrl
 				}
 				this.hideUploadEdit = true
@@ -433,7 +453,7 @@
 			},
 			handleAvatarSuccess2 (res, file, fileList, index, val) {
 				if (val === 'front') {
-					this.inputForm.accountHolderOpposite = res.url
+					this.inputForm.accountHolderOpposite = '/' +res.url
 					this.inputForm.accountHolderOppositeUrl = res.lsUrl
 				}
 				this.hideUploadEdit2 = true
@@ -441,7 +461,7 @@
 			},
 			gsHandleAvatarSuccess (res, file, fileList, index, val) {
 				if (val === 'front') {
-					this.inputForm.gsAccountHolderFront = res.url
+					this.inputForm.gsAccountHolderFront = '/' +res.url
 					this.inputForm.gsAccountHolderFrontUrl = res.lsUrl
 				}
 				this.hideUploadEdit = true
@@ -449,7 +469,7 @@
 			},
 			gsHandleAvatarSuccess2 (res, file, fileList, index, val) {
 				if (val === 'front') {
-					this.inputForm.gsAccountHolderOpposite = res.url
+					this.inputForm.gsAccountHolderOpposite = '/' +res.url
 					this.inputForm.gsAccountHolderOppositeUrl = res.lsUrl
 				}
 				this.hideUploadEdit2 = true
@@ -488,7 +508,7 @@
 				this.loading = false
 				this.$nextTick(() => {
 					this.loading = true
-					enrollmentRegistrationService.findWageCardById(this.inputForm.id).then( async (data) => {
+					enrollmentWageCardService.findWageCardById(this.inputForm.id).then( async (data) => {
 						this.fileList = []
 						this.fileList2 = []
 						if (this.status === 'audit' || this.status === 'taskFormDetail') {
@@ -551,7 +571,7 @@
 							this.inputForm.files = []
 						}
 						this.inputForm.id = this.businessId
-						enrollmentRegistrationService.saveWageCard(this.inputForm).then((data) => {
+						enrollmentWageCardService.saveWageCard(this.inputForm).then((data) => {
 							this.close()
 							this.$message.success(data)
 							this.$emit('refreshDataList')
@@ -570,7 +590,7 @@
 			},
 			reapplyForm (callback) {
 				this.loading = true
-				enrollmentRegistrationService.findWageCardById(this.inputForm.id).then((data) => {
+				enrollmentWageCardService.findWageCardById(this.inputForm.id).then((data) => {
 					if (data.type !== '4') { // 审核状态不是“驳回”,就弹出提示
 						this.loading = false
 						this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
@@ -586,7 +606,7 @@
 					if (valid) {
 						this.loading = true
 						this.inputForm.type = '2'
-						enrollmentRegistrationService.saveWageCard(this.inputForm).then((data) => {
+						enrollmentWageCardService.saveWageCard(this.inputForm).then((data) => {
 							this.inputForm.title = `${this.$store.state.user.name} 发起了 [工资卡信息登记]`
 							this.inputForm.id = data.businessId
 							callback(data.businessTable, data.businessId, this.inputForm)
@@ -605,7 +625,7 @@
 			// 通过
 			async agreeForm (callback) {
 				this.loading = true
-				enrollmentRegistrationService.findWageCardById(this.inputForm.id).then((data) => {
+				enrollmentWageCardService.findWageCardById(this.inputForm.id).then((data) => {
 					if (data.type !== '2') { // 审核状态不是“审核中”,就弹出提示
 						this.loading = false
 						this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
@@ -621,7 +641,7 @@
 											this.inputForm.type = '5'
 										}
 									}
-									enrollmentRegistrationService.saveWageCard(this.inputForm).then((data) => {
+									enrollmentWageCardService.saveWageCard(this.inputForm).then((data) => {
 										callback(data.businessTable, data.businessId, this.inputForm)
 										this.loading = false
 									}).catch(() => {
@@ -639,14 +659,14 @@
 			updateStatusById (type, callback) {
 				if (type === 'reject') {
 					this.loading = true
-					enrollmentRegistrationService.findWageCardById(this.inputForm.id).then((data) => {
+					enrollmentWageCardService.findWageCardById(this.inputForm.id).then((data) => {
 						if (data.type !== '2') { // 审核状态不是“审核中”,就弹出提示
 							this.loading = false
 							this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
 							throw new Error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
 						} else {
 							this.inputForm.type = '4'
-							enrollmentRegistrationService.updateWageCardStatusById(this.inputForm).then(() => {
+							enrollmentWageCardService.updateWageCardStatusById(this.inputForm).then(() => {
 								this.loading = false
 								callback()
 							})
@@ -654,20 +674,20 @@
 					})
 				} else if (type === 'hold') {
 					this.loading = true
-					enrollmentRegistrationService.findWageCardById(this.inputForm.id).then((data) => {
+					enrollmentWageCardService.findWageCardById(this.inputForm.id).then((data) => {
 						if (data.type !== '4') { // 审核状态不是“驳回”,就弹出提示
 							this.loading = false
 							this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
 							throw new Error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
 						} else {
 							this.inputForm.type = '1'
-							enrollmentRegistrationService.updateWageCardStatusById(this.inputForm).then(() => {
+							enrollmentWageCardService.updateWageCardStatusById(this.inputForm).then(() => {
 								this.loading = false
 								callback()
 							})
 						}
 						this.inputForm.type = '1'
-						enrollmentRegistrationService.updateWageCardStatusById(this.inputForm).then(() => {
+						enrollmentWageCardService.updateWageCardStatusById(this.inputForm).then(() => {
 							this.loading = false
 							callback()
 						})

+ 16 - 10
src/views/human/practice/reimburseRegister/ReimburseRegisterAddForm.vue

@@ -15,16 +15,17 @@
 								  :rules="[
 								  	{required: true, message: '项目经理不能为空', trigger: 'change'}
                    ]">
-						<UserSelectSignatory style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'"
-											 :readonly="true" :limit='1' :modelValue="inputForm.projectManager"
-											 @update:modelValue='(value, label) => {inputForm.projectManager = value}'></UserSelectSignatory>
-					</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"></el-input>
+<!--						<UserSelectSignatory style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'"-->
+<!--											 :readonly="true" :limit='1' :modelValue="inputForm.projectManager"-->
+<!--											 @update:modelValue='(value, label) => {inputForm.projectManager = value}'></UserSelectSignatory>-->
+						<UserSelect2 :limit='1' :modelValue="inputForm.projectManager" @update:modelValue='(value, label) => {inputForm.projectManager = value}'></UserSelect2>
 					</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"></el-input>-->
+<!--					</el-form-item>-->
+<!--				</el-col>-->
 				<el-col :span="12">
 					<el-form-item label="总报销金额" prop="allReimbursementAmount" :rules="[{required: true, message: '总报销金额不能为空', trigger: 'blur'}]">
 						<el-input v-model="inputForm.allReimbursementAmount" :disabled="true"></el-input>
@@ -143,7 +144,8 @@
 <script>
 	import ProgramPageForm from './ProgramPageForm'
 	import reimburseRegisterService from '@/api/human/register/ReimburseRegisterService'
-	import UserSelectSignatory from '@/views/cw/workClientInfo/clientUserSelect'
+	// import UserSelectSignatory from '@/views/cw/workClientInfo/clientUserSelect'
+	import UserSelect2 from '@/components/userSelect'
 	import XEUtils from "xe-utils";
 
 	export default {
@@ -191,8 +193,9 @@
 		created () {
 		},
 		components: {
-			UserSelectSignatory,
+			// UserSelectSignatory,
 			ProgramPageForm,
+			UserSelect2,
 		},
 		computed: {
 			bus: {
@@ -438,13 +441,16 @@
 						r.createName = item.createName
 						r.internshipDays = item.internshipDays
 						r.workLogId = item.id
+						r.reimbursementAmount = item.allMoney
 						this.inputForm.detailList[this.programRow] = r
+						this.baseKey = Math.random()
 					} else {
 						let r = {
 							workName: item.workName,
 							createName: item.createName,
 							internshipDays: item.internshipDays,
 							workLogId: item.id,
+							reimbursementAmount: item.allMoney
 						}
 						this.$refs.baseTable.insertAt(r)
 						this.inputForm.detailList.push(r)