From 6e3b6044ba218ba2c7cf4ad9d80821d8f78f1ff0 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 21:02:02 +0800
Subject: [PATCH] 1
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue | 26 ++++++++++++++++++++------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 12 +++---------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue | 6 +++---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue | 3 ++-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue | 10 ++--------
5 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
index f53e721..308880b 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -23,10 +23,18 @@
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="鐗╂枡绫诲瀷鍚嶇О">
- <a-input v-model="queryParam.materialTypeName" allow-clear
- placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" />
+ <!-- <a-input v-model="queryParam.materialTypeName" allow-clear
+ placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" /> -->
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷"
+ v-model="queryParam.materialTypeName">
+ <a-select-option v-for="(item, index) in materialTypeData" :key="index"
+ :value="item.materialTypeName">{{
+ item.materialTypeName }}</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
+
+
<!-- <a-col :md="8" :sm="24">
<a-form-item label="鐗╂枡绫诲瀷鎻忚堪">
<a-input v-model="queryParam.materialTypeDescr" allow-clear
@@ -44,11 +52,12 @@
<a-input v-model="queryParam.materialGroup" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑粍" />
</a-form-item>
</a-col>
- <a-col :md="8" :sm="24">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="ABC鍒嗙被鍚嶇О">
<a-input v-model="queryParam.abcClassName" allow-clear placeholder="璇疯緭鍏BC鍒嗙被鍚嶇О" />
</a-form-item>
- </a-col><a-col :md="8" :sm="24">
+ </a-col> -->
+ <a-col :md="8" :sm="24">
<a-form-item label="ABC鍒嗙被">
<a-input-number v-model="queryParam.abcClass" style="width: 100%" allow-clear
placeholder="璇疯緭鍏BC鍒嗙被" />
@@ -223,7 +232,7 @@
<script>
import { STable } from '@/components'
import moment from 'moment'
-import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
+import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel ,materialTypeDataList} from '@/api/modular/main/WmsBase/WmsMaterialManage'
//鑷畾涔塼able楂樺害
import setTableHtMixin from '@/mixins/handleTableHt.js'
import addForm from './addForm.vue'
@@ -768,7 +777,8 @@
})
},
selectedRowKeys: [],
- selectedRows: []
+ selectedRows: [],
+ materialTypeData:[]
}
},
created() {
@@ -804,7 +814,11 @@
},
false
)
+ materialTypeDataList().then((d) => {
+ this.materialTypeData = d.data || []
+ }).catch(() => {
+ })
},
methods: {
moment,
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 da96c2d..80bdb17 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -154,7 +154,7 @@
addControlRule
},
created() {
- this.materialTypeDataList()
+
const materialTypeOption = this.$options
this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class_type')
},
@@ -191,20 +191,13 @@
}).catch(() => {
})
- // 搴撳瓨鍗曚綅
+ // 搴撳瓨鍗曚綅 閲囪喘鍗曚綅
WmsUnitPage().then((d) => {
this.selectTypeData1 = d.data.rows || []
- }).catch(() => {
-
- })
-
- // 閲囪喘鍗曚綅
- WmsUnitPage().then((d) => {
this.selectTypeData2 = d.data.rows || []
}).catch(() => {
})
-
},
callbacktab(e) {
@@ -228,6 +221,7 @@
handleOk() { },
// 鍒濆鍖栨柟娉�
add(record, type) {
+ this.materialTypeDataList()
this.visible = true
if (record) {//缂栬緫
if (type == '璇︽儏') {
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
index bfea8f9..1f24edb 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
@@ -168,9 +168,9 @@
const placeStatusOption = this.$options
this.placeStatusData = placeStatusOption.filters['dictData']('place_status')
- WmsAreaPage().then(res => {
- this.WmsAreaData = res.data.rows
- })
+ // WmsAreaPage().then(res => {
+ // this.WmsAreaData = res.data.rows
+ // })
},
/**
* 鎻愪氦琛ㄥ崟
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
index c616771..cd0322f 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
@@ -153,7 +153,8 @@
placeStatusData: [],
visible: false,
confirmLoading: false,
- form: this.$form.createForm(this)
+ form: this.$form.createForm(this),
+ WmsAreaData:[]
}
},
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
index cf8bb56..177665f 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -110,16 +110,10 @@
<a-input v-model="queryParam.environment" allow-clear placeholder="璇疯緭鍏ュ簱瀛樼幆澧�" />
</a-form-item>
</a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="搴撳尯缂栧彿">
- <a-input v-model="queryParam.areaCode" allow-clear placeholder="璇疯緭鍏ュ簱鍖虹紪鍙�" />
- </a-form-item>
- </a-col>
<a-col :md="8" :sm="24">
<a-form-item label="鎵�鍦ㄥ簱鍖�">
<!-- <a-input v-model="queryParam.areaId" allow-clear placeholder="璇疯緭鍏ユ墍鍦ㄥ簱鍖�" /> -->
-
<a-select v-model="queryParam.areaCode" style="width: 100%" placeholder="璇烽�夋嫨鎵�鍦ㄥ簱鍖�">
<a-select-option v-for="(item, index) in WmsAreaData" :key="index"
:value="item.id">{{ item.areaName
@@ -1264,8 +1258,8 @@
},
false
)
- WmsAreaPage().then(res => {
- this.WmsAreaData = res.data.rows
+ WmsAreaPage().then(d => {
+ this.WmsAreaData = d.data.rows
this.$refs.addForm.WmsAreaData = d.data.rows || []
})
},
--
Gitblit v1.9.3