1

src/views/EHSD/procurement/profitBudgetEHSD/index.vue

@@ -9,12 +9,10 @@
         },
       ]" @get-list="getList">
     </byTable>
-    <div style="padding: 0 20px 20px 20px; background-color: white" v-if="rateStatus">
-      <el-table :data="sourceList.data" v-loading="loading">
-        <el-table-column label="合同编号" prop="code" width="160" fixed />
-        <el-table-column label="客户名称" prop="customerName" min-width="200" fixed />
-        <el-table-column label="业务员" prop="userName" width="120" fixed />
-        <el-table-column label="合同金额" width="120" fixed>
+    <div style="padding: 0 20px 0px 20px; background-color: white" v-if="rateStatus">
+      <el-table :data="sourceList.data" v-loading="loading" :height="tableHeight">
+        <el-table-column label="合同编号" prop="code" width="130" fixed />
+        <el-table-column label="合同金额" width="140" fixed>
           <template #default="{ row }">
             <div>{{ row.currency }} {{ moneyFormat( row.amount,2) }}</div>
           </template>
@@ -24,7 +22,7 @@
             <div> {{ dictValueLabel(row.isSettled, isSettled) }}</div>
           </template>
         </el-table-column> -->
-        <el-table-column label="是否已结清" width="120" fixed>
+        <el-table-column label="是否已结清" width="100" fixed>
           <template #default="{ row }">
             <div>
               <span style="padding: 4px" :class="[row.isSettled == 1 ? 'active' : '']">
@@ -34,27 +32,29 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="收入总计" prop="incomeAmount" width="120" fixed>
+        <el-table-column label="收入总计（CNY）" prop="incomeAmount" width="100" fixed>
           <template #default="{ row }">
-            <div>CNY {{ moneyFormat(row.incomeAmount ,2) }}</div>
+            <div> {{ moneyFormat(row.incomeAmount ,2) }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="支出总计" prop="expenditureAmount" width="120" fixed>
+        <el-table-column label="支出总计（CNY）" prop="expenditureAmount" width="100" fixed>
           <template #default="{ row }">
-            <div>CNY {{ moneyFormat(row.expenditureAmount,2) }}</div>
+            <div> {{ moneyFormat(row.expenditureAmount,2) }}</div>
           </template>
         </el-table-column>
 
-        <el-table-column label="毛利" prop="gross" width="120" fixed>
+        <el-table-column label="毛利" prop="gross" width="100" fixed>
           <template #default="{ row }">
             <div>{{ moneyFormat(row.gross ,2)}}</div>
           </template>
         </el-table-column>
-        <el-table-column label="毛利率" width="120" fixed>
+        <el-table-column label="毛利率" width="80" fixed>
           <template #default="{ row }">
             <div>{{ parseFloat(row.grossRate).toFixed(2) }}%</div>
           </template>
         </el-table-column>
+        <el-table-column label="客户名称" prop="customerName" min-width="200" />
+        <el-table-column label="业务员" prop="userName" width="120" />
 
         <el-table-column label="应付货款" width="120">
           <template #default="{ row }">
@@ -122,7 +122,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" align="center" width="160" fixed="right">
+        <el-table-column label="操作" align="center" width="110" fixed="right">
           <template #default="{ row }">
             <div>
               <el-button type="primary" @click="changeExchangeRate(row)" link>汇率</el-button>
@@ -284,6 +284,19 @@ import byForm from "@/components/byForm/index";
 import useUserStore from "@/store/modules/user";
 import { ElMessage } from "element-plus";
 
+const tableHeight = ref(0);
+const getTableHeight = () => {
+  if (window.innerHeight >= 920) {
+    tableHeight.value = 650;
+  } else {
+    tableHeight.value = 550;
+  }
+};
+getTableHeight();
+window.addEventListener("resize", () => {
+  getTableHeight();
+});
+
 const { proxy } = getCurrentInstance();
 const accountCurrency = ref([]);
 const userList = ref([]);

src/views/EHSD/procurement/profitSettlementEHSD/index.vue

@@ -3,12 +3,10 @@
     <byTable :hideTable="true" :hidePagination="true" :source="sourceList.data" :pagination="sourceList.pagination" :config="config"
              :selectConfig="selectConfig" highlight-current-row :onMoreSearch="true" @moreSearch="clickMoreSearch" @get-list="getList">
     </byTable>
-    <div style="padding: 0 20px 20px 20px; background-color: white">
-      <el-table v-loading="loading" :data="sourceList.data">
-        <el-table-column label="合同编号" prop="code" width="160" fixed />
-        <el-table-column label="客户名称" prop="customerName" min-width="200" fixed />
-        <el-table-column label="业务员" prop="userName" width="120" fixed />
-        <el-table-column label="合同金额" width="120" fixed="">
+    <div style="padding: 0 20px 0px 20px; background-color: white">
+      <el-table v-loading="loading" :data="sourceList.data" :height="tableHeight">
+        <el-table-column label="合同编号" prop="code" width="130" fixed />
+        <el-table-column label="合同金额" width="140" fixed="">
           <template #default="{ row }">
             <div>{{ row.currency }} {{ moneyFormat( row.amount,2) }}</div>
           </template>
@@ -18,7 +16,7 @@
             <div> {{ dictValueLabel(row.isSettled, isSettled) }}</div>
           </template>
         </el-table-column> -->
-        <el-table-column label="是否已结清" width="120" fixed>
+        <el-table-column label="是否已结清" width="100" fixed>
           <template #default="{ row }">
             <div>
               <span style="padding: 4px" :class="[row.isSettled == 1 ? 'active' : '']">
@@ -28,111 +26,113 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="统计" fixed>
-          <el-table-column label="收入合计" prop="incomeAmount" width="120">
-            <template #default="{ row }">
-              <div>CNY {{ moneyFormat(row.incomeAmount ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="支出合计" prop="expenditureAmount" width="120">
-            <template #default="{ row }">
-              <div>CNY {{ moneyFormat(row.expenditureAmount ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="毛利" prop="gross" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.gross ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="毛利率" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.grossRate ,2) }}%</div>
-            </template>
-          </el-table-column>
+        <!-- <el-table-column label="统计" fixed>
+         
+        </el-table-column> -->
+        <el-table-column label="收入合计（CNY）" prop="incomeAmount" width="100">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.incomeAmount ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="支出合计（CNY）" prop="expenditureAmount" width="100">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.expenditureAmount ,2) }}</div>
+          </template>
         </el-table-column>
+        <el-table-column label="毛利" prop="gross" width="100">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.gross ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="毛利率" width="80">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.grossRate ,2) }}%</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户名称" prop="customerName" min-width="200" />
+        <el-table-column label="业务员" prop="userName" width="120" />
 
