Kaynağa Gözat

仓库授权

ymy 1 yıl önce
ebeveyn
işleme
57026d9516

+ 35 - 0
src/api/warehourseAuto.ts

@@ -0,0 +1,35 @@
+import request from '@/benyun/utils/request'
+//查询
+export function query(data:any){
+	return request({
+		url: '/omsOrder/dswWarehouse/page',
+		method: 'GET',
+    params:data
+	})
+}
+// 新增
+export function add(data:any){
+	return request({
+		url: '/omsOrder/dswWarehouse/save',
+		method: 'POST',
+    data:data
+	})
+}
+
+// 新增
+export function update(data:any){
+	return request({
+		url: '/omsOrder/dswWarehouse/update',
+		method: 'POST',
+    data:data
+	})
+}
+
+// 删除
+export function del(data:any) {
+  return request({
+		url: '/omsOrder/dswWarehouse/delete',
+		method: 'POST',
+    params:data
+	})
+}

+ 1 - 1
src/benyun/components/byForm/byForm.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="by-form" :style="{width:attrs.width}">
     <el-descriptions v-if="attrs.showType=='desc'" :title="attrs.title" :column="attrs.itemCount" :border="attrs.border" :direction="attrs.direction" 
-    :size="attrs.size?attrs.size:'medium'" :colon="attrs.colon">
+    :size="attrs.size?attrs.size:'medium'" :colon="attrs.colon" contentClassName="clas123">
       <template v-for="(itemChild,index) of columns">
         <el-descriptions-item :label="item.label" v-for="(item,_ind) of itemChild" :span="item.colspan" :key="index+'-'+_ind">
           <slot v-if="item.descSlot" :name='item.prop+"_desc"' :value='value'></slot>

+ 64 - 64
src/router/index.ts

@@ -60,75 +60,75 @@ export const constantRoutes: Array<any> = [
       }
     ]
   },
-  {
-    path:'/order',
-    name:'Order',
-    component:() => import('@/views/demo/order/order.vue')
-  },
+  // {
+  //   path:'/order',
+  //   name:'Order',
+  //   component:() => import('@/views/demo/order/order.vue')
+  // },
   {
     path:'/shopAuto',
     name:'ShopAuto',
     component:() => import('@/views/oms/shop/shopAuto.vue')
   },
-  {
-    path:'/demo',
-    name:'Demo',
-    hidden: true,
-    component:() => import('@/views/demo/index.vue'),
-    // redirect: 'form',
-    children:[
-      {
-        path:'form',
-        component:()=> import('@/views/demo/form.vue'),
-        name:'Form',
-        meta: {
-          title: '表单',
-          activeMenu: '/system/user'
-        }
-      },
-      {
-        path:'table',
-        component:()=> import('@/views/demo/table.vue'),
-        name:'Table',
-        meta: {
-          title: '表格',
-          activeMenu: '/system/user'
-        }
-      },
-      {
-        path:'moduleView',
-        component:()=> import('@/views/demo/moduleView.vue'),
-        name:'ModuleView',
-        meta: {
-          title: 'view封装'
-        }
-      },
-      {
-        path:'bill',
-        component:()=> import('@/views/demo/bill.vue'),
-        name:'Bill',
-        meta: {
-          title: '单据'
-        }
-      },
-      {
-        path:'dialog',
-        component:()=> import('@/views/demo/dialogDemo.vue'),
-        name:'Dialog',
-        meta: {
-          title: '弹窗'
-        }
-      },
-			{
-			  path:'tab',
-			  component:()=> import('@/views/demo/tab.vue'),
-			  name:'Tab',
-			  meta: {
-			    title: '标签'
-			  }
-			}
-    ]
-  }
+  // {
+  //   path:'/demo',
+  //   name:'Demo',
+  //   hidden: true,
+  //   component:() => import('@/views/demo/index.vue'),
+  //   // redirect: 'form',
+  //   children:[
+  //     {
+  //       path:'form',
+  //       component:()=> import('@/views/demo/form.vue'),
+  //       name:'Form',
+  //       meta: {
+  //         title: '表单',
+  //         activeMenu: '/system/user'
+  //       }
+  //     },
+  //     {
+  //       path:'table',
+  //       component:()=> import('@/views/demo/table.vue'),
+  //       name:'Table',
+  //       meta: {
+  //         title: '表格',
+  //         activeMenu: '/system/user'
+  //       }
+  //     },
+  //     {
+  //       path:'moduleView',
+  //       component:()=> import('@/views/demo/moduleView.vue'),
+  //       name:'ModuleView',
+  //       meta: {
+  //         title: 'view封装'
+  //       }
+  //     },
+  //     {
+  //       path:'bill',
+  //       component:()=> import('@/views/demo/bill.vue'),
+  //       name:'Bill',
+  //       meta: {
+  //         title: '单据'
+  //       }
+  //     },
+  //     {
+  //       path:'dialog',
+  //       component:()=> import('@/views/demo/dialogDemo.vue'),
+  //       name:'Dialog',
+  //       meta: {
+  //         title: '弹窗'
+  //       }
+  //     },
+	// 		{
+	// 		  path:'tab',
+	// 		  component:()=> import('@/views/demo/tab.vue'),
+	// 		  name:'Tab',
+	// 		  meta: {
+	// 		    title: '标签'
+	// 		  }
+	// 		}
+  //   ]
+  // }
 ]
 
 // 动态路由,基于用户权限动态去加载

+ 421 - 0
src/views/audit/warehouseAuto/index.vue

