From 674e704f761eb7cd9a1b0ab0f10d36dc4d49e28d Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 4月 2024 14:25:21 +0800
Subject: [PATCH] 细节
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 82 +++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 47 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 e9a5f21..379ae90 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -1,5 +1,5 @@
<template>
- <a-modal title="鏂板鐗╂枡淇℃伅" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+ <a-modal title="鏂板鍩虹鐗╂枡淇℃伅" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<!-- tab -->
@@ -26,9 +26,20 @@
<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 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="Number(item.materialTypeCode)">{{ item.materialTypeName }}</a-select-option>
+ </a-select>
</a-form-item>
+
+ <!-- <a-col :md="8" :sm="24">
+
+ </a-col> -->
+
+
+
<a-form-item label="鐗╂枡缁�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ墿鏂欑粍" v-decorator="['materialGroup']" />
</a-form-item>
@@ -98,7 +109,7 @@
</template>
<script>
-import { WmsMaterialAdd, GetAreas, GetStations } from '@/api/modular/main/WmsMaterialManage'
+import { WmsMaterialAdd, GetAreas, GetStations, materialTypeDataList } from '@/api/modular/main/WmsMaterialManage'
import addForm from './tabItem/addForm.vue'
import addFormBaseCustomer from './tabItem/addFormBaseCustomer/addFormBaseCustomer.vue'
import addFormContainerPackaging from './tabItem/WmsContainerPackaging/addFormContainerPackaging.vue'
@@ -112,6 +123,9 @@
addFormContainerPackaging,
addFormSub,
addControlRule
+ },
+ created() {
+ this.materialTypeDataList()
},
data() {
return {
@@ -135,55 +149,29 @@
}
},
methods: {
+ materialTypeDataList() {
+ materialTypeDataList().then((d) => {
+ this.materialTypeData = d.data || []
+ }).catch(() => {
+
+ })
+ },
callbacktab(e) {
+
+ //鍖呰鍏崇郴
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() { },
@@ -193,8 +181,8 @@
this.$nextTick(() => {
this.getSelects()
})
- const materialTypeOption = this.$options
- this.materialTypeData = materialTypeOption.filters['dictData']('material_type')
+ // const materialTypeOption = this.$options
+ // this.materialTypeData = materialTypeOption.filters['dictData']('material_type')
const inspectionMethodOption = this.$options
this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
},
--
Gitblit v1.9.3