改bug

src/benyun/utils/auth.ts

@@ -6,7 +6,7 @@ const ExpiresInKey = 'AdminOMS-Expires-In'
 
 export function getToken() {
   if(process.env.NODE_ENV === 'development'){
-    return 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6ImUxMGZiNGE5LThjNjctNDRmNS04MmVlLTA3ZmEzNGRmZjEzMyIsInVzZXJuYW1lIjoiYWRtaW4ifQ.ZboNvSMNW-WCwU2e_2nqr7GBXdMbr27wapnmRtxz8_YQGHFCQX3chOFIg80qEl3i47gNtceAXaNFwKfb1Gmh6Q'
+    return 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6ImM5NjA2ZWE0LTNjMzYtNDhiMi1iNjA0LTZlMDkxMTExNjE3MSIsInVzZXJuYW1lIjoiYWRtaW4ifQ.EzQDbeUA_E1UQBAxqH4AnAmK2cDxsksphOZgF7tV86ziaNa-mrhzl4uNihBEs4_l_QZnH3te3vjZfETo-1dgtQ'
   }else{
     return Cookies.get(TokenKey)
   }

src/views/audit/sku/components/storeRecord.vue

@@ -3,7 +3,7 @@
     <div class="record-main">
       <el-tabs v-model="activeName" @tab-click="handleClick" v-loading="load">
         <el-tab-pane label="订单记录" name="first">
-          <by-table :propConfig="orderConfig" ref="orderTable" class="tableComp" @pagination="paginationOrder">
+          <by-table :propConfig="orderConfig" v-if="activeName == 'first'" ref="orderTable" class="tableComp" @pagination="paginationOrder">
             <template v-slot:state='{ row }'>
               <span v-if="row.status == 'WaitPay'">待付款</span>
               <span v-if="row.status == 'Delivering'">发货中</span>
@@ -28,10 +28,10 @@
           </by-table>
         </el-tab-pane>
         <el-tab-pane label="入库记录" name="second">
-          <by-table :propConfig="inStoreConfig" ref="inStoreTable" class="tableComp" @pagination="paginationInStore"></by-table>
+          <by-table :propConfig="inStoreConfig" v-if="activeName == 'second'" ref="inStoreTable" class="tableComp" @pagination="paginationInStore"></by-table>
         </el-tab-pane>
         <el-tab-pane label="出库记录" name="third">
-          <by-table :propConfig="outStoreConfig" ref="outStoreTable" class="tableComp" @pagination="paginationOutnStore"></by-table>
+          <by-table :propConfig="outStoreConfig" v-if="activeName == 'third'" ref="outStoreTable" class="tableComp" @pagination="paginationOutnStore"></by-table>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -263,15 +263,21 @@ export default class StoreRecord extends Vue {
     if(this.activeName == 'first') {
       this.pageOrder.pageNo = 1
       this.pageOrder.total = 0
-      this.loadOrderList()
+      this.$nextTick(()=>{
+        this.loadOrderList()
+      })
     }else if(this.activeName == 'second') {
       this.inStorePage.pageNo = 1
       this.inStorePage.total = 0
-      this.loadInstoreList()
+      this.$nextTick(()=>{
+        this.loadInstoreList()
+      })
     }else if(this.activeName == 'third') {
       this.outStorePage.pageNo = 1
       this.outStorePage.total = 0
-      this.loadOutstoreList()
+      this.$nextTick(()=>{
+        this.loadOutstoreList()
+      })
     }
   }
 }

src/views/audit/sku/index.vue

