diff --git a/fuintAdmin/src/api/order/exportExcel.js b/fuintAdmin/src/api/order/exportExcel.js index 6b6715bb3..424ffaf6f 100644 --- a/fuintAdmin/src/api/order/exportExcel.js +++ b/fuintAdmin/src/api/order/exportExcel.js @@ -10,6 +10,7 @@ export function exportExcelCashierApi(data) { }); } + // 导出油品订单 export function exportExcelOilOrderApi(data) { return request({ diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue index aa4d8652c..79a4fa172 100644 --- a/fuintAdmin/src/views/setting/print/index.vue +++ b/fuintAdmin/src/views/setting/print/index.vue @@ -106,12 +106,12 @@ - - - - - - + + + + + + +
+

退款密码： + +

+
+ 保存信息 @@ -162,6 +168,7 @@ export default { this.form.lat = this.store.latitude; this.form.lng = this.store.longitude; this.form.address = this.store.address; + this.form.refPass = this.store.refPass; if (this.store.welfare!=null){ this.welfare = this.store.welfare.split(",") } diff --git a/fuintAdmin/src/views/staff/tag/list.vue b/fuintAdmin/src/views/staff/tag/list.vue new file mode 100644 index 000000000..8d7a411f0 --- /dev/null +++ b/fuintAdmin/src/views/staff/tag/list.vue @@ -0,0 +1,919 @@ + + + + + + diff --git a/fuintAdmin_zt/src/api/allOrder.js b/fuintAdmin_zt/src/api/allOrder.js index 4b5472f1b..29f9a9e99 100644 --- a/fuintAdmin_zt/src/api/allOrder.js +++ b/fuintAdmin_zt/src/api/allOrder.js @@ -62,6 +62,14 @@ export function getDayListApi(query) { }) } +export function getDayDatyListApi(query) { + return request({ + url: 'business/allOrderInfo/getRunningWaterByDayData', + method: 'get', + params: query + + }) +} //统计 export function getRunningWaterByDataApi(query) { return request({ @@ -90,3 +98,41 @@ export function getTissueByDataApi(query) { }) } + + +export function exportExcelTradingApi(data) { + return request({ + url: 'business/allOrderInfo/tradingExportExcel', + method: 'post', + responseType: 'blob', // 表明响应类型为二进制流 + data: data // 通过 data 参数传递需要的数据 + }); +} + + +export function exportExcelTissueApi(data) { + return request({ + url: 'business/allOrderInfo/runningWaterByTissueExportExcel', + method: 'post', + responseType: 'blob', // 表明响应类型为二进制流 + data: data // 通过 data 参数传递需要的数据 + }); +} + +export function exportExcelOilDeptApi(data) { + return request({ + url: 'business/allOrderInfo/runningWaterByOilDeptExportExcel', + method: 'post', + responseType: 'blob', // 表明响应类型为二进制流 + data: data // 通过 data 参数传递需要的数据 + }); +} + +export function exportExcelDayApi(data) { + return request({ + url: 'business/allOrderInfo/runningWaterByDayExportExcel', + method: 'post', + responseType: 'blob', // 表明响应类型为二进制流 + data: data // 通过 data 参数传递需要的数据 + }); +} diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue index d6640afca..3a02f7612 100644 --- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue +++ b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue @@ -29,22 +29,45 @@ placeholder="结束日期"> - + - - {{ item.realName }} - {{ item.mobile }} + + + + + + + + + + + + + + + + + + 搜索 重置 - 导出订单 + @@ -61,7 +84,7 @@
退款余额
-
{{ orderStatistics.refBalance }}
+
{{ orderStatistics.refBalance?orderStatistics.refBalance:0 }}
@@ -83,9 +106,18 @@ - + - +