Răsfoiți Sursa

B2C订单显示“手工下载”

逆水行舟 1 lună în urmă
părinte
comite
ce6ebb44c1
3 a modificat fișierele cu 17 adăugiri și 11 ștergeri
  1. 1 0
      .gitignore
  2. 1 1
      src/benyun/utils/auth.ts
  3. 15 10
      src/views/oms/B2COrder/components/orderTool.vue

+ 1 - 0
.gitignore

@@ -2,6 +2,7 @@
 .DS_Store
 node_modules
 /dist
+dist.zip
 
 
 # local env files

+ 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.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6ImU5M2EwMTQ3LTQ5MjktNDI2OC05OTU5LTYxZmY3ZGJhZmNkYSIsInVzZXJuYW1lIjoiYWRtaW4ifQ.CH44ARBEr95sS0RBj0-aO-_kmUd66seuOEGrNQVlU4lFqnDnUJ7jne-T0rbaoB1rwzvN82LfG34srEgkHs5jzA";
+    return "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjNjM2I2YjM0LWIwNWQtNDZmMS1hMzM2LTZlNzU2NGU5MDczMiIsInVzZXJuYW1lIjoiYWRtaW4ifQ._Ki3OH0sxAIl7aOGP-r2X85LPwLXap7oMTm306PdzhqQdsZBRtfGt0_l9WA_B9QIYe7mQazr_OniLgBQkzNUTA";
   } else {
     return Cookies.get(TokenKey);
   }

+ 15 - 10
src/views/oms/B2COrder/components/orderTool.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="order-tool">
     <!-- 2024-9-30 经刑工、詹工开会讨论 手工下载按钮隐藏 pingCode:LSF-562 -->
-    <!-- <el-button type="text" @click="handle('loadOrder')">手工下载</el-button> -->
+    <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">
@@ -13,7 +13,7 @@
     <!-- <el-button type="text" @click="handle('addOrder')">新增订单</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>
@@ -28,7 +28,8 @@
     <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-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>
@@ -51,7 +52,8 @@
     <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('batchSendGoods')">发货<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>
 
@@ -60,32 +62,35 @@ import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 @Component
 export default class OrderTool extends Vue {
 
-  handleCommand(n:string){
+  handleCommand(n: string) {
     this.$emit(n)
   }
 
-  handle(n:string){
+  handle(n: string) {
     this.$emit(n)
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.order-tool{
+.order-tool {
   height: 40px;
   display: flex;
   align-items: center;
   width: 100%;
-  .order-tool-btn{
+
+  .order-tool-btn {
     color: #333;
   }
-  .split{
+
+  .split {
     height: 10px;
     width: 1px;
     background-color: #CCC;
     margin: 0 8px;
   }
-  .dropdown{
+
+  .dropdown {
     padding-left: 8px;
   }
 }