faiz
/
hy-shop-mer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
faiz 2024-07-11 14:44:20 +08:00
parent 63ee272f06
commit 775fd1060d
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -2,11 +2,11 @@
ENV = 'development' ENV = 'development'
# base api # base api
VUE_APP_BASE_API = 'http://192.168.1.24:8080' VUE_APP_BASE_API = 'http://192.168.1.12:8080'
# VUE_APP_BASE_API = 'https://plus.hwms.shop' # VUE_APP_BASE_API = 'https://plus.hwms.shop'
# socket 连接地址 # socket 连接地址
VUE_APP_WS_URL = 'ws://192.168.1.24:8080' VUE_APP_WS_URL = 'ws://192.168.1.12:8080'
# VUE_APP_WS_URL = 'ws://plus.hwms.shop' # VUE_APP_WS_URL = 'ws://plus.hwms.shop'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

25
src/views/order/index.vue
View File

@ -17,6 +17,20 @@
<el-form-item label="时间选择："> <el-form-item label="时间选择：">
<el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" /> <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" />
</el-form-item> </el-form-item>
<el-form-item label="完成时间：">
<el-date-picker
v-model="finishTime"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd HH:mm:ss"
size="small"
type="datetimerange"
placement="bottom-end"
placeholder="自定义时间"
style="width: 280px;"
:picker-options="pickerOptions"
@change="onchangeFinishTime"
/>
</el-form-item>
<!-- <el-form-item label="发货方式：" prop="filter_delivery"> <!-- <el-form-item label="发货方式：" prop="filter_delivery">
<el-select <el-select
v-model="tableFrom.filter_delivery" v-model="tableFrom.filter_delivery"
@ -559,6 +573,7 @@ export default {
], // 商品类型 ], // 商品类型
orderChartType: {}, orderChartType: {},
timeVal: [], timeVal: [],
finishTime: [],
fromList: { fromList: {
title: '选择时间', title: '选择时间',
custom: true, custom: true,
@ -734,10 +749,20 @@ export default {
/** 重置 */ /** 重置 */
searchReset() { searchReset() {
this.timeVal = [] this.timeVal = []
this.finishTime = []
this.tableFrom.finish_time = ""
this.tableFrom.date = '' this.tableFrom.date = ''
this.$refs.searchForm.resetFields() this.$refs.searchForm.resetFields()
this.getList(1) this.getList(1)
}, },
// 具体日期
onchangeFinishTime(e) {
this.finishTime = e;
this.tableFrom.finish_time = e ? this.finishTime.join("-") : "";
this.tableFrom.page = 1;
this.getCardList()
this.getList(1);
},
// 回 // 回
limitCount(row) { limitCount(row) {
if (row.stock > row.product_num)row.stock = row.product_num if (row.stock > row.product_num)row.stock = row.product_num