Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/views/oms/order/components/addOrder.vue

@@ -22,12 +22,12 @@
               {{ getFromText(value.sourceFrom) }}
             </template>
             <template v-slot:shopName="{value}">
-              <el-input :placeholder="!orderValue.id?'请选择标签':''" :value="value.shopName" :disabled="orderValue.id?true:false" size="small" class="myinpuy-with-select" clearable>
+              <el-input :placeholder="!orderValue.id?'请选择标签':''" :value="value.shopName" :disabled="orderValue.id?true:false" @clear="clearShop" size="small" class="myinpuy-with-select" clearable>
                 <el-button slot="append" v-if="!orderValue.id" icon="el-icon-more" @click="showShop"></el-button>
               </el-input>
             </template>
             <template v-slot:labels="{value}">
-              <el-input :placeholder="!orderValue.id?'请选择标签':''" :value="value.labels" :disabled="orderValue.id?true:false" size="small" class="myinpuy-with-select" clearable>
+              <el-input :placeholder="!orderValue.id?'请选择标签':''" :value="value.labels" :disabled="orderValue.id?true:false" size="small" @clear="clearLabels" class="myinpuy-with-select" clearable>
                 <el-button slot="append" v-if="!orderValue.id" icon="el-icon-more" @click="showLabels"></el-button>
               </el-input>
             </template>
@@ -896,6 +896,12 @@ export default class AddOrder extends Vue {
     value.shopName = data.shopName;
     (this.$refs.baseform as any).setValue(value);
   }
+  clearShop(){
+    let value:any = (this.$refs.baseform as any).getValue();
+    value.shopId = '';
+    value.shopName = '';
+    (this.$refs.baseform as any).setValue(value);
+  }
   setDetail(data:any){
     this.orderValue = data;
     if(this.orderValue.isPay == 0 || this.orderValue.isPay == 1){
@@ -926,6 +932,11 @@ export default class AddOrder extends Vue {
       (this.$refs.labelsModal as any).setShow(true);
     }
   }
+  clearLabels(){
+    let value:any = (this.$refs.baseform as any).getValue();
+    value.labels = '';
+    (this.$refs.baseform as any).setValue(value);
+  }
   handleSuccess(){
     this.$emit('handleSuccess');
     this.getData();

src/views/oms/order/components/labelsModal.vue

@@ -43,6 +43,7 @@ export default class LabelsModal extends Vue {
   }
   tableConfig:any={
     attr:{
+      triggerRowCheck:'row',
       size:'mini',
       align:'center',
       seq:true,

src/views/oms/order/components/loadOrderModal.vue

@@ -194,7 +194,15 @@ export default class LoadOrderModal extends Vue {
       }
       value.sourceIds = this.sourceIds.split('\n');
     }else if(this.type == 2){
-      if(Number(this.dateType) > 3 || Number(this.dateType) < 1){
+      let isS=false;
+      for(const item of this.dateTypeOptions){
+        if(item.value == this.dateType){
+          isS = true;
+          break
+        }
+      }
+      // if(Number(this.dateType) > 5 || Number(this.dateType) < 1){
+      if(!isS){
         if(msg){
           msg = msg + '，时间类型'
         }else{

src/views/oms/order/components/shopModal.vue

@@ -75,7 +75,7 @@ export default class ShopModal extends Vue {
     }
   }
   mounted(){
-    this.getList();
+    
   }
   //分页
   pagination(){
@@ -124,7 +124,8 @@ export default class ShopModal extends Vue {
     })
   }
   setShow(v:boolean){
-    this.value = v
+    this.value = v;
+    this.getList();
   }
   btn(){
     let data = (this.$refs.view as any).getSelectData();

src/views/oms/orderPay/index.vue

@@ -29,7 +29,7 @@ export default class OrderPay extends Vue {
           prop:'buyerId',
           component:'by-input'
         },{
-          label:'买家支付帐号',
+          label:'买家帐号',
           prop:'buyerAccount',
           component:'by-input'
         },{
@@ -64,7 +64,7 @@ export default class OrderPay extends Vue {
           component:'by-input'
         },{
           span:6,
-          label:'卖家收款账号',
+          label:'卖家账号',
           prop:'sellerAccount',
           component:'by-input'
         }
@@ -133,7 +133,7 @@ export default class OrderPay extends Vue {
         field:'buyerId',
         width:120
       },{
-        title:'买家支付帐号',
+        title:'买家帐号',
         field:'buyerAccount',
         width:120
       },{
@@ -141,7 +141,7 @@ export default class OrderPay extends Vue {
         field:'sellerId',
         width:120
       },{
-        title:'卖家收款账号',
+        title:'卖家账号',
         field:'sellerAccount',
         width:120
       },{