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/plan/customerorder/index.vue | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 3527286..87bf7f7 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -60,6 +60,7 @@
<el-button
style="margin-left: 10px;padding: 9px 14px;"
type="primary"
+ v-if="permissions.plan_customerorder_check"
@click="handleCheck"
>瀹℃牳</el-button
>
@@ -534,6 +535,7 @@
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
defaultOrderBy: { column: 'placeOrderDate', direction: 'desc' },
cancelRunCreated: true,
+ reserveSelection: true,//鏄惁淇濈暀涔嬪墠閫夋嫨鐨勬暟鎹�
},
table: {
total: 0,
@@ -601,7 +603,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'date',
+ searchInfoType: 'datetimerange',
formatter: this.formatDutyDate,
},
{
--
Gitblit v1.9.3