Merge branch 'zwl-develop' into 'develop'

fix: 系统配置提成成本配置编辑表单逻辑修改 See merge request !16

Merge branch 'zwl-develop' into 'develop'
fix: 系统配置提成成本配置编辑表单逻辑修改 See merge request !16
张
2 parents 5debdf32 2d13a7d7
Showing 1 changed file with 16 additions and 9 deletions
src/views/project/config/costEdit.vue
@@ -32,25 +32,32 @@
   const emit = defineEmits(['success']);
   const [register, { closeDrawer }] = useDrawerInner((data) => {
+    // 先重置所有字段
+    fixCost.value = '';
+    ratio.value = '';
+    spainRatio.value = '';
+    copyCommission.value = '';
+    year.value = '';
+
+    // 再赋值新数据
     listAll.value = data.data;
     relationValue.value = JSON.parse(listAll.value.relationValue);
-    fixCost.value = relationValue.value[0].relationValue;
-    // 将小数转换为百分比格式显示
-    ratio.value = relationValue.value[1].relationValue 
-      ? (parseFloat(relationValue.value[1].relationValue) * 100).toFixed(2) + '%' 
+    fixCost.value = relationValue.value[0]?.relationValue || '';
+    ratio.value = relationValue.value[1]?.relationValue
+      ? (parseFloat(relationValue.value[1].relationValue) * 100).toFixed(2) + '%'
       : '';
-    spainRatio.value = relationValue.value[2].relationValue 
-      ? (parseFloat(relationValue.value[2].relationValue) * 100).toFixed(2) + '%' 
+    spainRatio.value = relationValue.value[2]?.relationValue
+      ? (parseFloat(relationValue.value[2].relationValue) * 100).toFixed(2) + '%'
       : '';
-    copyCommission.value = relationValue.value[3].relationValue;
-    year.value = listAll.value.relationName;
+    copyCommission.value = relationValue.value[3]?.relationValue || '';
+    year.value = listAll.value.relationName || '';
   });
   //获取现有的列表
   const listAll = ref();
   const fixCost = ref();
   const ratio = ref();
   const spainRatio = ref();
-  const copyCommission = ref('');
+  const copyCommission = ref();
   const relationValue = ref();
   const year = ref();