Browse Source

Merge remote-tracking branch 'origin/master'

master
wangpengfei 2 years ago
parent
commit
1f48af6766
  1. 4
      supervise-report-ui/.env.development
  2. 22
      supervise-report-ui/src/views/reportCenter/inventorySummary.vue
  3. 5
      supervise-uniapp/pages.json
  4. 6
      supervise-uniapp/pages/login/login.vue
  5. 12
      supervise-wx-mp/App.vue
  6. 2
      supervise-wx-mp/common/request.api.js
  7. 10
      supervise-wx-mp/pages.json
  8. 129
      supervise-wx-mp/pages/index/auditReport.vue
  9. 37
      supervise-wx-mp/pages/index/enterpriseRisk.vue
  10. 88
      supervise-wx-mp/pages/index/inventoryReport.vue
  11. 4
      yxt-portal-ui/.env.development

4
supervise-report-ui/.env.development

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

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

@ -7,9 +7,10 @@
{{ searchxianshitit }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="queryParams" :model="orderDate" :inline="true" class="tab-header">
<el-form ref="queryParams" :model="page" :inline="true" class="tab-header">
<el-form-item label="日期">
<el-date-picker v-model="orderDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
<el-date-picker v-model="page.orderDate" type="date" clearable value-format="yyyy-MM-dd"
placeholder="选择日期" />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -146,7 +147,10 @@
},
logList3: [],
// orderDate: "2023-06-26"
orderDate: parseTime(new Date(), '{y}-{m}-{d}')
page: {
orderDate: parseTime(new Date(), '{y}-{m}-{d}')
}
}
},
mounted() {
@ -178,7 +182,7 @@
},
resetQuery() {
this.orderDate = ""
this.page.orderDate = ""
},
//
@ -225,7 +229,7 @@
},
loadLogList1() {
getReportInventoryDayGather(this.orderDate).then(response => {
getReportInventoryDayGather(this.page.orderDate).then(response => {
if (response.code === '200' && response.data) {
this.logList = response.data.list
this.logInfo = {
@ -243,7 +247,7 @@
return index + 1
},
loadLogList2() {
getReportInventoryDayStore(this.orderDate).then(response => {
getReportInventoryDayStore(this.page.orderDate).then(response => {
if (response.code === '200' && response.data) {
this.logList2 = response.data.list
this.logInfo2 = {
@ -260,7 +264,7 @@
return index + 1
},
loadLogList3() {
getReportInventoryDayToStore(this.orderDate).then(response => {
getReportInventoryDayToStore(this.page.orderDate).then(response => {
if (response.code === '200' && response.data) {
this.logList3 = response.data.list
this.logInfo3 = {
@ -278,8 +282,8 @@
},
//
doBuild() {
exportExcel(this.orderDate).then((resp) => {
console.log(">>>>>11111111111111111", resp)
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(() => {

5
supervise-uniapp/pages.json

@ -16,9 +16,6 @@
}
},
{
"path": "pages/home/AddFragment",
"style": {}
},{
"path": "pages/home/FindFragment",
"style": {}
}, {
@ -58,7 +55,7 @@
"pagePath": "pages/home/FindFragment",
"iconPath": "static/bottom-icon/find_normal.png",
"selectedIconPath": "static/bottom-icon/find_press.png",
"text": "业务"
"text": "工作台"
}, {
"pagePath": "pages/home/AddFragment",
"iconPath": "static/bottom-icon/add_normal.png",

6
supervise-uniapp/pages/login/login.vue

@ -33,8 +33,8 @@
vavatar: '/static/uview/common/logo.png',
//
formData: {
userName: '',
password: ''
userName: 'admin',
password: '111111'
},
rules: {
// name
@ -71,7 +71,7 @@
// url: '/pages/index/index',
// })
uni.switchTab({
url: '/pages/home/AddFragment'
url: '../home/AddFragment'
});
})

12
supervise-wx-mp/App.vue

@ -12,6 +12,18 @@
// url: 'pages/index/enterpriseRisk'
// });
// }, 1500);
if (!wx.cloud) {
console.error('请使用 2.2.3 或以上的基础库以使用云能力')
} else {
wx.cloud.init({
// env :
// env (wx.cloud.xxx)
// ID ID
//使 ()
// env: 'my-env-id
traceUser: true,
})
}
},
onShow: function() {
console.log('App Show')

2
supervise-wx-mp/common/request.api.js

@ -22,7 +22,7 @@ export default {
params),
// 库存汇总表
getReportInventoryDayGather: (params = {}) => request.get("/reportwxmpapi/reportinventory//getReportInventoryDayGather/" +
getReportInventoryDayGather: (params = {}) => request.get("/reportwxmpapi/reportinventory/getReportInventoryDayGather/" +
params,
params),
// 仓库库存明细表

10
supervise-wx-mp/pages.json

@ -1,6 +1,11 @@
{
"pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/auditReport",
"style": {
"navigationBarTitleText": "回款报告"
}
},{
"path": "pages/index/inventoryReport",
"style": {
"navigationBarTitleText": "库存日报表"
@ -10,11 +15,6 @@
"style": {
"navigationBarTitleText": "登录"
}
},{
"path": "pages/index/auditReport",
"style": {
"navigationBarTitleText": "回款报告"
}
},{
"path": "pages/index/enterpriseRisk",
"style": {

129
supervise-wx-mp/pages/index/auditReport.vue

@ -1,8 +1,20 @@
<template>
<view style="margin-left: 20px; margin-right: 20px;padding-bottom: 50px">
<view style="display: flex;width: 100%;">
<view style="flex: 1;"></view>
<text style="size: 25px;font-family: sans-serif;font-weight: 600;color: white;
margin-top: 10px;margin-right: 5px;border: none; padding: 5px 15px;
border-radius: 5px 5px;
background: #0498FD;" @click="download">
下载
</text>
</view>
<view
style="display: flex;width: 100%;justify-content: center;size: 25px;font-family: sans-serif;font-weight: 600;margin-top: 20px;">
style="display: flex;width: 100%;justify-content: center;size: 25px;font-family: sans-serif;font-weight: 600;margin-top: 10px;">
每日回款审核报告
</view>
@ -20,7 +32,7 @@
<text style="font-family: sans-serif;font-weight: 600;">{{info.difference}}</text>
<text> 未回款原因平台扣除手续费服务费等具体原因详见附件今日回款明细</text>
<view >
<view>
<text>截至</text>
<text style="font-family: sans-serif;font-weight: 600;">{{info.endTime}}</text>
<text>今日支付完毕款项后账户余额为</text>
@ -29,7 +41,7 @@
</view>
</view>
<view style="display: flex;flex-direction: column;margin-top: 15px; line-height: 30px;">
<text style="size: 25px;font-family: sans-serif;font-weight: 600;">审核结果</text>
<text style="text-indent:2em;">{{info.auditResult}}</text>
@ -39,21 +51,21 @@
<text style="font-family: sans-serif;font-weight: 600;">{{info.accountNumber}}</text>
<text></text>
</view> -->
</view>
<view style="display: flex;flex-direction: column;width: 100%;align-items: flex-end; margin-top: 30px;">
<text style="font-family: sans-serif;font-weight: 600;">{{info.reviewedBy}}</text>
<text style="margin-top:10px ; font-family: sans-serif;font-weight: 600;">{{info.date}}</text>
</view>
<view style="margin-top: 50px; display: flex; flex-direction: column;">
<text style="size: 25px;font-family: sans-serif;font-weight: 600;padding-bottom: 10px;">附件今日回款明细</text>
<uni-table ref="table1" border stripe emptyText="暂无更多数据">
<uni-table ref="table1" border stripe emptyText="暂无更多数据">
<uni-tr>
<uni-th align="center">销售日期</uni-th>
<uni-th align="center">支付渠道</uni-th>
@ -109,8 +121,8 @@
data() {
return {
queryParams: {
dataDate: "",
companyName: ""
dataDate: "2023-06-14",
companyName: "河北源蜂惠民科技集团有限公司"
},
loading1: false,
loading2: false,
@ -129,43 +141,94 @@
},
tableData1: [
// {
// "salesDate": "202367",
// "payChannels": "-",
// "money": "397.09",
// "mainBody": "-",
// "collection": "357.87",
// "different": "39.22",
// "notes": "6.7150.12"
// },
// {
// "salesDate": "202367",
// "payChannels": "-",
// "money": "397.09",
// "mainBody": "-",
// "collection": "357.87",
// "different": "39.22",
// "notes": "6.7150.12"
// },
],
tableData2: [
// {
// "payChannels": "",
// "money": "63094.88",
// "mainBody": "-",
// "cycle": "19"
// },
// {
// "payChannels": "",
// "money": "63094.88",
// "mainBody": "-",
// "cycle": "19"
// },
],
fileUrl: ""
};
},
onLoad(option) {
this.queryParams = {
dataDate: option.dataDate,
companyName: option.companyName
}
// this.queryParams = {
// dataDate: option.dataDate,
// companyName: option.companyName
// }
console.log('1111', this.queryParams)
this.getData()
},
onShow() {
wx.hideHomeButton()
},
methods: {
download() {
if (this.fileUrl == '') {
uni.showToast({
title: "下载地址错误,请重新进入页面。",
duration: 5000
})
return
}
uni.downloadFile({
url: this.fileUrl, //
success: (data) => {
if (data.statusCode === 200) {
uni.saveFile({
tempFilePath: data.tempFilePath, //
success: function(res) {
//
uni.showToast({
title: "文件已保存:" + res.savedFilePath,
duration: 5000
})
setTimeout(() => {
//
uni.openDocument({
filePath: res.savedFilePath,
showMenu: true, //
success: function(res) {
console.log('打开文档成功')
}
})
}, 3000);
}
});
}
},
fail: (err) => {
uni.showToast({
title: '失败请重新下载'
});
},
});
},
getData() {
console.log('getData', this.queryParams)
this.$api.getReportInfo(this.queryParams).then((resp) => {
console.log('1111>>>>>>', resp)
this.fileUrl = resp.downloadUrl
this.info = resp
}).catch(e => {
@ -183,7 +246,7 @@
this.$api.getCsmReportYesterdayByComSid(this.queryParams).then((resp) => {
console.log('3333>>>>>>', resp)
this.loading2 = true
this.loading2 = true
this.tableData2 = resp
}).catch(e => {

37
supervise-wx-mp/pages/index/enterpriseRisk.vue

@ -74,6 +74,7 @@
executionTime: ""
},
list: [],
fileUrl:"",
};
},
onLoad(option) {
@ -103,7 +104,43 @@
// })
},
onShow() {
wx.hideHomeButton()
},
methods: {
download() {
uni.downloadFile({
url: this.fileUrl,//
success: (data) => {
if (data.statusCode === 200) {
uni.saveFile({
tempFilePath: data.tempFilePath, //
success: function(res) {
//
uni.showToast({ title: "文件已保存:"+res.savedFilePath,duration:5000 })
setTimeout(()=>{
//
uni.openDocument({
filePath:res.savedFilePath,
showMenu: true,//
success:function(res){
console.log('打开文档成功')
}
})
}, 3000);
}
});
}
},
fail: (err) => {
uni.showToast({
title: '失败请重新下载'
});
},
});
},
getData() {
console.log('getData', this.queryParams)
this.$api.selectBusinessRiskInfo(this.queryParams).then((resp) => {

88
supervise-wx-mp/pages/index/inventoryReport.vue

@ -1,7 +1,22 @@
<template>
<view style="margin-left: 20px; margin-right: 20px;padding-bottom: 50px">
<view style="display: flex; width: 100%;justify-content: center; size: 25px;font-family: sans-serif;font-weight: 600;margin: 10px;">{{date}}</view>
<view style="display: flex;width: 100%;">
<view style="flex: 1;"></view>
<text style="size: 25px;font-family: sans-serif;font-weight: 600;color: white;
margin-top: 10px;margin-right: 5px;border: none; padding: 5px 15px;
border-radius: 5px 5px;
background: #0498FD;" @click="download">
下载
</text>
</view>
<view
style="display: flex; width: 100%;justify-content: center; size: 25px;font-family: sans-serif;font-weight: 600;margin: 10px;">
{{date}}
</view>
<view style="margin-top: 20px; display: flex; flex-direction: column;">
<text style="size: 25px;font-family: sans-serif;font-weight: 600;padding-bottom: 10px;">库存日报汇总表</text>
@ -13,9 +28,9 @@
<uni-tr>
<!-- <uni-th align="center">序号</uni-th> -->
<uni-th align="center" width="180">仓库类型</uni-th>
<uni-th align="center"width="80">仓库数量</uni-th>
<uni-th align="center"width="80">品种数量</uni-th>
<uni-th align="center"width="100">品种货值</uni-th>
<uni-th align="center" width="80">仓库数量</uni-th>
<uni-th align="center" width="80">品种数量</uni-th>
<uni-th align="center" width="100">品种货值</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in tableData1" :key="index">
<!-- <uni-td align="center">{{ index+1}}</uni-td> -->
@ -58,9 +73,9 @@
<uni-table ref="table1" border stripe emptyText="暂无更多数据">
<uni-tr>
<!-- <uni-th align="center">序号</uni-th> -->
<uni-th align="center" width="180">仓库名称</uni-th>
<uni-th align="center" width="80">品种数量</uni-th>
<uni-th align="center" width="100">品种货值</uni-th>
<uni-th align="center" width="180">仓库名称</uni-th>
<uni-th align="center" width="80">品种数量</uni-th>
<uni-th align="center" width="100">品种货值</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in tableData3" :key="index">
<!-- <uni-td align="center">{{ index+1 }}</uni-td> -->
@ -80,7 +95,7 @@
export default {
data() {
return {
date: "2023-06-25",
date: "",
logInfo: {
serialNumber: "",
reportTime: "",
@ -97,22 +112,75 @@
tableData1: [],
tableData2: [],
tableData3: [],
tempFilePath: "",
// fileUrl:"https://desk-fd.zol-img.com.cn/t_s960x600c5/g5/M00/01/0F/ChMkJlbKwtmINC3iAAx4ozyK5jAAALGuAMGw3cADHi7853.jpg"
fileUrl: ""
};
},
onLoad(option) {
// this.date = option.orderDate
this.date = option.orderDate
// console.log('1111', this.queryParams)
this.getData()
},
onShow() {
wx.hideHomeButton()
},
methods: {
download() {
if (this.fileUrl == '') {
uni.showToast({
title: "下载地址错误,请重新进入页面。",
duration: 5000
})
return
}
uni.downloadFile({
url: this.fileUrl, //
success: (data) => {
if (data.statusCode === 200) {
uni.saveFile({
tempFilePath: data.tempFilePath, //
success: function(res) {
//
uni.showToast({
title: "文件已保存:" + res.savedFilePath,
duration: 5000
})
setTimeout(() => {
//
uni.openDocument({
filePath: res.savedFilePath,
showMenu: true, //
success: function(res) {
console.log('打开文档成功')
}
})
}, 3000);
}
});
}
},
fail: (err) => {
uni.showToast({
title: '失败请重新下载'
});
},
});
},
getData() {
console.log('getData', this.date)
this.$api.getReportInventoryDayGather(this.date).then((resp) => {
console.log('1111>>>>>>', resp)
this.fileUrl = resp.downloadUrl
this.tableData1 = resp.list
this.logInfo = {
serialNumber: resp.serialNumber,

4
yxt-portal-ui/.env.development

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

Loading…
Cancel
Save