diff --git a/.env.development b/.env.development index 4f95d8a..3903075 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ VITE_APP_TITLE = 智慧换电管理系统 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.5.213:9100/gateway' -#VITE_APP_BASE_API = 'http://192.168.5.14:9100/gateway' +#VITE_APP_BASE_API = 'http://192.168.5.213:9100/gateway' +VITE_APP_BASE_API = 'http://192.168.5.14:9100/gateway' #VITE_APP_BASE_API = '/dev-api' #VITE_APP_BASE_API = 'https://api.evo-techina.com' diff --git a/src/api/order/replabatt.ts b/src/api/order/replabatt.ts index 2a71288..11bd3bb 100644 --- a/src/api/order/replabatt.ts +++ b/src/api/order/replabatt.ts @@ -148,4 +148,18 @@ export function oderdetails(orderNo:string) { },false) -} \ No newline at end of file +} + +//电子对账单 +export function dzdzd(params:any) { + return server.request({ + url: '/cloud/order/swap/bill/list', + method: 'get', + params + }) +} + +//下载电子对账单 +export function downdzdz(params:any) { + return server.download('/cloud/order/swap/bill/download',params,'电子对账单.xlsx') +} diff --git a/src/api/order/transaction.ts b/src/api/order/transaction.ts new file mode 100644 index 0000000..dea101b --- /dev/null +++ b/src/api/order/transaction.ts @@ -0,0 +1,40 @@ +import server from '@/utils/request' + +interface Params{ + wuid:String //用户编码 + pageSize:String|Number //每页条数,示例值 + pageNo:String|Number //页数 + stationCode:String //换电站编码 + accountCode:String //账号编码 + accountName:String //账号 + outTradeNo:String //交易编码 + tradeType:String|Number //交易类型：1-充值，2-订单消费，9-提现 + payType:String|Number //支付方式：1-账户余额，2-微信，3-支付宝，4-网银，5 -充电补偿 +} + +//交易记录 +export function traclist(params:Params) { + return server.request({ + url: '/cloud/trade/list', + method: 'get', + params + }) +} + +//上传凭证 +export function uppingz(data:any) { + return server.request({ + url: '/cloud/trade/submit', + method: 'post', + data + }) +} + +//审核 +export function examine(data:any) { + return server.request({ + url: '/cloud/trade/approve', + method: 'post', + data + }) +} diff --git a/src/views/order/replabatt/index.vue b/src/views/order/replabatt/index.vue index c3ec84f..00d3fe0 100644 --- a/src/views/order/replabatt/index.vue +++ b/src/views/order/replabatt/index.vue @@ -67,11 +67,16 @@ icon="Plus" @click="showpop(1)">新增 --> + 批量支付 + @click="zfdrawer = true">结算 @@ -119,6 +124,7 @@
充电完成
待支付
已完成
+
支付中
已取消
@@ -434,7 +440,8 @@ :with-header="false" size="1200px" > - + + @@ -727,6 +734,7 @@ import Payment from './payment.vue' + import Settlement from './settlement.vue' // import { // getdict diff --git a/src/views/order/replabatt/settlement.vue b/src/views/order/replabatt/settlement.vue new file mode 100644 index 0000000..78c8475 --- /dev/null +++ b/src/views/order/replabatt/settlement.vue @@ -0,0 +1,564 @@ + + + \ No newline at end of file diff --git a/src/views/order/transaction/index.vue b/src/views/order/transaction/index.vue new file mode 100644 index 0000000..88d23ae --- /dev/null +++ b/src/views/order/transaction/index.vue @@ -0,0 +1,418 @@ + + + + + diff --git a/src/views/order/transaction/orderlist.vue b/src/views/order/transaction/orderlist.vue new file mode 100644 index 0000000..20e2f8f --- /dev/null +++ b/src/views/order/transaction/orderlist.vue @@ -0,0 +1,208 @@ + + + \ No newline at end of file diff --git a/src/views/system/xcximg/index.vue b/src/views/system/xcximg/index.vue index 9e614db..96a997e 100644 --- a/src/views/system/xcximg/index.vue +++ b/src/views/system/xcximg/index.vue @@ -186,7 +186,7 @@ uploadFile ) => { if(response.code == 1000){ - addObj.picUrl = response.msg + addObj.picUrl = response.data } //addObj.picUrl = URL.createObjectURL(uploadFile.raw!) console.log(uploadFile)