From 9fd925c1e44d4148ddb3ca864661b56b71302a23 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 19:04:19 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/view/b2-standard.vue | 5 +++++
src/components/view/b2-standard-template.vue | 7 +++++--
static/js/menu.js | 2 +-
src/components/view/a6-personnel-detail.vue | 5 +----
src/assets/api/controller.js | 1 +
5 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 97d3649..a6bf7a6 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -207,6 +207,7 @@
upStandardTemplate: "/StandardTemplate/upStandardTemplate", //淇敼妫�楠屾ā鏉�
delStandardTemplate: "/StandardTemplate/delStandardTemplate", //鍒犻櫎妫�楠屾ā鏉�
getStandardTemplate: "/StandardTemplate/getStandardTemplate", //鏌ヨ鍘熷璁板綍妯℃澘鏋氫妇
+ getEditTemplatePreparation: "/StandardTemplate/getEditTemplatePreparation"
}
const insReport = {
diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index 109eedf..03c27c1 100644
--- a/src/components/view/a6-personnel-detail.vue
+++ b/src/components/view/a6-personnel-detail.vue
@@ -114,7 +114,7 @@
<el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'name' }" node-key="id"
:filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
@node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false"
- :default-expanded-keys="expandedKeys" :default-checked-keys="defaultCheckedKeys">
+ :default-expanded-keys="expandedKeys">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row style="width: 100%;">
<el-col :span="21" :class="{sort:node.level>3}">
@@ -271,7 +271,6 @@
selectField: {},
upUserDepardLimsIdPower: true
},
- defaultCheckedKeys:[]
}
},
mounted() {
@@ -338,14 +337,12 @@
this.treeLoad = true
this.$axios.get(this.$api.department.selectDepartmentLim).then(res => {
this.list = res.data
- this.refresh()
this.list.forEach(a => {
a.children.forEach(b => {
this.expandedKeys.push(b.id)
})
})
this.treeLoad = false
- this.defaultCheckedKeys = [this.list[0].id]
this.componentData.entity.departLimsId = this.list[0].id;
this.selectTree = this.list[0].name
this.refreshTable()
diff --git a/src/components/view/b2-standard-template.vue b/src/components/view/b2-standard-template.vue
index 60cd463..d42a770 100644
--- a/src/components/view/b2-standard-template.vue
+++ b/src/components/view/b2-standard-template.vue
@@ -167,8 +167,11 @@
this.addPower = add
},
templateWrite(row) {
- this.isShow = true
- this.row = row
+ this.$axios.get(this.$api.StandardTemplate.getEditTemplatePreparation + '?id=' + row.id).then(res => {
+ this.row = row
+ this.row.thing = res.data
+ this.isShow = true
+ })
},
closed() {
this.loading = true
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 7bce4a9..dcbdf55 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -1341,6 +1341,11 @@
return this.$message.error('璇烽�夋嫨妫�楠岄」')
}
this.moreEditLoad = true
+ for(let a in this.moreInfo){
+ if(this.moreInfo[a]==''){
+ delete this.moreInfo[a]
+ }
+ }
this.$axios.post(this.$api.standardTree.upStandardProducts, {
ids: this.moreSelects.map(a => a.id),
standardProductList: this.moreInfo
diff --git a/static/js/menu.js b/static/js/menu.js
index 59f26eb..5569d0e 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -292,7 +292,7 @@
i: "font icon-erjidaohang",
u: "a6-personnel-overview",
g: "6.2 浜哄憳",
- p: "selectUserList"
+ p: "selectPersonnelOverview"
}, {
v: "浜哄憳鏄庣粏",
i: "font icon-erjidaohang",
--
Gitblit v1.9.3