Merge branch 'dev'

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-01-29 14:26:09
+ * @LastEditTime: 2024-01-30 16:53:30
 -->
 -->
 <template>
 <template>
   <div class="tableBox">
   <div class="tableBox">
@@ -159,18 +159,22 @@
           default: (label) => label
           default: (label) => label
         };
         };
         const strategy = strategies[prop] || strategies.default;
         const strategy = strategies[prop] || strategies.default;
-        if (prop == 'bdbzzqse') {
-          let title = strategy(label)
-          if (row.jedw == 2) {
+        if (['zgzqse', 'bdbzzqse'].includes(prop)) {
+          let title = strategy(label) ? strategy(label) : ''
+          if (strategy(label) && row.jedw == 2) {
             title = title + '万元'
             title = title + '万元'
-          } else if (row.jedw == 1) {
+          } else if (strategy(label) && row.jedw == 1) {
             title = title + '元'
             title = title + '元'
           }
           }
           return title
           return title
         } else if (prop == 'dymj' && row.mjdw) {
         } else if (prop == 'dymj' && row.mjdw) {
           let arr = store.getters.dictData['A7'].filter(item => item.dcode === row.mjdw);
           let arr = store.getters.dictData['A7'].filter(item => item.dcode === row.mjdw);
+          if (strategy(label)) {
             return strategy(label) + arr[0].dname
             return strategy(label) + arr[0].dname
           } else {
           } else {
+            return strategy(label)
+          }
+        } else {
           return strategy(label);
           return strategy(label);
         }
         }
       },
       },

@@ -194,10 +194,11 @@
 
 
           <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 2">
           <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 2">
             <el-form-item label="最高债权额：">
             <el-form-item label="最高债权额：">
+              <div style="display: flex">
                 <el-input
                 <el-input
                   v-model="ruleForm.diyaq.zgzqse"
                   v-model="ruleForm.diyaq.zgzqse"
                   :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"></el-input>
                   :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"></el-input>
-              <el-select v-model="ruleForm.diyaq.jedw" :disabled="!viewEdit || ruleForm.sldy.djlx == '400'">
+                <el-select v-model="ruleForm.diyaq.jedw" style="width: 68px" :disabled="!viewEdit || ruleForm.sldy.djlx == '400'">
                   <el-option
                   <el-option
                     v-for="item in dictData['A57']"
                     v-for="item in dictData['A57']"
                     :key="item.dcode"
                     :key="item.dcode"
@@ -205,6 +206,7 @@
                     :value="item.dcode">
                     :value="item.dcode">
                   </el-option>
                   </el-option>
                 </el-select>
                 </el-select>
+              </div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>