From 029ce91c5f5e31a4ed1632ea00af1b59629ed7f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 16 Apr 2022 17:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=BA=E6=9E=84=E6=A0=91?=
=?UTF-8?q?=E5=92=8C=E5=95=86=E5=93=81=E7=B1=BB=E5=88=AB=E9=80=89=E6=8B=A9?=
=?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=9A=84=E9=80=BB=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/material/MaterialCategoryList.vue | 36 ++++++++++++-------
.../modules/MaterialCategoryModal.vue | 4 +--
.../src/views/system/OrganizationList.vue | 24 +++++++++----
.../system/modules/OrganizationModal.vue | 4 +--
4 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/jshERP-web/src/views/material/MaterialCategoryList.vue b/jshERP-web/src/views/material/MaterialCategoryList.vue
index 85941222..afdc3394 100644
--- a/jshERP-web/src/views/material/MaterialCategoryList.vue
+++ b/jshERP-web/src/views/material/MaterialCategoryList.vue
@@ -69,8 +69,8 @@
+ allow-clear :treeDefaultExpandAll="true"
+ :treeData="treeData" v-decorator="[ 'parentId' ]" placeholder="请选择上级目录">
@@ -169,7 +169,7 @@ export default {
this.refresh();
},
loadTree() {
- var that = this
+ let that = this
that.treeData = []
that.categoryTree = []
let params = {};
@@ -180,11 +180,9 @@ export default {
this.allTreeKeys = [];
for (let i = 0; i < res.length; i++) {
let temp = res[i]
- that.treeData.push(temp)
that.categoryTree.push(temp)
that.setThisExpandedKeys(temp)
that.getAllKeys(temp);
- // console.log(temp.id)
}
this.loading = false
}
@@ -211,8 +209,6 @@ export default {
},
onExpand(expandedKeys) {
console.log('onExpand', expandedKeys)
- // if not set autoExpandParent to false, if children expanded, parent can not collapse.
- // or, you can remove all expanded children keys.
this.iExpandedKeys = expandedKeys
},
backFlowList() {
@@ -236,11 +232,11 @@ export default {
if (this.checkedKeys.length <= 0) {
this.$message.warning('请选择一条记录！')
} else {
- var ids = ''
- for (var a = 0; a < this.checkedKeys.length; a++) {
+ let ids = ''
+ for (let a = 0; a < this.checkedKeys.length; a++) {
ids += this.checkedKeys[a] + ','
}
- var that = this
+ let that = this
this.$confirm({
title: '确认删除',
content: '确定要删除所选中的 ' + this.checkedKeys.length + ' 条数据吗?',
@@ -284,6 +280,7 @@ export default {
let record = e.node.dataRef
let params = {};
params.id=record.id;
+ this.getTreeByParams(params)
queryMaterialCategoryById(params).then((res) => {
if (res && res.code == 200) {
if(res.data){
@@ -300,7 +297,18 @@ export default {
this.setValuesToForm(record)
}
}
- });
+ })
+ },
+ //根据类别id加载类别树
+ getTreeByParams(params) {
+ queryMaterialCategoryTreeList(params).then((res) => {
+ if (res) {
+ this.treeData = []
+ for (let i = 0; i < res.length; i++) {
+ this.treeData.push(res[i])
+ }
+ }
+ })
},
// 触发onSelect事件时,为类别树右侧的form表单赋值
setValuesToForm(record) {
@@ -334,15 +342,17 @@ export default {
this.$message.warning('请点击选择要修改类别!')
return
}
-
let formData = Object.assign(this.currSelected, values)
console.log('Received values of form: ', formData)
httpAction(this.url.edit, formData, 'put').then((res) => {
if (res.code == 200) {
this.$message.success('保存成功!')
this.loadTree()
+ let params = {}
+ params.id = formData.id
+ this.getTreeByParams(params)
} else {
- this.$message.error(res.message)
+ this.$message.warning(res.data.message)
}
})
}
diff --git a/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue b/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
index a64cfb70..a6e36f55 100644
--- a/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
@@ -20,8 +20,8 @@
+ allow-clear :treeDefaultExpandAll="true"
+ :treeData="categoryTree" v-decorator="[ 'parentId' ]" placeholder="请选择上级目录">
diff --git a/jshERP-web/src/views/system/OrganizationList.vue b/jshERP-web/src/views/system/OrganizationList.vue
index 98dbde66..770808b1 100644
--- a/jshERP-web/src/views/system/OrganizationList.vue
+++ b/jshERP-web/src/views/system/OrganizationList.vue
@@ -69,8 +69,8 @@
+ allow-clear :treeDefaultExpandAll="true"
+ :treeData="treeData" v-decorator="[ 'parentId' ]" placeholder="请选择上级机构">
@@ -170,7 +170,7 @@ export default {
this.refresh();
},
loadTree() {
- var that = this
+ let that = this
that.treeData = []
that.departTree = []
let params = {};
@@ -181,11 +181,9 @@ export default {
this.allTreeKeys = [];
for (let i = 0; i < res.length; i++) {
let temp = res[i]
- that.treeData.push(temp)
that.departTree.push(temp)
that.setThisExpandedKeys(temp)
that.getAllKeys(temp);
- // console.log(temp.id)
}
this.loading = false
}
@@ -286,6 +284,7 @@ export default {
let record = e.node.dataRef
let params = {};
params.id=record.id;
+ this.getTreeByParams(params)
queryOrganizationById(params).then((res) => {
if (res && res.code == 200) {
if(res.data){
@@ -304,6 +303,17 @@ export default {
}
});
},
+ //根据机构id加载机构树
+ getTreeByParams(params) {
+ queryOrganizationTreeList(params).then((res) => {
+ if (res) {
+ this.treeData = []
+ for (let i = 0; i < res.length; i++) {
+ this.treeData.push(res[i])
+ }
+ }
+ })
+ },
// 触发onSelect事件时,为机构树右侧的form表单赋值
setValuesToForm(record) {
this.$nextTick(() => {
@@ -337,13 +347,15 @@ export default {
this.$message.warning('请点击选择要修改机构!')
return
}
-
let formData = Object.assign(this.currSelected, values)
console.log('Received values of form: ', formData)
httpAction(this.url.edit, formData, 'put').then((res) => {
if (res.code == 200) {
this.$message.success('保存成功!')
this.loadTree()
+ let params = {}
+ params.id = formData.id
+ this.getTreeByParams(params)
} else {
this.$message.error(res.message)
}
diff --git a/jshERP-web/src/views/system/modules/OrganizationModal.vue b/jshERP-web/src/views/system/modules/OrganizationModal.vue
index 25ec86cb..290b494a 100644
--- a/jshERP-web/src/views/system/modules/OrganizationModal.vue
+++ b/jshERP-web/src/views/system/modules/OrganizationModal.vue
@@ -20,8 +20,8 @@
+ allow-clear :treeDefaultExpandAll="true"
+ :treeData="departTree" v-decorator="[ 'parentId' ]" placeholder="请选择上级机构">