From ee2c8657a85b93040df0a7c94baac63bc320e132 Mon Sep 17 00:00:00 2001
From: sanmu <zhusen@oschina.cn>
Date: Tue, 19 Dec 2023 23:01:31 +0800
Subject: [PATCH] fix: 修复公式显示
---
src/views/project/approve/MsgModal.vue | 15 ++++++++++++++-
src/views/project/approve/index.vue | 6 ------
src/views/project/order/ProfitAnalysis.vue | 8 ++++----
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/views/project/approve/MsgModal.vue b/src/views/project/approve/MsgModal.vue
index be02d53..b749d14 100644
--- a/src/views/project/approve/MsgModal.vue
+++ b/src/views/project/approve/MsgModal.vue
@@ -1,7 +1,14 @@
<!-- 通过vue的modal增加一个拒绝填写message -->
<template>
<!-- 一直显示 -->
- <Modal title="拒绝原因" width="30%" @cancel="handleClose" @ok="handleOk" visible>
+ <Modal
+ title="拒绝原因"
+ width="30%"
+ @cancel="handleClose"
+ @ok="handleOk"
+ visible
+ wrapClassName="approve-modal"
+ >
<div className="pa-5">
<a-textarea :rows="5" placeholder="请输入拒绝原因" v-model:value="message" />
</div>
@@ -26,3 +33,9 @@
emit('msg-modal-close');
};
</script>
+
+<style>
+ .approve-modal {
+ z-index: 99999;
+ }
+</style>
diff --git a/src/views/project/approve/index.vue b/src/views/project/approve/index.vue
index 02111e6..63c262b 100644
--- a/src/views/project/approve/index.vue
+++ b/src/views/project/approve/index.vue
@@ -160,9 +160,3 @@
},
});
</script>
-
-<style>
- .ant-modal-wrap {
- z-index: 99999999;
- }
-</style>
diff --git a/src/views/project/order/ProfitAnalysis.vue b/src/views/project/order/ProfitAnalysis.vue
index 18a6894..64b3840 100644
--- a/src/views/project/order/ProfitAnalysis.vue
+++ b/src/views/project/order/ProfitAnalysis.vue
@@ -9,12 +9,12 @@
:footer="null"
>
<div className="mb-2">
- 公示：
+ 公式：
<Select
className="w-[200px]"
:options="[
- { label: '公示1：1 -（LOCAL总金额 / 汇率 + 包装总金额）/客户总金额', value: '0' },
- { label: '公示2：1 -（LOCAL总金额/汇率 / (客户总金额-包装费用总金额)', value: '1' },
+ { label: '公式1：1 -（LOCAL总金额 / 汇率 + 包装总金额）/客户总金额', value: '0' },
+ { label: '公式2：1 -（LOCAL总金额/汇率 / (客户总金额-包装费用总金额)', value: '1' },
]"
v-model:value="profitType"
placeholder="请选择"
@@ -74,7 +74,7 @@
onMounted(async () => {
const res = await getList({ settingCode: 'exchangeRate', page: 1, pageSize: 10 });
- activeRate.value = res?.[0]?.settingValue;
+ activeRate.value = res?.items?.[0]?.settingValue;
});
const schema: DescItem[] = [
--
libgit2 0.23.3