From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/warehouse/FinishedWarehousing/index.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/warehouse/FinishedWarehousing/index.vue b/src/views/warehouse/FinishedWarehousing/index.vue
index 7fbd608..b49dc54 100644
--- a/src/views/warehouse/FinishedWarehousing/index.vue
+++ b/src/views/warehouse/FinishedWarehousing/index.vue
@@ -4,9 +4,9 @@
<ttable
:table="table"
:isShowHide="true"
+ :ajaxFun="ajaxFun"
:prelang="prelang"
:options="options"
- :dataListLoading="false"
ref="processconfiguration"
>
<template #toolbar></template>
@@ -24,6 +24,7 @@
return {
ajaxFun: productPage,
prelang: 'operation',
+ dataListLoading: false,
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
stripe: true, // 鏄惁涓烘枒椹汗 table
@@ -206,4 +207,4 @@
ttable
},
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3