Merge branch 'hyx_2024-9-25_tongbu' into pet
commit
83e7cd595a
|
@ -717,7 +717,7 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
var hasUser = (rule, value, callback) => {
|
var hasUser = (rule, value, callback) => {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/user/hasUser',
|
'/user/goCheck',
|
||||||
{
|
{
|
||||||
USERNAME: value,
|
USERNAME: value,
|
||||||
VERIFYUSER_ID: this.form.USER_ID
|
VERIFYUSER_ID: this.form.USER_ID
|
||||||
|
|
|
@ -798,7 +798,7 @@ export default {
|
||||||
SHIFTDUTYTWO: this.SHIFTDUTYTWO,
|
SHIFTDUTYTWO: this.SHIFTDUTYTWO,
|
||||||
IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER,
|
IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER,
|
||||||
USER_ID: this.USER_ID,
|
USER_ID: this.USER_ID,
|
||||||
ISPUSH: '2'
|
ISPUSH: '1'
|
||||||
}
|
}
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<th>民族</th>
|
<th>民族</th>
|
||||||
<td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
|
<td>{{ userDetailForm.NATIONALITY_NAME ? userDetailForm.NATIONALITY_NAME : '暂无信息' }}</td>
|
||||||
<th>婚姻状况</th>
|
<th>婚姻状况</th>
|
||||||
<td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
|
<td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
|
||||||
<th>政治面貌</th>
|
<th>政治面貌</th>
|
||||||
|
|
Loading…
Reference in New Issue