From a09708582ca65d621d14a8c6a3a22222dd7db0d9 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 13 一月 2025 09:27:47 +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/asset.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/stock/asset.vue b/admin/src/views/stock/asset.vue
index 61d0ab4..d3880e6 100644
--- a/admin/src/views/stock/asset.vue
+++ b/admin/src/views/stock/asset.vue
@@ -2,7 +2,7 @@
<div class="main_app">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
<div class="mt20">
- <el-button type="primary" @click="handleEx()" v-permissions="['business:ywpatrolline:create']">鏂板</el-button>
+ <el-button type="primary" @click="$refs.newWarehouse.open('鏂板缓浠撳簱鍚嶇О')">鏂板</el-button>
</div>
<el-table v-loading="loading" :data="list" stripe>
<el-table-column prop="platformName" label="浠撳簱鍚嶇О" min-width="120" show-overflow-tooltip />
@@ -12,7 +12,7 @@
<el-table-column prop="param1" label="澶囨敞" min-width="120" show-overflow-tooltip />
<el-table-column prop="param2" label="鐘舵��" min-width="90" show-overflow-tooltip />
<el-table-column prop="workTime" label="鎿嶄綔" min-width="100" show-overflow-tooltip>
- <template v-slot="{row}">
+ <template v-slot="{ row }">
<span class="primaryColor pointer">鏌ョ湅璇︽儏</span>
<span class="red pointer">鍒犻櫎</span>
</template>
@@ -21,12 +21,14 @@
<div class="mt20">
<Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
</div>
+ <newWarehouse ref="newWarehouse" @success="getList" />
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
+import newWarehouse from './components/newWarehouse'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
@@ -34,7 +36,8 @@
export default {
components: {
Pagination,
- QueryForm
+ QueryForm,
+ newWarehouse
},
data() {
return {
@@ -49,7 +52,7 @@
total: 0,
queryFormConfig: {
formItems: [
- {
+ {
filed: 'carCodeFront',
type: 'input',
label: '浠撳簱鍚嶇О',
@@ -123,11 +126,10 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
</script>
-<style>
-
-</style>
+<style></style>
--
Gitblit v1.9.3