修改设备标签-新需求

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

@@ -54,11 +54,14 @@
                   </div>
 
                  
-                  <div class="lh">
+                  <!-- <div class="lh">
                     <div>设备状态：</div>
                     <div>{{ item1.status }}</div>
+                  </div> -->
+                  <div class="lh">
+                    <div>保管人：</div>
+                    <div>{{ item1.custodian }}</div>
                   </div>
-                 
                   <div class="ewm">
                     <vue-barcode :value="item1.serial" :width=1.5 :height=15  :margin="0" :displayValue="false"></vue-barcode>
                   </div>
@@ -127,7 +130,8 @@ export default {
         money:1,
         time:1,
         status:1,
-        specifications:1
+        specifications:1,
+        custodian:1
       }],
       visible: true,
     }
@@ -155,11 +159,11 @@ export default {
     },
     getLook(id) {
       let sql = `select * from t_sbdj where find_in_set(id_,'${id}')`
-      // console.log(sql)
-      repostCurd("sql", sql).then(res => {
-          const data = res.variables.data
-          // console.log(data)
-          let list = []
+      let personSql = `select id_,NAME_ from ibps_party_employee`
+      Promise.all([repostCurd("sql", sql),repostCurd("sql", personSql)]).then(([res1,res2])=>{
+        const { data } = res1.variables || []
+        const personData = res2.variables.data || []
+        let list = []
           data.forEach(item => {
             let num = 1
             let o = {
@@ -172,11 +176,11 @@ export default {
               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,
-              specifications:item.gui_ge_xing_hao_
+              specifications:item.gui_ge_xing_hao_,
+              custodian: this.findPersonName(item.guan_li_ren_,personData)
             }
             list.push(o)
           })
-          
           this.list = list
       })
     },
@@ -196,7 +200,14 @@ export default {
         day =  date.getDate();
       }
         return year + "-"+month+"-"+day;
-    }
+    },
+    findPersonName(id,personData) {
+            if(!personData)
+                return '保管人列表为空'
+            if(!id)
+                return ''
+            return personData.find(i => i.id_ === id).NAME_
+        }
   }
 }
 </script>