@@ -289,7 +289,7 @@
 						{
 							span: 6,
 							label: '商品名称',
-							prop: 'materialName',
+							prop: 'name',
 							component: 'by-input',
 							compConfig: {
 								attr: {

src/views/audit/store/components/deliveryGoodsInfo.vue

@@ -103,7 +103,7 @@
           <vxe-column field="price" title="单价"></vxe-column>
           <vxe-column field="tmsQuantity" title="数量" width="120">
             <template #default="{ row }">
-              <el-input v-model="row.tmsQuantity" type="number" size="mini" placeholder="" @input="qtyChange(row)"></el-input>
+              <el-input v-model="row.tmsQuantity" type="number" size="mini" placeholder="" @change="qtyChange(row)"></el-input>
             </template>
             
           </vxe-column>

src/views/oms/B2BOrder/index.vue

@@ -69,9 +69,9 @@
             </template>
           </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-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')" /> -->
-          <el-collapse-item title="付款方式 & 是否付款" name="codAndPay">
+          <!-- <el-collapse-item title="付款方式 & 是否付款" name="codAndPay">
             <div class="box01">
               <el-radio-group v-model="radio" @input="colChange">
                 <el-radio label="0">不限</el-radio>
@@ -86,7 +86,7 @@
                 <el-radio label="2">已付款</el-radio>
               </el-radio-group>
             </div>
-          </el-collapse-item>
+          </el-collapse-item> -->
           <!-- <order-checkbox title="店铺" ref="searchCom13" keyName="shopIdList" :options="shopIdListOptions" @checkboxChange="onChange($event,'shopIdList')" /> -->
 
           <order-checkbox title="省份" ref="searchCom14" keyName="receiverProvinceCode" :options="provinceOptions" @checkboxChange="onChange($event,'receiverProvinceCodeList')" />

src/views/oms/B2COrder/index.vue

@@ -69,8 +69,8 @@
             </template>
           </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')" />
-          <el-collapse-item title="付款方式 & 是否付款" name="codAndPay">
+          <!-- <order-checkbox title="订单类型" keyName="typeList" ref="searchCom12" :options="typeOption" noLimit @checkboxChange="onChange($event,'typeList')" /> -->
+          <!-- <el-collapse-item title="付款方式 & 是否付款" name="codAndPay">
             <div class="box01">
               <el-radio-group v-model="radio" @input="colChange">
                 <el-radio label="0">不限</el-radio>
@@ -85,7 +85,7 @@
                 <el-radio label="2">已付款</el-radio>
               </el-radio-group>
             </div>
-          </el-collapse-item>
+          </el-collapse-item> -->
           <!-- <order-checkbox title="店铺" ref="searchCom13" keyName="shopIdList" :options="shopIdListOptions" @checkboxChange="onChange($event,'shopIdList')" /> -->
 
           <order-checkbox title="省份" ref="searchCom14" keyName="receiverProvinceCode" :options="provinceOptions" @checkboxChange="onChange($event,'receiverProvinceCodeList')" />

src/views/oms/orderHistory/index.vue

@@ -200,7 +200,7 @@ export default class OrderHistory extends Vue {
 
   parameChange(parames:any){
     for(const key in parames){
-      if(this.value[key]){
+      if(parames[key]){
         if(this.value[key]){
           this.value[key] = parames[key].split(',')
         }else{

src/views/system/user/index.vue

@@ -80,7 +80,7 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button
               type="primary"
               plain
@@ -111,7 +111,7 @@
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
             >删除</el-button>
-          </el-col>
+          </el-col> -->
           <!-- <el-col :span="1.5">
             <el-button
               type="info"
@@ -147,6 +147,7 @@
               <el-switch
                 v-model="scope.row.status"
                 active-value="0"
+                disabled
                 inactive-value="1"
                 @change="handleStatusChange(scope.row)"
               ></el-switch>
@@ -157,7 +158,7 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             label="操作"
             align="center"
             width="160"
@@ -190,7 +191,7 @@
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
 
         <pagination
@@ -428,7 +429,7 @@ export default {
       rules: {
         userName: [
           { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 10, message: '用户名称长度必须介于 2 和 10 之间', trigger: 'blur' }
+          { min: 2, max: 11, message: '用户名称长度必须介于 2 和 11 之间', trigger: 'blur' }
         ],
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }