task-6449设备打印标签内字段信息获取，获取来源需优化、设备档案内取值优化（病理）

src/views/component/device/deviceDialog.vue

@@ -905,6 +905,41 @@
                             </el-form-item>
                           </el-col>
                         </el-row>
+                        <el-row v-if="form.shiFouXiaoZhun === '是' && isTrue">
+                          <el-col>
+                            <el-form-item
+                              label="检定/校准结果："
+                              label-width="140px"
+                              prop="xiaoZhunJieGuo"
+                            >
+                              <template slot="label">
+                                <span
+                                  :class="
+                                    dynamicRequiredFields ? 'required' : ''
+                                  "
+                                  >检定/校准结果：</span
+                                >
+                              </template>
+                              <el-select
+                                v-if="!readonly"
+                                v-model="form.xiaoZhunJieGuo"
+                                placeholder="请选择"
+                                size="mini"
+                                style="width: 100%"
+                              >
+                                <el-option
+                                  v-for="item in ['合格', '不合格']"
+                                  :key="item"
+                                  :label="item"
+                                  :value="item"
+                                />
+                              </el-select>
+                              <span v-else
+                                >{{ form.xiaoZhunJieGuo || '/' }}
+                              </span>
+                            </el-form-item>
+                          </el-col>
+                        </el-row>
                         <el-row v-if="form.shiFouXiaoZhun === '是'">
                           <el-col>
                             <el-form-item
@@ -1249,6 +1284,7 @@ export default {
     const { userId, position, level, deptList, setting } = this.$store.getters
     return {
       config: setting?.postJob?.allocation || false,
+      isTrue: setting.deviceTag?.tagFrom == 'sbdj' || false,
       tabItems: [
         {
           label: '维护项目',
@@ -1373,6 +1409,7 @@ export default {
         sheBeiMingCheng: '', // 设备名称
         sheBeiMingChen: '', // 设备名称id
         yiXiaoRiQi: '', // 最近校准时间
+        xiaoZhunJieGuo: '', //检定/校准结果
         heChaXiaoZhun: '', // 使用年限
         shiJiShiYongF: '', // 关机时间
         kaiShiShiYong: '', // 开机时间
@@ -1517,6 +1554,7 @@ export default {
         this.rules.yanShouRiQi[0].required = val
         this.rules.qiYongRiQi[0].required = val
         this.rules.yiXiaoRiQi[0].required = val
+        this.rules.xiaoZhunJieGuo[0].required = val
         this.rules.xiaoZhunYouXia[0].required = val
 
         this.$refs.form.clearValidate()
@@ -1577,6 +1615,7 @@ export default {
             'xiaoZhunZQ',
             'shiYongKeShi',
             'yiXiaoRiQi',
+            'xiaoZhunJieGuo',
             'xiaoZhunYouXia',
             'zhengShuBianHa',
             'jianDingXiao',

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

@@ -131,6 +131,7 @@ export default {
           fuZeRen: '仪器负责人及电话',
           jiaoZhunRiQi: '检定/校准日期',
           chuChangBianHao: '下一次检定/校准日期',
+          xiaoZhunJieGuo: '检定/校准结果',
           jianDingDanWei: '鉴定/校准单位',
           jieGuo: '鉴定/校准结果',
           // status: 1
@@ -212,6 +213,8 @@ export default {
       let sbjdData = []
       // 获取原设备编号后再去查他对应的检定校准记录
       if (data?.length) {
+        const { setting = {} } = this.$store.getters
+        const isTrue = setting.deviceTag?.tagFrom == 'sbdj' || false
         const yuanSheBei = data.map((item) => item.yuan_she_bei_bian).join(',')
         // const sbjdsql = `select * FROM t_mjsbjdxzjhzb WHERE  marks_ = 'record' AND jing_ban_ren_ IS NOT NULL AND jing_ban_ren_ <> '' AND FIND_IN_SET(yuan_she_bei_bian,'${yuanSheBei}') ORDER BY ji_hua_ri_qi_ desc,bian_zhi_shi_jian desc`
         const res3 = await this.$common.request('query', {
@@ -242,6 +245,8 @@ export default {
             jiaoZhunRiQi:
               item.shi_fou_xiao_zhun == '否'
                 ? '/'
+                : isTrue
+                ? item.yi_xiao_ri_qi_
                 : this.findData(
                     'shi_shi_ri_qi_',
                     item.yuan_she_bei_bian,
@@ -250,6 +255,8 @@ export default {
             chuChangBianHao:
               item.shi_fou_xiao_zhun == '否'
                 ? '/'
+                : isTrue
+                ? item.xiao_zhun_you_xia
                 : this.findData(
                     'chu_chang_bian_ha',
                     item.yuan_she_bei_bian,
@@ -258,6 +265,8 @@ export default {
             jianDingDanWei:
               item.shi_fou_xiao_zhun == '否'
                 ? '/'
+                : isTrue
+                ? item.gong_ying_shang_m
                 : this.findData(
                     'jian_ding_dan_wei',
                     item.yuan_she_bei_bian,
@@ -266,6 +275,8 @@ export default {
             jieGuo:
               item.shi_fou_xiao_zhun == '否'
                 ? '/'
+                : isTrue
+                ? item.xiao_zhun_jie_guo
                 : this.findData('jie_guo_', item.yuan_she_bei_bian, sbjdData),
             name: item.she_bei_ming_cheng_,
             serial: item.she_bei_shi_bie_h,