Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/App.vue

@@ -107,4 +107,14 @@ input[type='number'] {
       background: #f9FAFC!important;
       color: #8890B1!important;
     }
+    .el-table__body tr:hover>td {
+		background-color: #E8ECF6 !important;
+  }
+  .el-submenu__title:hover {
+  background-color: #5473E8!important;
+}
+.el-menu-item:hover {
+  outline: 0;
+  background-color: #5473E8!important;
+}
 </style>

src/global.js

@@ -11,7 +11,6 @@ export default {
   },
   whetherWebSocket: function() {
     var that =this
-    debugger
       if ('WebSocket' in window) {
         if (process.env.NODE_ENV === 'production') {
           that.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/?adminId=84f62127b7384dcdbaeaddfe460329fc' )

src/layout/index/top/index.vue

@@ -21,7 +21,7 @@
       <!-- 使用租户 -->
       
       <div class="hidden-content">
-        <el-input ref="hiddenFocus" type="password" class="input-Style" v-model="barCode" size="small" @focus="focus" @blur="blur" autocomplete="new-password" 
+        <el-input ref="hiddenFocus" type="password" class="input-Style" v-model="barCode" size="small" @focus="focus" @blur="blur" autocomplete="off" 
           @keyup.enter.native="payCode" placeholder="扫码枪内容"></el-input>
         <div v-show="isOpenCodeGun" class="code-scan-text">扫码枪已连接</div>
         <div v-show="!isOpenCodeGun" @click="setCodeGun" class="code-scan-text">点我扫码</div>
@@ -382,7 +382,7 @@
       ...mapActions('common', ['setLocalVessels']),
       ...mapActions('user', ['getUserInfo','toSetShow']),
       payCode() {
-        console.log("input", this.barCode)
+        console.log('input', this.barCode)
         this.btnStatus = {
           status1: false,
           status2: false,
@@ -393,13 +393,12 @@
         }
         // let _userCompId = "2710b21efc1e4393930c5dc800010dc4"
         // let _qualityNo = "SGRK202112140060003"
-         
         let _userCompId = this.barCode.split('&')[0]
         let _qualityNo = this.barCode.split('&')[1]
         let _userHouseId = this.barCode.split('&')[2]
         this.cangid = this.barCode.split('&')[2]
-        if(_userCompId.indexOf(",") != -1){
-         _userCompId =  _userCompId.split(",")[1]
+        if(_userCompId.indexOf(',') != -1){
+         _userCompId =  _userCompId.split(',')[1]
         }
         this.tmp = {
           compId: _userCompId,
@@ -410,6 +409,7 @@
         //判断当前账号公司是否是二维码上公司
         if (this.userINfo.userCompany != _userCompId) {
           this.$message.error('当前身份不可操作');
+           this.barCode = ''
           return
         }
         //判断二维码上的仓库当前账号是否有权限操作
@@ -551,6 +551,7 @@
                    this.getQRCodeData(this.tmp)
               }else{
                  this.$message.error('当前身份不可操作');
+                 this.barCode = ''
                  return
               }
             
@@ -594,14 +595,15 @@
         this.$refs['hiddenFocus'].focus()
       },
       focus() {
-        console.log("当前焦点状态")
+        console.log('当前焦点状态')
+        this.barCode = ''
         this.isOpenCodeGun = true
       },
       blur() {
-        console.log("当前已失去焦点状态")
+        console.log('当前已失去焦点状态')
         this.isOpenCodeGun = false
       },
-      goToPage(type) {debugger
+      goToPage(type) {
          this.barCode = ''
         let _url = ''
         if (type === 1) {