Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue

@@ -11,7 +11,7 @@
           <span>{{ item.label }}: </span>
           <span>
             <slot :name="`form-${item.key}`" :data="cardData">
-              {{ getValue(item.key) }}{{ item.suffix }}
+              {{ getValue(item) }}{{ item.suffix }}
             </slot>
           </span>
         </p>
@@ -106,8 +106,12 @@ export default {
     };
   },
   methods: {
-    getValue(key) {
-      return pathGet(this.cardData, key) ?? "-";
+    getValue(item) {
+      let value = pathGet(this.cardData, item.key) ?? "-";
+      if (item.value) {
+        value = item.value(this.cardData);
+      }
+      return value;
     },
 
     onClick() {

ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue

@@ -113,7 +113,7 @@ export default {
   height: 100%;
   background: rgba(0, 0, 0, 0.36);
   border-radius: 0px 0px 0px 0px;
-  z-index: 2100;
+  z-index: 1100;
   // display: flex;
   // align-items: center;
   // justify-content: center;