From e59ba641d083aed30d6cfabc5d17d09e2eeea8ad Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Sun, 17 Dec 2023 16:30:01 +0800 Subject: [PATCH] 2023-12-17 --- .env.development | 2 +- src/api/marketingCard/marketingCard.js | 8 + src/api/order/order.js | 45 ++++ src/layout/components/Sidebar/index.vue | 12 +- src/router/index.js | 12 +- src/views/marketingCard/pickupCardSet.vue | 122 ++++++++- src/views/order/allDistributionCount.vue | 282 ++++++++++++++++++++ src/views/order/distributionCount.vue | 83 ++++-- src/views/order/index.vue | 38 ++- src/views/order/subBranch.vue | 298 ++++++++++++++++++++++ 10 files changed, 853 insertions(+), 49 deletions(-) create mode 100644 src/views/order/allDistributionCount.vue create mode 100644 src/views/order/subBranch.vue diff --git a/.env.development b/.env.development index 0293dd2..fdd086a 100644 --- a/.env.development +++ b/.env.development @@ -8,6 +8,6 @@ VUE_APP_BASE_API = '/api' # VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi" -VUE_APP_URL = "http://192.168.2.106:7201" +VUE_APP_URL = "http://5sbheh.natappfree.cc" VUE_APP_REPORT_URL = "http://192.168.2.106:7202" ##VUE_APP_URL = "http://8.130.39.13:8112" diff --git a/src/api/marketingCard/marketingCard.js b/src/api/marketingCard/marketingCard.js index c6e3b86..7b4ef9a 100644 --- a/src/api/marketingCard/marketingCard.js +++ b/src/api/marketingCard/marketingCard.js @@ -13,6 +13,14 @@ export default { }); }, + // 修改上架/下架状态 + updateIsEnable: function(sid,isEnable) { + return request({ + url: '/lpkgiftbag/isGrounding/'+sid+"/"+isEnable + }); + }, + + // 获取发放网点列表 bankList: function(data) { return request({ diff --git a/src/api/order/order.js b/src/api/order/order.js index 78a45a4..44e746b 100644 --- a/src/api/order/order.js +++ b/src/api/order/order.js @@ -56,5 +56,50 @@ export default { }); }, + + // 获取支行汇总列表 + bankOrderList: function(data) { + return request({ + url: '/lpksreservoorder/orderListByBank', + method: 'post', + data: data + }); + }, + + // 导出支行报表 + bankOrderExportExcel: function(data) { + return request({ + url: '/lpksreservoorder/exportExcelByBank', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + // 获取支行汇总列表 + ZOrderList: function(data) { + return request({ + url: '/lpksreservoorder/orderListByZ', + method: 'post', + data: data + }); + }, + + // 导出总报表 + allOrderExportExcel: function(data) { + return request({ + url: '/lpksreservoorder/exportExcelByZ', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + } \ No newline at end of file diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index f15d906..2d4fccc 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -174,23 +174,23 @@ }, { alwaysShow: true, - component: "distributionCount", + component: "subBranch", meta: { icon: "el-icon-help", title: "支行配货统计", }, - name: "/order/distributionCount", - path: "/order/distributionCount", + name: "/order/subBranch", + path: "/order/subBranch", }, { alwaysShow: true, - component: "distributionCount", + component: "allDistributionCount", meta: { icon: "el-icon-help", title: "总配货统计", }, - name: "/order/distributionCount", - path: "/order/distributionCount", + name: "/order/allDistributionCount", + path: "/order/allDistributionCount", }, ] diff --git a/src/router/index.js b/src/router/index.js index c4e7a6d..ea20412 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -183,19 +183,19 @@ export const constantRoutes = [ title: '网点配货统计' } },{ - path: '/order/distributionCount', + path: '/order/subBranch', component: () => - import('@/views/order/distributionCount.vue'), - name: 'distributionCount', + import('@/views/order/subBranch.vue'), + name: 'subBranch', meta: { title: '支行配货统计' } }, { - path: '/order/distributionCount', + path: '/order/allDistributionCount', component: () => - import('@/views/order/distributionCount.vue'), - name: 'distributionCount', + import('@/views/order/allDistributionCount.vue'), + name: 'allDistributionCount', meta: { title: '总配货统计' } diff --git a/src/views/marketingCard/pickupCardSet.vue b/src/views/marketingCard/pickupCardSet.vue index 7307e5f..e5f3dbe 100644 --- a/src/views/marketingCard/pickupCardSet.vue +++ b/src/views/marketingCard/pickupCardSet.vue @@ -53,7 +53,7 @@ - @@ -119,7 +119,7 @@ - + + + + + + + +
+ + +
+ 起始日期： + + +
+
+ 终止日期： + + +
+
+ 导入数据： +
+ + + 请先选择日期 + + 选取文件 + 上传 + + +
+ +
+ + + + +
@@ -268,7 +321,13 @@ end: "", bankSid: "" }, - bankList: [] + bankList: [], + batchInfo: { + startDate: "", + endDate: "", + }, + updateAction: process.env.VUE_APP_BASE_API + '/lpkgiftcard/getExcelInfo2', + uploadFileList: [], } }, created() { @@ -293,7 +352,7 @@ if (tab.name == 'addrole') { this.giftBagList() - } else { + } else if (tab.name == 'roleList') { this.getPageList() } }, @@ -319,7 +378,14 @@ this.page.params.endDate = val }, - + selectbatchInfo1(val) { + console.log('selectbatchInfo1:', val) + this.batchInfo.startDate = val + }, + selectbatchInfo2(val) { + console.log('selectbatchInfo2:', val) + this.batchInfo.endDate = val + }, getPageList() { req.recordListPage(this.page) .then(resp => { @@ -506,6 +572,52 @@ this.editDialog = false }, + handleSuccess(resp, file, fileList) { + + if (resp.success) { + this.$message({ + showClose: true, + type: "success", + message: resp.msg + }) + + } else { + this.$message({ + showClose: true, + type: "error", + message: resp.msg + }) + } + + // console.log('handleSuccess----', resp) + // const _this = this + // const upfile = { + // fileTypeId: 6, // '文件类型: 1=帐户余额;2=应收账款;3=库存货值;4=在途货值;5=预付款;', + // fileTypeName: '报表文件', // '文件类型名: 1=帐户余额;2=应收账款;3=库存货值;4=在途货值;5=预付款', + // fileSrcName: resp.data.sourceFileName, // '原文件名', + // filePath: resp.data.filePath, // '文件的相对路径', + // fullUrl: resp.data.fullUrl, // '文件完整的访问URL', + // fileuid: file.uid // '文件完整的访问URL', + // } + // _this.reportFileList.push(upfile) + }, + handleRemove(file, fileList) { + const _this = this + let delete_index = 0 + for (let i = 0, len = _this.reportFileList.length; i < len; i++) { + if (file.uid === _this.reportFileList[i].fileuid) { + delete_index = i + break + } + } + _this.reportFileList.splice(delete_index, 1) + }, + + submitUpload() { + this.$refs.upload.submit() + + } + } } diff --git a/src/views/order/allDistributionCount.vue b/src/views/order/allDistributionCount.vue new file mode 100644 index 0000000..bad6877 --- /dev/null +++ b/src/views/order/allDistributionCount.vue @@ -0,0 +1,282 @@ + + + + \ No newline at end of file diff --git a/src/views/order/distributionCount.vue b/src/views/order/distributionCount.vue index 66146df..902322c 100644 --- a/src/views/order/distributionCount.vue +++ b/src/views/order/distributionCount.vue @@ -23,7 +23,14 @@ - + + + + + + @@ -52,26 +59,28 @@ - - - - - - - - + + + + - - @@ -82,6 +91,7 @@ + \ No newline at end of file