..
This commit is contained in:
server
+39
-29
@@ -107,6 +107,16 @@ const MEMBER_CHANGE = {
|
||||
:disabled="allowFields('preparedBy')" style="width: 100%"></dict-select>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="出生年月" >
|
||||
<el-form-item prop="birthday">
|
||||
<el-date-picker
|
||||
v-model="formData.birthday"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择出生年月">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="进站时间" >
|
||||
<el-form-item prop="postDoctoralJoinDate">
|
||||
<el-date-picker
|
||||
@@ -246,35 +256,35 @@ const MEMBER_CHANGE = {
|
||||
trigger: ["change", "blur"]
|
||||
}
|
||||
],
|
||||
idCard: [
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
if (!value) {
|
||||
// 如果值为空，直接通过校验
|
||||
callback();
|
||||
} else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}(\d|[Xx])$/.test(value)) {
|
||||
// 18位身份证号码格式正确
|
||||
callback();
|
||||
} else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
|
||||
// 15位身份证号码格式正确
|
||||
callback();
|
||||
} else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
|
||||
// 外国人身份证号码格式正确（18位）
|
||||
callback();
|
||||
} else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
|
||||
// 外国人身份证号码格式正确（15位）
|
||||
callback();
|
||||
} else if (/^[A-Z]\d{6,9}$/.test(value)) {
|
||||
// 香港身份证号码格式正确（8位）
|
||||
callback();
|
||||
} else {
|
||||
// 格式错误，返回错误信息
|
||||
callback(new Error("身份证号码格式错误"));
|
||||
}
|
||||
},
|
||||
trigger: ["change", "blur"]
|
||||
}
|
||||
],
|
||||
// idCard: [
|
||||
// {
|
||||
// validator: (rule, value, callback) => {
|
||||
// if (!value) {
|
||||
// // 如果值为空，直接通过校验
|
||||
// callback();
|
||||
// } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}(\d|[Xx])$/.test(value)) {
|
||||
// // 18位身份证号码格式正确
|
||||
// callback();
|
||||
// } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
|
||||
// // 15位身份证号码格式正确
|
||||
// callback();
|
||||
// } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
|
||||
// // 外国人身份证号码格式正确（18位）
|
||||
// callback();
|
||||
// } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
|
||||
// // 外国人身份证号码格式正确（15位）
|
||||
// callback();
|
||||
// } else if (/^[A-Z]\d{6,9}$/.test(value)) {
|
||||
// // 香港身份证号码格式正确（8位）
|
||||
// callback();
|
||||
// } else {
|
||||
// // 格式错误，返回错误信息
|
||||
// callback(new Error("身份证号码格式错误"));
|
||||
// }
|
||||
// },
|
||||
// trigger: ["change", "blur"]
|
||||
// }
|
||||
// ],
|
||||
mobile: [
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
|
||||
+2
-2
@@ -111,8 +111,8 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<span>姓  别：</span>
|
||||
<el-select placeholder="姓别" v-model="pageForm.sexTypes"
|
||||
<span>性  别：</span>
|
||||
<el-select placeholder="性别" v-model="pageForm.sexTypes"
|
||||
clearable multiple style="margin-left: 33px;width: 80%"
|
||||
@change="doSearch()"
|
||||
@clear="doSearch()"
|
||||
|
||||
@@ -483,7 +483,7 @@ const optionSelect = {
|
||||
})
|
||||
.catch(() => {
|
||||
this.isSubmitting = false
|
||||
this.$message.error("网络错误，请重试")
|
||||
// this.$message.error("网络错误，请重试")
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
@@ -144,7 +144,7 @@ layout("/layouts/platform.html"){
|
||||
{ prop: "welfareUnionName", label: "所属工会", sortable: true },
|
||||
{ prop: "welfareUnitName", label: "所属单位", sortable: true },
|
||||
{ prop: "selectedOptions", label: "所选福利", sortable: true },
|
||||
{ prop: "mobile", label: "联系电话", sortable: true }
|
||||
{ prop: "welfareMobile", label: "福利号码", sortable: true }
|
||||
],
|
||||
optionSelectVisible: false
|
||||
}
|
||||
|
||||
@@ -277,8 +277,8 @@ layout("/layouts/platform_h5.html"){
|
||||
|
||||
.welfare-tag {
|
||||
position: absolute;
|
||||
right: 8px;
|
||||
top: 8px;
|
||||
right: 41px;
|
||||
top: -3px;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
@@ -531,6 +531,17 @@ layout("/layouts/platform_h5.html"){
|
||||
text-align: center;
|
||||
margin-top: 6px;
|
||||
}
|
||||
|
||||
.welfare-info-card .van-collapse-item__content {
|
||||
padding: 0;
|
||||
}
|
||||
.welfare-info-card .welfare-cell-group .van-cell__title {
|
||||
max-width: 70px;
|
||||
}
|
||||
.welfare-info-card .welfare-cell-group .van-cell {
|
||||
padding: 8px 16px;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div id="app" v-cloak>
|
||||
@@ -582,7 +593,7 @@ layout("/layouts/platform_h5.html"){
|
||||
</div>
|
||||
<div class="welfare-cell-group">
|
||||
<van-cell title="选择时间" :value="formatTimeRange(projectInfo.choiceTimeStart, projectInfo.choiceTimeEnd)"></van-cell>
|
||||
<van-cell title="发放时间" :value="formatTimeRange(projectInfo.provideTimeStart, projectInfo.provideTimeEnd)"></van-cell>
|
||||
<!--<van-cell title="发放时间" :value="formatTimeRange(projectInfo.provideTimeStart, projectInfo.provideTimeEnd)"></van-cell>-->
|
||||
<van-cell title="发放地点" :value="projectInfo.provideAddress"></van-cell>
|
||||
<!-- <van-cell title="发放方式" :value="getProvideModeName(projectInfo.provideMode)"></van-cell>-->
|
||||
<!-- <van-cell title="签字方式" :value="getSignModeName(projectInfo.signMode)"></van-cell>-->
|
||||
|
||||
Reference in New Issue
Block a user