From 4378b6ecd779881e3a3a8bf57ad6811f9c96067a Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Fri, 24 May 2024 09:53:27 +0800
Subject: [PATCH] edit

---
 src/views/accounts/bill/index.vue           |  2 +-
 src/views/accounts/capital/index.vue        |  6 +++++-
 src/views/accounts/capitalFlow/index.vue    |  7 ++++---
 src/views/accounts/receipt/index.vue        |  7 ++++---
 src/views/accounts/statement/index.vue      |  7 ++++---
 src/views/accounts/transferRecord/index.vue |  6 +++---
 src/views/merchant/application/index.vue    | 12 ++++++------
 src/views/merchant/applyments/list.vue      | 13 +++++++------
 src/views/merchant/deposit/index.vue        |  6 +++---
 src/views/merchant/list/index.vue           |  6 +++---
 src/views/order/list/index.vue              |  2 ++
 src/views/order/orderCancellate/index.vue   |  6 +++---
 src/views/order/refund/index.vue            |  6 +++---
 src/views/product/productExamine/index.vue  | 16 +++++++++-------
 14 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/src/views/accounts/bill/index.vue b/src/views/accounts/bill/index.vue
index 2379271..9a9ae0e 100644
--- a/src/views/accounts/bill/index.vue
+++ b/src/views/accounts/bill/index.vue
@@ -3,7 +3,7 @@
     <div class="selCard mb14">
       <el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px">
         <el-form-item label="时间选择：">
-          <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" />
+          <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd HH:mm:ss" format="yyyy/MM/dd HH:mm:ss" size="small" type="datetimerange" placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" />
         </el-form-item>
         <el-form-item label="是否支付：" prop="paid">
           <el-select
diff --git a/src/views/accounts/capital/index.vue b/src/views/accounts/capital/index.vue
index 46d1ba0..c8276f3 100644
--- a/src/views/accounts/capital/index.vue
+++ b/src/views/accounts/capital/index.vue
@@ -3,7 +3,11 @@
     <div class="selCard">
       <el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px">
         <el-form-item label="时间选择：">
-          <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="daterange" placement="bottom-end" clearable placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" />
+          <el-date-picker v-model="timeVal" 
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            size="small"
+            type="datetimerange" placement="bottom-end" clearable placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" />
         </el-form-item>
         <el-form-item label="明细类型：" prop="type">
           <el-select v-model="tableFrom.type" class="selWidth" filterable clearable placeholder="请选择" @change="getList(1)">
diff --git a/src/views/accounts/capitalFlow/index.vue b/src/views/accounts/capitalFlow/index.vue
index 945f975..8d9d05a 100644
--- a/src/views/accounts/capitalFlow/index.vue
+++ b/src/views/accounts/capitalFlow/index.vue
@@ -5,9 +5,10 @@
         <el-form-item label="时间选择：">
           <el-date-picker
             v-model="timeVal"
-            value-format="yyyy/MM/dd"
-            format="yyyy/MM/dd"
-            type="daterange"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            size="small"
+            type="datetimerange"
             placement="bottom-end"
             placeholder="自定义时间"
             style="width: 280px;"
diff --git a/src/views/accounts/receipt/index.vue b/src/views/accounts/receipt/index.vue
index bca4054..e9cecec 100644
--- a/src/views/accounts/receipt/index.vue
+++ b/src/views/accounts/receipt/index.vue
@@ -27,9 +27,10 @@
         <el-form-item label="时间选择：">
           <el-date-picker
             v-model="timeVal"
-            value-format="yyyy/MM/dd"
-            format="yyyy/MM/dd"
-            type="daterange"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            size="small"
+            type="datetimerange"
             placement="bottom-end"
             placeholder="自定义时间"
             style="width: 280px"
diff --git a/src/views/accounts/statement/index.vue b/src/views/accounts/statement/index.vue
index a98e5bc..440fff1 100644
--- a/src/views/accounts/statement/index.vue
+++ b/src/views/accounts/statement/index.vue
@@ -5,12 +5,13 @@
         <el-form-item label="时间选择：">
           <el-date-picker
             v-model="timeVal"
-            type="daterange"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            size="small"
+            type="datetimerange"
             align="right"
             unlink-panels
             clearable
-            format="yyyy/MM/dd"
-            value-format="yyyy/MM/dd"
             @change="onchangeTime"
             style="width: 280px"
           />
diff --git a/src/views/accounts/transferRecord/index.vue b/src/views/accounts/transferRecord/index.vue
index 6dac0f7..6ce52d3 100644
--- a/src/views/accounts/transferRecord/index.vue
+++ b/src/views/accounts/transferRecord/index.vue
@@ -5,10 +5,10 @@
         <el-form-item label="时间选择：">
           <el-date-picker
             v-model="timeVal"
-            value-format="yyyy/MM/dd"
-            format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
             size="small"
-            type="daterange"
+            type="datetimerange"
             placement="bottom-end"
             placeholder="自定义时间"
             style="width: 280px;"
diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index d314f2b..7cb2a8f 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -19,10 +19,10 @@
         <el-form-item label="申请时间：">
           <el-date-picker
             v-model="timeVal"
