Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 11:23:08
+ * @LastEditTime: 2024-01-18 13:22:31
 -->
 <template>
   <div class="tableBox">
@@ -167,6 +167,9 @@
             title = title + '元'
           }
           return title
+        } else if (prop == 'dymj' && row.mjdw) {
+          let arr = store.getters.dictData['A7'].filter(item => item.dcode === row.mjdw);
+          return strategy(label) + arr[0].dname
         } else {
           return strategy(label);
         }