diff --git a/src/api/statistics/cusmoterSale.js b/src/api/statistics/cusmoterSale.js
index 6107cc9..f026a83 100644
--- a/src/api/statistics/cusmoterSale.js
+++ b/src/api/statistics/cusmoterSale.js
@@ -4,7 +4,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
- url: '/oms/v1/smssalesbill/listPage',
+ url: '/oms//v1/smssalesbill/customerSales',
method: 'post',
data: params,
headers: {
@@ -58,5 +58,20 @@ export default {
'Content-Type': 'application/json'
}
})
- }
+ },
+
+ expExcelOfCustomer: function(params) {
+ return request({
+ url: '/oms/v1/smssalesbill/customerSalesExport',
+ method: 'post',
+ data: params,
+ // headers: {
+ // "responseType": "blob" //将二进制流转换成blob对象
+ // },
+ headers: {
+ 'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
+ },
+ responseType: 'blob'
+ })
+ },
}
diff --git a/src/api/statistics/goodsPurchase.js b/src/api/statistics/goodsPurchase.js
index fda3c05..83c1dd9 100644
--- a/src/api/statistics/goodsPurchase.js
+++ b/src/api/statistics/goodsPurchase.js
@@ -4,7 +4,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
- url: '/oms/v1/smssalesbill/listPage',
+ url: '/oms/apiadmin/purchasebill/goodsPurchase',
method: 'post',
data: params,
headers: {
@@ -58,5 +58,20 @@ export default {
'Content-Type': 'application/json'
}
})
- }
+ },
+
+ expExcelOfCustomer: function(params) {
+ return request({
+ url: '/oms/apiadmin/purchasebill/goodsPurchaseExport',
+ method: 'post',
+ data: params,
+ // headers: {
+ // "responseType": "blob" //将二进制流转换成blob对象
+ // },
+ headers: {
+ 'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
+ },
+ responseType: 'blob'
+ })
+ },
}
diff --git a/src/api/statistics/goodsSale.js b/src/api/statistics/goodsSale.js
index 1d23509..177bb1b 100644
--- a/src/api/statistics/goodsSale.js
+++ b/src/api/statistics/goodsSale.js
@@ -4,7 +4,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
- url: '/oms/v1/smssalesbill/listPage',
+ url: '/oms/v1/smssalesbill/goodsSales',
method: 'post',
data: params,
headers: {
@@ -58,5 +58,19 @@ export default {
'Content-Type': 'application/json'
}
})
- }
+ },
+ expExcelOfCustomer: function(params) {
+ return request({
+ url: '/oms/v1/smssalesbill/goodsSalesExport',
+ method: 'post',
+ data: params,
+ // headers: {
+ // "responseType": "blob" //将二进制流转换成blob对象
+ // },
+ headers: {
+ 'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
+ },
+ responseType: 'blob'
+ })
+ },
}
diff --git a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
index 1c4108f..7142b22 100644
--- a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
+++ b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
@@ -118,9 +118,10 @@
删除
-
-
-
+
+
+
+
@@ -828,7 +829,9 @@
"sid": value[i].sid != null ? value[i].sid : '',
"goodsSkuSid": value[i].sid != null ? value[i].sid : '',
"goodsSkuCode": value[i].goodsSkuCode != null ? value[i].goodsSkuCode : '',
- "goodsSkuTitle": value[i].goodsName != null ? value[i].goodsName : '',
+ "goodsSkuTitle": value[i].title != null ? value[i].title : '',
+ "goodsCode": value[i].goodsCode != null ? value[i].goodsCode : '',
+ "goodsSpuName": value[i].goodsName != null ? value[i].goodsName : '',
"goodsSN": value[i].barCode != null ? value[i].barCode : '',
"goodsSkuOwnSpec": value[i].goodsSkuOwnSpec != null ? value[i].goodsSkuOwnSpec : '',
"unit": value[i].unit != null ? value[i].unit : '',
diff --git a/src/views/purchase/purchaseOrder/purchaseOrderInfo.vue b/src/views/purchase/purchaseOrder/purchaseOrderInfo.vue
index 7c8ef94..cef53a0 100644
--- a/src/views/purchase/purchaseOrder/purchaseOrderInfo.vue
+++ b/src/views/purchase/purchaseOrder/purchaseOrderInfo.vue
@@ -80,9 +80,10 @@
-
-
-
+
+
+
+
diff --git a/src/views/purchase/purchaseOrder/relation/chooseproducts.vue b/src/views/purchase/purchaseOrder/relation/chooseproducts.vue
index 564994d..e12911a 100644
--- a/src/views/purchase/purchaseOrder/relation/chooseproducts.vue
+++ b/src/views/purchase/purchaseOrder/relation/chooseproducts.vue
@@ -61,8 +61,9 @@
-
-
+
+
+
diff --git a/src/views/purchase/purchaseReview/index.vue b/src/views/purchase/purchaseReview/index.vue
index d91ffd4..10b7085 100644
--- a/src/views/purchase/purchaseReview/index.vue
+++ b/src/views/purchase/purchaseReview/index.vue
@@ -137,9 +137,10 @@
-
-
-
+
+
+
+
diff --git a/src/views/purchase/purchaseReview/purchaseOrderInfo.vue b/src/views/purchase/purchaseReview/purchaseOrderInfo.vue
index 101c0fe..11f8028 100644
--- a/src/views/purchase/purchaseReview/purchaseOrderInfo.vue
+++ b/src/views/purchase/purchaseReview/purchaseOrderInfo.vue
@@ -80,9 +80,10 @@
-
-
-
+
+
+
+
diff --git a/src/views/statistics/cusmoterSale/cusmoterSale.vue b/src/views/statistics/cusmoterSale/cusmoterSale.vue
index 0c78095..c74a08e 100644
--- a/src/views/statistics/cusmoterSale/cusmoterSale.vue
+++ b/src/views/statistics/cusmoterSale/cusmoterSale.vue
@@ -17,7 +17,7 @@
type="date" placeholder="选择日期">
-
+
@@ -39,11 +39,11 @@
@selection-change="handleSelectionChange">
-
-
-
-
-
+
+
+
+
+
@@ -76,6 +76,12 @@
return {
btndisabled: false,
btnList: [{
+ type: 'success',
+ size: 'small',
+ icon: 'export',
+ btnKey: 'build',
+ btnLabel: '导出'
+ }, {
type: 'info',
size: 'small',
icon: 'cross',
@@ -99,8 +105,6 @@
endDate: '',
cusmoterCode: '',
customerName: '',
- useOrgSid: '',
- createOrgSid: '',
}
}
}
@@ -134,6 +138,9 @@
case 'doClose':
this.doClose()
break
+ case 'build':
+ this.build()
+ break
default:
break
}
@@ -155,8 +162,9 @@
// 查询列表信息
getList() {
this.listLoading = true
- this.listQuery.params.useOrgSid = window.sessionStorage.getItem('orgSid')
- this.listQuery.params.createOrgSid = window.sessionStorage.getItem('orgSid')
+ this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+ this.listQuery.params.orgPath = window.sessionStorage.getItem('orgSidPath')
+ this.listQuery.params.menuUrl = this.$route.path
req.listPage(this.listQuery).then(response => {
this.listLoading = false
if (response.success) {
@@ -182,11 +190,8 @@
params: {
startDate: '',
endDate: '',
- customerCode: '',
+ cusmoterCode: '',
customerName: '',
- warehouseName: '',
- useOrgSid: '',
- createOrgSid: '',
}
}
this.getList()
@@ -247,6 +252,34 @@
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
+ },
+ // 导出
+ build() {
+
+ const loading = this.$loading({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
+ req.expExcelOfCustomer(this.listQuery.params).then((resp) => {
+ loading.close()
+ const blob = new Blob([resp], {
+ type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+ })
+ const fileName = '客户销售统计_' + this.listQuery.params.startDate + '.xlsx'
+ 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()
+ })
}
}
}
diff --git a/src/views/statistics/goodsPurchase/goodsPurchase.vue b/src/views/statistics/goodsPurchase/goodsPurchase.vue
index 417992d..6ad1410 100644
--- a/src/views/statistics/goodsPurchase/goodsPurchase.vue
+++ b/src/views/statistics/goodsPurchase/goodsPurchase.vue
@@ -8,19 +8,42 @@