Merge remote-tracking branch 'origin/main' into main

cds-fontend-2025.V1/src/views/business/category/index.vue

@@ -134,13 +134,18 @@ const {
         const suffixMap = {
           'BIZ030': ' * 交易金额',
           'BIZ031': ' * 交易金额',
-          'default': ' 元/条'
+          'default': '元/条'
         };
-
+        let formattedValue;
+        if(row.typeId !== 'BIZ030' && row.typeId !== 'BIZ031' ){
+          formattedValue = parseFloat(row.pricingRule).toFixed(2);
+        }else{
+          formattedValue = row.pricingRule;
+        }
         const suffix = suffixMap[row.typeId] || suffixMap.default;
         return (
           <NEllipsis style="width: 100%;" tooltip={true}>
-            {`${row.pricingRule}${suffix}`}
+            {`${formattedValue}${suffix}`}
           </NEllipsis>
         );
       }

cds-fontend-2025.V1/src/views/business/category/modules/subcategory-operate-drawer.vue

@@ -149,7 +149,7 @@ watch(visible, () => {
             :rows="3"
             placeholder="请输入计价规则说明"
           >
-          <template v-if="model.typeId === 'BIZ006' || model.typeId === 'BIZ028'  " #suffix>
+          <template v-if="model.typeId === 'BIZ030' || model.typeId === 'BIZ031'  " #suffix>
             * 交易金额
           </template>
           <template else #suffix>