diff --git a/pages/settlementApproval/detail.vue b/pages/settlementApproval/detail.vue index 7a888dd..1b25765 100644 --- a/pages/settlementApproval/detail.vue +++ b/pages/settlementApproval/detail.vue @@ -3,34 +3,36 @@ {{ - detailObj.SETTLEMENT_TYPE===1?`${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || ''}年度结算表`: - `${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || ''}-${$moment(detailObj.ENDDATE).format('YYYYMM')}月度结算表` - }} + detailObj.SETTLEMENT_TYPE === 1 ? `${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || ''}年度结算表` : + `${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || + ''}-${$moment(detailObj.ENDDATE).format('YYYYMM')}月度结算表` + }} 商家名称: - {{topDetail.MERCHANTS_NAME || ''}} + {{ topDetail.MERCHANTS_NAME || '' }} 合同总金额: - {{topDetail.RENTFEE ? $util.getMoney(topDetail.RENTFEE / 10000)+'万元':''}} + {{ topDetail.RENTFEE ? $util.getMoney(topDetail.RENTFEE / 10000) + '万元' : '' }} 税率: - {{topDetail.TaxRate ? `${topDetail.TaxRate}%` : '-'}} + {{ topDetail.TaxRate ? `${topDetail.TaxRate}%` : '-' }} 期除税收入: - {{topDetail.MINTURNOVER ? `${$util.getMoney(topDetail.MINTURNOVER / 10000)}万元` : ''}} + {{ topDetail.MINTURNOVER ? `${$util.getMoney(topDetail.MINTURNOVER / 10000)}万元` : + '' }} @@ -38,109 +40,119 @@ 履约保证金: - {{topDetail.SECURITYDEPOSIT ? $util.getMoney(topDetail.SECURITYDEPOSIT / 10000)+'万元':''}} + {{ topDetail.SECURITYDEPOSIT ? $util.getMoney(topDetail.SECURITYDEPOSIT / + 10000) + '万元' : '' }} 提成比例: - {{topDetail.GUARANTEERATIO ? `${topDetail.GUARANTEERATIO}%` : '-'}} + {{ topDetail.GUARANTEERATIO ? `${topDetail.GUARANTEERATIO}%` : '-' }} 结算模式: - {{detailObj.SETTLEMENT_MODES?SETTLEMENT_MODESObj[detailObj.SETTLEMENT_MODES] : ''}} + {{ detailObj.SETTLEMENT_MODES ? SETTLEMENT_MODESObj[detailObj.SETTLEMENT_MODES] : + '' }} 项目期数: - {{detailObj.CURRENT_PERIOD || ''}} + {{ detailObj.CURRENT_PERIOD || '' }} - + 装修期: - {{topDetail.DecorateDesc || ''}} + {{ topDetail.DecorateDesc || '' }} 开始时间: - {{detailObj.STARTDATE || ''}} + {{ detailObj.STARTDATE || '' }} 结束日期: - {{detailObj.ENDDATE || ''}} + {{ detailObj.ENDDATE || '' }} - - + + 结算数据 期限: - {{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}} + {{ `${detailObj.STARTDATE}-${detailObj.ENDDATE}` }} 本月营收: - {{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:'-'}} + {{ actuaryData.CurMonthRevenue ? `${$util.getMoney(actuaryData.CurMonthRevenue)}` : '-' + }} 累计营业额: - {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:'-'}} + {{ actuaryData.REVENUEDAILY_AMOUNTTotal ? + `${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}` : '-' }} - - - - + + + + 移动支付: - {{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:'-'}} + {{ actuaryData.MOBILEPAY_AMOUNT ? `${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}` : + '-' }} 移动冲正: - {{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'-'}} + {{ actuaryData.MOBILEPAY_CORRECT ? `${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}` : + '-' }} 现金交易: - {{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:'-'}} + {{ actuaryData.CASHPAY_AMOUNT ? `${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}` : '-' + }} 现金冲正: - {{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'-'}} + {{ actuaryData.CASHPAY_CORRECT ? `${$util.getMoney(actuaryData.CASHPAY_CORRECT)}` : '-' + }} 提成金额: - {{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:'-'}} + {{ actuaryData.GUARANTEERATIOAMOUNT ? + `${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}` : '-' }} 提成收入: - {{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:'-'}} + {{ actuaryData.GUARANTEERATIOINCOME ? + `${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}` : '-' }} - - + + 结算数据 @@ -149,119 +161,147 @@ 期限: - {{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}} - {{detailObj.Approvalstate>0?'已结算':'待结算'}} + {{ `${detailObj.STARTDATE}-${detailObj.ENDDATE}` }} + + {{ detailObj.Approvalstate > 0 ? '已结算' : '待结算' }} 本月营收: - {{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:'-'}} - {{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:'-'}} + {{ actuaryData.CurMonthRevenue ? `${$util.getMoney(actuaryData.CurMonthRevenue)}` : + '-' }} + + + {{ monthNewCalibration.CurMonthRevenueTEXT ? monthNewCalibration.CurMonthRevenueTEXT : '-' }} 累计营业额: - {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:'-'}} - {{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:'-'}} + + {{ actuaryData.REVENUEDAILY_AMOUNTTotal ? `${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}` : '-' }} + + + {{ monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT ? monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT : '-' + }} + 移动支付: - {{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:'-'}} + + {{ actuaryData.MOBILEPAY_AMOUNT ? `${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}` : '-' }} - {{monthNewCalibration.MOBILEPAY_AMOUNTTEXT || ''}} - ({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}) + {{ monthNewCalibration.MOBILEPAY_AMOUNTTEXT || '' }} + ({{ + monthNewCalibration.MOBILEPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.MOBILEPAY_CORRECTTEXT + || '' }}) 移动冲正: - {{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'-'}} - {{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}} + + {{ actuaryData.MOBILEPAY_CORRECT ? `${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}` : '-' }} + {{ monthNewCalibration.MOBILEPAY_CORRECTTEXT || '' }} 现金交易: - {{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:'-'}} + {{ actuaryData.CASHPAY_AMOUNT ? `${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}` : '-' + }} + - {{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}} - ({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }}) + {{ monthNewCalibration.CASHPAY_AMOUNTTEXT || '' }} + ({{ monthNewCalibration.CASHPAY_CORRECT + > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }}) 现金冲正: - {{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'-'}} - {{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}} + {{ actuaryData.CASHPAY_CORRECT ? `${$util.getMoney(actuaryData.CASHPAY_CORRECT)}` : + '-' }} + + {{ monthNewCalibration.CASHPAY_CORRECTTEXT || '0' }} 提成金额: - {{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:'-'}} - {{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}} + + {{ actuaryData.GUARANTEERATIOAMOUNT ? `${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}` : '-' }} + {{ monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || '' }} 提成收入: - {{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:'-'}} - {{monthNewCalibration.GUARANTEERATIOINCOMETEXT || ''}} + + {{ actuaryData.GUARANTEERATIOINCOME ? `${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}` : '-' }} + {{ monthNewCalibration.GUARANTEERATIOINCOMETEXT || '' }} - + 结算数据 - - + + 期限: - {{item.PeriodDesc ||''}} + {{ item.PeriodDesc || '' }} 结算状态: - {{detailObj.Approvalstate>0?'已结算':'待结算'}} + {{ + detailObj.Approvalstate > 0 ? '已结算' : '待结算' }} 现金: - {{item.CashAmount?numeral($util.getMoney(item.CashAmount)).format('0,0.00'):'-'}} + {{ item.CashAmount ? numeral($util.getMoney(item.CashAmount)).format('0,0.00') : '-' + }} 微支付: - {{item.MobilePayAmount?numeral($util.getMoney(item.MobilePayAmount)).format('0,0.00'):'-'}} + {{ item.MobilePayAmount ? + numeral($util.getMoney(item.MobilePayAmount)).format('0,0.00') : '-' }} 营业额合计: - {{item.RevenueAmount?numeral($util.getMoney(item.RevenueAmount)).format('0,0.00'):'-'}} + {{ item.RevenueAmount ? numeral($util.getMoney(item.RevenueAmount)).format('0,0.00') : + '-' }} 驿达收款: - {{item.RoyaltyAmount?numeral($util.getMoney(item.RoyaltyAmount)).format('0,0.00'):'-'}} + {{ item.RoyaltyAmount ? numeral($util.getMoney(item.RoyaltyAmount)).format('0,0.00') : + '-' }} 营收费用合计: - {{item.ReceivableAmount?numeral($util.getMoney(item.ReceivableAmount)).format('0,0.00'):'-'}} + {{ item.ReceivableAmount ? + numeral($util.getMoney(item.ReceivableAmount)).format('0,0.00') : '-' }} 租金: - {{item.GuaranteeFee?numeral($util.getMoney(item.GuaranteeFee)).format('0,0.00'):'-'}} + {{ item.GuaranteeFee ? numeral($util.getMoney(item.GuaranteeFee)).format('0,0.00') : + '-' }} 退补款: - {{item.RefundSupplement?numeral($util.getMoney(item.RefundSupplement)).format('0,0.00'):'-'}} + {{ item.RefundSupplement ? + numeral($util.getMoney(item.RefundSupplement)).format('0,0.00') : '-' }} @@ -269,8 +309,9 @@ - - + + @@ -280,149 +321,214 @@ 精算数据 - + 期限: - {{item.PeriodDesc ||''}} - {{detailObj.Approvalstate>0?'已结算':'待结算'}} + {{ item.PeriodDesc || '' }} + + {{ detailObj.Approvalstate > 0 ? '已结算' : '待结算' }} 营业额合计: - {{item.RevenueAmount?numeral($util.getMoney(item.RevenueAmount)).format('0,0.00'):'-'}} + + {{ item.RevenueAmount ? numeral($util.getMoney(item.RevenueAmount)).format('0,0.00') : '-' }} - {{yearDataListObj.RevenueAmountTEXT?yearDataListObj.RevenueAmountTEXT:''}} - ({{yearDataListObj.CorrectAmount>0?'+':''}}{{yearDataListObj.CorrectAmountTEXT || ''}}) + {{ yearDataListObj.RevenueAmountTEXT ? yearDataListObj.RevenueAmountTEXT : '' }} + ({{ yearDataListObj.CorrectAmount > 0 ? + '+' : '' }}{{ yearDataListObj.CorrectAmountTEXT + || '' }}) 现金: - {{item.CashAmount?numeral($util.getMoney(item.CashAmount)).format('0,0.00'):'-'}} - {{yearDataListObj.CashAmount?numeral($util.getMoney(yearDataListObj.CashAmount)).format('0,0.00'):''}} + {{ item.CashAmount ? numeral($util.getMoney(item.CashAmount)).format('0,0.00') : + '-' }} + + + {{ yearDataListObj.CashAmount ? numeral($util.getMoney(yearDataListObj.CashAmount)).format('0,0.00') : + '' }} + 微支付: - {{item.MobilePayAmount?numeral($util.getMoney(item.MobilePayAmount)).format('0,0.00'):'-'}} - {{yearDataListObj.MobilePayAmount?numeral($util.getMoney(yearDataListObj.MobilePayAmount)).format('0,0.00'):''}} + + {{ item.MobilePayAmount ? numeral($util.getMoney(item.MobilePayAmount)).format('0,0.00') : '-' }} + + {{ yearDataListObj.MobilePayAmount ? + numeral($util.getMoney(yearDataListObj.MobilePayAmount)).format('0,0.00') : '' }} + 驿达收款: - {{item.RoyaltyAmount?numeral($util.getMoney(item.RoyaltyAmount)).format('0,0.00'):'-'}} - {{yearDataListObj.RoyaltyAmount?numeral($util.getMoney(yearDataListObj.RoyaltyAmount)).format('0,0.00'):''}} + + {{ item.RoyaltyAmount ? numeral($util.getMoney(item.RoyaltyAmount)).format('0,0.00') : '-' }} + + {{ yearDataListObj.RoyaltyAmount ? + numeral($util.getMoney(yearDataListObj.RoyaltyAmount)).format('0,0.00') : '' }} + 营收费用合计: - {{item.ReceivableAmount?numeral($util.getMoney(item.ReceivableAmount)).format('0,0.00'):'-'}} - {{yearDataListObj.ReceivableAmount?numeral($util.getMoney(yearDataListObj.ReceivableAmount)).format('0,0.00'):''}} + + {{ item.ReceivableAmount ? numeral($util.getMoney(item.ReceivableAmount)).format('0,0.00') : '-' }} + + + {{ yearDataListObj.ReceivableAmount ? + numeral($util.getMoney(yearDataListObj.ReceivableAmount)).format('0,0.00') : '' }} + 租金: - {{item.GuaranteeFee || item.GuaranteeFee===0?numeral($util.getMoney(item.GuaranteeFee)).format('0,0.00'):'-'}} - {{yearDataListObj.GuaranteeFee?numeral($util.getMoney(yearDataListObj.GuaranteeFee)).format('0,0.00'):''}} + {{ item.GuaranteeFee || + item.GuaranteeFee === 0 ? numeral($util.getMoney(item.GuaranteeFee)).format('0,0.00') : '-' }} + + {{ yearDataListObj.GuaranteeFee ? numeral($util.getMoney(yearDataListObj.GuaranteeFee)).format('0,0.00') + : '' }} + 物业费: - {{item.PropertyFee || item.PropertyFee===0?numeral($util.getMoney(item.PropertyFee)).format('0,0.00'):'-'}} - {{yearDataListObj.PropertyFee || yearDataListObj.PropertyFee===0?numeral($util.getMoney(yearDataListObj.PropertyFee)).format('0,0.00'):''}} + {{ item.PropertyFee || + item.PropertyFee === 0 ? numeral($util.getMoney(item.PropertyFee)).format('0,0.00') : '-' }} + {{ yearDataListObj.PropertyFee || + yearDataListObj.PropertyFee === 0 ? + numeral($util.getMoney(yearDataListObj.PropertyFee)).format('0,0.00') : '' }} + 房租: - {{item.HouseRent || item.HouseRent===0?numeral($util.getMoney(item.HouseRent)).format('0,0.00'):'-'}} - {{yearDataListObj.HouseRent || yearDataListObj.HouseRent===0?numeral($util.getMoney(yearDataListObj.HouseRent)).format('0,0.00'):''}} + {{ item.HouseRent || + item.HouseRent === 0 ? numeral($util.getMoney(item.HouseRent)).format('0,0.00') : '-' }} + {{ yearDataListObj.HouseRent || + yearDataListObj.HouseRent === 0 ? + numeral($util.getMoney(yearDataListObj.HouseRent)).format('0,0.00') : '' }} + 罚款: - {{item.BreachPenalty || item.BreachPenalty===0?numeral($util.getMoney(item.BreachPenalty)).format('0,0.00'):'-'}} - {{yearDataListObj.BreachPenalty || yearDataListObj.BreachPenalty===0?numeral($util.getMoney(yearDataListObj.BreachPenalty)).format('0,0.00'):''}} + {{ item.BreachPenalty || + item.BreachPenalty === 0 ? numeral($util.getMoney(item.BreachPenalty)).format('0,0.00') : '-' }} + {{ yearDataListObj.BreachPenalty || + yearDataListObj.BreachPenalty === 0 ? + numeral($util.getMoney(yearDataListObj.BreachPenalty)).format('0,0.00') : '' }} + 电费: - {{item.ElectricityCharge || item.ElectricityCharge===0?numeral($util.getMoney(item.ElectricityCharge)).format('0,0.00'):'-'}} - {{yearDataListObj.ElectricityCharge || yearDataListObj.ElectricityCharge===0?numeral($util.getMoney(yearDataListObj.ElectricityCharge)).format('0,0.00'):''}} + {{ item.ElectricityCharge || + item.ElectricityCharge === 0 ? numeral($util.getMoney(item.ElectricityCharge)).format('0,0.00') : '-' }} + + {{ yearDataListObj.ElectricityCharge || + yearDataListObj.ElectricityCharge === 0 ? + numeral($util.getMoney(yearDataListObj.ElectricityCharge)).format('0,0.00') : '' }} + 水费: - {{item.WaterCharge || item.WaterCharge===0?numeral($util.getMoney(item.WaterCharge)).format('0,0.00'):'-'}} - {{yearDataListObj.WaterCharge || yearDataListObj.WaterCharge===0?numeral($util.getMoney(yearDataListObj.WaterCharge)).format('0,0.00'):''}} + {{ item.WaterCharge || + item.WaterCharge === 0 ? numeral($util.getMoney(item.WaterCharge)).format('0,0.00') : '-' }} + {{ yearDataListObj.WaterCharge || + yearDataListObj.WaterCharge === 0 ? + numeral($util.getMoney(yearDataListObj.WaterCharge)).format('0,0.00') : '' }} + 其他: - {{item.OtherFee || item.OtherFee===0?numeral($util.getMoney(item.OtherFee)).format('0,0.00'):'-'}} - {{yearDataListObj.OtherFee || yearDataListObj.OtherFee===0?numeral($util.getMoney(yearDataListObj.OtherFee)).format('0,0.00'):''}} + {{ item.OtherFee || + item.OtherFee === 0 ? numeral($util.getMoney(item.OtherFee)).format('0,0.00') : '-' }} + {{ yearDataListObj.OtherFee || + yearDataListObj.OtherFee === 0 ? numeral($util.getMoney(yearDataListObj.OtherFee)).format('0,0.00') : '' + }} + 退补款: - {{item.RefundSupplement?numeral($util.getMoney(item.RefundSupplement)).format('0,0.00'):'-'}} - {{yearDataListObj.RefundSupplement?numeral($util.getMoney(yearDataListObj.RefundSupplement)).format('0,0.00'):''}} + + {{ item.RefundSupplement ? numeral($util.getMoney(item.RefundSupplement)).format('0,0.00') : '-' }} + + + {{ yearDataListObj.RefundSupplement ? + numeral($util.getMoney(yearDataListObj.RefundSupplement)).format('0,0.00') : '' }} + - - + + - + - + 期限: - {{subItem.PeriodDesc ||''}} + {{ subItem.PeriodDesc || '' }} 结算状态: - {{subItem.IsApplySuccess?'已结算':'待结算'}} + {{ + subItem.IsApplySuccess ? '已结算' : '待结算' }} 现金: - {{subItem.CashAmount?numeral($util.getMoney(subItem.CashAmount)).format('0,0.00'):''}} + {{ subItem.CashAmount ? numeral($util.getMoney(subItem.CashAmount)).format('0,0.00') + : '' }} 微支付: - {{subItem.MobilePayAmount?numeral($util.getMoney(subItem.MobilePayAmount)).format('0,0.00'):''}} + {{ subItem.MobilePayAmount ? + numeral($util.getMoney(subItem.MobilePayAmount)).format('0,0.00') : '' }} 营业额合计: - {{subItem.RevenueAmount?numeral($util.getMoney(subItem.RevenueAmount)).format('0,0.00'):''}} + {{ subItem.RevenueAmount ? + numeral($util.getMoney(subItem.RevenueAmount)).format('0,0.00') : '' }} 驿达收款: - {{subItem.RoyaltyAmount?numeral($util.getMoney(subItem.RoyaltyAmount)).format('0,0.00'):''}} + {{ subItem.RoyaltyAmount ? + numeral($util.getMoney(subItem.RoyaltyAmount)).format('0,0.00') : '' }} 营收费用合计: - {{subItem.ReceivableAmount?numeral($util.getMoney(subItem.ReceivableAmount)).format('0,0.00'):''}} + {{ subItem.ReceivableAmount ? + numeral($util.getMoney(subItem.ReceivableAmount)).format('0,0.00') : '' }} 租金: - {{subItem.GuaranteeFee?numeral($util.getMoney(subItem.GuaranteeFee)).format('0,0.00'):''}} + {{ subItem.GuaranteeFee ? + numeral($util.getMoney(subItem.GuaranteeFee)).format('0,0.00') : '' }} 退补款: - {{subItem.RefundSupplement?numeral($util.getMoney(subItem.RefundSupplement)).format('0,0.00'):''}} + {{ subItem.RefundSupplement ? + numeral($util.getMoney(subItem.RefundSupplement)).format('0,0.00') : '' }} @@ -430,67 +536,68 @@ - + - + - - - + + + 精算数据 - + 期限: - {{item.PeriodDesc ||''}} + {{ item.PeriodDesc || '' }} 结算状态: - {{detailObj.Approvalstate>0?'已结算':'待结算'}} + {{ + detailObj.Approvalstate > 0 ? '已结算' : '待结算' }} 现金: - {{item.CashAmountTEXT || ''}} + {{ item.CashAmountTEXT || '' }} 微支付: - {{item.MobilePayAmountTEXT || ''}} + {{ item.MobilePayAmountTEXT || '' }} 营业额合计: - {{item.RevenueAmountTEXT || ''}} + {{ item.RevenueAmountTEXT || '' }} 驿达收款: - {{item.RoyaltyAmountTEXT || ''}} + {{ item.RoyaltyAmountTEXT || '' }} 营收费用合计: - {{item.ReceivableAmountTEXT || ''}} + {{ item.ReceivableAmountTEXT || '' }} 租金: - {{item.GuaranteeFeeTEXT || ''}} + {{ item.GuaranteeFeeTEXT || '' }} 退补款: - {{item.RefundSupplementTEXT || ''}} + {{ item.RefundSupplementTEXT || '' }} @@ -498,59 +605,69 @@ - - + + - + - + 期限: - {{subItem.PeriodDesc ||''}} + {{ subItem.PeriodDesc || '' }} 结算状态: - {{subItem.IsApplySuccess?'已结算':'待结算'}} + {{ + subItem.IsApplySuccess ? '已结算' : '待结算' }} 现金: - {{subItem.CashAmount?numeral($util.getMoney(subItem.CashAmount)).format('0,0.00'):''}} + {{ subItem.CashAmount ? numeral($util.getMoney(subItem.CashAmount)).format('0,0.00') + : '' }} 微支付: - {{subItem.MobilePayAmount?numeral($util.getMoney(subItem.MobilePayAmount)).format('0,0.00'):''}} + {{ subItem.MobilePayAmount ? + numeral($util.getMoney(subItem.MobilePayAmount)).format('0,0.00') : '' }} 营业额合计: - {{subItem.RevenueAmount?numeral($util.getMoney(subItem.RevenueAmount)).format('0,0.00'):''}} + {{ subItem.RevenueAmount ? + numeral($util.getMoney(subItem.RevenueAmount)).format('0,0.00') : '' }} 驿达收款: - {{subItem.RoyaltyAmount?numeral($util.getMoney(subItem.RoyaltyAmount)).format('0,0.00'):''}} + {{ subItem.RoyaltyAmount ? + numeral($util.getMoney(subItem.RoyaltyAmount)).format('0,0.00') : '' }} 营收费用合计: - {{subItem.ReceivableAmount?numeral($util.getMoney(subItem.ReceivableAmount)).format('0,0.00'):''}} + {{ subItem.ReceivableAmount ? + numeral($util.getMoney(subItem.ReceivableAmount)).format('0,0.00') : '' }} 租金: - {{subItem.GuaranteeFee?numeral($util.getMoney(subItem.GuaranteeFee)).format('0,0.00'):''}} + {{ subItem.GuaranteeFee ? + numeral($util.getMoney(subItem.GuaranteeFee)).format('0,0.00') : '' }} 退补款: - {{subItem.RefundSupplement?numeral($util.getMoney(subItem.RefundSupplement)).format('0,0.00'):''}} + {{ subItem.RefundSupplement ? + numeral($util.getMoney(subItem.RefundSupplement)).format('0,0.00') : '' }} @@ -558,136 +675,150 @@ - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - + - + 发起申请 - + - + - 审核 + 审核 - + - + - 驳回 + 驳回 - - + + 审批流程 - + - + 申请人: - {{progressDetail.STAFF_NAME || ''}} + {{ progressDetail.STAFF_NAME || '' }} - {{progressDetail.BUSINESS_STARTDATE || ''}} + {{ progressDetail.BUSINESS_STARTDATE || '' }} - + 待审核: - {{progressDetail.APPOVED_NAME || ''}} + {{ progressDetail.APPOVED_NAME || '' }} - - + + - - {{`【${item.APPLYAPPROVE_NAME}】`}} + + {{ `【${item.APPLYAPPROVE_NAME}】` }} - {{`${item.APPLYAPPROVE_DATE}`}} + {{ `${item.APPLYAPPROVE_DATE}` }} - {{item.STAFF_NAME}}: - {{`${item.APPLYAPPROVE_INFO}`}} + {{ item.STAFF_NAME }}: + {{ `${item.APPLYAPPROVE_INFO}` }} - + - {{ showType===1?'审核':showType===2?'驳回':'' }} - + {{ showType === 1 ? '审核' : showType === 2 ? '驳回' : '' }} + + - + 下一环节审批人: - - {{nextPersonLabel?nextPersonLabel:'请选择'}} + + {{ nextPersonLabel ? nextPersonLabel : '请选择' }} - + 回退状态: - - {{showRejectText?showRejectText:'请选择'}} + + {{ showRejectText ? showRejectText : '请选择' }} 审核意见: - + - {{showType===1?'审核通过':showType===2?'驳回':''}} + {{ showType === 1 ? '审核通过' : showType === 2 ? '驳回' : '' + }} - + 发起申请 - + + @@ -698,47 +829,54 @@ 期限: - {{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}} + {{ `${detailObj.STARTDATE}-${detailObj.ENDDATE}` }} 累计营业额: - {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:''}} + {{ actuaryData.REVENUEDAILY_AMOUNTTotal ? + `${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}` : '' }} 移动支付: - {{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:''}} + {{ actuaryData.MOBILEPAY_AMOUNT ? `${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}` + : '' }} 移动冲正: - {{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'0'}} + {{ actuaryData.MOBILEPAY_CORRECT ? + `${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}` : '0' }} 现金交易: - {{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:''}} + {{ actuaryData.CASHPAY_AMOUNT ? `${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}` : '' + }} 现金冲正: - {{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'0'}} + {{ actuaryData.CASHPAY_CORRECT ? `${$util.getMoney(actuaryData.CASHPAY_CORRECT)}` : + '0' }} 提成金额: - {{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:''}} + {{ actuaryData.GUARANTEERATIOAMOUNT ? + `${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}` : '' }} 提成收入: - {{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:''}} + {{ actuaryData.GUARANTEERATIOINCOME ? + `${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}` : '' }} @@ -754,14 +892,15 @@ 期限: - {{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}} + {{ `${detailObj.STARTDATE}-${detailObj.ENDDATE}` }} 累计营业额: - {{newCalibration.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(newCalibration.REVENUEDAILY_AMOUNTTotal)}`:''}} + {{ newCalibration.REVENUEDAILY_AMOUNTTotal ? + `${$util.getMoney(newCalibration.REVENUEDAILY_AMOUNTTotal)}` : '' }} @@ -769,34 +908,46 @@ 移动支付: - {{newCalibration.MOBILEPAY_AMOUNT?`${$util.getMoney(newCalibration.MOBILEPAY_AMOUNT + (newCalibration.MOBILEPAY_CORRECT || 0))}` + `${newCalibration.MOBILEPAY_CORRECT?`(${newCalibration.MOBILEPAY_CORRECT>0?'+':''}${newCalibration.MOBILEPAY_CORRECT})`:''}` :''}} + {{ newCalibration.MOBILEPAY_AMOUNT ? `${$util.getMoney(newCalibration.MOBILEPAY_AMOUNT + + (newCalibration.MOBILEPAY_CORRECT || 0))}` + + `${newCalibration.MOBILEPAY_CORRECT ? `(${newCalibration.MOBILEPAY_CORRECT > 0 ? '+' : + ''}${newCalibration.MOBILEPAY_CORRECT})` : ''}` + : '' }} 移动冲正: - {{newCalibration.MOBILEPAY_CORRECT?`${$util.getMoney(newCalibration.MOBILEPAY_CORRECT)}`:'0'}} + {{ newCalibration.MOBILEPAY_CORRECT ? + `${$util.getMoney(newCalibration.MOBILEPAY_CORRECT)}` : '0' }} 现金交易: - {{newCalibration.CASHPAY_AMOUNT?`${$util.getMoney(newCalibration.CASHPAY_AMOUNT + (newCalibration.CASHPAY_CORRECT || 0))}` + `${newCalibration.CASHPAY_CORRECT?`(${newCalibration.CASHPAY_CORRECT>0?'+':''}${newCalibration.CASHPAY_CORRECT})`:'' }` :''}} + {{ newCalibration.CASHPAY_AMOUNT ? `${$util.getMoney(newCalibration.CASHPAY_AMOUNT + + (newCalibration.CASHPAY_CORRECT || 0))}` + + `${newCalibration.CASHPAY_CORRECT ? `(${newCalibration.CASHPAY_CORRECT > 0 ? '+' : + ''}${newCalibration.CASHPAY_CORRECT})` : '' + }` : '' }} 现金冲正: - {{newCalibration.CASHPAY_CORRECT?`${$util.getMoney(newCalibration.CASHPAY_CORRECT)}`:'0'}} + {{ newCalibration.CASHPAY_CORRECT ? + `${$util.getMoney(newCalibration.CASHPAY_CORRECT)}` : '0' }} 提成金额: - {{newCalibration.GUARANTEERATIOAMOUNT?`${$util.getMoney(newCalibration.GUARANTEERATIOAMOUNT)}`:''}} + {{ newCalibration.GUARANTEERATIOAMOUNT ? + `${$util.getMoney(newCalibration.GUARANTEERATIOAMOUNT)}` : '' }} 提成收入: - {{newCalibration.GUARANTEERATIOINCOME?`${$util.getMoney(newCalibration.GUARANTEERATIOINCOME)}`:''}} + {{ newCalibration.GUARANTEERATIOINCOME ? + `${$util.getMoney(newCalibration.GUARANTEERATIOINCOME)}` : '' }} @@ -805,13 +956,13 @@ - + 移动支付差额 - + 现金支付差额 @@ -825,26 +976,29 @@ - - + + - + + 请选择下一阶段审批人 - - {{nextPersonValue? showLabel:'--请选择--'}} + + {{ nextPersonValue ? showLabel : '--请选择--' }} 审核意见 - + @@ -861,40 +1015,40 @@ import request from '@/util/index.js' import UniPop from '@/components/uni-popup.vue' import Store from "../../store/store"; -import {mapGetters} from "vuex"; -import {wrapTreeNode} from "../../util/dateTime"; +import { mapGetters } from "vuex"; +import { wrapTreeNode } from "../../util/dateTime"; import numeral from "numeral"; export default { name: "detail", - components: {UniPop}, + components: { UniPop }, data() { return { - detailObj:{},// 传入的详情数据 - staticMonth:'',// 外面查询时间的结束时间 - SETTLEMENT_MODESObj:{ - 1000:"营收回款", + detailObj: {},// 传入的详情数据 + staticMonth: '',// 外面查询时间的结束时间 + SETTLEMENT_MODESObj: { + 1000: "营收回款", 2000: "资金返款", 3000: "营收分润", 4000: "组合分润", 9998: "阶段提成", 9999: "分段提成", },// 写死的枚举 - topDetail:{},// 顶部详情数据 - actuaryData:{},// 精算数据 - approveDesc:'已核对,拟同意!',// 审批意见 - nextPerson:[],// 下一环节审批人列表 - nextPersonIndex:'',// 下一环节审批人索引 - nextPersonLabel:'',// 下一环节审批人索引 - nextPersonValue:'',// 下一环节审批人的值 - showLabel:'',// 审核人的显示 + topDetail: {},// 顶部详情数据 + actuaryData: {},// 精算数据 + approveDesc: '已核对,拟同意!',// 审批意见 + nextPerson: [],// 下一环节审批人列表 + nextPersonIndex: '',// 下一环节审批人索引 + nextPersonLabel: '',// 下一环节审批人索引 + nextPersonValue: '',// 下一环节审批人的值 + showLabel: '',// 审核人的显示 progressList: [],// 流程的数据 - showPop:false,// 悬浮框 + showPop: false,// 悬浮框 showType: 0,// 1审核 2 驳回 - progressDetail:{},// 进度详情 - rejectDataList:[],// 驳回的列表 + progressDetail: {},// 进度详情 + rejectDataList: [],// 驳回的列表 rejectSelectIndex: '',// 驳回索引 rejectSelectValue: '',// 驳回的选择值 - showRejectText:'',// 驳回显示的文字 + showRejectText: '',// 驳回显示的文字 isPending: false,// 接口是否进行中 isShowBtn: false,// 判断是否显示按钮 isShowApplyFor: false,// 发起申请的悬浮框 @@ -905,44 +1059,44 @@ export default { lastMonthIsOver: false,// 判断上个月是否已经审结 LastSettlementMonth: '',// 最近审结的月份 isShowSelect: false,// 出现选人的悬浮框 - yearDataList:[],// 年度结算的悬浮框数据 + yearDataList: [],// 年度结算的悬浮框数据 isAllMonthSuccess: true,// 判断是不是全部的月份都已经审结了 - allYearMonthDataList:[],//用来处理没完成的结算月度数据 - yearDataListAfter:[],// 年度精算数据 - yearDataListObj:[],// 年度精算数据 list也就一条 + allYearMonthDataList: [],//用来处理没完成的结算月度数据 + yearDataListAfter: [],// 年度精算数据 + yearDataListObj: [],// 年度精算数据 list也就一条 isShowProgress: true,// 是否显示流程进度 isPush: false,// 是否是推送 - progressObjDetail:{},// 流程详情 - monthId:'', // 月份审批二次进入发起申请的时候带的唯一id - monthNewCalibration:{},// 月度精算过后 详情进入查看的值 - yearId:'',// 年度审批二次进入发起申请的时候带的id + progressObjDetail: {},// 流程详情 + monthId: '', // 月份审批二次进入发起申请的时候带的唯一id + monthNewCalibration: {},// 月度精算过后 详情进入查看的值 + yearId: '',// 年度审批二次进入发起申请的时候带的id } }, - async onLoad(query){ - console.log('query',query) + async onLoad(query) { + console.log('query', query) if (query.id) { this.isPush = true await this.handleGetPageDetail(query.id) - }else{ - if(query.obj){ + } else { + if (query.obj) { this.detailObj = JSON.parse(query.obj) } } - console.log('this.detailObj',this.detailObj) - if(query.staticMonth){ - this.staticMonth = this.$moment(query.staticMonth ).format('YYYYMM') - console.log('this.staticMonth',this.staticMonth) + console.log('this.detailObj', this.detailObj) + if (query.staticMonth) { + this.staticMonth = this.$moment(query.staticMonth).format('YYYYMM') + console.log('this.staticMonth', this.staticMonth) } // 拿到顶部数据 await this.handleGetDetailDifference() - if(this.detailObj.SETTLEMENT_TYPE===1){ + if (this.detailObj.SETTLEMENT_TYPE === 1) { // 如果是年度的 就去请求年度的结算数据 - await this.handleGetYearSettlement() + await this.handleGetYearSettlement() if (this.detailObj.Approvalstate > 0) { // 请求年度的精算数据 await this.handleGetYearSettlementRight() } - }else{ + } else { // 月度数据 // 拿到月度精算数据 await this.handleGetActuaryData() @@ -956,7 +1110,7 @@ export default { }, - onUnload(){ + onUnload() { // 因为返回不会卸载页面 但是详情返回列表下一次进来肯定全部重新判断的 所以只能这样 this.detailObj = {} @@ -980,29 +1134,29 @@ export default { this.closeShowSelect() }, computed: { - ...mapGetters({'users':'getUser'}), + ...mapGetters({ 'users': 'getUser' }), }, - methods:{ + methods: { numeral, - async handleGetDetail(){ + async handleGetDetail() { uni.showLoading({ title: '请求月度精算数据...' }) - const data = await request.$webGet('EShangApiMain/BusinessProcess/GetBUSINESSAPPROVALDetail',{BUSINESSAPPROVALId: this.detailObj.BUSINESSAPPROVAL_ID}) + const data = await request.$webGet('EShangApiMain/BusinessProcess/GetBUSINESSAPPROVALDetail', { BUSINESSAPPROVALId: this.detailObj.BUSINESSAPPROVAL_ID }) console.log('data', data) let id = data.Result_Data.BUSINESSPROCESS_ID - const res = await request.$webGet('EShangApiMain/BusinessProject/GetBIZPSPLITMONTHDetail',{BIZPSPLITMONTHId: id}) + const res = await request.$webGet('EShangApiMain/BusinessProject/GetBIZPSPLITMONTHDetail', { BIZPSPLITMONTHId: id }) let obj = res.Result_Data const req = { BusinessProjectId: this.detailObj.BUSINESSPROJECT_ID, - StatisticsMonth: this.staticMonth || (this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).format('YYYYMM') : ''), + StatisticsMonth: this.staticMonth || (this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE === 1 ? '' : '/01')).format('YYYYMM') : ''), ShopRoyaltyId: this.detailObj.SHOPROYALTY_ID, MobilePayCorrect: obj.MOBILEPAY_CORRECT || 0, CashPayCorrect: obj.CASHPAY_CORRECT || 0 } - const result = await request.$webGet('EShangApiMain/Finance/GetProjectPeriodIncome',req) - console.log('Incomeresult',result) + const result = await request.$webGet('EShangApiMain/Finance/GetProjectPeriodIncome', req) + console.log('Incomeresult', result) let bigObj = result.Result_Data.List[0] this.monthId = bigObj.bizpsplitMonthId this.monthNewCalibration = bigObj @@ -1022,7 +1176,7 @@ export default { this.isShowProgress = !this.isShowProgress }, // 请求年度的精算数据 - async handleGetYearSettlementRight(){ + async handleGetYearSettlementRight() { const req = { BUSINESSPROJECT_ID: this.detailObj.BUSINESSPROJECT_ID, SHOPROYALTY_ID: this.detailObj.SHOPROYALTY_ID @@ -1030,7 +1184,7 @@ export default { uni.showLoading({ title: '请求精算数据...' }) - const data = await request.$webGet('EShangApiMain/Finance/GetProjectPeriodAccount',req) + const data = await request.$webGet('EShangApiMain/Finance/GetProjectPeriodAccount', req) let res = data.Result_Data // 页面显示的结算数据 let resList = wrapTreeNode(res.ProjectPeriodList) @@ -1045,7 +1199,7 @@ export default { item.CashAmountTEXT = numeral(this.$util.getMoney(item.CashAmount)).format('0,0.00') item.MobilePayAmountTEXT = numeral(this.$util.getMoney(item.MobilePayAmount)).format('0,0.00') item.RevenueAmountTEXT = numeral(this.$util.getMoney(item.RevenueAmount)).format('0,0.00') - // numeral(this.$util.getMoney(item.RevenueAmount)).format('0,0.00') + (item.CorrectAmount ? ('(' + (item.CorrectAmount > 0 ? '+' : '') + item.CorrectAmount + ')') : '') + // numeral(this.$util.getMoney(item.RevenueAmount)).format('0,0.00') + (item.CorrectAmount ? ('(' + (item.CorrectAmount > 0 ? '+' : '') + item.CorrectAmount + ')') : '') item.CorrectAmountTEXT = numeral(this.$util.getMoney(item.CorrectAmount)).format('0,0.00') item.RoyaltyAmountTEXT = numeral(this.$util.getMoney(item.RoyaltyAmount)).format('0,0.00') item.ReceivableAmountTEXT = numeral(this.$util.getMoney(item.ReceivableAmount)).format('0,0.00') @@ -1054,13 +1208,13 @@ export default { item.children = null }) this.yearDataListObj = result[0] - }else{ + } else { this.yearDataListObj = {} } this.yearDataListAfter = result this.yearId = result[0].RevenueConfirmId - console.log('this.yearDataListAfter',this.yearDataListAfter) - console.log('this.yearId',this.yearId) + console.log('this.yearDataListAfter', this.yearDataListAfter) + console.log('this.yearId', this.yearId) uni.hideLoading() }, // 推送拿到进入页面的初始参数 @@ -1072,11 +1226,11 @@ export default { BusinessApprovalId: id, UserId: this.users.UserId } - console.log('req',req) - const data = await request.$webGet('EShangApiMain/BusinessProject/GetProjectAccountDetail',req) - console.log('data',data) + console.log('req', req) + const data = await request.$webGet('EShangApiMain/BusinessProject/GetProjectAccountDetail', req) + console.log('data', data) let res = data.Result_Data - console.log('res',res) + console.log('res', res) let obj = { ...res, Approvalstate: res.SETTLEMENT_STATE === 0 ? 0 : res.SETTLEMENT_STATE === 1 ? 9 : res.SETTLEMENT_STATE === 2 ? 1 : '', @@ -1085,11 +1239,11 @@ export default { } this.detailObj = obj this.staticMonth = this.$moment(obj.endTime).format('YYYYMM') - console.log('this.detailObj',this.detailObj) + console.log('this.detailObj', this.detailObj) uni.hideLoading() }, // 拿到年度结算数据 - async handleGetYearSettlement(){ + async handleGetYearSettlement() { const req = { BUSINESSPROJECT_ID: this.detailObj.BUSINESSPROJECT_ID, SHOPROYALTY_ID: this.detailObj.SHOPROYALTY_ID @@ -1097,64 +1251,64 @@ export default { uni.showLoading({ title: '请求结算数据...' }) - const data = await request.$webGet('EShangApiMain/Finance/GetReconciliation',req) + const data = await request.$webGet('EShangApiMain/Finance/GetReconciliation', req) let res = data.Result_Data.List[0] - console.log('res',res) + console.log('res', res) // 页面显示的结算数据 let resList = wrapTreeNode(res.ProjectPeriodList.children) - if(resList && resList.length>0){ - resList.forEach(item=>{ + if (resList && resList.length > 0) { + resList.forEach(item => { item.level = 1 - if(item.children && item.children.length>0){ + if (item.children && item.children.length > 0) { item.showChildren = false - item.children.forEach(subItem=>{ + item.children.forEach(subItem => { subItem.level = 2 }) } }) } this.yearDataList = resList - console.log('this',this.yearDataList) + console.log('this', this.yearDataList) // 判断是否已经完成全部月度结算 let other = res.ProjectPeriodList.node let isContinue = true - if(!other.AllowApply){ + if (!other.AllowApply) { isContinue = false } this.isAllMonthSuccess = isContinue let list = wrapTreeNode([res.ProjectPeriodList.children[0]]) this.allYearMonthDataList = list - console.log('list',list) + console.log('list', list) uni.hideLoading() }, // 显示子级 - handleShowChildren(obj){ + handleShowChildren(obj) { let list = JSON.parse(JSON.stringify(this.yearDataList)) - list.forEach(item=>{ - if(item.ShopRoyalty_Id === obj.ShopRoyalty_Id && item.PeriodIndex === obj.PeriodIndex){ + list.forEach(item => { + if (item.ShopRoyalty_Id === obj.ShopRoyalty_Id && item.PeriodIndex === obj.PeriodIndex) { item.showChildren = !item.showChildren } }) this.yearDataList = list }, // 完成全部的月度结算 - async handleSuccessAllMonth(list){ + async handleSuccessAllMonth(list) { uni.showLoading({ title: '正在自动月度结算...' }) let ShopRoyaltyIdStr = '' let minStartTime = '' let maxEndTime = '' - console.log('list',list) - if(list && list.length>0){ + console.log('list', list) + if (list && list.length > 0) { // 拿到需要结算的月份 和 拆分数据 - list.forEach((item,index)=>{ + list.forEach((item, index) => { if (index === 0) { minStartTime = this.$moment(item.StartDate).format('YYYY-MM-DD') maxEndTime = this.$moment(item.EndDate).format('YYYY-MM-DD') - }else{ + } else { if (new Date(minStartTime).getTime() > new Date(this.$moment(item.StartDate).format('YYYY-MM-DD')).getTime()) { minStartTime = this.$moment(item.StartDate).format('YYYY-MM-DD') } @@ -1176,53 +1330,53 @@ export default { StartMonth: minStartTime ? this.$moment(minStartTime).format('YYYYMM') : '', EndMonth: maxEndTime ? this.$moment(maxEndTime).format('YYYYMM') : '', } - console.log('monthReq',monthReq) + console.log('monthReq', monthReq) - const monthData = await request.$webGet('EShangApiMain/Finance/ApprovePeriodAccount',monthReq) + const monthData = await request.$webGet('EShangApiMain/Finance/ApprovePeriodAccount', monthReq) uni.hideLoading() - console.log('monthData',monthData) + console.log('monthData', monthData) if (monthData.Result_Code === 100) { uni.showToast({ title: monthData.Result_Desc, - icon:'success', + icon: 'success', duration: 1000 }); // 重新计算一遍那些月份是否已经结算了 await this.handleGetYearSettlement() // 自动等于点击一遍发起申请 this.handleShowApplyForPop() - }else{ + } else { uni.showToast({ title: monthData.Result_Desc, - icon:'error', + icon: 'error', duration: 1000 }); } } }, // 选择审批人 - handleChangePerson(e){ - console.log('e',e) - console.log('this.nextPerson',this.nextPerson) + handleChangePerson(e) { + console.log('e', e) + console.log('this.nextPerson', this.nextPerson) this.nextPersonIndex = Number(e.target.value) let value = this.nextPerson[this.nextPersonIndex].value this.nextPersonValue = value this.showLabel = value.split('-')[0] - console.log('nextPersonValue',this.nextPersonValue) + console.log('nextPersonValue', this.nextPersonValue) }, // 发起申请 - async handleCreate(){ - if(!this.nextPersonValue){ + async handleCreate() { + if (!this.nextPersonValue) { uni.showToast({ - icon:'error', + icon: 'error', duration: 2000, title: '请选择审批人', }); return } - if(!this.approveDesc){ + if (!this.approveDesc) { uni.showToast({ - icon:'error', + icon: 'error', duration: 2000, title: '请输入审核意见', }); @@ -1230,12 +1384,12 @@ export default { } - console.log('this.detailObj',this.detailObj) - console.log('this.newCalibration',this.newCalibration) - console.log('users',this.users) + console.log('this.detailObj', this.detailObj) + console.log('this.newCalibration', this.newCalibration) + console.log('users', this.users) // 判断是年度结算还是月度结算 let _this = this - if(this.detailObj.SETTLEMENT_TYPE===1){ + if (this.detailObj.SETTLEMENT_TYPE === 1) { // // 年度 // const req = { // BusinessapprovalModel:{ @@ -1261,22 +1415,22 @@ export default { // } // // // const data = await request.$webPost('EShangApiMain/Finance/ApplyAccountProinst', req) - }else{ + } else { // 月度 - console.log('this.nextPersonValue',this.nextPersonValue) - let [APPOVED_NAME,APPOVED_IDS] = this.nextPersonValue.split('-') - console.log('APPOVED_IDS',APPOVED_IDS) - console.log('APPOVED_NAME',APPOVED_NAME) + console.log('this.nextPersonValue', this.nextPersonValue) + let [APPOVED_NAME, APPOVED_IDS] = this.nextPersonValue.split('-') + console.log('APPOVED_IDS', APPOVED_IDS) + console.log('APPOVED_NAME', APPOVED_NAME) uni.showLoading({ title: '正在发起申请...' }) const req = { - BusinessapprovalModel:{ - OPERATION_TYPE:'12', + BusinessapprovalModel: { + OPERATION_TYPE: '12', BUSINESSAPPROVAL_ID: this.detailObj.BUSINESSAPPROVAL_ID || '', - BUSINESSPROCESS_NAME:`${this.detailObj.BUSINESSPROJECT_NAME}【${this.detailObj.startTime}-${this.detailObj.endTime}】月度结算`, + BUSINESSPROCESS_NAME: `${this.detailObj.BUSINESSPROJECT_NAME}【${this.detailObj.startTime}-${this.detailObj.endTime}】月度结算`, PROINST_ID: this.detailObj.BUSINESSPROJECT_ID, SERVERPART_ID: this.detailObj.SERVERPART_ID, SERVERPART_NAME: this.detailObj.SERVERPART_NAME, @@ -1284,16 +1438,16 @@ export default { STAFF_NAME: this.users.UserName, BUSINESS_STARTDATE: this.$moment().format('YYYY-MM-DD HH:mm:ss'), BUSINESSAPPROVAL_STATE: 1000, - BUSINESSAPPROVAL_DESC:this.approveDesc, - SERVERPART_IDS: this.detailObj.SERVERPART_ID, + BUSINESSAPPROVAL_DESC: this.approveDesc, + SERVERPART_IDS: this.detailObj.SERVERPART_ID, MERCHANTS_ID: this.detailObj.MERCHANTS_ID, MERCHANTS_NAME: this.detailObj.MERCHANTS_NAME, SERVERPARTSHOP_ID: this.detailObj.SERVERPARTSHOP_ID, SERVERPARTSHOP_NAME: this.detailObj.SERVERPARTSHOP_NAME, APPOVED_IDS: APPOVED_IDS, - APPOVED_NAME:APPOVED_NAME, + APPOVED_NAME: APPOVED_NAME, }, - bizpsplitMonthModel:{ + bizpsplitMonthModel: { ...this.newCalibration, SHOPROYALTY_ID: this.detailObj.SHOPROYALTY_ID, SERVERPARTSHOP_ID: this.detailObj.SERVERPARTSHOP_ID, @@ -1317,38 +1471,38 @@ export default { BIZPSPLITMONTH_ID: this.monthId, } } - console.log('req',req) + console.log('req', req) // return const data = await request.$webPost('EShangApiMain/Finance/ApplyMonthAccountProinst', req) if (data.Result_Code === 100) { if (this.isPush) { uni.showToast({ - icon:'success', + icon: 'success', duration: 2000, title: data.Result_Desc, }); - setTimeout(()=>{ + setTimeout(() => { uni.redirectTo({ url: '/pages/settlementApproval/index' }); - },2000) - }else{ + }, 2000) + } else { uni.showToast({ - icon:'success', + icon: 'success', duration: 2000, title: data.Result_Desc, }); - uni.setStorageSync('reolad','true') - setTimeout(()=>{ + uni.setStorageSync('reolad', 'true') + setTimeout(() => { uni.navigateBack({ delta: 1 }); - },2000) + }, 2000) } - }else{ + } else { uni.showToast({ - icon:'error', + icon: 'error', duration: 2000, title: data.Result_Desc, }); @@ -1357,12 +1511,12 @@ export default { } }, // 重新校准 - async handleRecalibrate(){ - console.log('this.MobilePayCorrect',this.MobilePayCorrect) - console.log('this.CashPayCorrect',this.CashPayCorrect) + async handleRecalibrate() { + console.log('this.MobilePayCorrect', this.MobilePayCorrect) + console.log('this.CashPayCorrect', this.CashPayCorrect) const req = { BusinessProjectId: this.detailObj.BUSINESSPROJECT_ID, - StatisticsMonth: this.staticMonth || (this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).format('YYYYMM') : ''), + StatisticsMonth: this.staticMonth || (this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE === 1 ? '' : '/01')).format('YYYYMM') : ''), ShopRoyaltyId: this.detailObj.SHOPROYALTY_ID, MobilePayCorrect: this.MobilePayCorrect || 0, CashPayCorrect: this.CashPayCorrect || 0, @@ -1371,24 +1525,24 @@ export default { title: '请求精算数据...' }) const data = await request.$webGet('EShangApiMain/Finance/GetProjectPeriodIncome', req) - console.log('data',data) + console.log('data', data) let res = data.Result_Data.List[0] this.newCalibration = res this.afterCalibration = true - console.log('res',res) + console.log('res', res) uni.hideLoading() }, - openShowSelect(){ + openShowSelect() { this.isShowSelect = true }, // 关闭选人的悬浮框 - closeShowSelect(){ + closeShowSelect() { this.isShowSelect = false }, // 显示发起申请的悬浮框 - async handleShowApplyForPop(){ + async handleShowApplyForPop() { uni.showToast({ - icon:'none', + icon: 'none', duration: 2000, title: '请到电脑端发起结算!', }); @@ -1396,19 +1550,19 @@ export default { let _this = this - if(this.detailObj.SETTLEMENT_TYPE===2){ + if (this.detailObj.SETTLEMENT_TYPE === 2) { // 月度 if (this.lastMonthIsOver) { this.isShowApplyFor = true - }else{ + } else { uni.showModal({ title: '系统检测', content: `${this.detailObj.SERVERPART_NAME}-${this.detailObj.SERVERPARTSHOP_NAME},项目期数内存在未审批月度结算!点击确定自动为您调整到${this.LastSettlementMonth}月进行审批?`, success: function (res) { if (res.confirm) { - uni.setStorageSync('handleGetNewMonth','true') - uni.setStorageSync('handleGetNewMonthObj',_this.detailObj) - uni.setStorageSync('handleGetNewMonthTime',_this.LastSettlementMonth + '/01') + uni.setStorageSync('handleGetNewMonth', 'true') + uni.setStorageSync('handleGetNewMonthObj', _this.detailObj) + uni.setStorageSync('handleGetNewMonthTime', _this.LastSettlementMonth + '/01') uni.navigateBack({ delta: 1 }); @@ -1420,14 +1574,14 @@ export default { } }); } - }else{ + } else { // 年度 - if(this.isAllMonthSuccess){ + if (this.isAllMonthSuccess) { // 可以进行年度发起申请 就跳转新页面 this.handleGoYearSettlementPage() - }else{ + } else { uni.showModal({ - content:'请先完成全部月度结算! 点击确认将自动进行结算!', + content: '请先完成全部月度结算! 点击确认将自动进行结算!', success: async function (res) { if (res.confirm) { _this.handleSuccessAllMonth(_this.yearDataList) @@ -1438,47 +1592,47 @@ export default { } }, // 跳转去年度结算页面 - handleGoYearSettlementPage(){ + handleGoYearSettlementPage() { this.$util.toNextRoute('navigateTo', `/pages/settlementApproval/yearSettlement?obj=${JSON.stringify(this.detailObj)}&yearId=${this.yearId}`) }, // 关闭发起申请的悬浮框 - closeApplyFor(){ + closeApplyFor() { this.isShowApplyFor = false }, // 获得顶部详情和差异数据 - async handleGetDetailDifference(){ + async handleGetDetailDifference() { const req = { - StartDate: this.detailObj.STARTDATE?this.$moment(this.detailObj.STARTDATE).format('YYYY-MM-DD'):'', - EndDate: this.detailObj.ENDDATE?this.$moment(this.detailObj.ENDDATE).format('YYYY-MM-DD'):'', + StartDate: this.detailObj.STARTDATE ? this.$moment(this.detailObj.STARTDATE).format('YYYY-MM-DD') : '', + EndDate: this.detailObj.ENDDATE ? this.$moment(this.detailObj.ENDDATE).format('YYYY-MM-DD') : '', SHOPROYALTY_ID: this.detailObj.SHOPROYALTY_ID || '', BUSINESSPROJECT_ID: this.detailObj.BUSINESSPROJECT_ID || '', ACCOUNT_TYPE: 1000, SERVERPARTSHOP_ID: this.detailObj.SERVERPARTSHOP_ID, DataSourceType: 2, SERVERPART_ID: this.detailObj.SERVERPART_ID, - STATISTICS_MONTH: this.staticMonth || (this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE +(this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).format('YYYYMM') : '') + STATISTICS_MONTH: this.staticMonth || (this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE === 1 ? '' : '/01')).format('YYYYMM') : '') } - console.log('this.staticMonth',this.staticMonth) - console.log('req',req) + console.log('this.staticMonth', this.staticMonth) + console.log('req', req) uni.showLoading({ title: '请求详情数据...' }) - const data = await request.$webGet('EShangApiMain/Revenue/GetRevenueReportByBIZPSPLITMONTH',req) - console.log('data',data) + const data = await request.$webGet('EShangApiMain/Revenue/GetRevenueReportByBIZPSPLITMONTH', req) + console.log('data', data) let res = data.Result_Data.List - if(res && res.length>0){ + if (res && res.length > 0) { let detailObj = res[0] this.topDetail = detailObj.RevenueRecognition - console.log('this.topDetail',this.topDetail) + console.log('this.topDetail', this.topDetail) } uni.hideLoading() }, // 获取精算数据 - async handleGetActuaryData(){ + async handleGetActuaryData() { const req = { BusinessProjectId: this.detailObj.BUSINESSPROJECT_ID, - StatisticsMonth: this.staticMonth || (this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).format('YYYYMM') : ''), + StatisticsMonth: this.staticMonth || (this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE === 1 ? '' : '/01')).format('YYYYMM') : ''), ShopRoyaltyId: this.detailObj.SHOPROYALTY_ID, } uni.showLoading({ @@ -1486,23 +1640,23 @@ export default { }) const data = await request.$webGet('EShangApiMain/Finance/GetProjectPeriodIncome', req) let res = data.Result_Data.List[0] - console.log('res3232',res) + console.log('res3232', res) this.actuaryData = res - if(res.AllowSettlement===1){ + if (res.AllowSettlement === 1) { this.lastMonthIsOver = true - }else if(res.AllowSettlement===2){ + } else if (res.AllowSettlement === 2) { this.lastMonthIsOver = false this.LastSettlementMonth = `${res.LastSettlementMonth}审结中月度结算正在审批中,请审结后再发起${req.StatisticsMonth}月度结算` - }else{ + } else { this.lastMonthIsOver = false - if(res.LastSettlementState===0){ + if (res.LastSettlementState === 0) { // this.LastSettlementMonth =`请先进行${res.LastSettlementMonth}月度结算` this.LastSettlementMonth = res.LastSettlementMonth - }else if(res.LastSettlementState===1){ + } else if (res.LastSettlementState === 1) { // this.LastSettlementMonth =`请先进行${res.LastSettlementMonth}月度结算` this.LastSettlementMonth = res.LastSettlementMonth - }else if(res.LastSettlementState===2){ + } else if (res.LastSettlementState === 2) { // this.LastSettlementMonth =`请先进行${res.LastSettlementMonth}月度结算正在审批中,请审结后再发起下一个月度结算` this.LastSettlementMonth = res.LastSettlementMonth } @@ -1510,23 +1664,23 @@ export default { uni.hideLoading() }, // 下一环节审批人 - changeNextPerson(e){ - console.log('e',e) + changeNextPerson(e) { + console.log('e', e) let value = Number(e.target.value) this.nextPersonIndex = value this.nextPersonValue = this.nextPerson[value].value this.nextPersonLabel = this.nextPerson[value].label }, // 驳回的选择 - changeReject(e){ - console.log('e',e) - console.log('this.rejectDataList',this.rejectDataList) + changeReject(e) { + console.log('e', e) + console.log('this.rejectDataList', this.rejectDataList) let res = JSON.parse(this.rejectDataList[Number(e.target.value)].value) - console.log('res',res) + console.log('res', res) this.showRejectText = res.APPROVALROUTE_NAME this.rejectSelectValue = res }, - closePop(){ + closePop() { this.showPop = false this.showType = 0 this.approveDesc = '' @@ -1535,44 +1689,44 @@ export default { this.nextPersonValue = '' }, // 1审核 2驳回 - handleShowPop(type){ - if(!this.isShowBtn){ + handleShowPop(type) { + if (!this.isShowBtn) { uni.showToast({ title: '无审批权限!', - icon:'error', + icon: 'error', duration: 1000 }); return } this.showPop = true this.showType = type - if(type===1){ + if (type === 1) { this.approveDesc = '已核对,拟同意!' - }else{ + } else { this.approveDesc = '' } }, // 1审核 2驳回 - async handleExamine(type){ - if(this.isPending){ + async handleExamine(type) { + if (this.isPending) { return } this.isPending = true let req = {} let data = {} - if(type===1){ - if(!this.approveDesc ){ + if (type === 1) { + if (!this.approveDesc) { uni.showToast({ title: '请输入审核意见', - icon:'error', + icon: 'error', duration: 1000 }); return } - if(!this.nextPersonValue && this.progressObjDetail.NEXT_STATE!==9000){ + if (!this.nextPersonValue && this.progressObjDetail.NEXT_STATE !== 9000) { uni.showToast({ title: '请选择下一审批人', - icon:'error', + icon: 'error', duration: 1000 }); return @@ -1580,34 +1734,34 @@ export default { uni.showLoading({ title: '发起申请...' }) - let [APPOVED_NAME,APPOVED_IDS] = this.nextPersonValue.split('-') + let [APPOVED_NAME, APPOVED_IDS] = this.nextPersonValue.split('-') req = { businessApprovalID: this.detailObj.BUSINESSAPPROVAL_ID, curProinstState: this.progressDetail.BUSINESSAPPROVAL_STATE, - approveedInfo: this.approveDesc , + approveedInfo: this.approveDesc, approveedStaffId: Store.state.userData.UserId, approveedStaffName: Store.state.userData.UserName, nextId: APPOVED_IDS } if (this.detailObj.SETTLEMENT_TYPE === 2) { data = await request.$webGet('EShangApiMain/Finance/ApproveMonthAccountProinst', req) - }else{ + } else { data = await request.$webGet('EShangApiMain/Finance/ApproveAccountProinst', req) } - console.log('data',data) - }else if(type===2){ - if(!this.rejectSelectValue){ + console.log('data', data) + } else if (type === 2) { + if (!this.rejectSelectValue) { uni.showToast({ title: '请选择回退状态', - icon:'error', + icon: 'error', duration: 1000 }); return } - if(!this.approveDesc){ + if (!this.approveDesc) { uni.showToast({ title: '请输入审核意见', - icon:'error', + icon: 'error', duration: 1000 }); return @@ -1624,49 +1778,49 @@ export default { } if (this.detailObj.SETTLEMENT_TYPE === 2) { data = await request.$webGet('EShangApiMain/Finance/RejectMonthAccountProinst', req) - }else{ + } else { data = await request.$webGet('EShangApiMain/Finance/RejectAccountProinst', req) } - console.log('data',data) + console.log('data', data) } uni.hideLoading() - if(data.Result_Code===100){ + if (data.Result_Code === 100) { uni.showToast({ title: data.Result_Desc, - icon:'none', + icon: 'none', duration: 2000 }); if (this.isPush) { - setTimeout(()=>{ - uni.setStorageSync('reolad','true') + setTimeout(() => { + uni.setStorageSync('reolad', 'true') uni.redirectTo({ url: '/pages/settlementApproval/index' }); - },2000) - }else{ - setTimeout(()=>{ - uni.setStorageSync('reolad','true') + }, 2000) + } else { + setTimeout(() => { + uni.setStorageSync('reolad', 'true') uni.navigateBack({ delta: 1 }); - },2000) + }, 2000) } - }else{ + } else { uni.showToast({ title: data.Result_Desc, - icon:'error', + icon: 'error', duration: 2000 }); } this.isPending = false }, // 流程 下一环节 等数据 - async handleGetProgress(){ - if(!this.detailObj.BUSINESSAPPROVAL_ID){ + async handleGetProgress() { + if (!this.detailObj.BUSINESSAPPROVAL_ID) { const req = { - OperationType: this.detailObj.SETTLEMENT_TYPE===1?'11':'12', + OperationType: this.detailObj.SETTLEMENT_TYPE === 1 ? '11' : '12', CurState: 1000, IsValid: 1, ShowApprovalUser: true, @@ -1674,11 +1828,40 @@ export default { ShopIds: this.detailObj.SERVERPARTSHOP_ID || '' } const data = await request.$webGet('EShangApiMain/BusinessProcess/GetAPPROVALROUTEDetail', req) - console.log('handleGetProgress',data) + console.log('handleGetProgress', data) let res = data.Result_Data - if(res.UserList && res.UserList.length>0){ + if (res.UserList && res.UserList.length > 0) { let list = [] - res.UserList.forEach(item=>{ + + console.log('this.detailObjthis.detailObj', this.detailObj); + let userList = JSON.parse(JSON.stringify(res.UserList)) + + // 剔除 结算时间在2025年4月1日 之后的数据 不给孙青 如果提前撤场时间还在 4月1号之前的话 那还是给孙青 + // 先判断是不是撤场项目 如果是 那就看时间 如果4月1号之前的 就不排除孙青 如果4月1号之后 就排除孙青 + if (this.detailObj.CLOSED_DATE) { + if (new Date(this.detailObj.CLOSED_DATE).getTime() > new Date('2025-04-01 00:00:00').getTime()) { + userList = userList.filter((item) => item.value !== 827); + } + } else { + if (this.detailObj.ENDDATE && new Date(this.detailObj.ENDDATE).getTime() > new Date('2025-04-01 00:00:00').getTime()) { + userList = userList.filter((item) => item.value !== 827); + } + } + + // 剔除 结算时间在2025年4月1日 之前的数据 不给陶杰 + // 这里也同理 如果 撤场时间在4月1号之前 那么就要排除陶杰 + if (this.detailObj.CLOSED_DATE) { + if (new Date(this.detailObj.CLOSED_DATE).getTime() <= new Date('2025-04-01 00:00:00').getTime()) { + userList = userList.filter((item) => item.value !== 1802); + } + } else { + if (this.detailObj.ENDDATE && new Date(this.detailObj.ENDDATE).getTime() < new Date('2025-04-01 00:00:00').getTime()) { + userList = userList.filter((item) => item.value !== 1802); + } + } + + + userList.forEach(item => { list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` }) }) this.nextPerson = list @@ -1697,9 +1880,9 @@ export default { }) const data = await request.$webGet('EShangApiMain/BusinessProcess/GetBUSINESSAPPROVALDetail', req) let res = data.Result_Data - console.log('res',res) + console.log('res', res) const secondReq = { - OperationType: this.detailObj.SETTLEMENT_TYPE===1?'11':'12', + OperationType: this.detailObj.SETTLEMENT_TYPE === 1 ? '11' : '12', CurState: res.BUSINESSAPPROVAL_STATE, IsValid: 1, ShowApprovalUser: true, @@ -1708,42 +1891,42 @@ export default { } const secondData = await request.$webGet('EShangApiMain/BusinessProcess/GetAPPROVALROUTEDetail', secondReq) this.progressObjDetail = secondData.Result_Data - console.log('secondData',secondData) + console.log('secondData', secondData) this.progressDetail = res - console.log('Store.state.userData.UserId',Store.state.userData.UserId) - console.log('res.APPOVED_IDS',res.APPOVED_IDS) - if(Number(res.APPOVED_IDS) === Number(Store.state.userData.UserId)){ + console.log('Store.state.userData.UserId', Store.state.userData.UserId) + console.log('res.APPOVED_IDS', res.APPOVED_IDS) + if (Number(res.APPOVED_IDS) === Number(Store.state.userData.UserId)) { this.isShowBtn = true } this.progressList = res.approveList this.progressList.unshift({ APPLYAPPROVE_NAME: '服务区经营主管', - APPLYAPPROVE_DATE:res.BUSINESS_STARTDATE, - STAFF_NAME:res.STAFF_NAME, - APPLYAPPROVE_INFO:'', + APPLYAPPROVE_DATE: res.BUSINESS_STARTDATE, + STAFF_NAME: res.STAFF_NAME, + APPLYAPPROVE_INFO: '', }) let list = [] - if(res.UserList && res.UserList.length>0){ - res.UserList.forEach(item=>{ + if (res.UserList && res.UserList.length > 0) { + res.UserList.forEach(item => { // list.push({label: item.USER_NAME,value: item.USER_ID}) - list.push({label: item.USER_NAME,value: `${item.USER_NAME}-${item.USER_ID}`}) + list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` }) }) } this.nextPerson = list - console.log('this.nextPerson',this.nextPerson) + console.log('this.nextPerson', this.nextPerson) let rejectList = [] - if(res.rejectList && res.rejectList.length>0){ + if (res.rejectList && res.rejectList.length > 0) { res.rejectList.forEach((item) => { rejectList.push({ label: item.APPROVALROUTE_NAME, value: JSON.stringify(item) }) }) } this.rejectDataList = rejectList - console.log('this.rejectDataList',this.rejectDataList) + console.log('this.rejectDataList', this.rejectDataList) uni.hideLoading() } } @@ -1751,38 +1934,45 @@ export default {