update sampleScanner input option

src/views/system/jbdScan/goods/manualConfirmation.vue

@@ -71,13 +71,35 @@
                         <el-row>
                           <el-col :span="6">
                             <el-form-item label="样品类型(一)">
-                              <el-input v-model="item.yang_pin_lei_xing " ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_lei_xing " ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_lei_xing" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTypes"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           
                           <el-col :span="6">
                             <el-form-item label="样品运输条件(一)">
-                              <el-input v-model="item.yang_ben_yun_shu_" ></el-input>
+                              <!-- <el-input v-model="item.yang_ben_yun_shu_" ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_ben_yun_shu_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTransportationConditions"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           
@@ -89,7 +111,18 @@
                           
                           <el-col :span="6">
                             <el-form-item label="样品规格(一)">
-                              <el-input v-model="item.yang_pin_gui_ge_"></el-input>
+                              <!-- <el-input v-model="item.yang_pin_gui_ge_"></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_gui_ge_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleSpecifications"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                         </el-row>
@@ -122,12 +155,34 @@
                         <el-row  v-if="item.flag2">
                           <el-col :span="6">
                             <el-form-item label="样品类型(二)" >
-                              <el-input v-model="item.yang_pin_lei_er_"   ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_lei_er_"   ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_lei_er_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTypes"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品运输条件(二)">
-                              <el-input v-model="item.yang_pin_yun_shu_"  ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_yun_shu_"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_yun_shu_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTransportationConditions"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
@@ -137,7 +192,18 @@
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品规格(二)">
-                              <el-input v-model="item.yang_pin_gui_ge_e"  ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_gui_ge_e"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_gui_ge_e" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleSpecifications"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                         </el-row>
@@ -169,12 +235,34 @@
                         <el-row v-if="item.flag3">
                           <el-col :span="6">
                             <el-form-item label="样品类型(三)" >
-                              <el-input v-model="item.yang_pin_lei_san_"  ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_lei_san_"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_lei_san_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTypes"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品运输条件(三)">
-                              <el-input v-model="item.yang_pin_yun_san"  ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_yun_san"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_yun_san" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTransportationConditions"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
@@ -184,7 +272,18 @@
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品规格(三)">
-                              <el-input v-model="item.yang_pin_gui_ge_s"  ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_gui_ge_s"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_gui_ge_s" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleSpecifications"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                         </el-row>
@@ -216,12 +315,34 @@
                         <el-row  v-if="item.flag4">
                           <el-col :span="6">
                             <el-form-item label="样品类型(四)">
-                              <el-input v-model="item.yang_pin_lei_si_"   ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_lei_si_"   ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_lei_si_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTypes"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品运输条件(四)">
-                              <el-input v-model="item.yang_pin_yun_si_"  ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_yun_si_"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_yun_si_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTransportationConditions"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
@@ -231,7 +352,18 @@
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品规格(四)">
-                              <el-input v-model="item.yang_pin_gui_si_"  ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_gui_si_"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_gui_si_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleSpecifications"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                         </el-row> 
@@ -619,7 +751,24 @@ import * as dayjs from 'dayjs'
           label:'女'
         }],
       // OriginalPosition:[],
-      // mjwtsqbAllResult:[],
+      sampleTypes:[],
+      sampleSpecifications:[],
+      sampleTransportationConditions:[{
+         value:'常温',
+         label:'常温'
+      },{
+         value:'冰袋（2-8℃）',
+         label:'冰袋（2-8℃）'
+      },{
+         value:'干冰',
+         label:'干冰'
+      },{
+         value:'液氮',
+         label:'液氮'
+      },{
+         value:'其它',
+         label:'其它'
+      }],
       pageCount:1,
       item:'',
       flag: true,

src/views/system/jbdScan/goods/sampleConfirmation.vue

@@ -70,13 +70,35 @@
                         <el-row>
                           <el-col :span="6">
                             <el-form-item label="样品类型(一)">
-                              <el-input v-model="item.yang_pin_lei_xing" ></el-input>
+                                <!-- <el-input v-model="item.yang_pin_lei_xing " ></el-input> -->
+                                <template slot-scope="scope">
+                                    <el-select v-model="item.yang_pin_lei_xing" placeholder="请选择">
+                                    <el-option
+                                        v-for="item in sampleTypes"
+                                        :key = "item.value"
+                                        :label = "item.label"
+                                        :value = "item.value"
+                                    >
+                                    </el-option>
+                                    </el-select>
+                                </template>
                             </el-form-item>
                           </el-col>
                           
                           <el-col :span="6">
                             <el-form-item label="样品运输条件(一)">
-                              <el-input v-model="item.yang_ben_yun_shu_" ></el-input>
+                              <!-- <el-input v-model="item.yang_ben_yun_shu_" ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_ben_yun_shu_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTransportationConditions"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           
@@ -88,7 +110,18 @@
                           
                           <el-col :span="6">
                             <el-form-item label="样品规格(一)">
-                              <el-input v-model="item.yang_pin_gui_ge_" ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_gui_ge_"></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_gui_ge_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleSpecifications"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                         </el-row>
@@ -120,12 +153,34 @@
                         <el-row v-if="item.flag2">
                           <el-col :span="6">
                             <el-form-item label="样品类型(二)">
