From 3d502a0713eeb654d1b9167134ff5bb94cbcfdd7 Mon Sep 17 00:00:00 2001 From: Zhao Qiqi <1287235164@qq.com> Date: Tue, 14 Jun 2022 09:27:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=91=9E=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E7=9A=84=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E3=80=81=E9=A1=B5=E9=9D=A2=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=9A=84?= =?UTF-8?q?=E6=AC=A2=E8=BF=8E=E8=AF=AD=E3=80=81=E8=8F=9C=E5=8D=95=E5=8F=B3?= =?UTF-8?q?=E5=87=BB=E7=9A=84=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E6=95=B4=E4=BD=93=E8=B0=83=E6=95=B4=EF=BC=8C=E5=8E=82=E5=95=86?= =?UTF-8?q?=E3=80=81=E8=BD=A6=E5=9E=8B=E3=80=81=E5=91=98=E5=B7=A5=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/components/Sidebar/SidebarItem.vue | 14 +- .../src/layout/components/TagsView/index.vue | 2 +- .../changshangguanli/changshangguanli.vue | 1 + .../src/layout/components/Navbar.vue | 10 +- .../layout/components/Sidebar/SidebarItem.vue | 18 + .../src/layout/components/TagsView/index.vue | 9 +- .../anrui-buscenter-ui/src/main.js | 4 +- .../src/layout/components/Navbar.vue | 10 +- .../layout/components/Sidebar/SidebarItem.vue | 18 + .../src/layout/components/TagsView/index.vue | 8 +- .../src/store/modules/user.js | 4 +- .../src/components/uploadFileimg/upload.vue | 1 - .../src/layout/components/Navbar.vue | 10 +- .../layout/components/Sidebar/SidebarItem.vue | 18 + .../src/layout/components/TagsView/index.vue | 13 +- .../src/store/modules/user.js | 4 +- .../src/views/sysstaffinfo/yuangongAdd.vue | 59 ++-- .../src/views/sysstaffinfo/yuangongInfo.vue | 2 +- .../src/views/sysstaffinfo/yuangongguanli.vue | 18 +- .../src/api/cheliang/basevehiclemodel.js | 4 +- .../layout/components/Sidebar/SidebarItem.vue | 22 +- .../src/layout/components/TagsView/index.vue | 9 +- anrui-scm/anrui-scm-ui/src/main.js | 4 +- anrui-scm/anrui-scm-ui/src/styles/index.scss | 4 +- .../anruiscm/scmwarehouse/scmwarehouse.vue | 16 +- .../src/views/cheliang/chexing/chexing.vue | 5 +- .../views/cheliang/chexing/chexinglook.vue | 8 +- .../ohter/changyongpeizhiInfo.vue | 328 ------------------ .../ohter/changyongpeizhiRel.vue | 8 +- .../hegezhengtaizhang/hegezhengtaizhang.vue | 2 +- .../hegezhengtaizhangAdd.vue | 4 +- anrui-system-ui/src/api/system/menu/index.js | 2 +- .../src/layout/components/Navbar.vue | 5 +- .../layout/components/Sidebar/SidebarItem.vue | 1 + .../src/layout/components/Sidebar/index.vue | 21 +- .../src/layout/components/TagsView/index.vue | 17 +- anrui-system-ui/src/store/modules/user.js | 6 +- anrui-system-ui/src/views/Home/Home.vue | 13 +- .../views/RoleAdminister/RoleAdminister.vue | 2 +- 39 files changed, 257 insertions(+), 447 deletions(-) delete mode 100644 anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue diff --git a/anrui-base/anrui-base-ui/src/layout/components/Sidebar/SidebarItem.vue b/anrui-base/anrui-base-ui/src/layout/components/Sidebar/SidebarItem.vue index 9924099186..4c4b90bfb6 100644 --- a/anrui-base/anrui-base-ui/src/layout/components/Sidebar/SidebarItem.vue +++ b/anrui-base/anrui-base-ui/src/layout/components/Sidebar/SidebarItem.vue @@ -99,17 +99,19 @@ export default { diff --git a/anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue b/anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue index 42fe88e0bf..221c509b92 100644 --- a/anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue +++ b/anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue @@ -192,7 +192,7 @@ export default { } else { this.left = left } - this.top = e.clientY -32 + this.top = e.clientY - 32 this.visible = true this.selectedTag = tag }, diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue index 896c584f90..dec7480764 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue @@ -381,6 +381,7 @@ export default { handleFilter() { this.listQuery.current = 1 this.getList() + this.searchData() }, handleReset() { this.listQuery = { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/layout/components/Navbar.vue b/anrui-buscenter/anrui-buscenter-ui/src/layout/components/Navbar.vue index fe84b37c15..bae1fda225 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/layout/components/Navbar.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/layout/components/Navbar.vue @@ -3,13 +3,14 @@

安瑞集团信息化平台

-

{{Orgname}} {{departmentName}} 欢迎, {{name}}

+ +

欢迎您，{{pNameAndDepartmentNameAndPostName}} {{name}}

返回首页
- Copyright © 2021 安瑞集团 All Rights Reserved + Copyright © {{ year }} 安瑞集团 All Rights Reserved @@ -20,12 +21,17 @@ export default { Orgname: '', departmentName: '', name: '', + year:'', + pNameAndDepartmentNameAndPostName:'' } }, mounted() { this.Orgname = window.sessionStorage.getItem('Orgname') this.departmentName = window.sessionStorage.getItem('departmentName') + this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName') this.name = window.sessionStorage.getItem('name') + var nowDate = new Date() + this.year = nowDate.getFullYear() }, methods: { logout() { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/layout/components/Sidebar/SidebarItem.vue b/anrui-buscenter/anrui-buscenter-ui/src/layout/components/Sidebar/SidebarItem.vue index 923c38eb86..030aa46a8d 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/layout/components/Sidebar/SidebarItem.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/layout/components/Sidebar/SidebarItem.vue @@ -97,3 +97,21 @@ export default { } } + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue b/anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue index b1deb3ce8c..04708d4bca 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue @@ -20,13 +20,13 @@ --> - + @@ -141,7 +141,8 @@ } = view this.$nextTick(() => { this.$router.replace({ - path: '/redirect' + fullPath + // path: '/redirect' + fullPath + path: fullPath }) }) }) @@ -199,7 +200,7 @@ } else { this.left = left } - this.top = e.clientY + this.top = e.clientY - 32 this.visible = true this.selectedTag = tag }, diff --git a/anrui-buscenter/anrui-buscenter-ui/src/main.js b/anrui-buscenter/anrui-buscenter-ui/src/main.js index d7910d74c4..a399788daf 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/main.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/main.js @@ -96,7 +96,8 @@ function getUserInfo() { userSid: data.sid, orgSid: data.organizationSid, //单位sid Orgname: data.organizationName, - dwjb: data.dwjb + dwjb: data.dwjb, + pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName }; //结果存入缓存 window.sessionStorage.setItem('staffSid', user.staffSid); @@ -108,6 +109,7 @@ function getUserInfo() { window.sessionStorage.setItem('user', user); window.sessionStorage.setItem('departmentName', user.departmentName); window.sessionStorage.setItem('departmentSid', user.departmentSid); + window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName) }) } diff --git a/anrui-buscenter/anrui-finmanage-ui/src/layout/components/Navbar.vue b/anrui-buscenter/anrui-finmanage-ui/src/layout/components/Navbar.vue index 407400180b..f319e5cec5 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/layout/components/Navbar.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/layout/components/Navbar.vue @@ -3,13 +3,14 @@

安瑞集团信息化平台

-

{{Orgname}} {{departmentName}} 欢迎, {{name}}

+ +

欢迎您，{{pNameAndDepartmentNameAndPostName}} {{name}}

返回首页
- Copyright © 2021 安瑞集团 All Rights Reserved + Copyright © {{year}} 安瑞集团 All Rights Reserved @@ -20,12 +21,17 @@ export default { Orgname:'', departmentName:'', name:'', + year:'', + pNameAndDepartmentNameAndPostName:'' } }, mounted(){ this.Orgname = window.sessionStorage.getItem('Orgname') this.departmentName = window.sessionStorage.getItem('departmentName') this.name = window.sessionStorage.getItem('name') + this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName') + var nowDate = new Date() + this.year = nowDate.getFullYear() }, methods: { logout() { diff --git a/anrui-buscenter/anrui-finmanage-ui/src/layout/components/Sidebar/SidebarItem.vue b/anrui-buscenter/anrui-finmanage-ui/src/layout/components/Sidebar/SidebarItem.vue index 0b48331f33..937ac8f82f 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/layout/components/Sidebar/SidebarItem.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/layout/components/Sidebar/SidebarItem.vue @@ -97,3 +97,21 @@ export default { } } + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue b/anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue index 57b4af0362..ce2d1d44a4 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue @@ -26,13 +26,12 @@ --> - + @@ -139,7 +138,8 @@ export default { const { fullPath } = view this.$nextTick(() => { this.$router.replace({ - path: '/redirect' + fullPath + path: fullPath + // path: '/redirect' + fullPath }) }) }) @@ -191,7 +191,7 @@ export default { } else { this.left = left } - this.top = e.clientY + this.top = e.clientY - 32 this.visible = true this.selectedTag = tag }, diff --git a/anrui-buscenter/anrui-finmanage-ui/src/store/modules/user.js b/anrui-buscenter/anrui-finmanage-ui/src/store/modules/user.js index 9c4d2c563d..feece04ead 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/store/modules/user.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/store/modules/user.js @@ -39,13 +39,15 @@ const actions = { userSid: data.sid, orgSid: data.organizationSid, Orgname: data.organizationName, - dwjb: data.dwjb + dwjb: data.dwjb, + pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName } commit('SET_UESRINFO', user) window.sessionStorage.setItem('userSid', user.userSid); window.sessionStorage.setItem('Orgname', user.Orgname); window.sessionStorage.setItem('departmentName', user.departmentName); window.sessionStorage.setItem('name', user.name); + window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName) resolve(data) }).catch(error => { reject(error) diff --git a/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload.vue b/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload.vue index d87cf534ad..c4242db4ee 100644 --- a/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload.vue +++ b/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload.vue @@ -138,7 +138,6 @@ export default { removeImage(file, ImageFileList) { this.files.splice(this.files.indexOf(file), 1) const imgFiles = [] - this.files.forEach((o) => { imgFiles.push(o.url) }) diff --git a/anrui-management/anrui-management-ui/src/layout/components/Navbar.vue b/anrui-management/anrui-management-ui/src/layout/components/Navbar.vue index fe84b37c15..685479217d 100644 --- a/anrui-management/anrui-management-ui/src/layout/components/Navbar.vue +++ b/anrui-management/anrui-management-ui/src/layout/components/Navbar.vue @@ -3,13 +3,14 @@

安瑞集团信息化平台

-

{{Orgname}} {{departmentName}} 欢迎, {{name}}

+ +

欢迎您，{{pNameAndDepartmentNameAndPostName}} {{name}}

返回首页
- Copyright © 2021 安瑞集团 All Rights Reserved + Copyright © {{ year }} 安瑞集团 All Rights Reserved @@ -20,12 +21,17 @@ export default { Orgname: '', departmentName: '', name: '', + year:'', + pNameAndDepartmentNameAndPostName:'' } }, mounted() { this.Orgname = window.sessionStorage.getItem('Orgname') this.departmentName = window.sessionStorage.getItem('departmentName') this.name = window.sessionStorage.getItem('name') + this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName') + var nowDate = new Date() + this.year = nowDate.getFullYear() }, methods: { logout() { diff --git a/anrui-management/anrui-management-ui/src/layout/components/Sidebar/SidebarItem.vue b/anrui-management/anrui-management-ui/src/layout/components/Sidebar/SidebarItem.vue index a17b245c62..2a0846bd8c 100644 --- a/anrui-management/anrui-management-ui/src/layout/components/Sidebar/SidebarItem.vue +++ b/anrui-management/anrui-management-ui/src/layout/components/Sidebar/SidebarItem.vue @@ -97,3 +97,21 @@ export default { } } + diff --git a/anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue b/anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue index 213937e8f5..d3b099f84a 100644 --- a/anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue +++ b/anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue @@ -16,6 +16,14 @@ + + + @@ -122,7 +130,8 @@ export default { const { fullPath } = view this.$nextTick(() => { this.$router.replace({ - path: '/redirect' + fullPath + path: fullPath + // path: '/redirect' + fullPath }) }) }) @@ -174,7 +183,7 @@ export default { } else { this.left = left } - this.top = e.clientY + this.top = e.clientY - 32 this.visible = true this.selectedTag = tag }, diff --git a/anrui-management/anrui-management-ui/src/store/modules/user.js b/anrui-management/anrui-management-ui/src/store/modules/user.js index bdb27a50e6..fa4dae6c85 100644 --- a/anrui-management/anrui-management-ui/src/store/modules/user.js +++ b/anrui-management/anrui-management-ui/src/store/modules/user.js @@ -39,13 +39,15 @@ const actions = { userSid: data.sid, orgSid: data.organizationSid, Orgname: data.organizationName, - dwjb: data.dwjb + dwjb: data.dwjb, + pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName } commit('SET_UESRINFO', user) window.sessionStorage.setItem('userSid', user.userSid); window.sessionStorage.setItem('Orgname', user.Orgname); window.sessionStorage.setItem('departmentName', user.departmentName); window.sessionStorage.setItem('name', user.name); + window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName) resolve(data) }).catch(error => { reject(error) diff --git a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue index 64987bc19a..cddaef70c2 100644 --- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue +++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue @@ -121,7 +121,7 @@ - + @@ -221,7 +221,7 @@ - *入职时间 + *入职日期 @@ -598,7 +598,8 @@ export default { idTerm: [{required: true, message: '证件有效期不能为空', trigger: 'change'}], national: [{required: true, message: '民族不能为空', trigger: 'change'}], mobile: [{required: true, message: '手机号不能为空', validator: checkSubmit, trigger: 'change'}], - personType: [{required: true, message: '员工类型不能为空', trigger: 'change'}] + personType: [{required: true, message: '员工类型不能为空', trigger: 'change'}], + joinCompnyDate: [{required: true, message: '入职日期不能为空', trigger: 'blur'}] }, submitdisabled: false } @@ -611,6 +612,13 @@ export default { this.huoquSheng() }, methods: { + // 邮箱正则 + // email_blur(){ + // var verify =/^\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/; + // if(!verify.test(this.temp.email)){ + // this.message ='邮箱格式错误, 请重新输⼊' + // } + // }, // -------------------------获取省市县方法------------------------- huoquSheng() { getProvince().then((res) => { @@ -1012,61 +1020,45 @@ export default { }, // 上传附件 getUrl() { - // 员工照片 - // if (this.photo_list.length > 0) { - // this.temp.photo = this.photo_list[this.photo_list.length - 1].url - // } - // for (var i = 0; i < this.photo_list.length; i++) { - // this.temp.photo = this.photo_list[i].url; - // console.log("图片信息", this.temp.photo); - // } + console.log('身份证人面像',this.idCardA_list) // 身份证(人像面) if (this.idCardA_list.length > 0) { this.temp.idCardA = this.idCardA_list[this.idCardA_list.length - 1].url + }else { + this.temp.idCardA = '' } - // for (var i = 0; i < this.idCardA_list.length; i++) { - // this.temp.idCardA = this.idCardA_list[i].url; - // console.log("图片信息", this.temp.idCardA); - // } // 身份证(国徽面) if (this.idCardB_list.length > 0) { this.temp.idCardB = this.idCardB_list[this.idCardB_list.length - 1].url + }else { + this.temp.idCardB = '' } - // for (var i = 0; i < this.idCardB_list.length; i++) { - // this.temp.idCardB = this.idCardB_list[i].url; - // console.log("图片信息", this.temp.idCardB); - // } // 学历证书 if (this.diploma_list.length > 0) { this.temp.diploma = this.diploma_list[this.diploma_list.length - 1].url + }else { + this.temp.diploma = '' } - // for (var i = 0; i < this.diploma_list.length; i++) { - // this.temp.diploma = this.diploma_list[i].url; - // console.log("图片信息", this.temp.diploma); - // } // 学位证书 if (this.degree_list.length > 0) { this.temp.degreeCertificate = this.degree_list[this.degree_list.length - 1].url + }else { + this.temp.degreeCertificate = '' } - // for (var i = 0; i < this.degree_list.length; i++) { - // this.temp.degreeCertificate = this.degree_list[i].url; - // console.log("图片信息", this.temp.degreeCertificate); - // } // 前公司离职证明 leaveCertificate if (this.leave_list.length > 0) { this.temp.leaveCertificate = this.leave_list[this.leave_list.length - 1].url + }else { + this.temp.leaveCertificate = '' } - // for (var i = 0; i < this.leave_list.length; i++) { - // this.temp.leaveCertificate = this.leave_list[i].url; - // console.log("图片信息", this.temp.leaveCertificate); - // } - // console.log("所有图片路径"); }, // 返回（===既判断又赋值） handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') // this.photo_list = [] + this.$refs['uploadHead'].files = [] + this.$refs['uploadHead'].Photo = '' this.idCardA_list = [] this.idCardB_list = [] this.diploma_list = [] @@ -1132,6 +1124,7 @@ export default { url: this.temp.idCardA }) } + console.log('身份证人面像',this.idCardA_list) if (this.temp.idCardB !== '') { const imgName = this.temp.idCardB.split('/') this.idCardB_list.push({ @@ -1167,7 +1160,6 @@ export default { saveAdd() { const _this = this - this.getUrl() this.$refs['dataForm'].validate((valid) => { this.getGenderKey() this.getUrl() @@ -1203,6 +1195,7 @@ export default { saveEdit() { const _this = this this.$refs['dataForm'].validate((valid) => { + this.getUrl() if (valid) { this.submitdisabled = true req.saveEdit(this.temp, this.sid).then((resp) => { diff --git a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue index 930bad855e..9ced066a3e 100644 --- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue +++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue @@ -216,7 +216,7 @@ - *入职时间 + *入职日期 diff --git a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue index 3a2cc6c20f..591412ea18 100644 --- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue +++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue @@ -57,17 +57,17 @@ - + - - - - - - + + + + + +
@@ -503,11 +503,11 @@ export default { } /deep/ .el-collapse-item__wrap { - border-bottom: 0px solid #ebeef5; + border-bottom: 0 solid #ebeef5; } /deep/ .el-collapse-item__header { - border-bottom: 0px solid #e6ebf5; + border-bottom: 0 solid #e6ebf5; } .searchbtn { diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js index b63dfc375b..3fb930c19e 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js @@ -33,9 +33,9 @@ export function deleteBySids(params) { // 详情回显 已改 export function details(data) { return request({ - url: '/base/v1/basevehiclemodel/details/' + data, + url: '/base/v1/basevehiclemodel/details/' + data.sid + '/' + data.useOrgSid, method: 'get', - params: data + // params: data }) } diff --git a/anrui-scm/anrui-scm-ui/src/layout/components/Sidebar/SidebarItem.vue b/anrui-scm/anrui-scm-ui/src/layout/components/Sidebar/SidebarItem.vue index 114df4053a..71870af7ac 100644 --- a/anrui-scm/anrui-scm-ui/src/layout/components/Sidebar/SidebarItem.vue +++ b/anrui-scm/anrui-scm-ui/src/layout/components/Sidebar/SidebarItem.vue @@ -71,7 +71,7 @@ export default { } }) - // When there is only one child + // When there is only one child // if (showingChildren.length === 1) { // this.onlyOneChild=item() // return true @@ -96,4 +96,22 @@ export default { } } } - \ No newline at end of file + + diff --git a/anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue b/anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue index 57b4af0362..a6e3362c97 100644 --- a/anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue +++ b/anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue @@ -26,13 +26,13 @@
--> - + @@ -139,7 +139,8 @@ export default { const { fullPath } = view this.$nextTick(() => { this.$router.replace({ - path: '/redirect' + fullPath + path: fullPath + // path: '/redirect' + fullPath }) }) }) @@ -191,7 +192,7 @@ export default { } else { this.left = left } - this.top = e.clientY + this.top = e.clientY - 32 this.visible = true this.selectedTag = tag }, diff --git a/anrui-scm/anrui-scm-ui/src/main.js b/anrui-scm/anrui-scm-ui/src/main.js index 68970e038e..e53fd86411 100644 --- a/anrui-scm/anrui-scm-ui/src/main.js +++ b/anrui-scm/anrui-scm-ui/src/main.js @@ -65,7 +65,8 @@ function getUserInfo() { Orgname: data.organizationName, dwjb: data.dwjb, orgNamePath: data.orgNamePath, // 使用组织全路径名称 - orgSidPath: data.orgSidPath // 使用组织全路径Sid + orgSidPath: data.orgSidPath, // 使用组织全路径Sid + pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName } // 结果存入缓存 window.sessionStorage.setItem('staffSid', user.staffSid) @@ -79,6 +80,7 @@ function getUserInfo() { window.sessionStorage.setItem('departmentSid', user.departmentSid) window.sessionStorage.setItem('orgNamePath', user.orgNamePath) window.sessionStorage.setItem('orgSidPath', user.orgSidPath) + window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName) }) } diff --git a/anrui-scm/anrui-scm-ui/src/styles/index.scss b/anrui-scm/anrui-scm-ui/src/styles/index.scss index 3989c17cb0..b685225c7f 100644 --- a/anrui-scm/anrui-scm-ui/src/styles/index.scss +++ b/anrui-scm/anrui-scm-ui/src/styles/index.scss @@ -214,11 +214,11 @@ div:focus { color: #606266; font-weight: 600; border-right: 1px solid $table-border-color; - padding: 0px 15px !important; + padding: 0 10px !important; line-height: 48px; } .el-form-item{ - padding: 0px 15px !important; + padding: 0 10px !important; margin-bottom: 0; .addinputw { width: 80%; } } diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue index 14558220cb..75cdf7be3c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue +++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue @@ -17,9 +17,9 @@ - - - + + + @@ -52,13 +52,17 @@ @selection-change="handleSelectionChange"> - + + + + + + - diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue index dc3bfc9533..a632894fa1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue @@ -348,6 +348,7 @@ export default { break } }, + // 孟哲接口 getPathSid() { const userSid = window.sessionStorage.getItem('userSid') getPathSidByUserSid({userSid:userSid}).then((res) => { @@ -587,8 +588,8 @@ export default { handleCheck(row) { this.viewState = 4 const sid = row.sid - console.log('详情sid', sid) - this.$refs['divinfo'].showInfo(sid, row) + console.log('详情sid', sid,'useOrg:',this.useOrg) + this.$refs['divinfo'].showInfo(sid, row, this.useOrg) }, // 根据本行ID删除数据 doDel() { diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue index aa28b09729..209bb61772 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue @@ -270,8 +270,12 @@ export default { this.$emit('doback') }, // 查看 - showInfo(sid, row) { - details(sid).then((response) => { + showInfo(sid, row, useOrgSid) { + const data = { + sid:sid, + useOrgSid:useOrgSid + } + details(data).then((response) => { this.FormLoading = false if (response.success) { this.temp = response.data diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue deleted file mode 100644 index ebff3c75c8..0000000000 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue +++ /dev/null @@ -1,328 +0,0 @@ - - - - - diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue index 3ed16b8d83..6d783bd31b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue @@ -128,21 +128,21 @@ - + + diff --git a/anrui-system-ui/src/layout/components/Sidebar/index.vue b/anrui-system-ui/src/layout/components/Sidebar/index.vue index 4f291a0adc..e1556a4cfa 100644 --- a/anrui-system-ui/src/layout/components/Sidebar/index.vue +++ b/anrui-system-ui/src/layout/components/Sidebar/index.vue @@ -138,8 +138,21 @@ } } - diff --git a/anrui-system-ui/src/layout/components/TagsView/index.vue b/anrui-system-ui/src/layout/components/TagsView/index.vue index 1b096ef642..373543fa77 100644 --- a/anrui-system-ui/src/layout/components/TagsView/index.vue +++ b/anrui-system-ui/src/layout/components/TagsView/index.vue @@ -25,15 +25,15 @@ --> - - - + @@ -140,7 +140,8 @@ export default { const { fullPath } = view this.$nextTick(() => { this.$router.replace({ - path: '/redirect' + fullPath + path: fullPath + // path: '/redirect' + fullPath }) }) }) @@ -153,8 +154,8 @@ export default { } else { this.$router.push('/index'); } - - + + // this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => { // if (this.isActive(view)) { // this.toLastView(visitedViews, view) @@ -201,7 +202,7 @@ export default { } else { this.left = left } - this.top = e.clientY + this.top = e.clientY - 32 this.visible = true this.selectedTag = tag }, diff --git a/anrui-system-ui/src/store/modules/user.js b/anrui-system-ui/src/store/modules/user.js index d49545a3dc..6b6ad985e8 100644 --- a/anrui-system-ui/src/store/modules/user.js +++ b/anrui-system-ui/src/store/modules/user.js @@ -28,7 +28,7 @@ const actions = { login(userInfo).then(response => { const { data } = response commit('SET_TOKEN', data.token) - setStorage(data.token) + setStorage(data.token) let user = { roleSid: data.roleSid, name: data.name, @@ -39,13 +39,15 @@ const actions = { userSid: data.sid, orgSid: data.organizationSid, Orgname: data.organizationName, - dwjb: data.dwjb + dwjb: data.dwjb, + pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName } commit('SET_UESRINFO', user) window.sessionStorage.setItem('userSid', user.userSid); window.sessionStorage.setItem('Orgname', user.Orgname); window.sessionStorage.setItem('departmentName', user.departmentName); window.sessionStorage.setItem('name', user.name); + window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName); resolve(data) }).catch(error => { reject(error) diff --git a/anrui-system-ui/src/views/Home/Home.vue b/anrui-system-ui/src/views/Home/Home.vue index eb989d0d84..da288966dd 100644 --- a/anrui-system-ui/src/views/Home/Home.vue +++ b/anrui-system-ui/src/views/Home/Home.vue @@ -3,9 +3,9 @@

安瑞集团信息化平台

-

{{Orgname}},

+ -

欢迎，{{name}}

+

欢迎您，{{pNameAndDepartmentNameAndPostName}} {{name}}

@@ -72,7 +72,7 @@

{{item.title}}

-

Copyright © 2021 安瑞集团 All Rights Reserved

+

Copyright © {{ year }} 安瑞集团 All Rights Reserved