2023-3-25

2023-03-25 17:05:49 +08:00
parent 98aa5422cd
commit 1f7f39aa4c
5 changed files with 223 additions and 119 deletions
--- a/mallplusui-web-admin/config/dev.env.js
+++ b/mallplusui-web-admin/config/dev.env.js
@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')

 module.exports = merge(prodEnv, {
  NODE_ENV: '"development"',
-  BASE_API: '"http://mall.yyundong.com/adminapi"',
-  // BASE_API: '"http://192.168.3.20:8085"'
+  // BASE_API: '"http://mall.yyundong.com/adminapi"',
+  BASE_API: '"http://192.168.3.9:8085"'
  // BASE_API: '"http://127.0.0.1:8085"'
 })
--- a/mallplusui-web-admin/src/api/order.js
+++ b/mallplusui-web-admin/src/api/order.js
@@ -1,69 +1,81 @@
 import request from '@/utils/request'
 export function fetchList(params) {
-  return request({
-    url:'/oms/OmsOrder/list',
-    method:'get',
-    params:params
-  })
+	return request({
+		url: '/oms/OmsOrder/list',
+		method: 'get',
+		params: params
+	})
 }

 export function closeOrder(params) {
-  return request({
-    url:'/oms/OmsOrder/update/close',
-    method:'post',
-    params:params
-  })
+	return request({
+		url: '/oms/OmsOrder/update/close',
+		method: 'post',
+		params: params
+	})
 }

 export function deleteOrder(id) {
-  return request({
-    url:'/oms/OmsOrder/delete'+id,
-    method:'get'
-  })
+	return request({
+		url: '/oms/OmsOrder/delete' + id,
+		method: 'get'
+	})
 }

 export function deliveryOrder(data) {
-  return request({
-    url:'/oms/OmsOrder/update/delivery',
-    method:'post',
-    data:data
-  });
+	return request({
+		url: '/oms/OmsOrder/update/delivery',
+		method: 'post',
+		data: data
+	});
 }

 export function getOrderDetail(id) {
-  return request({
-    url:'/oms/OmsOrder/'+id,
-    method:'get'
-  });
+	return request({
+		url: '/oms/OmsOrder/' + id,
+		method: 'get'
+	});
 }

 export function updateReceiverInfo(data) {
-  return request({
-    url:'/oms/OmsOrder/update/receiverInfo',
-    method:'post',
-    data:data
-  });
+	return request({
+		url: '/oms/OmsOrder/update/receiverInfo',
+		method: 'post',
+		data: data
+	});
 }

 export function updateMoneyInfo(data) {
-  return request({
-    url:'/oms/OmsOrder/update/moneyInfo',
-    method:'post',
-    data:data
-  });
+	return request({
+		url: '/oms/OmsOrder/update/moneyInfo',
+		method: 'post',
+		data: data
+	});
 }

 export function updateOrderNote(params) {
-  return request({
-    url:'/oms/OmsOrder/update/note',
-    method:'post',
-    params:params
-  })
+	return request({
+		url: '/oms/OmsOrder/update/note',
+		method: 'post',
+		params: params
+	})
 }
 export function orderData(params) {
-  return request({
-    url:'/oms/OmsOrder/data/count',
-    method:'get',
-    params:params
-  })
+	return request({
+		url: '/oms/OmsOrder/data/count',
+		method: 'get',
+		params: params
+	})
+}
+
+export function exportExcel(params) {
+	return request({
+		url: '/base/v1/basevehicleout/exportExcel',
+		method: 'post',
+		responseType: 'blob', // 表明返回服务器返回的数据类型
+		data: params,
+		headers: {
+			'Content-Type': 'application/json'
+		}
+	})
 }
