Merge branch 'master' of http://192.168.2.4:3000/user5/xg_total_process_master_cloud_vue

src/utils/validateXG.js

@@ -23,9 +23,11 @@ export function isPhone (str) {
  * @param str
  * @returns {boolean}
  */
-export function isPhoneOrMobile (str) {
-  const phone = /(^(\d{3,4}-)?\d{6,8}$)|(^(\d{3,4}-)?\d{6,8}(-\d{1,5})?$)|(^(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[0-9]{1})|(18[0-9]{1})|(17[0-9]{1})|(19[0-9]{1}))+\d{8})$)/
-  return phone.test(str)
+export function isPhoneOrMobile(str) {
+	const phoneRegex = /^(\d{3,4}-)?\d{6,8}$/;  // 座机
+	const mobileRegex = /^1[3-9]\d{9}$/;        // 手机号（最新号段）
+
+	return phoneRegex.test(str) || mobileRegex.test(str);
 }
 
 /**

src/views/ccpm/reimbursement/info/ReimbursementForm.vue

@@ -997,10 +997,9 @@ export default {
             this.currentNodeName = name
             if (name == "综合管理部主任审核") {
               this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 1
-            }
-            if (name == "财务审核") {
-              this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 2
-            }
+            }else{
+				      this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 2
+			      }
           })
           // 获取文件确认状态
           this.reimbursementService.getListByUser(this.inputForm.id).then(data => {

src/views/consultancy/reimbursement/info/ReimbursementForm.vue

@@ -996,9 +996,8 @@ export default {
             this.currentNodeName = name
             if (name == "综合管理部主任审核") {
               this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 1
-            }
-            if (name == "财务审批") {
-              this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 2
+            }else{
+				      this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 2
             }
           })
           // 获取文件确认状态

src/views/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -1158,8 +1158,7 @@ export default {
 						this.currentNodeName = name
 						if (name == "综合管理部主任审批") {
 							this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 1
-						}
-						if (name == "财务审批") {
+						}else{
 							this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 2
 						}
 					})

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

@@ -91,7 +91,7 @@
 								</el-select>
 							</el-form-item>
 
-							<el-form-item label="入所日期" prop="createDates">
+							<el-form-item label="进所日期" prop="createDates">
 								<el-date-picker style="width: 300px" placement="bottom-start" format="YYYY-MM-DD"
 									value-format="YYYY-MM-DD" v-model="searchForm.createDates" type="daterange"
 									range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
@@ -593,7 +593,7 @@ export default {
 			})
 		},
 		resetPwd(userId) {
-			this.$confirm(`确定重置该用户的登录密码吗?重置后,默认密码为:123456`, '提示', {
+			this.$confirm(`确定重置该用户的登录密码吗？重置后，密码为:123456`, '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'
@@ -667,4 +667,4 @@ export default {
 		},
 	}
 }
-</script>
+</script>

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

@@ -196,7 +196,11 @@
 										{{$dictUtils.getDictLabel('political_outlook', scope.row.politicalOutlook, '')}}
 									</template>
 								</vxe-column>
-								<vxe-column min-width="160" align="center" title="民族" field="nation"></vxe-column>
+								<vxe-column min-width="160" align="center" title="民族" field="nation">
+									<template #default="scope">
+										{{$dictUtils.getDictLabel('sys_nation', scope.row.nation, '')}}
+									</template>
+								</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="160" align="center" title="所属公司" field="practiceUnitName"></vxe-column>

src/views/reimbursement/info/ReimbursementForm.vue

@@ -1097,8 +1097,7 @@ export default {
 						this.currentNodeName = name
 						if (name == "综合管理部主任审批") {
 							this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 1
-						}
-						if (name == "财务审批") {
+						}else{
 							this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 2
 						}
 					})

src/views/sys/user/UserInfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-container class="userInfo">
 		<el-aside class="aside">
-			<el-card shadow="never" body-style="height:600px">
+			<el-card shadow="never" body-style="height:700px">
 				<template #header>
 					<div class="card-header">
 						<span>
@@ -68,7 +68,7 @@
 			</el-card>
 		</el-aside>
 		<el-main style="padding: 0">
-			<el-card shadow="never" body-style="height:600px" v-loading="loading">
+			<el-card shadow="never" body-style="height:700px" v-loading="loading">
 				<template #header>
 					<div class="card-header">
 						<span>
@@ -302,7 +302,7 @@
 										</el-date-picker>
 									</el-form-item>
 								</el-col>
-								<!-- 
+								<!--
 								<el-col :span="24">
 									<el-form-item label="个人简介" prop="remarks" :rules="[]">
 										<el-input type="textarea" maxlength="200" show-word-limit
@@ -1922,7 +1922,7 @@ export default {
 				name: '', //姓名
 				sex: '', // 性别
 				age: '',//年龄
-				birthday: '',//生日 
+				birthday: '',//生日
 				joinIndustryDate: null, // 参加工作日期
 				joinWorkDate: null, // 参加行业日期
 				politicalOutlook: '',//政治面貌
@@ -2303,7 +2303,7 @@ export default {
 				name: '', //姓名
 				sex: '', // 性别
 				age: '',//年龄
-				birthday: '',//生日 
+				birthday: '',//生日
 				joinIndustryDate: null, // 参加工作日期
 				joinWorkDate: null, // 参加行业日期
 				politicalOutlook: '',//政治面貌

src/views/zs/reimbursement/info/ReimbursementForm.vue

@@ -1119,10 +1119,9 @@ export default {
             this.currentNodeName = name
             if (name == "综合管理部主任审批") {
               this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 1
-            }
-            if (name == "财务审批") {
-              this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 2
-            }
+            }else{
+				this.$refs.invoiceReimbursementUpLoadComponent.isConfirm = 2
+			}
           })
           // 获取文件确认状态
           this.reimbursementService.getListByUser(this.inputForm.id).then(data => {