修改订单

src/api/omsOrder.ts

@@ -25,6 +25,14 @@ export function addOrder(data:any){
 	})
 }
 
+export function saveBaseOrder(data:any){
+	return request({
+		url: '/omsOrder/omsOrder/updateInfo',
+		method: 'POST',
+		data: data
+	})
+}
+
 export function smt(data:any){
 	return request({
 		url: '/omsOrder/omsOrder/submit',

src/benyun/compVue/VueViews.ts

@@ -20,6 +20,9 @@ export default class VueViews extends Vue{
   @Prop()
   propValue?:any
 
+  @Prop()
+  parentValue:any
+
   constructor() {
     super()
   }

src/benyun/components/byArea/byArea.vue

@@ -5,7 +5,7 @@
         <div class="area-box first">
           <div class="left-label">省：</div>
           <div class="right-area">
-            <el-select v-model="provinceCode" clearable class="areaSelect" :class="{'error':provinceError}" @change="onProvince" size="mini" placeholder="请选择省">
+            <el-select v-model="provinceCode" clearable :disabled="attrs.disabled" class="areaSelect" :class="{'error':provinceError}" @change="onProvince" size="mini" placeholder="请选择省">
               <el-option
                 v-for="item in optionsProvince"
                 :key="item.id"
@@ -20,7 +20,7 @@
         <div class="area-box">
           <div class="left-label">市：</div>
           <div class="right-area">
-            <el-select v-model="cityCode" clearable class="areaSelect" :class="{'error':cityError}" @change="onCity" size="mini" placeholder="请选择市">
+            <el-select v-model="cityCode" clearable :disabled="attrs.disabled" class="areaSelect" :class="{'error':cityError}" @change="onCity" size="mini" placeholder="请选择市">
               <el-option
                 v-for="item in optionsCity"
                 :key="item.id"
@@ -35,7 +35,7 @@
         <div class="area-box last">
           <div class="left-label">区/县：</div>
           <div class="right-area">
-            <el-select v-model="countyCode" clearable class="areaSelect" :class="{'error':countyError}" @change="onCounty" size="mini" placeholder="请选择区/县">
+            <el-select v-model="countyCode" clearable :disabled="attrs.disabled" class="areaSelect" :class="{'error':countyError}" @change="onCounty" size="mini" placeholder="请选择区/县">
               <el-option
                 v-for="item in optionsCounty"
                 :key="item.id"
@@ -50,7 +50,7 @@
         <div class="area-box last">
           <div class="left-label">街道：</div>
           <div class="right-area">
-            <el-select v-model="townCode" clearable class="areaSelect" @change="onTown" size="mini" placeholder="请选择街道">
+            <el-select v-model="townCode" clearable :disabled="attrs.disabled" class="areaSelect" @change="onTown" size="mini" placeholder="请选择街道">
               <el-option
                 v-for="item in optionsTown"
                 :key="item.id"
@@ -106,10 +106,57 @@ export default class ByArea extends VueViews {
     if(this.propConfig){
       this.setConfig(this.propConfig)
     }
+    if(this.parentValue){
+      this.setAllValue(this.parentValue);
+    }
   }
   mounted(){
     this.getProvince();
   }
+  setAllValue(data:any){
+    if(this.attrs.province){
+      this.province=data[this.attrs.province];
+    }
+    if(this.attrs.provinceCode){
+      this.provinceCode=data[this.attrs.provinceCode];
+    }
+    if(this.attrs.city){
+      this.city=data[this.attrs.city];
+    }
+    if(this.attrs.cityCode){
+      this.cityCode=data[this.attrs.cityCode];
+      if(this.provinceCode){
+        this.getCity(this.provinceCode);
+      }
+    }
+    if(this.attrs.county){
+      this.county=data[this.attrs.county];
+    }
+    if(this.attrs.countyCode){
+      this.countyCode=data[this.attrs.countyCode];
+      if(this.cityCode){
+        this.getCounty(this.cityCode);
+      }
+    }
+    if(this.attrs.town){
+      this.town=data[this.attrs.town];
+    }
+    if(this.attrs.townCode){
+      this.townCode=data[this.attrs.townCode];
+      if(this.countyCode){
+        this.getTown(this.countyCode);
+      }
+    }
+    if(this.attrs.areaCode){
+      this.areaCode=data[this.attrs.areaCode];
+    }
+    if(this.attrs.area){
+      this.area=data[this.attrs.area];
+    }
+  }
+  setValue(v?:any){
+    this.setAllValue(this.parentValue);
+  }
   clearValue(){
     this.provinceCode='';
     this.cityCode='';

src/benyun/components/byForm/byForm.vue

@@ -13,7 +13,7 @@
     :rules="attrs.readonly?[]:attrs.rules"
     :label-position="attrs.labelPosition ? attrs.labelPosition : ''">
       <el-row class="form-row" v-for="(itemChild,index) of columns" :key="index">
-        <el-col  v-for="(item,_ind) of itemChild" :span="item.span" :key="'itemChild'+_ind">
+        <el-col v-for="(item,_ind) of itemChild" :span="item.span" :key="'itemChild'+_ind">
           <el-form-item class="by-form-item" 
             :label="item.label" 
             :rules="attrs.readonly?[]:item.rules" 
@@ -26,6 +26,7 @@
               class="form-comp"
               :propConfig="item.compConfig" 
               :ref="item.prop+'Comp'" 
+              :parentValue="value"
               :propValue="value[item.prop]" 
               @onChange="onChange($event,item)" 
               v-bind="$attrs" 
@@ -111,7 +112,11 @@ export default class ByForm extends VueViews {
       this.setConfig(this.propConfig)
     }
   }
-  mounted(){}
+  mounted(){
+    if(this.attrs.data){
+      this.setValue(this.attrs.data);
+    }
+  }
   getValueData(){
     console.log('表单数据',this.value)
   }
@@ -122,7 +127,11 @@ export default class ByForm extends VueViews {
     }else{
       this.value = {};
     }
-    this.setChildrenComValue();
+    this.$nextTick(()=>{
+      this.setChildrenComValue();
+    })
+    
+    this.$forceUpdate();
   }
 
   clearValue(){

src/benyun/components/byInput/byInput.vue

@@ -1,7 +1,7 @@
 <template>
   <el-input 
     v-model="value"
-    :placeholder="attrs.placeholder?attrs.placeholder:'请输入内容'"
+    :placeholder="placeholder"
     :maxlength="attrs.maxlength"
     :minlength="attrs.minlength"
     :show-word-limit="attrs.showWordLimit"
@@ -24,7 +24,7 @@ import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import VueViews from '@/benyun/compVue/VueViews'
 @Component
 export default class ByInput extends VueViews {
-  value:any='';
+  value:any=null;
 
 
   created(){
@@ -32,20 +32,29 @@ export default class ByInput extends VueViews {
       this.setConfig(this.propConfig)
     }
     if(this.propValue){
-      this.setValue(this.propConfig)
+      this.setValue(this.propValue)
     }
   }
-  mounted(){
-    if(this.propValue){
-      this.value = this.propValue
+  get placeholder(){
+    if(this.attrs.disabled){
+      return ''
+    }
+    if(this.attrs.placeholder){
+      return this.attrs.placeholder
     }
+    return '请输入内容'
+  }
+  mounted(){
   }
 
   setValue(data:any){
     if(data){
       this.value = (this as any).$lodash.cloneDeep(data);
+      if(this.attrs.type == 'number'){
+        this.value = Number(this.value);
+      }
     }else{
-      this.value = '';
+      this.value = null;
     }
   }
 

src/benyun/components/byTable/byTable.vue

@@ -54,7 +54,7 @@
         >
           <template #default="{ row }">
             <slot v-if="item.slot" :name='item.field' :row='row'></slot>
-            <component v-else-if="item.component" :is="item.component" :ref="item.prop+'Comp'" :propConfig="item.compConfig" 
+            <component v-else-if="item.component" :is="item.component" :ref="item.prop+'Comp'" :propConfig="item.compConfig" :parentValue="row"
               :propValue="row[item.field]" @onChange="onChange($event, row,item.field)" />
             <template v-else>
               <div v-if="item.isDetail" :style="{ 'text-align': item.align }" class="tdCol detail" @click="detail(row)">{{ row[item.field] }}</div>

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

@@ -1,16 +1,30 @@
 <template>
   <vxe-modal v-model="value" id="addOrder" @show="show" width="70%" height="80%" min-width="460" min-height="320" 
-    show-zoom resize transfer show-footer>
+    show-zoom resize transfer :show-footer="!orderValue.id" @hide="hide" v-loading="load">
     <template #title>
       <span>创建新订单</span>
     </template>
     <template #default>
       <el-collapse v-model="activeNames">
         <el-collapse-item title="基本信息" name="1" class="add-order-item">
-          <by-form :propConfig="config" ref="baseform" @formChange="formChangeBase"></by-form>
+          <by-form :propConfig="baseConfig" ref="baseform" @formChange="formChangeBase"></by-form>
         </el-collapse-item>
         <el-collapse-item title="买家信息" name="2" class="add-order-item">
-          <by-form :propConfig="config2" ref="infoform"></by-form>
+          <by-form :propConfig="buyerInfoConfig" ref="infoform"></by-form>
+        </el-collapse-item>
+        <el-collapse-item title="发票信息" name="5" class="add-order-item" v-if="orderValue.id">
+          <by-form :propConfig="invoicesConfig" ref="invoicesform"></by-form>
+        </el-collapse-item>
+        <div class="btn-save" v-if="orderValue.id">
+          <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 :label="0">待付款</el-radio>
+            <el-radio :label="1">快速支付&已付款</el-radio>
+            <el-radio :label="2">手工添加支付信息</el-radio>
+          </el-radio-group>
+          <by-form v-if="radioPay == 2" :propConfig="payConfig" ref="payform"></by-form>
         </el-collapse-item>
         <el-collapse-item title="商品订单" name="3" class="add-order-item">
           <div class="addProductTool">
@@ -70,7 +84,7 @@
             </div>
           </div>
         </el-collapse-item>
-        <el-collapse-item title="订单支付情况" name="4" class="add-order-item">
+        <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 :label="0">待付款</el-radio>
             <el-radio :label="1">快速支付&已付款</el-radio>
@@ -78,14 +92,14 @@
           </el-radio-group>
           <by-form v-if="radioPay == 2" :propConfig="payConfig" ref="payform"></by-form>
         </el-collapse-item>
-        <el-collapse-item title="发票信息" name="5" class="add-order-item">
+        <el-collapse-item title="发票信息" name="5" class="add-order-item" v-if="!orderValue.id">
           <by-form :propConfig="invoicesConfig" ref="invoicesform"></by-form>
         </el-collapse-item>
       </el-collapse>
       <productDialog ref="product" @confirm="confirmProduct" />
       <productDialog ref="productGift" @confirm="confirmProductGift" />
     </template>
-    <template #footer>
+    <template #footer v-if="!orderValue.id">
       <div class="btn">
         <el-button type="primary" size="small" @click="btn('continue')">确定并继续</el-button>
         <el-button type="primary" size="small" @click="btn">确定</el-button>
@@ -97,19 +111,22 @@
 </template>
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import { addOrder,getSingleData } from '@/api/omsOrder'
+import { addOrder,saveBaseOrder } from '@/api/omsOrder'
 import { add,multiply,subtract,divide } from '@/benyun/utils/accuracy'
 
 @Component
 export default class AddOrder extends Vue {
   value=false;
   num:any=0;
+  load = false;
   freeAmount="";
   productTotal:any=0;
   userName:any='';//用户信息
   orderValue:any={}; //新增订单值
   radioPay=0;
-  activeNames:Array<any> =['1','2','3','4','5'];
+  activeNames:Array<any> =['1','2','3','4','5','save'];
+  baseConfig:any={};
+  buyerInfoConfig:any={};
   config:any={
     attr:{
       size:'mini',
@@ -663,12 +680,10 @@ export default class AddOrder extends Vue {
   }
   setDetail(data:any){
     this.orderValue = data;
-    let infoConfig = (this as any).$lodash.cloneDeep(this.config);
-    for(const col of infoConfig.columns){
-      for(const item of col){
-        if(!item.compConfig.attr) item.compConfig.attr = {};
-        item.compConfig.attr.readonly = true;
-      }
+    if(this.orderValue.isPay == 0 || this.orderValue.isPay == 1){
+      this.radioPay = this.orderValue.isPay
+    }else{
+      this.radioPay = 2;
     }
   }
   //订单支付情况单选值
@@ -682,36 +697,42 @@ export default class AddOrder extends Vue {
     this.userName = this.$store.getters.name;
   }
   show(){
+    this.baseConfig = (this as any).$lodash.cloneDeep(this.config);
+    this.buyerInfoConfig = (this as any).$lodash.cloneDeep(this.config2);
+    
     if(this.orderValue.id){
       let data = this.orderValue;
+      this.freeAmount = this.orderValue.freeAmount;
       //基本信息
       let info:any={};
       info.shopName = data.shopName;
       info.sourceId = data.sourceId;
       info.orderDate = data.orderDate;
-      info.freight = data.freight;
+      info.freight = Number(data.freight)?Number(data.freight):0;
       info.logisticsCompany = data.logisticsCompany;
       info.createBy = data.createBy;
       info.note = data.note;
       info.buyerMessage = data.buyerMessage;
       info.remark = data.remark;
+      this.baseConfig.attr.data = info;
       (this.$refs.baseform as any).setValue(info);
       //买家
       let buyerInfo:any={};
       buyerInfo.buyerId = data.buyerId;
       buyerInfo.receiverName = data.receiverName;
-      buyerInfo.province=data.receiverProvince;//省
-      buyerInfo.provinceCode=data.receiverProvinceCode; //省编码
-      buyerInfo.city=data.receiverCity;   //市
-      buyerInfo.cityCode=data.receiverCityCode;  //市编码
-      buyerInfo.county=data.receiverDistrict;  //县/区
-      buyerInfo.countyCode=data.receiverDistrictCode;   //县/区编码
-      buyerInfo.townCode=data.receiverTownCode;
-      buyerInfo.town=data.receiverTown;
+      buyerInfo.receiverProvince=data.receiverProvince;//省
+      buyerInfo.receiverProvinceCode=data.receiverProvinceCode; //省编码
+      buyerInfo.receiverCity=data.receiverCity;   //市
+      buyerInfo.receiverCityCode=data.receiverCityCode;  //市编码
+      buyerInfo.receiverDistrict=data.receiverDistrict;  //县/区
+      buyerInfo.receiverDistrictCode=data.receiverDistrictCode;   //县/区编码
+      buyerInfo.receiverTownCode=data.receiverTownCode;
+      buyerInfo.receiverTown=data.receiverTown;
       buyerInfo.receiverAddress = data.receiverAddress;
       buyerInfo.receiverPhone = data.receiverPhone;
       buyerInfo.receiverMobile = data.receiverMobile;
       buyerInfo.receiverZip = data.receiverZip;
+      this.buyerInfoConfig.attr.data = buyerInfo;
       (this.$refs.infoform as any).setValue(buyerInfo);
       //商品
       const productData:Array<any> = data.items ? data.items : [];
@@ -731,14 +752,41 @@ export default class AddOrder extends Vue {
       if(data.invoices && data.invoices[0]){
         (this.$refs.invoicesform as any).setValue(data.invoices[0]);
       }
+      
+      for(let col of this.baseConfig.columns){
+        for(let item of col){
+          if(item.prop != 'freight'){
+            if(!item.compConfig.attr) item.compConfig.attr = {};
+            item.compConfig.attr.disabled = true;
+          }
+        }
+      }
+      if(this.orderValue.isPay != 0){
+        for(let col of this.buyerInfoConfig.columns){
+          for(let item of col){
+            if(!item.compConfig.attr) item.compConfig.attr = {};
+              item.compConfig.attr.disabled = true;
+          }
+        }
+      }
+
+      this.totalAmount();
+      this.amountChange();
+      this.payAmountChange();
+      this.totalNum();
+
     }else{
       let value:any = (this.$refs.baseform as any).getValue();
       value.createBy = this.userName;
       (this.$refs.baseform as any).setValue(value);
     }
-    
+    (this.$refs.baseform as any).setConfig(this.baseConfig);
+    (this.$refs.infoform as any).setConfig(this.buyerInfoConfig);
     
   }
+  hide(){
+    this.clearValue();
+  }
   //抵扣金额数值变化
   freeAmountChange(v:any){
     this.orderValue.freeAmount = 0;
@@ -929,29 +977,34 @@ export default class AddOrder extends Vue {
     this.radioPay = 0;
     this.freeAmount = '';
   }
-  getOrderValue(){
+  getOrderValue(n?:string){
     // this.orderValue = {};
     return new Promise((resolve:Function, reject:Function) => {
       let r = true;
-      let a = (this.$refs.baseform as any).getValue();
       //基本信息
       (this.$refs.baseform as any).validate({noMsg:true}).then(()=>{
         let baseInfo = (this.$refs.baseform as any).getValue();
         for(const key in baseInfo){
           this.orderValue[key] = baseInfo[key]
         }
-        
-        //卖家信息
+        if(this.orderValue.orderDate){
+          this.orderValue.orderDate = this.orderValue.orderDate + ' 00:00:00'
+        }
+        //买家信息
         (this.$refs.infoform as any).validate({noMsg:true}).then(()=>{
           let infoValue = (this.$refs.infoform as any).getValue();
           for(const key in infoValue){
             this.orderValue[key] = infoValue[key]
           }
+          if(n == 'base'){
+            resolve();
+            return
+          }
           //商品
           let productOrder:Array<any> = [];
           if(this.$refs.table){
             productOrder = (this.$refs.table as any).getValue();
-           
+          
           }
           if(productOrder.length > 0){
             this.orderValue.items = productOrder;
@@ -989,6 +1042,7 @@ export default class AddOrder extends Vue {
           }else{
             resolve();
           }
+          
         }).catch(()=>{
           if(r){
             (this as any).$message({
@@ -1019,25 +1073,43 @@ export default class AddOrder extends Vue {
   //确定
   btn(n?:string){
     this.getOrderValue().then(()=>{
-      if(this.orderValue.orderDate){
-        this.orderValue.orderDate = this.orderValue.orderDate + ' 00:00:00'
-      }
+      
       this.orderValue.receiverCountryCode = '86';
       this.orderValue.receiverCountry="中华人民共和国";
+      this.load = true;
       addOrder(this.orderValue).then((res:any) => {
         if(n != 'continue'){
           this.value = false;
         }
-        
+        this.load = false;
         (this as any).$message({
           message: '订单添加成功！',
           type: 'success',
         })
-        this.clearValue();
-        this.$emit('addSuccess');
-      }).catch((err:any) => {})
+        this.$emit('handleSuccess');
+      }).catch((err:any) => {
+        this.load = false;
+      })
     }).catch((err:any) => {})
   }
+  
+  //保存基本信息及守护地址
+  saveBase(){
+    this.getOrderValue('base').then(()=>{
+      this.load = true;
+      saveBaseOrder(this.orderValue).then(() => {
+        this.load = false;
+        (this as any).$message({
+          message: '订单修改成功！',
+          type: 'success',
+        })
+        this.$emit('handleSuccess');
+      }).catch((err:any) => {
+        this.load = false;
+      })
+    })
+    
+  }
 }
 </script>
 
@@ -1047,6 +1119,13 @@ export default class AddOrder extends Vue {
   display: flex;
   justify-content: flex-end;
 }
+.btn-save{
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+  padding: 16px 0;
+  border-bottom: 1px solid #e6ebf5;
+}
 .updateBuyer{
   padding: 0 16px;
 }

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

@@ -2,11 +2,12 @@
   <vxe-table
     size="mini"
     border
+    ref="table"
     :height="height"
     :data="data">
-    <vxe-column type="checkbox" width="50"></vxe-column>
-    <vxe-column type="seq" width="60" title="序号"></vxe-column>
-    <vxe-column field="sourceId" title="线上订单号" width="130">
+    <vxe-column type="checkbox" width="50" fixed="left"></vxe-column>
+    <vxe-column type="seq" width="60" title="序号" fixed="left"></vxe-column>
+    <vxe-column field="sourceId" title="线上订单号" width="130" fixed="left">
       <template #default="{ row }">
         <div class="detail" @click="detail(row)">{{ row.sourceId }}</div>
       </template>
@@ -54,8 +55,13 @@
     <vxe-column field="wmsCoId" title="发货仓编号" width="120"></vxe-column>
     <vxe-column field="payDate" title="支付时间" width="120"></vxe-column>
     <vxe-column field="freeAmount" title="抵扣金额" width="120"></vxe-column>
-    <vxe-column field="payAmount" title="应付金额" width="120"></vxe-column>
-    <vxe-column field="paidAmount" title="实付+运费" width="120"></vxe-column>
+    <vxe-column field="payAmount" title="应付+运费" width="120">
+      <template #default="{ row }">
+        <span>{{ row.payAmount }}</span> <br/>
+        <span style="color: #b9b8b8;">{{ row.freight?row.freight:0 }}</span>
+      </template>
+    </vxe-column>
+    <vxe-column field="paidAmount" title="实付金额" width="120"></vxe-column>
     <vxe-column field="shopBuyerId" title="买家昵称" width="120"></vxe-column>
     <vxe-column field="openId" title="平台买家唯一值" width="120"></vxe-column>
     <vxe-column field="buyerPaidAmount" title="总买家实付" width="120"></vxe-column>
@@ -99,6 +105,10 @@ export default class OrderTable extends Vue {
   detail(row:any){
     this.$emit('detail',row)
   }
+  getSelectData(){
+    let data = (this as any).$lodash.cloneDeep((this.$refs.table as any).getCheckboxRecords());
+    return data;
+  }
 }
 </script>
 

src/views/oms/order/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="order">
+  <div class="order" v-loading="load">
     <div class="order-left">
       <el-scrollbar class="search-content">
         <el-collapse v-model="activeNames" class="my-collapse">
@@ -8,7 +8,7 @@
             <input-select :options="outLineOptions" @input="parameChangeBase($event,'idType','idValue')" ref="searchCom02" />
             <input-select :options="buyerOptions" @input="parameChangeInfo($event,'receiverInfo','receiverValue')" ref="searchCom03" />
           </el-collapse-item>
-          <order-checkbox title="订单状态" keyName="status" ref="searchCom04" :options="statusOptions" noLimit @checkboxChange="onChange($event,'status')" />
+          <order-checkbox title="订单状态" keyName="statusList" ref="searchCom04" :options="statusOptions" noLimit @checkboxChange="onChange($event,'statusList')" />
           <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>
@@ -152,7 +152,7 @@
             :layout="'total, sizes, prev, pager, next, jumper'" :total="page.total"></el-pagination>
         </div>
       </div>
-      <add-order ref="addOrder" @addSuccess="addSuccess" />
+      <add-order ref="addOrder" @handleSuccess="handleSuccess" />
     </div>
   </div>
 </template>
@@ -176,6 +176,7 @@ export default class Order extends Vue {
   radio=''
   radio2=''
   data:Array<any> = []
+  load = false;
   page:any={
     pageNo: 1, //当前页
     pageSize: 20, //每页条数
@@ -475,7 +476,7 @@ export default class Order extends Vue {
     (this.$refs.addOrder as any).setShow(true)
   }
   smtOrder(){
-    let data:Array<any>= (this.$refs.orderTable as any).getValue();
+    let data:Array<any>= (this.$refs.orderTable as any).getSelectData();
     if(data.length == 0){
       this.$message('请选择订单!');
     }
@@ -494,7 +495,7 @@ export default class Order extends Vue {
     })
   }
   reSmt(){
-    let data:Array<any>= (this.$refs.orderTable as any).getValue();
+    let data:Array<any>= (this.$refs.orderTable as any).getSelectData();
     if(data.length == 0){
       this.$message('请选择订单!');
     }
@@ -591,17 +592,19 @@ export default class Order extends Vue {
     let params:any={};
     params.pageNo = this.page.pageNo;
     params.pageSize = this.page.pageSize;
+    this.load = true;
     query(params,data).then((res:any) => {
       this.data = res.data.records;
       this.page.pageNo = res.data.pages;
       // this.page.pageSize = res.data.size;
       this.page.total = res.data.total;
+      this.load = false;
     }).catch((err:any) => {
-
+      this.load = false;
     })
   }
-  //新增订单成功刷新页面
-  addSuccess(){
+  //订单操作成功刷新页面
+  handleSuccess(){
     this.page.pageNo = 1;
     this.clearSearchValue();
     this.getList();