From 5977f069cc0adbe2219fb67ed8d054eac1026cf9 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Wed, 12 Oct 2022 17:35:30 +0800
Subject: [PATCH] 2022.10.12

---
 src/views/finance/component/detailServe.vue | 57 +++++++++++++++++++++
 src/views/finance/salaryList.vue            |  7 +--
 src/views/finance/serveDetail.vue           | 32 +++++++-----
 src/views/schedule/component/timeSelect.vue |  2 +-
 4 files changed, 80 insertions(+), 18 deletions(-)
 create mode 100644 src/views/finance/component/detailServe.vue

diff --git a/src/views/finance/component/detailServe.vue b/src/views/finance/component/detailServe.vue
new file mode 100644
index 0000000..eb93028
--- /dev/null
+++ b/src/views/finance/component/detailServe.vue
@@ -0,0 +1,57 @@
+<template>
+  <div class="serve-detail">
+    <xy-dialog :is-show.sync="isShow">
+      <template>
+        <div class="serve-detail__title">
+          服务时间
+        </div>
+        <div class="serve-detail__time-value">
+          12:00 ~ 16:00
+        </div>
+
+        <div class="serve-detail__title">
+          签到打卡
+        </div>
+
+        <div class="serve-detail__title">
+          过程打卡
+        </div>
+
+        <div class="serve-detail__title">
+          签退打卡
+        </div>
+      </template>
+
+      <template v-slot:footerContent>
+        <div></div>
+      </template>
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+
+  data() {
+    return {
+      isShow:false,
+
+    }
+  },
+  methods: {
+
+  },
+
+}
+</script>
+
+<style scoped lang="scss">
+.serve-detail{
+
+  &__title{
+    font-weight: 600;
+
+    padding: 10px 0;
+  }
+}
+</style>
diff --git a/src/views/finance/salaryList.vue b/src/views/finance/salaryList.vue
index bc1bb29..c4c3d1b 100644
--- a/src/views/finance/salaryList.vue
+++ b/src/views/finance/salaryList.vue
@@ -13,6 +13,7 @@
     </div>
 
     <xy-table
+      :default-expand-all="false"
       row-key="name"
       :total="total"
       :list="list"
@@ -21,7 +22,6 @@
         <div></div>
       </template>
     </xy-table>
-
   </div>
 </template>
 
@@ -30,7 +30,9 @@ import {salaryList as getList} from '@/api/worker'
 import {parseTime} from "@/utils"
 
 export default {
-
+  components:{
+    xyDia
+  },
   data() {
     return {
       select:{
@@ -104,7 +106,6 @@ export default {
     }
   },
   methods: {
-
     async getList(){
       const res = await getList(this.select)
       this.tableArr = res.map((item,index) => {
diff --git a/src/views/finance/serveDetail.vue b/src/views/finance/serveDetail.vue
index 195d448..6592cdc 100644
--- a/src/views/finance/serveDetail.vue
+++ b/src/views/finance/serveDetail.vue
@@ -6,7 +6,7 @@
         <slot>
           <div>
             <Input v-model="select.keyword" placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
-            <Button style="margin-left: 10px" type="primary" @click="select.page = 1,getList">查询</Button>
+            <Button style="margin-left: 10px" type="primary" @click="select.page = 1,getList()">查询</Button>
           </div>
         </slot>
       </lx-header>
@@ -17,10 +17,15 @@
       :list="list"
       :table-item="table">
       <template v-slot:btns>
-        <div></div>
+        <el-table-column fixed="right" label="操作" width="68" header-align="center" align="center">
+          <template v-slot:default="scope">
+            <Button size="small" type="primary" @click="detail(scope.row),$refs['detailServe'].isShow=true">查看</Button>
+          </template>
+        </el-table-column>
       </template>
     </xy-table>
 
+    <detailServe ref="detailServe"></detailServe>
   </div>
 </template>
 
@@ -28,12 +33,18 @@
 import {getList} from '@/api/serveDetail'
 import {parseTime} from "@/utils"
 
+import detailServe from "@/views/finance/component/detailServe";
 export default {
+  components:{
+    detailServe
+  },
   data() {
     return {
+      isShowDetail:false,
       select:{
         page:1,
         page_size:10,
+        area_id:'',
         keyword:''
       },
       types:[],
@@ -53,7 +64,7 @@ export default {
         },
         {
           label:'时间段',
-          width: 180,
+          width: 170,
           customFn:(row) => {
             return (
               <div>{parseTime(new Date(row.start_time),'{h}:{i}')}~{parseTime(new Date(row.start_time),'{h}:{i}')}</div>
@@ -74,17 +85,7 @@ export default {
           label:'上门地址',
           minWidth:300,
           align:'left',
-          customFn:(row)=>{
-            return (
-              <div>
-                {
-                  row.customer_address.filter(item => {
-                    return item.default === 1
-                  })[0]?.address || row.customer_address[0]?.address || '无'
-                }
-              </div>
-            )
-          }
+          prop:'customer_address.address'
         },
         {
           label:'服务状态',
@@ -110,6 +111,9 @@ export default {
     }
   },
   methods: {
+    detail(row){
+      console.log(row)
+    },
 
     async getList(){
       const res = await getList(this.select)
diff --git a/src/views/schedule/component/timeSelect.vue b/src/views/schedule/component/timeSelect.vue
index df139e1..e35e233 100644
--- a/src/views/schedule/component/timeSelect.vue
+++ b/src/views/schedule/component/timeSelect.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Modal :value="isShow" title="排班" width="48" @on-visible-change="e => $emit('update:isShow',e)">
+    <Modal :value.sync="isShow" title="排班" width="48" @on-visible-change="e => $emit('update:isShow',e)">
       <template v-slot:default>
         <el-form ref="elForm" :model="form" :rules="rules" label-width="110px">
           <el-form-item label="时间选择" prop="end_time">