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

Merge branch 'dev' into hyx_2024-10-9_tongbu

hyx_2024-10-9_tongbu
huangyuxuan 2024-10-18 16:45:37 +08:00
parent a85f2fde80 07984df286
commit ff19f4ddbe
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/PersonManager/user/components/add.vue
View File

@ -1089,6 +1089,7 @@ export default {
} }
} }
} }
formData.delete('CORPINFO_ID')
formData.append('CORPINFO_ID', JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID) formData.append('CORPINFO_ID', JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID)
upload( upload(
'/user/' + this.dialogType, '/user/' + this.dialogType,

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

@ -140,7 +140,7 @@
<template v-show="loginUser.ACCOUNT_TYPE === '0'"> <template v-show="loginUser.ACCOUNT_TYPE === '0'">
<el-button v-show="edit && row.ACCOUNT_TYPE == '1'" type="success" icon="el-icon-edit" size="mini" @click="handleUserEdit(row)">编辑</el-button> <el-button v-show="edit && row.ACCOUNT_TYPE == '1'" type="success" icon="el-icon-edit" size="mini" @click="handleUserEdit(row)">编辑</el-button>
<el-button v-show="edit" type="success" icon="el-icon-refresh" size="mini" @click="resetPwd(row.USER_ID)">重置密码</el-button> <el-button v-show="edit" type="success" icon="el-icon-refresh" size="mini" @click="resetPwd(row.USER_ID)">重置密码</el-button>
<el-button v-if="del && row.ACCOUNT_TYPE == '1'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row)">删除</el-button> <el-button v-if="false && del && row.ACCOUNT_TYPE == '1'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row)">删除</el-button>
<el-button v-if="row.ISUSE == 1 && row.ACCOUNT_TYPE == '1'" type="success" icon="el-icon-check" size="mini" @click="enableORDisable('0', row)">启用</el-button> <el-button v-if="row.ISUSE == 1 && row.ACCOUNT_TYPE == '1'" type="success" icon="el-icon-check" size="mini" @click="enableORDisable('0', row)">启用</el-button>
<el-button v-if="row.ISUSE == 0 && row.ACCOUNT_TYPE == '1'" type="danger" icon="el-icon-close" size="mini" @click="enableORDisable('1', row)">禁用</el-button> <el-button v-if="row.ISUSE == 0 && row.ACCOUNT_TYPE == '1'" type="danger" icon="el-icon-close" size="mini" @click="enableORDisable('1', row)">禁用</el-button>
</template> </template>