第一版设备标签改为传参控制，检定标签编号通过全局配参控制

src/views/component/device/index.vue

@@ -357,7 +357,7 @@
         />
         <!-- <DeviceTagWeiNing v-if="tagName==='deviceTagWeiNing'" :scan-visible="printVisible" :obj="printObj" :state-list="stateList" @scanOff="scanOff" /> -->
         <DeviceTagTemplateTwo v-if="tagName==='deviceTagTemplateTwo'" :tag-data="tagData" :scan-visible="printVisible" :obj="printObj" :state-list="stateList" @scanOff="scanOff" />
-        <DeviceTag v-else :scan-visible="printVisible" :obj="printObj" :state-list="stateList" @scanOff="scanOff" />
+        <DeviceTag v-else :scan-visible="printVisible" :obj="printObj" :tag-data="tagData" :state-list="stateList" @scanOff="scanOff" />
         <el-dialog
             :close-on-click-modal="false"
             :close-on-press-escape="false"
@@ -666,12 +666,13 @@ export default {
             hasRole: true,
             typeList: { '检验系统': '检验系统', '通用设备': '通用设备', '软件': '软件', '信息系统': '信息系统' },
             tagName: '',
-            tagData: []
+            tagData: {}
         }
     },
     async mounted () {
         const { stateList, hideSysDeviceNo, tabList, hasDeviceRole, typeList } = await getSetting('device') || {}
-        const { tagName, tagData } = await getSetting('deviceTag') || {}
+        const { tagName } = await getSetting('deviceTag') || ''
+        const { tagData } = await getSetting('deviceTag') || {}
         if (tagName) {
             console.debug('tagName', tagName)
             this.tagName = tagName

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

@@ -32,7 +32,13 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="tagBox">
+                                    <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="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>
@@ -57,6 +63,12 @@
                                             <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>
@@ -67,10 +79,6 @@
                                                 <div>{{ item.verificationDate }}</div>
                                             </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>
                                 </div>
 
@@ -120,6 +128,10 @@ export default {
             default: function () {
                 return { '停用': '停用', '报废': '报废', '合格': '合格' }
             }
+        },
+        tagData: {
+            type: Object,
+            default: () => {}
         }
     },
     data () {
@@ -130,6 +142,7 @@ export default {
             list: [{
                 name: '设备名称',
                 serial: '设备编号',
+                original: '原设备编号',
                 model: '型号规格',
                 verifier: '核查人',
                 verificationDate: '核查日期',
@@ -182,7 +195,8 @@ export default {
                     dj.bi_xu_de_huan_jin,
                     dj.bi_xu_she_shi_,
                     dj.cai_gou_he_tong_,
-                    dj.zi_chan_bian_hao_
+                    dj.zi_chan_bian_hao_,
+                    dj.yuan_she_bei_bian
                 FROM
                     t_sbdj dj
                 WHERE
@@ -206,6 +220,7 @@ export default {
 
                         name: item.she_bei_ming_cheng_,
                         serial: item.she_bei_shi_bie_h,
+                        original: item.yuan_she_bei_bian,
                         model: item.gui_ge_xing_hao_,
                         verifier: this.findPersonName(item.bi_xu_de_huan_jin, personData),
                         verificationDate: verificationDateStr.substring(0, 10)

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

@@ -1,11 +1,17 @@
 <template>
     <div class="bg">
-        <el-dialog width="11cm" height="10cm" :modal-append-to-body='true' :append-to-body="true" title="设备检定校准标签"
-            :visible.sync="scanVisible">
+        <el-dialog
+            width="11cm"
+            height="10cm"
+            :modal-append-to-body="true"
+            :append-to-body="true"
+            title="设备检定校准标签"
+            :visible.sync="scanVisible"
+        >
             <!-- 表单是否显示 -->
             <div style="height:500px">
-                <div ref="qrcode" id="box">
-                    <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
+                <div id="box" ref="qrcode">
+                    <vue-easy-print ref="easyPrint" table-show :one-page-row="onePageRow">
                         <div v-for="(item, index1) in list" :key="index1">
                             <!-- style="page-break-after:always" -->
                             <div class="All">
@@ -13,12 +19,14 @@
                                     <div class="one">
                                         <div class="container">
                                             <div
-                                                :class="item.deviceStatus === '合格' ? 'triangle' : item.deviceStatus === '停用' ? 'triangleRed' : 'triangleYellow'">
+                                                :class="item.deviceStatus === '合格' ? 'triangle' : item.deviceStatus === '停用' ? 'triangleRed' : 'triangleYellow'"
+                                            >
                                                 <div class="label" style="border: 0;">{{ item.prove }}</div>
                                             </div>
                                             <div style="position: absolute;top: 25px;width: 100%;">
                                                 <div
-                                                    style="display: flex;justify-content: space-between;font-size: 14px;font-weight: 800;margin: 0 8px;">
+                                                    style="display: flex;justify-content: space-between;font-size: 14px;font-weight: 800;margin: 0 8px;"
+                                                >
                                                     <div>{{ item.slogan }}</div>
                                                 </div>
                                             </div>
@@ -33,10 +41,15 @@
                                             <div>设备型号：</div>
                                             <div>{{ item.model }}</div>
                                         </div>
-                                        <div class="lh">
+                                        <div v-if="tagDataTF" class="lh">
+                                            <div>设备编号：</div>
+                                            <div>{{ item.original }}</div>
+                                        </div>
+                                        <div v-else class="lh">
                                             <div>设备编号：</div>
                                             <div>{{ item.serial }}</div>
                                         </div>
+
                                         <div class="lh">
                                             <div class="la">
                                                 <div>校准日期：</div>
@@ -47,8 +60,10 @@
                                                 <div>{{ item.validTo }}</div>
                                             </div>
                                         </div>
-                                        <div class="lh"
-                                            :style="item.range !== '' ? 'border-bottom: 1px solid #000000;' : 'border-bottom: 0px;'">
+                                        <div
+                                            class="lh"
+                                            :style="item.range !== '' ? 'border-bottom: 1px solid #000000;' : 'border-bottom: 0px;'"
+                                        >
                                             <div class="qianZhi">校准单位：</div>
                                             <div class="zuoJuZhong">{{ item.unit }}</div>
                                         </div>
@@ -70,19 +85,19 @@
             </span>
         </el-dialog>
 
-
     </div>
 </template>
 
 <script>
-import VueBarcode from 'vue-barcode';
-import vueEasyPrint from "vue-easy-print";
-import curdPost from '@/business/platform/form/utils/custom/joinCURD.js';
+import VueBarcode from 'vue-barcode'
+import vueEasyPrint from 'vue-easy-print'
+import curdPost from '@/business/platform/form/utils/custom/joinCURD.js'
+import { getSetting } from '@/utils/query'
 
 export default {
     components: {
         VueBarcode,
-        vueEasyPrint,
+        vueEasyPrint
     },
     props: {
         obj: {
@@ -102,13 +117,14 @@ export default {
             default: false
         }
     },
-    data() {
+    data () {
         return {
             value: '',
             id: '',
             list: [{
                 name: 1,
                 serial: 1,
+                original: 1,
                 validTo: 1,
                 model: 1,
                 unit: 1,
@@ -120,36 +136,41 @@ export default {
                 range: 1 // 限用范围
             }],
             visible: true,
+            tagDataTF: false
+
         }
     },
     watch: {
-        obj() {
+        obj () {
             this.getInit()
             // console.log(this.obj)
         }
     },
-    created() {
+    created () {
         this.getInit()
     },
     methods: {
-        printDemo() {
+        printDemo () {
             this.$refs.easyPrint.print()
         },
-        getInit() {
-            var idStr = '';
+        async getInit () {
+            var idStr = ''
             this.obj.forEach(item => {
-                idStr += item.split(" ")[0] + ','
+                idStr += item.split(' ')[0] + ','
             })
-            idStr = idStr.substring(0, idStr.length - 1);
+            idStr = idStr.substring(0, idStr.length - 1)
             this.getLook(idStr)
+            const { tagData } = await getSetting('verificationTag') || {}
+            this.tagDataTF = tagData && tagData.hasOwnProperty('originalDevice') ? tagData.originalDevice : false
         },
-        getLook(id) {
-            let sql = `select
+        getLook (id) {
+            const sql = `select
                     dj.she_bei_ming_cheng_,
                     dj.she_bei_shi_bie_h,
                     dj.gui_ge_xing_hao_,
                     dj.she_bei_zhuang_ta,
                     dj.cai_gou_he_tong_, 
+                    dj.yuan_she_bei_bian,
                     zx.shi_shi_ri_qi_,
                     zx.chu_chang_bian_ha,
                     zx.jian_ding_dan_wei
@@ -159,23 +180,24 @@ export default {
                 WHERE
                     find_in_set( zx.id_, '${id}' )`
             // console.log(sql)
-            curdPost("sql", sql).then(res => {
+            curdPost('sql', sql).then(res => {
                 const { data } = res.variables || []
                 // console.log(data)
-                let list = []
+                const list = []
                 data.forEach(item => {
-                    let o = {
+                    const o = {
                         prove: this.switchProve(item.she_bei_zhuang_ta),
                         slogan: this.switchSlogan(item.she_bei_zhuang_ta),
                         deviceStatus: item.she_bei_zhuang_ta,
-                        range: this.judgementVal(item.cai_gou_he_tong_)?item.cai_gou_he_tong_:"",
+                        range: this.judgementVal(item.cai_gou_he_tong_) ? item.cai_gou_he_tong_ : '',
 
                         name: item.she_bei_ming_cheng_,
                         serial: item.she_bei_shi_bie_h,
+                        original: item.yuan_she_bei_bian,
                         validTo: item.chu_chang_bian_ha,
                         model: item.gui_ge_xing_hao_,
                         unit: item.jian_ding_dan_wei,
-                        jiaoZhunTime: item.shi_shi_ri_qi_,
+                        jiaoZhunTime: item.shi_shi_ri_qi_
                     }
                     list.push(o)
                 })
@@ -183,49 +205,49 @@ export default {
                 this.list = list
             })
         },
-        judgementVal(value){
+        judgementVal (value) {
             return value != null && value != undefined
         },
-        switchProve(status) {
+        switchProve (status) {
             switch (status) {
                 case '合格':
-                    return "合格证"
+                    return '合格证'
                 case '停用':
-                    return "停用证"
+                    return '停用证'
                 case '限用':
-                    return "限用证"
+                    return '限用证'
                 default:
-                    return "测试证"
+                    return '测试证'
             }
         },
-        switchSlogan(status) {
+        switchSlogan (status) {
             switch (status) {
                 case '合格':
-                    return "PASS"
+                    return 'PASS'
                 case '停用':
-                    return "STOP"
+                    return 'STOP'
                 case '限用':
-                    return "RESTRICT"
+                    return 'RESTRICT'
                 default:
-                    return "TEST"
+                    return 'TEST'
             }
         },
-        getTime(second) {
-            let date = new Date(second);
-            let year = date.getFullYear();
+        getTime (second) {
+            const date = new Date(second)
+            const year = date.getFullYear()
             let month = ''
             let day = ''
             if ((date.getMonth() + 1) <= 9) {
-                month = "0" + (date.getMonth() + 1)
+                month = '0' + (date.getMonth() + 1)
             } else {
                 month = date.getMonth() + 1
             }
             if (date.getDate() <= 9) {
-                day = "0" + date.getDate();
+                day = '0' + date.getDate()
             } else {
-                day = date.getDate();
+                day = date.getDate()
             }
-            return year + "-" + month + "-" + day;
+            return year + '-' + month + '-' + day
         }
     }
 }
@@ -302,8 +324,6 @@ export default {
     border-bottom: 1px solid #000000;
 }
 
-
-
 .container {
     width: 250px;
     height: 50px;