From 51f38f6fd09633b20d2af827c5a5b3ec810c5dd3 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周三, 24 4月 2024 14:24:48 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 58 +++++++++++++++-------------------------------------------
1 files changed, 15 insertions(+), 43 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 0b218df..383b7c0 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -26,9 +26,9 @@
<a-form-item label="鐗╂枡绫诲瀷鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬫弿杩�" v-decorator="['materialTypeDescr']" />
</a-form-item>
- <!-- <a-form-item label="鐗╂枡绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-form-item label="鐗╂枡绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input-number placeholder="璇疯緭鍏ョ墿鏂欑被鍨�" style="width: 100%" v-decorator="['materialType']" />
- </a-form-item> -->
+ </a-form-item>
<a-form-item label="鐗╂枡绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -161,54 +161,26 @@
})
},
callbacktab(e) {
+
+ const {
+ form: { validateFields }
+ } = this
+ // this.confirmLoading = true
+
+//鍖呰鍏崇郴
if (e == 6) {
this.$nextTick(() => {
+ let materialType = this.form.getFieldValue('materialType');
// 璋冩帴鍙� 浼犵墿鏂欑被鍨�
- const {
- form: { validateFields }
- } = this
- this.confirmLoading = true
- validateFields((errors, values) => {
- if (!errors) {
- for (const key in values) {
- if (typeof values[key] === 'object') {
- values[key] = JSON.stringify(values[key])
- }
- }
- console.log(values)
- this.confirmLoading = false
- this.$refs.addFormContainerPackagingRef.initShow(values.materialType)
-
- } else {
- this.confirmLoading = false
- }
- })
+ this.$refs.addFormContainerPackagingRef.initShow(materialType)
+
})
}
// 鏇夸唬鍝�
if (e == 4) {
- const {
- form: { validateFields }
- } = this
- this.confirmLoading = true
- validateFields((errors, values) => {
- if (!errors) {
- for (const key in values) {
- if (typeof values[key] === 'object') {
- values[key] = JSON.stringify(values[key])
- }
- }
- console.log(66666666666)
- console.log(values)
- this.confirmLoading = false
- debugger
- // materialName materialCode
- this.$refs.addFormWmsSubstituteGoodRef.initShow(values.materialCode, values.materialName)
-
- } else {
- this.confirmLoading = false
- }
- })
+ let materialCode = this.form.getFieldValue('materialCode');
+ let materialName = this.form.getFieldValue('materialName');
+ this.$refs.addFormWmsSubstituteGoodRef.initShow(materialCode, materialName)
}
},
handleOk() { },
--
Gitblit v1.9.3