From b123be9ae5228248e456ac6fbbe59ddc2c1ca34d Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 14:09:26 +0800
Subject: [PATCH] 销售合同号/部门新增编号

---
 src/views/salesManagement/salesLedger/index.vue |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 0c3c193..ad55ca7 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -25,6 +25,7 @@
                 :expand-row-keys="expandedRowKeys"
                 :row-key="row => row.id"
                 show-summary
+                style="width: 100%"
                 :summary-method="summarizeMainTable"
                 @expand-change="expandChange"
                 height="calc(100vh - 18.5em)">
@@ -35,27 +36,27 @@
                       show-summary
                       :summary-method="summarizeChildrenTable">
               <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-              <el-table-column label="浜у搧澶х被" prop="productCategory" />
-              <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+              <el-table-column label="浜у搧澶х被"   prop="productCategory" />
+              <el-table-column label="瑙勬牸鍨嬪彿"  prop="specificationModel" />
               <el-table-column label="鍗曚綅" prop="unit" />
-              <el-table-column label="鏁伴噺" prop="quantity" />
-              <el-table-column label="绋庣巼(%)" prop="taxRate" />
-              <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber"/>
+              <el-table-column label="鏁伴噺"  prop="quantity" />
+              <el-table-column label="绋庣巼(%)"  prop="taxRate" />
+              <el-table-column label="鍚◣鍗曚环(鍏�)"  prop="taxInclusiveUnitPrice" :formatter="formattedNumber"/>
               <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber"/>
               <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber"/>
             </el-table>
           </template>
         </el-table-column>
         <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-        <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip/>
-        <el-table-column label="瀹㈡埛鍚堝悓鍙�" prop="customerContractNo" show-overflow-tooltip/>
-        <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip/>
-        <el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip/>
-        <el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip/>
-        <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip :formatter="formattedNumber"/>
-        <el-table-column label="褰曞叆浜�" prop="entryPersonName" show-overflow-tooltip/>
-        <el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" show-overflow-tooltip/>
-        <el-table-column label="褰曞叆鏃ユ湡" prop="executionDate" show-overflow-tooltip/>
+        <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" show-overflow-tooltip/>
+        <el-table-column label="瀹㈡埛鍚堝悓鍙�" prop="customerContractNo" width="180" show-overflow-tooltip/>
+        <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="300" show-overflow-tooltip/>
+        <el-table-column label="涓氬姟鍛�" prop="salesman" width="100" show-overflow-tooltip/>
+        <el-table-column label="椤圭洰鍚嶇О" prop="projectName" width="180" show-overflow-tooltip/>
+        <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" width="180" show-overflow-tooltip :formatter="formattedNumber"/>
+        <el-table-column label="褰曞叆浜�" prop="entryPersonName" width="100" show-overflow-tooltip/>
+        <el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip/>
+        <el-table-column label="褰曞叆鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip/>
         <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
           <template #default="scope">
             <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
@@ -403,9 +404,9 @@
   page.current = 1
   getList()
 }
-const paginationChange = ({ current, limit }) => {
-  page.current = current;
-  page.size = limit;
+const paginationChange = (obj) => {
+  page.current = obj.page;
+  page.size = obj.limit;
   getList()
 }
 const getList = () => {

--
Gitblit v1.9.3