修改扫码，标签

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

@@ -298,6 +298,12 @@
                               </template>
                             </el-form-item>
                           </el-col>
+
+                         <el-col :span="6">
+                          <el-form-item label="是否加急" >
+                            <el-input v-model="item.chu_ju_bao_gao_ya" readonly="true" class="jiaji"></el-input>
+                          </el-form-item>
+                         </el-col>
                           <!-- <el-col :span="6">
                             <el-form-item label="分装留样数量">
                               <template slot-scope="scope">
@@ -516,7 +522,7 @@ import * as dayjs from 'dayjs'
           label:'女'
         }],
       // OriginalPosition:[],
-      mjwtsqbAllResult:[],
+      // mjwtsqbAllResult:[],
       pageCount:1,
       item:'',
       flag: true
@@ -576,4 +582,10 @@ import * as dayjs from 'dayjs'
    border-right: none !important;
    border-radius: 0;
  }
+ /deep/.jiaji{
+      // color: #F56C6C;
+      // font-size: 18px;
+      // line-height: 40px;
+      // font-weight: bold;  
+ }
 </style>

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

@@ -12,7 +12,7 @@
             測試</el-button> -->
          <!-- 扫码操作组件-->
            <div class="popContainer" v-if="redar" @click="remRedar">
-                <dv-decoration-12 style="width:150px;height:150px;margin:0 auto;top: 35%;">
+                <dv-decoration-12 style="width:150px;height:100px;margin:0 auto;top: 35%;">
                  <span style=" color: #66D9EF;">开启扫描设备连接-样品接收确认</span>
                 </dv-decoration-12>
            </div>
@@ -20,7 +20,7 @@
                width="90%"
                top="5vh"
                :modal-append-to-body='false'
-               title="样品扫码接收确认操作 - 扫码样品标签并确认样品数量、存放位置 (如果扫描无结果,请点击除标题外的空白处,恢复扫码功能)"
+               title="      样品手动接收确认操作 - 确认样品数量及相关信息  (如果扫描无结果,请点击除标题外的空白处,恢复扫码功能)"
                @close="closeDialog"
                :before-close = "handleClose"
                :visible.sync="visible"> <!-- 表单是否显示 -->
@@ -297,6 +297,12 @@
                               </template>
                             </el-form-item>
                           </el-col>
+                          <el-col :span="6">
+
+                          <el-form-item label="是否加急">
+                            <el-input v-model="item.chu_ju_bao_gao_ya" readonly="true"></el-input>
+                          </el-form-item>
+                         </el-col>
                           <!-- <el-col :span="6">
                             <el-form-item label="分装留样数量">
                               <template slot-scope="scope">
@@ -508,9 +514,10 @@ import * as dayjs from 'dayjs'
         }],
       // OriginalPosition:[],
       pageCount:'',
-      item:''
+      item:'',
       // currentPage:1,
       // pageCount:''
+      flag: true
 
     }
   },
@@ -529,7 +536,8 @@ import * as dayjs from 'dayjs'
   }
 </script>
 
-<style>
+
+<style lang="less" scoped>
  .sample-scan .popContainer{
       position: fixed;
       top: 0;
@@ -539,4 +547,34 @@ import * as dayjs from 'dayjs'
       z-index: 9999999;
       background: rgba(0,0,0,0.7);
   }
+    // .dynamic-form-table__label:before {
+    //   content: '*';
+    //   color: #F56C6C;
+    // }
+    .dynamic-form-table__label{
+      color: #F56C6C;
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: bold;
+    }
+    /deep/.el-form-item__content{
+    display: inline-block;
+  }
+  /deep/.el-form-item__label{
+    padding: 0;
+    margin-right: 5px;
+    width: 100px;
+  }
+   /deep/.el-input__inner{
+   border-top: none !important;
+   border-left: none !important;
+   border-right: none !important;
+   border-radius: 0;
+ }
+ /deep/.jiaji{
+      // color: #F56C6C;
+      // font-size: 18px;
+      // line-height: 40px;
+      // font-weight: bold;  
+ }
 </style>

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

@@ -47,8 +47,8 @@
                       <div>{{ index2 + 1 }}/{{ item1.num }}支</div>
                     </div>
                   <div class="lh" >
-                      <div>收样时间:</div>
-                      <div></div>
+                      <div>收样时间：</div>
+                      <div>{{ item1.time }}</div>
                     </div>
                   <div class="lh">
                     <div>流转状态：</div>
@@ -114,11 +114,12 @@ export default {
       value: '',
       id: '',
       list: [{
-        name: 5,
-        serial: 5,
-        type: 5,
-        num: 5,
-        condition: 5
+        name: '测试名称',
+        serial: '测试编号',
+        type: '测试类型',
+        num: 1,
+        condition: '测试条件',
+        time:''
       }],
       visible: true
     }
