Browse Source

Merge remote-tracking branch 'origin/master'

master
wangpengfei 2 years ago
parent
commit
cc6fa96cf2
  1. 3
      supervise-crm-ui/src/views/brank/brankAdd.vue
  2. 3
      supervise-crm-ui/src/views/enterprise/enterpriseAdd.vue
  3. 3
      supervise-crm-ui/src/views/storehouse/storehouseAdd.vue
  4. 102
      supervise-report-ui/src/api/supervise/salesSummary.js
  5. 2
      supervise-report-ui/src/utils/request.js
  6. 740
      supervise-report-ui/src/views/reportCenter/salesSummary.vue
  7. 3
      yxt-portal-ui/src/views/Home/Home.vue

3
supervise-crm-ui/src/views/brank/brankAdd.vue

@ -195,6 +195,8 @@
}) })
// codeprovince // codeprovince
this.formobj.province = bb.name this.formobj.province = bb.name
this.formobj.city = ""
this.formobj.county = ""
this.huoquShi(bb.sid) this.huoquShi(bb.sid)
}, },
huoquShi(sid1) { huoquShi(sid1) {
@ -219,6 +221,7 @@
} }
}) })
this.formobj.city = bb.name this.formobj.city = bb.name
this.formobj.county = ""
this.huoquXian(bb.sid) this.huoquXian(bb.sid)
}, },
huoquXian(sid1) { huoquXian(sid1) {

3
supervise-crm-ui/src/views/enterprise/enterpriseAdd.vue

@ -227,6 +227,8 @@
}) })
// codeprovince // codeprovince
this.formobj.province = bb.name this.formobj.province = bb.name
this.formobj.city = ""
this.formobj.county = ""
this.huoquShi(bb.sid) this.huoquShi(bb.sid)
}, },
huoquShi(sid1) { huoquShi(sid1) {
@ -251,6 +253,7 @@
} }
}) })
this.formobj.city = bb.name this.formobj.city = bb.name
this.formobj.county = ""
this.huoquXian(bb.sid) this.huoquXian(bb.sid)
}, },
huoquXian(sid1) { huoquXian(sid1) {

3
supervise-crm-ui/src/views/storehouse/storehouseAdd.vue

@ -215,6 +215,8 @@
}) })
// codeprovince // codeprovince
this.formobj.province = bb.name this.formobj.province = bb.name
this.formobj.city = ""
this.formobj.county = ""
this.huoquShi(bb.sid) this.huoquShi(bb.sid)
}, },
huoquShi(sid1) { huoquShi(sid1) {
@ -239,6 +241,7 @@
} }
}) })
this.formobj.city = bb.name this.formobj.city = bb.name
this.formobj.county = ""
this.huoquXian(bb.sid) this.huoquXian(bb.sid)
}, },
huoquXian(sid1) { huoquXian(sid1) {

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

@ -0,0 +1,102 @@
import request from '@/utils/request'
// 重新汇总入库商品
export function recount() {
return request({
url: '/ruku/recount',
method: 'get'
})
}
// 入库汇总信息
export function countinfo() {
return request({
url: '/ruku/countinfo',
method: 'get'
})
}
// 门店销售明细表
export function logPagerList(data) {
return request({
url: '/report/getStoreSalesReport',
data,
method: 'post',
headers: {
'Content-Type': 'application/json'
}
})
}
// 门店商品销售明细表
export function in112PagerList(data) {
return request({
url: '/report/getGoodsSalesReport',
data,
method: 'post',
headers: {
'Content-Type': 'application/json'
}
})
}
// 门店销售明细表(烟草)
export function inallPagerList(data) {
return request({
url: '/report/getStoreSalesReportYc',
data,
method: 'post',
headers: {
'Content-Type': 'application/json'
}
})
}
// 门店商品销售明细表(烟草)
export function inall4PagerList(data) {
return request({
url: '/report/getGoodsSalesReportYc',
data,
method: 'post',
headers: {
'Content-Type': 'application/json'
}
})
}
// 加盟店入库明细表按天查询
export function jmdRkmxList(data) {
return request({
url: '/ruku/jmdRkmxList',
data,
method: 'post',
headers: {
'Content-Type': 'application/json'
}
})
}
// 下载 加盟店入库明细表
export function jmdRkmxListDownload(data) {
return request({
url: '/ruku/jmdRkmxListDownload',
data,
method: 'post',
headers: {
'Content-Type': 'application/json'
}
})
}
// 下采购订单、入库的数据
export function ztsjZhengli() {
return request({
url: '/v1/purchaserequisition/supplierAnalysis',
method: 'post'
})
}
export function buildExcelZaiTu() {
return request({
url: '/ruku/buildExcelZaiTu'
})
}

2
supervise-report-ui/src/utils/request.js

@ -7,7 +7,7 @@ import { getToken, getStorage } from '@/utils/auth'
const service = axios.create({ const service = axios.create({
baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
// withCredentials: true, // send cookies when cross-domain requests // withCredentials: true, // send cookies when cross-domain requests
timeout: 30000 // request timeout timeout: 300000 // request timeout
}) })
// request interceptor // request interceptor

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

@ -1,114 +1,96 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<button-bar ref="btnbar" view-title="销售汇总日报表" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <button-bar ref="btnbar" view-title="销售汇总日报表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<el-row style="margin-left: 20px;margin-right: 20px;" > <el-row style="margin-left: 20px;margin-right: 20px;">
<el-col > <el-col>
<el-tabs v-model="tabActiveName"> <el-tabs v-model="tabActiveName" @tab-click="handleOrder">
<el-tab-pane label="门店销售明细表" name="uplog"> <el-tab-pane label="门店销售明细表" name="uplog">
<div> <div>
<el-date-picker v-model="jmdListQuery.orderDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" /> <el-date-picker v-model="jmdListQuery.date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
size="small" />
<el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button> <el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button>
</div> </div>
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
<el-table :data="logList" border style="width: 100%"> <el-table v-loading="tableLoading1" :data="logList" border style="width: 100%">
<el-table-column prop="createTime" label="序号" /> <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="orderDate" label="销售渠道" /> <el-table-column prop="storeName" label="销售渠道" align="center" />
<el-table-column prop="allNum" label="销售额(元)" /> <el-table-column prop="salesVolume" label="销售额(元)" align="center" />
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
<!-- 翻页 --> <!-- 翻页 -->
<pagination <pagination v-show="logListTotal > 0" :total="logListTotal" :page.sync="logListQuery.current"
v-show="logListTotal > 0" :limit.sync="logListQuery.size" class="pagination" @pagination="loadLogList" />
:total="logListTotal"
:page.sync="logListQuery.current"
:limit.sync="logListQuery.size"
class="pagination"
@pagination="loadLogList"
/>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="门店商品销售明细表" name="k112"> <el-tab-pane label="门店商品销售明细表" name="k112">
<div> <div>
<el-date-picker v-model="jmdListQuery.orderDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" /> <el-date-picker v-model="jmdListQuery.date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
<el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button> size="small" />
</div> <el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button>
<div style="margin-top: 20px;"> </div>
<el-table :data="in112List" border style="width: 100%"> <div style="margin-top: 20px;">
<el-table-column prop="supplierCodeUnified" label="销售渠道" /> <el-table v-loading="tableLoading2" :data="in112List" border style="width: 100%">
<el-table-column prop="colex" label="类型" /> <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod2" align="center" />
<el-table-column prop="colh7" label="销售订单号" /> <el-table-column prop="storeName" label="销售渠道" align="center" />
<el-table-column prop="colr17" label="商品编码" /> <el-table-column prop="orderType" label="类型" width="100" align="center" />
<el-table-column prop="colr17" label="商品名称" /> <el-table-column prop="orderNo" label="销售订单号" width="200" align="center" />
<el-table-column prop="colr17" label="数量" /> <el-table-column prop="prodCode" label="商品编码" width="200" align="center" />
<el-table-column prop="colr17" label="价格" /> <el-table-column prop="prodName" label="商品名称" align="center" />
<el-table-column prop="colr17" label="小计" /> <el-table-column prop="saleNum" label="数量" width="100" align="center" />
<el-table-column prop="salePrice" label="价格" width="100" align="center" />
<el-table-column prop="total" label="小计" width="100" align="center" />
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
<!-- 翻页 --> <!-- 翻页 -->
<pagination <pagination v-show="in112ListTotal > 0" :total="in112ListTotal" :page.sync="in112ListQuery.current"
v-show="in112ListTotal > 0" :limit.sync="in112ListQuery.size" class="pagination" @pagination="loadIn112List" />
:total="in112ListTotal"
:page.sync="in112ListQuery.current"
:limit.sync="in112ListQuery.size"
class="pagination"
@pagination="loadIn112List"
/>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="门店销售明细表(烟草)" name="all"> <el-tab-pane label="门店销售明细表(烟草)" name="all">
<div> <div>
<el-date-picker v-model="jmdListQuery.orderDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" /> <el-date-picker v-model="jmdListQuery.date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
<el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button> size="small" />
</div> <el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button>
<div style="margin-top: 20px;"> </div>
<el-table :data="inallList" border style="width: 100%"> <div style="margin-top: 20px;">
<el-table-column prop="supplierCodeUnified" label="序号" /> <el-table v-loading="tableLoading3" :data="inallList" border style="width: 100%">
<el-table-column prop="colex" label="销售渠道" /> <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod3" align="center" />
<el-table-column prop="cole4" label="销售额(元)" :show-overflow-tooltip="true" /> <el-table-column prop="storeName" label="销售渠道" align="center" />
<el-table-column prop="salesVolume" label="销售额(元)" align="center" :show-overflow-tooltip="true" />
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
<!-- 翻页 --> <!-- 翻页 -->
<pagination <pagination v-show="inallListTotal > 0" :total="inallListTotal" :page.sync="inallListQuery.current"
v-show="inallListTotal > 0" :limit.sync="inallListQuery.size" class="pagination" @pagination="loadInallList" />
:total="inallListTotal"
:page.sync="inallListQuery.current"
:limit.sync="inallListQuery.size"
class="pagination"
@pagination="loadInallList"
/>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="门店商品销售明细表(烟草)" name="hz"> <el-tab-pane label="门店商品销售明细表(烟草)" name="hz">
<div> <div>
<el-date-picker v-model="jmdListQuery.orderDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" /> <el-date-picker v-model="jmdListQuery.date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
<el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button> size="small" />
</div> <el-button style="margin-left: 20px;" size="small" type="primary" @click="loadJmdList">搜索</el-button>
<div style="margin-top: 20px;"> </div>
<el-table :data="countInfo.countList" height="350" border style="width: 100%"> <div style="margin-top: 20px;">
<el-table-column prop="supplierCodeUnified" label="销售渠道" /> <el-table v-loading="tableLoading4" :data="inall4List" height="350" border style="width: 100%">
<el-table-column prop="supplierCode" label="类型" /> <el-table-column fixed width="100" label="序号" type="index" :index="indexMethod2" align="center" />
<el-table-column prop="supplierName" label="销售订单号" :show-overflow-tooltip="true" /> <el-table-column prop="storeName" label="销售渠道" align="center" />
<el-table-column prop="prodCode" label="商品编码" /> <el-table-column prop="orderType" label="类型" width="100" align="center" />
<el-table-column prop="prodCode" label="商品名称" /> <el-table-column prop="orderNo" label="销售订单号" width="200" align="center" />
<el-table-column prop="prodCode" label="数量" /> <el-table-column prop="prodCode" label="商品编码" width="200" align="center" />
<el-table-column prop="prodCode" label="价格" /> <el-table-column prop="prodName" label="商品名称" align="center" />
<el-table-column prop="prodCode" label="小计" /> <el-table-column prop="saleNum" label="数量" width="100" align="center" />
</el-table> <el-table-column prop="salePrice" label="价格" width="100" align="center" />
</div> <el-table-column prop="total" label="小计" width="100" align="center" />
<div class="pages"> </el-table>
<!-- 翻页 --> </div>
<pagination <div class="pages">
v-show="in112ListTotal > 0" <!-- 翻页 -->
:total="in112ListTotal" <pagination v-show="inall4ListTotal > 0" :total="inall4ListTotal" :page.sync="inall4List.current"
:page.sync="in112ListQuery.current" :limit.sync="inall4List.size" class="pagination" @pagination="inall4List" />
:limit.sync="in112ListQuery.size" </div>
class="pagination"
@pagination="loadIn112List"
/>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-col> </el-col>
@ -117,270 +99,378 @@
</template> </template>
<script> <script>
import { recount, countinfo, in112PagerList, inallPagerList, logPagerList, jmdRkmxList, jmdRkmxListDownload, ztsjZhengli, buildExcelZaiTu } from '@/api/inventorySummary/inventorySummary' import {
import Pagination from '@/components/pagination' recount,
import { parseTime } from '@/utils/index' countinfo,
import ButtonBar from '@/components/ButtonBar' in112PagerList,
export default { inallPagerList,
name: 'KucunRkmxIndex', logPagerList,
components: { jmdRkmxList,
ButtonBar,Pagination }, jmdRkmxListDownload,
data() { ztsjZhengli,
return { buildExcelZaiTu
btnList: [ // } from '@/api/supervise/salesSummary'
{ import Pagination from '@/components/pagination'
type: 'success', import {
size: 'small', parseTime
icon: 'export', } from '@/utils/index'
btnKey: 'build', import ButtonBar from '@/components/ButtonBar'
btnLabel: '导出' export default {
name: 'KucunRkmxIndex',
components: {
ButtonBar,
Pagination
},
data() {
return {
btndisabled: false,
tableLoading1: false,
tableLoading2: false,
tableLoading3: false,
tableLoading4: false,
btnList: [ //
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'build',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
updateAction: "",
name: '入库明细',
tabActiveName: 'uplog',
fileList: [],
uploadResultMesssage: '',
fullscreenloading: null,
logList: [],
logListQuery: {
current: 1,
size: 10
},
logListTotal: 1,
in112List: [],
in112ListQuery: {
current: 1,
size: 10
},
in112ListTotal: 1,
inallList: [],
inallListQuery: {
current: 1,
size: 10
}, },
{ inallListTotal: 1,
type: 'info', inall4List: [],
size: 'small', inall4ListQuery: {
icon: 'cross', current: 1,
btnKey: 'doClose', size: 10
btnLabel: '关闭' },
inall4ListTotal: 1,
countInfo: {
countLog: null,
countList: []
},
countInfoMessage: '无汇总信息',
jmdList: [],
jmdListQuery: {
ate: parseTime(new Date(), '{y}-{m}-{d}')
} }
],
updateAction: "",
name: '入库明细',
tabActiveName: 'uplog',
fileList: [],
uploadResultMesssage: '',
fullscreenloading: null,
logList: [],
logListQuery: {
current: 1,
size: 5
},
logListTotal: 1,
in112List: [],
in112ListQuery: {
current: 1,
size: 5
},
in112ListTotal: 1,
inallList: [],
inallListQuery: {
current: 1,
size: 5
},
inallListTotal: 1,
countInfo: {
countLog: null,
countList: []
},
countInfoMessage: '无汇总信息',
jmdList: [],
jmdListQuery: {
orderDate: ''
}
}
},
mounted() {
//
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
//
this.init()
},
methods: {
//
btnHandle(btnKey) {
switch (btnKey) {
case 'build': //
this.doBuild()
break
case 'doClose': //
this.doClose()
break
default:
break
} }
}, },
init() { mounted() {
this.loadLogList() //
this.loadIn112List() this.$refs['btnbar'].setButtonList(this.btnList)
this.loadInallList()
this.loadCountInfo()
this.jmdListQuery.orderDate = parseTime(new Date(), '{y}-{m}-{d}')
this.loadJmdList()
}, },
loadLogList() { created() {
logPagerList({ //
current: this.logListQuery.current, this.init()
size: this.logListQuery.size,
params: {
orderDate: ''
}
}).then(response => {
if (response.code === '200' && response.data && response.data.total > 0) {
this.logList = response.data.records
this.logListTotal = response.data.total
this.logListQuery.current = response.data.current
this.logListQuery.size = response.data.size
} else {
this.logList = []
this.logListTotal = 0
}
})
}, },
loadIn112List() { methods: {
in112PagerList({ //
current: this.in112ListQuery.current, btnHandle(btnKey) {
size: this.in112ListQuery.size, switch (btnKey) {
params: { case 'build': //
orderDate: '' this.doBuild()
} break
}).then(response => { case 'doClose': //
if (response.code === '200' && response.data && response.data.total > 0) { this.doClose()
this.in112List = response.data.records break
this.in112ListTotal = response.data.total default:
this.in112ListQuery.current = response.data.current break
this.in112ListQuery.size = response.data.size
} else {
this.in112List = []
this.in112ListTotal = 0
} }
}) },
}, init() {
loadInallList() { this.loadLogList()
inallPagerList({ // this.loadIn112List()
current: this.inallListQuery.current, // this.loadInallList()
size: this.inallListQuery.size, // this.loadInall4List()
params: { // this.loadCountInfo()
orderDate: '' // this.loadJmdList()
} },
}).then(response => { handleOrder(tab, event) {
if (response.code === '200' && response.data && response.data.total > 0) { console.log("tab", tab)
this.inallList = response.data.records // this.listQuery.status = tab.name;
this.inallListTotal = response.data.total // this.getList();
this.inallListQuery.current = response.data.current // this.orderDatas(tab.name);
this.inallListQuery.size = response.data.size
} else { switch (tab.index) {
this.inallList = [] //
this.inallListTotal = 0 case "0":
this.loadLogList()
break;
//
case "1":
this.loadIn112List()
break;
//
case "2":
this.loadInallList()
break;
//
case "3":
this.loadInall4List()
break;
default:
break;
} }
})
},
loadCountInfo() { },
countinfo() loadLogList() {
.then(res => { this.tableLoading1 = true
if (res.msg === '没有统计入库明细!') { logPagerList({
this.countInfoMessage = res.msg current: this.logListQuery.current,
size: this.logListQuery.size,
params: {
date: "2023-01-07"
}
}).then(response => {
this.tableLoading1 = false
if (response.code === '200' && response.data && response.data.total > 0) {
this.logList = response.data.records
this.logListTotal = response.data.total
this.logListQuery.current = response.data.current
this.logListQuery.size = response.data.size
} else { } else {
this.countInfo = res.data this.logList = []
this.countInfoMessage = '最新统计时间:' + res.data.countLog.createTime + ', 统计用时:' + res.data.countLog.durations + ' 毫秒!' this.logListTotal = 0
} }
}) })
.catch(e => { },
console.log(e) //
}) indexMethod(index) {
}, var pagestart = (this.logListQuery.current - 1) * this.logListQuery.size
loadJmdList() { var pageindex = index + 1 + pagestart
jmdRkmxList(this.jmdListQuery) return pageindex
.then(res => { },
this.jmdList = res.data loadIn112List() {
}) this.tableLoading2 = true
.catch(e => { in112PagerList({
console.log(e) current: this.in112ListQuery.current,
size: this.in112ListQuery.size,
params: {
date: "2023-01-07"
}
}).then(response => {
this.tableLoading2 = false
if (response.code === '200' && response.data && response.data.total > 0) {
this.in112List = response.data.records
this.in112ListTotal = response.data.total
this.in112ListQuery.current = response.data.current
this.in112ListQuery.size = response.data.size
} else {
this.in112List = []
this.in112ListTotal = 0
}
}) })
}, },
downJmdList() { //
jmdRkmxListDownload(this.jmdListQuery) indexMethod2(index) {
.then(res => { var pagestart = (this.in112ListQuery.current - 1) * this.in112ListQuery.size
console.log('mmmm', res) var pageindex = index + 1 + pagestart
if (res.msg == '数据为空') { return pageindex
this.$message({ },
message: '无数据,不能导出!', loadInallList() {
type: 'error' this.tableLoading3 = true
}) inallPagerList({
current: this.inallListQuery.current,
size: this.inallListQuery.size,
params: {
date: "2023-01-07"
}
}).then(response => {
this.tableLoading3 = false
if (response.code === '200' && response.data && response.data.total > 0) {
this.inallList = response.data.records
this.inallListTotal = response.data.total
this.inallListQuery.current = response.data.current
this.inallListQuery.size = response.data.size
} else { } else {
window.open(res.data, '_blank') this.inallList = []
this.inallListTotal = 0
} }
}) })
.catch(e => { },
console.log(e) //
indexMethod3(index) {
var pagestart = (this.inallListQuery.current - 1) * this.inallListQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
loadInall4List() {
inall4PagerList({
current: this.inall4ListQuery.current,
size: this.inall4ListQuery.size,
params: {
date: "2023-01-07"
}
}).then(response => {
if (response.code === '200' && response.data && response.data.total > 0) {
this.inall4List = response.data.records
this.inall4ListTotal = response.data.total
this.inall4ListQuery.current = response.data.current
this.inall4ListQuery.size = response.data.size
} else {
this.inall4List = []
this.inall4ListTotal = 0
}
}) })
}, },
recountRk() { //
recount() indexMethod4(index) {
.then(res => { var pagestart = (this.inall4ListQuery.current - 1) * this.inall4ListQuery.size
this.$message({ var pageindex = index + 1 + pagestart
message: '入库信息已经重新汇总完成!', return pageindex
type: 'success' },
loadCountInfo() {
countinfo()
.then(res => {
if (res.msg === '没有统计入库明细!') {
this.countInfoMessage = res.msg
} else {
this.countInfo = res.data
this.countInfoMessage = '最新统计时间:' + res.data.countLog.createTime + ', 统计用时:' + res.data.countLog
.durations + ' 毫秒!'
}
}) })
this.loadCountInfo() .catch(e => {
this.tabActiveName = 'hz' console.log(e)
}) })
.catch(e => { },
console.log(e)
})
},
submitUpload() {
this.$refs.upload.submit()
},
handleProgress(event, file, fileList) {
const _this = this
this.fullscreenloading = this.$loading({
lock: true,
text: '文件正在上传',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
if (event.percent >= 100) {
_this.fullscreenloading.text = '上传完成,正在导入数据库'
}
},
handleSuccess(resp, file, fileList) {
console.log('222', resp)
if (this.fullscreenloading) this.fullscreenloading.close()
this.fullscreenloading = null
if (resp.success) {
const rdata = resp.data
this.uploadResultMesssage = '共导入数据:' + rdata.allNum + ' 条,【112】仓库记录数:' + rdata.validNum + ' 条;用时:' + rdata.durations + ' 毫秒。'
this.loadLogList() loadJmdList() {
this.tabActiveName = 'uplog' jmdRkmxList(this.jmdListQuery)
} else { .then(res => {
this.uploadResultMesssage = resp.msg this.jmdList = res.data
} })
}, .catch(e => {
downloadZtsj() { console.log(e)
ztsjZhengli() })
.then(res => { },
console.log('2222', res) downJmdList() {
buildExcelZaiTu() jmdRkmxListDownload(this.jmdListQuery)
.then(resp => { .then(res => {
console.log('3333', resp) console.log('mmmm', res)
window.open(resp.data, '_blank') if (res.msg == '数据为空') {
}) this.$message({
.catch(ee => { message: '无数据,不能导出!',
console.log(ee) type: 'error'
})
} else {
window.open(res.data, '_blank')
}
})
.catch(e => {
console.log(e)
})
},
recountRk() {
recount()
.then(res => {
this.$message({
message: '入库信息已经重新汇总完成!',
type: 'success'
}) })
this.loadCountInfo()
this.tabActiveName = 'hz'
})
.catch(e => {
console.log(e)
})
},
submitUpload() {
this.$refs.upload.submit()
},
handleProgress(event, file, fileList) {
const _this = this
this.fullscreenloading = this.$loading({
lock: true,
text: '文件正在上传',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
}) })
.catch(e => { if (event.percent >= 100) {
console.log(e) _this.fullscreenloading.text = '上传完成,正在导入数据库'
}) }
},
handleSuccess(resp, file, fileList) {
console.log('222', resp)
if (this.fullscreenloading) this.fullscreenloading.close()
this.fullscreenloading = null
if (resp.success) {
const rdata = resp.data
this.uploadResultMesssage = '共导入数据:' + rdata.allNum + ' 条,【112】仓库记录数:' + rdata.validNum + ' 条;用时:' + rdata
.durations + ' 毫秒。'
this.loadLogList()
this.tabActiveName = 'uplog'
} else {
this.uploadResultMesssage = resp.msg
}
},
downloadZtsj() {
ztsjZhengli()
.then(res => {
console.log('2222', res)
buildExcelZaiTu()
.then(resp => {
console.log('3333', resp)
window.open(resp.data, '_blank')
})
.catch(ee => {
console.log(ee)
})
})
.catch(e => {
console.log(e)
})
}
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.wenjiantit { .wenjiantit {
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
margin: 25px 0 10px 0; margin: 25px 0 10px 0;
} }
.forminfo {
margin: 0; .forminfo {
padding: 0; margin: 0;
} padding: 0;
.listcon { }
height: calc(100vh - 250px);
overflow-y: auto; .listcon {
overflow-x: hidden; height: calc(100vh - 250px);
} overflow-y: auto;
overflow-x: hidden;
}
</style> </style>

3
yxt-portal-ui/src/views/Home/Home.vue

@ -444,7 +444,8 @@
} else if (index === 7) { } else if (index === 7) {
window.open('http://jianguan.yyundong.com/#/index' + '?token=' + getStorage(), '_blank') window.open('http://jianguan.yyundong.com/#/index' + '?token=' + getStorage(), '_blank')
} else if (index === 8) { } else if (index === 8) {
window.open('http://jianguan.yyundong.com/crm/#/' + '?token=' + getStorage(), '_blank') window.open('http://192.168.3.8:9531/#/' + '?token=' + getStorage(), '_blank')
// window.open('http://jianguan.yyundong.com/crm/#/' + '?token=' + getStorage(), '_blank')
} }
} }
} }

Loading…
Cancel
Save