1

src/benyun/utils/auth.ts

@@ -5,11 +5,11 @@ const TokenKey = 'AdminOMS-Token'
 const ExpiresInKey = 'AdminOMS-Expires-In'
 
 export function getToken() {
-  if(process.env.NODE_ENV === 'development'){
-    return 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjE0NWRjMDlmLWE1ODYtNGQzYy1iMzViLTU2NTI1MDQ1NTk0ZiIsInVzZXJuYW1lIjoiYWRtaW4ifQ.dEMzKkhoomRGBjfbeDEYyT0bWw6qsXQSDiOaBXSORV9aJszOIHR-8KsRuZd-aT-xFR1zWS-DckxbT2HFPHijUA'
-  }else{
+  // if(process.env.NODE_ENV === 'development'){
+  //   return 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjdkM2FmZGVhLWQ1ZjctNDdhMC04ZDY3LWQ4ZTVlOWI3NGU4YiIsInVzZXJuYW1lIjoiYWRtaW4ifQ.Qoyb1kPCLTqEujOUoJzMkLz1ZqETlknJ1buyc8F8lePc0iLcKYnw-HFdMGN3colI2K0_8tZT2wiwaD7PuaVKJA'
+  // }else{
     return Cookies.get(TokenKey)
-  }
+  // }
   
 }
 

src/components/skuModal/productModal.vue

@@ -59,19 +59,31 @@ export default class ProductModal extends Vue {
         //   }
         // },
         {
-          span:10,
+          span:8,
           label:'商品名称',
-          prop:'name',
+          prop:'skuTitle',
           component:'by-input',
           labelWidth:'120px',
           compConfig:{
             attr:{
               clearable:true,
-              placeholder:'请输入商品名称'
+              placeholder:'商品名称'
             }
           }
         },{
-            span: 10,
+            span: 8,
+            label: '物料编码',
+            prop: 'skuCode',
+            labelWidth: '130px',
+            component: 'by-input',
+            compConfig: {
+              attr: {
+                placeholder: '69码-商品条码',
+                clearable: true
+              }
+            }
+          },{
+            span: 8,
             label: '69码-商品条码',
             prop: 'barCode',
             labelWidth: '130px',
@@ -82,7 +94,7 @@ export default class ProductModal extends Vue {
                 clearable: true
               }
             }
-          },]
+          }]
       ]
     },
     tool:{
@@ -108,6 +120,10 @@ export default class ProductModal extends Vue {
         field:'skuTitle',
         ellipsis:true,
         // width:150
+      },{
+        title:'物料编码',
+        field:'skuCode',
+        width:140
       },{
         title:'69码',
         field:'barCode',
@@ -117,12 +133,14 @@ export default class ProductModal extends Vue {
         title: '是否已同步WMS',
         field: 'isSynchronousWMS',
         component: wmsStatue
-      },{
-        title:'规格',
-        field:'materialSpec',
-        width:240,
-        ellipsis:true
-      },{
+      },
+      // {
+      //   title:'规格',
+      //   field:'materialSpec',
+      //   width:240,
+      //   ellipsis:true
+      // },
+      {
         title:'单价',
         field:'price',
         width:80

src/main.ts

@@ -18,6 +18,7 @@ import '@/assets/styles/benyuntech.scss' // young css
 
 import './assets/icons' // icon
 import './permission' // permission control
+// import './permission2'
 
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
@@ -175,7 +176,7 @@ function unitVue() {
     }).$mount('#app')
   })
 }
-
+// unitVue()
 omsLogin()