Commit ee2c8657a85b93040df0a7c94baac63bc320e132
1 parent
79967025
fix: 修复公式显示
Showing
3 changed files
with
18 additions
and
11 deletions
src/views/project/approve/MsgModal.vue
1 | <!-- 通过vue的modal增加一个拒绝填写message --> | 1 | <!-- 通过vue的modal增加一个拒绝填写message --> |
2 | <template> | 2 | <template> |
3 | <!-- 一直显示 --> | 3 | <!-- 一直显示 --> |
4 | - <Modal title="拒绝原因" width="30%" @cancel="handleClose" @ok="handleOk" visible> | 4 | + <Modal |
5 | + title="拒绝原因" | ||
6 | + width="30%" | ||
7 | + @cancel="handleClose" | ||
8 | + @ok="handleOk" | ||
9 | + visible | ||
10 | + wrapClassName="approve-modal" | ||
11 | + > | ||
5 | <div className="pa-5"> | 12 | <div className="pa-5"> |
6 | <a-textarea :rows="5" placeholder="请输入拒绝原因" v-model:value="message" /> | 13 | <a-textarea :rows="5" placeholder="请输入拒绝原因" v-model:value="message" /> |
7 | </div> | 14 | </div> |
@@ -26,3 +33,9 @@ | @@ -26,3 +33,9 @@ | ||
26 | emit('msg-modal-close'); | 33 | emit('msg-modal-close'); |
27 | }; | 34 | }; |
28 | </script> | 35 | </script> |
36 | + | ||
37 | +<style> | ||
38 | + .approve-modal { | ||
39 | + z-index: 99999; | ||
40 | + } | ||
41 | +</style> |
src/views/project/approve/index.vue
src/views/project/order/ProfitAnalysis.vue
@@ -9,12 +9,12 @@ | @@ -9,12 +9,12 @@ | ||
9 | :footer="null" | 9 | :footer="null" |
10 | > | 10 | > |
11 | <div className="mb-2"> | 11 | <div className="mb-2"> |
12 | - 公示: | 12 | + 公式: |
13 | <Select | 13 | <Select |
14 | className="w-[200px]" | 14 | className="w-[200px]" |
15 | :options="[ | 15 | :options="[ |
16 | - { label: '公示1:1 -(LOCAL总金额 / 汇率 + 包装总金额)/客户总金额', value: '0' }, | ||
17 | - { label: '公示2:1 -(LOCAL总金额/汇率 / (客户总金额-包装费用总金额)', value: '1' }, | 16 | + { label: '公式1:1 -(LOCAL总金额 / 汇率 + 包装总金额)/客户总金额', value: '0' }, |
17 | + { label: '公式2:1 -(LOCAL总金额/汇率 / (客户总金额-包装费用总金额)', value: '1' }, | ||
18 | ]" | 18 | ]" |
19 | v-model:value="profitType" | 19 | v-model:value="profitType" |
20 | placeholder="请选择" | 20 | placeholder="请选择" |
@@ -74,7 +74,7 @@ | @@ -74,7 +74,7 @@ | ||
74 | 74 | ||
75 | onMounted(async () => { | 75 | onMounted(async () => { |
76 | const res = await getList({ settingCode: 'exchangeRate', page: 1, pageSize: 10 }); | 76 | const res = await getList({ settingCode: 'exchangeRate', page: 1, pageSize: 10 }); |
77 | - activeRate.value = res?.[0]?.settingValue; | 77 | + activeRate.value = res?.items?.[0]?.settingValue; |
78 | }); | 78 | }); |
79 | 79 | ||
80 | const schema: DescItem[] = [ | 80 | const schema: DescItem[] = [ |