From fcc3f96a76d35abc14210cfcaaf4d218fd194ad3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 14 八月 2025 20:47:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/base/FactoryManager.vue | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/src/views/base/FactoryManager.vue b/src/views/base/FactoryManager.vue
index c2f7347..1ed3c6c 100644
--- a/src/views/base/FactoryManager.vue
+++ b/src/views/base/FactoryManager.vue
@@ -5,8 +5,8 @@
<!-- 鎸夐挳鎿嶄綔鍖哄煙 -->
<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 @click="handleAdd(1)" type="primary">娣诲姞宸ュ巶</a-button>
+ <a-button v-if="this.factoryCategory == '1' || this.factoryCategory == '2'" @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">
@@ -66,13 +66,16 @@
<a-tab-pane tab="鍩烘湰淇℃伅" key="1">
<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="factoryCode" label="杞﹂棿缂栧彿">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryCode" :label="codeLabel">
<a-input placeholder="璇疯緭鍏ヤ骇绾�/杞﹂棿缂栧彿" v-model="model.factoryCode"/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryName" label="杞﹂棿鍚嶇О">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryName" :label="nameLabel">
<a-input placeholder="璇疯緭鍏ヤ骇绾�/杞﹂棿鍚嶇О" v-model="model.factoryName"/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="涓婄骇杞﹂棿">
+ <a-form-model-item v-if="this.factoryCategory == '3'" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionType" :label="nameLabel">
+ <j-dict-select-tag type="list" placeholder="璇烽�夋嫨浜х嚎绫诲瀷" v-model="model.productionType" dictCode="production_type"/>
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鐖惰妭鐐�">
<a-tree-select
style="width:100%"
:dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
@@ -83,7 +86,7 @@
</a-tree-select>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鎺掑簭">
- <a-input-number v-model="model.sorter"/>
+ <a-input-number v-model="model.sorter" style="width:100%"/>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="澶囨敞">
<a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark"/>
@@ -119,11 +122,11 @@
</a-row>
</template>
<script>
- import UserFactory from './modules/FactoryManager/UserFactory'
+ import UserFactory from './modules/factoryManager/UserFactory'
import { queryFactoryTreeList, searchByKeywords, deleteByFactory } from '@/api/api'
import { httpAction, deleteAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import FactoryModal from './modules/FactoryManager/FactoryModal'
+ import FactoryModal from './modules/factoryManager/FactoryModal'
export default {
name: 'FactoryManager',
@@ -163,7 +166,9 @@
edges: []
},
validatorRules: {
- factoryName: [{ required: true, message: '璇疯緭鍏ヤ骇绾�/杞﹂棿鍚嶇О!' }]
+ factoryCode:[{ required: true, message: '璇疯緭鍏ュ伐鍘�/杞﹂棿/浜х嚎缂栧彿!' }],
+ factoryName:[{ required: true, message: '璇疯緭鍏ュ伐鍘�/杞﹂棿/浜х嚎鍚嶇О!' }],
+ productionType:[{ required: false, message: '璇烽�夋嫨浜х嚎绫诲瀷!' }],
},
url: {
delete: '/base/factory/delete',
@@ -180,7 +185,27 @@
computed: {
importExcelUrl: function() {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
- }
+ },
+ // 鏂板璁＄畻灞炴�э細鍔ㄦ�佺紪鍙锋爣绛�
+ codeLabel() {
+ if (!this.currSelected.factoryCategory) return "杞﹂棿缂栧彿";
+ const typeMap = {
+ '1': '宸ュ巶缂栧彿',
+ '2': '杞﹂棿缂栧彿',
+ '3': '浜х嚎缂栧彿'
+ };
+ return typeMap[this.currSelected.factoryCategory] || "杞﹂棿缂栧彿";
+ },
+ // 鏂板璁＄畻灞炴�э細鍔ㄦ�佸悕绉版爣绛�
+ nameLabel() {
+ if (!this.currSelected.factoryCategory) return "杞﹂棿鍚嶇О";
+ const typeMap = {
+ '1': '宸ュ巶鍚嶇О',
+ '2': '杞﹂棿鍚嶇О',
+ '3': '浜х嚎鍚嶇О'
+ };
+ return typeMap[this.currSelected.factoryCategory] || "杞﹂棿鍚嶇О";
+ }
},
methods: {
loadData() {
@@ -220,7 +245,7 @@
this.iExpandedKeys = expandedKeys
this.autoExpandParent = false
},
-
+
batchDel: function() {
this.isIncludesNotLeaf = false
this.includesNotLeaf(this.factoryTree)
@@ -325,6 +350,7 @@
this.setValuesToForm(record)
if(record.factoryCategory == '3'){
this.$refs.userFactory.show(record.id)
+ this.validatorRules.productionType[0].required = true
}else{
this.$refs.userFactory.factoryId = ''
}
@@ -396,7 +422,7 @@
})
return false
}
- this.$refs.departModal.add(this.selectedKeys)
+ this.$refs.departModal.add(this.selectedKeys,this.factoryCategory)
this.$refs.departModal.title = '鏂板'
} else {
this.$refs.departModal.add(this.currSelected)
--
Gitblit v1.9.3