ZZJ il y a 3 ans
Parent
commit
a7021b3709
1 fichiers modifiés avec 38 ajouts et 63 suppressions
  1. 38 63
      src/views/system/jbdScan/goods/sampleTag.vue

+ 38 - 63
src/views/system/jbdScan/goods/sampleTag.vue

@@ -25,30 +25,31 @@
                       <div>样本编号:</div>
                       <div>{{ item1.serial }}</div>
                     </div>
-                    <div class="lh" style="margin-left: 5px">
+                    <div class="lh" style="margin-left: 18px">
+                    <div>样品数量:</div>
+                    <div>{{ index2 + 1 }}/{{ item1.num }}支</div>
+                  </div>
+                    <!-- <div class="lh" style="margin-left: 5px">
                       <div>收样时间:</div>
-                      <div></div>
-                    </div>
+                      <div>{{ item1.num }}</div>
+                    </div> -->
                   </div>
-                  <div class="lh">
-                    <div>样品类型:</div>
+                  <!-- <div class="lh">
+                    <div>检测项目:</div>
                     <div>{{ item1.type }}</div>
-                  </div>
-                  <div class="lh">
+                  </div> -->
+                  <!-- <div class="lh">
                     <div>存储条件:</div>
                     <div>{{ item1.condition }}</div>
-                  </div>
+                  </div> -->
 
                   <div class="lh">
                     <div>流转状态:</div>
                     <div>▢待检,▢已检,▢留样</div>
                   </div>
-                  <div class="lh">
-                    <div>样品数量:</div>
-                    <div>{{ index2 + 1 }}/{{ item1.num }}支</div>
-                  </div>
+                 
                   <div class="ewm">
-                    <vue-barcode :value="item1.serial" :width="1" :height="15" ></vue-barcode>
+                    <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=3 ></vue-barcode>
                   </div>
 
                   <!-- <div
@@ -108,9 +109,9 @@ export default {
       list: [{
         name: 5,
         serial: 5,
-        type: 5,
-        num: 5,
-        condition: 5
+        // type: 5,
+        num: 5
+        // condition: 5
       }],
       visible: true
     }
@@ -129,6 +130,7 @@ export default {
       this.$refs.easyPrint.print()
     },
     getInit() {
+      console.log('getInit:',this.obj)
       var idStr = '';
       this.obj.forEach(item=>{
         idStr += item + ','
@@ -138,59 +140,32 @@ export default {
       this.getLook(idStr)
     },
     getLook(id) {
-      console.log(id)
-      let sql = `select * from t_lhypb where find_in_set(parent_id_,'${id}')`
+      // console.log(id)
+      let sql = `select * from t_mjypdjb where find_in_set(id_,'${id}')`
       console.log(sql)
       repostCurd("sql", sql).then(res => {
-        if (res.state === 200) {
           const data = res.variables.data
+          // console.log(data)
           let list = []
           data.forEach(item => {
-            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_
-              }
-              list.push(o)
-            }
-            if (item.yang_pin_lei_er_ != '' && parseInt(item.shu_liang_er_) > 0) {
-              let o = {
-                name: item.yang_pin_ming_che,
-                serial: item.yang_pin_bian_hao,
-                type: item.yang_pin_lei_er_,
-                num: item.shu_liang_er_,
-                condition: item.yang_pin_yun_shu_
-              }
-              list.push(o)
+            let num = parseInt(item.shou_yang_shu_lia)
+            if(typeof(num) == 'number'){
+              // console.log(num)
+              // for(let i = 0;i<num;i++){
+                let o = {
+                  name: item.yang_pin_ming_che,
+                  serial: item.yang_pin_bian_hao,
+                  // type: item.jian_ce_xiang_mu_,
+                  num: num,
+                  // condition: item.yang_ben_yun_shu_
+                }
+                list.push(o)
+            // }
             }
-            if (item.yang_pin_lei_san_ != '' && parseInt(item.shu_liang_san_) > 0) {
-              let o = {
-                name: item.yang_pin_ming_che,
-                serial: item.yang_pin_bian_hao,
-                type: item.yang_pin_lei_san_,
-                num: item.shu_liang_san_,
-                condition: item.yang_pin_yun_san
-              }
-              list.push(o)
-            }
-            if (item.yang_pin_lei_si_ != '' && parseInt(item.shu_liang_si_) > 0) {
-              let o = {
-                name: item.yang_pin_ming_che,
-                serial: item.yang_pin_bian_hao,
-                type: item.yang_pin_lei_si_,
-                num: item.shu_liang_si_,
-                condition: item.yang_pin_yun_si_
-              }
-              list.push(o)
-            }
-
           })
+          // console.log(list)
           this.list = list
-
-        }
+          // console.log(this.list)
       })
     }
   }
@@ -204,7 +179,7 @@ export default {
 
 .tagBox {
   width: 240px;   // 300  240
-  height: 140px;  // 180  150
+  height: 94px;  // 180  150  140
   position: relative;
   border: 1px solid #000000;
   padding: 2px;
@@ -241,7 +216,7 @@ export default {
 
 .lh {
   // line-height: auto;
-  font-size: 4px;  //16
+  font-size: 8px;  //16
   display: flex;
   align-items: center;