From c7d99f5e11c4cf0667f67b8170e1c585db2e2016 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 08 二月 2025 15:34:15 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
admin/src/views/stock/query.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/stock/query.vue b/admin/src/views/stock/query.vue
index 943434c..d36de1e 100644
--- a/admin/src/views/stock/query.vue
+++ b/admin/src/views/stock/query.vue
@@ -5,8 +5,8 @@
<el-button @click="handleEx" v-permissions="['business:ywstock:exportExcel']">瀵煎嚭</el-button>
</div>
<el-table v-loading="loading" :data="list" stripe>
- <el-table-column prop="materialId" label="璧勪骇缂栫爜" min-width="100" show-overflow-tooltip />
- <el-table-column prop="materialName" label="璧勪骇鍚嶇О" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="materialCode" label="鐗╂枡缂栫爜" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="materialName" label="鐗╂枡鍚嶇О" min-width="100" show-overflow-tooltip />
<el-table-column prop="materialQrcode" label="鏉＄爜" min-width="100" show-overflow-tooltip />
<el-table-column prop="materialBrand" label="鍝佺墝" min-width="100" show-overflow-tooltip />
<el-table-column prop="materialAttr" label="瑙勬牸鍨嬪彿" min-width="100" show-overflow-tooltip />
@@ -26,6 +26,7 @@
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import { ywStockPage,ywStockPageEx } from '@/api/store/index'
+import { fetchList as getStoreList } from '@/api/ywWarehouse'
export default {
components: {
Pagination,
@@ -51,7 +52,7 @@
options: []
},
{
- filed: 'materialId',
+ filed: 'materialCode',
type: 'input',
label: '鐗╂枡鍚嶇О/缂栫爜',
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�/缂栫爜'
@@ -67,8 +68,14 @@
},
created() {
this.getList()
+ this.initData()
},
methods: {
+ initData() {
+ getStoreList({ capacity: 9999, page: 1, model: {} }).then(res => {
+ this.queryFormConfig.formItems[0].options = res.records || []
+ })
+ },
getList(page) {
const { pagination, filters } = this
this.loading = true
--
Gitblit v1.9.3