diff --git a/supervise-crm-ui/src/views/brank/brankAdd.vue b/supervise-crm-ui/src/views/brank/brankAdd.vue index af80f380..867b55c0 100644 --- a/supervise-crm-ui/src/views/brank/brankAdd.vue +++ b/supervise-crm-ui/src/views/brank/brankAdd.vue @@ -195,6 +195,8 @@ }) // 这里是把code的值赋给province省字段 this.formobj.province = bb.name + this.formobj.city = "" + this.formobj.county = "" this.huoquShi(bb.sid) }, huoquShi(sid1) { @@ -219,6 +221,7 @@ } }) this.formobj.city = bb.name + this.formobj.county = "" this.huoquXian(bb.sid) }, huoquXian(sid1) { diff --git a/supervise-crm-ui/src/views/enterprise/enterpriseAdd.vue b/supervise-crm-ui/src/views/enterprise/enterpriseAdd.vue index 432e0382..0f685613 100644 --- a/supervise-crm-ui/src/views/enterprise/enterpriseAdd.vue +++ b/supervise-crm-ui/src/views/enterprise/enterpriseAdd.vue @@ -227,6 +227,8 @@ }) // 这里是把code的值赋给province省字段 this.formobj.province = bb.name + this.formobj.city = "" + this.formobj.county = "" this.huoquShi(bb.sid) }, huoquShi(sid1) { @@ -251,6 +253,7 @@ } }) this.formobj.city = bb.name + this.formobj.county = "" this.huoquXian(bb.sid) }, huoquXian(sid1) { diff --git a/supervise-crm-ui/src/views/storehouse/storehouseAdd.vue b/supervise-crm-ui/src/views/storehouse/storehouseAdd.vue index a09c2dbd..eae2cc18 100644 --- a/supervise-crm-ui/src/views/storehouse/storehouseAdd.vue +++ b/supervise-crm-ui/src/views/storehouse/storehouseAdd.vue @@ -215,6 +215,8 @@ }) // 这里是把code的值赋给province省字段 this.formobj.province = bb.name + this.formobj.city = "" + this.formobj.county = "" this.huoquShi(bb.sid) }, huoquShi(sid1) { @@ -239,6 +241,7 @@ } }) this.formobj.city = bb.name + this.formobj.county = "" this.huoquXian(bb.sid) }, huoquXian(sid1) { diff --git a/supervise-report-ui/src/api/supervise/salesSummary.js b/supervise-report-ui/src/api/supervise/salesSummary.js new file mode 100644 index 00000000..02a152f0 --- /dev/null +++ b/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' + }) +} diff --git a/supervise-report-ui/src/utils/request.js b/supervise-report-ui/src/utils/request.js index 12093fa6..0e8707ac 100644 --- a/supervise-report-ui/src/utils/request.js +++ b/supervise-report-ui/src/utils/request.js @@ -7,7 +7,7 @@ import { getToken, getStorage } from '@/utils/auth' const service = axios.create({ baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests - timeout: 30000 // request timeout + timeout: 300000 // request timeout }) // request interceptor diff --git a/supervise-report-ui/src/views/reportCenter/salesSummary.vue b/supervise-report-ui/src/views/reportCenter/salesSummary.vue index 08a21b8d..04fcc3fd 100644 --- a/supervise-report-ui/src/views/reportCenter/salesSummary.vue +++ b/supervise-report-ui/src/views/reportCenter/salesSummary.vue @@ -1,114 +1,96 @@ diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue index 01e4fe42..c55df383 100644 --- a/yxt-portal-ui/src/views/Home/Home.vue +++ b/yxt-portal-ui/src/views/Home/Home.vue @@ -444,7 +444,8 @@ } else if (index === 7) { window.open('http://jianguan.yyundong.com/#/index' + '?token=' + getStorage(), '_blank') } 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') } } }