From 17d7043f10d55429db919238fe639bff1b51ec0e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 07 二月 2025 15:59:37 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/stock/query.vue b/admin/src/views/stock/query.vue
index f93e7be..d5d750f 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 />
@@ -51,7 +51,7 @@
options: []
},
{
- filed: 'materialId',
+ filed: 'materialCode',
type: 'input',
label: '鐗╂枡鍚嶇О/缂栫爜',
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�/缂栫爜'
--
Gitblit v1.9.3