diff --git a/api/financialCenter/settlementDoc.js b/api/financialCenter/settlementDoc.js
new file mode 100644
index 0000000..9235db6
--- /dev/null
+++ b/api/financialCenter/settlementDoc.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export default {
+ getByOmsSettlementPage(data) {
+ return request({
+ url: '/oil-finance/oilSettlementInfo/getByOmsSettlementPage',
+ method: 'post',
+ data: data
+ })
+ },
+}
diff --git a/financialCenter/enterprise/recharge/index.vue b/financialCenter/enterprise/recharge/index.vue
index 64f3d63..eb1da21 100644
--- a/financialCenter/enterprise/recharge/index.vue
+++ b/financialCenter/enterprise/recharge/index.vue
@@ -19,7 +19,7 @@
-->
{{ parameter.params.name || '企业名称'}}
-
+
@@ -39,7 +39,7 @@
-
+
{{typeEnum[item.transactionType]}}
@@ -92,11 +92,9 @@
companyId: '',
createTimeStart: '',
createTimeEnd: '',
- businessLeader: '',
+ businessLeader: ''
},
- sorted: {
-
- }
+ sorted: {}
},
styles: {},
listData: [],
@@ -134,12 +132,11 @@
uni.$on('currentEnterprise', (item) => {
if (!item.id) return
+ this.parameter.currentPage = 1
this.parameter.params.companyId = item.id
this.parameter.params.name = item.name
-
})
- },
- onShow() {
+
this.search();
},
@@ -166,6 +163,23 @@
this.parameter.params.businessLeader = this.userInfo.id
serve.getByPageRecharge(this.parameter).then(res => {
if (res.code !== 20000) return
+ if (this.parameter.currentPage == 1) {
+ if(!res.data.list.length) {
+ uni.showToast({
+ title: '暂无数据~',
+ icon:'none'
+ })
+ }
+ this.listData = res.data.list
+ return
+ }
+ if (!res.data.list.length) {
+ uni.showToast({
+ title: '没有更多数据了~',
+ icon:'none'
+ })
+ return
+ }
this.listData = this.listData.concat(res.data.list);
})
},
diff --git a/financialCenter/settlementDoc/manage/index.vue b/financialCenter/settlementDoc/manage/index.vue
new file mode 100644
index 0000000..e27ec01
--- /dev/null
+++ b/financialCenter/settlementDoc/manage/index.vue
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+ 结算单号:{{item.settlementNo}}
+
+
+ {{item.settlementObjectName}}
+
+ 开票金额:{{item.invoicedAmount}}
+ 结算金额:{{item.settlementAmount}}
+
+
+ 创建人信息:{{item.createUserName}} -
+ {{item.createUserPhone}}
+
+
+
+
+ {{item.createTime}}
+ {{item.settlementState == 2 ?'已开票' : '待开票'}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oilAccount/page/billPush/index.vue b/oilAccount/page/billPush/index.vue
new file mode 100644
index 0000000..d62ace0
--- /dev/null
+++ b/oilAccount/page/billPush/index.vue
@@ -0,0 +1,427 @@
+
+
+
+
+
+
+
+ {{typeEnum[item.transactionType]}}
+
+
+
+
+ {{item.createTime}}
+ ¥{{item.transactionAmount}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 914f17b..6ec588f 100644
--- a/pages.json
+++ b/pages.json
@@ -388,6 +388,14 @@
"enablePullDownRefresh": false
}
+ },{
+ "path": "page/billPush/index",
+ "style": {
+ "navigationBarTitleText": "账单余额推送",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+
}]
},
{
@@ -416,6 +424,14 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "settlementDoc/manage/index",
+ "style": {
+ "navigationBarTitleText": "结算单管理",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+
}, {
"path": "enterprise/recharge/selEnterprise",
"style": {
diff --git a/pages/index/menu.json b/pages/index/menu.json
index f9e38d3..4091433 100644
--- a/pages/index/menu.json
+++ b/pages/index/menu.json
@@ -121,6 +121,13 @@
"router":"/oilAccount/page/accountRecharge/index",
"lable":"sys:siteAcct:recharge",
"image":"../../static/newindex/siteAcctList.png"
+ },
+ {
+ "icon":"iconxiugaijiage",
+ "name":"账单余额推送",
+ "router":"/oilAccount/page/billPush/index",
+ "lable":"sys:siteAcct:billPush",
+ "image":"../../static/newindex/siteAcctList.png"
}
]
},
@@ -150,6 +157,13 @@
"router":"/financialCenter/enterprise/recharge/index",
"lable":"finance:enterprise:recharge",
"image":"../../static/newindex/customerList.png"
+ },
+ {
+ "icon":"iconxiugaijiage",
+ "name":"结算单管理",
+ "router":"/financialCenter/settlementDoc/manage/index",
+ "lable":"finance:settlementDoc:manage",
+ "image":"../../static/newindex/customerList.png"
}
]
},
diff --git a/utils/request.js b/utils/request.js
index 5e42a5d..c82f5b6 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,12 +1,12 @@
import axios from 'axios'
import utils from '@/utils/encode'
// const env = process.env.NODE_ENV
-// const env = 'test'
-const env = 'production'
+const env = 'test'
+// const env = 'production'
const testUrl = 'http://192.168.1.83:38080'
-// const productUrl = 'https://www.xingoil.com/adminapi'
+const productUrl = 'https://www.xingoil.com/adminapi'
// const productUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new
-const productUrl = 'http://uat.xingoil.com/adminapi'
+// const productUrl = 'http://uat.xingoil.com/adminapi'
const service = axios.create({
baseURL: env == 'production' ? productUrl : testUrl,