-            type="daterange"
             placeholder="选择日期"
-            format="yyyy/MM/dd"
-            value-format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            type="datetimerange"
             :picker-options="pickerOptions"
             @change="onchangeTime"
             style="width: 280px"
@@ -31,10 +31,10 @@
         <el-form-item label="审核时间：">
           <el-date-picker
             v-model="timeVals"
-            type="daterange"
             placeholder="选择日期"
-            format="yyyy/MM/dd"
-            value-format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            type="datetimerange"
             :picker-options="pickerOptions"
             @change="onchangeTimes"
             style="width: 280px"
diff --git a/src/views/merchant/applyments/list.vue b/src/views/merchant/applyments/list.vue
index 2fe1052..d4181d4 100644
--- a/src/views/merchant/applyments/list.vue
+++ b/src/views/merchant/applyments/list.vue
@@ -5,9 +5,10 @@
         <el-form-item label="创建时间：">
           <el-date-picker
             v-model="timeVal"
-            value-format="yyyy/MM/dd"
-            format="yyyy/MM/dd"
-            type="daterange"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            size="small"
+            type="datetimerange"
             placement="bottom-end"
             placeholder="自定义时间"
             style="width: 280px;"
@@ -19,10 +20,10 @@
         <el-form-item label="分账时间：">
           <el-date-picker
             v-model="timeVal2"
-            value-format="yyyy/MM/dd"
-            format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
             size="small"
-            type="daterange"
+            type="datetimerange"
             placement="bottom-end"
             placeholder="自定义时间"
             style="width: 280px;"
diff --git a/src/views/merchant/deposit/index.vue b/src/views/merchant/deposit/index.vue
index b35a192..9741cd3 100644
--- a/src/views/merchant/deposit/index.vue
+++ b/src/views/merchant/deposit/index.vue
@@ -5,10 +5,10 @@
         <el-form-item label="选择时间：">
           <el-date-picker
             v-model="timeVal"
-            type="daterange"
             placeholder="选择日期"
-            format="yyyy/MM/dd"
-            value-format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            type="datetimerange"
             @change="onchangeTime"
             clearable
             :picker-options="pickerOptions"
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 89dba32..43d941f 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -11,10 +11,10 @@
         <el-form-item label="选择时间：">
           <el-date-picker
             v-model="timeVal"
-            type="daterange"
             placeholder="选择日期"
-            format="yyyy/MM/dd"
-            value-format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            type="datetimerange"
             range-separator="-"
             style="width: 280px"
             :picker-options="pickerOptions"
diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue
index 1a3329e..69d1477 100644
--- a/src/views/order/list/index.vue
+++ b/src/views/order/list/index.vue
@@ -583,7 +583,9 @@ export default {
         // }else{
         //   work = createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
         // }
+        //循环次数
         pageCount = Math.ceil(lebData.count/excelData.limit)
+        // 数据同步
         if (lebData.export.length) {
           data = data.concat(lebData.export)
           excelData.page++
diff --git a/src/views/order/orderCancellate/index.vue b/src/views/order/orderCancellate/index.vue
index 925da7e..1ccc4a1 100644
--- a/src/views/order/orderCancellate/index.vue
+++ b/src/views/order/orderCancellate/index.vue
@@ -5,10 +5,10 @@
         <el-form-item label="核销时间：">
           <el-date-picker
             v-model="timeVal"
-            value-format="yyyy/MM/dd"
-            format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
             size="small"
-            type="daterange"
+            type="datetimerange"
             placement="bottom-end"
             placeholder="自定义时间"
             style="width: 280px;"
diff --git a/src/views/order/refund/index.vue b/src/views/order/refund/index.vue
index b6ead9d..b28354c 100644
--- a/src/views/order/refund/index.vue
+++ b/src/views/order/refund/index.vue
@@ -25,10 +25,10 @@
         <el-form-item label="时间选择：">
           <el-date-picker
             v-model="timeVal"
-            value-format="yyyy/MM/dd"
-            format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
             size="small"
-            type="daterange"
+            type="datetimerange"
             placement="bottom-end"
             placeholder="自定义时间"
             style="width: 280px;"
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index ba838f9..85bc0c4 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -155,9 +155,10 @@
         <el-form-item label="时间选择：" prop="create_time">
           <el-date-picker
             v-model="timeVal"
-            value-format="yyyy/MM/dd"
-            format="yyyy/MM/dd"
-            type="daterange"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            size="small"
+            type="datetimerange"
             placement="bottom-end"
             placeholder="自定义时间"
             start-placeholder="开始日期"
@@ -168,12 +169,13 @@
             clearable
           />
         </el-form-item>
-        <el-form-item label="更新选择：" prop="update_date">
+        <el-form-item label="更新时间：" prop="update_date">
           <el-date-picker
             v-model="updateTimeVal"
-            value-format="yyyy/MM/dd"
-            format="yyyy/MM/dd"
-            type="daterange"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            size="small"
+            type="datetimerange"
             placement="bottom-end"
             placeholder="自定义时间"
             start-placeholder="开始日期"