diff --git a/pages.json b/pages.json index f5745d8..e73d3ec 100644 --- a/pages.json +++ b/pages.json @@ -114,6 +114,7 @@ "path": "yearSettlement", "style": { + "navigationStyle": "custom", "navigationBarTitleText": "年度结算" } }, @@ -124,6 +125,13 @@ "navigationStyle": "custom", "navigationBarTitleText": "月度详情" } + }, + { + "path": "dailyList", + "style": + { + "navigationBarTitleText": "日结冲正明细" + } } ] }, diff --git a/pages/settlementApproval/dailyList.vue b/pages/settlementApproval/dailyList.vue new file mode 100644 index 0000000..43bd599 --- /dev/null +++ b/pages/settlementApproval/dailyList.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/pages/settlementApproval/detail.vue b/pages/settlementApproval/detail.vue index 5307f94..528e439 100644 --- a/pages/settlementApproval/detail.vue +++ b/pages/settlementApproval/detail.vue @@ -6,7 +6,7 @@ - + {{ detailObj.SERVERPART_NAME}} @@ -64,11 +64,11 @@ - + {{detailObj.Approvalstate===0?'待结算':detailObj.Approvalstate===1?'审核中':''}} - + @@ -80,7 +80,7 @@ - + {{item.PeriodIndexStr ||''}} @@ -136,12 +136,12 @@ - - + + {{detailObj.Approvalstate===0?'待结算':detailObj.Approvalstate===1?'审核中':''}} - - + + @@ -156,7 +156,7 @@ - + 结算时间：{{item.StartDate || ''}} 至 {{item.EndDate || ''}} @@ -165,12 +165,12 @@ 数据类型 - + 结算数据 - + 精算数据 @@ -298,7 +298,7 @@ - + 结算时间：{{detailObj.SETTLEMENT_DATE || ''}} @@ -307,12 +307,12 @@ 数据类型 - + 结算数据 - + 精算数据 @@ -340,7 +340,7 @@ {{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:'-'}} {{monthNewCalibration.MOBILEPAY_AMOUNTTEXT || ''}} - ({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}) + ({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}) @@ -358,7 +358,7 @@ {{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}} - ({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }}) + ({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }}) @@ -393,7 +393,7 @@ 经营商户应交费用明细表 - + 结算时间：{{detailObj.SETTLEMENT_DATE || ''}} @@ -401,12 +401,12 @@ 数据类型 - + 应缴费用 - + 已缴费用 @@ -480,8 +480,8 @@ {{item.STAFF_NAME.slice(1,3)}} - - + + @@ -509,7 +509,7 @@ 发起审批 - + 驳回 @@ -561,7 +561,7 @@ - + 结算时间：{{detailObj.STARTDATE || ''}} 至 {{detailObj.ENDDATE || ''}} @@ -570,12 +570,12 @@ 数据类型 - + 结算数据 - + 精算数据 @@ -749,6 +749,7 @@ export default { afterCalibration: false,// 是否为校准之后 lastMonthIsOver: false,// 判断上个月是否已经审结 LastSettlementMonth: '',// 最近审结的月份 + LastSettlementMonthText: '',// 最近审结的月份 isShowSelect: false,// 出现选人的悬浮框 yearDataList:[],// 年度结算的悬浮框数据 isAllMonthSuccess: true,// 判断是不是全部的月份都已经审结了 @@ -806,8 +807,11 @@ export default { // 拿到流程数据 await this.handleGetProgress() - // 经营商户应交费用明细表 - await this.handleGetProjectExpenseList() + if(this.detailObj.SETTLEMENT_TYPE!==1){ + // 经营商户应交费用明细表 + await this.handleGetProjectExpenseList() + } + }, onUnload(){ @@ -818,6 +822,7 @@ export default { this.topDetail = {} this.actuaryData = {} this.yearDataListObj = {} + this.ExpenseObj = {} this.newCalibration = {} this.progressDetail = {} this.nextPerson = [] @@ -829,6 +834,7 @@ export default { this.progressList = [] this.afterCalibration = false this.monthId = '' + this.isAllMonthSuccess = true this.closePop() this.closeApplyFor() @@ -842,16 +848,22 @@ export default { numeral, // 经营商户应交费用明细表 async handleGetProjectExpenseList(){ + console.log('this.detailObj.SETTLEMENT_DATE',this.detailObj.SETTLEMENT_DATE) + uni.showLoading({ + title: '请求应交费用数据...' + }) if(this.detailObj.Approvalstate===9){ let req = { BusinessProjectId: this.detailObj.BUSINESSPROJECT_ID, - ShopRoyaltyId: this.detailObj.SHOPROYALTY_ID,SETTLEMENT_DATE, - StartMonth: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE).format('YYYYMM') : '', - EndMonth: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE).format('YYYYMM') : '', + ShopRoyaltyId: this.detailObj.SHOPROYALTY_ID, + StartMonth: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).format('YYYYMM') : '', + EndMonth: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).format('YYYYMM') : '', } const data = await request.$webGet('EShangApiMain/Finance/GetProjectExpenseList',req) console.log('handleGetProjectExpenseList',data) + uni.hideLoading() this.ExpenseObj = data.Result_Data.List[0] + console.log('this.ExpenseObj',this.ExpenseObj) }else{ @@ -866,12 +878,14 @@ export default { } let req = { serverpartshop_id: min===999999999?'':min, - statistics_month_start: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE).startOf('months').format('YYYY/MM/DD') :'', - statistics_month_end: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE).endOf('months').format('YYYY/MM/DD') :'', + statistics_month_start: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).startOf('months').format('YYYY/MM/DD') :'', + statistics_month_end: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).endOf('months').format('YYYY/MM/DD') :'', } + console.log('this.detailObj.SETTLEMENT_DATE + this.detailObj.SETTLEMENT_TYPE===1?\'\':\'/01\'',this.detailObj.SETTLEMENT_DATE + this.detailObj.SETTLEMENT_TYPE===1?'':'/01') console.log('redsadasdasdq', req) const data = await request.$webGet('EShangApiMain/BusinessProject/GetShopExpenseSummary',req) console.log('handleGetProjectExpenseList',data) + uni.hideLoading() this.ExpenseObj = data.Result_Data.List[0] console.log('this.ExpenseObj',this.ExpenseObj) } @@ -1418,7 +1432,8 @@ export default { this.lastMonthIsOver = true }else if(res.AllowSettlement===2){ this.lastMonthIsOver = false - this.LastSettlementMonth = `${res.LastSettlementMonth}审结中月度结算正在审批中，请审结后再发起${req.StatisticsMonth}月度结算` + this.LastSettlementMonth = res.LastSettlementMonth + this.LastSettlementMonthText = `${res.LastSettlementMonth}审结中月度结算正在审批中，请审结后再发起${req.StatisticsMonth}月度结算` }else{ this.lastMonthIsOver = false if(res.LastSettlementState===0){ @@ -1815,7 +1830,7 @@ export default { .moneyItem{ width: 50%; .redMoney{ - font-family: DINAlternate, DINAlternate; + font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; font-size: 40rpx; color: #9A3D1A; @@ -1824,7 +1839,7 @@ export default { font-style: normal; } .moneyValue{ - font-family: DINAlternate, DINAlternate; + font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; font-size: 34rpx; color: #160002; @@ -1866,7 +1881,7 @@ export default { width: calc(100% / 3); box-sizing: border-box; .value{ - font-family: DINAlternate, DINAlternate; + font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; font-size: 28rpx; color: #160002; @@ -1972,9 +1987,9 @@ export default { font-style: normal; } .timeBox{ - font-family: PingFangSC, PingFang SC; + font-family: DINAlternate-Bold, DINAlternate; font-weight: 400; - font-size: 28rpx; + font-size: 24rpx; color: #786B6C; line-height: 40rpx; text-align: left; @@ -2013,7 +2028,7 @@ export default { .revenueValue{ font-family: DINAlternate, DINAlternate; font-weight: bold; - font-size: 36rpx; + font-size: 28rpx; color: #160002; line-height: 44rpx; text-align: left; @@ -2083,9 +2098,9 @@ export default { margin-right: 8rpx; } .endTime{ - font-family: PingFangSC, PingFang SC; + font-family: DINAlternate-Bold, DINAlternate; font-weight: 400; - font-size: 28rpx; + font-size: 24rpx; color: #786B6C; line-height: 40rpx; text-align: left; @@ -2100,12 +2115,13 @@ export default { display: flex; align-items: center; width: 100%; - height: 156rpx; + height: 80rpx; background-color: #F7F8FA; .firstTableTitle{ width: 30%; box-sizing: border-box; padding-left: 24rpx; + font-size: 24rpx; } .borderRight{ width: 2rpx; @@ -2117,6 +2133,7 @@ export default { display: flex; flex-direction: column; align-items: center; + font-size: 24rpx; .dataIcon{ width: 60rpx; height: 60rpx; @@ -2134,6 +2151,7 @@ export default { width: 30%; box-sizing: border-box; padding: 22rpx 0 22rpx 22rpx; + font-size: 24rpx; } .refundPay{ font-family: PingFangSC, PingFang SC; @@ -2154,6 +2172,8 @@ export default { box-sizing: border-box; padding: 22rpx 24rpx 22rpx 0; text-align: right; + font-size: 26rpx; + font-family: DINAlternate-Bold, DINAlternate; } } .tableRowGray{ @@ -2326,9 +2346,9 @@ export default { margin-right: 8rpx; } .endTime{ - font-family: PingFangSC, PingFang SC; + font-family: DINAlternate-Bold, DINAlternate; font-weight: 400; - font-size: 28rpx; + font-size: 24rpx; color: #786B6C; line-height: 40rpx; text-align: left; @@ -2343,12 +2363,13 @@ export default { display: flex; align-items: center; width: 100%; - height: 156rpx; + height: 80rpx; background-color: #F7F8FA; .firstTableTitle{ width: 30%; box-sizing: border-box; padding-left: 24rpx; + font-size: 24rpx; } .borderRight{ width: 2rpx; @@ -2360,6 +2381,7 @@ export default { display: flex; flex-direction: column; align-items: center; + font-size: 24rpx; .dataIcon{ width: 60rpx; height: 60rpx; @@ -2372,11 +2394,11 @@ export default { width: 100%; height: 100%; display: flex; - align-items: center; .labelRow{ width: 30%; box-sizing: border-box; padding: 22rpx 0 22rpx 22rpx; + font-size: 24rpx; } .refundPay{ font-family: PingFangSC, PingFang SC; @@ -2397,6 +2419,8 @@ export default { box-sizing: border-box; padding: 22rpx 24rpx 22rpx 0; text-align: right; + font-size: 26rpx; + font-family: DINAlternate-Bold, DINAlternate; } } .tableRowGray{ @@ -2409,7 +2433,7 @@ export default { .payableFeesBox{ width: 100%; box-sizing: border-box; - padding: 32rpx 32rpx 0; + padding: 32rpx 32rpx 24rpx; background-color: #fff; .payableFeesBoxTitle{ font-family: PingFangSC, PingFang SC; @@ -2431,9 +2455,9 @@ export default { margin-right: 8rpx; } .endTime{ - font-family: PingFangSC, PingFang SC; + font-family: DINAlternate-Bold, DINAlternate; font-weight: 400; - font-size: 28rpx; + font-size: 24rpx; color: #786B6C; line-height: 40rpx; text-align: left; @@ -2448,12 +2472,13 @@ export default { display: flex; align-items: center; width: 100%; - height: 156rpx; + height: 80rpx; background-color: #F7F8FA; .firstTableTitle{ width: 30%; box-sizing: border-box; padding-left: 24rpx; + font-size: 24rpx; } .borderRight{ width: 2rpx; @@ -2465,6 +2490,7 @@ export default { display: flex; flex-direction: column; align-items: center; + font-size: 24rpx; .dataIcon{ width: 60rpx; height: 60rpx; @@ -2482,6 +2508,7 @@ export default { width: 30%; box-sizing: border-box; padding: 22rpx 0 22rpx 22rpx; + font-size: 24rpx; } .refundPay{ font-family: PingFangSC, PingFang SC; @@ -2502,6 +2529,8 @@ export default { box-sizing: border-box; padding: 22rpx 24rpx 22rpx 0; text-align: right; + font-size: 26rpx; + font-family: DINAlternate-Bold, DINAlternate; } } .tableRowGray{ @@ -2557,9 +2586,9 @@ export default { margin-right: 8rpx; } .endTime{ - font-family: PingFangSC, PingFang SC; + font-family: DINAlternate-Bold, DINAlternate; font-weight: 400; - font-size: 28rpx; + font-size: 24rpx; color: #786B6C; line-height: 40rpx; text-align: left; @@ -2574,12 +2603,13 @@ export default { display: flex; align-items: center; width: 100%; - height: 156rpx; + height: 80rpx; background-color: #F7F8FA; .firstTableTitle{ width: 30%; box-sizing: border-box; padding-left: 24rpx; + font-size: 24rpx; } .borderRight{ width: 2rpx; @@ -2591,6 +2621,7 @@ export default { display: flex; flex-direction: column; align-items: center; + font-size: 24rpx; .dataIcon{ width: 60rpx; height: 60rpx; @@ -2608,6 +2639,7 @@ export default { width: 30%; box-sizing: border-box; padding: 22rpx 0 22rpx 22rpx; + font-size: 24rpx; } .refundPay{ font-family: PingFangSC, PingFang SC; @@ -2629,6 +2661,7 @@ export default { padding: 22rpx 24rpx 22rpx 0; text-align: right; font-size: 26rpx; + font-family: DINAlternate-Bold, DINAlternate; } } .tableRowGray{ @@ -3287,9 +3320,9 @@ export default { margin-right: 8rpx; } .endTime{ - font-family: PingFangSC, PingFang SC; + font-family: DINAlternate-Bold, DINAlternate; font-weight: 400; - font-size: 28rpx; + font-size: 24rpx; color: #786B6C; line-height: 40rpx; text-align: left; @@ -3304,12 +3337,13 @@ export default { display: flex; align-items: center; width: 100%; - height: 56rpx; + height: 80rpx; background-color: #d0d1d2; .firstTableTitle{ width: 30%; box-sizing: border-box; padding-left: 24rpx; + font-size: 24rpx; } .borderRight{ width: 2rpx; @@ -3321,6 +3355,7 @@ export default { display: flex; flex-direction: column; align-items: center; + font-size: 24rpx; .dataIcon{ width: 60rpx; height: 60rpx; @@ -3338,6 +3373,7 @@ export default { width: 30%; box-sizing: border-box; padding: 16rpx 0 16rpx 16rpx; + font-size: 24rpx; } .refundPay{ font-family: PingFangSC, PingFang SC; @@ -3358,6 +3394,8 @@ export default { box-sizing: border-box; padding: 16rpx 16rpx 16rpx 0; text-align: right; + font-size: 26rpx; + font-family: DINAlternate-Bold, DINAlternate; } } .tableRowGray{ diff --git a/pages/settlementApproval/index.vue b/pages/settlementApproval/index.vue index a63cdcd..b1525ed 100644 --- a/pages/settlementApproval/index.vue +++ b/pages/settlementApproval/index.vue @@ -79,7 +79,7 @@ {{item.CURRENT_PERIOD || ''}} - {{item.SETTLEMENT_TYPE===1?'年度结算':item.SETTLEMENT_TYPE===2?'月度结算':''}}：{{item.SETTLEMENT_DATE || ''}} + {{item.SETTLEMENT_TYPE===1?'年度结算':item.SETTLEMENT_TYPE===2?'月度结算':''}}：{{item.SETTLEMENT_DATE || ''}} @@ -281,6 +281,7 @@ import moment from "moment"; }, // 自动跳转到指定月份的方法 async handleGetNewMonth(obj,time){ + console.log('time',time) uni.showLoading({ title: '正在加载...' }) @@ -479,7 +480,7 @@ import moment from "moment"; } } .timeBox{ - height: 32px; + height: 28px; margin-top: 12px; display: flex; align-items: center; @@ -487,7 +488,8 @@ import moment from "moment"; display: flex; align-items: center; .monthNumber{ - font-size: 56rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-size: 42rpx; font-weight: bold; } .monthUnit{ @@ -498,7 +500,7 @@ import moment from "moment"; color: #242729; } .year{ - font-family: PingFangSC, PingFang SC; + font-family: DINAlternate-Bold, DINAlternate; font-weight: 400; font-size: 28rpx; color: #786B6C; @@ -666,6 +668,9 @@ import moment from "moment"; border-radius: 14rpx; margin: 0 8px 0 5px; } + .month{ + font-family: DINAlternate-Bold, DINAlternate; + } } } .itemCenterRow{ @@ -674,6 +679,7 @@ import moment from "moment"; flex-direction: column; align-items: center; .value{ + font-family: DINAlternate-Bold, DINAlternate; font-size: 16px; font-weight: 600; color: #FF814FFF; diff --git a/pages/settlementApproval/monthDetail.vue b/pages/settlementApproval/monthDetail.vue index 59187ef..e5a2319 100644 --- a/pages/settlementApproval/monthDetail.vue +++ b/pages/settlementApproval/monthDetail.vue @@ -6,7 +6,7 @@ - + {{ detailObj.SERVERPART_NAME}} @@ -64,23 +64,22 @@ - + {{detailObj.Approvalstate===0?'待结算':detailObj.Approvalstate===1?'审核中':''}} - + - 月度结算详情 - - 结算时间：{{detailObj.STARTDATE || ''}} 至 {{detailObj.ENDDATE || ''}} + + 结算时间：{{detailObj.thisMonth || ''}} @@ -88,18 +87,18 @@ 数据类型 - + 结算数据 - + 精算数据 - + 本月营收 {{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:'-'}} @@ -107,7 +106,7 @@ {{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:'-'}} - + 累计营业额 {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:'-'}} @@ -115,7 +114,7 @@ {{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:'-'}} - + 移动支付 {{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:'-'}} @@ -124,7 +123,7 @@ ({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}) - + 移动冲正 {{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'-'}} @@ -132,7 +131,7 @@ {{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}} - + 现金交易 {{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:'-'}} @@ -143,7 +142,7 @@ - + 现金冲正 {{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'-'}} @@ -151,7 +150,7 @@ {{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}} - + 提成金额 {{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:'-'}} @@ -159,7 +158,7 @@ {{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}} - + 提成收入 {{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:'-'}} @@ -170,6 +169,80 @@ + + + 经营商户应交费用明细表 + + + 结算时间：{{detailObj.thisMonth || ''}} + + + + 数据类型 + + + + 应缴费用 + + + + + 已缴费用 + + + + + 合计 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT ||'-'}} + + {{ExpenseObj.PAID_AMOUNT ||'-'}} + + + + 水费 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT_1000 ||'-'}} + + {{ExpenseObj.PAID_AMOUNT_9010 ||'-'}} + + + + 电费 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT_2000 ||'-'}} + + {{ExpenseObj.PAID_AMOUNT_9020 ||'-'}} + + + + 物业费 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT_5000 ||'-'}} + + {{ExpenseObj.PAID_AMOUNT_9050 ||'-'}} + + + + 就餐费 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT_4000 ||'-'}} + + {{'-'}} + + + + 住宿费 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT_3000 ||'-'}} + + {{ExpenseObj.PAID_AMOUNT_9030 ||'-'}} + + + + + + 审批流程 @@ -186,8 +259,8 @@ {{item.STAFF_NAME.slice(1,3)}} - - + + @@ -272,6 +345,7 @@ export default { menu:{}, settlementModes:{},// 結算模式 projectObj:{},// 项目数据 暂时是取头像的 + ExpenseObj:{},// 水电费 } }, async onLoad(query){ @@ -300,7 +374,8 @@ export default { } // 拿到流程数据 await this.handleGetProgress() - + // 经营商户应交费用明细表 + await this.handleGetProjectExpenseList() }, onUnload(){ @@ -316,6 +391,7 @@ export default { this.staticMonth = '' this.nextPersonIndex = '' this.nextPersonLabel = '' + this.ExpenseObj = {} this.showLabel = '' this.approveDesc = '' this.progressList = [] @@ -326,6 +402,42 @@ export default { this.closeShowSelect() }, methods:{ + // 经营商户应交费用明细表 + async handleGetProjectExpenseList(){ + if(this.detailObj.Approvalstate===9){ + let req = { + BusinessProjectId: this.detailObj.BUSINESSPROJECT_ID, + ShopRoyaltyId: this.detailObj.ShopRoyalty_Id, + StartMonth: this.detailObj.thisMonth ? this.$moment(this.detailObj.thisMonth+ '/01').format('YYYYMM') : '', + EndMonth: this.detailObj.thisMonth ? this.$moment(this.detailObj.thisMonth+ '/01').format('YYYYMM') : '', + } + const data = await request.$webGet('EShangApiMain/Finance/GetProjectExpenseList',req) + console.log('handleGetProjectExpenseList',data) + this.ExpenseObj = data.Result_Data.List[0] + console.log('this.ExpenseObj',this.ExpenseObj) + }else{ + + let min = 999999999 + if (this.detailObj.SERVERPARTSHOP_ID) { + let shopList = this.detailObj.SERVERPARTSHOP_ID.split(',') + shopList.forEach((item) => { + if (Number(item) < min) { + min = Number(item) + } + }) + } + let req = { + serverpartshop_id: min===999999999?'':min, + statistics_month_start: this.detailObj.thisMonth ? this.$moment(this.detailObj.thisMonth+ '/01').startOf('months').format('YYYY/MM/DD') :'', + statistics_month_end: this.detailObj.thisMonth ? this.$moment(this.detailObj.thisMonth+ '/01').endOf('months').format('YYYY/MM/DD') :'', + } + console.log('redsadasdasdq', req) + const data = await request.$webGet('EShangApiMain/BusinessProject/GetShopExpenseSummary',req) + console.log('handleGetProjectExpenseList',data) + this.ExpenseObj = data.Result_Data.List[0] + console.log('this.ExpenseObj',this.ExpenseObj) + } + }, // 拿到结算模式的枚举 async handleGetSETTLEMENTMODES(){ const req = { FieldExplainField: 'SETTLEMENT_MODES' } @@ -693,7 +805,7 @@ export default { .moneyItem{ width: 50%; .redMoney{ - font-family: DINAlternate, DINAlternate; + font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; font-size: 40rpx; color: #9A3D1A; @@ -702,7 +814,7 @@ export default { font-style: normal; } .moneyValue{ - font-family: DINAlternate, DINAlternate; + font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; font-size: 34rpx; color: #160002; @@ -744,7 +856,7 @@ export default { width: calc(100% / 3); box-sizing: border-box; .value{ - font-family: DINAlternate, DINAlternate; + font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; font-size: 28rpx; color: #160002; @@ -853,9 +965,9 @@ export default { margin-right: 8rpx; } .endTime{ - font-family: PingFangSC, PingFang SC; + font-family: DINAlternate-Bold, DINAlternate; font-weight: 400; - font-size: 28rpx; + font-size: 24rpx; color: #786B6C; line-height: 40rpx; text-align: left; @@ -870,12 +982,13 @@ export default { display: flex; align-items: center; width: 100%; - height: 156rpx; + height: 80rpx; background-color: #F7F8FA; .firstTableTitle{ width: 30%; box-sizing: border-box; padding-left: 24rpx; + font-size: 24rpx; } .borderRight{ width: 2rpx; @@ -887,6 +1000,7 @@ export default { display: flex; flex-direction: column; align-items: center; + font-size: 24rpx; .dataIcon{ width: 60rpx; height: 60rpx; @@ -904,7 +1018,7 @@ export default { width: 30%; box-sizing: border-box; padding: 22rpx 0 22rpx 22rpx; - font-size: 28rpx; + font-size: 24rpx; } .refundPay{ font-family: PingFangSC, PingFang SC; @@ -925,7 +1039,118 @@ export default { box-sizing: border-box; padding: 22rpx 24rpx 22rpx 0; text-align: right; - font-size: 28rpx; + font-size: 26rpx; + font-family: DINAlternate-Bold, DINAlternate; + } + } + .tableRowGray{ + background-color: #F9F9FA!important; + } + } + } + } + + .payableFeesBox{ + width: 100%; + box-sizing: border-box; + padding: 32rpx 32rpx 32rpx; + background-color: #fff; + .payableFeesBoxTitle{ + font-family: PingFangSC, PingFang SC; + font-weight: 600; + font-size: 32rpx; + color: #212226; + line-height: 44rpx; + text-align: left; + font-style: normal; + } + .detailBoxTime{ + display: flex; + align-items: center; + margin-bottom: 20rpx; + margin-top: 8rpx; + .timeIcon{ + width: 28rpx; + height: 28rpx; + margin-right: 8rpx; + } + .endTime{ + font-family: DINAlternate-Bold, DINAlternate; + font-weight: 400; + font-size: 24rpx; + color: #786B6C; + line-height: 40rpx; + text-align: left; + font-style: normal; + } + } + .table{ + width: calc(100% - 4rpx); + border-radius: 12rpx; + border: 2rpx solid #EEEEF0; + .tableHeader{ + display: flex; + align-items: center; + width: 100%; + height: 80rpx; + background-color: #F7F8FA; + .firstTableTitle{ + width: 30%; + box-sizing: border-box; + padding-left: 24rpx; + font-size: 24rpx; + } + .borderRight{ + width: 2rpx; + height: 100%; + background-color: #F1F1F1; + } + .otherTableTitle{ + width: 35%; + display: flex; + flex-direction: column; + align-items: center; + font-size: 24rpx; + .dataIcon{ + width: 60rpx; + height: 60rpx; + margin-bottom: 8rpx; + } + } + } + .tableBody{ + .tableRow{ + width: 100%; + height: 100%; + display: flex; + align-items: center; + .labelRow{ + width: 30%; + box-sizing: border-box; + padding: 22rpx 0 22rpx 22rpx; + font-size: 24rpx; + } + .refundPay{ + font-family: PingFangSC, PingFang SC; + font-weight: 600; + font-size: 24rpx; + color: #9A3D1A; + line-height: 36rpx; + text-align: left; + font-style: normal; + } + .borderRight{ + width: 2rpx; + min-height: 80rpx; + background-color: #F1F1F1; + } + .valueRow{ + width: 35%; + box-sizing: border-box; + padding: 22rpx 24rpx 22rpx 0; + text-align: right; + font-size: 26rpx; + font-family: DINAlternate-Bold, DINAlternate; } } .tableRowGray{ @@ -1010,6 +1235,7 @@ export default { } } .itemRight{ + flex: 1; margin-left: 12rpx; .nameBox{ display: flex; diff --git a/pages/settlementApproval/monthList.vue b/pages/settlementApproval/monthList.vue index 6fa5ec7..da8f4bc 100644 --- a/pages/settlementApproval/monthList.vue +++ b/pages/settlementApproval/monthList.vue @@ -4,7 +4,7 @@ - + {{ item.StartDate || '' }} 至 {{item.EndDate || ''}} @@ -86,8 +86,9 @@ export default { SERVERPARTSHOP_ID: this.detailObj.SERVERPARTSHOP_ID || '', SERVERPART_ID: this.detailObj.SERVERPART_ID || '', SERVERPART_NAME: this.detailObj.SERVERPART_NAME || '', - Approvalstate: this.detailObj.Approvalstate + Approvalstate: obj.IsApplySuccess?9:this.detailObj.Approvalstate } + res.thisMonth = this.$moment(res.ENDDATE).format('YYYY/MM') let staticMonth = this.$moment(res.ENDDATE).endOf('months').format('YYYYMM') this.$util.toNextRoute('navigateTo', `/pages/settlementApproval/monthDetail?obj=${JSON.stringify(res)}&staticMonth=${staticMonth}&id=${id}`) } @@ -130,7 +131,7 @@ export default { margin-right: 12rpx; } .leftTime{ - font-family: PingFangSC, PingFang SC; + font-family: DINAlternate-Bold, DINAlternate; font-weight: 400; font-size: 28rpx; color: #242729; @@ -163,9 +164,9 @@ export default { align-items: center; justify-content: center; .bigMoney{ - font-family: DINAlternate, DINAlternate; + font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; - font-size: 32rpx; + font-size: 28rpx; color: #9A3D1A; line-height: 40rpx; text-align: left; @@ -204,9 +205,9 @@ export default { flex-direction: column; margin-bottom: 24rpx; .value{ - font-family: DINAlternate, DINAlternate; + font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; - font-size: 26rpx; + font-size: 24rpx; color: #483E3A; line-height: 32rpx; text-align: right; diff --git a/pages/settlementApproval/yearSettlement.vue b/pages/settlementApproval/yearSettlement.vue index 901c284..9fe2165 100644 --- a/pages/settlementApproval/yearSettlement.vue +++ b/pages/settlementApproval/yearSettlement.vue @@ -1,51 +1,79 @@