diff --git a/src/views/modules/operation-management/commodity/index.vue b/src/views/modules/operation-management/commodity/index.vue
index 962cac0..af7abed 100644
--- a/src/views/modules/operation-management/commodity/index.vue
+++ b/src/views/modules/operation-management/commodity/index.vue
@@ -55,6 +55,15 @@
>
+
+
+
+
+
+
查询 {
this.$refs.oTable.reload()
@@ -257,7 +268,8 @@ export default {
this.formInline = {
name: '',
marketId: this.marketId,
- shopId: this.shopId
+ shopId: this.shopId,
+ isAdvanceSell: 0
}
this.$refs.oTable.reload()
},
@@ -508,4 +520,3 @@ export default {
margin-bottom: 5px;
}
-
diff --git a/src/views/modules/presale/products/popup/add-or-update.vue b/src/views/modules/presale/products/popup/add-or-update.vue
index 00ea79d..5652593 100644
--- a/src/views/modules/presale/products/popup/add-or-update.vue
+++ b/src/views/modules/presale/products/popup/add-or-update.vue
@@ -682,6 +682,19 @@ export default {
)
return
}
+ if (
+ dayjs(this.ruleForm.estimatedStartDeliveryTime).format(
+ 'YYYY-MM-DD'
+ ) ===
+ dayjs(this.ruleForm.estimatedEndDeliveryTime).format(
+ 'YYYY-MM-DD'
+ )
+ ) {
+ this.$message.error(
+ '可预约发货时间必须跨天'
+ )
+ return
+ }
if (
this.ruleForm.productList &&
this.ruleForm.productList.length === 0
@@ -835,7 +848,7 @@ export default {
text-align: center;
width: 50%;
height: 40px;
- line-height:40px;
+ line-height: 40px;
font-size: 14px;
background: white;
z-index: 100;
@@ -848,7 +861,7 @@ export default {
text-align: center;
top: 0;
height: 40px;
- line-height:40px;
+ line-height: 40px;
right: 0;
width: 50%;
font-size: 14px;