--- a/mallplusui-web-admin/src/api/orderStatistic.js
+++ b/mallplusui-web-admin/src/api/orderStatistic.js
@@ -1,84 +1,96 @@
 import request from '@/utils/request'
 export function getValueszd() {
-  return request({
-    url:'/oms/OmsOrder/getLocation',
-    method:'get'
-  })
+	return request({
+		url: '/oms/OmsOrder/getLocation',
+		method: 'get'
+	})
 }

 export function getValueqhd(params) {
-  return request({
-    url:'/oms/OmsOrder/getPickupPoint',
-    method:'get',
-	 params:params
-  })
+	return request({
+		url: '/oms/OmsOrder/getPickupPoint',
+		method: 'get',
+		params: params
+	})
 }

 export function fetchList(params) {
-  return request({
-    url:'/oms/OmsOrder/getOmsOrderLocationByPage',
-    method:'get',
-    params:params
-  })
+	return request({
+		url: '/oms/OmsOrder/getOmsOrderLocationByPage',
+		method: 'get',
+		params: params
+	})
 }

 export function closeOrder(params) {
-  return request({
-    url:'/oms/OmsOrder/update/close',
-    method:'post',
-    params:params
-  })
+	return request({
+		url: '/oms/OmsOrder/update/close',
+		method: 'post',
+		params: params
+	})
 }

 export function deleteOrder(id) {
-  return request({
-    url:'/oms/OmsOrder/delete'+id,
-    method:'get'
-  })
+	return request({
+		url: '/oms/OmsOrder/delete' + id,
+		method: 'get'
+	})
 }

 export function deliveryOrder(data) {
-  return request({
-    url:'/oms/OmsOrder/update/delivery',
-    method:'post',
-    data:data
-  });
+	return request({
+		url: '/oms/OmsOrder/update/delivery',
+		method: 'post',
+		data: data
+	});
 }

 export function getOrderDetail(id) {
-  return request({
-    url:'/oms/OmsOrder/'+id,
-    method:'get'
-  });
+	return request({
+		url: '/oms/OmsOrder/' + id,
+		method: 'get'
+	});
 }

 export function updateReceiverInfo(data) {
-  return request({
-    url:'/oms/OmsOrder/update/receiverInfo',
-    method:'post',
-    data:data
-  });
+	return request({
+		url: '/oms/OmsOrder/update/receiverInfo',
+		method: 'post',
+		data: data
+	});
 }

 export function updateMoneyInfo(data) {
-  return request({
-    url:'/oms/OmsOrder/update/moneyInfo',
-    method:'post',
-    data:data
-  });
+	return request({
+		url: '/oms/OmsOrder/update/moneyInfo',
+		method: 'post',
+		data: data
+	});
 }

 export function updateOrderNote(params) {
-  return request({
-    url:'/oms/OmsOrder/update/note',
-    method:'post',
-    params:params
-  })
+	return request({
+		url: '/oms/OmsOrder/update/note',
+		method: 'post',
+		params: params
+	})
 }
 export function orderData(params) {
-  return request({
-    url:'/oms/OmsOrder/data/count',
-    method:'get',
-    params:params
-  })
+	return request({
+		url: '/oms/OmsOrder/data/count2',
+		method: 'get',
+		params: params
+	})
+}
+
+export function exportExcel(params) {
+	return request({
+		url: '/base/v1/basevehicleout/exportExcel',
+		method: 'post',
+		responseType: 'blob', // 表明返回服务器返回的数据类型
+		data: params,
+		headers: {
+			'Content-Type': 'application/json'
+		}
+	})
 }
--- a/mallplusui-web-admin/src/views/oms/order/index1.vue
+++ b/mallplusui-web-admin/src/views/oms/order/index1.vue
@@ -80,12 +80,12 @@
 						</el-form-item> -->

 						<el-form-item label="提交日期：">
-							<el-date-picker class="input-width" v-model="listQuery.createTimeStart" value-format="yyyy-MM-dd"
-								type="date" placeholder="请选择日期"></el-date-picker> - 
-								<el-date-picker class="input-width" v-model="listQuery.createTimeEnd" value-format="yyyy-MM-dd"
-									type="date" placeholder="请选择日期"></el-date-picker>
+							<el-date-picker class="input-width" v-model="listQuery.createTimeStart"
+								value-format="yyyy-MM-dd" type="date" placeholder="请选择日期"></el-date-picker> -
+							<el-date-picker class="input-width" v-model="listQuery.createTimeEnd"
+								value-format="yyyy-MM-dd" type="date" placeholder="请选择日期"></el-date-picker>
 						</el-form-item>
-						
+
 						<el-form-item label="收货信息  ：">
 							<el-input v-model="listQuery.receiverPhone" class="input-width" placeholder="收货人电话">
 							</el-input>
@@ -121,7 +121,7 @@
 			<el-card class="operate-container" shadow="never">
 				<i class="el-icon-tickets"></i>
 				<span>数据列表</span>
-				<el-button  style="margin-top: -5px;" type="primary" class="btn-add" @click="doExport()" size="small">
+				<el-button style="margin-top: -5px;" type="primary" class="btn-add" @click="doExport()" size="small">
 					导出Excel
 				</el-button>
 			</el-card>
