优化功能

.env.production

@@ -10,6 +10,6 @@ VUE_APP_BASE_API = '/prod-api'
 # 登录地址 正式
 # VUE_APP_LOGIN_URL = 'https://sso.lzlxylsf.com/#/'
 # 开发
-VUE_APP_LOGIN_URL = 'https://sso.benyuntech.com/#/'
+# VUE_APP_LOGIN_URL = 'https://sso.benyuntech.com/#/'
 # 测试
-# VUE_APP_LOGIN_URL = 'https://ssotest.benyuntech.com/#/sso/auth'
+VUE_APP_LOGIN_URL = 'https://ssotest.benyuntech.com/#/sso/auth'

src/benyun/components/byDatePicker/byDatePicker.vue

@@ -68,6 +68,7 @@ export default class ByDatePicker extends VueViews {
   // 清空数据
   clearValue(){
     this.value = '';
+    this.defaultHandle()
   }
 
   defaultHandle(){

src/benyun/components/byInput/byInput.vue

@@ -95,6 +95,10 @@ export default class ByInput extends VueViews {
   // 清空数据
   clearValue(){
     this.value = '';
+    if((this.attrs.defaultValue || this.attrs.defaultValue === 0) && !this.value){
+      this.setValue(this.attrs.defaultValue);
+      this.onChange();
+    }
   }
 
   onChange(){

src/benyun/components/bySelect/bySelect.vue

@@ -145,7 +145,11 @@ export default class BySelect extends VueViews {
 
   // 清空数据
   clearValue(){
-    this.value = ''
+    this.value = '';
+    if(!this.value && this.attrs.defaultIndex >= 0 && this.options[this.attrs.defaultIndex]){
+      this.value = this.options[this.attrs.defaultIndex][this.itemValue];
+      this.onChange();
+    }
   }
 
   //请求url

src/views/audit/productManagement/index.vue

@@ -1267,6 +1267,9 @@
 						if (!/^\d{1,32}$/.test(v.barCode)){
 							return this.$message.warning('69码-商品条码为数字，最大32位');
 						}
+						if (!/^[a-zA-Z0-9]+$/.test(v.skuCode)){
+							return this.$message.warning('物料编码只能是字母和数字');
+						}
 						// if(v.weight&&v.weight!=0){
 						// 	v.weight = v.weight/1000
 						// }
@@ -1320,8 +1323,8 @@
 						if (!/^\d{1,32}$/.test(v.barCode)){
 							return this.$message.warning('69码-商品条码为数字，最大32位');
 						}
-						if (!/^\d{1,32}$/.test(v.skuCode)){
-							return this.$message.warning('物料编码不能输入中文');
+						if (!/^[a-zA-Z0-9]+$/.test(v.skuCode)){
+							return this.$message.warning('物料编码只能是字母和数字');
 						}
 						
 						// if(v.weight&&v.weight!=0){

src/views/audit/sku/index.vue

@@ -506,11 +506,14 @@
 			let data : any = (this as any).$refs.addFormId.getValue();
 			(this.$refs.addFormId as any).validate();
 			if (!data[0].skuTitle) return this.$message.warning('物料标题不能为空');
-			if (!data[0].skuCode) return this.$message.warning('物料编号不能为空');
+			if (!data[0].skuCode) return this.$message.warning('物料编码不能为空');
 			if (!data[0].barCode) return this.$message.warning('物料属性的69码-商品条码需必填');
 			if (!/^\d{1,32}$/.test(data[0].barCode)){
 				return this.$message.warning('69码-商品条码为数字，最大32位');
 			}
+			if (!/^[a-zA-Z0-9]+$/.test(data[0].skuCode)){
+				return this.$message.warning('物料编码只能是字母和数字');
+			}
 			api.updateList(data[0], 'maindataMaterialSku').then((res : any) => {
 				if (res.code === 200) {
 					this.$message.success('编辑成功');

src/views/oms/B2BOrder/index.vue

@@ -70,7 +70,7 @@
           </order-radio>
           <order-radio title="操作标记" keyName="operationFlag" ref="searchCom11" :options="sourceFromOptions" noLimit @radioChange="onChange($event,'operationFlag')" />
           <order-checkbox title="订单类型" keyName="typeList" ref="searchCom12" :options="typeOption" noLimit @checkboxChange="onChange($event,'typeList')" />
-          <order-radio title="售卖类型" keyName="sellType" ref="searchCom15" :options="sellTypeOptions" noLimit @radioChange="onChange($event,'sellType')" />
+          <!-- <order-radio title="售卖类型" keyName="sellType" ref="searchCom15" :options="sellTypeOptions" noLimit @radioChange="onChange($event,'sellType')" /> -->
           <el-collapse-item title="付款方式 & 是否付款" name="codAndPay">
             <div class="box01">
               <el-radio-group v-model="radio" @input="colChange">

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

@@ -0,0 +1,308 @@
+<template>
+  <vxe-table
+    size="mini"
+    border
+    stripe
+    ref="table"
+    :height="height"
+    :row-config="{isCurrent: true,isHover: true}"
+    :data="data">
+    <vxe-column field="id" title="内部订单号" width="100">
+      <template #default="{ row }">
+        <div class="col-cont">
+          <span>{{ row.id }}</span>
+          <!-- <div class="update">
+            <div class="tag-update" @click="detail(row)">详</div>
+          </div> -->
+        </div>
+      </template>
+    </vxe-column>
+    <vxe-column field="rawSourceId" title="线上订单号" width="140"> </vxe-column>
+    <vxe-column field="buyerNickname" title="买家/分销商昵称" show-overflow width="140"></vxe-column>
+    <vxe-column field="isSubmitted" title="提交状态" width="100">
+      <template #default="{ row }">
+        <el-tag v-if="row.isSubmitted == 1" size="small">已提交</el-tag>
+        <el-tag v-else type="warning" size="small"> 未提交 </el-tag>
+      </template>
+    </vxe-column>
+    <vxe-column field="product" title="商品" width="140">
+      <template #default="{ row }">
+        <el-badge :value="item.qty" class="item-pro" type="primary" :max="99" v-for="(item,index) of row.items" :key="index">
+          <el-image  style="width: 28px; height: 28px">
+            <div slot="error" class="image-slot">
+              <i class="el-icon-picture-outline"></i>
+            </div>
+          </el-image>
+        </el-badge>
+      </template>
+    </vxe-column>
+    <!-- <vxe-column field="businessType" title="业务类型" width="80"></vxe-column> -->
+    <vxe-column field="orderType" title="订单类型" width="100">
+      <template #default="{ row }">
+        <span v-if="row.orderType == 'Common'">普通订单</span>
+        <span v-if="row.orderType == 'Reissue'">补发订单</span>
+        <span v-if="row.orderType == 'DistributionPlus'">分销Plus</span>
+        <span v-if="row.orderType == 'SupplyPlus'">供销Plus</span>
+        <span v-if="row.orderType == 'Exchange'">换货订单</span>
+      </template>
+    </vxe-column>
+    <vxe-column field="status" title="订单状态" width="120">
+      <template #default="{ row }">
+        <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'" 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>
+        <span v-if="row.status == 'WaitFConfirm'">已客审待财审</span>
+        <span v-if="row.status == 'Sent'">已发货</span>
+        <span v-if="row.status == 'Cancelled'">取消</span>
+      </template>
+    </vxe-column>
+    <vxe-column field="upSourceName" title="订单来源" width="110"></vxe-column>
+    <vxe-column field="operationFlag" title="操作标记" width="120">
+      <template #default="{ row }">
+        {{ getFromText(row.operationFlag) }}
+      </template>
+    </vxe-column>
+    <vxe-column field="shopName" title="店铺名称" width="140"></vxe-column>
+    <vxe-column field="orderDate" title="订单日期" width="140">
+      <!-- <template #default="{ row }">
+        {{ formatDate(row.orderDate) }}
+      </template> -->
+    </vxe-column>
+    <!-- <vxe-column field="sellType" title="售卖类型" width="80">
+      <template #default="{ row }">
+        {{ getSellType(row.sellType) }}
+      </template>
+    </vxe-column> -->
+    <vxe-column field="weight" title="重量" width="70"></vxe-column>
+    <vxe-column field="isCod" title="是否货到付款" width="120">
+      <template #default="{ row }">
+        {{ row.isCod == 1 ? '是' :' 否' }}
+      </template>
+    </vxe-column>
+    <vxe-column field="sendDate" title="发货日期" width="120"></vxe-column>
+    <!-- <vxe-column field="signTime" title="预计送达时间" width="120"></vxe-column>
+    <vxe-column field="endTime" title="确认收货时间" width="120"></vxe-column> -->
+    <vxe-column field="receiverAddress" title="收货地址" show-overflow width="160"></vxe-column>
+    <vxe-column field="receiverName" title="收件人" show-overflow width="120"></vxe-column>
+    <vxe-column field="receiverMobile" title="手机" show-overflow width="120"></vxe-column>
+    <vxe-column field="buyerMessage" title="买家/分销商留言" show-overflow width="120"></vxe-column>
+    <!-- <vxe-column field="wmsCoId" title="发货仓编号" width="120"></vxe-column> -->
+    <vxe-column field="payDate" title="支付时间" width="140"></vxe-column>
+    <vxe-column field="freeAmount" title="抵扣金额" align="right" width="120"></vxe-column>
+    <vxe-column field="payAmount" title="应付+运费" align="right" 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="实付金额" align="right" width="120"></vxe-column>
+    <!-- <vxe-column field="openId" title="平台买家唯一值" show-overflow width="140"></vxe-column> -->
+    <vxe-column field="buyerPaidAmount" title="买家/分销商总实付" width="120"></vxe-column>
+    <vxe-column field="sellerIncomeAmount" title="总卖家实收" width="120"></vxe-column>
+    <!-- <vxe-column field="invoiceType" title="发票类型" width="120"></vxe-column> -->
+    <vxe-column field="invoiceTitle" title="发票抬头+税号" width="120">
+      <template #default="{ row }">
+        <span>{{ row.invoiceTitle }}</span> <br/>
+        <span style="color: #b9b8b8;">{{ row.buyerTaxNo }}</span><br/>
+        <span>{{ row.invoiceType }}</span>
+      </template>
+    </vxe-column>
+  </vxe-table>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import Format from '@/benyun/utils/dateFormat'
+@Component
+export default class OrderTable extends Vue {
+  @Prop()
+  data!:Array<any>
+  height=null
+
+  operationFlag:any={
+    'OMS':'手工下单',
+    'COPY':'复制',
+    'MERGE':'合并',
+    'SPLIT':'拆分；拆分还原',
+    'MOBILE':'导入',
+    'DRP-S':'供销推送',
+    'DRP-D':'分销推送',
+    'KWAISHOP':'快手；微商城',
+    'PINDUODUO':'拼多多',
+    'TOUTIAOFXG':'头条放心购',
+    'JUSHUITAN':'聚水潭'
+  }
+  //转换售卖类型
+  getSellType(n:any) {
+    let name = ''
+    switch(n) {
+      case '1':
+        name = '自营';
+        break;
+      case '2':
+        name = '代发';
+        break;
+      case '3':
+        name = '代销';
+        break;
+      case '4':
+        name = '经销';
+        break;
+      case '5':
+        name = '线下';
+        break;
+    }
+    return name;
+  }
+  //订单来源转换文字信息
+  getFromText(f:any){
+    let t='';
+    if(f){
+      let arr:Array<any>=f.split(',');
+      for(const item of arr){
+        if(this.operationFlag[item]){
+          if(t){
+            t = t + ' , ' + this.operationFlag[item]
+          }else{
+            t = this.operationFlag[item]
+          }
+        }
+      }
+    }
+    return t;
+  }
+  //是否显示发货
+  showSend(item:any){
+    let noStatus = ['WaitPay','Delivering','Merged','Split','Question','Sent','Cancelled'];
+    if(item.isSubmitted == 1 && item.pays && item.pays.length > 0 && noStatus.indexOf(item.status) == -1){
+      return true
+    }
+    return false
+  }
+  //合并按钮是否显示
+  showMerge(item:any){
+    let r = false;
+    if(item.isSubmitted == 1 && item.pays && item.pays.length > 0 && (!item.operationFlag || item.operationFlag.indexOf('MERGE') == -1 && item.operationFlag.indexOf('SPLIT') == -1 
+    && item.operationFlag.indexOf('JUSHUITAN') == -1)){
+      if(item.status == 'WaitConfirm' || item.status == 'Question'){
+        r = true;
+      }
+    }
+    return r;
+  }
+  showSplit(item:any){
+    let r = false;
+    if(item.isSubmitted == 1 && item.pays && item.pays.length > 0 && (!item.operationFlag || item.operationFlag.indexOf('MERGE') == -1 && item.operationFlag.indexOf('SPLIT') == -1 
+    && item.operationFlag.indexOf('JUSHUITAN') == -1)){
+      let s=['WaitConfirm','Question','Split']
+      if(s.indexOf(item.status) >= 0){
+        r = true;
+      }
+    }
+    return r;
+  }
+
+  formatDate(v:string){
+    return Format(v,'yyyy-MM-dd');
+  }
+
+  mounted(){
+    this.$nextTick(() => {
+      this.height = (this as any).$el.offsetHeight;
+    })
+  }
+  detail(row:any){
+    this.$emit('detail',row)
+  }
+  getSelectData(){
+    let data = (this as any).$lodash.cloneDeep((this.$refs.table as any).getCheckboxRecords());
+    return data;
+  }
+  sendGoods(row:any){
+    this.$emit('sendGoods',row)
+  }
+  sendGoodsDetail(row:any){
+    this.$emit('sendGoodsDetail',row)
+  }
+  mergeHandle(row:any){
+    let v = (this as any).$lodash.cloneDeep(row);
+    v.isMain = 1;
+    let data:Array<any> = [];
+    data.push(v);
+    for(const item of this.data){
+      if(row.id != item.id && item.isSubmitted == 1 && row.buyerId == item.buyerId &&  row.receiverMobile == item.receiverMobile && row.receiverProvince == item.receiverProvince && row.receiverCity == item.receiverCity && row.receiverDistrict == item.receiverDistrict && row.receiverTown == item.receiverTown && row.receiverAddress == item.receiverAddress  && item.pays && item.pays.length > 0 && item.operationFlag.indexOf('SPLIT') == -1 && 
+      item.operationFlag.indexOf('MERGE') == -1 && (item.status == 'WaitConfirm' || item.status == 'Question')){
+        data.push(item);
+      }
+    }
+    this.$emit('mergeHandle',data);
+  }
+  splitHandle(row:any){
+    this.$emit('splitHandle',row);
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail{
+  color: #0089ff;
+  cursor: pointer;
+}
+.col-cont{
+  // display: flex;
+  // justify-content: space-between;
+  // align-items: center;
+  // flex-direction: column;
+  .update{
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+    visibility: hidden;
+  }
+  .tag-update{
+    height: 24px;
+    width: 24px;
+    font-size: 12px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 50%;
+    background-color:#2d99f7;
+    color: #FFF;
+    flex-shrink: 0;
+    margin-left: 4px;
+    cursor: pointer;
+  }
+  .tag-update:hover{
+    opacity: 0.7;
+  }
+}
+</style>
+
+<style lang="scss">
+.row--hover{
+  .update{
+    visibility:visible !important;
+  }
+}
+.row--current{
+  .update{
+    visibility:visible !important;
+  }
+}
+.image-slot{
+  .el-icon-picture-outline{
+    font-size: 28px;
+    color: #999;
+  }
+}
+.item-pro{
+  .el-badge__content{
+    z-index: 1;
+  }
+}
+</style>

src/views/oms/account/components/orderTool.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="order-tool">
+    <!-- <el-dropdown split-button type="text" @click="handle('addOrder')" @command="handleCommand">
+      新增订单
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item command="loadOrder">手工下载</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown> -->
+    <el-button type="text" @click="handle('addOrder')">新增订单</el-button>
+    <el-button type="text" @click="handle('importOrder')">导入订单</el-button>
+    <div class="split"></div>
+    <el-dropdown split-button type="text" @click="handle('smt')" @command="handleCommand">
+        提交
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item command="reSmt">反提交</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <!-- <el-button type="text">设快递</el-button>
+    <el-dropdown split-button type="text" class="dropdown">
+      设快递单号
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item>批量设置快递单号</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown> -->
+    <div class="split"></div>
+    <el-button type="text" @click="handle('changeQues')">转异常</el-button>
+    <el-button type="text" @click="handle('changeNormal')">转正常</el-button>
+    <el-button type="text" @click="handle('cancelOrder')">取消订单<i class="el-icon-info" title="只有[待付款,发货中,异常,已付款待审核,等供销商|外仓发货,已客审待财审]才可以取消订单"></i></el-button>
+    <!-- <el-dropdown split-button type="text" class="dropdown" @click="handle('cancelOrder')" @command="handleCommand">
+      取消订单
+      <i class="el-icon-info" title="只有[待付款,发货中,异常,已付款待审核,等供销商|外仓发货,已客审待财审]才可以取消订单"></i>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item command="reCancelOrder">反取消订单</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown> -->
+    <div class="split"></div>
+    <el-dropdown split-button type="text" class="dropdown" @click="handle('addGift')" @command="handleCommand">
+      添加赠品
+      <el-dropdown-menu slot="dropdown">
+        <!-- <el-dropdown-item command="addProduct">添加商品</el-dropdown-item> -->
+        <!-- <el-dropdown-item command="addGift">添加赠品</el-dropdown-item> -->
+        <el-dropdown-item command="updateFreight">改运费</el-dropdown-item>
+        <el-dropdown-item command="updateTag">改标签</el-dropdown-item>
+        <el-dropdown-item command="updateRmk">改备注</el-dropdown-item>
+        <el-dropdown-item command="updateSalesman">设定业务员</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-button type="text" @click="handle('producePurchase')" title="选取已提交数据">生成采购单</el-button>
+    <el-button type="text" @click="handle('orderFile')">订单归档</el-button>
+    <div class="split"></div>
+    <el-button type="text" @click="handle('autoMerge')">自动合并<i class="el-icon-info" title="自动合并条件：已付款，已提交，同一个买家/分销商，同一个发货地址，未合并，未拆分"></i></el-button>
+    <el-button type="text" @click="handle('autoSplit')">自动拆分<i class="el-icon-info" title="自动拆分条件：已付款，已提交，未合并"></i></el-button>
+    <el-button type="text" @click="handle('batchSendGoods')">发货<i class="el-icon-info" title="发货条件：已提交，待付款，已付款待审核"></i></el-button>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+@Component
+export default class OrderTool extends Vue {
+
+  handleCommand(n:string){
+    this.$emit(n)
+  }
+
+  handle(n:string){
+    this.$emit(n)
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.order-tool{
+  height: 40px;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  .order-tool-btn{
+    color: #333;
+  }
+  .split{
+    height: 10px;
+    width: 1px;
+    background-color: #CCC;
+    margin: 0 8px;
+  }
+  .dropdown{
+    padding-left: 8px;
+  }
+}
+</style>

src/views/oms/account/index.vue

@@ -0,0 +1,310 @@
+<template>
+  <div class="order" v-loading="load">
+    <div class="order-right">
+      <div class="tool">
+        <el-radio-group v-model="radio" @input="typeChange">
+          <el-radio v-for="(item,index) of sellTypeOptions" :key="index" :label="item.value">{{item.label}}</el-radio>
+        </el-radio-group>
+        <el-button size="small" circle icon="el-icon-refresh" type="primary" @click="getList"></el-button>
+      </div>
+      <div class="table">
+        <order-table :data="data" ref="orderTable" class="order-table" />
+        <div class="page">
+          <el-pagination v-if="page.total > 0" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page.pageNo" :page-size="page.pageSize"
+            :layout="'total, sizes, prev, pager, next, jumper'" :total="page.total"></el-pagination>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import OrderTool from "./components/orderTool.vue";
+import OrderTable from "./components/orderTable.vue";
+import { query,getProvince,smt,unSmt,purchaseQty,unCancel,resetQuestion,archive,merge } from '@/api/omsOrder'
+import { queryAll } from '@/api/question'
+@Component({components:{OrderTool,OrderTable}})
+export default class Account extends Vue {
+  activeNames:Array<any>=['1','statusList']
+  radio='2'
+  data:Array<any> = []
+  load = false;
+  showQues=false;
+  isContainLabel=true;
+  page:any={
+    pageNo: 1, //当前页
+    pageSize: 20, //每页条数
+    total: 0 //总条数
+  }
+  sellTypeOptions:Array<any>=[
+  //   {
+  //   value: '1',
+  //   label: '自营'
+  // }, 
+  {
+    value: '2',
+    label: '代发'
+  }, {
+    value: '3',
+    label: '代销'
+  }, {
+    value: '4',
+    label: '经销'
+  }, {
+    value: '5',
+    label: '线下'
+  }]
+  questData:Array<any>=[]
+  value:any={
+    // sourceId:'',  //线上订单号
+    // shopBuyerId:'', //买家昵称
+    // buyerId:'', //买家ID
+    // logisticsId:'', //快递单号
+    // logisticsCompany:'', //快递公司
+    // internationalLogisticsId:'', //国际物流单号
+    // isSubmitte:'', //数据是否已提交
+    // drpCoIdFrom:'', //分销商编号
+    // drpCoIdTo:'', //供销商编号
+    // sourceFrom:'', //订单来源
+    // dateType:1,//时间类型
+    // deliveryRemainingMin:0, //订单剩余发货时间(小时)-小于等于
+    // deliveryRemainingMax:null, //订单剩余发货时间(小时)-大于等于
+    // includeSkuType:1, //包含编码类型
+    // type:'', //订单类型
+    // status:'' , //订单状态
+    // excludeSkuType:1, //排除编码类型
+  }
+  
+
+  mounted(){
+    this.getList();
+  }
+  typeChange(){
+    this.page.pageNo = 1;
+    this.getList();
+  }
+  //重置搜索数据
+  clearSearchValue(){
+    this.value={};
+    for(const key in this.$refs){
+      if(key.indexOf('searchCom') >= 0 && (this.$refs[key] as any).clear){
+        (this.$refs[key] as any).clear()
+      }
+    }
+    this.value.dateType = 1;
+    this.value.includeSkuType = 1;
+  }
+  resert(){
+    this.clearSearchValue();
+    this.page.pageNo = 1;
+    this.getList();
+  }
+  //搜索
+  search(){
+    this.page.pageNo = 1;
+    this.getList();
+  }
+  //获取订单列表数据
+  getList(){
+    let data:any = (this as any).$lodash.cloneDeep(this.value);
+    let params:any={};
+    data.sellType = this.radio;
+    data.businessType = 'B2B'
+    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.current;
+      this.page.total = res.data.total;
+      this.load = false;
+      this.$forceUpdate();
+    }).catch((err:any) => {
+      this.load = false;
+    })
+  }
+  //订单操作成功刷新页面
+  handleSuccess(){
+    this.page.pageNo = 1;
+    this.clearSearchValue();
+    this.getList();
+  }
+
+  handleSizeChange(v:number){
+    this.page.pageSize = v;
+    this.getList();
+  }
+  handleCurrentChange(v:number){
+    this.page.pageNo = v;
+    this.getList();
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+.order{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  overflow-y: hidden;
+  .order-left{
+    width: 260px;
+    height: 100%;
+    flex-shrink: 0;
+    background-color: #f0f0f0;
+    border-right: solid 1px #CCC;
+    box-sizing: border-box;
+    padding: 4px 4px 0;
+    position: relative;
+    .my-collapse{
+      padding: 0 4px;
+      background: #FFF;
+    }
+
+    .searchHandle{
+      display: flex;
+      justify-content: center;
+      width: 100%;
+      box-sizing: border-box;
+      padding: 8px;
+      background-color: #f0f0f0;
+    }
+    .box01{
+      width: 100%;
+      padding-bottom: 8px;
+    }
+  }
+  .filter-box{
+    width: calc(100% - 8px);
+    background-color: #FFF;
+    box-sizing: border-box;
+    padding: 8px;
+    border:solid 1px #EEE;
+    
+    .filter-row:last-child{
+      padding: 0;
+    }
+  }
+  .order-right{
+    // width: calc(100% - 260px);
+    width: 100%;
+    box-sizing: border-box;
+    padding-left: 8px;
+    height: 100%;
+    min-width: 900px;
+    overflow-x: auto;
+    .tool{
+      width: 100%;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      box-sizing: border-box;
+      padding: 0 16px;
+    }
+    .table{
+      width: 100%;
+      height: calc(100% - 40px);
+      .order-table{
+        width: 100%;
+        height: calc(100% - 48px);
+      }
+      .page{
+        width: 100%;
+        display: flex;
+        justify-content: flex-end;
+        padding: 8px;
+        box-sizing: border-box;
+      }
+    }
+  }
+  .el-icon-info{
+    font-size: 16px;
+    margin-left: 4px;
+  }
+}
+// .order-label{
+//   font-size: 12px;
+// }
+.orderSelect{
+  width: 100%;
+  margin-bottom: 4px;
+}
+.order-time{
+  width: 100%;
+  display: flex;
+  align-items: center;
+  padding-bottom: 4px;
+}
+.ques-box{
+  .questtion-top{
+    height: 30px;
+    display: flex;
+    justify-content:space-between;
+    align-items: center;
+    padding: 0 16px;
+    background-color: #EEE;
+    cursor: pointer;
+    .quest-title{
+      height: 30px;
+      font-size: 12px;
+      display: flex;
+      align-items: center;
+    }
+    .el-icon-setting{
+      padding-right: 8px;
+      color: #2d99f7;
+      margin-left: 4px;
+    }
+    i{
+      font-size: 16px;
+      cursor: pointer;
+    }
+  }
+  .ques-list{
+    overflow: hidden;
+    padding-left: 16px;
+  }
+}
+</style>
+
+<style lang="scss">
+.order-left{
+  .el-collapse-item__content{
+    padding-bottom: 0;
+  }
+  .el-collapse-item__header{
+    font-weight: 700 !important;
+  }
+}
+.deliveryHours-input{
+  width: 80px; 
+  flex-shrink: 0; 
+  padding: 0;
+  .el-input__inner{
+    padding: 0 !important;
+    text-align: center;
+  }
+}
+.search-content{
+  height: calc(100% - 44px);
+  div.el-scrollbar__wrap {
+    overflow-x: hidden;
+  }
+  .el-scrollbar__bar {
+    right: 0px;
+  }
+}
+.labels-width-btn{
+  margin-bottom: 8px;
+  .el-input-group__append{
+    background-color: #fff !important;
+    width: 30px !important;
+    padding: 0 10px;
+    .el-icon-more{
+      font-size: 16px;
+    }
+  }  
+}
+</style>