From 874a19bfb2d1437d8c1465263b76553a37835964 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 11 二月 2025 18:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue b/src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue
index 5b707e6..1cffefd 100644
--- a/src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue
+++ b/src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue
@@ -14,8 +14,9 @@
</a-form-item>
</a-col>
<a-col :span="24">
- <a-form-item label="鎵�灞為儴闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag type="list" v-decorator="['departId']" :trigger-change="true" dictCode="sys_department,depart_name,depart_id" placeholder="璇烽�夋嫨鎵�灞為儴闂�"/>
+ <a-form-item label="鎵�灞炶溅闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+<!-- <j-dict-select-tag type="list" v-decorator="['departId']" :trigger-change="true" dictCode="sys_department,depart_name,depart_id" placeholder="璇烽�夋嫨鎵�灞為儴闂�"/>-->
+ <j-select-equipment-production v-model="model.departId" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>
</a-form-item>
</a-col>
<a-col :span="24">
@@ -43,10 +44,14 @@
import pick from 'lodash.pick'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDictSelectTag from "@/components/dict/JDictSelectTag"
+ import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
+ import JSelectEquipmentProduction from '@comp/jeecgbiz/JSelectEquipmentProduction.vue'
export default {
name: 'NcDeviceCharactersForm',
components: {
+ JSelectEquipmentProduction,
+ JSelectProduction,
JFormContainer,
JDictSelectTag,
},
@@ -91,7 +96,7 @@
},
departId: {
rules: [
- { required: true, message: '璇烽�夋嫨閮ㄩ棬鍒嗙粍!'},
+ { required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�!'},
]
},
controlSystem: {
@@ -139,6 +144,14 @@
add () {
this.edit({});
},
+ backProductionInfo(info) {
+ // console.log(info)
+ this.model.productionIds = this.model.selectedProduction;
+ this.nextProductionOptions = info.map((item,index,arr)=>{
+ let c = {label:item.text, value: item.value+""}
+ return c;
+ })
+ },
edit (record) {
this.form.resetFields();
this.model = Object.assign({}, record);
--
Gitblit v1.9.3