Merge remote-tracking branch 'origin/master'

supervise-report-ui/.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = '/api/service'
+VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
 ##VUE_APP_URL = "http://8.130.39.13:8112"
-VUE_APP_URL = "http://192.168.1.107:8112"
+VUE_APP_URL = "http://192.168.1.107:7009"

supervise-report-ui/.env.production

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/api/service'
+VUE_APP_BASE_API = '/api/report'
 
 ## 配置 正式接口地址
 VUE_APP_URL = "http://120.46.131.15:8111"

supervise-report-ui/src/api/Common/Upload.js

@@ -8,6 +8,12 @@ export function imageUpload(data){
 		headers:{'Content-Type':'multipart/form-data'}
 	})
 }
+
+// 统一请求路径前缀
+const base = process.env.VUE_APP_BASE_API
+
+export const uploadFiles = base+'/projectdaily/uploadfile'
+
 export const uploadFile = '/api/base/v1/basemanufactorsubscription/pictureUpload'
 
 export const uploadimg_tuiku = '/api/base/v1/basemanufacturerretwareveh/pictureUpload'

supervise-report-ui/src/api/inventorySummary/inventorySummary.js

@@ -109,7 +109,6 @@ export function buildExcelZaiTu() {
 // 库存汇总表
 export function getReportInventoryDayGather(data) {
   return request({
-    baseURL: "api/report/",
     url: '/reportinventory/getReportInventoryDayGather/' + data,
     method: 'get',
     headers: {
@@ -121,7 +120,6 @@ export function getReportInventoryDayGather(data) {
 // 仓库库存明细表
 export function getReportInventoryDayStore(data) {
   return request({
-    baseURL: "api/report/",
     url: '/reportinventory/getReportInventoryDayStore/' + data,
     method: 'get',
     headers: {
@@ -133,7 +131,6 @@ export function getReportInventoryDayStore(data) {
 // 烟草仓库库存明细表
 export function getReportInventoryDayToStore(data) {
   return request({
-    baseURL: "api/report/",
     url: '/reportinventory/getReportInventoryDayToStore/' + data,
     method: 'get',
     headers: {
@@ -145,7 +142,6 @@ export function getReportInventoryDayToStore(data) {
 // 导出
 export function exportExcel(data) {
   return request({
-    baseURL: "api/report/",
     url: '/reportinventory/downloadExcel/' + data,
     method: 'get',
     headers: {

supervise-report-ui/src/api/project/projectDaily.js

@@ -6,24 +6,28 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      baseURL: '/api',
-      url: '/report/projectdaily/listPage',
+      url: '/projectdaily/listPage',
       method: 'post',
       data: params
     })
   },
+   // 所有项目信息列表
+    projectListAll: function() {
+      return request({
+        baseURL: '/api',
+        url: '/crm/v1/projectinformation/listAll'
+      })
+    },
   // 所有项目信息列表
-  projectListAll: function() {
+  projectdailyistAll: function() {
     return request({
-      baseURL: '/api',
-      url: '/crm/v1/projectinformation/listAll'
+      url: '/projectdaily/listAll',
     })
   },
   // 保存项目监管数据
   saveDaily: function(params) {
     return request({
-      baseURL: '/api',
-      url: '/report/projectdaily/saveDaily',
+      url: '/projectdaily/saveDaily',
       method: 'post',
       data: params
     })
@@ -31,16 +35,14 @@ export default {
   // 发送通知
   sendMess: function(projectSid, orderDate) {
     return request({
-      baseURL: '/api',
-      url: '/report/projectdaily/sendMess/' + projectSid + "/" + orderDate
+      url: '/projectdaily/sendMess/' + projectSid + "/" + orderDate
     })
   },
 
   // 根据项目sid 获取项目账户信息
   getProjectAccountBySid: function(projectSid, orderDate) {
     return request({
-      baseURL: '/api/crm',
-      url: '/projectAccount/getAccountByProjectSid/' + projectSid ,
+      url: '/projectdaily/getAccountByProjectSid/' + projectSid ,
     })
   }
 

supervise-report-ui/src/api/supervise/salesSummary.js

@@ -3,8 +3,7 @@ import request from '@/utils/request'
 // 导出
 export function exportExcel(data) {
   return request({
-    baseURL: '/api',
-    url: '/report/reportsaleslog/getFullUrlByOrderDate',
+    url: '/reportsaleslog/getFullUrlByOrderDate',
     data,
     method: 'post',
     headers: {
@@ -23,8 +22,7 @@ export function countinfo() {
 //  门店销售明细表
 export function logPagerList(data) {
   return request({
-    baseURL: '/api',
-    url: '/report/reportsalesdaystore/getReportSalesDayStore',
+    url: '/reportsalesdaystore/getReportSalesDayStore',
     data,
     method: 'post',
     headers: {
@@ -36,8 +34,7 @@ export function logPagerList(data) {
 // 门店商品销售明细表
 export function in112PagerList(data) {
   return request({
-    baseURL: '/api',
-    url: '/report/reportproduct/getRepoSalesDayStoreProd',
+    url: '/reportproduct/getRepoSalesDayStoreProd',
     data,
     method: 'post',
     headers: {
@@ -49,8 +46,7 @@ export function in112PagerList(data) {
 // 门店销售明细表（烟草）
 export function inallPagerList(data) {
   return request({
-    baseURL: '/api',
-    url: '/report/reporttobaccostore/getSalesTobaccoStore',
+    url: '/reporttobaccostore/getSalesTobaccoStore',
     data,
     method: 'post',
     headers: {
@@ -62,8 +58,7 @@ export function inallPagerList(data) {
 // 门店商品销售明细表（烟草）
 export function inall4PagerList(data) {
   return request({
-    baseURL: '/api',
-    url: '/report/reporttobaccoproduct/getSalesStoreProduct',
+    url: '/reporttobaccoproduct/getSalesStoreProduct',
     data,
     method: 'post',
     headers: {

supervise-report-ui/src/api/supervise/salesreport.js

@@ -16,8 +16,7 @@ export default {
 
   initData(data) {
     return request({
-        baseURL: '/api',
-      url: '/report/DailySalesReport/getSalesByDate/'+data,
+      url: '/DailySalesReport/getSalesByDate/'+data,
       method: 'get',
     })
   },

supervise-report-ui/src/api/system/Role/role.js

@@ -14,7 +14,7 @@ export function rolemenus(data) {
 export function getrolemenus(data) {
   return request({
     baseURL: '/api',
-    url: '/portal/v1/sysmenu/sourcemenutree',
+    url: '/v1/sysmenu/sourcemenutree',
     method: 'POST',
     async: false,
 //  data: {userSid: data.userSid, sourceSid: '000011'},
@@ -37,7 +37,7 @@ export function sourcesofrole(data) {
 export function loginDetails(data) {
   return request({
     baseURL: '/api',
-    url: '/portal/v1/sysuser/loginDetails',
+    url: '/v1/sysuser/loginDetails',
     method: 'post',
     data: data,
     headers: {

supervise-report-ui/src/main.js

@@ -43,8 +43,9 @@ VueAMap.initAMapApiLoader({
 
 Vue.config.productionTip = false
 
-let token = null
-token = GetQueryString('token')
+// let token = null
+let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE2OTgzODc5MTN9.iu23s5M4XCJgIvjaK3y1CAWMUTMvIFmjCIDP5bOAb0A'
+// token = GetQueryString('token')
 if (token) {
   setStorage(token)
   const href = window.location.href
@@ -68,7 +69,7 @@ function getUserInfo() {
 console.log('2222')
   return request({
     baseURL: '/api',
-    url: '/portal/v1/sysuser/loginDetails',
+    url: '/v1/sysuser/loginDetails',
     method: 'post',
     headers: {
       'Content-Type': 'application/json'

supervise-report-ui/src/views/project/projectDaily.vue

@@ -301,7 +301,7 @@
           }
         ],
         dialogVisible: false,
-        updateAction: '/api/report' + '/projectdaily/uploadfile',
+        updateAction: process.env.VUE_APP_BASE_API+'/projectdaily/uploadfile',
         showSelectButton: false,
         currentLogSid: '',
         ychzFilePath: '',
@@ -387,6 +387,7 @@
       this.$refs['btnbar'].setButtonList(this.btnList)
     },
     created() {
+      console.log("process.env.VUE_APP_URL",process.env.VUE_APP_BASE_API)
       this.initData()
       this.loadList()
     },
@@ -439,16 +440,23 @@
         }
       },
       initData() {
-        req.projectListAll().then(res => {
-          this.projectList = res.data
-          this.projectDaily.projectSid = this.projectList[0].sid
-          this.projectDaily.projectName = this.projectList[0].entryName
-          this.projectDaily.totalLoan = Number(this.projectList[0].creditLimit)
-          this.projectDaily.useLimit = Number(this.projectList[0].useLimit)
-          this.projectDaily.accountsBalance = this.projectList[0].balance
-          console.log('projectList:', res)
-          console.log('projectList:',   this.projectList[0])
-          console.log('projectDaily:',    this.projectDaily)
+        req.projectdailyistAll().then(res => {
+
+          if (res.data.length > 0) {
+            this.projectList = res.data
+
+            this.projectDaily.projectSid = this.projectList[0].sid
+            this.projectDaily.projectName = this.projectList[0].entryName
+            this.projectDaily.totalLoan = Number(this.projectList[0].creditLimit)
+            this.projectDaily.useLimit = Number(this.projectList[0].useLimit)
+            this.projectDaily.accountsBalance = this.projectList[0].balance
+
+            console.log('projectList:', res)
+            console.log('projectList:', this.projectList[0])
+            console.log('projectDaily:', this.projectDaily)
+
+          }
+
 
         }).catch(e => {
           console.log('projectListAll--ee:', e)
@@ -541,9 +549,13 @@
         this.projectDaily.sid = ''
         this.projectDaily.remarks = '' // 备注说明',
         this.projectDaily.orderDate = parseTime(new Date(), '{y}-{m}-{d}') // 单据日期',
-        this.projectDaily.projectSid = this.projectList[0].sid // 项目Sid',
-        this.projectDaily.projectName = this.projectList[0].entryName // 项目名称',
-        this.projectDaily.totalLoan = Number(this.projectList[0].creditLimit) // 贷款总额',
+        // this.projectDaily.projectSid = this.projectList[0].sid // 项目Sid',
+        // this.projectDaily.projectName = this.projectList[0].entryName // 项目名称',
+        // this.projectDaily.totalLoan = Number(this.projectList[0].creditLimit) // 贷款总额',
+        this.projectDaily.projectSid = "" // 项目Sid',
+        this.projectDaily.projectName = "" // 项目名称',
+        this.projectDaily.totalLoan = "" // 贷款总额',
+
         // this.projectDaily.accountsBalance =  Number(this.projectList[0].balance)  // 帐户余额',
         this.projectDaily.accountsReceivable = 0 // 应收账款',
         this.projectDaily.stockAmount = 0 // 库存货值',

supervise-report-ui/src/views/reportCenter/goodsOnWay.vue

@@ -94,7 +94,7 @@
           }
         ],
         queryParams: {
-          date: "",
+          date: this.getDate(),
         },
         nowDate: new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate(),
         listGoodsOnWays: {
@@ -224,6 +224,13 @@
       //
     },
     methods: {
+      getDate(){
+        var tempDate = new Date() // 获取今天的日期
+        tempDate.setDate(tempDate.getDate() - 1) // 今天的前N天的日期，N自定义
+       var endDate = tempDate.getFullYear() + '-' + (tempDate.getMonth() + 1) + '-' + tempDate.getDate()
+        console.log(endDate)
+        return endDate
+      },
       // 搜索条件效果
       clicksearchShow() {
         this.isSearchShow = !this.isSearchShow

supervise-report-ui/src/views/reportCenter/inTransitSummary.vue

@@ -486,31 +486,37 @@
         //     return
         //   }
         // }
-
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
+        
+        this.$message({
+          showClose: true,
+          type: 'success',
+          message: '功能暂未完善...'
         })
 
-        exportExcel(this.jmdListQuery).then((resp) => {
-          loading.close()
-          const blob = new Blob([resp], {
-            type: 'application/vnd.ms-excel;charset=UTF-8'
-          })
-          const fileName = '库存明细列表' + '.xls'
-          const elink = document.createElement('a')
-          elink.download = fileName
-          elink.style.display = 'nonde'
-          elink.href = URL.createObjectURL(blob)
-          document.body.appendChild(elink)
-          elink.click()
-          URL.revokeObjectURL(elink.href)
-          document.body.removeChild(elink)
-        }).catch(() => {
-          loading.close()
-        })
+        // const loading = this.$loading({
+        //   lock: true,
+        //   text: 'Loading',
+        //   spinner: 'el-icon-loading',
+        //   background: 'rgba(0, 0, 0, 0.7)'
+        // })
+
+        // exportExcel(this.jmdListQuery).then((resp) => {
+        //   loading.close()
+        //   const blob = new Blob([resp], {
+        //     type: 'application/vnd.ms-excel;charset=UTF-8'
+        //   })
+        //   const fileName = '库存明细列表' + '.xls'
+        //   const elink = document.createElement('a')
+        //   elink.download = fileName
+        //   elink.style.display = 'nonde'
+        //   elink.href = URL.createObjectURL(blob)
+        //   document.body.appendChild(elink)
+        //   elink.click()
+        //   URL.revokeObjectURL(elink.href)
+        //   document.body.removeChild(elink)
+        // }).catch(() => {
+        //   loading.close()
+        // })
 
       },
     }

supervise-report-ui/src/views/reportCenter/inventorySummary.vue

@@ -162,6 +162,13 @@
       this.init()
     },
     methods: {
+      getDate(){
+        var tempDate = new Date() // 获取今天的日期
+        tempDate.setDate(tempDate.getDate() - 1) // 今天的前N天的日期，N自定义
+       var endDate = tempDate.getFullYear() + '-' + (tempDate.getMonth() + 1) + '-' + tempDate.getDate()
+        console.log(endDate)
+        return endDate
+      },
       // 搜索条件效果
       clicksearchShow() {
         this.isSearchShow = !this.isSearchShow
@@ -282,13 +289,20 @@
       },
       // 导出文件
       doBuild() {
-        exportExcel(this.page.orderDate).then((resp) => {
-          console.log(">>>>>11111111111111111", resp)
-          // console.log(">>>>>222222222", process.env.VUE_APP_BASE_API + resp.data.fullUrl)
-          window.location.href = resp.data
-        }).catch(() => {
-          // loading.close()
+        
+        this.$message({
+          showClose: true,
+          type: 'success',
+          message: '功能暂未完善...'
         })
+        
+        // exportExcel(this.page.orderDate).then((resp) => {
+        //   console.log(">>>>>11111111111111111", resp)
+        //   // console.log(">>>>>222222222", process.env.VUE_APP_BASE_API + resp.data.fullUrl)
+        //   window.location.href = resp.data
+        // }).catch(() => {
+        //   // loading.close()
+        // })
 
       },
     }

supervise-report-ui/src/views/reportCenter/salesReport.vue

@@ -188,7 +188,7 @@
         ],
         queryParams: {
             // customerSid: '11',
-          date: "2023-9-5",
+          date: this.getDate(),
           // type: "" // 类别key
         },
 

supervise-report-ui/src/views/reportCenter/salesSummary.vue

@@ -455,34 +455,40 @@
         //   background: 'rgba(0, 0, 0, 0.7)'
         // })
 
-        exportExcel({
-          current: 1,
-          size: 1,
-          params: {
-            date: "2023-04-21"
-          }
-        }).then((resp) => {
-          // loading.close
+ this.$message({
+          showClose: true,
+          type: 'success',
+          message: '功能暂未完善...'
+        })
+        
+        // exportExcel({
+        //   current: 1,
+        //   size: 1,
+        //   params: {
+        //     date: "2023-04-21"
+        //   }
+        // }).then((resp) => {
+        //   // loading.close
 
-          console.log(">>>>>11111111111111111", resp)
-          console.log(">>>>>222222222", process.env.VUE_APP_BASE_API + resp.data.fullUrl)
+        //   console.log(">>>>>11111111111111111", resp)
+        //   console.log(">>>>>222222222", process.env.VUE_APP_BASE_API + resp.data.fullUrl)
 
-          window.location.href =resp.data.fullUrl
-          // const blob = new Blob([resp], {
-          //   type: 'application/vnd.ms-excel;charset=UTF-8'
-          // })
-          // const fileName = '库存明细列表' + '.xls'
-          // const elink = document.createElement('a')
-          // elink.download = fileName
-          // elink.style.display = 'nonde'
-          // elink.href = URL.createObjectURL(blob)
-          // document.body.appendChild(elink)
-          // elink.click()
-          // URL.revokeObjectURL(elink.href)
-          // document.body.removeChild(elink)
-        }).catch(() => {
-          // loading.close()
-        })
+        //   window.location.href =resp.data.fullUrl
+        //   // const blob = new Blob([resp], {
+        //   //   type: 'application/vnd.ms-excel;charset=UTF-8'
+        //   // })
+        //   // const fileName = '库存明细列表' + '.xls'
+        //   // const elink = document.createElement('a')
+        //   // elink.download = fileName
+        //   // elink.style.display = 'nonde'
+        //   // elink.href = URL.createObjectURL(blob)
+        //   // document.body.appendChild(elink)
+        //   // elink.click()
+        //   // URL.revokeObjectURL(elink.href)
+        //   // document.body.removeChild(elink)
+        // }).catch(() => {
+        //   // loading.close()
+        // })
 
       },
     }

supervise-report-ui/src/views/reportCenter/thresholdAnalysis(阀值分析).vue

@@ -375,6 +375,9 @@
       },
       btnHandle(btnKey) {
         switch (btnKey) {
+          case 'build': // 导出
+            this.doBuild()
+            break
           case 'toAdd':
             this.toAdd()
             break

supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue

@@ -117,7 +117,7 @@
           total: 0,
           params: {
             customerSid: '',
-            date: "",
+            date: this.getDate(),
             type: '',
           } // 类别key
         },
@@ -247,11 +247,18 @@
       this.loadList()
     },
     methods: {
+      getDate(){
+        var tempDate = new Date() // 获取今天的日期
+        tempDate.setDate(tempDate.getDate() - 1) // 今天的前N天的日期，N自定义
+       var endDate = tempDate.getFullYear() + '-' + (tempDate.getMonth() + 1) + '-' + tempDate.getDate()
+        console.log(endDate)
+        return endDate
+      },
       initChart(obj) {
         var _legend = []
         var _xdata = obj.date
         var _series = obj.series
-      
+
         var _ss = []
         for (var i in _series) {
           let objNum = _series[i];
@@ -261,11 +268,11 @@
             _key = key;
             _value = objNum[key];
           })
-      
+
           _legend.push(
             _key
           )
-      
+
           if (i == 6)
             // 百分比
             _ss.push({
@@ -291,9 +298,9 @@
               },
               data: _value
             })
-      
+
         }
-      
+
         var myChart = echarts.init(document.getElementById('main'));
         // 绘制图表
         myChart.setOption({
@@ -326,7 +333,7 @@
               saveAsImage: {
                 show: false
               }
-      
+
             }
           },
           legend: {
@@ -362,7 +369,7 @@
           ],
           series: _ss
         });
-      
+
       },
       // 搜索条件效果
       clicksearchShow() {
@@ -375,6 +382,9 @@
       },
       btnHandle(btnKey) {
         switch (btnKey) {
+          case 'build': // 导出
+            this.doBuild()
+            break
           case 'toAdd':
             this.toAdd()
             break