@@ -490,6 +490,7 @@
 			handleSearchList() {
 				this.listQuery.pageNum = 1;
 				this.getList();
+				this.orderDatas(this.listQuery.status);
 			},
 			handleSelectionChange(val) {
 				this.multipleSelection = val;
@@ -626,9 +627,24 @@
 				});
 			},
 			orderDatas(status) {
-				orderData({
-					status: status
-				}).then(response => {
+
+				let _orderSn = this.listQuery.orderSn
+				let _receiverPhone = this.listQuery.receiverPhone
+				let _createTimeStart = this.listQuery.createTimeStart
+				let _createTimeEnd = this.listQuery.createTimeEnd
+
+				if (status == 0)
+					status = null
+
+				let data = {
+					status: status,
+					orderSn: _orderSn == null ? "" : _orderSn,
+					receiverPhone: _receiverPhone == null ? "" : _receiverPhone,
+					createTimeStart: _createTimeStart == null ? "" : _createTimeStart,
+					createTimeEnd: _createTimeEnd == null ? "" : _createTimeEnd
+				}
+
+				orderData(data).then(response => {
 					this.caculateInfo = response.data;
 				});
 			},
@@ -715,8 +731,33 @@
 				}
 			},
 			// 导出
-			doExport(){
-				
+			doExport() {
+
+				// const loading = this.$loading({
+				// 	lock: true,
+				// 	text: 'Loading',
+				// 	spinner: 'el-icon-loading',
+				// 	background: 'rgba(0, 0, 0, 0.7)'
+				// })
+				// exportExcel(this.listQuery).then((resp) => {
+				// 	loading.close()
+				// 	const blob = new Blob([resp], {
+				// 		type: 'application/vnd.ms-excel'
+				// 	})
+				// 	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()
+				// })
+
+
 			},
 			handleExportOption(val) {
 				let list = this.checkList;
@@ -866,4 +907,4 @@
 			padding: 4px 0;
 		}
 	}
-</style>
+</style>
--- a/mallplusui-web-admin/src/views/oms/order/orderStatistic.vue
+++ b/mallplusui-web-admin/src/views/oms/order/orderStatistic.vue
@@ -69,7 +69,7 @@
 				</div>
 				<div style="margin-top: 15px">
 					<el-form :inline="true" :model="listQuery" size="small" label-width="140px">
-						<el-form-item label="所在地：">
+						<el-form-item label="社区名称">
 							<el-select v-model="listQuery.valueszd" @change="changeszd" placeholder="请选择所在地">
 								<el-option v-for="item in rangeszd" :key="item.id" :label="item.name"
 									:value="item.name">
@@ -115,7 +115,7 @@
 			<el-card class="operate-container" shadow="never">
 				<i class="el-icon-tickets"></i>
 				<span>数据列表</span>
-				<el-button  style="margin-top: -5px;" type="primary" class="btn-add" @click="doExport()" size="small">
+				<el-button style="margin-top: -5px;" type="primary" class="btn-add" @click="doExport()" size="small">
 					导出Excel
 				</el-button>
 			</el-card>
@@ -317,7 +317,7 @@

 			handleOrder(tab, event) {
 				this.listQuery.status = tab.name;
-				this.status =  tab.name;
+				this.status = tab.name;
 				this.getList();
 				this.orderDatas(tab.name);
 				console.log("tab", tab)
@@ -326,7 +326,7 @@
 				this.listQuery = {
 					pageNum: 1,
 					pageSize: 10,
-					status:this.status,
+					status: this.status,
 					valueszd: null,
 					valueqhd: null,
 					receiverPhone: null
@@ -338,6 +338,7 @@

 				this.listQuery.pageNum = 1;
 				this.getList();
+				this.orderDatas(this.listQuery.status);
 			},
 			handleViewOrder(index, row) {
 				this.$router.push({
@@ -376,15 +377,53 @@
 				});
 			},
 			orderDatas(status) {
-				orderData({
-					status: status
-				}).then(response => {
+
+
+				let _receiverPhone = this.listQuery.receiverPhone
+				let _valueszd = this.listQuery.valueszd
+				let _valueqhd = this.listQuery.valueqhd
+
+				if (status == 0)
+					status = null
+
+				let data = {
+					status: status,
+					receiverPhone: _receiverPhone == null ? "" : _receiverPhone,
+					valueszd: _valueszd == null ? "" : _valueszd,
+					valueqhd: _valueqhd == null ? "" : _valueqhd
+				}
+
+				orderData(data).then(response => {
 					this.caculateInfo = response.data;
 				});
 			},
 			// 导出
-			doExport(){
-				
+			doExport() {
+
+				// const loading = this.$loading({
+				// 	lock: true,
+				// 	text: 'Loading',
+				// 	spinner: 'el-icon-loading',
+				// 	background: 'rgba(0, 0, 0, 0.7)'
+				// })
+				// exportExcel(this.listQuery).then((resp) => {
+				// 	loading.close()
+				// 	const blob = new Blob([resp], {
+				// 		type: 'application/vnd.ms-excel'
+				// 	})
+				// 	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()
+				// })
+
 			}

 		}
@@ -465,4 +504,4 @@
 			padding: 4px 0;
 		}
 	}
-</style>
+</style>