代码调整

src/api/human/enrollment/EnrollmentRegistrationService.js

@@ -16,6 +16,13 @@ export default {
 			data: inputForm
 		})
 	},
+	updateInfo (inputForm) {
+		return request({
+			url: prefix +  `/enrollmentRegistration/updateInfo`,
+			method: 'post',
+			data: inputForm
+		})
+	},
 	saveWageCard (inputForm) {
 		return request({
 			url: prefix +  `/enrollmentRegistration/saveWageCard`,

src/api/human/register/RegisterService.js

@@ -23,6 +23,13 @@ export default {
 			data: inputForm
 		})
 	},
+	updateInfo (inputForm) {
+		return request({
+			url: prefix +  `/register/updateInfo`,
+			method: 'post',
+			data: inputForm
+		})
+	},
 	findById (id) {
 		return request({
 			url: prefix + '/register/findById',

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) => {

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) => {

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) => {

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) => {

src/views/human/depart/registration/DepartRegistrationList.vue

@@ -18,7 +18,7 @@
 				:clearable="true"
 				:accordion="true"
 				size="default"
-				@getValue="(value,label) => {searchForm.department=label}"/>
+				@getValue="(value,label) => {searchForm.department=value}"/>
 		</el-form-item>
 		<el-form-item label="联系电话" prop="mobile">
 			<el-input v-model="searchForm.mobile" placeholder="请输入联系电话" clearable></el-input>

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

@@ -597,6 +597,7 @@
 				loading: false,
 				showViewer: false,
 				inputForm: {
+					id: '',
 					userId: '',
 					name: '',
 					sex: '',
@@ -735,6 +736,7 @@
 			init (method, id) {
 				this.method = method
 				this.inputForm = {
+					id: '',
 					userId: '',
 					name: '',
 					sex: '',
@@ -846,8 +848,8 @@
 							this.$message.error('社保编号与社保银行卡号不能为空');
 							throw new Error('社保编号与社保银行卡号不能为空')
 						}
-						this.inputForm.id = this.businessId
-						enrollmentRegistrationService.save(this.inputForm).then((data) => {
+						// this.inputForm.id = this.businessId
+						enrollmentRegistrationService.updateInfo(this.inputForm).then((data) => {
 							this.close()
 							this.$message.success(data)
 							this.$emit('refreshDataList')

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

@@ -5,6 +5,21 @@
 		<el-form-item label="姓名" prop="name">
 			<el-input v-model="searchForm.name" placeholder="请输入姓名" clearable></el-input>
 		</el-form-item>
+		<el-form-item label="所属部门" prop="department">
+			<SelectTree
+				ref="officeTree"
+				:props="{
+                value: 'id',             // ID字段名
+                label: 'name',         // 显示名称
+                children: 'children'    // 子级字段名
+              }"
+				:url="`/system-server/sys/office/treeData?type=2`"
+				:value="searchForm.department"
+				:clearable="true"
+				:accordion="true"
+				size="default"
+				@getValue="(value,label) => {searchForm.department=value}"/>
+		</el-form-item>
 		<el-form-item label="联系电话" prop="mobilePhone">
 			<el-input v-model="searchForm.mobilePhone" placeholder="请输入联系电话" clearable></el-input>
 		</el-form-item>
@@ -57,6 +72,7 @@
 			  </template>
 		  </vxe-column>
           <vxe-column min-width="160" align="center" title="民族" field="nation"></vxe-column>
+          <vxe-column min-width="160" align="center" title="所属部门" field="departmentName"></vxe-column>
           <vxe-column min-width="160" align="center" title="联系电话" field="mobilePhone"></vxe-column>
           <vxe-column min-width="160" align="center" title="毕业院校" field="graduatedFrom"></vxe-column>
 			<vxe-column min-width="100" title="状态" fixed="right" align="center" field="type">
@@ -87,11 +103,12 @@
         </vxe-pager>
       </div>
     </div>
-	  <EnrollmentRegistrationEditForm ref="enrollmentRegistrationEditForm" @refreshList="refreshList"></EnrollmentRegistrationEditForm>
+	  <EnrollmentRegistrationEditForm ref="enrollmentRegistrationEditForm" @refreshDataList="refreshList"></EnrollmentRegistrationEditForm>
   </div>
 </template>
 
 <script>
+	import SelectTree from '@/components/treeSelect/treeSelect.vue'
 	import EnrollmentRegistrationEditForm from './EnrollmentRegistrationEditForm'
   import enrollmentRegistrationService from '@/api/human/enrollment/EnrollmentRegistrationService'
   import processService from '@/api/flowable/ProcessService'
@@ -105,6 +122,7 @@
         searchForm: {
           name: '',
 			mobilePhone: '',
+			department: '',
         },
         dataList: [],
         tablePage: {
@@ -125,6 +143,7 @@
     created () {
     },
     components: {
+		SelectTree,
 		EnrollmentRegistrationEditForm,
     },
     computed: {

src/views/human/practice/register/RegistrationEditForm.vue

@@ -444,7 +444,7 @@
 								throw new Error('QQ号/微信号填写不正确，请重新填写')
 							}
 						}
-						registerService.save(this.inputForm).then((data) => {
+						registerService.updateInfo(this.inputForm).then((data) => {
 							this.close()
 							this.$message.success(data)
 							this.$emit('refreshList')

src/views/human/practice/register/RegistrationList.vue

@@ -18,7 +18,7 @@
 				:clearable="true"
 				:accordion="true"
 				size="default"
-				@getValue="(value,label) => {searchForm.department=label}"/>
+				@getValue="(value,label) => {searchForm.department=value}"/>
 		</el-form-item>
 		<el-form-item label="联系电话" prop="mobilePhone">
 			<el-input v-model="searchForm.mobilePhone" placeholder="请输入联系电话" clearable></el-input>
@@ -76,6 +76,7 @@
           <vxe-column min-width="160" align="center" title="毕业院校" field="graduatedFrom"></vxe-column>
           <vxe-column min-width="160" align="center" title="所属部门" field="departmentName"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目经理" field="projectManagerName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="实习状态" field="practiceStatus"></vxe-column>
 			<vxe-column min-width="100" title="状态" fixed="right" align="center" field="type">
 				<template #default="scope">
 					<el-button @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '')" effect="dark" >{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>

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

@@ -38,7 +38,7 @@
 								  show-word-limit v-model="inputForm.remarks"></el-input>
 					</el-form-item>
 				</el-col>
-				<el-form v-if="status === 'audit'" style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
+				<el-form v-if="status === 'audit' " style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
 						 label-width="110px" @submit.native.prevent>
 					<el-col :span="12">
 						<el-form-item label="是否实习结束" prop="completePractice" :rules="[{required: true, message: '是否实习结束不能为空', trigger: 'change'}]">
@@ -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 === '5'" 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'}]">