From ba77fdc6a30c9ad0941e40319f8c4f6fe6fdf9f1 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 07 八月 2025 10:30:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue b/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue
index ce4eb25..344325b 100644
--- a/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue
@@ -64,7 +64,7 @@
<!--杞﹂棿鍒嗛厤-->
<a-form-model-item label="杞﹂棿鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!productionDisabled">
- <j-select-production v-model="model.selectedProduction" :multi="true" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-production>
+ <j-select-production v-model="model.selectedFactory" :multi="true" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-production>
</a-form-model-item>
<a-form-model-item label="璐熻矗閮ㄩ棬" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="departIdShow==true">
@@ -220,7 +220,7 @@
this.resetScreenSize();
that.userId = record.id;
that.model = Object.assign({},{selectedroles:'',selecteddeparts:''}, record);
- that.model = Object.assign({},{selectedroles:'',selectedProduction:''}, record);
+ that.model = Object.assign({},{selectedroles:'',selectedFactory:''}, record);
//韬唤涓轰笂绾ф樉绀鸿礋璐ｉ儴闂紝鍚﹀垯涓嶆樉绀�
if(this.model.userIdentity==2){
@@ -305,7 +305,7 @@
}
that.model.selecteddeparts = selectDepartKeys.join(",")
- that.model.selectedProduction = selectDepartKeys.join(",")
+ that.model.selectedFactory = selectDepartKeys.join(",")
that.nextDepartOptions=departOptions;
console.log('that.nextDepartOptions=',that.nextDepartOptions)
@@ -325,7 +325,7 @@
})
}
- that.model.selectedProduction = selectProductKeys.join(",")
+ that.model.selectedFactory = selectProductKeys.join(",")
that.nextProductionOptions=ProductionOptions;
console.log('that.nextProductionOptions=',that.nextProductionOptions)
@@ -341,7 +341,7 @@
})
},
backProductionInfo(info) {
- this.model.productionIds = this.model.selectedProduction;
+ this.model.productionIds = this.model.selectedFactory;
this.nextProductionOptions = info.map((item,index,arr)=>{
let c = {label:item.text, value: item.value+""}
return c;
--
Gitblit v1.9.3