From f409a5ea59614945ecd7196e2255ef61bbb8ec3c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 19:15:01 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/mdcPassRate.vue | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/mdcPassRate.vue b/src/views/mdc/base/mdcPassRate.vue
index 16380a1..8d7feb0 100644
--- a/src/views/mdc/base/mdcPassRate.vue
+++ b/src/views/mdc/base/mdcPassRate.vue
@@ -7,14 +7,13 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
<a-col :md="20">
- <mdc-pass-rate-list ref="MdcStandardProcessDurationList" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></mdc-pass-rate-list>
+ <mdc-pass-rate-list ref="MdcStandardProcessDurationList" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></mdc-pass-rate-list>
</a-col>
</a-row>
</a-card>
@@ -32,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'mdcPassRate',
components: {
@@ -52,12 +52,29 @@
slectTypeTree:"",
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
--
Gitblit v1.9.3