Merge branch 'stage'

src/components/contractCom/contractDetails.vue

@@ -112,6 +112,10 @@ const transactionType = ref([
     label: "到账认领",
     value: "30",
   },
+  {
+    label: "退税",
+    value: "40",
+  },
 ]);
 const config = computed(() => {
   return [

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 }">

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>
@@ -78,16 +81,18 @@
                 <template #reference>
                   <span class="table-btn">{{moneyFormat(row.taxReturnMoney, 2) }}</span>
                 </template>
-                <el-table :data="row.taxReturnList">
-                  <el-table-column width="150" property="date" label="交易金额">
-                    <template #default="{ row }">
-                      <div>{{row.currency}} {{ moneyFormat(row.amount, 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.taxReturnList">
+                    <el-table-column width="150" property="date" label="交易金额">
+                      <template #default="{ row }">
+                        <div>{{row.currency}} {{ moneyFormat(row.amount, 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>
           </el-table-column>
@@ -97,16 +102,7 @@
                 <template #reference>
                   <span class="table-btn">{{moneyFormat(row.otherIncome, 2) }}</span>
                 </template>
-                <el-table :data="row.accountRequestFundsDetailList">
-                  <el-table-column width="150" property="date" label="交易金额">
-                    <template #default="{ row }">
-                      <div>{{row.currency}} {{ moneyFormat(row.amount, 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>
+                
               </el-popover>
             </template>
           </el-table-column>
@@ -118,16 +114,18 @@
                 <template #reference>
                   <span class="table-btn">CNY {{ moneyFormat(row.purchaseAmount, 2) }}</span>
                 </template>
-                <el-table :data="row.purchaseList">
-                  <el-table-column width="140" property="date" label="交易金额">
-                    <template #default="{ row }">
-                      <div>{{row.currency}} {{ moneyFormat(row.amount, 2) }}</div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column width="120" property="rate" label="汇率" />
-                  <el-table-column min-width="130" property="purchaseName" label="业务员" />
-                  <el-table-column width="160" property="createTime" label="操作时间" />
-                </el-table>
+                <div style="max-height: 300px;overflow-y: auto;">
+                  <el-table :data="row.purchaseList">
+                    <el-table-column width="140" property="date" label="交易金额">
+                      <template #default="{ row }">
+                        <div>{{row.currency}} {{ moneyFormat(row.amount, 2) }}</div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column width="120" property="rate" label="汇率" />
+                    <el-table-column min-width="130" property="purchaseName" label="业务员" />
+                    <el-table-column width="160" property="createTime" label="操作时间" />
+                  </el-table>
+                </div>
               </el-popover>
             </template>
           </el-table-column>
@@ -139,23 +137,40 @@
                 <template #reference>
                   <span class="table-btn">{{ moneyFormat(row.payForGoods, 2) }}</span>
                 </template>
-                <el-table :data="row.payList">
-                  <el-table-column width="150" property="date" label="交易金额">
-                    <template #default="{ row }">
-                      <div>{{row.currency}} {{ moneyFormat(row.amount, 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.payList">
+                    <el-table-column width="150" property="date" label="交易金额">
+                      <template #default="{ row }">
+                        <div>{{row.currency}} {{ moneyFormat(row.amount, 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>
           </el-table-column>
           <el-table-column label="其他支出" width="120">
             <template #default="{ row }">
-              
-              <div class="table-btn">{{ moneyFormat(row.otherExpenses, 2) }}</div>
+              <el-popover placement="top" :width="580" trigger="click">
+                <template #reference>
+                  <span class="table-btn">{{moneyFormat(row.otherIncome, 2) }}</span>
+                </template>
+                <div style="max-height: 300px;overflow-y: auto;">
+                  <el-table :data="row.accountRequestFundsDetailList">
+                    <el-table-column width="150" property="date" label="交易金额">
+                      <template #default="{ row }">
+                        <div>{{row.currency}} {{ moneyFormat(row.amount, 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>
           </el-table-column>
         </el-table-column>
@@ -170,7 +185,8 @@
               <div>{{ moneyFormat(row.totalExpenses, 2) }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="毛利" width="120">
+          
+          <el-table-column label="毛利" width="120"> 
             <template #default="{ row }">
               <div>{{ moneyFormat(row.grossProfit, 2) }}</div>
             </template>