asd26269546 před 1 rokem
rodič
revize
0df7cb2f53

+ 2 - 2
src/views/salesMange/saleContract/contractSelect/index.vue

@@ -13,8 +13,8 @@
       >
         <template #amount="{ item }">
           <div>
-            <span style="padding-right: 4px">{{ item.currency }}</span>
-            <span>{{ moneyFormat(item.amount, 2) }}</span>
+            <span style="padding-right: 4px">CNY</span>
+            <span>{{ moneyFormat(item.amountCNY, 2) }}</span>
           </div>
         </template>
         <template #refundMoney="{ item }">

+ 13 - 10
src/views/salesMange/salesMange/profitSettlement/index.vue

@@ -58,16 +58,19 @@
                 <template #reference>
                   <span class="table-btn">{{ moneyFormat(row.contractArrival, 2) }}</span>
                 </template>
-                <el-table :data="row.claimList">
-                  <el-table-column width="150" property="date" label="认领金额">
-                    <template #default="{ row }">
-                      <div>{{row.currency}} {{ moneyFormat(row.money, 2) }}</div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column width="60" property="rate" label="汇率" />
-                  <el-table-column width="160" property="userName" label="操作人" />
-                  <el-table-column width="190" property="createTime" label="操作时间" />
-                </el-table>
+                <div style="max-height: 300px;overflow-y: auto;">
+                  <el-table :data="row.claimList">
+                    <el-table-column width="150" property="date" label="认领金额">
+                      <template #default="{ row }">
+                        <div>{{row.currency}} {{ moneyFormat(row.money, 2) }}</div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column width="60" property="rate" label="汇率" />
+                    <el-table-column width="160" property="userName" label="操作人" />
+                    <el-table-column width="190" property="createTime" label="操作时间" />
+                  </el-table>
+                </div>
+                
               </el-popover>
               
             </template>