@@ -146,8 +147,8 @@ export default {
       this.getLook(idStr)
     },
     getLook(id) {
-      // console.log(id)
-      let sql = `select * from t_lhypb where find_in_set(id_,'${id}')`
+      // let sql = `select * from t_lhypb where find_in_set(id_,'${id}')`
+      let sql = `select ypb.*,	djb.shou_yang_ri_qi_ FROM	t_lhypb ypb left outer JOIN t_lhypdjb djb ON djb.yang_ben_bian_hao = ypb.yang_pin_bian_hao 	where find_in_set( ypb.id_, '${id}' )`
       // let sql = `select * from t_lhypdjb where find_in_set(id_,'${id}')`
       // console.log(sql)
       repostCurd("sql", sql).then(res => {
@@ -166,13 +167,15 @@ export default {
           //     }
           //     list.push(o)
           //   }
+          let shijian = item.shou_yang_ri_qi_ == null ? this.dateFormat():item.shou_yang_ri_qi_
             if (item.yang_pin_lei_xing != '' && parseInt(item.shu_liang_) > 0) {
               let o = {
                 name: item.yang_pin_ming_che,
                 serial: item.yang_pin_bian_hao,
                 type: item.yang_pin_lei_xing,
                 num: item.shu_liang_,
-                condition: item.yang_ben_yun_shu_
+                condition: item.yang_ben_yun_shu_,
+                time : shijian
               }
               list.push(o)
             }
@@ -182,7 +185,8 @@ export default {
                 serial: item.yang_pin_bian_hao,
                 type: item.yang_pin_lei_er_,
                 num: item.shu_liang_er_,
-                condition: item.yang_pin_yun_shu_
+                condition: item.yang_pin_yun_shu_,
+                time : shijian
               }
               list.push(o)
             }
@@ -192,7 +196,8 @@ export default {
                 serial: item.yang_pin_bian_hao,
                 type: item.yang_pin_lei_san_,
                 num: item.shu_liang_san_,
-                condition: item.yang_pin_yun_san
+                condition: item.yang_pin_yun_san,
+                time : shijian
               }
               list.push(o)
             }
@@ -202,16 +207,39 @@ export default {
                 serial: item.yang_pin_bian_hao,
                 type: item.yang_pin_lei_si_,
                 num: item.shu_liang_si_,
-                condition: item.yang_pin_yun_si_
+                condition: item.yang_pin_yun_si_,
+                time : shijian
               }
               list.push(o)
             }
-
+          
           })
+          if(list.length == 0){
+              this.$message({
+                message: '该样品信息有误，请联系开发人员！',
+                type: 'error'
+              })
+              this.remRedar();
+            }
           this.list = list
           // console.log(this.list)
         }
       })
+    },
+    
+    /* 关闭*/
+    remRedar() {
+      this.visible = false // 列表隐藏
+      this.listData = [] // 清空列表数据
+      this.redar = false // 扫码图标隐藏
+      this.$emit('scanOff', false)
+    },
+    dateFormat() { // 获取当前时间
+        var date=new Date();
+        var year=date.getFullYear();
+        var month= date.getMonth()+1<10 ? "0"+(date.getMonth()+1) : date.getMonth()+1;
+        var day=date.getDate()<10 ? "0"+date.getDate() : date.getDate();
+        return year+"-"+month+"-"+day;
     }
   }
 }

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

@@ -18,7 +18,7 @@ export default {
     },
     /* 获取数据 ，开始查阅记录 */
     loadData(obj) {
-      let sql = `select * from t_lhypb where find_in_set(id_,'${obj}') and jie_yang_zhuang_t = '待接收' and shi_fou_guo_shen_ = '1'`
+      let sql = `select ypb.*,sqb.chu_ju_bao_gao_ya from t_lhypb ypb join t_lhwtsqb sqb on ypb.parent_id_ = sqb.id_  and find_in_set(ypb.id_,'${obj}') and ypb.jie_yang_zhuang_t = '待接收' and ypb.shi_fou_guo_shen_ = '1'`
       repostCurd('sql',sql).then(response=>{
         if (response.variables.data && response.variables.data.length > 0) {
           let temp = response.variables.data
@@ -44,7 +44,7 @@ export default {
       let countSQL = `select count(*) as count from t_lhypb where jie_yang_zhuang_t = '待接收' and shi_fou_guo_shen_ = '1'`
       let str = (page-1)*10
       // let fysql = `select * from t_lhypb where jie_yang_zhuang_t = '待接收' and shi_fou_guo_shen_ = '1' limit ${str},10`
-      let fysql = `select * from t_lhypb where jie_yang_zhuang_t = '待接收' and shi_fou_guo_shen_ = '1'`
+      let fysql = `select ypb.*,sqb.chu_ju_bao_gao_ya from t_lhypb ypb join t_lhwtsqb sqb on ypb.parent_id_ = sqb.id_  and ypb.jie_yang_zhuang_t = '待接收' and ypb.shi_fou_guo_shen_ = '1'`
       Promise.all([repostCurd('sql', countSQL), repostCurd('sql', fysql)]).then(([res1, res]) => {
         this.listData = []
         this.pageCount = res1.variables.data[0].count

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

@@ -1,4 +1,5 @@
 import repostCurd from '@/business/platform/form/utils/custom/joinCURD.js'
+import * as dayjs from 'dayjs'
 
 export default {
   methods: {
@@ -28,7 +29,8 @@ export default {
 
       // 扫码扫到新数据,查询 回填展示
       if(flag){
-         repostCurd('select','{"tableName": "t_lhypb","paramWhere":{"yang_pin_bian_hao":"' + id + '","jie_yang_zhuang_t":"待接收","shi_fou_guo_shen_":"1"}}').then(res => {
+        let sql = `select ypb.*,sqb.chu_ju_bao_gao_ya from t_lhypb ypb join t_lhwtsqb sqb on ypb.parent_id_ = sqb.id_  and find_in_set(ypb.yang_pin_bian_hao,'${id}') and ypb.jie_yang_zhuang_t = '待接收' and ypb.shi_fou_guo_shen_ = '1'`
+         repostCurd('sql',sql).then(res => {
           if (res.variables.data && res.variables.data.length > 0) {
             for (let i in res.variables.data) {
               // res.variables.data[i].jie_yang_shu_lian = 1