ZZJ 3 лет назад
Родитель
Сommit
f971686399

+ 1 - 1
src/views/system/jbdScan/goods/deviceFailureTag.vue

@@ -54,7 +54,7 @@
                   </div>
                  
                   <div class="ewm">
-                    <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=8 ></vue-barcode>
+                    <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=8 :displayValue="false"></vue-barcode>
                   </div>
 
                   <!-- <div

+ 1 - 1
src/views/system/jbdScan/goods/deviceTag.vue

@@ -55,7 +55,7 @@
                   </div>
                  
                   <div class="ewm">
-                    <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=8 ></vue-barcode>
+                    <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=8 :displayValue="false"></vue-barcode>
                   </div>
 
                   <!-- <div

+ 31 - 31
src/views/system/jbdScan/goods/deviceVerificationTag.vue

@@ -26,23 +26,23 @@
                       <div>{{ item1.serial }}</div>
                     </div>
                   </div>
-                  <div class="lh">
+                  <!-- <div class="lh">
                     <div>存放地点:</div>
                     <div>{{ item1.local }}</div>
-                  </div>
-                  <div class="lh">
+                  </div> -->
+                  <!-- <div class="lh">
                     <div>启用日期:</div>
                     <div>{{ item1.time }}</div>
-                  </div>
+                  </div> -->
 
-                  <div class="lh">
+                  <!-- <div class="lh">
                     <div>资产原值:</div>
                     <div>{{ item1.money }}</div>
-                  </div>
-                  <div class="lh">
+                  </div> -->
+                  <!-- <div class="lh">
                     <div>使用科室:</div>
                     <div>{{ item1.condition }}</div>
-                  </div>
+                  </div> -->
                   <div class="lh">
                     <div>校准机构:</div>
                     <div>{{ item1.jiGou }}</div>
@@ -56,18 +56,18 @@
                     <div>{{ item1.yinZi }}</div>
                   </div>
 
-                  <div class="lh">
+                  <!-- <div class="lh">
                     <div>固定资产编号:</div>
                     <div>{{ item1.assets }}</div>
-                  </div>
-                  <div class="lh">
+                  </div> -->
+                  <!-- <div class="lh">
                     <div>设备状态:</div>
                     <div>{{ item1.status }}</div>
-                  </div>
+                  </div> -->
                  
-                  <div class="ewm">
-                    <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=8 ></vue-barcode>
-                  </div>
+                  <!-- <div class="ewm">
+                    <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin="0" :displayValue="false"></vue-barcode>
+                  </div> -->
 
                   <!-- <div
                     style="page-break-after: always; display: block !important;height: 40px"
@@ -126,16 +126,16 @@ export default {
       list: [{
         name: 1,
         serial: 1,
-        assets: 1,
+        // assets: 1,
         num: 1,
-        local:1,
-        condition: 1,
-        money:1,
-        time:1,
+        // local:1,
+        // condition: 1,
+        // money:1,
+        // time:1,
         yinZi:1,
         jiGou:1,
         jiaoZhunTime:1,
-        status: 1
+        // status: 1
       }],
       visible: true,
     }
@@ -176,16 +176,16 @@ export default {
             let o = {
               name: item.she_bei_ming_cheng_,
               serial: item.she_bei_shi_bie_h,
-              assets: item.zi_chan_bian_hao_,
+              // assets: item.zi_chan_bian_hao_,
               num: num,
-              local:item.cun_fang_di_dian_,
-              condition: item.shi_yong_ke_shi_,
-              money:item.zi_chan_yuan_zhi_,
-              time:item.qi_yong_ri_qi_!=null?this.getTime(item.qi_yong_ri_qi_):'',
+              // local:item.cun_fang_di_dian_,
+              // condition: item.shi_yong_ke_shi_,
+              // money:item.zi_chan_yuan_zhi_,
+              // time:item.qi_yong_ri_qi_!=null?this.getTime(item.qi_yong_ri_qi_):'',
               yinZi:item.xiu_zheng_zhi_,
               jiGou:item.jian_ding_xiao_zh,
               jiaoZhunTime:item.xiao_zhun_ri_qi_,
-              status:item.she_bei_zhuang_ta,
+              // status:item.she_bei_zhuang_ta,
             }
             list.push(o)
           })
@@ -220,11 +220,11 @@ export default {
 }
 
 .tagBox {
-  width: 283px;   // 300  240
-  height: 283px;  // 180  150  94
+  width: 231px;   // 300  240
+  // height: 283px;  // 180  150  94
   position: relative;
   border: 2px solid #000000;
-  padding: 5px;
+  padding: 2px;
   display: inline-block;
   // justify-content: space-around;
   // flex-direction: column;
@@ -233,7 +233,7 @@ export default {
   background-color: #fff;
 }
 .ewm{
-
+  margin-left: 10px;
 }
 /*
 .tagBox {

+ 8 - 4
src/views/system/jbdScan/goods/tag.vue

@@ -37,11 +37,15 @@
                       <div>存储条件:</div>
                       <div>{{ item1.condition }}</div>
                     </div>
-                    <div class="lh" style="margin-left: 5px">
+                    <!-- <div class="lh" style="margin-left: 5px">
                       <div>样品数量:</div>
                       <div>{{ index2 + 1 }}/{{ item1.num }}支</div>
-                    </div>
+                    </div> -->
                   </div>
+                  <div class="lh">
+                      <div>样品数量:</div>
+                      <div>{{ index2 + 1 }}/{{ item1.num }}支</div>
+                    </div>
                   <div class="lh" >
                       <div>收样时间:</div>
                       <div></div>
@@ -231,7 +235,7 @@ export default {
   margin: 10px 10px;
   border-radius: 4px;
   background-color: #fff;
-  font-weight: bold;
+  // font-weight: bold;
 }
 .ewm{
   margin-left: 30px;
@@ -259,7 +263,7 @@ export default {
 
 .lh {
   // line-height: auto;
-  font-size: 4px;  //16
+  font-size: 14px;  //16
   display: flex;
   align-items: center;