Commit ee2c8657a85b93040df0a7c94baac63bc320e132

Authored by sanmu
1 parent 79967025

fix: 修复公式显示

src/views/project/approve/MsgModal.vue
1 1 <!-- 通过vue的modal增加一个拒绝填写message -->
2 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 12 <div className="pa-5">
6 13 <a-textarea :rows="5" placeholder="请输入拒绝原因" v-model:value="message" />
7 14 </div>
... ... @@ -26,3 +33,9 @@
26 33 emit('msg-modal-close');
27 34 };
28 35 </script>
  36 +
  37 +<style>
  38 + .approve-modal {
  39 + z-index: 99999;
  40 + }
  41 +</style>
... ...
src/views/project/approve/index.vue
... ... @@ -160,9 +160,3 @@
160 160 },
161 161 });
162 162 </script>
163   -
164   -<style>
165   - .ant-modal-wrap {
166   - z-index: 99999999;
167   - }
168   -</style>
... ...
src/views/project/order/ProfitAnalysis.vue
... ... @@ -9,12 +9,12 @@
9 9 :footer="null"
10 10 >
11 11 <div className="mb-2">
12   - 公
  12 + 公
13 13 <Select
14 14 className="w-[200px]"
15 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 19 v-model:value="profitType"
20 20 placeholder="请选择"
... ... @@ -74,7 +74,7 @@
74 74  
75 75 onMounted(async () => {
76 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 80 const schema: DescItem[] = [
... ...