|
@@ -7,7 +7,7 @@
|
|
|
size="small"
|
|
|
:inline="true"
|
|
|
v-show="showSearch"
|
|
|
- label-width="68px"
|
|
|
+
|
|
|
>
|
|
|
<el-form-item :label="$t('orderList.orderNumber')" prop="orderSn">
|
|
|
<el-input
|
|
@@ -80,6 +80,7 @@
|
|
|
type="datetime"
|
|
|
style="width: 190px"
|
|
|
:placeholder="$t('orderList.startTime')"
|
|
|
+ :picker-options="pickerOptions"
|
|
|
></el-date-picker>
|
|
|
<span class="sp">~</span>
|
|
|
<el-date-picker
|
|
@@ -88,6 +89,8 @@
|
|
|
type="datetime"
|
|
|
style="width: 190px"
|
|
|
:placeholder="$t('orderList.endTime')"
|
|
|
+ :picker-options="pickerOptions"
|
|
|
+
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
@@ -230,6 +233,7 @@
|
|
|
<el-table-column :label="$t('orderList.operation')" align="left" width="130" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
+ v-if="false"
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
v-hasPermi="['order:edit']"
|
|
@@ -293,7 +297,7 @@
|
|
|
width="700px"
|
|
|
append-to-body
|
|
|
>
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
|
|
+ <el-form ref="form" :model="form" :rules="rules" >
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item :label="$t('orderList.orderNumber')" prop="orderSn">
|
|
@@ -356,7 +360,7 @@
|
|
|
width="700px"
|
|
|
append-to-body
|
|
|
>
|
|
|
- <el-form ref="vForm" :model="vForm" :rules="vFormRules" label-width="120px">
|
|
|
+ <el-form ref="vForm" :model="vForm" :rules="vFormRules" >
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item :label="$t('orderList.orderNumber')" prop="orderSn">
|
|
@@ -402,7 +406,7 @@
|
|
|
width="700px"
|
|
|
append-to-body
|
|
|
>
|
|
|
- <el-form ref="eForm" :model="eForm" :rules="eFormRules" label-width="120px">
|
|
|
+ <el-form ref="eForm" :model="eForm" :rules="eFormRules" >
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item :label="$t('orderList.orderNumber')" prop="orderSn">
|
|
@@ -467,7 +471,7 @@
|
|
|
width="700px"
|
|
|
append-to-body
|
|
|
>
|
|
|
- <el-form ref="rForm" :model="rForm" :rules="rFormRules" label-width="120px">
|
|
|
+ <el-form ref="rForm" :model="rForm" :rules="rFormRules" >
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item :label="$t('orderList.orderNumber')" prop="orderSn" style="width: 450px">
|
|
@@ -546,6 +550,13 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ // 配置日期选择器的选项
|
|
|
+ pickerOptions: {
|
|
|
+ // 禁用大于当前日期时间的选项
|
|
|
+ disabledDate(time) {
|
|
|
+ return time.getTime() > Date.now();
|
|
|
+ }
|
|
|
+ },
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
// 标题
|
|
@@ -696,6 +707,10 @@ export default {
|
|
|
element.name=this.$t(element.name);
|
|
|
return element;
|
|
|
});;
|
|
|
+ // console.log(this.statusList,this.payStatusList)
|
|
|
+ const retainArr = ["A", "B", "C"];
|
|
|
+ this.payStatusList = this.payStatusList.filter(item => retainArr.includes(item.key));
|
|
|
+ this.statusList = this.statusList.filter(item => retainArr.includes(item.key));
|
|
|
this.orderModeList = response.data.orderModeList;
|
|
|
this.payTypeList = response.data.payTypeList;
|
|
|
this.storeList = response.data.storeList;
|