From d13186e759ff86515a472195f33eb885b7b3e7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 27 Apr 2021 23:34:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=88=86?= =?UTF-8?q?=E9=85=8D=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E5=88=86?= =?UTF-8?q?=E9=85=8D=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/views/system/RoleList.vue | 11 +- jshERP-web/src/views/system/UserList.vue | 109 +++------ .../views/system/modules/RolePushBtnModal.vue | 153 ++++++++----- .../system/modules/UserCustomerModal.vue | 209 ++++++++++++++++++ .../views/system/modules/UserDepotModal.vue | 209 ++++++++++++++++++ .../src/views/system/modules/UserModal.vue | 177 +-------------- 6 files changed, 541 insertions(+), 327 deletions(-) create mode 100644 jshERP-web/src/views/system/modules/UserCustomerModal.vue create mode 100644 jshERP-web/src/views/system/modules/UserDepotModal.vue diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue index f3a08e18..dce4ddab 100644 --- a/jshERP-web/src/views/system/RoleList.vue +++ b/jshERP-web/src/views/system/RoleList.vue @@ -47,8 +47,8 @@ 分配功能 - - + 分配按钮 + 编辑 @@ -136,13 +136,10 @@ this.$refs.roleFunctionModal.title = "分配功能"; this.$refs.roleFunctionModal.disableSubmit = false; }, - handleSetPushBtn(id) { - this.$refs.rolePushBtnModal.add(); + handleSetPushBtn(record) { + this.$refs.rolePushBtnModal.edit(record); this.$refs.rolePushBtnModal.title = "分配按钮"; this.$refs.rolePushBtnModal.disableSubmit = false; - }, - onChangeDate(date, dateString) { - console.log(date, dateString); } } } diff --git a/jshERP-web/src/views/system/UserList.vue b/jshERP-web/src/views/system/UserList.vue index dfd8a57c..0670b2c5 100644 --- a/jshERP-web/src/views/system/UserList.vue +++ b/jshERP-web/src/views/system/UserList.vue @@ -27,19 +27,11 @@
新增 - + 删除 - - - 冻结 - - - - 解冻 - 批量操作 @@ -60,12 +52,11 @@ :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - + 分配仓库 + + 分配客户 + 编辑 @@ -80,18 +71,16 @@
- - - - + + \ No newline at end of file diff --git a/jshERP-web/src/views/system/modules/UserDepotModal.vue b/jshERP-web/src/views/system/modules/UserDepotModal.vue new file mode 100644 index 00000000..8bd10a8c --- /dev/null +++ b/jshERP-web/src/views/system/modules/UserDepotModal.vue @@ -0,0 +1,209 @@ + + + \ No newline at end of file diff --git a/jshERP-web/src/views/system/modules/UserModal.vue b/jshERP-web/src/views/system/modules/UserModal.vue index 56b17447..a09cb433 100644 --- a/jshERP-web/src/views/system/modules/UserModal.vue +++ b/jshERP-web/src/views/system/modules/UserModal.vue @@ -70,22 +70,12 @@ return { title:"操作", visible: false, - departDisabled: false, //是否是我的部门调用该页面 - roleDisabled: false, //是否是角色维护调用该页面 modalWidth:800, drawerWidth:700, - modaltoggleFlag:true, - confirmDirty: false, orgaTree: [], roleList: [], - selectedDepartKeys:[], //保存用户选择部门id - checkedDepartKeys:[], - checkedDepartNames:[], // 保存部门的名称 =>title - checkedDepartNameString:"", // 保存部门的名称 =>title - resultDepartOptions:[], userId:"", //保存用户id disableSubmit:false, - userDepartModel:{userId:'',departIdList:[]}, // 保存SysUserDepart的用户部门中间表数据需要的对象 dateFormat:"YYYY-MM-DD", validatorRules:{ loginName:{ @@ -99,10 +89,7 @@ }] } }, - departIdShow:false, - departIds:[], //负责部门id model: {}, - selectedRole:[], labelCol: { xs: { span: 24 }, sm: { span: 5 }, @@ -114,14 +101,7 @@ uploadLoading:false, confirmLoading: false, headers:{}, - form:this.$form.createForm(this), - picUrl: "", - url: { - userId:"/sys/user/generateUserId", // 引入生成添加用户情况下的url - syncUserByUserName:"/process/extActProcess/doSyncUserByUserName",//同步用户到工作流 - }, - identity:"1", - fileList:[], + form:this.$form.createForm(this) } }, created () { @@ -130,47 +110,13 @@ const token = Vue.ls.get(ACCESS_TOKEN); this.headers = {"X-Access-Token":token} }, - computed:{ - uploadAction:function () { - return this.url.fileUpload; - } - }, methods: { - isDisabledAuth(code){ - return disabledAuthFilter(code); - }, - //窗口最大化切换 - toggleScreen(){ - if(this.modaltoggleFlag){ - this.modalWidth = window.innerWidth; - }else{ - this.modalWidth = 800; - } - this.modaltoggleFlag = !this.modaltoggleFlag; - }, - refresh () { - this.selectedDepartKeys=[]; - this.checkedDepartKeys=[]; - this.checkedDepartNames=[]; - this.checkedDepartNameString = ""; - this.userId="" - this.resultDepartOptions=[]; - this.departId=[]; - this.departIdShow=false; - }, add () { - this.picUrl = ""; - this.edit({activitiSync:'1'}); + this.edit({}); }, edit (record) { let that = this; - that.checkedDepartNameString = ""; that.form.resetFields(); - if(record.hasOwnProperty("id")){ - setTimeout(() => { - this.fileList = record.avatar; - }, 5) - } that.userId = record.id; that.visible = true; that.model = Object.assign({}, record); @@ -178,57 +124,11 @@ that.form.setFieldsValue(pick(this.model,'loginName','username','roleId','orgaId','position', 'phonenum','email','userBlngOrgaDsplSeq','description')) }); - // 调用查询用户对应的部门信息的方法 - that.checkedDepartKeys = []; - that.loadCheckedDeparts(); - }, - loadCheckedDeparts(){ - let that = this; - if(!that.userId){return} - getAction(that.url.userWithDepart,{userId:that.userId}).then((res)=>{ - that.checkedDepartNames = []; - if(res.success){ - var depart=[]; - var departId=[]; - for (let i = 0; i < res.result.length; i++) { - that.checkedDepartNames.push(res.result[i].title); - this.checkedDepartNameString = this.checkedDepartNames.join(","); - that.checkedDepartKeys.push(res.result[i].key); - //新增负责部门选择下拉框 - depart.push({ - key:res.result[i].key, - title:res.result[i].title - }) - departId.push(res.result[i].key) - } - that.resultDepartOptions=depart; - //判断部门id是否存在，不存在择直接默认当前所在部门 - if(this.model.departIds){ - this.departIds=this.model.departIds.split(","); - }else{ - this.departIds=departId; - } - that.userDepartModel.departIdList = that.checkedDepartKeys - }else{ - console.log(res.message); - } - }) }, close() { this.$emit('close'); this.visible = false; this.disableSubmit = false; - this.selectedRole = []; - this.userDepartModel = {userId:'',departIdList:[]}; - this.checkedDepartNames = []; - this.checkedDepartNameString=''; - this.checkedDepartKeys = []; - this.selectedDepartKeys = []; - this.resultDepartOptions=[]; - this.departIds=[]; - this.departIdShow=false; - this.identity="1"; - this.fileList=[]; }, handleOk() { const that = this; @@ -236,27 +136,7 @@ this.form.validateFields((err, values) => { if (!err) { that.confirmLoading = true; - if(!values.birthday){ - values.birthday = ''; - }else{ - values.birthday = values.birthday.format(this.dateFormat); - } let formData = Object.assign(this.model, values); - if(that.fileList != ''){ - formData.avatar = that.fileList; - }else{ - formData.avatar = null; - } - formData.selectedroles = this.selectedRole.length>0?this.selectedRole.join(","):''; - formData.selecteddeparts = this.userDepartModel.departIdList.length>0?this.userDepartModel.departIdList.join(","):''; - formData.userIdentity=this.identity; - //如果是上级择传入departIds,否则为空 - if(this.identity==="2"){ - formData.departIds=this.departIds.join(","); - }else{ - formData.departIds=""; - } - // that.addDepartsToUser(that,formData); // 调用根据当前用户添加部门信息的方法 let obj; if(!this.model.id){ formData.id = this.userId; @@ -272,8 +152,6 @@ } }).finally(() => { that.confirmLoading = false; - that.checkedDepartNames = []; - that.userDepartModel.departIdList = {userId:'',departIdList:[]}; that.close(); }) @@ -283,28 +161,6 @@ handleCancel() { this.close() }, - handleConfirmBlur(e) { - const value = e.target.value; - this.confirmDirty = this.confirmDirty || !!value - }, - handleChange(info) { - this.picUrl = ""; - if (info.file.status === 'uploading') { - this.uploadLoading = true; - return - } - if (info.file.status === 'done') { - var response = info.file.response; - this.uploadLoading = false; - console.log(response); - if(response.success){ - this.model.avatar = response.message; - this.picUrl = "Has no pic url yet"; - }else{ - this.$message.warning(response.message); - } - } - }, loadOrgaData(){ let that = this; let params = {}; @@ -332,34 +188,5 @@ \ No newline at end of file