From 886748a39efb188d8008d41f2718eb78f3006ddd Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 18 七月 2025 17:08:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/base/EamRepairDepartList.vue | 48 +++++++++++++++---------------------------------
1 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/src/views/eam/base/EamRepairDepartList.vue b/src/views/eam/base/EamRepairDepartList.vue
index 665b4f8..f367a6b 100644
--- a/src/views/eam/base/EamRepairDepartList.vue
+++ b/src/views/eam/base/EamRepairDepartList.vue
@@ -7,11 +7,6 @@
<a-row style="margin-left: 14px">
<a-button @click="handleAdd(1)" type="primary">娣诲姞缁翠慨閮ㄩ棬</a-button>
<a-button @click="handleAdd(2)" type="primary">娣诲姞涓嬬骇</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('缁翠慨閮ㄩ棬淇℃伅')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
- :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
<a-button @click="handleDelete" v-if="selectedKeys.length>0">鍒犻櫎</a-button>
<a-button title="鍒犻櫎澶氭潯鏁版嵁" @click="batchDel" v-if="checkedKeys.length>0">鎵归噺鍒犻櫎</a-button>
<!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">鍒锋柊</a-button>-->
@@ -27,19 +22,10 @@
<a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="璇疯緭鍏ョ淮淇儴闂ㄥ悕绉�"/>
<!-- 鏍�-->
<a-col :md="10" :sm="24">
- <a-tree
- checkable
- multiple
- @select="onSelect"
- @check="onCheck"
- @rightClick="rightHandle"
- :selectedKeys="selectedKeys"
- :checkedKeys="checkedKeys"
- :treeData="departTree"
- :checkStrictly="checkStrictly"
- :expandedKeys="iExpandedKeys"
- :autoExpandParent="autoExpandParent"
- @expand="onExpand"/>
+ <a-tree checkable multiple @select="onSelect" @check="onCheck" @rightClick="rightHandle"
+ :selectedKeys="selectedKeys" :checkedKeys="checkedKeys" :treeData="departTree"
+ :checkStrictly="checkStrictly" :expandedKeys="iExpandedKeys" :autoExpandParent="autoExpandParent"
+ @expand="onExpand"/>
</a-col>
</div>
</a-card>
@@ -68,20 +54,15 @@
<a-card :bordered="false" v-if="selectedKeys.length>0">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departCode" label="缁翠慨閮ㄩ棬缂栧彿">
- <a-input placeholder="璇疯緭鍏ヤ骇绾�/缁翠慨閮ㄩ棬缂栧彿" v-model="model.departCode"/>
+ <a-input placeholder="璇疯緭鍏ョ淮淇儴闂�/鐝粍缂栧彿" v-model="model.departCode"/>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departName" label="缁翠慨閮ㄩ棬鍚嶇О">
- <a-input placeholder="璇疯緭鍏ヤ骇绾�/缁翠慨閮ㄩ棬鍚嶇О" v-model="model.departName"/>
+ <a-input placeholder="璇疯緭鍏ョ淮淇儴闂�/鐝粍鍚嶇О" v-model="model.departName"/>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="涓婄骇缁翠慨閮ㄩ棬">
- <a-tree-select
- style="width:100%"
- :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
- :treeData="treeData"
- :disabled="disable"
- v-model="model.parentId"
- placeholder="鏃�">
- </a-tree-select>
+ <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+ :treeData="treeData" :disabled="disable" v-model="model.parentId"
+ placeholder="鏃�"/>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鎺掑簭">
<a-input-number v-model="model.departOrder"/>
@@ -109,10 +90,10 @@
</a-row>
</template>
<script>
-import { queryRepairDepartTreeList, queryRepDepIdTree, deleteByRepairDepartId } from '@api/api'
-import { httpAction, deleteAction } from '@api/manage'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import EamRepairDepartModal from './modules/EamRepairDepartModal'
+ import { queryRepairDepartTreeList, queryRepDepIdTree, deleteByRepairDepartId } from '@api/api'
+ import { httpAction, deleteAction } from '@api/manage'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import EamRepairDepartModal from './modules/EamRepairDepartModal'
export default {
name: 'EamRepairDepartList',
@@ -157,7 +138,8 @@
edges: []
},
validatorRules: {
- departName: [{ required: true, message: '璇疯緭鍏ヤ骇绾�/缁翠慨閮ㄩ棬鍚嶇О!' }]
+ departCode: [{ required: true, message: '璇疯緭鍏ョ淮淇儴闂�/鐝粍缂栧彿' }],
+ departName: [{ required: true, message: '璇疯緭鍏ョ淮淇儴闂�/鐝粍鍚嶇О' }]
},
url: {
delete: '/eam/eamBaseRepairDepart/delete',
--
Gitblit v1.9.3