diff --git a/pages.json b/pages.json
index 172c2f9..f76ea2f 100644
--- a/pages.json
+++ b/pages.json
@@ -87,6 +87,14 @@
{
"path": "index",
"style":
+ {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "结算审批"
+ }
+ },
+ {
+ "path": "detail",
+ "style":
{
"navigationBarTitleText": "结算审批"
}
diff --git a/pages/settlementApproval/detail.vue b/pages/settlementApproval/detail.vue
new file mode 100644
index 0000000..d555767
--- /dev/null
+++ b/pages/settlementApproval/detail.vue
@@ -0,0 +1,1065 @@
+
+
+
+
+ {{`${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || ''}-${$moment(detailObj.ENDDATE).format('YYYYMM')}月度结算表`}}
+
+
+
+
+ 开始时间：
+ {{detailObj.STARTDATE || ''}}
+
+
+ 结束日期：
+ {{detailObj.ENDDATE || ''}}
+
+
+
+
+
+ 结算模式：
+ {{detailObj.BUSINESS_TYPE?SETTLEMENT_MODESObj[detailObj.BUSINESS_TYPE] : ''}}
+
+
+ 项目期数：
+ {{detailObj.CURRENT_PERIOD || ''}}
+
+
+
+
+
+ 装修期：
+ {{topDetail.DecorateDesc || ''}}
+
+
+
+
+
+ 履约保证金：
+ {{topDetail.SECURITYDEPOSIT ? $util.getMoney(topDetail.SECURITYDEPOSIT / 10000)+'万元':''}}
+
+
+ 提成比例：
+ {{topDetail.GUARANTEERATIO ? `${topDetail.GUARANTEERATIO}%` : '-'}}
+
+
+
+
+
+ 税率：
+ {{topDetail.TaxRate ? `${topDetail.TaxRate}%` : '-'}}
+
+
+ 期除税收入：
+ {{topDetail.MINTURNOVER ? `${$util.getMoney(topDetail.MINTURNOVER / 10000)}万元` : ''}}
+
+
+
+
+
+ 合同总金额：
+ {{topDetail.RENTFEE ? $util.getMoney(topDetail.RENTFEE / 10000)+'万元':''}}
+
+
+
+
+ 商家名称：
+ {{topDetail.MERCHANTS_NAME || ''}}
+
+
+
+
+
+
+
+ {{ detailObj.Approvalstate>0?'精算数据':'结算数据' }}
+
+
+
+
+ 期限：
+ {{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}}
+
+
+
+
+
+ 累计营业额：
+ {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:''}}
+
+
+
+
+
+ 移动支付：
+ {{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:''}}
+
+
+ 移动冲正：
+ {{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'0'}}
+
+
+
+
+
+ 现金交易：
+ {{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:''}}
+
+
+ 现金冲正：
+ {{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'0'}}
+
+
+
+
+
+ 提成金额：
+ {{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:''}}
+
+
+ 提成收入：
+ {{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:''}}
+
+
+
+
+
+
+
+
+
+
+ 申请人：
+ {{progressDetail.STAFF_NAME || ''}}
+
+
+ {{progressDetail.BUSINESS_STARTDATE || ''}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 发起申请
+
+
+
+
+
+
+ 审核
+
+
+
+
+
+
+ 驳回
+
+
+
+
+
+
+
+ 审批流程
+
+
+
+
+
+
+
+ {{`【${item.APPLYAPPROVE_NAME}】`}}
+
+ {{`${item.APPLYAPPROVE_DATE}`}}
+
+
+
+ {{item.STAFF_NAME}}
+ {{`${item.APPLYAPPROVE_INFO}`}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/settlementApproval/index.vue b/pages/settlementApproval/index.vue
index 703df77..4214d12 100644
--- a/pages/settlementApproval/index.vue
+++ b/pages/settlementApproval/index.vue
@@ -1,9 +1,13 @@
-
+
-
- {{ selectServiceList[selectIndex].label }}
-
+
+
+ {{ selectServiceList[selectIndex].label }}
+
+ {{`${$moment(startDate).format('YYYY/MM')}-${$moment(endDate).format('YYYY/MM')}`}}
+
+
@@ -19,33 +23,36 @@
-
+
{{index+1}}
-
+
{{ item.BUSINESSPROJECT_NAME }}
- {{ item.SETTLEMENT_STATE===0?'待结算':item.SETTLEMENT_STATE===1?'已结算':item.SETTLEMENT_STATE===2?'结算审批中':'' }}
+ {{ item.SETTLEMENT_STATE===0?'待结算':item.SETTLEMENT_STATE===1?'已结算':item.SETTLEMENT_STATE===2?'审批中':'' }}
-
- {{ $util.getMoney(item.CURREVENUE_AMOUNT) }}
- 本月营业额
+
+ {{ item.SETTLEMENT_TYPE===1?$util.getMoney(item.REVENUE_AMOUNT):item.SETTLEMENT_TYPE===2?$util.getMoney(item.CURREVENUE_AMOUNT):'' }}
+ {{ item.SETTLEMENT_TYPE===1?'累计营业额':item.SETTLEMENT_TYPE===2?'本月营业额':'' }}
{{item.CURRENT_PERIOD || ''}}
- {{ item.MERCHANTS_NAME || '' }}
+ {{item.SETTLEMENT_TYPE===1?'年度结算':item.SETTLEMENT_TYPE===2?'月度结算':''}}：{{item.SETTLEMENT_DATE || ''}}
- {{item.SETTLEMENT_DATE || ''}}
- {{item.SETTLEMENT_TYPE===1?'年度结算':item.SETTLEMENT_TYPE===2?'月度结算':''}}
+ {{ item.MERCHANTS_NAME || '' }}
+
{{item.SERVERPARTSHOP_NAME || ''}}
+
+ {{!isEnd ? '正在加载,请稍后...':'——— 我是有底线的 ———'}}
+
-
+