From ceacdcb1e517982c2dce40c4217a9de29e9dabcc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 11 二月 2025 11:52:40 +0800
Subject: [PATCH] DNC修改所属部门为所属车间
---
src/views/dnc/base/modules/ActivitiSingExamine/ActivitiSignExamineForm.vue | 14 ++++++-
src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue | 12 +++---
src/views/dnc/base/ActivitiSingExamineList.vue | 2
src/views/dnc/base/modules/AssignApproveUser/AssignApproveUserForm.vue | 14 ++++++-
src/views/dnc/base/AssignApproveUserList.vue | 2
src/views/dnc/base/NcDeviceCharactersList.vue | 2
src/views/dnc/base/modules/NcDeviceCharacters/NcDeviceCharactersForm.vue | 19 ++++++++-
7 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/src/views/dnc/base/ActivitiSingExamineList.vue b/src/views/dnc/base/ActivitiSingExamineList.vue
index 0949d22..339f57a 100644
--- a/src/views/dnc/base/ActivitiSingExamineList.vue
+++ b/src/views/dnc/base/ActivitiSingExamineList.vue
@@ -134,7 +134,7 @@
width: 200,
},
{
- title: '鎵�灞為儴闂�',
+ title: '鎵�灞炶溅闂�',
align: "center",
dataIndex: 'departId_dictText',
width: 220,
diff --git a/src/views/dnc/base/AssignApproveUserList.vue b/src/views/dnc/base/AssignApproveUserList.vue
index ea632f6..d91f545 100644
--- a/src/views/dnc/base/AssignApproveUserList.vue
+++ b/src/views/dnc/base/AssignApproveUserList.vue
@@ -134,7 +134,7 @@
width: 200,
},
{
- title: '鎵�灞為儴闂�',
+ title: '鎵�灞炶溅闂�',
align: "center",
dataIndex: 'departId_dictText',
width: 220,
diff --git a/src/views/dnc/base/NcDeviceCharactersList.vue b/src/views/dnc/base/NcDeviceCharactersList.vue
index 94a3dc2..76136bf 100644
--- a/src/views/dnc/base/NcDeviceCharactersList.vue
+++ b/src/views/dnc/base/NcDeviceCharactersList.vue
@@ -159,7 +159,7 @@
width: 200,
},
{
- title: '鎵�灞為儴闂�',
+ title: '鎵�灞炶溅闂�',
align: "center",
dataIndex: 'departId_dictText',
width: 220,
diff --git a/src/views/dnc/base/modules/ActivitiSingExamine/ActivitiSignExamineForm.vue b/src/views/dnc/base/modules/ActivitiSingExamine/ActivitiSignExamineForm.vue
index 00fbe31..46b6c81 100644
--- a/src/views/dnc/base/modules/ActivitiSingExamine/ActivitiSignExamineForm.vue
+++ b/src/views/dnc/base/modules/ActivitiSingExamine/ActivitiSignExamineForm.vue
@@ -14,8 +14,8 @@
</a-form-item>
</a-col>
<a-col :span="24">
- <a-form-item label="鎵�灞為儴闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag :disabled="formDisabled" 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-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">
@@ -57,10 +57,12 @@
import pick from 'lodash.pick'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDictSelectTag from "@/components/dict/JDictSelectTag"
+ import JSelectEquipmentProduction from '@comp/jeecgbiz/JSelectEquipmentProduction.vue'
export default {
name: 'ActivitiSignExamineForm',
components: {
+ JSelectEquipmentProduction,
JFormContainer,
JDictSelectTag,
},
@@ -155,6 +157,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);
diff --git a/src/views/dnc/base/modules/AssignApproveUser/AssignApproveUserForm.vue b/src/views/dnc/base/modules/AssignApproveUser/AssignApproveUserForm.vue
index 6d09688..203c436 100644
--- a/src/views/dnc/base/modules/AssignApproveUser/AssignApproveUserForm.vue
+++ b/src/views/dnc/base/modules/AssignApproveUser/AssignApproveUserForm.vue
@@ -14,8 +14,8 @@
</a-form-item>
</a-col>
<a-col :span="24">
- <a-form-item label="鎵�灞為儴闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag :disabled="formDisabled" 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-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">
@@ -39,10 +39,12 @@
import pick from 'lodash.pick'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDictSelectTag from "@/components/dict/JDictSelectTag"
+ import JSelectEquipmentProduction from '@comp/jeecgbiz/JSelectEquipmentProduction.vue'
export default {
name: 'AssignApproveUserForm',
components: {
+ JSelectEquipmentProduction,
JFormContainer,
JDictSelectTag,
},
@@ -137,6 +139,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);
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);
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue b/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue
index e5f323b..12d9b4c 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue
@@ -34,12 +34,12 @@
return parseInt(index) + 1
}
},
- { title: '璁惧鍚嶇О', dataIndex: 'deviceName', align: 'center' },
- { title: '璁惧缂栧彿', dataIndex: 'deviceNo', align: 'center' },
- { title: '璁惧鍨嬪彿', dataIndex: 'deviceModel', align: 'center' },
- { title: '鎵�灞為儴闂�', dataIndex: 'departName', align: 'center' },
- { title: '璁惧鍒嗙粍', dataIndex: 'groupName', align: 'center' },
- { title: '鎺у埗绯荤粺', dataIndex: 'controlSystem', align: 'center' }
+ { title: '璁惧鍚嶇О', dataIndex: 'equipmentName', align: 'center' },
+ { title: '璁惧缂栧彿', dataIndex: 'equipmentId', align: 'center' },
+ { title: '璁惧绫诲瀷', dataIndex: 'equipmentType', align: 'center' },
+ { title: '璁惧鍨嬪彿', dataIndex: 'equipmentModel', align: 'center' },
+ { title: '鎵�灞炶溅闂�', dataIndex: 'productionName', align: 'center' },
+ { title: '鏁版帶绯荤粺', dataIndex: 'controlSystem', align: 'center' }
],
url: {
list: '/doc/relative/get/device'
--
Gitblit v1.9.3