Merge branch 'dev_test' into 'dev_20230829_change'

Dev test

See merge request laws-foton-slrs/foton-laws-system-front!113
This commit is contained in:
高嵩
2023-11-06 02:35:58 +00:00
76 changed files with 697 additions and 258 deletions
@@ -15,6 +15,7 @@
node-key="id"
class="tree-line"
icon-class="icon-tree"
:expand-on-click-node="false"
:indent="0"
:props="props"
:data="treeList"
@@ -2652,9 +2653,10 @@ export default {
list1 = list1.concat(list2)
}
if(list1.length > 0){
this.treeList = this.sortByKey(list1,"displaySeq")
}
// if(list1.length > 0){
// this.treeList = this.sortByKey(list1,"displaySeq")
// }
this.treeList = list1
},
sortByKey(ary, key) {
return ary.sort(function (a, b) {
@@ -3030,7 +3032,8 @@ export default {
_this: this
}, res => {
if (res.ok) {
this.selectMenuListNew()
// this.selectMenuListNew()
this.getTreeAsync()
this.productModal = false
this.productModelAdd = {
// 模态框信息
@@ -3050,7 +3053,8 @@ export default {
this.$http.putData('sarResource/ts-resource', this.productModelAdd, {
_this: this
}, res => {
this.selectMenuListNew()
// this.selectMenuListNew()
this.getTreeAsync()
this.productModal = false
this.productModelAdd = {
// 模态框信息
@@ -3208,7 +3212,8 @@ export default {
message: "删除成功"
})
this.getBussionStandTable()
this.selectMenuListNew()
// this.selectMenuListNew()
this.getTreeAsync()
} else {
this.$message({
type: 'warning',