From 981a6d7d77e6465d8afa4facfbdda84546249db3 Mon Sep 17 00:00:00 2001 From: Your Name <123456> Date: 星期一, 11 七月 2022 18:55:19 +0800 Subject: [PATCH] lct --- src/views/systemManage/userManage/index.vue | 55 +++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/views/systemManage/userManage/index.vue b/src/views/systemManage/userManage/index.vue index d530bf6..d4f0ec4 100644 --- a/src/views/systemManage/userManage/index.vue +++ b/src/views/systemManage/userManage/index.vue @@ -365,7 +365,7 @@ <el-option v-for="item in departmentList" :key="item.id" - :value="item.department" + :value="item.id" :label="item.department" > </el-option> @@ -425,6 +425,19 @@ </el-row> <el-row> <el-col :span="12"> + <el-form-item label="是否安全员:" prop="issecurityofficer"> + <el-select v-model.trim="dataForm.issecurityofficer" auto-complete="on" style="width:100%;"> + <el-option + v-for="item in isSecurityOfficerList" + :key="item.id" + :value="item.id" + :label="item.name" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="12"> <el-form-item label="状态:" prop="status"> <el-select v-model.trim="dataForm.status" auto-complete="on" style="width:100%;"> <el-option @@ -437,13 +450,14 @@ </el-select> </el-form-item> </el-col> + + </el-row> + <el-row> <el-col :span="12"> <el-form-item label="定位卡编号:" prop="empNo"> <el-input v-model.trim="dataForm.empNo"></el-input> </el-form-item> </el-col> - </el-row> - <el-row> <el-col :span="12"> <el-form-item label="定位卡MAC地址:" prop="deviceNo"> <el-input v-model.trim="dataForm.deviceNo"></el-input> @@ -656,6 +670,7 @@ listLoading: true, isMain:false, iscompanyList:[{id:1,name:'否'},{id:0,name:'是'}], + isSecurityOfficerList:[{id:1,name:'是'},{id:0,name:'否'}], queryForm: { realname:'', username: '', @@ -692,6 +707,7 @@ lastmodifieddate:'', empNo:'', deviceNo:'', + issecurityofficer:'', }, cardDataForm:{ username:'', @@ -902,6 +918,7 @@ createddate:'', lastmodifiedby:'', lastmodifieddate:'', + issecurityofficer:'', } }, getDepartmentData(){ @@ -1170,23 +1187,21 @@ formData.append('file', files[0]) } formData.append('action', 'import') - importUser(formData) - .then((response) => { - const res = response.data - if (res.code == 200) { - _this.importDialogFormVisible = false - _this.$message({ - message: '导入成功', - type: 'success' - }) - _this.getUserList() - } else { - parseError({ error: res.message, vm: _this }) - } - }) - .catch((error) => { - parseError({ error: error, vm: _this }) - }) + importUser(formData).then((response) => { + const res = response.data + if (res.code == 200) { + _this.importDialogFormVisible = false + _this.$message({ + message: '导入成功', + type: 'success' + }) + _this.getUserList() + } else { + parseError({ error: res.message, vm: _this }) + } + }).catch((error) => { + parseError({ error: error, vm: _this }) + }) }, getProvince(){ const _this = this -- Gitblit v1.9.2