ymy hace 8 meses
padre
commit
f87a09fab5

+ 1 - 1
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.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6ImQ4NjgxMzBiLWRhOWItNDY1Ni05MDA1LWJjMTdkNTRiOGFjYiIsInVzZXJuYW1lIjoiYWRtaW4ifQ.maoXwOre2xa1X5oW0S8szndPK1opp4wWIKssXyWTiSEqsKuUBaRBlNtV41OpwaF-NwyfdHfBDfHqPON8xsOCVQ'
+    return 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxNDIsInVzZXJfa2V5IjoiOTZmYTFlYjMtMzZkMS00NmMyLTg3MDMtZjdlMjFhYjIxNmQ2IiwidXNlcm5hbWUiOiIxODc3ODI3NTEzNiJ9.LYcF_qo_4rvgxgWXBS4j8mdTLiCfZ8pd0xsonzrBq96FC8hLIM_ikUNFPU64Gqn87jubpGumWoX0-iNT5tPuPw'
   }else{
     return Cookies.get(TokenKey)
   }

+ 2 - 2
src/layout/components/Navbar.vue

@@ -11,9 +11,9 @@
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
       </template>
 

+ 1 - 1
src/views/oms/B2BOrder/components/deliveryDetail.vue

@@ -225,7 +225,7 @@ export default class DeliveryDetail extends Vue {
           this.value.subItem = [];
           for (const item of this.value.subItemList) {
             this.value.subItem.push({
-              tmsGoodsCode: item.tmsGoodsCode,
+              barCode: item.tmsGoodsCode,
               name: item.tmsGoodsName,
               tmsGoodsTotalPrice: item.tmsGoodsTotalPrice,
               price: item.tmsGoodsPrice,

+ 3 - 1
src/views/oms/B2COrder/components/orderTool.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="order-tool">
-    <el-button type="text" @click="handle('loadOrder')">手工下载</el-button>
+    <!-- 2024-9-30 经刑工、詹工开会讨论 手工下载按钮隐藏 pingCode:LSF-562 -->
+    <!-- <el-button type="text" @click="handle('loadOrder')">手工下载</el-button> -->
+
     <el-button type="text" @click="handle('importOrder')">导入订单</el-button>
     <!-- <el-dropdown split-button type="text" @click="handle('addOrder')" @command="handleCommand">
       新增订单