From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新

---
 admin/src/views/stock/query.vue |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/admin/src/views/stock/query.vue b/admin/src/views/stock/query.vue
index f93e7be..565c971 100644
--- a/admin/src/views/stock/query.vue
+++ b/admin/src/views/stock/query.vue
@@ -2,11 +2,11 @@
   <div class="main_app">
     <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
     <div class="mt20">
-      <el-button @click="handleEx" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
+      <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,
@@ -48,10 +49,12 @@
             filed: 'warehouseId',
             type: 'select',
             label: '鎵�鍦ㄤ粨搴�',
+            labelCode: 'name',
+            valueCode: 'id',
             options: []
           },
           {
-            filed: 'materialId',
+            filed: 'materialCode',
             type: 'input',
             label: '鐗╂枡鍚嶇О/缂栫爜',
             placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�/缂栫爜'
@@ -67,8 +70,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