From 83be7ca0c138b64b3447cc207b63c7933690f6ec Mon Sep 17 00:00:00 2001 From: 曹睿 <360930172@qq.com> Date: 星期二, 25 二月 2025 09:08:58 +0800 Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev --- src/views/system/user/index.vue | 211 ++++++++++++++++++++++++++++------------------------ 1 files changed, 113 insertions(+), 98 deletions(-) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index dcfc2e9..2b823cb 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -6,11 +6,15 @@ <pane size="12"> <el-col> <div class="head-container addButton"> - <el-input v-model="deptName" placeholder="閮ㄩ棬鍚嶇О" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" /> - <el-button style="margin-left: 4px" type="primary" plain icon="el-icon-plus" size="mini" circle @click="addSchema"></el-button> + <el-input v-model="deptName" placeholder="閮ㄩ棬鍚嶇О" clearable size="small" prefix-icon="el-icon-search" + style="margin-bottom: 20px" /> + <el-button style="margin-left: 4px" type="primary" plain icon="el-icon-plus" size="mini" circle + @click="addSchema"></el-button> </div> <div class="head-container"> - <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" /> + <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" + :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current + @node-click="handleNodeClick" /> </div> </el-col> </pane> @@ -20,11 +24,13 @@ <div> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="鐢ㄦ埛鍚嶇О" prop="nickName"> - <el-input v-model="queryParams.nickName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable @keyup.enter.native="handleQuery" /> + <el-input v-model="queryParams.nickName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable + @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="鐘舵��" prop="status"> <el-select v-model="queryParams.status" placeholder="鐢ㄦ埛鐘舵��" clearable> - <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" /> + <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" + :value="dict.value" /> </el-select> </el-form-item> <el-form-item> @@ -34,8 +40,10 @@ </el-form> </div> <div class="options_button"> - <el-button type="primary" size="mini" @click="openthirdParty" v-hasPermi="['system:user:add']">鑾峰彇涓夋柟浜哄憳</el-button> - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">鏂板鐢ㄦ埛</el-button> + <el-button type="primary" size="mini" @click="openthirdParty" + v-hasPermi="['system:user:add']">鑾峰彇涓夋柟浜哄憳</el-button> + <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" + v-hasPermi="['system:user:add']">鏂板鐢ㄦ埛</el-button> </div> </div> <el-col> @@ -45,25 +53,28 @@ <el-table-column label="璐﹀彿" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" /> <el-table-column label="鐘舵��" align="center" key="status"> <template slot-scope="scope"> - <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch> + <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" + @change="handleStatusChange(scope.row)"></el-switch> </template> </el-table-column> <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" width="120" /> <el-table-column label="鎿嶄綔" align="center" width="160" class-nickName="small-padding fixed-width"> <template slot-scope="scope"> - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">淇敼</el-button> -<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">鍒犻櫎</el-button>--> -<!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">--> -<!-- <el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏇村</el-button>--> -<!-- <el-dropdown-menu slot="dropdown">--> -<!-- <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-dropdown-item>--> -<!-- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">鍒嗛厤瑙掕壊</el-dropdown-item>--> -<!-- </el-dropdown-menu>--> -<!-- </el-dropdown>--> + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" + v-hasPermi="['system:user:edit']">淇敼</el-button> + <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">鍒犻櫎</el-button>--> + <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">--> + <!-- <el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏇村</el-button>--> + <!-- <el-dropdown-menu slot="dropdown">--> + <!-- <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-dropdown-item>--> + <!-- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">鍒嗛厤瑙掕壊</el-dropdown-item>--> + <!-- </el-dropdown-menu>--> + <!-- </el-dropdown>--> </template> </el-table-column> </el-table> - <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /> + <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" + :limit.sync="queryParams.pageSize" @pagination="getList" /> </el-col> </pane> </splitpanes> @@ -88,7 +99,9 @@ <el-col :span="12"> <el-form-item label="鐘舵��" prop="status"> <el-radio-group v-model="form.status"> - <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio> + <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ + dict.label + }}</el-radio> </el-radio-group> </el-form-item> </el-col> @@ -102,7 +115,8 @@ <el-col :span="12"> <el-form-item label="瑙掕壊" prop="roleIds"> <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨瑙掕壊" clearable> - <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option> + <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" + :disabled="item.status == 1"></el-option> </el-select> </el-form-item> </el-col> @@ -128,7 +142,8 @@ <el-col :span="12"> <el-form-item label="鍗曚綅" prop="company"> <el-select v-model="form.company" placeholder="璇烽�夋嫨鍗曚綅" style="width: 100%" clearable> - <el-option v-for="item in postOptions" :key="item.id" :label="item.company" :value="item.id"></el-option> + <el-option v-for="item in postOptions" :key="item.id" :label="item.company" + :value="item.id"></el-option> </el-select> </el-form-item> </el-col> @@ -136,30 +151,20 @@ <el-row> <el-col :span="12"> <el-form-item label="绛惧悕"> - <el-upload - class="avatar-uploader" - :action="uploadAction" - :show-file-list="false" - accept=".png, .jpg, .jpeg, .gif" - :on-error="handleUploadError" - :on-success="handleUploadSuccess" - :before-upload="handleBeforeUpload"> - <img v-if="signatureUrl" :src="signatureUrl" class="avatar" alt=""> + <el-upload class="avatar-uploader" :action="uploadAction" :show-file-list="false" + :headers="upload.headers" accept=".png, .jpg, .jpeg, .gif" :on-error="handleUploadError" + :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload"> + <img v-if="form.signatureUrl" :src="javaApi + '/img/' + form.signatureUrl" class="avatar" alt=""> <i v-else class="el-icon-plus avatar-uploader-icon"></i> </el-upload> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="涓汉鐓х墖"> - <el-upload - class="avatar-uploader" - :action="uploadAction" - :show-file-list="false" - accept=".png, .jpg, .jpeg, .gif" - :on-error="handleUploadError1" - :on-success="handleUploadSuccess1" - :before-upload="handleBeforeUpload1"> - <img v-if="pictureUrl" :src="pictureUrl" class="avatar" alt=""> + <el-upload class="avatar-uploader" :action="uploadAction" :show-file-list="false" + :headers="upload.headers" accept=".png, .jpg, .jpeg, .gif" :on-error="handleUploadError1" + :on-success="handleUploadSuccess1" :before-upload="handleBeforeUpload1"> + <img v-if="form.pictureUrl" :src="javaApi + '/img/' + form.pictureUrl" class="avatar" alt=""> <i v-else class="el-icon-plus avatar-uploader-icon"></i> </el-upload> </el-form-item> @@ -174,7 +179,9 @@ <!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� --> <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> - <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag> + <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" + :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" + :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag> <i class="el-icon-upload"></i> <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div> <div class="el-upload__tip text-center" slot="tip"> @@ -182,7 +189,8 @@ <el-checkbox v-model="upload.updateSupport" />鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹� </div> <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span> - <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">涓嬭浇妯℃澘</el-link> + <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" + @click="importTemplate">涓嬭浇妯℃澘</el-link> </div> </el-upload> <div slot="footer" class="dialog-footer"> @@ -195,24 +203,22 @@ <el-dialog title="鑾峰彇浜轰簨绯荤粺浜哄憳淇℃伅" :visible.sync="addthirdParty" width="70%"> <div class="body" v-loading="thirdPartyLoading"> <el-row> - <el-col :span="8" style="height: 70vh;overflow: hidden;" v-if="companiesList.length!=1"> - <el-input v-model="search2" placeholder="杈撳叆鍏抽敭瀛楁悳绱�" clearable size="small" - @clear="searchFilter2" @keyup.enter.native="searchFilter2" - prefix-icon="el-icon-search" style="margin-bottom: 20px;width: 90%"/> + <el-col :span="8" style="height: 70vh;overflow: hidden;" v-if="companiesList.length != 1"> + <el-input v-model="search2" placeholder="杈撳叆鍏抽敭瀛楁悳绱�" clearable size="small" @clear="searchFilter2" + @keyup.enter.native="searchFilter2" prefix-icon="el-icon-search" style="margin-bottom: 20px;width: 90%" /> <el-tree :data="datathirdParty" node-key="companyId" :props="defaultProps" @node-click="nodeClick2" - style="height: calc(100% - 42px);" @node-expand="nodeOpen0" :filter-node-method="filterNode2" ref="tree2" - highlight-current> + style="height: calc(100% - 42px);" @node-expand="nodeOpen0" :filter-node-method="filterNode2" ref="tree2" + highlight-current> </el-tree> </el-col> - <el-col :span="companiesList.length==1?24:16" style="height: 70vh;padding-left: 8px;"> + <el-col :span="companiesList.length == 1 ? 24 : 16" style="height: 70vh;padding-left: 8px;"> <div style="display: flex;align-items: center;margin-bottom: 10px"> <span style="width: 140px">鍛樺伐鍙�/鍛樺伐濮撳悕:</span> <el-input size="small" placeholder="璇疯緭鍏ュ憳宸ュ彿/鍛樺伐濮撳悕" @clear="searchPerson" clearable v-model="userSearch2" - style="width: 50%" - @keyup.enter.native="searchPerson()"></el-input> + style="width: 50%" @keyup.enter.native="searchPerson()"></el-input> </div> <el-table height="67vh" stripe :data="personList" v-loading="personLoad" ref="personTable" - @selection-change="handleSelectionChange"> + @selection-change="handleSelectionChange"> <el-table-column type="selection" width="50"> </el-table-column> <el-table-column prop="employeeID" label="鍛樺伐鍙�"> @@ -332,8 +338,6 @@ url: process.env.VUE_APP_BASE_API + "/system/user/importData" }, uploadAction: process.env.VUE_APP_BASE_API + '/deviceScope/uploadFile', - signatureUrl: '', - pictureUrl: '', // 鏌ヨ鍙傛暟 queryParams: { pageNum: 1, @@ -361,18 +365,18 @@ userName: [ { required: true, message: "璇峰~鍐欒处鍙�", trigger: "blur" } ], - nameEn: [ - { required: true, message: "璇疯緭鍏ュ鍚岴N", trigger: "blur" } - ], + // nameEn: [ + // { required: true, message: "璇疯緭鍏ュ鍚岴N", trigger: "blur" } + // ], status: [ { required: true, message: "璇烽�夋嫨鐘舵��", trigger: "change" } ], roleIds: [ { required: true, message: "璇烽�夋嫨瑙掕壊", trigger: "change" } ], - password: [ - { required: true, message: "瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, - ], + // password: [ + // { required: true, message: "瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, + // ], phonenumber: [ { required: true, @@ -384,7 +388,7 @@ }, // 鑾峰彇涓夋柟浜哄憳寮规 addthirdParty: false, - thirdPartyLoading:false, + thirdPartyLoading: false, companiesList: [], search2: '', datathirdParty: [], @@ -420,18 +424,18 @@ getList() { this.loading = true; listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { - this.userList = response.rows; - this.total = response.total; - this.loading = false; - } + this.userList = response.rows; + this.total = response.total; + this.loading = false; + } ); }, // 鎵撳紑娣诲姞鏋舵瀯寮规 - addSchema () { + addSchema() { this.addDia = true }, // 鎻愪氦鏋舵瀯 - addStandardTree () { + addStandardTree() { if (this.addOb.nickName == null || this.addOb.factory == '') { this.$message.error('鏋勬灦鍚嶇О鏄繀濉」') return @@ -484,11 +488,11 @@ // 鐢ㄦ埛鐘舵�佷慨鏀� handleStatusChange(row) { let text = row.status === "0" ? "鍚敤" : "鍋滅敤"; - this.$modal.confirm('纭瑕�"' + text + '""' + row.nickName + '"鐢ㄦ埛鍚楋紵').then(function() { + this.$modal.confirm('纭瑕�"' + text + '""' + row.nickName + '"鐢ㄦ埛鍚楋紵').then(function () { return changeUserStatus(row.userId, row.status); }).then(() => { this.$modal.msgSuccess(text + "鎴愬姛"); - }).catch(function() { + }).catch(function () { row.status = row.status === "0" ? "1" : "0"; }); }, @@ -511,8 +515,12 @@ sex: undefined, status: "0", company: '', - roleIds: [] + roleIds: [], + signatureUrl: '', + pictureUrl: '' }; + // this.signatureUrl = ''; + // this.pictureUrl = '' this.resetForm("form"); }, /** 鎼滅储鎸夐挳鎿嶄綔 */ @@ -553,21 +561,21 @@ this.thirdPartyLoading = true; selectCompaniesList().then(res => { this.companiesList = this.HaveJson(res.data); - if(this.companiesList.length ==1){ - selectSimpleList({companyId: this.companiesList[0].companyId}).then(res => { + if (this.companiesList.length == 1) { + selectSimpleList({ companyId: this.companiesList[0].companyId }).then(res => { this.thirdPartyLoading = false; this.personListCopy = JSON.parse(JSON.stringify(res.data)) this.personList = res.data this.$refs.personTable.doLayout() }) - }else{ + } else { this.thirdPartyLoading = false; } this.datathirdParty = this.tranListToTreeData(res.data, "ROOT"); }).catch(() => { this.thirdPartyLoading = false; }) - if(this.componentData.entity.roleId > 10000)this.$message.warning('鐢变簬鏈�変腑鍏蜂綋瑙掕壊锛屾柊澧炵敤鎴峰皢鎴愪负榛樿瑙掕壊') + if (this.componentData.entity.roleId > 10000) this.$message.warning('鐢变簬鏈�変腑鍏蜂綋瑙掕壊锛屾柊澧炵敤鎴峰皢鎴愪负榛樿瑙掕壊') }, tranListToTreeData(list, rootValue) { const arr = []; @@ -597,7 +605,7 @@ this.getNodeParent(node) if (ob.companyId !== 'SC21') { this.personLoad = true - selectSimpleList({companyId: ob.companyId}).then(res => { + selectSimpleList({ companyId: ob.companyId }).then(res => { this.personListCopy = JSON.parse(JSON.stringify(res.data)) this.personList = res.data this.personLoad = false @@ -677,6 +685,7 @@ const userId = row.userId || this.ids; getUser(userId).then(response => { this.form = response.data; + this.form.password = '' this.roleOptions = response.roles; this.$set(this.form, "roleIds", response.roleIds); this.open = true; @@ -697,18 +706,18 @@ } }, }).then(({ value }) => { - resetUserPwd(row.userId, value).then(response => { - this.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value); - }); - }).catch(() => {}); + resetUserPwd(row.userId, value).then(response => { + this.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value); + }); + }).catch(() => { }); }, /** 鍒嗛厤瑙掕壊鎿嶄綔 */ - handleAuthRole: function(row) { + handleAuthRole: function (row) { const userId = row.userId; this.$router.push("/system/user-auth/role/" + userId); }, /** 鎻愪氦鎸夐挳 */ - submitForm: function() { + submitForm: function () { this.$refs["form"].validate(valid => { if (valid) { if (this.form.userId != undefined) { @@ -730,12 +739,12 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const userIds = row.userId || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�').then(function() { + this.$modal.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�').then(function () { return delUser(userIds); }).then(() => { this.getList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(() => {}); + }).catch(() => { }); }, /** 涓嬭浇妯℃澘鎿嶄綔 */ importTemplate() { @@ -781,14 +790,14 @@ // 濡傛灉涓婁紶鎴愬姛 if (res.code == 200) { // 鑾峰彇瀵屾枃鏈粍浠跺疄渚� - let quill = this.Quill; - // 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃� - let length = quill.getSelection().index; - // 鎻掑叆鍥剧墖 res.url涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囧湴鍧� - quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName); - // 璋冩暣鍏夋爣鍒版渶鍚� - quill.setSelection(length + 1); - this.signatureUrl = res.data.url + // let quill = this.Quill; + // // 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃� + // let length = quill.getSelection().index; + // // 鎻掑叆鍥剧墖 res.url涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囧湴鍧� + // quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName); + // // 璋冩暣鍏夋爣鍒版渶鍚� + // quill.setSelection(length + 1); + this.form.signatureUrl = res.data.url } else { this.$message.error("鍥剧墖鎻掑叆澶辫触"); } @@ -819,14 +828,14 @@ // 濡傛灉涓婁紶鎴愬姛 if (res.code == 200) { // 鑾峰彇瀵屾枃鏈粍浠跺疄渚� - let quill = this.Quill; - // 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃� - let length = quill.getSelection().index; - // 鎻掑叆鍥剧墖 res.url涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囧湴鍧� - quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName); - // 璋冩暣鍏夋爣鍒版渶鍚� - quill.setSelection(length + 1); - this.pictureUrl = res.data.url + // let quill = this.Quill; + // // 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃� + // let length = quill.getSelection().index; + // // 鎻掑叆鍥剧墖 res.url涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囧湴鍧� + // quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName); + // // 璋冩暣鍏夋爣鍒版渶鍚� + // quill.setSelection(length + 1); + this.form.pictureUrl = res.data.url } else { this.$message.error("鍥剧墖鎻掑叆澶辫触"); } @@ -842,10 +851,12 @@ .search_form { display: flex; justify-content: space-between; + .options_button { margin-top: 3px; } } + .avatar-uploader ::v-deep .el-upload { border: 1px dashed #666666; border-radius: 6px; @@ -853,9 +864,11 @@ position: relative; overflow: hidden; } + .avatar-uploader ::v-deep .el-upload:hover { border-color: #409EFF; } + .avatar-uploader-icon { font-size: 20px; color: #8c939d; @@ -864,11 +877,13 @@ line-height: 90px; text-align: center; } + .avatar { width: 90px; height: 90px; display: block; } + .addButton { display: flex; align-items: flex-start; -- Gitblit v1.9.3