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 @@ + + + + + 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 @@ - @@ -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 @@
- +
@@ -17,10 +17,15 @@ :list="list" :table-item="table"> + @@ -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 (
{parseTime(new Date(row.start_time),'{h}:{i}')}~{parseTime(new Date(row.start_time),'{h}:{i}')}
@@ -74,17 +85,7 @@ export default { label:'上门地址', minWidth:300, align:'left', - customFn:(row)=>{ - return ( -
- { - row.customer_address.filter(item => { - return item.default === 1 - })[0]?.address || row.customer_address[0]?.address || '无' - } -
- ) - } + 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 @@