-                              <el-input v-model="item.yang_pin_lei_er_" ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_lei_er_"   ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_lei_er_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTypes"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品运输条件(二)">
-                              <el-input v-model="item.yang_pin_yun_shu_" ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_yun_shu_"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_yun_shu_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTransportationConditions"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
@@ -135,7 +190,18 @@
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品规格(二)">
-                              <el-input v-model="item.yang_pin_gui_ge_e" ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_gui_ge_e"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_gui_ge_e" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleSpecifications"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                         </el-row>
@@ -167,12 +233,34 @@
                         <el-row v-if="item.flag3">
                           <el-col :span="6">
                             <el-form-item label="样品类型(三)">
-                              <el-input v-model="item.yang_pin_lei_san_" ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_lei_san_"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_lei_san_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTypes"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品运输条件(三)">
-                              <el-input v-model="item.yang_pin_yun_san" ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_yun_san"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_yun_san" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTransportationConditions"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
@@ -182,7 +270,18 @@
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品规格(三)">
-                              <el-input v-model="item.yang_pin_gui_ge_s" ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_gui_ge_s"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_gui_ge_s" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleSpecifications"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                         </el-row>   
@@ -215,12 +314,34 @@
                         <el-row v-if="item.flag4">
                           <el-col :span="6">
                             <el-form-item label="样品类型(四)">
-                              <el-input v-model="item.yang_pin_lei_si_"  ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_lei_si_"   ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_lei_si_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTypes"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品运输条件(四)">
-                              <el-input v-model="item.yang_pin_yun_si_" ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_yun_si_"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_yun_si_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleTransportationConditions"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
@@ -230,7 +351,18 @@
                           </el-col>
                           <el-col :span="6">
                             <el-form-item label="样品规格(四)">
-                              <el-input v-model="item.yang_pin_gui_si_" ></el-input>
+                              <!-- <el-input v-model="item.yang_pin_gui_si_"  ></el-input> -->
+                              <template slot-scope="scope">
+                                <el-select v-model="item.yang_pin_gui_si_" placeholder="请选择">
+                                <el-option
+                                    v-for="item in sampleSpecifications"
+                                    :key = "item.value"
+                                    :label = "item.label"
+                                    :value = "item.value"
+                                >
+                                </el-option>
+                                </el-select>
+                              </template>
                             </el-form-item>
                           </el-col>
                         </el-row> 
@@ -591,6 +723,24 @@ import * as dayjs from 'dayjs'
           label:'女'
         }],
       // OriginalPosition:[],
+      sampleTypes:[],
+      sampleSpecifications:[],
+      sampleTransportationConditions:[{
+         value:'常温',
+         label:'常温'
+      },{
+         value:'冰袋（2-8℃）',
+         label:'冰袋（2-8℃）'
+      },{
+         value:'干冰',
+         label:'干冰'
+      },{
+         value:'液氮',
+         label:'液氮'
+      },{
+         value:'其它',
+         label:'其它'
+      }],
       pageCount:'',
       item:'',
       // currentPage:1,

src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -19,6 +19,30 @@ export default {
     },
     methods: {
         facilityData(page) {
+            let sql = `select lei_xing_ from t_yplxb`
+            let sql2 = `select yang_pin_gui_ge_ from t_ypbzggb`
+            Promise.all([repostCurd('sql',sql),repostCurd('sql',sql2)]).then(([res1,res2]) =>{
+                let data  = res1.variables.data
+                let data2 = res2.variables.data
+                let types = []
+                let guiGes = []
+                data.forEach(item=>{
+                    let obj = {
+                        value:item.lei_xing_,
+                        label:item.lei_xing_
+                    }
+                    types.push(obj)
+                })
+                data2.forEach(item=>{
+                    let o = {
+                        value:item.yang_pin_gui_ge_,
+                        label:item.yang_pin_gui_ge_
+                    }
+                    guiGes.push(o)
+                })
+                this.sampleTypes = types
+                this.sampleSpecifications = guiGes
+            })
             if (this.obj.length > 0) {
                 this.loadData(this.obj)
             } else {

src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -27,7 +27,6 @@ export default {
         },
         /* 获取数据 ，开始查阅记录 */
         loadData(id) {
-            // let this_ = this
             let flag = true // 重复扫码标志位
             for (let index in this.listData) { // 判断是否重复，重复扫码 数量自增
                 if (this.listData[index].yang_pin_bian_hao == id) {
@@ -35,6 +34,30 @@ export default {
                     flag = false
                 }
             }
+            let sql = `select lei_xing_ from t_yplxb`
+            let sql2 = `select yang_pin_gui_ge_ from t_ypbzggb`
+            Promise.all([repostCurd('sql',sql),repostCurd('sql',sql2)]).then(([res1,res2]) =>{
+                let data  = res1.variables.data
+                let data2 = res2.variables.data
+                let types = []
+                let guiGes = []
+                data.forEach(item=>{
+                    let obj = {
+                        value:item.lei_xing_,
+                        label:item.lei_xing_
+                    }
+                    types.push(obj)
+                })
+                data2.forEach(item=>{
+                    let o = {
+                        value:item.yang_pin_gui_ge_,
+                        label:item.yang_pin_gui_ge_
+                    }
+                    guiGes.push(o)
+                })
+                this.sampleTypes = types
+                this.sampleSpecifications = guiGes
+            })
 
             // 扫码扫到新数据,查询 回填展示
             if (flag) {