From 870a9499eb65de0031ef8e8f70607e5dfb64b806 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 30 十一月 2023 09:30:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/departmentitem/itemscr/scrapping/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
index d5a05bc..e4864c7 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
@@ -24,7 +24,7 @@
</div>
<div class="card-header-right">
<el-button site="form" type="success" size="mini" @click="handleExport(item)"
- >瀵煎嚭鎶ュ簾鍗�</el-button
+ >瀵煎嚭鎶ュ簾鐧昏鍗�</el-button
>
<el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
>鏌ョ湅璇︽儏</el-button
@@ -54,7 +54,7 @@
</el-card>
</el-col>
</el-row>
- <div class="no-data" v-else>鏆傛棤鏁版嵁</div>
+ <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
</div>
<el-pagination
:small="false"
@@ -77,12 +77,12 @@
</template>
<script>
-import { outputList } from '@/api/stock/accessStock';
+import {outputList} from '@/api/stock/accessStock';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
-import listPage from '../../../mixins/listPage'
+import listPage from '@/views/mixins/listPage'
export default {
name: 'index',
--
Gitblit v1.9.1