From c2412056fd06e919332cf51173de89c2951116d1 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Tue, 14 Nov 2023 14:57:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/financialCenter/settlementDoc.js | 11 + financialCenter/enterprise/recharge/index.vue | 32 +- .../settlementDoc/manage/index.vue | 287 ++++++++++++ oilAccount/page/billPush/index.vue | 427 ++++++++++++++++++ pages.json | 16 + pages/index/menu.json | 14 + utils/request.js | 8 +- 7 files changed, 782 insertions(+), 13 deletions(-) create mode 100644 api/financialCenter/settlementDoc.js create mode 100644 financialCenter/settlementDoc/manage/index.vue create mode 100644 oilAccount/page/billPush/index.vue 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 @@ + + + + + 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 @@ + + + + + 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, From 2fb5ef3efdc0de7e1f03b74cf8f9e44dce15acf2 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Wed, 15 Nov 2023 14:05:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oilAccount/page/billPush/index.vue | 427 ----------------------------- 1 file changed, 427 deletions(-) delete mode 100644 oilAccount/page/billPush/index.vue diff --git a/oilAccount/page/billPush/index.vue b/oilAccount/page/billPush/index.vue deleted file mode 100644 index d62ace0..0000000 --- a/oilAccount/page/billPush/index.vue +++ /dev/null @@ -1,427 +0,0 @@ - - - - - From aabf040620d1c73d1bbb9265aaf51d2a30c73346 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Fri, 17 Nov 2023 10:28:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 8 -------- pages/index/menu.json | 7 ------- 2 files changed, 15 deletions(-) diff --git a/pages.json b/pages.json index 6ec588f..c4e9307 100644 --- a/pages.json +++ b/pages.json @@ -388,14 +388,6 @@ "enablePullDownRefresh": false } - },{ - "path": "page/billPush/index", - "style": { - "navigationBarTitleText": "账单余额推送", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }] }, { diff --git a/pages/index/menu.json b/pages/index/menu.json index 4091433..d15dcf9 100644 --- a/pages/index/menu.json +++ b/pages/index/menu.json @@ -121,13 +121,6 @@ "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" } ] },