优化设备标签兼容

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

@@ -32,54 +32,12 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div v-if="Object.keys(tagData).length>0&&tagData.columns.length>0" class="tagBox">
-                                        <div v-for="(e,t) in tagData.columns" v-if="(e.field=='range'&&item[e.field] !== '') || e.field!='range'" :key="'zi'+t" class="lh" :style=" e.field=='verificationDate' ? item['range'] !== '' ? 'border-bottom: 1px solid #000000;' : 'border-bottom: 0px;':''">
+                                    <div class="tagBox">
+                                        <div v-for="(e,t) in midData.columns" v-if="(e.field=='range'&&item[e.field] !== '') || e.field!='range'" :key="'zi'+t" class="lh" :style=" e.field=='verificationDate' ? item['range'] !== '' ? 'border-bottom: 1px solid #000000;' : 'border-bottom: 0px;':''">
                                             <div :class="e.field=='name'?'qianZhi':''">{{ e.label }}：</div>
                                             <div>{{ item[e.field] }}</div>
                                         </div>
                                     </div>
-                                    <div v-else class="tagBox">
-                                        <div class="lh">
-                                            <div class="qianZhi">设备名称：</div>
-                                            <div>{{ item.name }}</div>
-                                        </div>
-                                        <div class="lh">
-                                            <div>设备型号：</div>
-                                            <div>{{ item.model }}</div>
-                                        </div>
-                                        <div class="lh">
-                                            <div>设备编号：</div>
-                                            <div>{{ item.serial }}</div>
-                                        </div>
-                                        <div class="lh">
-                                            <div>固定资产号：</div>
-                                            <div>{{ item.assetNum }}</div>
-                                        </div>
-                                        <div class="lh">
-                                            <div>核查人：</div>
-                                            <div>{{ item.verifier }}</div>
-                                        </div>
-                                        <div class="lh" :style="item.range !== '' ? 'border-bottom: 1px solid #000000;' : 'border-bottom: 0px;'">
-                                            <div>核查日期：</div>
-                                            <div>{{ item.verificationDate }}</div>
-                                        </div>
-
-                                        <div v-if="item.range !== ''" class="lh" style="border-bottom: 0px;">
-                                            <div class="qianZhi">限用范围：</div>
-                                            <div class="zuoJuZhong">{{ item.range }}</div>
-                                        </div>
-
-                                        <!-- <div class="lh">
-                                            <div class="la">
-                                                <div>核查人：</div>
-                                                <div>{{ item.verifier }}</div>
-                                            </div>
-                                            <div class="la" style="border-left: 1px solid #000000;">
-                                                <div>核查日期：</div>
-                                                <div>{{ item.verificationDate }}</div>
-                                            </div>
-                                        </div> -->
-                                    </div>
                                 </div>
 
                             </div>
@@ -153,7 +111,8 @@ export default {
                 range: '限用范围', // 限用范围
                 assetNum: '固定资产号'
             }],
-            visible: true
+            visible: true,
+            midData: {}
         }
     },
     watch: {
@@ -165,6 +124,16 @@ export default {
                 this.dialogVisible = val
             },
             immediate: true
+        },
+        tagData: {
+            handler (val) {
+                if (this.tagData && this.tagData.hasOwnProperty('columns')) {
+                    this.midData = val
+                } else {
+                    this.midData = { 'columns': [{ 'label': '设备名称', 'field': 'name' }, { 'label': '设备型号', 'field': 'model' }, { 'label': '设备编号', 'field': 'serial' }, { 'label': '固定资产号', 'field': 'assetNum' }, { 'label': '核查人', 'field': 'verifier' }, { 'label': '核查日期', 'field': 'verificationDate' }, { 'label': '限用范围', 'field': 'range' }], 'width': 330 }
+                }
+            },
+            immediate: true
         }
     },
     created () {