2023-3-25

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"'
 })

mallplusui-web-admin/src/api/order.js

@@ -67,3 +67,15 @@ export function orderData(params) {
 		params: params
 	})
 }
+
+export function exportExcel(params) {
+	return request({
+		url: '/base/v1/basevehicleout/exportExcel',
+		method: 'post',
+		responseType: 'blob', // 表明返回服务器返回的数据类型
+		data: params,
+		headers: {
+			'Content-Type': 'application/json'
+		}
+	})
+}

mallplusui-web-admin/src/api/orderStatistic.js

@@ -77,8 +77,20 @@ export function updateOrderNote(params) {
 }
 export function orderData(params) {
 	return request({
-    url:'/oms/OmsOrder/data/count',
+		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'
+		}
+	})
+}

mallplusui-web-admin/src/views/oms/order/index1.vue

@@ -80,10 +80,10 @@
 						</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="收货信息  ：">
@@ -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;
 				});
 			},
@@ -717,6 +733,31 @@
 			// 导出
 			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;

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">
@@ -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() {
 
+				// 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()
+				// })
+
 			}
 
 		}