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/EamProductionUserManagement.vue | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/src/views/eam/base/EamProductionUserManagement.vue b/src/views/eam/base/EamProductionUserManagement.vue
index 221ec10..2f67b52 100644
--- a/src/views/eam/base/EamProductionUserManagement.vue
+++ b/src/views/eam/base/EamProductionUserManagement.vue
@@ -5,12 +5,7 @@
<!-- 鎸夐挳鎿嶄綔鍖哄煙 -->
<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="handleAdd(2)" type="primary" v-if="currSelected.factoryCategory!=3">娣诲姞涓嬬骇</a-button>
<a-button @click="handleDelete" v-if="selectedKeys.length>0">鍒犻櫎</a-button>
<a-button title="鍒犻櫎澶氭潯鏁版嵁" @click="batchDel" v-if="checkedKeys.length>0">鎵归噺鍒犻櫎</a-button>
</a-row>
@@ -26,18 +21,9 @@
<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"
- :selectedKeys="selectedKeys"
- :checkedKeys="checkedKeys"
- :treeData="departTree"
- :checkStrictly="checkStrictly"
- :expandedKeys="expandedKeys"
- :autoExpandParent="autoExpandParent"
- @expand="onExpand"/>
+ <a-tree checkable multiple @select="onSelect" @check="onCheck" :selectedKeys="selectedKeys"
+ :checkedKeys="checkedKeys" :treeData="departTree" :checkStrictly="checkStrictly"
+ :expandedKeys="expandedKeys" :autoExpandParent="autoExpandParent" @expand="onExpand"/>
</a-col>
</div>
</a-card>
@@ -66,10 +52,10 @@
<template v-if="selectedKeys.length>0">
<a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol"
:wrapperCol="wrapperCol">
- <a-form-model-item label="鏈烘瀯缂栫爜">
+ <a-form-model-item label="鏈烘瀯缂栫爜" prop="factoryCode">
<a-input placeholder="璇疯緭鍏ユ満鏋勭紪鐮�" v-model="model.factoryCode"/>
</a-form-model-item>
- <a-form-model-item expandedKeys prop="factoryName" label="鏈烘瀯鍚嶇О">
+ <a-form-model-item prop="factoryName" label="鏈烘瀯鍚嶇О">
<a-input placeholder="璇疯緭鍏ユ満鏋勫悕绉�" v-model="model.factoryName"/>
</a-form-model-item>
<a-form-model-item expandedKeys label="涓婄骇杞﹂棿">
@@ -148,15 +134,14 @@
sm: { span: 16 }
},
validatorRules: {
- factoryName: [{ required: true, message: '璇疯緭鍏ユ満鏋勫悕绉�!' }]
+ factoryCode: [{ required: true, message: '璇疯緭鍏ユ満鏋勭紪鍙�', trigger: 'change' }],
+ factoryName: [{ required: true, message: '璇疯緭鍏ユ満鏋勫悕绉�', trigger: 'change' }]
},
url: {
getProductionTreeList: '/eam/BaseFactory/queryTreeList',
delete: '/eam/BaseFactory/delete',
edit: '/eam/BaseFactory/edit',
- deleteBatch: '/eam/BaseFactory/deleteBatch',
- exportXlsUrl: '/eam/BaseFactory/exportXls',
- importExcelUrl: '/eam/BaseFactory/importExcel'
+ deleteBatch: '/eam/BaseFactory/deleteBatch'
},
isIncludesNotLeaf: false,
confirmLoading: false
@@ -304,6 +289,7 @@
this.model = this.currSelected
this.selectedKeys = [record.key]
this.$refs.userList.show(record.id)
+ if (this.$refs.form) this.$refs.form.clearValidate()
},
onClearSelected() {
@@ -348,8 +334,7 @@
},
emptyCurrForm() {
- this.$refs.form.resetFields()
- this.model = {}
+ this.model = { parentId: this.model.parentId }
},
handleAdd(num) {
--
Gitblit v1.9.3