From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue
index 6c88371..f9fd2a5 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue
@@ -7,8 +7,8 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :md="6" :sm="6">
- <a-form-item label="閮ㄩ棬" >
+ <a-col :md="6" :sm="6" v-if="isDepartType == 0">
+ <a-form-item label="閮ㄩ棬" v-if="isDepartType == 0">
<!--<a-select v-model="queryParam.sectionPid" placeholder="璇烽�夋嫨閮ㄩ棬" :options="sectionPData" @change="initGroupOptions" />-->
<a-tree-select
v-model="value"
@@ -76,6 +76,7 @@
</template>
<script>
+ import {mapActions} from 'vuex'
import {
ajaxGetSelectItems
} from '@/api/api'
@@ -113,6 +114,7 @@
},
data() {
return {
+ isDepartType:'',
/*readOnly:true,*/
title:'',
visible: false,
@@ -164,7 +166,7 @@
}
},
created() {
-
+ this.queryTreeData()
},
watch: {
value(value) {
@@ -176,6 +178,21 @@
}
},
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(() =>{
+ })
+ },
onSelectChange(selectedRowKeys, selectionRows) {
// this.SelectedList.push(selectedRowKeys);
this.selectedRowKeys = selectedRowKeys;
@@ -195,13 +212,13 @@
this.loadData();
},
openPage() {
- this.visible = true
this.onClearSelected()
+ this.valueProduct=null
+ this.visible = true
this.dataSource = [];
this.queryParam = {
status: this.status
};
-
this.loadData();
this.initOptions();
this.initGroupOptions()
--
Gitblit v1.9.3