diff --git a/fuintCashierWeb/src/api/allOrder.js b/fuintCashierWeb/src/api/allOrder.js new file mode 100644 index 000000000..290c5db22 --- /dev/null +++ b/fuintCashierWeb/src/api/allOrder.js @@ -0,0 +1,182 @@ +import request from '@/utils/request' + +// 分页查询所有的订单信息 +export function getOrderListApi(query) { + return request({ + url: 'business/allOrderInfo/getPageList', + method: 'get', + params: query + + }) +} +// 分页查询所有的订单信息 +export function getSumPayMoneyApi(query) { + return request({ + url: 'business/allOrderInfo/sumPayMoney', + method: 'get', + params: query + + }) +} + +// 查询订单信息 +export function getOrderInfo(orderId) { + return request({ + url: 'backendApi/order/info/' + orderId, + method: 'post', + data: data + }) +} + +export function getTradingPageApi(query) { + return request({ + url: 'business/allOrderInfo/trading', + method: 'get', + params: query + + }) +} +export function getInstituionListApi(query) { + return request({ + url: 'business/allOrderInfo/runningWaterByInstituion', + method: 'get', + params: query + + }) +} + +export function getNoneListApi(query) { + return request({ + url: 'business/allOrderInfo/runningWaterByNone', + method: 'get', + params: query + + }) +} + +export function getDayListApi(query) { + return request({ + url: 'business/allOrderInfo/runningWaterByDay', + method: 'get', + params: query + + }) +} +export function getDayDatyListApi(query) { + return request({ + url: 'business/allOrderInfo/getRunningWaterByDayData', + method: 'get', + params: query + + }) +} +//统计 +export function getRunningWaterByDataApi(query) { + return request({ + url: 'business/allOrderInfo/runningWaterByData', + method: 'get', + params: query + + }) +} +//统计 +export function getRunningWaterByTissueApi(query) { + return request({ + url: 'business/allOrderInfo/runningWaterByTissue', + method: 'get', + params: query + + }) +} + +export function getmyDataApi(query) { + return request({ + url: 'business/allOrderInfo/getmyData', + method: 'get', + params: query + + }) +} + +//统计 +export function getTissueByDataApi(query) { + return request({ + url: 'business/allOrderInfo/getTradingData', + method: 'get', + params: 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 参数传递需要的数据 + }); +} + +// 油站首页核心数据 +export function getTotalAmount() { + return request({ + url: 'business/allOrderInfo/getTotalAmount', + method: 'get', + }); +} + +// 油站首页数据展示 +export function getDataBoard(query) { + return request({ + url: 'business/allOrderInfo/getDataBoard', + method: 'get', + params:query + }); +} + +// 油站首页数据分析 +export function getDataAnalysis(query) { + return request({ + url: 'business/allOrderInfo/getDataAnalysis', + method: 'get', + params:query + }); +} +// 油站首页数据展示 +export function getDataShow(query) { + return request({ + url: 'business/allOrderInfo/getDataShow', + method: 'get', + params:query + }); +} + diff --git a/fuintCashierWeb/src/api/handover/handover.js b/fuintCashierWeb/src/api/handover/handover.js index e616cee37..51aa40b04 100644 --- a/fuintCashierWeb/src/api/handover/handover.js +++ b/fuintCashierWeb/src/api/handover/handover.js @@ -28,11 +28,11 @@ export function getStatisticsApi(data) { -export function getHandoverApi2() { +export function getHandoverApi2(query) { return request({ url: '/business/handoverRecord/handover2', method: 'get', - // params: query + params: query }) } diff --git a/fuintCashierWeb/src/router/index.js b/fuintCashierWeb/src/router/index.js index cffbd3bfd..f66f4126d 100644 --- a/fuintCashierWeb/src/router/index.js +++ b/fuintCashierWeb/src/router/index.js @@ -140,7 +140,31 @@ export const constantRoutes = [ component: () => import('@/views/cashier/NewComponents/HandoverDetails?id=8'), }, ] + }, + + { + path: '/handover', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [ + { + path: '/handover/info', + component: () => import('@/views/cashier/NewComponents/handover/list'), + name: 'handover-info', + props: true, // 启用路由参数作为组件的props + meta: { title: '交易明细', icon: 'user' } + }, + // { + // path: '/handover/details', + // component: () => import('@/views/handover/info/rec/details'), + // name: 'handover-details', + // props: true, // 启用路由参数作为组件的props + // meta: { title: '交易明细', icon: 'user' } + // }, + ] } + ] } ] diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue index df55c9548..52148eb02 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue @@ -17,7 +17,7 @@ - + - 搜索 + 搜索 重置 @@ -408,8 +408,8 @@ export default { // base queryParams: { - staffId: '', - status: '', + staffId: null, + status: '统一交班', type: '', page:null, @@ -539,7 +539,7 @@ export default { resetQuery(){ this.queryParams = { giftName: '', - status: '', + status: '统一交班', mobile: '', orderNumber: '', page:1, diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue index ba6e7efde..cc81cb525 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue @@ -108,7 +108,7 @@ export default { this.oilNumberStatistics = info.oilNumberStatistics; this.goodsNumberStatistics = info.goodsNumberStatistics; this.IntegerNumberStatistics = info.IntegerNumberStatistics; - console.in + console.log("data",data) }, openSeeDetailsMethods(data) { @@ -125,15 +125,8 @@ export default { btime : data.startTime, etime : data.endTime, } - - // PinventoryId: data.id, - // PorderNumber: data.orderNumber, - // PorderDate: data.orderDate, - // PapprovalStatus: data.approvalStatus, - // PcreataByName: data.createByName - // }, - }); + } } } diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/handover/list.vue b/fuintCashierWeb/src/views/cashier/NewComponents/handover/list.vue new file mode 100644 index 000000000..1b5e3e68b --- /dev/null +++ b/fuintCashierWeb/src/views/cashier/NewComponents/handover/list.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/handover/ref.vue b/fuintCashierWeb/src/views/cashier/NewComponents/handover/ref.vue new file mode 100644 index 000000000..d72b92ca6 --- /dev/null +++ b/fuintCashierWeb/src/views/cashier/NewComponents/handover/ref.vue @@ -0,0 +1,517 @@ + + + + + + diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/handover/trading.vue b/fuintCashierWeb/src/views/cashier/NewComponents/handover/trading.vue new file mode 100644 index 000000000..29a520f13 --- /dev/null +++ b/fuintCashierWeb/src/views/cashier/NewComponents/handover/trading.vue @@ -0,0 +1,618 @@ + + + + + +