diff --git a/src/api/ma/typeConfigRepair.js b/src/api/ma/typeConfigRepair.js index 9106fe45..0cca1ec4 100644 --- a/src/api/ma/typeConfigRepair.js +++ b/src/api/ma/typeConfigRepair.js @@ -12,17 +12,26 @@ export function getMatConfigList(query) { //组织人员树类型管理列表 export function getListByMatConfig(query) { return request({ - url: '/material/ma_type/getMaTypeConfigList', + url: '/material/ma_type/listNoPage', method: 'get', params: query, }) } -// 物资类型管理--新增 -export function bindRepair(data) { +// 库管员管理--绑定 +export function bindKeeper(data) { return request({ - url: '/material/ma_type_config/updateMaTypeBindInfo', + url: '/material/ma_type_repair', method: 'post', data: data, }) +} + +// 库管员管理--绑定 +export function noBindKeeper(data) { + return request({ + url: '/material/ma_type_repair', + method: 'delete', + data: data, + }) } \ No newline at end of file diff --git a/src/views/material/basic/bmUnit/people.vue b/src/views/material/basic/bmUnit/people.vue index 61185e99..ec474350 100644 --- a/src/views/material/basic/bmUnit/people.vue +++ b/src/views/material/basic/bmUnit/people.vue @@ -510,7 +510,7 @@ export default { renderConent(h, { node }) { let iconClass = ''; // 根据 node 的类型判断图标 - if (node.data.level == 3) { + if (node.data.level == 99) { iconClass = 'el-icon-user-solid'; } // else if (node.type === 'file') { @@ -619,7 +619,7 @@ export default { handleSave() { console.log(this.chosenUserId, 'chosenUserId') console.log(this.ids, 'ids') - if(this.levelTemp!=3) { + if(this.levelTemp!=99) { this.$modal.msgError("请先选择配置人员！") return } diff --git a/src/views/material/basic/unitType/index.vue b/src/views/material/basic/unitType/index.vue index 4c45d0c4..7c273bd9 100644 --- a/src/views/material/basic/unitType/index.vue +++ b/src/views/material/basic/unitType/index.vue @@ -75,12 +75,6 @@ {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }} - @@ -138,8 +132,8 @@ - - + + diff --git a/src/views/material/ma/typeConfigKeeper/index.vue b/src/views/material/ma/typeConfigKeeper/index.vue index 63638a9a..2f40eefb 100644 --- a/src/views/material/ma/typeConfigKeeper/index.vue +++ b/src/views/material/ma/typeConfigKeeper/index.vue @@ -56,7 +56,7 @@ :filter-node-method="filterNodeTwo" ref="treeTwo" node-key="id" - default-expand-all + :default-expand-all="false" highlight-current @node-click="handleNodeClickTwo" > @@ -326,11 +326,12 @@ export default { maxLength:100,//已选列表上限，防止数据过多请求报错 // 查询参数 queryParams: { - typeName: undefined, + typeName: "", level: 0, pageNum: 1, pageSize: 10, displayBindRelationship:true, + houseId:"", // phonenumber: undefined, // status: undefined, // typeId: undefined @@ -346,6 +347,9 @@ export default { selectionRows:[], }; }, + // mounted(){ + // this.selectFirstNode(); + // }, watch: { // 根据名称筛选部门树 typeName(val) { @@ -358,10 +362,13 @@ export default { }, created() { // this.getInfo() - this.getList(); - this.getTreeData(); - this.getTreeDataTwo(); - this.getKeeperDataList(); + this.getTreeData(); + this.getTreeDataTwo(); + // this.getKeeperDataList(); + // setTimeout(()=>{ + // this.getList(); + // },200) + // this.getUserList() // this.getPropData() }, @@ -372,6 +379,16 @@ export default { // this.companyId = res.user.companyId // }) // }, + selectFirstNode(){ + const firstNode = this.$refs.treeTwo.getNode(1); + if(firstNode){ + this.queryParams.typeId = firstNode.id + this.queryParams.level = 0 + this.queryParams.houseId = firstNode.id + this.$refs.treeTwo.setChecked(firstNode,true); + } + }, + renderConent(h, { node }) { let iconClass = ''; // 根据 node 的类型判断图标 @@ -429,7 +446,7 @@ export default { this.form.keeperDataPro = this.keeperProRange.value; }, /** 查询新增页面-上级类型下拉树结构 */ - getTreeData() { + async getTreeData() { // getMatConfigList().then((response) => { // this.treeOptions = response.data; // }); @@ -439,16 +456,25 @@ export default { }); }, /** 查询新增页面-上级类型下拉树结构 */ - getTreeDataTwo() { + async getTreeDataTwo() { getMaTypeList().then((response) => { this.treeOptionsTwo = response.data + if(this.treeOptionsTwo.length>0 && this.treeOptionsTwo[0].children.length>0){ + const firstNode = this.treeOptionsTwo[0].children[0]; + this.queryParams.typeId = firstNode.id + this.queryParams.level = 1 + this.queryParams.houseId = firstNode.houseId + this.getList(); + } }) + }, /** 查询列表 */ - getList() { + async getList() { this.loading = true - this.queryParams.displayBindRelationship=true; - getListByMaType(this.queryParams).then((response) => { + this.queryParams.displayBindRelationship="true"; + console.log('queryParams1',this.queryParams) + await getListByMaType(this.queryParams).then((response) => { this.typeList = response.data.rows this.total = response.data.total this.loading = false @@ -473,10 +499,18 @@ export default { }, // 节点单击事件 - 左侧树 async handleNodeClickTwo(data,node) { + if(data.level==0){ this.queryParams.typeId = data.id this.queryParams.level = data.level + this.queryParams.houseId = data.id + }else{ + this.queryParams.typeId = data.id + this.queryParams.level = data.level + this.queryParams.houseId = data.houseId + } this.handleQuery() }, + // 取消按钮 cancel() { this.open = false; @@ -494,7 +528,7 @@ export default { this.resetForm("form"); }, /** 搜索按钮操作 */ - handleQuery() { + async handleQuery() { // this.queryParams.pageNum = 1; this.$refs.multipleTable.clearSelection(); this.queryParams.pageNum = 1; diff --git a/src/views/material/ma/typeConfigRepair/index.vue b/src/views/material/ma/typeConfigRepair/index.vue index 7a785e73..e28b98e8 100644 --- a/src/views/material/ma/typeConfigRepair/index.vue +++ b/src/views/material/ma/typeConfigRepair/index.vue @@ -3,11 +3,11 @@
- +
+
组织人员树
 + + +
+ +
+
+
物资类型树
+ + +
+ - + - + - + +
@@ -202,26 +237,23 @@ @@ -657,6 +708,13 @@ export default { font-size: 16px; } } +.grid-content { + border-radius: 4px; + min-height: 24px; +} +.bg-purple-dark { + background: #e5e9f2; +} ::v-deep .el-tree .el-tree-node__expand-icon.expanded { -webkit-transform: rotate(0deg);