Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
commit
25e1882b4c
|
@ -229,7 +229,7 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-col :span="12" v-if="form.userPost==66">
|
||||
<el-form-item label="工种" v-if="data.isManager" prop="craftPost">
|
||||
<el-select v-model="form.craftPost">
|
||||
<el-option v-for="dict in data.craftPostList" :key="dict.value" :label="dict.label"
|
||||
|
@ -427,25 +427,25 @@ function doImageUpload(type) {
|
|||
url = location.origin + url;
|
||||
//url="http://62.234.3.186/statics/2025/01/19/4491f170cd1609142f9a6f097cbf681f_20250119000046A004.jpg"
|
||||
proxy.$http.get(`/system/tools/id/front?url=${url}`).then(d => {
|
||||
form.value.userName = form.value.userName || d.data.name || '';
|
||||
form.value.certificateCode = form.value.certificateCode || d.data.cardId || '';
|
||||
form.value.address = form.value.address || d.data.address || '';
|
||||
from.value.nativePlace = form.value.native || d.data.native || '';
|
||||
form.value.userName = d.data.name ||form.value.userName || '';
|
||||
form.value.certificateCode = d.data.cardId || form.value.certificateCode || '';
|
||||
form.value.address = d.data.address || form.value.address || '';
|
||||
form.value.nativePlace = d.data.native || form.value.native || '';
|
||||
let nation = d.data.nation || "";
|
||||
if (nation) {
|
||||
let tmps = data.nationOpts.filter(it => it.indexOf(nation) >= 0);
|
||||
if (tmps.length > 0) {
|
||||
form.value.nation = form.value.nation || tmps[0] || '';
|
||||
form.value.nation = tmps[0] || form.value.nation || '';
|
||||
}
|
||||
}
|
||||
let sex = d.data.sex || '';
|
||||
if (sex) {
|
||||
form.value.sex = form.value.sex || (sex == '男' ? 0 : 1);
|
||||
form.value.sex = (sex == '男' ? 0 : 1) || form.value.sex ;
|
||||
}
|
||||
let birthDay = d.data.birthDay;
|
||||
if (birthDay && birthDay.length == 8) {
|
||||
birthDay = birthDay.substr(0, 4) + "-" + birthDay.substr(4, 2) + "-" + birthDay.substr(6);
|
||||
form.value.birthDay = form.value.birthDay || birthDay;
|
||||
form.value.birthDay =birthDay || form.value.birthDay;
|
||||
}
|
||||
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue