ymy 1 gadu atpakaļ
vecāks
revīzija
e860a3feaa

+ 16 - 1
src/views/oms/B2BOrder/components/purchaseModel.vue

@@ -51,6 +51,8 @@ export default class PurchaseModel extends Vue {
         }],
         deliveryData:[{
           required: true, message: '交货时间不能为空!', trigger: 'blur'
+        },{
+          validator: this.validateDate, trigger: 'blur' 
         }],
         delivery:[{
           required: true, message: '交货人不能为空!', trigger: 'blur'
@@ -88,7 +90,7 @@ export default class PurchaseModel extends Vue {
           attr:{
             placeholder:'交货时间',
             type:'datetime',
-            defaultNow:true,
+            // defaultNow:true,
             clearable:true
           }
         }
@@ -192,6 +194,19 @@ export default class PurchaseModel extends Vue {
       }]
     }]
   }
+
+  validateDate(rule:any, value:any, callback:any){
+    if (value) {
+      if(new Date() >= new Date(value)) {
+        callback(new Error('交货时间不能小于当前时间!'));  
+      }else{
+        callback();
+      }
+      
+    } else {
+      callback();
+    }
+  }
   validatePhone(rule:any, value:any, callback:any){
     if (value) {
       if(!/^1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(value)) {

+ 1 - 0
src/views/oms/B2COrder/components/orderTable.vue

@@ -68,6 +68,7 @@
       </template>
     </vxe-column>
     <vxe-column field="shopName" title="店铺名称" width="140"></vxe-column>
+    <vxe-column field="shopSite" title="平台" width="140"></vxe-column>
     <vxe-column field="orderDate" title="订单日期" width="140">
       <!-- <template #default="{ row }">
         {{ formatDate(row.orderDate) }}

+ 16 - 1
src/views/oms/B2COrder/components/purchaseModel.vue

@@ -51,6 +51,8 @@ export default class PurchaseModel extends Vue {
         }],
         deliveryData:[{
           required: true, message: '交货时间不能为空!', trigger: 'blur'
+        },{
+          validator: this.validateDate, trigger: 'blur' 
         }],
         delivery:[{
           required: true, message: '交货人不能为空!', trigger: 'blur'
@@ -88,7 +90,7 @@ export default class PurchaseModel extends Vue {
           attr:{
             placeholder:'交货时间',
             type:'datetime',
-            defaultNow:true,
+            // defaultNow:true,
             clearable:true
           }
         }
@@ -192,6 +194,19 @@ export default class PurchaseModel extends Vue {
       }]
     }]
   }
+
+  validateDate(rule:any, value:any, callback:any){
+    if (value) {
+      if(new Date() >= new Date(value)) {
+        callback(new Error('交货时间不能小于当前时间!'));  
+      }else{
+        callback();
+      }
+      
+    } else {
+      callback();
+    }
+  }
   validatePhone(rule:any, value:any, callback:any){
     if (value) {
       if(!/^1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(value)) {