Эх сурвалжийг харах

Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

johnsen 4 сар өмнө
parent
commit
40bdbbab83

+ 5 - 5
src/views/system/jbdScan/goods/deviceTagTemplateTwo.vue

@@ -54,10 +54,10 @@
                                 (item[e.field] === '合格'
                                   ? '#008000'
                                   : item[e.field] === '停用'
-                                    ? '#ff0000'
-                                    : item[e.field] === '限用'
-                                      ? '#ffff00'
-                                      : '#909399') + '!important',
+                                  ? '#ff0000'
+                                  : item[e.field] === '限用'
+                                  ? '#ffff00'
+                                  : '#909399') + '!important',
                               color: '#fff !important',
                               padding: '0px 3px',
                               'border-radius': '2px',
@@ -238,7 +238,7 @@ export default {
               ? item.cai_gou_he_tong_
               : '',
             assetNum: item.zi_chan_bian_hao_,
-
+            originalNumber: item.yuan_she_bei_bian,
             name: item.she_bei_ming_cheng_,
             serial: item.she_bei_shi_bie_h,
             model: item.gui_ge_xing_hao_,