Merge branch 'dev'

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-19 16:57:33
+ * @LastEditTime: 2023-10-20 10:27:25
 -->
 -->
 <template>
 <template>
   <div class="tableBox">
   <div class="tableBox">
@@ -74,7 +74,7 @@
               <el-link v-if="['zxywh', 'ywh'].includes(item.prop)"
               <el-link v-if="['zxywh', 'ywh'].includes(item.prop)"
                 @click="handleSelectYwh(row, row[item.prop])"
                 @click="handleSelectYwh(row, row[item.prop])"
                 type="primary">{{ row[item.prop] }}</el-link>
                 type="primary">{{ row[item.prop] }}</el-link>
-              <span v-if="!['qszt','ywh', 'zxywh' ].includes(item.prop)">{{ row[item.prop] }}</span>
+              <span v-if="!['qszt','ywh', 'zxywh' ].includes(item.prop)">{{ getLable(item.prop,row[item.prop]) }}</span>
             </p>
             </p>
 
 
             <el-tooltip
             <el-tooltip
@@ -96,6 +96,7 @@
 </template>
 </template>
 <script>
 <script>
   import Router from '@/router'
   import Router from '@/router'
+  import { mapGetters } from "vuex";
   import { datas } from "../qlxxFormData.js";
   import { datas } from "../qlxxFormData.js";
   import { ywPopupDialog } from "@/utils/popup.js";
   import { ywPopupDialog } from "@/utils/popup.js";
   import printTemplate from "../components/printTemplate.vue";
   import printTemplate from "../components/printTemplate.vue";
@@ -128,6 +129,9 @@
         default: () => []
         default: () => []
       },
       },
     },
     },
+    computed: {
+      ...mapGetters(["dictData"]),
+    },
     data () {
     data () {
       return {
       return {
         qsztList: datas.columns().qsztList,
         qsztList: datas.columns().qsztList,
@@ -138,6 +142,25 @@
       };
       };
     },
     },
     methods: {
     methods: {
+      getLable (prop, label) {
+        const ztObj = {
+          0: '否',
+          1: '是'
+        };
+
+        const strategies = {
+          sfygdj: (label) => ztObj[label] || label,
+          sfczjzhxz: (label) => ztObj[label] || label,
+          dyrlx: (label) => {
+            let arr = this.dictData['A36'].filter(item => item.dcode === label);
+            return arr.length > 0 ? arr[0].dname : label;
+          },
+          default: (label) => label
+        };
+
+        const strategy = strategies[prop] || strategies.default;
+        return strategy(label);
+      },
       openPrint () {
       openPrint () {
         this.render = true;
         this.render = true;
         setTimeout(() => {
         setTimeout(() => {

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: miaofang
  * @Autor: miaofang
- * @LastEditTime: 2023-10-19 16:13:55
+ * @LastEditTime: 2023-10-20 10:28:07
 -->
 -->
 <template>
 <template>
   <div class="djxxTable">
   <div class="djxxTable">
@@ -95,7 +95,7 @@
                   item.prop !== 'fj' &&
                   item.prop !== 'fj' &&
                   !judge(item.label)
                   !judge(item.label)
                 ">
                 ">
-                {{ row[item.prop] }}
+                {{ getLable(item.prop,row[item.prop]) }}
               </span>
               </span>
               <div class="many" v-if="judge(item.label)">
               <div class="many" v-if="judge(item.label)">
                 <div
                 <div
@@ -155,10 +155,25 @@
       }
       }
     },
     },
     methods: {
     methods: {
-      /**
-   * @description: openPrint
-   * @author: miaofang
-   */
+      getLable (prop, label) {
+        const ztObj = {
+          0: '否',
+          1: '是'
+        };
+
+        const strategies = {
+          sfygdj: (label) => ztObj[label] || label,
+          sfczjzhxz: (label) => ztObj[label] || label,
+          dyrlx: (label) => {
+            let arr = this.dictData['A36'].filter(item => item.dcode === label);
+            return arr.length > 0 ? arr[0].dname : label;
+          },
+          default: (label) => label
+        };
+
+        const strategy = strategies[prop] || strategies.default;
+        return strategy(label);
+      },
       openPrint () {
       openPrint () {
         this.render = true;
         this.render = true;
         setTimeout(() => {
         setTimeout(() => {