From 94f2a3d6e23ec40dbe225d2810ad06ee005bbd1d Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 11 Apr 2024 19:15:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/headerImg/companyIcon1.png | Bin 0 -> 1224 bytes src/assets/images/headerImg/companyIcon2.png | Bin 0 -> 1463 bytes src/assets/images/headerImg/documentIcon1.png | Bin 0 -> 1767 bytes src/assets/images/headerImg/equipIcon1.png | Bin 0 -> 1316 bytes src/assets/images/headerImg/projectIcon1.png | Bin 0 -> 2586 bytes src/assets/js/api/account.js | 5 +- src/assets/js/api/companyDiagram.js | 1 + src/assets/js/api/supplier.js | 1 + src/assets/js/http.js | 4 +- src/components/account.vue | 45 ++-- src/components/centerChange.vue | 20 +- src/components/header.vue | 26 ++- src/components/layout.vue | 14 +- src/components/layoutnalmal.vue | 13 +- src/components/userChange.vue | 92 ++++++-- src/router/index.js | 2 +- src/store/index.js | 4 +- src/views/companyAdmin/companyDiagram.vue | 103 +++++++-- .../projectSummary/supplierAudit.vue | 5 +- .../components/apply-info.vue | 200 +++++++++--------- .../components/basic-info.vue | 1 - .../components/qualification-info.vue | 55 ++++- .../qualificationApply/index.vue | 31 +-- src/views/workSpace/index.vue | 63 +++++- 24 files changed, 471 insertions(+), 214 deletions(-) create mode 100644 src/assets/images/headerImg/companyIcon1.png create mode 100644 src/assets/images/headerImg/companyIcon2.png create mode 100644 src/assets/images/headerImg/documentIcon1.png create mode 100644 src/assets/images/headerImg/equipIcon1.png create mode 100644 src/assets/images/headerImg/projectIcon1.png diff --git a/src/assets/images/headerImg/companyIcon1.png b/src/assets/images/headerImg/companyIcon1.png new file mode 100644 index 0000000000000000000000000000000000000000..ec8457a2ec7f6977cd76c9eed87707b3dfc86190 GIT binary patch literal 1224 zcmeAS@N?(olHy`uVBq!ia0vp^AwV3%!3HEhSWH?2q&N#aB8wRq6fHoQ(RG?(0#J~# zILO_JVcj{Imp~3nx}&cn1H;CC?mvmFKyIw3i(^Oy!-rf%?q!_h;VdFeLXF9+TMIFx__HFaJ#(s)qbI4$8k4-u!># zghO`Way|!XmIH}>4Gp>?KR&$NpZNH9vh$T~lS-AgGM?$;`}Xc#TIKUEzwNHRC~#D; zV^8yKzcDSba_L9&ZLa^139)z|m@^~I&|}i7pZiQU1RiLrJf?8x`uii?Dp%ViT{WJG zUdXpy0MJCU2CeIJt2*W#;F+K? z=im7&xhwL*XYG=W#m+*6T!RUx@IKvd7vA9#jZQRqI@JK ztvr~$tK%FqyK9rn&OQIGwEuZm|FA4q+wkvQF0CDG!Yu;dR4*64e=>sKre+re&m;_s4_Hm2sskF5lIKW~t?En1SU@@2~pY0-Zt kw!0^RGJJ9m?{~>P@1t)7EO;0^UHx3vIVCg!00b*gX8-^I literal 0 HcmV?d00001 diff --git a/src/assets/images/headerImg/companyIcon2.png b/src/assets/images/headerImg/companyIcon2.png new file mode 100644 index 0000000000000000000000000000000000000000..e3674a734fc7838607b151e6a4accb7c58f5b50a GIT binary patch literal 1463 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 literal 0 HcmV?d00001 diff --git a/src/assets/js/api/account.js b/src/assets/js/api/account.js index 228f9ab6..677260ea 100644 --- a/src/assets/js/api/account.js +++ b/src/assets/js/api/account.js @@ -6,7 +6,9 @@ import {get,post} from '../http' export const addSystemUserApi = data => post('xmgl/systemUser/add', data); //添加账号信息 export const editSystemUserApi = data => post('xmgl/systemUser/edit', data); //编辑账号信息 export const deleteSystemUserApi = data => post('xmgl/systemUser/delete', data); //删除账号信息 -export const getSystemUserBySnApi = data => post('xmgl/systemUser/getSystemUserBySn', data); //根据企业或项目SN查找账号列表 +export const getSystemUserBySnApi = data => post('xmgl/systemUser/getSystemUserBySn', data); //查找账号列表 +export const getSystemUserBySnPageApi = data => post('xmgl/systemUser/getSystemUserBySnPage', data); //查找账号分页列表 + // 新用户审核 // 列表 @@ -18,6 +20,7 @@ export const userDeleteApi = data => post('xmgl/xzRegistry/delete', data); // 用户管理 // 列表 export const getUserManagerApi = data => post('xmgl/systemUser/getTenantListBySn', data); +export const getUserManagerPageApi = data => post('xmgl/systemUser/getTenantPageBySn', data); // 回显所选组织 export const getSelectedGroupApi = data => post('xmgl/company/getOrgSnListByUserId', data); // 调整组织 diff --git a/src/assets/js/api/companyDiagram.js b/src/assets/js/api/companyDiagram.js index d78f808f..66fcdb80 100644 --- a/src/assets/js/api/companyDiagram.js +++ b/src/assets/js/api/companyDiagram.js @@ -16,6 +16,7 @@ export const addorganizationJobApi = data => post('xmgl/organizationJob/add', da export const editorganizationJobApi = data => post('xmgl/organizationJob/edit', data); export const deleteorganizationJobApi = data => post('xmgl/organizationJob/delete', data); export const getorganizationJobListApi = data => post('xmgl/organizationJob/selectList', data); +export const getorganizationJobPageApi = data => post('xmgl/organizationJob/selectPage', data); // 推送安全帽账号 export const sendSafetyHatAccountDataApi = data => post('xmgl/systemUser/sendSafetyHatAccountData', data); diff --git a/src/assets/js/api/supplier.js b/src/assets/js/api/supplier.js index 2d1fab3e..69c5f95a 100644 --- a/src/assets/js/api/supplier.js +++ b/src/assets/js/api/supplier.js @@ -16,6 +16,7 @@ export const infoReportSaveApi = data => post('xmgl/xzSupplier/saveSupplier', d // 资质文件 export const getQualificationFileApi = data => post('xmgl/xzSupplierQualification/list', data); +export const getQualificationFilePageApi = data => post('xmgl/xzSupplierQualification/page', data); // 资质文件-记录 export const getQualificationFileRecordApi = data => get('xmgl/xzSupplierQualificationRecord/list', data); export const addQualificationFileApi = data => post('xmgl/xzSupplierQualification/add', data); diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 0d71d028..6f530745 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -83,7 +83,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 @@ -91,7 +91,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 - axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 + // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/components/account.vue b/src/components/account.vue index 8e91a88f..2e1c56c5 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -9,7 +9,7 @@ @hide="sendMsg2" >
-
+
@@ -31,7 +31,7 @@ -
+
+ {{ enterpriseFront }}
@@ -58,13 +57,12 @@ @click="goto2" v-if=" $route.path.indexOf('/companyAdmin/companyDiagram') == -1 && - $store.state.userInfo.accountType != 5 && - $store.state.userInfo.accountType != 6 && - $store.state.userInfo.accountType != 10 + ![5, 6, 10].includes($store.state.userInfo.accountType) " :title="enterpriseBackground" > - + + {{ enterpriseBackground }} @@ -79,7 +77,8 @@ " :title="projectBackground" > - + + {{ projectBackground }}
@@ -93,7 +92,8 @@ " :title="equipmentChina" > - + + {{ equipmentChina }}
@@ -114,10 +114,13 @@
- + + {{ dataCenter }}
@@ -129,8 +132,7 @@ $route.path.indexOf('/firm/projectManage') == -1 && $store.state.userInfo.systemLogoConfig.isShowProjectFront == 1 && - $store.state.userInfo.accountType == 5 && - $store.state.userInfo.accountType == 6 + [5, 6].includes($store.state.userInfo.accountType) " :title="projectFront" > @@ -308,7 +310,7 @@ export default { this.$store.commit("setMapBackArr", []); this.$store.commit("setMoudle", null); this.$store.commit("setProDetail", null); - this.$store.commit('setSelectedGroupSn', null); + this.$store.commit("setSelectedGroupSn", null); window.localStorage.removeItem("isIframe"); window.localStorage.removeItem("soundList"); let json = { @@ -369,7 +371,7 @@ export default { window.open("/#/projectList", "_self"); } } - if (type == 5 || type == 6) { + if (type == 5 || type == 6 || type == 10) { window.open("/index.html#/projectIndex", "_self"); } else { routeUrl = this.$router.resolve({ @@ -425,10 +427,15 @@ export default { .accountBox { padding: 10px 10px 0; } +.accountInfo{ + margin-bottom: 17px; +} .logout { justify-content: space-around; cursor: pointer; color: #4a8ef7; + border-top: 1px solid rgba(47, 57, 92, 0.1); + padding-top: 10px; // &:hover { // color: @--color-primary; // } @@ -453,8 +460,6 @@ export default { .wrap { flex-wrap: wrap; border-top: 1px solid rgba(47, 57, 92, 0.1); - border-bottom: 1px solid rgba(47, 57, 92, 0.1); - margin: 17px 0 10px; padding-top: 10px; } .width_100 { diff --git a/src/components/centerChange.vue b/src/components/centerChange.vue index a5344031..a55146cc 100644 --- a/src/components/centerChange.vue +++ b/src/components/centerChange.vue @@ -2,7 +2,7 @@
个人中心
-
工作台
-
用户中心
-
消息中心
+
工作台
+
用户中心
+
消息中心
@@ -41,6 +41,9 @@ export default { mounted() { }, methods: { + isActive(val){ + return this.$route.path.indexOf(val) != -1?true:false + }, jumpRouter(routeName){ this.$router.push(routeName) } @@ -52,6 +55,10 @@ export default { display: flex; align-items: center; } +.activeStyle(){ + color: white; + background-color: #478CF7; +} .changeBox { .center-classify{ width: 180px; @@ -74,9 +81,8 @@ export default { border-radius: 3px; cursor: pointer; } - div:hover{ - color: white; - background-color: #478CF7; + div:hover,.active-item{ + .activeStyle(); } div:not(:last-child){ margin-bottom: 7px; diff --git a/src/components/header.vue b/src/components/header.vue index 3bbc3356..467fecec 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -40,10 +40,9 @@ class="canClick" v-if="$route.path.indexOf('/firm/') == -1 && company != 'nanchang'" @click="changeArea(-1)" - >{{ - $store.state.currentProDetail && $store.state.currentProDetail.name ? systemInfo.platformName + " - " + $store.state.currentProDetail.name : headerName - }}{{ updateTitle }} + >{{ item.name }}
-
+
-
+
@@ -278,7 +277,22 @@ export default { this.showQrCode = false; } }, - + computed: { + updateTitle() { + if ( + this.$store.state.currentProDetail && + this.$store.state.currentProDetail.name + ) { + return ( + this.systemInfo.platformName + + " - " + + this.$store.state.currentProDetail.name + ); + } else { + return this.headerName; + } + }, + }, methods: { //获取项目详细(数据看板跳转地址) closeAudio() { diff --git a/src/components/layout.vue b/src/components/layout.vue index b486567d..959ae9ff 100644 --- a/src/components/layout.vue +++ b/src/components/layout.vue @@ -242,12 +242,14 @@ export default { backtoIndex() { // window._paq.push(['trackEvent', '点击', '返回主菜单','返回主菜单' ]) var url = window.location.href; - this.$router.push("/workSpace"); - // if (url.indexOf("equipmentCenter.html") != -1) { - // this.$router.push("/equipmentCenterIndx"); - // } else { - // this.$router.push("/projectIndex"); - // } + // this.$router.push("/workSpace"); + if (url.indexOf("equipmentCenter.html") != -1) { + this.$router.push("/equipmentCenterIndx"); + } else if (url.indexOf("supplier/qualification/apply") != -1) { + this.$router.back(); + } else { + this.$router.push("/projectIndex"); + } }, handleSelect(key, keyPath) { diff --git a/src/components/layoutnalmal.vue b/src/components/layoutnalmal.vue index b436881c..58f71d34 100644 --- a/src/components/layoutnalmal.vue +++ b/src/components/layoutnalmal.vue @@ -184,12 +184,13 @@ export default { backtoIndex() { // window._paq.push(['trackEvent', '点击', '返回主菜单','返回主菜单' ]) var url = window.location.href; - this.$router.push("/workSpace"); - // if (url.indexOf("equipmentCenter.html") != -1) { - // this.$router.push("/equipmentCenterIndx"); - // } else { - // this.$router.push("/projectIndex"); - // } + if (url.indexOf("equipmentCenter.html") != -1) { + this.$router.push("/equipmentCenterIndx"); + } else if (url.indexOf("supplier/qualification/apply") != -1) { + this.$router.back(); + } else { + this.$router.push("/projectIndex"); + } }, handleSelect(key,keyPath) { diff --git a/src/components/userChange.vue b/src/components/userChange.vue index 80d9a3bb..a0d8c3b5 100644 --- a/src/components/userChange.vue +++ b/src/components/userChange.vue @@ -2,7 +2,7 @@
{{ item.companyName }}
-
- +
@@ -73,16 +72,35 @@ + > + + {{ node.label }} + +
@@ -126,10 +144,26 @@ export default { }, mounted() {}, methods: { + // 处理组织架构树形数据 + filterTreeData(tree){ + tree.forEach(node => { + if(!node.projectSn){ + node.disabled = true; + } + if (node.list && node.list.length) { + this.filterTreeData(node.list); + } + }); + }, + // 展示组织架构内容 + showGroup(){ + this.isUserList = false; + this.setTreeActive(); + }, // 选中组织中的项目级 selectProject(obj) { console.log(obj, "111222333"); - if (!obj || !obj.list) return; + if (!obj) return; if (obj.list && obj.list.length > 0) { obj.list.map((item) => { this.selectProject(item); @@ -138,16 +172,28 @@ export default { if (!this.selectedProjectSn) { // 加判断是为了在循环中只选中第一个 this.selectedProjectSn = obj.sn; + this.setTreeActive(); // 修改全局projectSn this.$store.commit("setProjectSn", obj.sn); this.$store.commit("setProDetail", obj); } } }, + // 设置树形的选中项目样式 + setTreeActive(){ + this.$nextTick(() => { + let activeSn = this.selectedProjectSn || this.$store.state.selectedGroupSn + if(activeSn){ + this.$refs.tree.setCurrentKey(activeSn); + } + }) + }, // 选中组织 selectGroup(item) { if (item) { - this.selectedGroupData = [item]; + this.selectedGroupData = [item] + this.filterTreeData(this.selectedGroupData); + console.log(this.selectedGroupData) } else { this.selectedGroupData = []; this.$store.commit("setProjectSn", ""); @@ -167,7 +213,8 @@ export default { return item.sn == this.$store.state.selectedGroupSn; }); if (findItem) { - this.selectedGroupData = [findItem]; + this.selectedGroupData = [findItem] + this.filterTreeData(this.selectedGroupData); this.$nextTick(() => { this.selectProject(findItem); }); @@ -263,14 +310,23 @@ export default { margin-top: 15px; background-color: #fff; .select-list { - &-item { - display: flex; - align-items: center; - justify-content: space-between; + .custom-tree-node { + width: 100%; + .flexStyle(); + .projectStyle{ + font-family: Source Han Sans CN, Source Han Sans CN; + font-weight: 400; + color: #272D45; + } + .companyStyle{ + font-family: Source Han Sans CN, Source Han Sans CN; + font-weight: 400; + color: #A2A4AF; + } } - } } } +} .click-content { cursor: pointer; .flexStyle(); diff --git a/src/router/index.js b/src/router/index.js index f53b8605..1938ecc8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -844,7 +844,7 @@ const routes2 = [ }, { path: "/project/configManage/groupStructureManagement", - name: "系统管理_人员权限1", + name: "系统管理_组织架构管理", component: (resolve) => require([ "@/views/projectFront/configManage/groupStructureManagement.vue", diff --git a/src/store/index.js b/src/store/index.js index 6e428150..949251b3 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -50,7 +50,7 @@ export default new Vuex.Store({ // FILEURL:' http://101.43.164.214:11111/image/',// 百色 // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 - // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地) + WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地) // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 BASEURL: baseUrl @@ -62,7 +62,7 @@ export default new Vuex.Store({ window.location.host + "/upload/image", //正式环境 FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 - WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址 + // WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue index e92bad44..cfadab1e 100644 --- a/src/views/companyAdmin/companyDiagram.vue +++ b/src/views/companyAdmin/companyDiagram.vue @@ -82,7 +82,7 @@ : treeSelectData.companyName }}
- + +
@@ -1219,7 +1230,7 @@ :check-on-click-node="false" show-checkbox :props="defaultProps" - node-key="itemId" + node-key="sn" ref="relativeTree" > @@ -1281,7 +1292,7 @@ import { addorganizationJobApi, editorganizationJobApi, deleteorganizationJobApi, - getorganizationJobListApi, + getorganizationJobPageApi, sendSafetyHatAccountDataApi, getDictionaryItemApi, } from "@/assets/js/api/companyDiagram.js"; @@ -1290,11 +1301,11 @@ import { addSystemUserApi, editSystemUserApi, deleteSystemUserApi, - getSystemUserBySnApi, + getSystemUserBySnPageApi, getUserAuditListApi, userAuditApi, userDeleteApi, - getUserManagerApi, + getUserManagerPageApi, updateUserManagerApi, getSelectedGroupApi } from "@/assets/js/api/account.js"; @@ -1331,6 +1342,11 @@ export default { } }; return { + pagInfo: { + pageNo: 1, //页数 + pageSize: 10, //条数 + total: 0 //总条数 + }, COMPANY: COMPANY, projectType2: "", //全局的项目类型 （eg:hengqin） yiCheckArr: [], @@ -2075,10 +2091,6 @@ export default { editGroupForm: { groupId: "", }, - selectTreeProps: { - children: "children", - label: "label", - }, isSelectCompany: false, selectTree: {}, filterText: "", @@ -2227,14 +2239,22 @@ export default { } } }, - handleTabClick(tab, event) { - if(!this.treeSelectData.name) return; - if(this.tabActiveName == 'third'){ + getListData(){ + this.pagInfo.pageNo = 1; + if(this.tabActiveName == 'first'){ + this.getAccountList(); + } else if(this.tabActiveName == 'two'){ + this.getJobList(); + } else if(this.tabActiveName == 'third'){ this.getUserAuditListApiFunc(); } else if(this.tabActiveName == 'four'){ this.getUserManageListApi(); } }, + handleTabClick(tab, event) { + if(!this.treeSelectData.name) return; + this.getListData(); + }, handleNodeClick(data) { this.tabActiveName = "first"; this.treeSelectData = data; @@ -2996,7 +3016,12 @@ export default { getJobList() { let data = this.treeSelectData; let sn = data.projectSn ? data.projectSn : data.companySn; - getorganizationJobListApi({ sn: sn }).then((res) => { + let requestData = { + sn, + pageNo: this.pagInfo.pageNo, + pageSize: this.pagInfo.pageSize + } + getorganizationJobPageApi(requestData).then((res) => { this.jobList = res.result; }); }, @@ -3094,6 +3119,7 @@ export default { relativeGroupFn(item) { this.selectRowObj = item; this.relativeGroupDialog = true; + this.filterText = ""; this.$nextTick(() => { this.$refs.relativeTree.setCheckedKeys([]); }) @@ -3220,6 +3246,7 @@ export default { async editGroup(row) { this.selectRowObj = row; this.editGroupDialog = true; + this.filterText = ""; // 打开弹窗时调用上面的接口勾选 const res = await getSelectedGroupApi({ userId: row.userId }); // 打开弹窗时调用上面的接口勾选 @@ -3303,7 +3330,12 @@ export default { getUserManageListApi(){ let data = this.treeSelectData; let sn = data.projectSn ? data.projectSn : ""; - getUserManagerApi({ projectSn: sn, pageNo: -1, pageSize: -1 }).then((res) => { + let requestData = { + projectSn: sn, + pageNo: this.pagInfo.pageNo, + pageSize: this.pagInfo.pageSize + } + getUserManagerPageApi(requestData).then((res) => { this.userManageList = res.result; }); }, @@ -3311,16 +3343,29 @@ export default { getUserAuditListApiFunc(){ let data = this.treeSelectData; let sn = data.projectSn ? data.projectSn : data.companySn; - getUserAuditListApi({ sn: sn, accountType: 1 }).then((res) => { + let requestData = { + sn, + accountType: 1, + pageNo: this.pagInfo.pageNo, + pageSize: this.pagInfo.pageSize + } + getUserAuditListApi(requestData).then((res) => { this.userAuditList = res.result.records; + this.pagInfo.total = res.result.total; }); }, //获取账号列表 getAccountList() { let data = this.treeSelectData; let sn = data.projectSn ? data.projectSn : data.companySn; - getSystemUserBySnApi({ sn: sn }).then((res) => { + let requestData = { + sn, + pageNo: this.pagInfo.pageNo, + pageSize: this.pagInfo.pageSize + } + getSystemUserBySnPageApi(requestData).then((res) => { this.level1AccountData = res.result; + this.pagInfo.total = res.result.length; }); }, //删除项目 @@ -3615,10 +3660,22 @@ export default { }); } }, + SizeChange(val) { + this.pagInfo.pageSize = val + this.getListData(); + }, + CurrentChange(val) { + this.pagInfo.pageNo = val + this.getListData(); + }, }, watch: { filterText(val) { - this.$refs.tree.filter(val); + if(this.editGroupDialog){ + this.$refs.groupTree.filter(val); + } else if(this.relativeGroupDialog){ + this.$refs.relativeTree.filter(val); + } }, }, }; @@ -3803,6 +3860,18 @@ export default { margin-left: 20px; padding: 20px 15px; height: calc(100% - 40px); + .tabs-content{ + height: calc(100% - 95px); + /deep/.el-tabs__content{ + height: calc(100% - 50px); + .el-tab-pane{ + height: 100%; + } + } + } + .pagerBox{ + margin-top: 18px; + } } .operateBtns { float: right; //向右浮动 diff --git a/src/views/projectFront/projectSummary/supplierAudit.vue b/src/views/projectFront/projectSummary/supplierAudit.vue index 500df2d5..296607e4 100644 --- a/src/views/projectFront/projectSummary/supplierAudit.vue +++ b/src/views/projectFront/projectSummary/supplierAudit.vue @@ -559,6 +559,7 @@ export default { pageNo: this.page, pageSize: this.pageSize, applyStatus: this.tableParameter.applyStatus, + projectSn: this.$store.state.projectSn }; if ( this.tableParameter.timeRange && @@ -654,10 +655,12 @@ export default { }, //切换数量 handleSizeChange(value) { - // this.pageSize = value; + this.pageSize = value; + this.getTableList(); }, handleCurrentChange(value) { this.page = value; + this.getTableList(); }, }, }; diff --git a/src/views/supplierAdmin/qualificationApply/components/apply-info.vue b/src/views/supplierAdmin/qualificationApply/components/apply-info.vue index 914c838c..1b00485c 100644 --- a/src/views/supplierAdmin/qualificationApply/components/apply-info.vue +++ b/src/views/supplierAdmin/qualificationApply/components/apply-info.vue @@ -41,101 +41,99 @@ - - - - - - - + + @@ -453,11 +451,11 @@
审批人： - {{replyData.applyUser}} + {{ replyData.applyUser }}
审批回复时间： - {{replyData.replyTime}} + {{ replyData.replyTime }}
审批回复： @@ -482,7 +480,7 @@ import { operateQualificationApplyApi, getSupplierInfoRecordApi, getQualificationFileRecordApi, - qualificationApplyInfoApi + qualificationApplyInfoApi, } from "@/assets/js/api/supplier.js"; import { getComapnyStatisticsListApi } from "@/assets/js/api/company/project"; export default { @@ -539,17 +537,12 @@ export default { projectDirectorPhone: "", }, rowData: {}, - replyData: {} + replyData: {}, }; }, created() { this.projectSn = this.$store.state.projectSn; }, - watch: { - filterText(val) { - this.$refs.tree.filter(val); - }, - }, props: ["activeTabName"], methods: { // 查看详情-审批回复内容 @@ -726,9 +719,11 @@ export default { //切换数量 handleSizeChange(value) { this.pageSize = value; + this.getTableList(); }, handleCurrentChange(value) { this.page = value; + this.getTableList(); }, }, watch: { @@ -738,6 +733,9 @@ export default { this.loadData(); } }, + filterText(val) { + this.$refs.relativeTree.filter(val); + }, }, }; @@ -835,7 +833,7 @@ export default { padding: 15px 0; box-sizing: border-box; width: 100%; - height: calc(100% - 42px); + height: 100%; } .title_wrap { width: 100%; diff --git a/src/views/supplierAdmin/qualificationApply/components/basic-info.vue b/src/views/supplierAdmin/qualificationApply/components/basic-info.vue index 4bee5c0f..5f2326da 100644 --- a/src/views/supplierAdmin/qualificationApply/components/basic-info.vue +++ b/src/views/supplierAdmin/qualificationApply/components/basic-info.vue @@ -614,7 +614,6 @@ export default { } .main-content { width: 100%; - height: 100%; // background: #ffffff; box-sizing: border-box; .btn_wrap { diff --git a/src/views/supplierAdmin/qualificationApply/components/qualification-info.vue b/src/views/supplierAdmin/qualificationApply/components/qualification-info.vue index d805ec05..0410c2ac 100644 --- a/src/views/supplierAdmin/qualificationApply/components/qualification-info.vue +++ b/src/views/supplierAdmin/qualificationApply/components/qualification-info.vue @@ -1,5 +1,5 @@