From 8c16c0fdac9d895f8b53a8032f47cddfe8490ff9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 24 九月 2024 17:34:15 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master

---
 src/components/view/b1-sample.vue |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/components/view/b1-sample.vue b/src/components/view/b1-sample.vue
index 70d036c..f5680aa 100644
--- a/src/components/view/b1-sample.vue
+++ b/src/components/view/b1-sample.vue
@@ -166,7 +166,7 @@
     <div style="width: 100%;height: 100%;" v-if="!isDetail">
       <div>
         <el-row class="title">
-          <el-col :span="12" style="padding-left: 20px;">鏍峰搧绠＄悊</el-col>
+          <el-col :span="12" style="padding-left: 20px;text-align: left;">鏍峰搧绠＄悊</el-col>
           <el-col :span="12" style="text-align: right;">
             <el-button size="small" type="primary" @click="storageVisible=true">鍏ュ簱</el-button>
             <el-button size="small" type="primary" @click="exportVisible=true">鍑哄簱</el-button>
@@ -195,7 +195,7 @@
         <div class="search_thing">
           <div class="search_label">鏍峰搧缂栧彿锛�</div>
           <div class="search_input">
-            <el-input placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" v-model="searchSampleCode" size="small">
+            <el-input placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" v-model="searchSampleCode" size="small" autocomplete="off">
               <el-button slot="append" icon="el-icon-search" @click="handleSearch"></el-button>
             </el-input>
           </div>
@@ -222,7 +222,7 @@
                   effect="dark"
                   placement="top"
                   v-for="(n,j) in m.samples"
-                  :key="j" :disabled="`${n.sample}${n.model}`.length<10">
+                  :key="j" :disabled="`${n.sample}${n.model}`.length<5">
                     <div slot="content"><span>{{ n.sample }}</span>
                       <span>&nbsp;({{ n.model }})&nbsp;[{{ n.sampleCode }}]</span></div>
                     <li class="green"
@@ -366,6 +366,7 @@
         <el-button type="primary" @click="confirmShelves" :loading="upLoadShelves">纭� 瀹�</el-button>
       </span>
     </el-dialog>
+    <input type="password" id="ScanCodeInfo" v-model="codeInfo" @keyup.enter="keyup" style="opacity: 0;height: 0px;margin: 0px;padding: 0px;position: absolute;top: 0;"></input>
   </div>
 </template>
 
@@ -382,6 +383,7 @@
           shelfId: null
         },
         warehouse: [],
+        startTime: null,
         shelf: [],
         storageList:[],
         storageVisible: false,
@@ -406,13 +408,57 @@
         tableLoading:false,
         sampleCode:'',
         currentId:null,
-        searchSampleCode:''
+        searchSampleCode:'',
+        codeInfo:null,
       }
+    },
+    watch:{
+      storageVisible(newVal){
+        if(newVal){
+            // this.$message.success('鎵爜锛氭墦寮�')
+            let input = document.getElementById('ScanCodeInfo');
+            input.focus();
+            this.startTime = setInterval(()=>{
+                input.focus()
+            },1000)
+        }else{
+            // this.$message.warning('鎵爜锛氬叧闂�')
+            clearInterval(this.startTime)
+        }
+      },
+      exportVisible(newVal){
+        if(newVal){
+            // this.$message.success('鎵爜锛氭墦寮�')
+            let input = document.getElementById('ScanCodeInfo');
+            input.focus();
+            this.startTime = setInterval(()=>{
+                input.focus()
+            },1000)
+        }else{
+            // this.$message.warning('鎵爜锛氬叧闂�')
+            clearInterval(this.startTime)
+        }
+      },
     },
     mounted() {
       this.selectList()
     },
     methods: {
+      keyup(e){
+        var code = ''
+        // console.log(3333,this.codeInfo,e)
+        try{
+            code = JSON.parse(this.codeInfo)
+            if(code==null||code==undefined||code==''){
+                this.$message.error('璇ヤ簩缁寸爜鏈夎')
+            }else{
+                this.sampleCode = code
+            }
+        }catch(e){
+            this.$message.error('璇ヤ簩缁寸爜鏈夎')
+        }
+        this.codeInfo = null
+      },
       selectList() {
         this.$axios.get(this.$api.warehouse.selectWarehouse).then(res => {
           this.warehouse = res.data
@@ -700,6 +746,7 @@
         this.isDetail = true;
       },
       warehouseChange(val) {
+        this.tableList = []
         let map = this.warehouse.find(a => {
           return a.id === val ? a : null
         })

--
Gitblit v1.9.3