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

src/benyun/components/byDatePicker/byDatePicker.vue

@@ -43,7 +43,7 @@ export default class ByDatePicker extends VueViews {
       this.setConfig(this.propConfig)
     }
     if(this.propValue){
-      this.setValue(this.propConfig)
+      this.setValue(this.propValue)
     }
   }
   mounted(){

src/benyun/components/bySelect/bySelect.vue

@@ -61,7 +61,7 @@ export default class BySelect extends VueViews {
       this.setConfig(this.propConfig)
     }
     if(this.propValue){
-      this.setValue(this.propConfig)
+      this.setValue(this.propValue)
     }
   }
 

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

@@ -884,6 +884,9 @@ export default class AddOrder extends Vue {
     if(data.code == 'freight'){
       this.payAmountChange();
     }
+    if(data.code == 'shopName'){
+      this.orderValue.shopId = data.value;
+    }
   }
   //确定新增的商品
   confirmProduct(data:Array<any>){

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

@@ -2,7 +2,7 @@
   <el-collapse-item :name="keyName" :title="title">
     <el-radio-group v-model="value" v-if="options.length > 0" @input="input">
       <el-radio label="" class="order-radio" v-if="noLimit">不限</el-radio>
-      <el-radio v-for="(item,index) in options" :label="item.value?item.value:item.label" :key="index" class="order-radio">
+      <el-radio v-for="(item,index) in options" :label="item.value || item.value == 0?item.value:item.label" :key="index" class="order-radio">
         {{item.label}}
         <template v-if="item.slotName">
           <slot :name="item.slotName" />

src/views/oms/order/index.vue

@@ -9,7 +9,7 @@
             <input-select :options="buyerOptions" @input="parameChangeInfo($event,'receiverInfo','receiverValue')" ref="searchCom03" />
           </el-collapse-item>
           <order-checkbox title="订单状态" keyName="statusList" ref="searchCom04" :options="statusOptions" noLimit @checkboxChange="onChange($event,'statusList')" />
-          <order-checkbox title="提交状态" keyName="isSubmitted" ref="isSubmitted" :options="submitOption" noLimit @checkboxChange="onChange($event,'isSubmitted')" />
+          <order-radio title="提交状态" keyName="isSubmitted" ref="searchComsubmitStatus" :options="submitOption" noLimit @radioChange="onChangeSmt" />
           <order-radio title="买家留言" keyName="buyerMessageFilter" ref="searchCom05" :options="buyerMessageOptions" noLimit @radioChange="onChange($event,'buyerMessageFilter')">
             <template v-slot:buyerMessage>
               <el-input style="width: 140px;" v-model="value.buyerMessageContent" size="mini" placeholder="留言内容"></el-input>
@@ -489,6 +489,11 @@ export default class Order extends Vue {
           }
         }
       }
+      for(let i = productData.length - 1; i>=0; i--){
+        if(productData[i] && productData[i].residueQty == 0){
+          productData.splice(i,1)
+        }
+      }
       (this.$refs.purchaseModel as any).setShow(true);
       (this.$refs.purchaseModel as any).setTableData(productData);
     })
@@ -621,6 +626,13 @@ export default class Order extends Vue {
       }
     }
   }
+  onChangeSmt(v:any){
+    if(v == 1){
+      this.value.submitStatus = true
+    }else if(v == 0){
+      this.value.submitStatus = false
+    }
+  }
   colChange(v:any){
     if(v == 1){
       this.value.isCod = false