From cf04c31eb5f3f4c9e2a863010673773e1705385e Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 14:33:54 +0800
Subject: [PATCH] 1
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 10 ++++++----
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue | 3 ++-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue | 9 ++++-----
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
index 6af8f65..420db3b 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -30,7 +30,7 @@
<a-form-item label="鐗╂枡绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷" v-decorator="['materialType']">
<a-select-option v-for="(item, index) in materialTypeData" :key="index"
- :value="Number(item.materialTypeCode)">{{ item.materialTypeName }}</a-select-option>
+ :value="item.materialTypeCode">{{ item.materialTypeName }}</a-select-option>
</a-select>
</a-form-item>
@@ -43,7 +43,7 @@
<a-form-item label="ABC鍒嗙被" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<!-- <a-input-number placeholder="璇疯緭鍏BC鍒嗙被" style="width: 100%" v-decorator="['aBCClass']" /> -->
- <a-select style="width: 100%" placeholder="璇烽�夋嫨ABC鍒嗙被" v-decorator="['factoryCode']">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨ABC鍒嗙被" v-decorator="['aBCClass']">
<a-select-option v-for="(item, index) in materialTypeData2" :key="index" :value="Number(item.code)">{{
item.name }}</a-select-option>
</a-select>
@@ -61,7 +61,7 @@
<!-- <a-input placeholder="璇疯緭鍏ュ簱瀛樺崟浣�" v-decorator="['materialUnit']" /> -->
<a-select style="width: 100%" placeholder="璇烽�夋嫨搴撳瓨鍗曚綅" v-decorator="['materialUnit']">
- <a-select-option v-for="(item, index) in selectTypeData1" :key="index" :value="Number(item.unitCode)">{{
+ <a-select-option v-for="(item, index) in selectTypeData1" :key="index" :value="item.unitCode">{{
item.unitName }}</a-select-option>
</a-select>
@@ -71,7 +71,7 @@
<!-- <a-input placeholder="璇疯緭鍏ラ噰璐崟浣�" v-decorator="['pOUnit']" /> -->
<a-select style="width: 100%" placeholder="璇烽�夋嫨閲囪喘鍗曚綅" v-decorator="['pOUnit']">
- <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="Number(item.unitCode)">{{
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.unitCode">{{
item.unitName }}</a-select-option>
</a-select>
@@ -208,9 +208,11 @@
// }
// 鏇夸唬鍝�
if (e == 4) {
+ this.$nextTick(() => {
// let materialCode = this.form.getFieldValue('materialCode');
// let materialName = this.form.getFieldValue('materialName');
this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
+ })
}
},
handleOk() { },
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
index 20543ce..0d7bb05 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
@@ -56,7 +56,8 @@
},
visible: false,
confirmLoading: false,
- form: this.$form.createForm(this)
+ form: this.$form.createForm(this),
+ selectTypeData:[]
}
},
created() {
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue
index bf61488..71d488d 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue
@@ -188,14 +188,13 @@
this.list = selectedRowsArrMy
}else{
var arr1 = []
- this.list.forEach(item => {
- var itemArr = selectedRowsArrMy.filter(v=>v.id != item.id)
+ selectedRowsArrMy.forEach(item => {
+ var itemArr = this.list.filter(v=>v.custCode != item.custCode)
if(itemArr.length>0){
- //arr1.push(itemArr[0])
- arr1.concat(itemArr)
+ arr1 = arr1.concat(itemArr)
}
})
- this.list.concat(arr1)
+ this.list = [...arr1,...this.list]
}
this.visible = false
},
--
Gitblit v1.9.3