-        <el-table-column label="收入">
-          <el-table-column label="到账金额" prop="sumClaimMoney" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.sumClaimMoney ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="退税金额" prop="refundableAmount" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.refundableAmount ,2) }}</div>
-            </template></el-table-column>
-          <el-table-column label="其他收入" prop="otherIncomeAmount" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.otherIncomeAmount ,2) }}</div>
-            </template>
-          </el-table-column>
+        <!-- <el-table-column label="收入">
+          
+        </el-table-column> -->
+        <el-table-column label="到账金额" prop="sumClaimMoney" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.sumClaimMoney ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="退税金额" prop="refundableAmount" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.refundableAmount ,2) }}</div>
+          </template></el-table-column>
+        <el-table-column label="其他收入" prop="otherIncomeAmount" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.otherIncomeAmount ,2) }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="采购合同金额" prop="sumPurchaseContractMoney" width="120">
           <template #default="{ row }">
             <div> {{ moneyFormat(row.sumPurchaseContractMoney ,2) }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="支出">
-          <el-table-column label="已付货款" prop="accountPaid" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.accountPaid ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="代理费" prop="agencyFee" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.agencyFee ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="拖车费" prop="trailerFee" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.trailerFee ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="报关费" prop="customsFee" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.customsFee ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="港杂费" prop="portMixedFee" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.portMixedFee ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="验货红包" prop="inspectionRedPack" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.inspectionRedPack ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="佣金" prop="commission" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.commission ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="检测费" prop="checkout" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.checkout ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="验货费" prop="inspectionCharge" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.inspectionCharge ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="运费" prop="freight" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.freight ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="产地证费" prop="certificateOfOrigin" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.certificateOfOrigin ,2) }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="其他" prop="other" width="120">
-            <template #default="{ row }">
-              <div> {{ moneyFormat(row.other ,2) }}</div>
-            </template>
-          </el-table-column>
+        <el-table-column label="已付货款" prop="accountPaid" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.accountPaid ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="代理费" prop="agencyFee" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.agencyFee ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="拖车费" prop="trailerFee" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.trailerFee ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="报关费" prop="customsFee" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.customsFee ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="港杂费" prop="portMixedFee" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.portMixedFee ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="验货红包" prop="inspectionRedPack" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.inspectionRedPack ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="佣金" prop="commission" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.commission ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="检测费" prop="checkout" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.checkout ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="验货费" prop="inspectionCharge" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.inspectionCharge ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="运费" prop="freight" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.freight ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="产地证费" prop="certificateOfOrigin" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.certificateOfOrigin ,2) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="其他" prop="other" width="120">
+          <template #default="{ row }">
+            <div> {{ moneyFormat(row.other ,2) }}</div>
+          </template>
         </el-table-column>
         <el-table-column label="备注" prop="remark" width="200" />
         <el-table-column label="操作" align="center" width="120" fixed="right">
@@ -202,6 +202,14 @@ import useUserStore from "@/store/modules/user";
 import { ElMessage } from "element-plus";
 
 const { proxy } = getCurrentInstance();
+const tableHeight = ref(0);
+const getTableHeight = () => {
+  tableHeight.value = window.innerHeight - 285;
+};
+getTableHeight();
+window.addEventListener("resize", () => {
+  getTableHeight();
+});
 const accountCurrency = ref([]);
 const sourceList = ref({
   data: [],
@@ -430,4 +438,11 @@ const moreSearchReset = () => {
   color: #fff;
   border-radius: 4px;
 }
+
+:deep(
+    .el-table .el-table__header-wrapper th,
+    .el-table .el-table__fixed-header-wrapper th
+  ) {
+  background-color: #f5f7fa !important;
+}
 </style>