From 142f2e839bf76eff614ca7c07c30b5da2745681a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 17:47:20 +0800
Subject: [PATCH] 处理冲突
---
src/views/mdc/base/EquipmentList.vue | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index c2b147a..cee4b26 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -22,8 +22,8 @@
<a-col :md="6" :sm="8">
<a-form-item label="杞﹂棿鍚嶇О">
- <!--<a-input placeholder="璇疯緭鍏ヨ处鍙锋煡璇�" v-model="queryParam.username"></a-input>-->
- <a-input placeholder="璇疯緭鍏ヨ溅闂村悕绉�" v-model="queryParam.productionName"></a-input>
+ <!--<a-input placeholder="璇疯緭鍏ヨ溅闂村悕绉�" v-model="queryParam.productionName"></a-input>-->
+ <a-tree-select v-model="queryParam.productionName" :treeData="workshopTreeData" placeholder="璇烽�夋嫨杞﹂棿" tree-default-expand-all></a-tree-select>
</a-form-item>
</a-col>
@@ -38,6 +38,7 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator" style="border-top: 5px">
<a-button @click="handleAdd" type="primary" icon="plus" >娣诲姞璁惧</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('璁惧淇℃伅')">瀵煎嚭</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" @click="handleMenuClick">
<a-menu-item key="1">
@@ -147,6 +148,7 @@
import UserRecycleBinModal from './modules/EquipmentList/UserRecycleBinModal'
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
+ import { queryProductionTreeList } from '@/api/api'
import {mapActions} from 'vuex'
export default {
@@ -256,10 +258,11 @@
list: "/mdc/mdcEquipment/list",
delete: "/mdc/mdcEquipment/delete",
deleteBatch: "/mdc/mdcEquipment/deleteBatch",
- // exportXlsUrl: "/sys/user/exportXls",
+ exportXlsUrl: "/mdc/mdcEquipment/exportXls",
// importExcelUrl: "sys/user/importExcel",
},
- isDepartType:''
+ isDepartType:'',
+ workshopTreeData:[]
}
},
computed: {
@@ -269,6 +272,7 @@
},
created() {
this.queryTreeData()
+ this.getWorkshopListByApi()
},
methods: {
...mapActions(['QueryDepartTree']),
@@ -554,6 +558,12 @@
this.loadData()
}
},
+
+ getWorkshopListByApi(){
+ queryProductionTreeList().then(res=>{
+ if(res.success) this.workshopTreeData=res.result
+ })
+ }
}
}
--
Gitblit v1.9.3