From 00fa40050801614c079026fc629c0ea0b807ed5d Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 16:07:04 +0800
Subject: [PATCH] bug
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 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 420db3b..8c7c415 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -29,8 +29,8 @@
<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">{{ item.materialTypeName }}</a-select-option>
+ <a-select-option v-for="(item, index) in materialTypeData" :key="index" :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="['aBCClass']">
+ <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>
@@ -104,7 +104,7 @@
</a-form>
</a-tab-pane>
<a-tab-pane key="2" tab="鎺у埗灞炴��" force-render>
- <add-control-rule v-if="visible" ref="WmsControlRule" />
+ <add-control-rule v-if="visible" ref="WmsControlRuleRef" />
</a-tab-pane>
<a-tab-pane key="3" tab="鎵规灞炴��">
闇�姹傚緟瀹�
@@ -127,14 +127,14 @@
<script>
import {
- WmsMaterialAdd, WmsMaterialEdit, WmsMaterialDetailList,materialTypeDataList
+ WmsMaterialAdd, WmsMaterialEdit, WmsMaterialDetailList, materialTypeDataList
} from '@/api/modular/main/WmsBase/WmsMaterialManage'
import addForm from './tabItem/addForm.vue'
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/addForm.vue'
-import { WmsUnitPage} from '@/api/modular/main/WmsBase/WmsUnitManage'
+import { WmsUnitPage } from '@/api/modular/main/WmsBase/WmsUnitManage'
export default {
components: {
addForm,
@@ -169,8 +169,8 @@
confirmLoading: false,
form: this.$form.createForm(this),
materialTypeData2: [],
- selectTypeData2:[],
- selectTypeData1:[]
+ selectTypeData2: [],
+ selectTypeData1: []
}
},
methods: {
@@ -209,10 +209,10 @@
// 鏇夸唬鍝�
if (e == 4) {
this.$nextTick(() => {
- // let materialCode = this.form.getFieldValue('materialCode');
- // let materialName = this.form.getFieldValue('materialName');
- this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
- })
+ // let materialCode = this.form.getFieldValue('materialCode');
+ // let materialName = this.form.getFieldValue('materialName');
+ this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
+ })
}
},
handleOk() { },
@@ -235,15 +235,18 @@
})
.then(res => {
if (res.success) {
- console.log("666666666666")
+
console.log(res)
- this.$refs.WmsControlRule.list = res.data.baseCustomerList || []
- this.$refs.addFormBaseCustomer.list = res.data.controlRuleDetailList || []
- this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
- // this.$message.success('缂栬緫鎴愬姛')
- // this.confirmLoading = false
- // this.$emit('ok', values)
- // this.handleCancel()
+ this.$nextTick(() => {
+ if (res.data.controlRuleDetailList && res.data.controlRuleDetailList.length > 0) {
+ this.$refs.WmsControlRuleRef.form.setFieldsValue({
+ ...res.data.controlRuleDetailList[0]
+ })
+ }
+ this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
+ this.$refs.addFormBaseCustomer.list = res.data.baseCustomerList || []
+ })
+
} else {
this.$message.error('璇︽儏澶辫触锛�' + JSON.stringify(res.message))
}
@@ -296,7 +299,7 @@
// }
console.log(6666666666666 + '鎺у埗灞炴��')
- var ControlRuleld = this.$refs.WmsControlRule.form.getFieldValue('id') || ''
+ var ControlRuleld = this.$refs.WmsControlRuleRef.form.getFieldValue('id') || ''
let SubstituteGoodList = []
if (this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length > 0) {
--
Gitblit v1.9.3