修改设备标签

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

@@ -49,10 +49,10 @@
                   </div>
 
                  
-                  <!-- <div class="lh">
-                    <div>流转状态：</div>
-                    <div>▢待检，▢已检，▢留样</div>
-                  </div> -->
+                  <div class="lh">
+                    <div>设备状态：</div>
+                    <div>{{ item1.status }}</div>
+                  </div>
                  
                   <div class="ewm">
                     <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=8 ></vue-barcode>
@@ -121,6 +121,7 @@ export default {
         condition: 1,
         money:1,
         time:1,
+        status:1
       }],
       visible: true,
     }
@@ -164,6 +165,7 @@ export default {
               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_):'',
+              status:item.she_bei_zhuang_ta,
             }
             list.push(o)
           })

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

@@ -60,6 +60,10 @@
                     <div>固定资产编号：</div>
                     <div>{{ item1.assets }}</div>
                   </div>
+                  <div class="lh">
+                    <div>设备状态：</div>
+                    <div>{{ item1.status }}</div>
+                  </div>
                  
                   <div class="ewm">
                     <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=8 ></vue-barcode>
@@ -130,7 +134,8 @@ export default {
         time:1,
         yinZi:1,
         jiGou:1,
-        jiaoZhunTime:1
+        jiaoZhunTime:1,
+        status: 1
       }],
       visible: true,
     }
@@ -158,7 +163,7 @@ export default {
     },
     getLook(id) {
       let sql = `select dj.she_bei_ming_cheng_,dj.she_bei_shi_bie_h,dj.zi_chan_bian_hao_,
-        dj.cun_fang_di_dian_,dj.shi_yong_ke_shi_,dj.zi_chan_yuan_zhi_,  dj.qi_yong_ri_qi_,
+        dj.cun_fang_di_dian_,dj.shi_yong_ke_shi_,dj.zi_chan_yuan_zhi_,  dj.qi_yong_ri_qi_,dj.she_bei_zhuang_ta,
         zx.xiu_zheng_zhi_,zx.xiao_zhun_ri_qi_,zx.jian_ding_xiao_zh
         from t_sbdj dj right JOIN t_sbjdxzzx zx on zx.yi_qi_bian_hao_ = dj.id_ where find_in_set(zx.parent_id_,'${id}')`
       // console.log(sql)
@@ -179,7 +184,8 @@ export default {
               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_
+              jiaoZhunTime:item.xiao_zhun_ri_qi_,
+              status:item.she_bei_zhuang_ta,
             }
             list.push(o)
           })

src/views/system/jbdScan/scan.vue

@@ -23,7 +23,7 @@ import neishenzhuangtai from './goods/neishenzhuangtai'
 import bwTag from './goods/bwTag.vue'
 import fzrkTag from './goods/fzrkTag.vue'
 export default {
-  components: { facility,material,sample,sampleConfirmation,manualConfirmation,tag,deviceTag,neishenzhuangtai,bwTag,fzrkTag},
+  components: { facility,material,sample,sampleConfirmation,manualConfirmation,tag,deviceTag,deviceVerificationTag,neishenzhuangtai,bwTag,fzrkTag},
   props:{
     currentScan:String,
     scanVisible:Boolean,