guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pet' into pet

hyx_2024-10-30_new
shanao 2024-10-23 14:24:37 +08:00
parent 04b6e8f93b 83e7cd595a
commit ef3c04dfb5
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/corpInfo/user/components/edit.vue
View File

@ -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

2
src/views/corpInfo/user/components/list.vue
View File

@ -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

7
src/views/login/index.vue
View File

@ -320,11 +320,12 @@ export default {
).then((data) => { ).then((data) => {
if (data.list && data.list.length > 0) { if (data.list && data.list.length > 0) {
setTimeout(() => { setTimeout(() => {
console.log(data)
console.log('???????--sparrow')
this.$notify.info({ this.$notify.info({
title: '消息', title: '消息',
message: '您有【' + data.list.length + '】条相关方人员数据待审核' message: '您有【' + data.list.length + '】条相关方人员数据待审核',
onClick: () => {
this.$router.push('/xgf/flow')
}
}) })
}, 3000) }, 3000)
} }

2
src/views/xgf/flowApply/components/userInfo.vue
View File

@ -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>