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/modules/factoryManager/FactoryModal.vue | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/src/views/base/modules/factoryManager/FactoryModal.vue b/src/views/base/modules/factoryManager/FactoryModal.vue
index dea6f54..f26ce6c 100644
--- a/src/views/base/modules/factoryManager/FactoryModal.vue
+++ b/src/views/base/modules/factoryManager/FactoryModal.vue
@@ -16,28 +16,38 @@
<a-form-model-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="杞﹂棿缂栫爜"
+ :label="codeLabel"
prop="factoryCode"
:hidden="false"
hasFeedback >
- <a-input id="factoryCode" placeholder="璇疯緭鍏ヤ骇绾�/杞﹂棿缂栧彿" v-model="model.factoryCode"/>
+ <a-input id="factoryCode" placeholder="璇疯緭鍏ュ伐鍘�/浜х嚎/杞﹂棿缂栧彿" v-model="model.factoryCode"/>
</a-form-model-item>
<a-form-model-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="杞﹂棿鍚嶇О"
+ :label="nameLabel"
prop="factoryName"
:hidden="false"
hasFeedback >
- <a-input id="factoryName" placeholder="璇疯緭鍏ヤ骇绾�/杞﹂棿鍚嶇О" v-model="model.factoryName"/>
+ <a-input id="factoryName" placeholder="璇疯緭鍏ュ伐鍘�/浜х嚎/杞﹂棿鍚嶇О" v-model="model.factoryName"/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="涓婄骇杞﹂棿" hasFeedback>
+ <a-form-model-item
+ v-if="this.factoryCategory == '2'"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="浜х嚎绫诲瀷"
+ prop="productionType"
+ :hidden="false"
+ hasFeedback >
+ <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" :hidden="seen" label="鐖惰妭鐐�" hasFeedback>
<a-tree-select
style="width:100%"
:dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
:treeData="factoryTree"
v-model="model.parentId"
- placeholder="璇烽�夋嫨涓婄骇杞﹂棿"
+ placeholder="璇烽�夋嫨鐖惰妭鐐�"
:disabled="condition">
</a-tree-select>
</a-form-model-item>
@@ -45,7 +55,7 @@
: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"
@@ -63,12 +73,14 @@
import { httpAction } from '@/api/manage'
import { queryById } from '@/api/api'
import pick from 'lodash.pick'
+import JDictSelectTag from '../../../../components/dict/JDictSelectTag.vue'
export default {
name: "FactoryModal",
- components: { },
+ components: {JDictSelectTag },
data () {
return {
factoryTree:[],
+ factoryCategory:'',
title:"鎿嶄綔",
seen:false,
visible: false,
@@ -86,7 +98,9 @@
confirmLoading: false,
validatorRules:{
- factoryName:[{ required: true, message: '璇疯緭鍏ヤ骇绾�/杞﹂棿鍚嶇О!' }],
+ factoryCode:[{ required: true, message: '璇疯緭鍏ュ伐鍘�/杞﹂棿/浜х嚎缂栧彿!' }],
+ factoryName:[{ required: true, message: '璇疯緭鍏ュ伐鍘�/杞﹂棿/浜х嚎鍚嶇О!' }],
+ productionType:[{ required: false, message: '璇烽�夋嫨浜х嚎绫诲瀷!' }],
},
url: {
add: "/base/factory/add",
@@ -95,6 +109,28 @@
}
},
created () {
+ },
+ computed: {
+ // 鏂板璁＄畻灞炴�э細鍔ㄦ�佺紪鍙锋爣绛�
+ codeLabel() {
+ if (!this.factoryCategory) return "宸ュ巶缂栧彿";
+ const typeMap = {
+ '1': '杞﹂棿缂栧彿',
+ '2': '浜х嚎缂栧彿',
+ '3': '浜х嚎缂栧彿'
+ };
+ return typeMap[this.factoryCategory] || "宸ュ巶缂栧彿";
+ },
+ // 鏂板璁＄畻灞炴�э細鍔ㄦ�佸悕绉版爣绛�
+ nameLabel() {
+ if (!this.factoryCategory) return "宸ュ巶鍚嶇О";
+ const typeMap = {
+ '1': '杞﹂棿鍚嶇О',
+ '2': '浜х嚎鍚嶇О',
+ '3': '浜х嚎鍚嶇О'
+ };
+ return typeMap[this.factoryCategory] || "宸ュ巶鍚嶇О";
+ }
},
methods: {
loadTreeData(){
@@ -110,7 +146,7 @@
})
},
- add (factory) {
+ add (factory,factoryCategory) {
if(factory){
this.seen = false;
this.dictDisabled = false;
@@ -118,13 +154,17 @@
this.seen = true;
this.dictDisabled = true;
}
- this.edit(factory);
+ this.edit(factory,factoryCategory);
},
- edit (record) {
+ edit (record,factoryCategory) {
this.visible = true;
this.model = Object.assign({}, this.defaultModel, record)
+ if(factoryCategory == '2'){
+ this.validatorRules.productionType[0].required = true
+ }
this.loadTreeData();
this.model.parentId = record!=null?record.toString():null;
+ this.factoryCategory = factoryCategory
},
close () {
this.$emit('close');
--
Gitblit v1.9.3