From 4d14b84903bf0277c5e8b9b3138c5e1d981e95db Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 11:01:31 +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 | 78 +++++++++++++++++++++++++++++----------
1 files changed, 58 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 9b4f0fc..2749b69 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -1,12 +1,12 @@
<template>
- <a-modal title="鏂板鍩虹鐗╂枡淇℃伅" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+ <a-modal title="鏂板鍩虹鐗╂枡淇℃伅" :width="1200" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<!-- tab -->
<a-tabs default-active-key="1" @change="callbacktab">
<a-tab-pane key="1" tab="鍩烘湰淇℃伅">
<!-- <add-form ref="addFormRef" @ok="handleOk" /> -->
- <!-- 鍩烘湰淇℃伅 -->
+ <!-- 鍩烘湰淇℃伅 layout="inline" layout="vertical" -->
<a-form :form="form">
<a-form-item label="鐗╂枡鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
@@ -34,12 +34,6 @@
</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>
@@ -47,7 +41,15 @@
<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-input-number placeholder="璇疯緭鍏BC鍒嗙被" style="width: 100%" v-decorator="['aBCClass']" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨ABC鍒嗙被" v-decorator="['factoryCode']">
+ <a-select-option v-for="(item, index) in materialTypeData2" :key="index" :value="Number(item.code)">{{
+ item.name }}</a-select-option>
+ </a-select>
+
+
+
</a-form-item>
<a-form-item label="鐗╂枡瑙勬牸" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ墿鏂欒鏍�" v-decorator="['materialSpec']" />
@@ -56,10 +58,24 @@
<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-input placeholder="璇疯緭鍏ュ簱瀛樺崟浣�" v-decorator="['materialUnit']" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撳瓨鍗曚綅" v-decorator="['materialUnit']">
+ <a-select-option v-for="(item, index) in selectTypeData1" :key="index" :value="Number(item.unitCode)">{{
+ item.unitName }}</a-select-option>
+ </a-select>
+
+
</a-form-item>
<a-form-item label="閲囪喘鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ラ噰璐崟浣�" v-decorator="['pOUnit']" />
+ <!-- <a-input placeholder="璇疯緭鍏ラ噰璐崟浣�" v-decorator="['pOUnit']" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨閲囪喘鍗曚綅" v-decorator="['pOUnit']">
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="Number(item.unitCode)">{{
+ item.unitName }}</a-select-option>
+ </a-select>
+
+
</a-form-item>
<a-form-item label="棰滆壊" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ラ鑹�" v-decorator="['color']" />
@@ -115,7 +131,7 @@
import addFormContainerPackaging from './tabItem/WmsContainerPackaging/addFormContainerPackaging.vue'
import addFormSub from './tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue'
import addControlRule from './tabItem/WmsControlRule/addForm.vue'
-
+import { WmsUnitPage, WmsUnitDelete, WmsUnitToExcel } from '@/api/modular/main/WmsBase/WmsUnitManage'
export default {
components: {
addForm,
@@ -149,12 +165,27 @@
}
},
methods: {
+ // 鐗╂枡绫诲瀷
materialTypeDataList() {
materialTypeDataList().then((d) => {
this.materialTypeData = d.data || []
}).catch(() => {
})
+ // 搴撳瓨鍗曚綅
+ WmsUnitPage().then((d) => {
+ this.selectTypeData1 = d.data.rows || []
+ }).catch(() => {
+
+ })
+
+ // 閲囪喘鍗曚綅
+ WmsUnitPage().then((d) => {
+ this.selectTypeData2 = d.data.rows || []
+ }).catch(() => {
+
+ })
+
},
callbacktab(e) {
@@ -177,13 +208,13 @@
// 鍒濆鍖栨柟娉�
add(record) {
this.visible = true
- this.$nextTick(() => {
- // this.getSelects()
- })
- // const materialTypeOption = this.$options
- // this.materialTypeData = materialTypeOption.filters['dictData']('material_type')
- const inspectionMethodOption = this.$options
- this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
+ // this.$nextTick(() => {
+ // // this.getSelects()
+ // })
+ const materialTypeOption = this.$options
+ this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class')
+ // const inspectionMethodOption = this.$options
+ // this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
},
getSelects() {
if (this.areaNameParameterData.length <= 0 || this.stationNameParameterData.length <= 0) {
@@ -241,7 +272,7 @@
let BaseCustomerList = [];
if (this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length > 0) {
BaseCustomerList = this.$refs.addFormBaseCustomer.list
-
+
}
console.log(6666666666666 + '瀹㈡埛妗ｆ闆嗗悎')
@@ -296,3 +327,10 @@
}
}
</script>
+
+<style lang="less" scoped>
+ .ant-row.ant-form-item {
+ width: 50% !important;
+ display: inline-block;
+ }
+</style>
--
Gitblit v1.9.3