From d86353384f4071a3cea77e6151e1a7bda4486501 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 4月 2024 13:40:12 +0800
Subject: [PATCH] 物料tab
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 158 insertions(+), 20 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 20ef856..e9a5f21 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -1,36 +1,98 @@
<template>
- <a-modal
- title="鏂板鐗╂枡淇℃伅"
- :width="900"
- :visible="visible"
- :confirmLoading="confirmLoading"
- @ok="handleSubmit"
- @cancel="handleCancel"
- >
+ <a-modal title="鏂板鐗╂枡淇℃伅" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+ @cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<!-- tab -->
- <a-tabs default-active-key="1" @change="callback">
+ <a-tabs default-active-key="1" @change="callbacktab">
<a-tab-pane key="1" tab="鍩烘湰淇℃伅">
- <add-form ref="addForm" @ok="handleOk" />
+ <!-- <add-form ref="addFormRef" @ok="handleOk" /> -->
+
+ <!-- 鍩烘湰淇℃伅 -->
+ <a-form :form="form">
+ <a-form-item label="鐗╂枡鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
+ v-decorator="['materialName', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒' }] }]" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�"
+ v-decorator="['materialCode', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒' }] }]" />
+ </a-form-item>
+ <a-form-item label="ERP缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏RP缂栧彿" v-decorator="['erpCode']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" v-decorator="['materialTypeName']" />
+ </a-form-item>
+ <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-input-number placeholder="璇疯緭鍏ョ墿鏂欑被鍨�" style="width: 100%" v-decorator="['materialType']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡缁�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑粍" v-decorator="['materialGroup']" />
+ </a-form-item>
+ <a-form-item label="ABC鍒嗙被鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏BC鍒嗙被鍚嶇О" v-decorator="['aBCClassName']" />
+ </a-form-item>
+ <a-form-item label="ABC鍒嗙被" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input-number placeholder="璇疯緭鍏BC鍒嗙被" style="width: 100%" v-decorator="['aBCClass']" />
+ </a-form-item>
+ <a-form-item label="鐗╂枡瑙勬牸" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欒鏍�" v-decorator="['materialSpec']" />
+ </a-form-item>
+ <a-form-item label="榛樿鍏ュ簱搴撲綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ラ粯璁ゅ叆搴撳簱浣�" v-decorator="['inPlaceCode']" />
+ </a-form-item>
+ <a-form-item label="搴撳瓨鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ュ簱瀛樺崟浣�" v-decorator="['materialUnit']" />
+ </a-form-item>
+ <a-form-item label="閲囪喘鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ラ噰璐崟浣�" v-decorator="['pOUnit']" />
+ </a-form-item>
+ <a-form-item label="棰滆壊" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ラ鑹�" v-decorator="['color']" />
+ </a-form-item>
+ <a-form-item label="閲嶉噺" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <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-form-item>
+ <a-form-item label="鎹㈢畻鐜�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ崲绠楃巼" v-decorator="['translateRate']" />
+ </a-form-item>
+ <a-form-item label="鎵规灞炴�ц鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ壒娆″睘鎬ц鍒�" v-decorator="['batchRuleId']" />
+ </a-form-item>
+ <a-form-item label="鎺у埗灞炴�ц鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒�" v-decorator="['controlRuleId']" />
+ </a-form-item>
+ <a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
+ </a-form-item>
+ <a-form-item label="鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ弿杩�" v-decorator="['materialDesc']" />
+ </a-form-item>
+ </a-form>
</a-tab-pane>
<a-tab-pane key="2" tab="鎺у埗灞炴��" force-render>
- Content of Tab Pane 2
+ <add-control-rule ref="WmsControlRule" @ok="handleOk" />
</a-tab-pane>
<a-tab-pane key="3" tab="鎵规灞炴��">
- Content of Tab Pane 3
+ 闇�姹傚緟瀹�
</a-tab-pane>
<a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�">
- Content of Tab Pane 4
+ <add-form-sub ref="addFormWmsSubstituteGoodRef" @ok="handleOk" />
</a-tab-pane>
<a-tab-pane key="5" tab="瀹㈡埛">
<add-form-base-customer ref="addFormBaseCustomer" @ok="handleOk" />
</a-tab-pane>
- <a-tab-pane key="7" tab="鍖呰鍏崇郴">
- <add-form-container-packaging ref="addFormContainerPackaging" @ok="handleOk" />
+ <a-tab-pane key="6" tab="鍖呰鍏崇郴">
+ <add-form-container-packaging ref="addFormContainerPackagingRef" @ok="handleOk" />
</a-tab-pane>
</a-tabs>
-
</a-spin>
</a-modal>
</template>
@@ -38,15 +100,18 @@
<script>
import { WmsMaterialAdd, GetAreas, GetStations } from '@/api/modular/main/WmsMaterialManage'
import addForm from './tabItem/addForm.vue'
-import addFormBaseCustomer from './tabItem/addFormBaseCustomer.vue'
-import addFormContainerPackaging from './tabItem/addFormContainerPackaging.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/index.vue'
export default {
components: {
- // STable,
addForm,
addFormBaseCustomer,
addFormContainerPackaging,
+ addFormSub,
+ addControlRule
},
data() {
return {
@@ -70,6 +135,58 @@
}
},
methods: {
+ callbacktab(e) {
+ if (e == 6) {
+ this.$nextTick(() => {
+ // 璋冩帴鍙� 浼犵墿鏂欑被鍨�
+ 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
+ }
+ })
+ })
+ }
+ // 鏇夸唬鍝�
+ 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
+ }
+ })
+ }
+ },
+ handleOk() { },
// 鍒濆鍖栨柟娉�
add(record) {
this.visible = true
@@ -119,7 +236,28 @@
})
values.stationNameParameter = values.stationNameParameterArr.join(',')
}
- WmsMaterialAdd(values)
+
+ console.log(6666666666666 + '鎺у埗灞炴��')
+ console.log(this.$refs.WmsControlRule.selectedRows)
+ var ControlRuleld = this.$refs.WmsControlRule.selectedRows[0].id
+
+ console.log(6666666666666 + '鏇夸唬鍝�')
+ console.log(this.$refs.addFormWmsSubstituteGoodRef.list)
+
+ console.log(6666666666666 + '瀹㈡埛妗ｆ闆嗗悎')
+ console.log(this.$refs.addFormBaseCustomer.list)
+
+
+ console.log(6666666666666 + '鍖呰鍏崇郴')
+ console.log(this.$refs.addFormContainerPackagingRef.list)
+ var param = {
+ MaterialInput: values,
+ ControlRuleld: ControlRuleld, //鎺у埗灞炴��
+ SubstituteGoodLis: this.$refs.addFormWmsSubstituteGoodRef.list, //鏇夸唬鍝�
+ BaseCustomerList: this.$refs.addFormBaseCustomer.list, //瀹㈡埛妗ｆ闆嗗悎
+ ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //鍖呰鍏崇郴
+ }
+ WmsMaterialAdd(param)
.then(res => {
if (res.success) {
this.$message.success('鏂板鎴愬姛')
--
Gitblit v1.9.3