@@ -0,0 +1,421 @@
+<template>
+  <div class="priceManage">
+    <module-view :propConfig="config" ref="view" v-loading="load" @modalHandle="modalHandle" @onRefresh="getList" 
+    @resert="queryList" @search="queryList" @clickHandle="clickHandle" @detail="detail" />
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import { query, add, update, del } from '@/api/warehourseAuto'
+@Component({components:{}})
+export default class WarehouseAuto extends Vue {
+  load=false;
+  time:any;
+  timeNum = 0;
+  isSearch=false;
+  config:any={
+    attr:{
+      calculateH:true
+    },
+    search:{
+      attr:{
+        size:'small'
+      },
+      columns:[
+        [{
+          label:'仓库编码',
+          prop:'warehouseCode',
+          component:'by-input',
+          compConfig: {}
+        },{
+          label:'仓库名称',
+          prop:'warehouseName',
+          component:'by-input',
+          compConfig: {}
+        },{
+          label:'授权状态',
+          prop:'authStatus',
+          component:'by-select',
+          compConfig: {
+            attr: {
+              placeholder: '请选择授权状态',
+              clearable: true,
+              data: [{
+                value: '0',
+                label: '未授权'
+              }, {
+                value: '1',
+                label: '已授权'
+              }]
+            }
+          }
+        }]
+      ]
+    },
+    tool:{
+      tools:{
+        add:true,
+        delete:true,
+        // search:true,
+        refresh:true
+      }
+    },
+    table:{
+      attr:{
+        size:'mini',
+        seq:true,
+        align:'center',
+        checkbox:true
+      },
+      columns:[{
+        title:'仓库名称',
+        field:'warehouseName',
+        isDetail:true,
+        width:200
+      },
+      {
+        title:'仓库编码',
+        field:'warehouseCode',
+        width:150
+      },
+      {
+        title:'授权状态',
+        field:'authStatus',
+        width:130,
+        component: 'textChange',
+        compConfig:{
+          attr:{
+            data:[{
+              label:'已授权',
+              value:1,
+              backgroundColor:'#f0f9eb',
+              color:'#67c23a'
+            },{
+              label:'未授权',
+              value:0,
+              backgroundColor:'#fef0f0',
+              color:'#f56c6c'
+            }]
+          }
+        }
+      },
+      {
+        title:'状态',
+        field:'status',
+        width:130,
+        component: 'textChange',
+        compConfig:{
+          attr:{
+            data:[{
+              label:'启用',
+              value:1,
+              backgroundColor:'#f0f9eb',
+              color:'#67c23a'
+            },{
+              label:'停用',
+              value:0,
+              backgroundColor:'#fef0f0',
+              color:'#f56c6c'
+            }]
+          }
+        }
+      },
+      {
+        title:'授权信息-客户编码',
+        field:'refOwnerCode',
+        width:180
+      },
+      {
+        title:'授权信息-仓库编码',
+        field:'refWarehouseCode',
+        width:180
+      },
+      {
+        title:'授权信息-货主编码',
+        field:'refTenantCode',
+        width:180
+      },
+      {
+        title:'授权信息-appkey',
+        field:'refAppKey',
+        width:180
+      },
+      {
+        title:'操作',
+        action:true,
+        width:100,
+        plugins:[{
+          name:'删除',
+          event:{
+            click:(item:any) => {
+              this.del([item.id]);
+            }
+          }
+        }]
+      }
+    ]
+    },
+    modal:{
+      tool:{
+        tools:{
+          return:true,
+          add:true
+        }
+      },
+      form:{
+        attr:{
+          size:'small',
+          width:'1200px',
+          labelWidth:'150px',
+          rules:{
+            warehouseCode:[
+              {required: true, message: '请输入仓库编码', trigger: 'blur'}
+            ],
+            warehouseName:[
+              {required: true, message: '请输入仓库名称', trigger: 'blur'}
+            ],
+            authStatus:[
+              {required: true, message: '请选择授权状态', trigger: 'change'}
+            ],
+            status:[
+              {required: true, message: '请选择状态', trigger: 'change'}
+            ],
+            refOwnerCode:[
+              {required: true, message: '请输入授权信息-客户编码', trigger: 'blur'}
+            ],
+            refWarehouseCode:[
+              {required: true, message: '请输入授权信息-仓库编码', trigger: 'blur'}
+            ],
+            refTenantCode:[
+              {required: true, message: '请输入授权信息-货主编码', trigger: 'blur'}
+            ],
+            refAppKey:[
+              {required: true, message: '请输入授权信息-appkey', trigger: 'blur'}
+            ]
+          }
+        },
+        columns:[
+          [{
+            label:'仓库编码',
+            prop:'warehouseCode',
+            component:'by-input',
+            compConfig: {}
+          },{
+            label:'仓库名称',
+            prop:'warehouseName',
+            component:'by-input',
+            compConfig: {}
+          }],
+          [{
+            label:'授权状态',
+            prop:'authStatus',
+            component:'by-select',
+            compConfig: {
+							attr: {
+								placeholder: '请选择授权状态',
+								clearable: true,
+								data: [{
+									value: '0',
+									label: '未授权'
+								}, {
+									value: '1',
+									label: '已授权'
+								}]
+							}
+						}
+          },{
+            label:'状态',
+            prop:'status',
+            component:'by-select',
+            compConfig: {
+							attr: {
+								placeholder: '请选择授权状态',
+								clearable: true,
+								data: [{
+									value: '0',
+									label: '停用'
+								}, {
+									value: '1',
+									label: '启用'
+								}]
+							}
+						}
+          }],
+          [{
+            label:'授权信息-客户编码',
+            prop:'refOwnerCode',
+            component:'by-input',
+            compConfig: {}
+          },{
+            label:'授权信息-仓库编码',
+            prop:'refWarehouseCode',
+            component:'by-input',
+            compConfig: {}
+          }],
+          [{
+            label:'授权信息-货主编码',
+            prop:'refTenantCode',
+            component:'by-input',
+            compConfig: {}
+          },{
+            label:'授权信息-appkey',
+            prop:'refAppKey',
+            component:'by-input',
+            compConfig: {}
+          }],
+        ]
+      }
+    }
+  }
+  mounted(){
+    this.$nextTick(()=>{
+      this.getList()
+    })
+  }
+  //删除
+  del(ids:Array<number>){
+    this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(() => {
+      this.load = true;
+      del({ids:ids}).then(()=>{
+        this.load = false;
+        this.$message({
+          message:'删除成功!',
+          type:'success'
+        })
+        this.pagination();
+      }).catch(()=>{
+        this.load = false;
+      })
+    }).catch(() => {});
+  }
+  //分页
+  pagination(){
+    if(this.isSearch){
+      this.queryList();
+    }else{
+      this.getList()
+    }
+  }
+  //列表请求(只有分页,不包含搜素条件)
+  getList(){
+    if(!this.$refs.view){
+      if(this.timeNum > 5){
+        return
+      }
+      setTimeout(()=>{
+        this.getList()
+      },500) 
+      this.timeNum ++;
+      return
+    }
+    this.isSearch = false;
+    let data = (this.$refs.view as any).getPage();
+    this.requestList(data);
+  }
+  //列表请求(包含分页和搜素条件)
+  queryList(){
+    this.isSearch = true;
+    let data = (this.$refs.view as any).getQuery();
+    this.requestList(data);
+  }
+  requestList(data:any){
+    this.load = true;
+    query(data).then((res:any) => {
+      this.load = false;
+      (this.$refs.view as any).setTableValue(res.data.records);
+      let page = {
+        pageNo: res.data.current, //当前页
+        pageSize: res.data.size, //每页条数
+        total: res.data.total //总条数
+      };
+      (this.$refs.view as any).setPage(page)
+
+    }).catch(()=>{
+      this.load = false;
+    })
+  }
+  //修改价格数据
+  onSave(){
+    let data = (this.$refs.view as any).getFormValue();
+    this.load = true;
+    update(data).then((res:any) => {
+      this.$message({
+        message:res.msg,
+        type:'success'
+      });
+      this.load = false;
+      (this.$refs.view as any).closeModal();
+      this.pagination();
+    }).catch(()=>{
+      this.load = false;
+    })
+  }
+  //表单工具栏按钮事件
+  modalHandle(n:string){
+    if(n == 'onAdd'){
+      (this.$refs.view as any).getFormValidate(this.addPrice)
+    }
+
+    if(n == 'onSave'){
+      (this.$refs.view as any).getFormValidate(this.onSave)
+    }
+  }
+  //表格工具栏按钮事件
+  clickHandle(n:string){ 
+    if(n == 'onAdd'){
+      this.config.modal.tool.tools.add = true;
+      delete this.config.modal.tool.tools.save;
+      (this.$refs.view as any).initFormTool();
+    }
+    if(n == 'onDelete') {
+      let data = (this.$refs.view as any).getSelectData();
+      if(!data || data.length == 0) {
+        this.$message('请选择数据!');
+        return
+      }
+      let ids:Array<number> = [];
+      for(const item of data) {
+        ids.push(item.id)
+      }
+      this.del(ids);
+    }
+  }
+  //添加平台
+  addPrice(){
+    let value = (this.$refs.view as any).getFormValue();
+    if(value){
+      this.load = true;
+      add(value).then((res:any)=>{
+        this.load = false;
+        this.$message({
+          message:res.msg,
+          type:'success'
+        });
+        (this.$refs.view as any).closeModal();
+        this.getList();
+      }).catch(()=>{
+        this.load = false;
+      })
+    }
+  }
+  //点击详情
+  detail(){
+    this.config.modal.tool.tools.save = true;
+    delete this.config.modal.tool.tools.add;
+    (this.$refs.view as any).initFormTool();
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.priceManage{
+  width: 100%;
+  height: 100%;
+  overflow-y: hidden;
+}
+</style>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 465 - 440
src/views/oms/B2BOrder/components/addOrder.vue


+ 166 - 153
src/views/oms/B2BOrder/components/carpoolModal.vue

@@ -1,23 +1,19 @@
 <template>
-  <el-drawer
-    v-loading="load"
-    :title="'订单发货(共'+data.length+'单)'"
-    :visible.sync="drawer"
-    :direction="direction"
-    size="50%">
+  <el-drawer v-loading="load" :title="'订单发货(共' + data.length + '单)'" :visible.sync="drawer" :direction="direction" size="50%">
     <div class="content">
       <div class="order-cont" v-if="data && data[0]">
         <div class="cont-left">
           <!-- <div class="order-code">订单号:{{data[0].id}}</div> -->
           <div class="order-other">
-            <div class="receive-name">姓名:{{data[0].receiverName}}</div>
-            <div class="address">目的地:<span>{{data[0].receiverProvince+'-'+data[0].receiverCity}}</span></div>
+            <div class="receive-name">姓名:{{ data[0].receiverName }}</div>
+            <div class="address">目的地:<span>{{ data[0].receiverProvince + '-' + data[0].receiverCity }}</span></div>
             <!-- <div class="time">预计送达:8月6日 12:00前</div> -->
           </div>
         </div>
         <!-- <i class="el-icon-arrow-right"></i> -->
       </div>
-      <deliveryGoodsInfo :hideOrderCode="true" :sendState="true" @editState="editState" @editResult="editResult" ref="info" />
+      <deliveryGoodsInfo :hideOrderCode="true" :sendState="true" @editState="editState" @editResult="editResult"
+        ref="info" />
       <!-- <deliveryPrice v-if="priceData && priceData.length > 0" :data="priceData" :currentValue="currentPrice" @prichChange="prichChange" /> -->
     </div>
     <div class="space"></div>
@@ -39,74 +35,74 @@
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import DeliveryGoodsInfo from "./deliveryGoodsInfo.vue";
 import DeliveryPrice from "./deliveryPrice.vue";
-import { add,multiply,subtract,divide } from '@/benyun/utils/accuracy'
-import { getMultipleToOnePrice,addMultipleToOne,getInventoryByStoreHouseIdAndSkuids } from  '@/api/delivery'
-import  api from '@/api/currency'
+import { add, multiply, subtract, divide } from '@/benyun/utils/accuracy'
+import { getMultipleToOnePrice, addMultipleToOne, getInventoryByStoreHouseIdAndSkuids } from '@/api/delivery'
+import api from '@/api/currency'
 import Format from '@/benyun/utils/dateFormat'
-@Component({components:{DeliveryGoodsInfo,DeliveryPrice}})
+@Component({ components: { DeliveryGoodsInfo, DeliveryPrice } })
 export default class CarpoolModal extends Vue {
-  drawer=false;
-  direction='rtl'
-  checked=false;
-  stopHandle=false;
-  load=false;
-  onAct='1';
-  data:Array<any>=[];
-  priceData:Array<any>=[]
-  currentPrice:any={}
-  value:any={};
-  setShow(v:boolean){
-    this.drawer=v;
+  drawer = false;
+  direction = 'rtl'
+  checked = false;
+  stopHandle = false;
+  load = false;
+  onAct = '1';
+  data: Array<any> = [];
+  priceData: Array<any> = []
+  currentPrice: any = {}
+  value: any = {};
+  setShow(v: boolean) {
+    this.drawer = v;
     this.stopHandle = false;
-    this.priceData=[];
-    this.currentPrice={}
+    this.priceData = [];
+    this.currentPrice = {}
   }
-  setValue(data:Array<any>){
-    this.data =data;
-    this.value={};
+  setValue(data: Array<any>) {
+    this.data = data;
+    this.value = {};
     this.value.tmsTransportMethod = '整车';
     this.value.tmsBusinessMan = (this as any).$store.getters.userInfo.nickName;
     this.value.tmsBusinessPhone = (this as any).$store.getters.userInfo.phonenumber;
-    this.value.subItem=[];
+    this.value.subItem = [];
     this.value.weight = data[0].weight;
-    this.value.tmsUnloadingProvince=data[0].receiverProvince;
-    this.value.tmsUnloadingProvinceNo=data[0].receiverProvinceCode;
-    this.value.tmsUnloadingCity=data[0].receiverCity;
-    this.value.tmsUnloadingCityNo=data[0].receiverCityCode;
-    this.value.tmsUnloadingRegion=data[0].receiverDistrict;
-    this.value.tmsUnloadingRegionNo=data[0].receiverDistrictCode;
-    this.value.tmsUnloadingStreet=data[0].receiverTown;
-    this.value.tmsUnloadingStreetNo=data[0].receiverTownCode;
-    this.value.tmsUnloadingAddress=data[0].receiverAddress;
-    this.value.tmsUnloadingConsignor=data[0].receiverName;
-    this.value.tmsUnloadingContacts=data[0].receiverMobile;
-    this.value.wmsSendType='B2BCK';
-    this.value.tmsArrivalDate=this.getTime(3600 * 1000 * 24 * 2);
-    this.value.tmsDeliveryDate=this.getTime(3600 * 1000 * (24 * 2 + 2));
+    this.value.tmsUnloadingProvince = data[0].receiverProvince;
+    this.value.tmsUnloadingProvinceNo = data[0].receiverProvinceCode;
+    this.value.tmsUnloadingCity = data[0].receiverCity;
+    this.value.tmsUnloadingCityNo = data[0].receiverCityCode;
+    this.value.tmsUnloadingRegion = data[0].receiverDistrict;
+    this.value.tmsUnloadingRegionNo = data[0].receiverDistrictCode;
+    this.value.tmsUnloadingStreet = data[0].receiverTown;
+    this.value.tmsUnloadingStreetNo = data[0].receiverTownCode;
+    this.value.tmsUnloadingAddress = data[0].receiverAddress;
+    this.value.tmsUnloadingConsignor = data[0].receiverName;
+    this.value.tmsUnloadingContacts = data[0].receiverMobile;
+    this.value.wmsSendType = 'B2BCK';
+    this.value.tmsArrivalDate = this.getTime(3600 * 1000 * 24 * 2);
+    this.value.tmsDeliveryDate = this.getTime(3600 * 1000 * (24 * 2 + 2));
     this.checked = false;
-    const requestId =  new Date().getTime() + this.getUuid();
+    const requestId = new Date().getTime() + this.getUuid();
     this.value.requestId = requestId;
-    for(let item of data){     
-      if(item.items){
-        for(const i of item.items){
-          let total:any = 0;
-          if(Number(i.qty) && Number(i.price)){
-            total = multiply(Number(i.qty),Number(i.price))
+    for (let item of data) {
+      if (item.items) {
+        for (const i of item.items) {
+          let total: any = 0;
+          if (Number(i.qty) && Number(i.price)) {
+            total = multiply(Number(i.qty), Number(i.price))
           }
           this.value.subItem.push({
-            requestId:requestId,
-            omsOrderId:item.id,
-            isGift:i.isGift,
-            barCode:i.barCode,
-            omsOrderItemId:i.itemId,
-            tmsGoodsModel:i.styleId,
-            tmsGoodsCode:i.skuId,
+            requestId: requestId,
+            omsOrderId: item.id,
+            isGift: i.isGift,
+            barCode: i.barCode,
+            omsOrderItemId: i.itemId,
+            tmsGoodsModel: i.styleId,
+            tmsGoodsCode: i.skuId,
             // omsOrderItemSkuId:i.itemId,
-            tmsQuantity:Number(i.qty)?Number(i.qty):0,
-            tmsGoodsTotalPrice:total,
-            name:i.name,
-            price:i.price,
-            weight:i.weight
+            tmsQuantity: Number(i.qty) ? Number(i.qty) : 0,
+            tmsGoodsTotalPrice: total,
+            name: i.name,
+            price: i.price,
+            weight: i.weight
           })
         }
       }
@@ -124,66 +120,66 @@ export default class CarpoolModal extends Vue {
       pageSize: 1000
     }, 'maindataStorehouse').then((res: any) => {
       let warehouseData = res.data.records;
-      if(warehouseData.length > 0){
-        this.value.tmsShipmentConsignor=warehouseData[0].shipper;
-        this.value.tmsShipmentContacts=warehouseData[0].shipperPhone;
-        this.value.tmsShipmentProvince= warehouseData[0].province;
-        this.value.tmsShipmentProvinceNo=warehouseData[0].provinceCode;
-        this.value.tmsShipmentCity= warehouseData[0].city;
-        this.value.tmsShipmentCityNo= warehouseData[0].cityCode;
-        this.value.tmsShipmentRegion= warehouseData[0].region;
-        this.value.tmsShipmentRegionNo= warehouseData[0].regionCode;
-        this.value.tmsShipmentStreetNo= warehouseData[0].streetCode;
-        this.value.tmsShipmentStreet= warehouseData[0].street;
-        this.value.tmsShipmentAddress=warehouseData[0].address;
-        this.value.storeHouseId= warehouseData[0].id;
-        this.value.storeHouseName= warehouseData[0].name;
+      if (warehouseData.length > 0) {
+        this.value.tmsShipmentConsignor = warehouseData[0].shipper;
+        this.value.tmsShipmentContacts = warehouseData[0].shipperPhone;
+        this.value.tmsShipmentProvince = warehouseData[0].province;
+        this.value.tmsShipmentProvinceNo = warehouseData[0].provinceCode;
+        this.value.tmsShipmentCity = warehouseData[0].city;
+        this.value.tmsShipmentCityNo = warehouseData[0].cityCode;
+        this.value.tmsShipmentRegion = warehouseData[0].region;
+        this.value.tmsShipmentRegionNo = warehouseData[0].regionCode;
+        this.value.tmsShipmentStreetNo = warehouseData[0].streetCode;
+        this.value.tmsShipmentStreet = warehouseData[0].street;
+        this.value.tmsShipmentAddress = warehouseData[0].address;
+        this.value.storeHouseId = warehouseData[0].id;
+        this.value.storeHouseName = warehouseData[0].name;
         (this.$refs.info as any).setValue(this.value);
       }
-    }).catch(() => {})
+    }).catch(() => { })
   }
-  getTime(n:number) {
+  getTime(n: number) {
     const start = new Date();
     start.setTime(start.getTime() + n);
-    const t = Format(new Date(start),'yyyy-MM-dd HH:mm:ss');
+    const t = Format(new Date(start), 'yyyy-MM-dd HH:mm:ss');
     return t
   }
-  getUuid(){
+  getUuid() {
     return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
   }
-  prichChange(index:number){
+  prichChange(index: number) {
     this.currentPrice = this.priceData[index];
     this.$forceUpdate();
   }
-  getPriceInfo(data:any){
-    let params:any={};
+  getPriceInfo(data: any) {
+    let params: any = {};
     params.startStoreHouseId = data.storeHouseId;
     // params.startAddressCode = data.tmsShipmentCityNo + '00000';
     params.endAddressCode = data.tmsUnloadingCityNo + '00000';
     params.planType = data.tmsTransportMethod;
-    params.omsIds=[];
-    for(const item of this.data){
+    params.omsIds = [];
+    for (const item of this.data) {
       params.omsIds.push(item.id);
     }
     this.load = true;
-    getMultipleToOnePrice(params).then((res:any) => {
-      this.load=false;
-      let current:any=null;
-      for(let item of res.data[0].data){
-        let d = new Date().getTime() + item.duration*60*60*1000;
-        item.endTime=Format(new Date(d),'MM月dd日 HH:mm');
-        if(!current) current = item;
-        if(Number(current.estimateFreight) > Number(item.estimateFreight)){
+    getMultipleToOnePrice(params).then((res: any) => {
+      this.load = false;
+      let current: any = null;
+      for (let item of res.data[0].data) {
+        let d = new Date().getTime() + item.duration * 60 * 60 * 1000;
+        item.endTime = Format(new Date(d), 'MM月dd日 HH:mm');
+        if (!current) current = item;
+        if (Number(current.estimateFreight) > Number(item.estimateFreight)) {
           current = item
         }
       }
       this.priceData = res.data[0].data;
       this.currentPrice = current;
-    }).catch((err:any)=>{
+    }).catch((err: any) => {
       this.load = false;
     })
   }
-  btn(){
+  btn() {
     // if(this.stopHandle){
     //   this.$message('库存不足!')
     //   return
@@ -192,15 +188,15 @@ export default class CarpoolModal extends Vue {
     //   this.$message('请阅读并同意运单协议!')
     //   return
     // }
-    if(!this.value.tmsBusinessMan || !this.value.tmsBusinessPhone || !this.value.tmsShipmentConsignor || !this.value.tmsShipmentContacts || !this.value.tmsUnloadingConsignor || !this.value.tmsUnloadingContacts || !this.value.tmsUnloadingProvince || !this.value.tmsUnloadingAddress || !this.value.storeHouseId){
+    if (!this.value.tmsBusinessMan || !this.value.tmsBusinessPhone || !this.value.tmsShipmentConsignor || !this.value.tmsShipmentContacts || !this.value.tmsUnloadingConsignor || !this.value.tmsUnloadingContacts || !this.value.tmsUnloadingProvince || !this.value.tmsUnloadingAddress || !this.value.storeHouseId) {
       this.$message("订单信息不完整,请编辑信息!");
       return
     }
-    if(this.value.tmsBusinessMan.length > 10){
+    if (this.value.tmsBusinessMan.length > 10) {
       this.$message("业务员名称不能超过10个字符!");
       return
     }
-    let params:any=(this as any).$lodash.cloneDeep(this.value);
+    let params: any = (this as any).$lodash.cloneDeep(this.value);
     // if(this.priceData){
     //   try{
     //     params.pricePlan = JSON.stringify(this.priceData)
@@ -209,96 +205,98 @@ export default class CarpoolModal extends Vue {
     // if(this.currentPrice){
     //   params.priceId = this.currentPrice.id;
     // }
-    params.omsOrderIds=[]
-    for(const item of this.data){
+    params.omsOrderIds = []
+    for (const item of this.data) {
       params.omsOrderIds.push(item.id);
     }
-    params.tmsMaterials=[];
-    if(this.value.subItem){
-      for(const item of this.value.subItem){
+    params.tmsMaterials = [];
+    if (this.value.subItem) {
+      for (const item of this.value.subItem) {
         params.tmsMaterials.push({
-          storeHouseId:this.value.storeHouseId,
-          materialSkuId:item.omsOrderItemId,
+          storeHouseId: this.value.storeHouseId,
+          materialSkuId: item.omsOrderItemId,
           qty: item.tmsQuantity
         })
       }
     }
     delete params.subItem;
     this.load = true;
-    addMultipleToOne(params).then((res:any) => {
+    addMultipleToOne(params).then((res: any) => {
       this.load = false;
-      if(res.code == 200){
+      if (res.code == 200) {
         this.$message({
-          message:'订单发货成功!',
-          type:'success'
+          message: '订单发货成功!',
+          type: 'success'
         })
         this.$emit('handleSuccess');
-        this.drawer=false;
+        this.drawer = false;
       }
-    }).catch(()=>{  
+    }).catch(() => {
       this.load = false;
     })
   }
   //查库存
-  getStoreCount(item:any,callback?:Function){
-    let params:any={};
+  getStoreCount(item: any, callback?: Function) {
+    let params: any = {};
     params.storeHouseId = item.storeHouseId;
-    params.skuIds=[]
-    if(item.subItem){
-      for(const i of item.subItem){
-        if(params.skuIds.indexOf(i.omsOrderItemId) == -1){
+    params.skuIds = []
+    if (item.subItem) {
+      for (const i of item.subItem) {
+        if (params.skuIds.indexOf(i.omsOrderItemId) == -1) {
           params.skuIds.push(i.omsOrderItemId)
         }
       }
     }
     this.load = true;
-    getInventoryByStoreHouseIdAndSkuids(params).then((res:any) => {
+    getInventoryByStoreHouseIdAndSkuids(params).then((res: any) => {
       this.load = false;
-      let m='';
-      for(const i of item.subItem){
-        for(const d of res.data){
+      let m = '';
+      for (const i of item.subItem) {
+        for (const d of res.data) {
           let s = Number(d.inventory) - Number(d.useInventory) - Number(i.tmsQuantity);
-          if(i.omsOrderItemId == d.skuid && s < 0){
-            m = m ? m + ',' + i.name : i.name;          
-          }else{
+          if (i.omsOrderItemId == d.skuid && ++
+            s < 0) {
+            m = m ? m + ',' + i.name : i.name;
+          } else {
             d.inventory = subtract(d.inventory, i.tmsQuantity);
           }
         }
       }
-      if(m){
+      if (m) {
         this.$message({
-          message:'商品“'+m+'”库存不足!',
-          type:'error'
+          message: '商品“' + m + '”库存不足!',
+          type: 'error'
         })
         this.stopHandle = true;
         return
       }
-    }).catch(()=>{
+    }).catch(() => {
       this.load = false;
     })
   }
-  editResult(v:any){
+  editResult(v: any) {
     this.value = v;
     // this.getPriceInfo(v);
     // this.getStoreCount(v);
   }
-  editState(v:boolean){
+  editState(v: boolean) {
     this.drawer = v
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.content{
+.content {
   width: 100%;
   box-sizing: border-box;
   padding: 0 16px;
   background-color: #FFF;
-  .order-cont{
+
+  .order-cont {
     height: 60px;
     width: 100%;
     box-sizing: border-box;
-    border:solid 1px #BBB;
+    border: solid 1px #BBB;
     border-radius: 5px;
     display: flex;
     justify-content: space-between;
@@ -306,44 +304,54 @@ export default class CarpoolModal extends Vue {
     padding: 0 16px;
     margin-bottom: 16px;
     cursor: pointer;
-    .cont-left{
+
+    .cont-left {
       // width: calc(100% - 40px);
       width: 100%;
-      .order-code{
+
+      .order-code {
         width: 100%;
         font-size: 14px;
         padding: 6px 0 4px;
       }
-      .order-other{
+
+      .order-other {
         width: 100%;
         display: flex;
         font-size: 14px;
-        .receive-name{
+
+        .receive-name {
           width: 150px;
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
         }
-        .address{
+
+        .address {
           width: calc(100% - 150px);
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
-          span{
+
+          span {
             color: #F00;
           }
         }
+
         // .time{
         //   width: calc(100% - 120px - 150px);
         // }
       }
     }
   }
-  .order-cont:hover,.onAct{
-    background-color: rgba(160,205,255,0.22);
+
+  .order-cont:hover,
+  .onAct {
+    background-color: rgba(160, 205, 255, 0.22);
   }
 }
-.deli-footer{
+
+.deli-footer {
   height: 60px;
   width: 100%;
   padding: 0 16px;
@@ -357,28 +365,33 @@ export default class CarpoolModal extends Vue {
   left: 0;
   bottom: 0;
   z-index: 10;
-  .d-left{
+
+  .d-left {
     width: 70%;
-    .estimate-total{
+
+    .estimate-total {
       font-size: 14px;
       padding-bottom: 4px;
-      .total{
+
+      .total {
         font-size: 16px;
         color: #F00;
       }
-      .detail{
+
+      .detail {
         color: #1684FC;
         padding-left: 16px;
         cursor: pointer;
       }
     }
   }
-  .send-btn{
+
+  .send-btn {
     width: 120px;
     height: 40px;
     line-height: 40px;
     border-radius: 8px;
-    background: linear-gradient(129.2deg, rgba(22,132,252,1) 9.81%,rgba(93,167,249,1) 97.4%);
+    background: linear-gradient(129.2deg, rgba(22, 132, 252, 1) 9.81%, rgba(93, 167, 249, 1) 97.4%);
     color: rgba(255, 255, 255, 100);
     font-size: 14px;
     text-align: center;
@@ -386,9 +399,9 @@ export default class CarpoolModal extends Vue {
     cursor: pointer;
   }
 }
-.space{
+
+.space {
   height: 60px;
   width: 100%;
   margin-top: 16px;
-}
-</style>
+}</style>

+ 120 - 106
src/views/oms/B2BOrder/components/deliveryDetail.vue

@@ -1,11 +1,5 @@
 <template>
-  <el-drawer
-    append-to-body
-    title="发货详情"
-    v-loading="load"
-    :visible.sync="drawer"
-    @close="close"
-    :direction="direction"
+  <el-drawer append-to-body title="发货详情" v-loading="load" :visible.sync="drawer" @close="close" :direction="direction"
     size="50%">
     <div class="content" v-if="value.orderType == 'B2B'">
       <deliveryGoodsInfo :sendState="true" ref="info" :readOnly="true" />
@@ -58,7 +52,7 @@
           </el-popover>
         </div>
       </div> -->
-      
+
       <!-- <div class="space"></div> -->
 
       <div class="send-box">
@@ -112,31 +106,31 @@
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import DeliveryGoodsInfo from "./deliveryGoodsInfo.vue";
-import { queryOrderByOrderId,cancleSendOrder,cancleWmsTradeOrder } from  '@/api/delivery'
+import { queryOrderByOrderId, cancleSendOrder, cancleWmsTradeOrder } from '@/api/delivery'
 import api from '@/api/currency'
-@Component({components:{DeliveryGoodsInfo}})
+@Component({ components: { DeliveryGoodsInfo } })
 export default class DeliveryDetail extends Vue {
-  drawer=false;
-  direction='rtl'
+  drawer = false;
+  direction = 'rtl'
   load = false;
-  priceData:Array<any>=[];
-  value:any={};
-  wmsState='';
-  operationFlag:string=''
-  setShow(v:boolean){
-    this.drawer=v;
+  priceData: Array<any> = [];
+  value: any = {};
+  wmsState = '';
+  operationFlag: string = ''
+  setShow(v: boolean) {
+    this.drawer = v;
   }
   showLogistics() {
     this.drawer = false;
-    this.$emit('showLogistics',this.value.tmsOrderNo)
+    this.$emit('showLogistics', this.value.tmsOrderNo)
   }
-  close(){
-    this.value={}
-    this.priceData=[];
+  close() {
+    this.value = {}
+    this.priceData = [];
   }
-  getTMSStatus(v:any){
+  getTMSStatus(v: any) {
     let n = '';
-    switch(v){
+    switch (v) {
       case 0:
         n = '创建';
         break;
@@ -168,9 +162,9 @@ export default class DeliveryDetail extends Vue {
 
     return n;
   }
-  getWmsState(s:any){
+  getWmsState(s: any) {
     let n = '';
-    switch(s){
+    switch (s) {
       case 1:
         n = '创建';
         break;
@@ -187,10 +181,10 @@ export default class DeliveryDetail extends Vue {
     return n;
   }
   cancelB2CDelivery() {
-    if(this.operationFlag === 'DS_JUSHUITAN'){
+    if (this.operationFlag === 'DS_JUSHUITAN') {
       this.$message({
-        message:'点三订单禁止取消发货!',
-        type:'warning'
+        message: '点三订单禁止取消发货!',
+        type: 'warning'
       })
       return
     }
@@ -200,62 +194,62 @@ export default class DeliveryDetail extends Vue {
       type: 'warning'
     }).then(() => {
       this.load = true;
-      cancleWmsTradeOrder({saleOrderCode:this.value.wmsSaleorderCode}).then((res:any) => {
+      cancleWmsTradeOrder({ saleOrderCode: this.value.wmsSaleorderCode }).then((res: any) => {
         this.drawer = false;
-        this.load =false;
+        this.load = false;
         this.$message({
-          message:'该订单的发货已被取消!',
-          type:'success'
+          message: '该订单的发货已被取消!',
+          type: 'success'
         })
         this.$emit('handleSuccess');
       }).catch(() => {
         this.load = false;
       })
-    }).catch(() => {});
+    }).catch(() => { });
   }
-  setData(v:any){
-    if(!v || !v.id) {
+  setData(v: any) {
+    if (!v || !v.id) {
       this.$message('缺少订单id');
       return
     }
     this.operationFlag = v.upSourceName
     this.load = true;
     queryOrderByOrderId({
-      omsOrderId:v.id
-    }).then((res:any) => {
+      omsOrderId: v.id
+    }).then((res: any) => {
       this.load = false;
-      if(res.data) {
+      if (res.data) {
         this.value = res.data;
         this.loadWarehouse();
-        if(res.data.subItemList){
-          this.value.subItem=[];
-          for(const item of this.value.subItemList){
+        if (res.data.subItemList) {
+          this.value.subItem = [];
+          for (const item of this.value.subItemList) {
             this.value.subItem.push({
-              tmsGoodsCode:item.tmsGoodsCode,
-              name:item.tmsGoodsName,
-              tmsGoodsTotalPrice:item.tmsGoodsTotalPrice,
-              price:item.tmsGoodsPrice,
-              weight:item.tmsWeight,
-              tmsQuantity:item.tmsQuantity
+              tmsGoodsCode: item.tmsGoodsCode,
+              name: item.tmsGoodsName,
+              tmsGoodsTotalPrice: item.tmsGoodsTotalPrice,
+              price: item.tmsGoodsPrice,
+              weight: item.tmsWeight,
+              tmsQuantity: item.tmsQuantity
             })
           }
         }
         this.value.weight = Number(this.value.tmsTotalWeight)
-        if(res.data.pricePlan){
-          try{
+        if (res.data.pricePlan) {
+          try {
             this.priceData = JSON.parse(res.data.pricePlan);
-          }catch(e){
+          } catch (e) {
             this.priceData = [];
             console.error('价格列表数据转换错误!')
           }
-          
+
         }
-        this.$nextTick(()=>{
-          if(this.$refs.info){
+        this.$nextTick(() => {
+          if (this.$refs.info) {
             (this.$refs.info as any).setValue(this.value)
           }
         })
-      }else{
+      } else {
         // this.drawer = false;
         this.$message('未找到发货明细数据!')
       }
@@ -268,62 +262,62 @@ export default class DeliveryDetail extends Vue {
       pageNo: 1,
       pageSize: 1000
     }, 'maindataStorehouse').then((res: any) => {
-      if(res.data.records.length > 0){
-        for(const item of res.data.records){
-          if(this.value.storeHouseOutId === item.id){
+      if (res.data.records.length > 0) {
+        for (const item of res.data.records) {
+          if (this.value.storeHouseOutId === item.id) {
             this.value.storeHouseName = item.name
           }
         }
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
           (this.$refs.info as any).setValue(this.value);
         })
       }
-    }).catch(() => {})
+    }).catch(() => { })
   }
-  cancelDelivery(){
+  cancelDelivery() {
     let msg = '';
-    if(this.operationFlag === 'DS_JUSHUITAN'){
+    if (this.operationFlag === 'DS_JUSHUITAN') {
       this.$message({
-        message:'点三订单禁止取消发货!',
-        type:'warning'
+        message: '点三订单禁止取消发货!',
+        type: 'warning'
       })
       return
     }
-    if(this.value.shippingType == 'MORE'){
+    if (this.value.shippingType == 'MORE') {
       msg = '此操作将导致整车订单的发货被取消,是否继续?'
     }
-    if(this.value.shippingType == 'ONE'){
+    if (this.value.shippingType == 'ONE') {
       msg = '此操作将导致该订单的发货被取消,是否继续?'
     }
-    if(msg){
+    if (msg) {
       this.$confirm(msg, '提示', {
         confirmButtonText: '继续',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.load = true;
-        cancleSendOrder({orderNos:[this.value.tmsOrderNo]}).then((res:any) => {
+        cancleSendOrder({ orderNos: [this.value.tmsOrderNo] }).then((res: any) => {
           this.drawer = false;
-          this.load =false;
+          this.load = false;
           this.$message({
-            message:'该订单的发货已被取消!',
-            type:'success'
+            message: '该订单的发货已被取消!',
+            type: 'success'
           })
           this.$emit('handleSuccess');
         }).catch(() => {
           this.load = false;
         })
-      }).catch(() => {});
+      }).catch(() => { });
     }
   }
 
-  getSendType(v:string){
+  getSendType(v: string) {
     let n = v;
-    if(v === 'YKCK'){
+    if (v === 'YKCK') {
       n = '越库出库'
-    }else if(v === 'B2BCK'){
+    } else if (v === 'B2BCK') {
       n = 'B2B出库'
-    }else if(v === 'B2CCK'){
+    } else if (v === 'B2CCK') {
       n = 'B2C出库'
     }
     return n;
@@ -331,47 +325,54 @@ export default class DeliveryDetail extends Vue {
 }
 </script>
 <style lang="scss" scoped>
-.content{
+.content {
   width: 100%;
   box-sizing: border-box;
   padding: 0 16px;
   background-color: #FFF;
-  .send-box{
+
+  .send-box {
     width: 100%;
     box-sizing: border-box;
     padding: 16px;
     padding-bottom: 0;
     margin-bottom: 16px;
-    background-color: rgba(160,205,255,0.22);
-    .pri-title{
+    background-color: rgba(160, 205, 255, 0.22);
+
+    .pri-title {
       width: 100%;
       padding-bottom: 8px;
       display: flex;
       align-items: center;
-      .title-item{
+
+      .title-item {
         width: 188px;
         font-size: 12px;
-        span{
+
+        span {
           color: #1684FC;
           padding-left: 8px;
         }
       }
     }
-    .send-type{
+
+    .send-type {
       width: 100%;
       display: flex;
       align-items: center;
-      flex-wrap:wrap;
-      .send-item{
+      flex-wrap: wrap;
+
+      .send-item {
         width: 165px;
         box-sizing: border-box;
-        border:solid 3px #999;
+        border: solid 3px #999;
         border-radius: 6px;
         overflow: hidden;
         margin-right: 32px;
         margin-bottom: 16px;
+
         // cursor: pointer;
-        .label-name{
+        .label-name {
           background-color: #999;
           color: #FFF;
           font-size: 16px;
@@ -379,52 +380,64 @@ export default class DeliveryDetail extends Vue {
           padding: 2px 0 4px;
           text-align: center;
         }
-        .send-info{
+
+        .send-info {
           padding: 8px 0;
           text-align: center;
           background-color: #FFF;
-          .s-time{
+
+          .s-time {
             font-size: 14px;
             color: #1684FC;
           }
-          .send-price{
+
+          .send-price {
             font-size: 20px;
             padding-top: 4px;
           }
         }
       }
-      .onSend{
-        border:solid 3px #1684FC;
-        .label-name{
+
+      .onSend {
+        border: solid 3px #1684FC;
+
+        .label-name {
           background-color: #1684FC;
         }
       }
-      .ont{
-        border:solid 3px #FF0404;
-        .label-name{
+
+      .ont {
+        border: solid 3px #FF0404;
+
+        .label-name {
           background-color: #FF0404;
         }
       }
     }
-    .s-row{
+
+    .s-row {
       width: 100%;
       display: flex;
       align-items: center;
       padding-bottom: 16px;
-      .s-col{
+
+      .s-col {
         width: 100%;
         font-size: 14px;
       }
-      .width50{
+
+      .width50 {
         width: 50%;
       }
     }
-    .s-row:last-child{
+
+    .s-row:last-child {
       padding: 16;
     }
   }
 }
-.deli-footer{
+
+.deli-footer {
   height: 60px;
   box-shadow: 0 -5px 10px #EEE;
   width: 100%;
@@ -438,12 +451,13 @@ export default class DeliveryDetail extends Vue {
   left: 0;
   bottom: 0;
   z-index: 10;
-  .send-btn{
+
+  .send-btn {
     width: 120px;
     height: 40px;
     line-height: 40px;
     border-radius: 8px;
-    background: linear-gradient(129.2deg, rgba(22,132,252,1) 9.81%,rgba(93,167,249,1) 97.4%);
+    background: linear-gradient(129.2deg, rgba(22, 132, 252, 1) 9.81%, rgba(93, 167, 249, 1) 97.4%);
     color: rgba(255, 255, 255, 100);
     font-size: 14px;
     text-align: center;
@@ -452,9 +466,9 @@ export default class DeliveryDetail extends Vue {
     cursor: pointer;
   }
 }
-.space{
+
+.space {
   height: 60px;
   width: 100%;
   margin-top: 16px;
-}
-</style>
+}</style>

+ 0 - 1
src/views/oms/priceManage/index.vue

@@ -8,7 +8,6 @@
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import { queryPrice, add, update, del } from '@/api/priceManage'
-import { number } from "echarts";
 @Component({components:{}})
 export default class SourceShop extends Vue {
   load=false;

+ 71 - 71
src/views/oms/sourceShop/index.vue

@@ -19,81 +19,81 @@ export default class SourceShop extends Vue {
     attr:{
       calculateH:true
     },
-    search:{
-      attr:{
-        size:'small'
-      },
-      columns:[
-        [{
-          label:'来源名称',
-          prop:'sourceName',
-          component:'by-input',
-          span:8,
-          compConfig:{}
-        },
-        {
-          label:'授权状态',
-          prop:'authStatus',
-          span:8,
-          component:'by-select',
-          compConfig:{
-            attr:{
-              clearable:true,
-              data:[{
-                value:'Authorized',
-                label:'已授权'
-              },{
-                value:'Unauthorized',
-                label:'未授权'
-              },{
-                value:'Expired',
-                label:'已过期'
-              }]
-            }
-          }
-        },
-        {
-          label:'所属平台',
-          prop:'channelName',
-          span:8,
-          component:'by-select',
-            compConfig:{
-              attr:{
-                clearable:true,
-                data:[{
-                  value:'JUSHUITAN',
-                  label:'聚水潭'
-                }]
-              }
-            }
-        }],
-        [{
-          label:'授权账号',
-          prop:'authAccount',
-          component:'by-input',
-          span:8,
-          compConfig:{}
-        },
-        {
-          label:'创建时间',
-          prop:'createTime',
-          component:'by-date-picker',
-          span:8,
-          compConfig:{
-            attr:{
-              editable:false,
-              type:'datetimerange',
-              format:'yyyy-MM-dd HH:mm:ss'
-            }
-          }
-        }]
-      ]
-    },
+    // search:{
+    //   attr:{
+    //     size:'small'
+    //   },
+    //   columns:[
+    //     [{
+    //       label:'来源名称',
+    //       prop:'sourceName',
+    //       component:'by-input',
+    //       span:8,
+    //       compConfig:{}
+    //     },
+    //     {
+    //       label:'授权状态',
+    //       prop:'authStatus',
+    //       span:8,
+    //       component:'by-select',
+    //       compConfig:{
+    //         attr:{
+    //           clearable:true,
+    //           data:[{
+    //             value:'Authorized',
+    //             label:'已授权'
+    //           },{
+    //             value:'Unauthorized',
+    //             label:'未授权'
+    //           },{
+    //             value:'Expired',
+    //             label:'已过期'
+    //           }]
+    //         }
+    //       }
+    //     },
+    //     {
+    //       label:'所属平台',
+    //       prop:'channelName',
+    //       span:8,
+    //       component:'by-select',
+    //         compConfig:{
+    //           attr:{
+    //             clearable:true,
+    //             data:[{
+    //               value:'JUSHUITAN',
+    //               label:'聚水潭'
+    //             }]
+    //           }
+    //         }
+    //     }],
+    //     [{
+    //       label:'授权账号',
+    //       prop:'authAccount',
+    //       component:'by-input',
+    //       span:8,
+    //       compConfig:{}
+    //     },
+    //     {
+    //       label:'创建时间',
+    //       prop:'createTime',
+    //       component:'by-date-picker',
+    //       span:8,
+    //       compConfig:{
+    //         attr:{
+    //           editable:false,
+    //           type:'datetimerange',
+    //           format:'yyyy-MM-dd HH:mm:ss'
+    //         }
+    //       }
+    //     }]
+    //   ]
+    // },
     tool:{
       tools:{
         add:true,
         // delete:true,
-        search:true,
+        // search:true,
         refresh:true
       }
     },

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor