From e4963529b19325117dcbf419c97503b86b16bf22 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 4月 2024 19:29:59 +0800
Subject: [PATCH] 物料
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 68 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 30 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 e1d757a..b8f8f15 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -89,21 +89,21 @@
</a-form>
</a-tab-pane>
<a-tab-pane key="2" tab="鎺у埗灞炴��" force-render>
- <add-control-rule ref="WmsControlRule" @ok="handleOk" />
+ <add-control-rule ref="WmsControlRule" />
</a-tab-pane>
<a-tab-pane key="3" tab="鎵规灞炴��">
闇�姹傚緟瀹�
</a-tab-pane>
<a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�">
- <add-form-sub ref="addFormWmsSubstituteGoodRef" @ok="handleOk" />
+ <add-form-sub ref="addFormWmsSubstituteGoodRef" />
</a-tab-pane>
<a-tab-pane key="5" tab="瀹㈡埛">
- <add-form-base-customer ref="addFormBaseCustomer" @ok="handleOk" />
+ <add-form-base-customer ref="addFormBaseCustomer" />
</a-tab-pane>
- <a-tab-pane key="6" tab="鍖呰鍏崇郴">
+ <!-- <a-tab-pane key="6" tab="鍖呰鍏崇郴">
<add-form-container-packaging ref="addFormContainerPackagingRef" @ok="handleOk" />
- </a-tab-pane>
+ </a-tab-pane> -->
</a-tabs>
</a-spin>
</a-modal>
@@ -115,7 +115,7 @@
import addFormBaseCustomer from './tabItem/addFormBaseCustomer/addFormBaseCustomer.vue'
import addFormContainerPackaging from './tabItem/WmsContainerPackaging/addFormContainerPackaging.vue'
import addFormSub from './tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue'
-import addControlRule from './tabItem/WmsControlRule/index.vue'
+import addControlRule from './tabItem/WmsControlRule/addForm.vue'
export default {
components: {
@@ -208,44 +208,52 @@
const {
form: { validateFields }
} = this
- this.confirmLoading = true
+
validateFields((errors, values) => {
if (!errors) {
- if (this.$getObjectType(values.areas) === 'array') {
- values.areaIds = values.areas.join(',')
- values.areaNameParameterArr = values.areas.map(val => {
- return this.parseSelectName(val, 'areaId', 'areaName', 'areaNameParameterData')
- })
- values.areaNameParameter = values.areaNameParameterArr.join(',')
- }
- if (this.$getObjectType(values.stations) === 'array') {
- values.stationIds = values.stations.join(',')
- values.stationNameParameterArr = values.stations.map(val => {
- return this.parseSelectName(val, 'stationId', 'stationName', 'stationNameParameterData')
- })
- values.stationNameParameter = values.stationNameParameterArr.join(',')
- }
+ // if (this.$getObjectType(values.areas) === 'array') {
+ // values.areaIds = values.areas.join(',')
+ // values.areaNameParameterArr = values.areas.map(val => {
+ // return this.parseSelectName(val, 'areaId', 'areaName', 'areaNameParameterData')
+ // })
+ // values.areaNameParameter = values.areaNameParameterArr.join(',')
+ // }
+ // if (this.$getObjectType(values.stations) === 'array') {
+ // values.stationIds = values.stations.join(',')
+ // values.stationNameParameterArr = values.stations.map(val => {
+ // return this.parseSelectName(val, 'stationId', 'stationName', 'stationNameParameterData')
+ // })
+ // values.stationNameParameter = values.stationNameParameterArr.join(',')
+ // }
console.log(6666666666666 + '鎺у埗灞炴��')
- console.log(this.$refs.WmsControlRule.selectedRows)
- var ControlRuleld = this.$refs.WmsControlRule.selectedRows[0].id
+
+ var ControlRuleld = this.$refs.WmsControlRule.form.getFieldValue('id') || ''
+ let SubstituteGoodList = []
+ if(this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length>0){
+ SubstituteGoodList = this.$refs.addFormWmsSubstituteGoodRef.list
+ }
console.log(6666666666666 + '鏇夸唬鍝�')
- console.log(this.$refs.addFormWmsSubstituteGoodRef.list)
+
+ let BaseCustomerList = [];
+ if(this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length>0){
+ BaseCustomerList = this.$refs.addFormWmsSubstituteGoodRef.list
+ }
console.log(6666666666666 + '瀹㈡埛妗ｆ闆嗗悎')
- console.log(this.$refs.addFormBaseCustomer.list)
+ // console.log(6666666666666 + '鍖呰鍏崇郴')
+ // console.log(this.$refs.addFormContainerPackagingRef.list)
- console.log(6666666666666 + '鍖呰鍏崇郴')
- console.log(this.$refs.addFormContainerPackagingRef.list)
var param = {
MaterialInput: values,
ControlRuleld: ControlRuleld, //鎺у埗灞炴��
- SubstituteGoodList: this.$refs.addFormWmsSubstituteGoodRef.list, //鏇夸唬鍝�
- BaseCustomerList: this.$refs.addFormBaseCustomer.list, //瀹㈡埛妗ｆ闆嗗悎
- ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //鍖呰鍏崇郴
+ SubstituteGoodList: SubstituteGoodList, //鏇夸唬鍝�
+ BaseCustomerList: BaseCustomerList, //瀹㈡埛妗ｆ闆嗗悎
+ // ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //鍖呰鍏崇郴
}
+ this.confirmLoading = true
WmsMaterialAdd(param)
.then(res => {
if (res.success) {
--
Gitblit v1.9.3