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

src/api/maindataMaterialRelevancy.ts

@@ -0,0 +1,24 @@
+import request from '@/benyun/utils/request'
+export function pullItem(data:any){
+	return request({
+		url: '/omsOrder/shopItem/pullItem',
+		method: 'POST',
+		data: data
+	})
+}
+
+export function maindataMaterialRelevancy(params:any){
+	return request({
+		url:'/maindata/maindataMaterialRelevancy/page',
+		method:'Get',
+		params:params
+	})
+}
+
+export function materialrelevancy(data:any){
+	return request({
+		url:'/maindata/maindataMaterialRelevancy/materialrelevancy',
+		method:'POST',
+		data:data
+	})
+}

src/api/omsOrder.ts

@@ -65,29 +65,6 @@ export function pullOrder(data:any){
 	})
 }
 
-export function pullItem(data:any){
-	return request({
-		url: '/omsOrder/shopItem/pullItem',
-		method: 'POST',
-		data: data
-	})
-}
-
-export function maindataMaterialRelevancy(params:any){
-	return request({
-		url:'/maindata/maindataMaterialRelevancy/page',
-		method:'Get',
-		params:params
-	})
-}
-
-export function materialrelevancy(data:any){
-	return request({
-		url:'/maindata/maindataMaterialRelevancy/materialrelevancy',
-		method:'POST',
-		data:data
-	})
-}
 
 export function purchaseQty(params:any){
 	return request({

src/benyun/components/byDatePicker/byDatePicker.vue

@@ -37,7 +37,10 @@ import VueViews from '@/benyun/compVue/VueViews'
 
 @Component
 export default class ByDatePicker extends VueViews {
-
+  @Watch('propValue')
+  propValueChange(v:any){
+    this.setValue(v);
+  }
   created(){
     if(this.propConfig){
       this.setConfig(this.propConfig)

src/benyun/components/byInput/byInput.vue

@@ -28,14 +28,7 @@ export default class ByInput extends VueViews {
 
   @Watch('propValue')
   propValueChange(v:any){
-    if(v){
-      this.value = (this as any).$lodash.cloneDeep(v);
-      if(this.attrs.type == 'number'){
-        this.value = Number(v);
-      }
-    }else{
-      this.value = null;
-    }
+    this.setValue(v);
   }
 
   created(){

src/benyun/components/bySelect/bySelect.vue

@@ -40,6 +40,11 @@ export default class BySelect extends VueViews {
   value:any='';
   options:Array<any>=[]
 
+  @Watch('propValue')
+  propValueChange(v:any){
+    this.setValue(v);
+  }
+
   get itemLabel(){
     let n = 'label';
     if(this.attrs.label){

src/views/audit/productManagement/components/importProduct.vue

@@ -1,184 +0,0 @@
-<template>
-  <vxe-modal v-model="value" id="importProduct" width="70%" height="80%" @show="show" show-zoom resize transfer v-loading="load">
-    <template #title>
-      <span>关联商品</span>
-    </template>
-    <template #default>
-      <div class="i-box">
-        <div class="table" id="t1">
-          <by-table :propConfig="config" ref="table"></by-table>
-        </div>
-        <!-- <div class="icon">
-          <i class="el-icon-right" style="font-size: 30px;"></i>
-        </div>
-        <div class="table t2">
-          <by-table :propConfig="config2" ref="table2"></by-table>
-        </div> -->
-      </div>
-      <product-modal ref="product" @confirm="confirmProduct" />
-    </template>
-  </vxe-modal>
-
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import { maindataMaterialRelevancy,materialrelevancy } from '@/api/omsOrder'
-import ProductModal from "@/components/skuModal/productModal.vue";
-@Component({components:{ProductModal}})
-export default class ImportProduct extends Vue {
-  value = false;
-  load = false;
-  syncProduct:Array<any>=[];
-  currentRow:any=null;
-  config:any={
-    attr:{
-      size:'mini',
-      align:'center'
-    },
-    columns:[{
-      title:'商品编码',
-      field:'goodsSkuId'
-    },{
-      title:'商品名称',
-      field:'goodsName'
-    },{
-      title:'关联的oms商品',
-      field:'materialField'
-    },{
-      title:'操作',
-      action:true,
-      width:170,
-      plugins:[{
-        name:'关联商品',
-        audit:'',
-        event:{
-          show:(row:any) => {
-            return row.isSync != 1
-          },
-          click:(item:any) => {
-            (this.$refs.product as any).setShow(true);
-            this.setCurrentRow(item);
-          }
-        }
-      },{
-        name:'直接注册',
-        audit:'',
-        event:{
-          show:(row:any) => {
-            return row.isSync != 1
-          },
-          click:(item:any) => {
-            this.$message('尚未开发！');
-            console.log('该行数据：',item)
-          }
-        }
-      }]
-    }]
-  }
-  config2:any={
-    attr:{
-      size:'mini',
-      align:'center'
-    },
-    columns:[{
-      title:'名称',
-      field:'name'
-    }]
-  }
-
-  mounted(){
-
-  }
-  setCurrentRow(row:any){
-    this.currentRow = row;
-  }
-
-  show(){
-    const h = document.getElementById('t1')?.offsetHeight;
-    if(h){
-      this.config.attr.height = h - 48;
-      this.config2.attr.height = h - 48;
-    }
-    this.getSyncData()
-  }
-
-  setShow(v:boolean){
-    this.value = v;
-  }
-
-  getSyncData(){
-    let page = (this.$refs.table as any).getPage();
-    let data:any={
-      pageNo:page.pageNo,
-      pageSize:page.pageSize
-    }
-    this.load = true;
-    maindataMaterialRelevancy(data).then((res:any) => {
-      this.load = false;
-      if(this.$refs.table){
-        (this.$refs.table as any).setValue(res.data.records);
-        page.pageNo = res.data.current;
-        page.total = res.data.total;
-        (this.$refs.table as any).setPage(page);
-      }
-    }).catch((err:any) => {
-      this.load = false;
-    })
-  }
-
-  confirmProduct(data:Array<any>){
-    if(data.length == 0){
-      this.$message('请选择商品！');
-      return;
-    }
-    let value:any={
-      lid:this.currentRow.id,
-      mskuid:data[0].id
-    }
-    this.load = true;
-    materialrelevancy(value).then((res:any) => {
-      this.load = false;
-      this.$message({
-        message:'商品关联成功！',
-        type:'success'
-      })
-      this.getSyncData();
-    }).catch((err:any) => {
-      this.load = false;
-      this.$message.error('商品关联失败！')
-    })
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.i-box{
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  height: 100%;
-  .table{
-    width: 100%;
-    height: 100%;
-    overflow: auto;
-    box-shadow: 0 0 10px rgba(86,86,86,.1);
-    // background-color: aliceblue;
-  }
-  .t1{
-    width: 52%;
-    // box-shadow: 5px -5px 5px rgba(127,127,127,.1);
-  }
-  .t2{
-    width: 40%;
-    // box-shadow: -5px -5px 5px rgba(127,127,127,.1);
-  }
-  .icon{
-    width: 8%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-}
-</style>

src/views/audit/productManagement/index.vue

@@ -96,8 +96,6 @@
 				</div>
 			</div>
 		</transition-group>
-		<import-product ref="importProduct" />
-		<synchronous-orderModal ref="synchronousOrderModal" @handleSuccess="handleSuccess" />
 	</div>
 </template>
 <script lang="ts">
@@ -105,9 +103,7 @@
 	import api from '@/api/currency'
 	import other from '@/api/other'
 	import ForTab from "@/components/ForTab/index.vue";
-	import ImportProduct from "./components/importProduct.vue";
-	import SynchronousOrderModal from "./components/synchronousOrderModal.vue";
-	@Component({ components: { ForTab, ImportProduct, SynchronousOrderModal } })
+	@Component({ components: { ForTab } })
 	export default class productManagement extends Vue {
 		loading : any = null
 		tagsData : any = [] // 标签值
@@ -812,23 +808,7 @@
 					delete: true,
 					search: true,
 					refresh: true
-				},
-				customTools: [
-					{
-						name: '商品同步', icon: 'el-icon-setting', event: {
-							click: () => {
-								(this.$refs.synchronousOrderModal as any).setShow(true);
-							}
-						}
-					},
-					{
-						name: '关联商品', icon: 'el-icon-setting', event: {
-							click: () => {
-								(this.$refs.importProduct as any).setShow(true);
-							}
-						}
-					}
-				]
+				}
 			},
 			table: {
 				attr: {
@@ -895,13 +875,6 @@
 				this.getDataList()
 			}, 500)
 		}
-		//商品同步成功
-		handleSuccess() {
-			let page = (this.$refs.moduleView as any).getPage();
-			page.pageNo = 1;
-			(this.$refs.moduleView as any).setPage(page);
-			this.getDataList()
-		}
 		// 监听单表格数据
 		getSingleValue(e : any) {
 			// console.log('监听单表格 ==> ', e);

src/views/audit/productManagement/components/synchronousOrderModal.vue → src/views/audit/synchronous/components/synchronousOrderModal.vue

@@ -85,7 +85,7 @@
 
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import { pullItem } from '@/api/omsOrder'
+import { pullItem } from '@/api/maindataMaterialRelevancy'
 @Component
 export default class SynchronousOrderModal extends Vue {
   load = false;

src/views/audit/synchronous/index.vue

@@ -0,0 +1,213 @@
+<template>
+  <div class="m-box" v-loading="load">
+    <moduleView :propConfig="config" ref="view" @search="search" @pagination="pagination" @resert="resert" />
+    <synchronous-orderModal ref="synchronousOrderModal" @handleSuccess="handleSuccess" />
+    <product-sku-modal ref="sku"  @confirm="confirmProduct" />
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import SynchronousOrderModal from "./components/synchronousOrderModal.vue";
+import { maindataMaterialRelevancy, materialrelevancy } from '@/api/maindataMaterialRelevancy'
+@Component({ components: { SynchronousOrderModal } })
+export default class SynchronousProduct extends Vue {
+  load = false;
+  currentRow:any=null;
+  count=0;
+  time:any=null;
+  config:any={
+    search:{
+      attr:{
+        size:'mini',
+        rules:{
+          name:[{
+            required: true, message: '请输入名称', trigger: 'blur'
+          }]
+        }
+      },
+      columns:[
+        [{
+          span:6,
+          label:'商品编码',
+          prop:'goodsSkuId',
+          component:'by-input',
+          compConfig:{
+          }
+        },{
+          span:6,
+          label:'商品名称',
+          prop:'goodsName',
+          component:'by-input',
+          compConfig:{
+          }
+        },{
+          span:6,
+          label:'关联商品',
+          prop:'materialField',
+          component:'by-input',
+          compConfig:{
+          }
+        }]
+      ]
+    },
+    tool:{
+      customTools: [
+        {
+          name: '商品同步', icon: 'el-icon-setting', event: {
+            click: () => {
+              (this.$refs.synchronousOrderModal as any).setShow(true);
+            }
+          }
+        }
+      ]
+    },
+    table:{
+      attr:{
+        size:'mini',
+        align:'center'
+      },
+      columns:[{
+        title:'商品编码',
+        field:'goodsSkuId',
+        width:150
+      },{
+        title:'商品名称',
+        field:'goodsName'
+      },{
+        title:'关联的sku',
+        field:'materialField'
+      },{
+        title:'关联的skuID',
+        field:'materialSkuId',
+        width:140
+      },{
+        title:'操作',
+        action:true,
+        width:170,
+        plugins:[{
+          name:'关联商品',
+          audit:'',
+          event:{
+            show:(row:any) => {
+              return row.isSync != 1
+            },
+            click:(item:any) => {
+              (this.$refs.sku as any).setShow(true);
+              this.setCurrentRow(item);
+            }
+          }
+        },{
+          name:'直接注册',
+          audit:'',
+          event:{
+            show:(row:any) => {
+              return row.isSync != 1
+            },
+            click:(item:any) => {
+              this.$message('尚未开发！');
+              console.log('该行数据：',item)
+            }
+          }
+        }]
+      }]
+    }
+  }
+
+  mounted(){
+    this.$nextTick(()=>{
+      this.time = setInterval(()=>{
+        this.getSyncData()
+      },500)
+      
+    })
+  }
+  setCurrentRow(row:any){
+    this.currentRow = row;
+  }
+  //商品同步成功
+  handleSuccess() {
+    let page = (this.$refs.moduleView as any).getPage();
+    page.pageNo = 1;
+    (this.$refs.moduleView as any).setPage(page);
+    this.getSyncData()
+  }
+  pagination(){
+    this.search();
+  }
+  resert(){
+    let data = (this.$refs.view as any).getPage();
+    data.pageNo = 1;
+    this.getList(data);
+  }
+  search(){
+    let data:any=(this.$refs.view as any).getQuery();
+    data.pageNo = 1;
+    this.getList(data);
+  }
+  getList(data:any){
+    let page:any = {
+      pageNo:data.pageNo,
+      pageSize:data.pageSize
+    }
+    
+    this.load = true;
+    maindataMaterialRelevancy(data).then((res:any) => {
+      this.load = false;
+      if(this.$refs.view){
+        (this.$refs.view as any).setTableValue(res.data.records);
+        page.pageNo = res.data.current;
+        page.total = res.data.total;
+        (this.$refs.view as any).setPage(page);
+      }
+    }).catch((err:any) => {
+      this.load = false;
+    })
+  }
+  //列表数据
+  getSyncData(){
+    this.count ++ ;
+    if(this.count >=5){
+      clearInterval(this.time)
+      return
+    }
+    if(!this.$refs.view){
+      return
+    }
+    clearInterval(this.time)
+    let data = (this.$refs.view as any).getPage();
+    
+    this.getList(data);
+  }
+
+  confirmProduct(data:Array<any>){
+    if(data.length == 0){
+      this.$message('请选择商品！');
+      return;
+    }
+    let value:any={
+      lid:this.currentRow.id,
+      mskuid:data[0].id
+    }
+    this.load = true;
+    materialrelevancy(value).then((res:any) => {
+      this.load = false;
+      this.$message({
+        message:'商品关联成功！',
+        type:'success'
+      })
+      this.getSyncData();
+    }).catch((err:any) => {
+      this.load = false;
+      this.$message.error('商品关联失败！')
+    })
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.m-box{
+  height: 100%;
+  width: 100%;
+}
+</style>

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

@@ -19,12 +19,24 @@
           <el-button type="primary" size="small" @click="saveBase">保存基本信息及收获地址</el-button>
         </div>
         <el-collapse-item title="订单支付情况" name="4" class="add-order-item" v-if="orderValue.id">
-          <el-radio-group v-model="radioPay" @input="inputPay" class="payType">
+          <el-radio-group v-model="radioPay" @input="inputPay" v-if="!orderValue.id" class="payType">
             <el-radio :label="0">待付款</el-radio>
             <el-radio :label="1">快速支付&已付款</el-radio>
             <el-radio :label="2">手工添加支付信息</el-radio>
           </el-radio-group>
+          <div class="pay-row" v-else>
+            <el-button type="text" v-if="!orderValue.pays || orderValue.pays.length == 0">快速支付</el-button>
+            <el-button type="text" @click="radioPay = 2">添加手工支付</el-button>
+          </div>
           <by-form v-if="radioPay == 2" :propConfig="payConfig" ref="payform"></by-form>
+          <div class="pay-info">
+            <el-descriptions v-for="(item,index) of orderValue.pays" :key="index" :title="item.payment" size="mini">
+              <el-descriptions-item label="单号">{{item.outerPayId}}</el-descriptions-item>
+              <el-descriptions-item label="金额">{{item.amount}}</el-descriptions-item>
+              <el-descriptions-item label="支付日期">{{item.payDate}}</el-descriptions-item>
+            </el-descriptions>
+          </div>
+          
         </el-collapse-item>
         <el-collapse-item title="商品订单" name="3" class="add-order-item">
           <div class="addProductTool">
@@ -366,23 +378,23 @@ export default class AddOrder extends Vue {
       }],
       [{
         span:6,
-        label:'电话',
-        prop:'receiverPhone',
+        label:'手机',
+        prop:'receiverMobile',
         component:'by-input',
         compConfig:{
           attr:{
-            placeholder:'请输入电话',
+            placeholder:'请输入手机',
             clearable:true
           }
         }
       },{
         span:6,
-        label:'手机',
-        prop:'receiverMobile',
+        label:'电话',
+        prop:'receiverPhone',
         component:'by-input',
         compConfig:{
           attr:{
-            placeholder:'请输入手机',
+            placeholder:'请输入电话',
             clearable:true
           }
         }
@@ -1235,6 +1247,13 @@ export default class AddOrder extends Vue {
     }
   }
 }
+.pay-info{
+  width: 100%;
+}
+.pay-row{
+  display: flex;
+  justify-content: flex-end;
+}
 </style>
 
 <style lang="scss">
@@ -1243,4 +1262,15 @@ export default class AddOrder extends Vue {
     padding-bottom: 0;
   }
 }
+.pay-info{
+  .el-descriptions{
+    padding-bottom: 8px;
+    .el-descriptions__header{
+      margin-bottom: 0 !important;
+      .el-descriptions__title{
+        font-size: 14px;
+      }
+    }
+  }
+}
 </style>

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

@@ -14,7 +14,7 @@
       <div class="cont">
         <div class="title">店铺名称：</div>
         <div class="right-cont">
-          <el-select v-model="shopId" size="mini" style="width:100%" placeholder="请选择" clearable>
+          <el-select v-model="shopId" size="mini" style="width:100%" placeholder="请选择" clearable @change="shopChange">
             <el-option
               v-for="item in shopOptions"
               :key="item.value"
@@ -53,9 +53,9 @@
               v-model="time"
               style="width: 100%;"
               size="mini"
-              type="daterange"
+              type="datetimerange"
               clearable
-              value-format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
               range-separator="-"
               start-placeholder="开始日期"
               @change="change"
@@ -97,23 +97,23 @@ export default class LoadOrderModal extends Vue {
   load = false;
   value = false;
   type=1;
-  shopName = '';
-  shopId:any = null;
+  shopName = '犇云聚水潭店铺';
+  shopId:any = 2;
   shopOptions=[{
     label:'犇云聚水潭店铺',
     value:2
   }]
   sourceIds=''; //线上订单号
-  dateType:any=null;
+  dateType:any='';
   dateTypeOptions=[{
     label:'修改时间',
-    value:0
+    value:1
   },{
     label:'订单日期',
-    value:1
+    value:3
   },{
     label:'发货时间',
-    value:2
+    value:4
   }]
   beginDate='';
   endDate='';
@@ -162,6 +162,18 @@ export default class LoadOrderModal extends Vue {
       this.endDate = '';
     }
   }
+  shopChange(v:any){
+    if(v){
+      for(const item of this.shopOptions){
+        if(item.value == v){
+          this.shopName = item.label
+          break;
+        }
+      }
+    }else{
+      this.shopName=''
+    }
+  }
   btn(){
     let value:any={};
     let msg = '';
@@ -179,11 +191,9 @@ export default class LoadOrderModal extends Vue {
           msg = '线上订单'
         }
       }
-      
-      
       value.sourceIds = this.sourceIds.split('\n');
     }else if(this.type == 2){
-      if(this.dateType < 0 || this.dateType > 2){
+      if(Number(this.dateType) > 3 || Number(this.dateType) < 1){
         if(msg){
           msg = msg + '，时间类型'
         }else{
@@ -197,9 +207,9 @@ export default class LoadOrderModal extends Vue {
           msg = '时间'
         }
       }
-      value.dateType = this.dateType;
-      value.beginDate = this.beginDate + ' 00:00:00';
-      value.endDate = this.endDate + ' 00:00:00';
+      value.dateType = Number(this.dateType) - 1;
+      value.beginDate = this.beginDate;
+      value.endDate = this.endDate;
     }else if(this.type == 3){
       if(!this.status){
         if(msg){

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

@@ -34,7 +34,7 @@
         <span v-if="row.status == 'WaitPay'">待付款</span>
         <span v-if="row.status == 'Delivering'">发货中</span>
         <span v-if="row.status == 'Merged'">被合并</span>
-        <span v-if="row.status == 'Question'">异常</span>
+        <span v-if="row.status == 'Question'" style="color:red">异常</span>
         <span v-if="row.status == 'Split'">被拆分</span>
         <span v-if="row.status == 'WaitOuterSent'">等供销商|外仓发货</span>
         <span v-if="row.status == 'WaitConfirm'">已付款待审核</span>
@@ -43,6 +43,22 @@
         <span v-if="row.status == 'Cancelled'">取消</span>
       </template>
     </vxe-column>
+    <vxe-column field="sourceFrom" title="订单来源" width="120">
+      <template #default="{ row }">
+        <span v-if="row.sourceFrom == 'ERP'">手工下单</span>
+        <span v-if="row.sourceFrom == 'COPY'">复制</span>
+        <span v-if="row.sourceFrom == 'MERGE'">合并</span>
+        <span v-if="row.sourceFrom == 'SPLIT'">拆分；拆分还原</span>
+        <span v-if="row.sourceFrom == 'MOBILE'">手工下单</span>
+        <span v-if="row.sourceFrom == 'IMPORT'">导入</span>
+        <span v-if="row.sourceFrom == 'drp-s'">供销推送</span>
+        <span v-if="row.sourceFrom == 'drp-d'">分销推送</span>
+        <span v-if="row.sourceFrom == 'KWAISHOP'">快手；微商城</span>
+        <span v-if="row.sourceFrom == 'PINDUODUO'">拼多多</span>
+        <span v-if="row.sourceFrom == 'TOUTIAOFXG'">头条放心购</span>
+        <span v-if="row.sourceFrom == 'JUSHUITAN'">聚水潭</span>
+      </template>
+    </vxe-column>
     <vxe-column field="shipment" title="跨境买家指定物流" width="120"></vxe-column>
     <vxe-column field="chosenChannel" title="实发快递渠道" width="120"></vxe-column>
     <vxe-column field="logisticsId" title="快递单号" width="120"></vxe-column>

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

@@ -84,7 +84,8 @@ export default class PurchaseModel extends Vue {
             clearable:true
           }
         }
-      },{
+      }],
+      [{
         span:6,
         label:'交货人',
         prop:'delivery',
@@ -95,8 +96,7 @@ export default class PurchaseModel extends Vue {
             clearable:true
           }
         }
-      }],
-      [{
+      },{
         span:6,
         label:'交货人手机',
         prop:'deliveryPhone',
@@ -218,7 +218,7 @@ export default class PurchaseModel extends Vue {
   onChangeRow(row:any){
     if(Number(row.qty) > Number(row.residueQty)){
       this.$message('数量不能大于可采购数量！');
-      row.qty = 0;
+      row.qty = 1;
       this.$forceUpdate()
     }
   }

src/views/oms/order/index.vue

@@ -465,7 +465,7 @@ export default class Order extends Vue {
     }
     if(msg){
       this.$message({
-        message:'单号“'+msg + '”未提交，不能生成采购单！'
+        message:'订单“'+msg + '”未提交，不能生成采购单！'
       })
       return
     }
@@ -526,6 +526,7 @@ export default class Order extends Vue {
     let data:Array<any>= (this.$refs.orderTable as any).getSelectData();
     if(data.length == 0){
       this.$message('请选择订单!');
+      return
     }
     let ids:Array<any>=[];
     let msg = '';
@@ -549,13 +550,13 @@ export default class Order extends Vue {
     }
     if(smtMst){
       this.$message({
-        message:'单号“'+smtMst + '”已提交，不能重复操作！'
+        message:'订单“'+smtMst + '”已提交，不能重复操作！'
       })
       return
     }
     if(msg){
       this.$message({
-        message:'单号“'+msg + '”不是“已付款待审核”状态，不能提交！'
+        message:'订单“'+msg + '”不是“已付款待审核”状态，不能提交！'
       })
       return
     }
@@ -580,6 +581,7 @@ export default class Order extends Vue {
     let data:Array<any>= (this.$refs.orderTable as any).getSelectData();
     if(data.length == 0){
       this.$message('请选择订单!');
+      return
     }
     let ids:Array<any>=[];