From d8e1d04b42dc073b84a41f05a2b1ae19f1ad401b Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 22 Oct 2024 10:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XyTable/index.vue             |  2 ++
 src/utils/downloadRequest.js                 |  2 +-
 src/views/customer/component/addCustomer.vue |  2 +-
 src/views/finance/component/serveDraw.vue    |  2 +-
 src/views/finance/scheduleList.vue           | 17 +++++++++++------
 src/views/finance/serveDetail.vue            | 13 +++++++------
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index 6df14ca..3a0a33f 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -244,7 +244,9 @@ export default {
             span-method={this.spanMethod}
             tree-props={treeProps}
             fit={true}
+            highlight-current-roll={true}
             on={{
+              ['row-click']: (row, column, event) => this.$emit('row-click', {row, column, event}),
               ['select']: selectClick,
               ['cell-click']: cellClick,
               ['select-all']: selectAllClick,
diff --git a/src/utils/downloadRequest.js b/src/utils/downloadRequest.js
index 3dfce31..7915bc8 100644
--- a/src/utils/downloadRequest.js
+++ b/src/utils/downloadRequest.js
@@ -21,7 +21,7 @@ export async function download(url,method='get',info,filename){
     url,
     method,
     responseType: 'blob',
-    timeout:10000,
+    timeout: 60000,
     headers: {
       Accept: 'application/json','Content-Type':'application/json; charset=utf-8',
       withCredentials: true,
diff --git a/src/views/customer/component/addCustomer.vue b/src/views/customer/component/addCustomer.vue
index a604291..1ad742e 100644
--- a/src/views/customer/component/addCustomer.vue
+++ b/src/views/customer/component/addCustomer.vue
@@ -264,7 +264,7 @@
 <!--        </div>-->
 <!--      </template>-->
 
-      <template v-slot:extraFormBottom>
+      <template v-slot:extraFormBottom v-if="$store.state.user.myRoles.findIndex(i => i.name === '系统管理员') !== -1">
         <div style="font-weight: 600;padding: 10px;">日志</div>
         <xy-table :is-page="false" :height="240" style="width: 100%" :list="log" :table-item="logTable">
           <template v-slot:btns><div></div></template>
diff --git a/src/views/finance/component/serveDraw.vue b/src/views/finance/component/serveDraw.vue
index 44670c2..db7ac6e 100644
--- a/src/views/finance/component/serveDraw.vue
+++ b/src/views/finance/component/serveDraw.vue
@@ -34,7 +34,7 @@
                 :height="300"
                 :is-page="false"
                 :list="list"
-                :table-item="table"
+                :table-item="table.filter(i => i.prop === 'updated_at' ? $store.state.user.myRoles.findIndex(i => i.name === '系统管理员') !== -1 : true)"
               >
                 <template v-slot:btns>
                   <el-table-column
diff --git a/src/views/finance/scheduleList.vue b/src/views/finance/scheduleList.vue
index 4192c1b..a1db71e 100644
--- a/src/views/finance/scheduleList.vue
+++ b/src/views/finance/scheduleList.vue
@@ -168,6 +168,7 @@
       :row-style="tableRowStyle"
       :default-expand-all="false"
       :list="list"
+      @row-click="rowClick"
       :table-item="table"
       :total="total"
       @pageIndexChange="
@@ -244,6 +245,7 @@ export default {
   },
   data() {
     return {
+      pickedRowId: '',
       ways: [
         {
           id: 1,
@@ -580,6 +582,9 @@ export default {
     };
   },
   methods: {
+    rowClick({row, column, event}) {
+      this.pickedRowId = row.id
+    },
     tableRowStyle({row, rowIndex}){
       let selectTime = row.sku.reduce((pre,cur) => {
         return pre + Number(cur.time ?? 0)
@@ -599,6 +604,11 @@ export default {
           'background':'rgb(253,165,122)'
         }
       }
+      if(row.id === this.pickedRowId) {
+        return {
+          'background':'rgba(220,239,250,0.93)'
+        }
+      }
     },
     pickYear(e) {
       if (e) {
@@ -676,14 +686,9 @@ export default {
 
     exports(){
       download('/api/admin/chart/schedule-list-log','get',{
+        ...this.select,
         page: 1,
         page_size: 9999,
-        status:this.select.status,
-        nurse_name:this.select.nurse_name,
-        customer_name:this.select.customer_name,
-        address_name:this.select.address_name,
-        start_start_time: this.select.start_start_time,
-        end_start_time: this.select.end_start_time,
         is_export:1
       },`服务明细.xlsx`)
     },
diff --git a/src/views/finance/serveDetail.vue b/src/views/finance/serveDetail.vue
index 3b4629a..973f09b 100644
--- a/src/views/finance/serveDetail.vue
+++ b/src/views/finance/serveDetail.vue
@@ -204,12 +204,13 @@ export default {
         "/api/admin/customer/schedule_list_skus",
         "get",
         {
-          start_date: this.$moment(this.select.month)
-            .startOf("month")
-            .format("YYYY-MM-DD"),
-          end_date: this.$moment(this.select.month)
-            .endOf("month")
-            .format("YYYY-MM-DD"),
+          ...this.select,
+          // start_date: this.$moment(this.select.month)
+          //   .startOf("month")
+          //   .format("YYYY-MM-DD"),
+          // end_date: this.$moment(this.select.month)
+          //   .endOf("month")
+          //   .format("YYYY-MM-DD"),
           page: 1,
           page_size: 9999,
           is_export: 1,