From ac4d6eb764700424a7fe282721ab5bcdaa54d7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Sat, 14 Sep 2024 14:36:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/handover/HandoverDetails.vue | 889 +++++++++--------- 1 file changed, 468 insertions(+), 421 deletions(-) diff --git a/fuintAdmin/src/views/handover/HandoverDetails.vue b/fuintAdmin/src/views/handover/HandoverDetails.vue index 1038b2eeb..b8e588ec5 100644 --- a/fuintAdmin/src/views/handover/HandoverDetails.vue +++ b/fuintAdmin/src/views/handover/HandoverDetails.vue @@ -1,360 +1,364 @@ @@ -367,7 +371,7 @@ import { printLocallyApi } from "@/api/handover/handover"; -import {getStatisticsApi } from "@/api/order/order"; +import {getStatisticsApi} from "@/api/order/order"; import {getDicts} from "@/api/order/data"; import HandoverOnly from "@/views/handover/HandoverOnly.vue"; import {listStaff} from "@/api/order/staff"; @@ -382,28 +386,29 @@ export default { data() { return { - tabs:[ + tabs: [ "交接班", "交班记录" ], - value:'', - tabindex:0, - openDetail:false, - dataForm:{}, - dataList:[], - recordData:'', - zhztList:'', - shiftHandoverList:'', - handoverList : {}, - handoverData:{}, - baseInfo:{}, - billingDetails:[], - employeeStatistics:[], - greaseGunStatistics:[], - oilNumberStatistics:[], - orderSummary:{}, - paymentAggregation:[], - returnedToTheAccount:[], + isSearch: true, + value: '', + tabindex: 0, + openDetail: false, + dataForm: {}, + dataList: [], + recordData: '', + zhztList: '', + shiftHandoverList: '', + handoverList: {}, + handoverData: {}, + baseInfo: {}, + billingDetails: [], + employeeStatistics: [], + greaseGunStatistics: [], + oilNumberStatistics: [], + orderSummary: {}, + paymentAggregation: [], + returnedToTheAccount: [], // base queryParams: { @@ -411,22 +416,22 @@ export default { status: '', type: '', - page:null, - pageSize:null + page: null, + pageSize: null }, loading: false, - dateRange: [new Date(),new Date()], - beginTime:new Date(), - endTime:new Date(), + dateRange: [new Date(), new Date()], + beginTime: new Date(), + endTime: new Date(), defaultSort: {prop: 'createTime', order: 'descending'}, total: 0, - staffList:[], + staffList: [], statisticsForm: { - num:0, - exchangeQuantity:0, - integral:0, - amount:0 + num: 0, + exchangeQuantity: 0, + integral: 0, + amount: 0 } } }, @@ -442,41 +447,57 @@ export default { }, methods: { getHandover() { - getHandoverApi2(this.queryParams).then(res=>{ + getHandoverApi2(this.queryParams).then(res => { // this.handoverList = res.data; this.handoverData = res.data; this.baseInfo = this.handoverData.baseInfo, - this.billingDetails = this.handoverData.billingDetails, - this.employeeStatistics = this.handoverData.employeeStatistics, - this.greaseGunStatistics = this.handoverData.greaseGunStatistics, - this.oilNumberStatistics = this.handoverData.oilNumberStatistics, - this.orderSummary = this.handoverData.orderSummary, - this.paymentAggregation = this.handoverData.paymentAggregation, - this.returnedToTheAccount = this.handoverData.returnedToTheAccount, - console.log("this.handoverList",this.handoverList) + this.billingDetails = this.handoverData.billingDetails, + this.employeeStatistics = this.handoverData.employeeStatistics, + this.greaseGunStatistics = this.handoverData.greaseGunStatistics, + this.oilNumberStatistics = this.handoverData.oilNumberStatistics, + this.orderSummary = this.handoverData.orderSummary, + this.paymentAggregation = this.handoverData.paymentAggregation, + this.returnedToTheAccount = this.handoverData.returnedToTheAccount, + console.log("this.handoverList", this.handoverList) }) }, + onChange() { + if (this.queryParams.status == '统一交班') { + this.queryParams.staffId = '' + this.isSearch = true + } else if (this.queryParams.status == '个人交班') { + this.isSearch = false + } + }, + onChange2() { + console.log("this.queryParams.staffId", this.queryParams.staffId) + if (!this.queryParams.staffId) { + this.isSearch = false + } else if (this.queryParams.staffId) { + this.isSearch = true + } + }, - getindex(index){ + getindex(index) { this.tabindex = index }, - getList(){ + getList() { this.dateRange = [] if (this.beginTime && this.endTime) { this.dateRange.push(this.beginTime.toLocaleDateString()) this.dateRange.push(this.endTime.toLocaleDateString()) } - getHandoverListApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{ + getHandoverListApi(this.addDateRange(this.queryParams, this.dateRange)).then(res => { this.dataList = res.data.records this.total = res.data.total }) }, getStatistics() { - getStatisticsApi().then(res=>{ + getStatisticsApi().then(res => { this.statisticsForm = res.data }) - console.log("123123123",this.statisticsForm) + console.log("123123123", this.statisticsForm) }, // 获取支付方式 @@ -525,27 +546,30 @@ export default { }) }) }, - handleUpdate(){}, - handleQuery(){ + handleUpdate() { + }, + handleQuery() { this.getList(); this.getHandover(); }, getStaffList() { - listStaff(this.addDateRange({ page: 1, - pageSize: 10000})).then(response => { + listStaff(this.addDateRange({ + page: 1, + pageSize: 10000 + })).then(response => { this.staffList = response.data.records; } ); }, - resetQuery(){ + resetQuery() { this.queryParams = { giftName: '', status: '', mobile: '', orderNumber: '', - page:1, - pageSize:10 + page: 1, + pageSize: 10 }, this.dateRange = [] this.beginTime = ""; @@ -554,22 +578,22 @@ export default { this.getList(); }, printLocally(data) { - printLocallyApi(data).then(res=>{ + printLocallyApi(data).then(res => { - }) - }, - handleDetail(data){ + }) + }, + handleDetail(data) { this.openDetail = true this.recordData = data.recordData; // JSON.parse(this.recordData ) - console.log("data.recordData;",this.recordData) + console.log("data.recordData;", this.recordData) }, goToAbout() { this.$router.push({ - path:'/Handover', - query:{ - id:9 + path: '/Handover', + query: { + id: 9 } }); }, @@ -615,7 +639,8 @@ export default { box-sizing: border-box; padding-bottom: 20px; } -.tab-box{ + +.tab-box { width: 100%; background: #fff; display: flex; @@ -624,10 +649,12 @@ export default { margin-bottom: 25px; } -.box_{ + +.box_ { height: 100%; border-bottom: 2px solid #fe9554; } + .box { padding: 10px; height: 80px; @@ -641,25 +668,29 @@ export default { align-items: left; text-align: left; } -.box-card{ + +.box-card { width: 640px; margin: 0 auto; margin-bottom: 15px; } + .font-chinese { font-size: 15px; - font-family:Microsoft YaHei; + font-family: Microsoft YaHei; font-weight: bold; - line-height:1.5 + line-height: 1.5 } + .font-number { font-size: 20px; - font-family: PingFang SC,sans-serif; + font-family: PingFang SC, sans-serif; font-weight: bold; - line-height:1.3 + line-height: 1.3 } -.table-box{ + +.table-box { width: 100%; } @@ -670,10 +701,12 @@ export default { flex-wrap: nowrap; /* 确保不换行 */ width: 100%; /* 让父容器占满可用宽度 */ } + .el-form--inline .el-form-item { margin-right: 44px; } -.tab-box{ + +.tab-box { width: 100%; height: 40px; background: #fff; @@ -682,7 +715,8 @@ export default { margin-bottom: 25px; } -.tab_{ + +.tab_ { width: 75px; height: 100%; //border-bottom: 2px solid #FF770F; @@ -695,17 +729,20 @@ export default { margin-left: 50px; cursor: pointer; } -.active{ + +.active { border-bottom: 2px solid #FF770F !important; color: #FF770F !important; } -.title_{ + +.title_ { text-align: center; font-weight: 600; font-size: 16px; color: #333333; } -.d-s-b{ + +.d-s-b { width: 100%; display: flex; align-items: center; @@ -715,15 +752,18 @@ export default { color: #333333; margin: 20px auto; } -.xxing{ + +.xxing { width: 100%; - border-bottom: 1px solid #EEEEEE; + border-bottom: 1px solid #EEEEEE; } -.for-box{ + +.for-box { width: 100%; margin: 20px auto; } -.for-title{ + +.for-title { display: flex; align-items: center; justify-content: center; @@ -732,34 +772,41 @@ export default { color: #333333; } -.x-{ + +.x- { width: 100px; border-bottom: 1px solid #EEEEEE; margin: 0 15px; } -.f-size{ + +.f-size { width: 33%; text-align: center; font-weight: 600; font-size: 16px; color: #333333; } -.s-size{ + +.s-size { width: 33%; text-align: center; } -.l-size{ + +.l-size { width: 33%; text-align: left; } -.r-size{ + +.r-size { width: 33%; text-align: right; } -.bottom-{ + +.bottom- { width: 98%; } -.table-boxs{ + +.table-boxs { border-radius: 8px; width: 98%; background: #fff;