From b57f4eca1133a7ecad85abf3cff87fe88c366ec2 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 16:10:54 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
index 53ff524..0d7bb05 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
@@ -19,8 +19,8 @@
<a-form-item label="鏇夸唬鍝佺墿鏂欑紪鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<!-- <a-input placeholder="璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿"
v-decorator="['substituteMaterialCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿锛�' }] }]" /> -->
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鏇夸唬鍝佺墿鏂欑紪鍙�" v-decorator="['substituteMaterialCode']">
- <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.materialCode">{{
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鏇夸唬鍝佺墿鏂欑紪鍙�" v-decorator="['substituteMaterialCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿锛�' }] }]" >
+ <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.materialCode" >{{
item.materialName }}</a-select-option>
</a-select>
@@ -42,11 +42,7 @@
<script>
import moment from 'moment'
-import {
- WmsSubstituteGoodAdd
-} from '@/api/modular/main/WmsBase/WmsSubstituteGoodManage'
-
-import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
+import { WmsMaterialPage } from '@/api/modular/main/WmsBase/WmsMaterialManage'
export default {
data() {
return {
@@ -60,7 +56,8 @@
},
visible: false,
confirmLoading: false,
- form: this.$form.createForm(this)
+ form: this.$form.createForm(this),
+ selectTypeData:[]
}
},
created() {
--
Gitblit v1.9.3