From a630b33c48db307e47259078f57e28bdeee45edd Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 19:17:53 +0800
Subject: [PATCH] css
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 8c7c415..b59e34c 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -28,8 +28,8 @@
</a-form-item> -->
<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="item.materialTypeCode">{{
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷" v-decorator="['materialType', { rules: [{ required: true, message: '璇烽�夋嫨鐗╂枡绫诲瀷锛�' }] }]">
+ <a-select-option v-for="(item, index) in materialTypeData" :key="index" :value="item.id">{{
item.materialTypeName }}</a-select-option>
</a-select>
</a-form-item>
@@ -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="item.unitCode">{{
+ <a-select-option v-for="(item, index) in selectTypeData1" :key="index" :value="item.unitName">{{
item.unitName }}</a-select-option>
</a-select>
@@ -70,8 +70,8 @@
<a-form-item label="閲囪喘鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<!-- <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="item.unitCode">{{
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨閲囪喘鍗曚綅" v-decorator="['poUnit']">
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.unitName">{{
item.unitName }}</a-select-option>
</a-select>
@@ -84,7 +84,7 @@
<a-input placeholder="璇疯緭鍏ラ噸閲�" v-decorator="['weight']" />
</a-form-item>
<a-form-item label="鏍囧寘鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ爣鍖呮暟閲�" v-decorator="['sNP']" />
+ <a-input placeholder="璇疯緭鍏ユ爣鍖呮暟閲�" v-decorator="['snp']" />
</a-form-item>
<a-form-item label="鎹㈢畻鐜�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ユ崲绠楃巼" v-decorator="['translateRate']" />
@@ -101,6 +101,7 @@
<a-form-item label="鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ユ弿杩�" v-decorator="['materialDesc']" />
</a-form-item>
+ <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
</a-form>
</a-tab-pane>
<a-tab-pane key="2" tab="鎺у埗灞炴��" force-render>
@@ -112,7 +113,7 @@
<a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�">
<add-form-sub v-if="visible" ref="addFormWmsSubstituteGoodRef" />
</a-tab-pane>
- <a-tab-pane key="5" tab="瀹㈡埛">
+ <a-tab-pane key="5" tab="寰�鏉ュ崟浣�">
<add-form-base-customer v-if="visible" ref="addFormBaseCustomer" />
</a-tab-pane>
@@ -298,6 +299,10 @@
// values.stationNameParameter = values.stationNameParameterArr.join(',')
// }
+
+ console.log("鐗╂枡淇℃伅9999999999999999")
+ console.log(values);
+
console.log(6666666666666 + '鎺у埗灞炴��')
var ControlRuleld = this.$refs.WmsControlRuleRef.form.getFieldValue('id') || ''
@@ -321,12 +326,15 @@
// console.log(6666666666666 + '鍖呰鍏崇郴')
// console.log(this.$refs.addFormContainerPackagingRef.list)
-
+ var a1 = []
+ BaseCustomerList.forEach((item)=>{
+ a1.push(item.id)
+ })
var param = {
MaterialInput: values,
ControlRuleld: ControlRuleld, //鎺у埗灞炴��
SubstituteGoodList: SubstituteGoodList, //鏇夸唬鍝�
- BaseCustomerList: BaseCustomerList, //寰�鏉ュ叧绯婚泦鍚�
+ BaseCustomerList: a1, //寰�鏉ュ叧绯婚泦鍚�
// ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //鍖呰鍏崇郴
}
this.confirmLoading = true
--
Gitblit v1.9.3