From c7f90a3054ee56c3be7317a67d2b192b6509b3e7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 27 三月 2026 13:22:40 +0800
Subject: [PATCH] fix: 采购销售订单需要审核

---
 src/views/salesManagement/salesLedger/index.vue | 3575 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 1,653 insertions(+), 1,922 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index ab7b9d6..7b45b73 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -1,48 +1,29 @@
 <template>
   <div class="app-container">
     <div class="search_form">
-      <el-form :model="searchForm"
-               :inline="true">
+      <el-form :model="searchForm" :inline="true">
         <el-form-item label="瀹㈡埛鍚嶇О锛�">
-          <el-input v-model="searchForm.customerName"
-                    placeholder="璇疯緭鍏�"
-                    clearable
-                    prefix-icon="Search"
-                    @change="handleQuery" />
+          <el-input v-model="searchForm.customerName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+            @change="handleQuery" />
         </el-form-item>
         <el-form-item label="瀹㈡埛鍚堝悓鍙凤細">
-          <el-input v-model="searchForm.customerContractNo"
-                    placeholder="璇疯緭鍏�"
-                    clearable
-                    prefix-icon="Search"
-                    @change="handleQuery" />
+          <el-input v-model="searchForm.customerContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+            @change="handleQuery" />
         </el-form-item>
         <el-form-item label="閿�鍞悎鍚屽彿锛�">
-          <el-input v-model="searchForm.salesContractNo"
-                    placeholder="璇疯緭鍏�"
-                    clearable
-                    prefix-icon="Search"
-                    @change="handleQuery" />
+          <el-input v-model="searchForm.salesContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+            @change="handleQuery" />
         </el-form-item>
         <el-form-item label="椤圭洰鍚嶇О锛�">
-          <el-input v-model="searchForm.projectName"
-                    placeholder="璇疯緭鍏�"
-                    clearable
-                    prefix-icon="Search"
-                    @change="handleQuery" />
+          <el-input v-model="searchForm.projectName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+            @change="handleQuery" />
         </el-form-item>
         <el-form-item label="褰曞叆鏃ユ湡锛�">
-          <el-date-picker v-model="searchForm.entryDate"
-                          value-format="YYYY-MM-DD"
-                          format="YYYY-MM-DD"
-                          type="daterange"
-                          placeholder="璇烽�夋嫨"
-                          clearable
-                          @change="changeDaterange" />
+          <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
+            placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary"
-                     @click="handleQuery"> 鎼滅储 </el-button>
+          <el-button type="primary" @click="handleQuery"> 鎼滅储 </el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -50,254 +31,125 @@
       <div class="actions">
         <div></div>
         <div>
-          <el-button type="primary"
-                     @click="openForm('add')">
+          <el-button type="primary" @click="openForm('add')">
             鏂板鍙拌处
           </el-button>
           <el-button @click="handleOut">瀵煎嚭</el-button>
-          <el-button type="danger"
-                     plain
-                     @click="handleDelete">鍒犻櫎</el-button>
-          <el-button type="primary"
-                     plain
-                     @click="handlePrint">鎵撳嵃</el-button>
+          <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+          <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
         </div>
       </div>
-      <el-table :data="tableData"
-                border
-                v-loading="tableLoading"
-                @selection-change="handleSelectionChange"
-                :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)">
-        <el-table-column align="center"
-                         type="selection"
-                         width="55" />
+      <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
+        :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)">
+        <el-table-column align="center" type="selection" width="55" />
         <el-table-column type="expand">
           <template #default="props">
-            <el-table :data="props.row.children"
-                      border
-                      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="unit" />
-              <el-table-column label="鐢熶骇鐘舵��"
-                               width="100px"
-                               align="center">
-                <template #default="scope">
-                  <el-tag v-if="scope.row.productionStatus === '宸插畬鎴�'"
-                          type="success">宸插畬鎴�</el-tag>
-                  <el-tag v-if="scope.row.productionStatus === '鐢熶骇涓�'"
-                          type="warning">鐢熶骇涓�</el-tag>
-                  <el-tag v-if="scope.row.productionStatus === '鏈紑濮�'"
-                          type="danger">鏈紑濮�</el-tag>
-                  <el-tag v-if="!scope.row.productionStatus"
-                          type="info">鏆傛棤鐘舵��</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column label="浜у搧鐘舵��"
-                               width="100px"
-                               align="center">
-                <template #default="scope">
-                  <el-tag v-if="scope.row.approveStatus === 0"
-                          type="info">鏈嚭搴�</el-tag>
-                  <el-tag v-if="scope.row.approveStatus === 1"
-                          type="success">宸插嚭搴�</el-tag>
-                  <el-tag v-if="scope.row.approveStatus === 2"
-                          type="warning">瀹℃牳涓�</el-tag>
-                  <el-tag v-if="scope.row.approveStatus === 3"
-                          type="success">瀹℃牳鎴愬姛</el-tag>
-                  <el-tag v-if="scope.row.approveStatus === 4"
-                          type="danger">瀹℃牳澶辫触</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column label="鍙戣揣杞︾墝"
-                               minWidth="100px"
-                               align="center">
-                <template #default="scope">
-                  <div>
-                    <el-tag type="success"
-                            v-if="scope.row.shippingCarNumber">{{ scope.row.shippingCarNumber }}</el-tag>
-                    <el-tag v-else
-                            type="info">鏈彂璐�</el-tag>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column label="鍙戣揣鏃ユ湡"
-                               minWidth="100px"
-                               align="center">
-                <template #default="scope">
-                  <div>
-                    <div v-if="scope.row.shippingDate">{{ scope.row.shippingDate }}</div>
-                    <el-tag v-else
-                            type="info">鏈彂璐�</el-tag>
-                  </div>
-                </template>
-              </el-table-column>
-              <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-column Width="60px"
-                               label="鎿嶄綔"
-                               align="center">
-                <template #default="scope">
-                  <el-button :disabled="scope.row.approveStatus===2 || scope.row.approveStatus===5"
-                             link
-                             type="primary"
-                             size="small"
-                             @click="openDeliveryForm(scope.row)">鍙戣揣</el-button>
-                </template>
-              </el-table-column>
+            <el-table :data="props.row.children" border show-summary :summary-method="summarizeChildrenTable" style="min-width: 1200px;"
+                      scrollbar-always-on>
+              <el-table-column align="center" label="搴忓彿" type="index" width="70" />
+              <el-table-column label="浜у搧澶х被" prop="productCategory" width="160" />
+              <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="220" />
+              <el-table-column label="鍗曚綅" prop="unit" width="100" />
+              <el-table-column label="鏁伴噺" prop="quantity" width="120" />
+              <el-table-column label="绋庣巼(%)" prop="taxRate" width="120" />
+              <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" width="160" />
+              <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" width="180" />
+              <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" width="180" />
+<!--              <el-table-column fixed="right" label="鎿嶄綔" width="150" align="center">-->
+<!--                <template #default="scope">-->
+<!--                  <el-button link type="primary" size="small" @click="openDeliveryForm(props.row, scope.row)">鍙戣揣</el-button>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         label="搴忓彿"
-                         type="index"
-                         width="60" />
-        <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="paymentMethod"
-                         show-overflow-tooltip />
-        <el-table-column label="鍚堝悓閲戦(鍏�)"
-                         prop="contractAmount"
-                         width="220"
-                         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="100"
-                         align="center">
+        <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+        <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="瀹℃牳鐘舵��" width="140">
           <template #default="scope">
-            <el-button link
-                       type="primary"
-                       size="small"
-                       @click="openForm('edit', scope.row)">缂栬緫</el-button>
-            <!--            <el-button link type="primary" size="small" @click="openForm('view', scope.row)">璇︽儏</el-button>-->
-            <el-button link
-                       type="primary"
-                       size="small"
-                       @click="downLoadFile(scope.row)">闄勪欢</el-button>
-            <!--            <el-button link type="primary" size="small" @click="openDeliveryForm(scope.row)">鍙戣揣</el-button>-->
+
+              <el-tag
+                v-if="(scope.row.approveStatus ?? scope.row.approvalStatus) == 0"
+                type="warning"
+              >寰呭鏍�</el-tag>
+              <el-tag
+                v-else-if="(scope.row.approveStatus ?? scope.row.approvalStatus) == 1"
+                type="primary"
+              >瀹℃牳涓�</el-tag>
+              <el-tag
+                v-else-if="(scope.row.approveStatus ?? scope.row.approvalStatus) == 2"
+                type="success"
+              >瀹℃牳瀹屾垚</el-tag>
+              <el-tag
+                v-else-if="(scope.row.approveStatus ?? scope.row.approvalStatus) == 3"
+                type="danger"
+              >瀹℃牳鏈�氳繃</el-tag>
+              <el-tag
+                v-else-if="(scope.row.approveStatus ?? scope.row.approvalStatus) == 4"
+                type="info"
+              >宸查噸鏂版彁浜�</el-tag>
+              <el-tag v-else type="info">-</el-tag>
+
+          </template>
+        </el-table-column>
+        <el-table-column label="閿�鍞被鍨�" width="120">
+          <template #default="scope">
+            <el-tag
+              :type="scope.row.salesType === '绱ф��' ? 'danger' : 'info'"
+            >{{ scope.row.salesType || '-' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="浠樻鏂瑰紡" prop="paymentMethod" show-overflow-tooltip />
+        <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" width="220" 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="150" align="center">
+          <template #default="scope">
+            <el-button link type="primary" size="small" @click="openForm('edit', scope.row)">缂栬緫</el-button>
+<!--            <el-button link type="primary" size="small" @click="openForm('view', scope.row)">璇︽儏</el-button>-->
+            <el-button link type="primary" size="small" @click="downLoadFile(scope.row)">闄勪欢</el-button>
+            <el-button link type="primary" size="small" @click="openDeliveryForm(scope.row)">鍙戣揣</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total > 0"
-                  :total="total"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  :page="page.current"
-                  :limit="page.size"
-                  @pagination="paginationChange" />
+      <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
+        :page="page.current" :limit="page.size" @pagination="paginationChange" />
     </div>
-    <el-dialog v-model="dialogFormVisible"
-               :title="operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'"
-               width="70%"
-               @close="closeDia">
-      <el-form :model="form"
-               label-width="140px"
-               label-position="top"
-               :rules="rules"
-               ref="formRef">
+    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'" width="70%"
+      @close="closeDia">
+      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
         <el-row :gutter="30">
           <el-col :span="12">
-            <el-form-item label="閿�鍞悎鍚屽彿锛�"
-                          prop="salesContractNo">
-              <el-input v-model="form.salesContractNo"
-                        placeholder="鑷姩鐢熸垚"
-                        clearable
-                        disabled />
+            <el-form-item label="閿�鍞悎鍚屽彿锛�" prop="salesContractNo">
+              <el-input v-model="form.salesContractNo" placeholder="鑷姩鐢熸垚" clearable disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="涓氬姟鍛橈細"
-                          prop="salesman">
-              <el-select v-model="form.salesman"
-                         placeholder="璇烽�夋嫨"
-                         clearable
-                         :disabled="operationType === 'view'">
-                <el-option v-for="item in userList"
-                           :key="item.nickName"
-                           :label="item.nickName"
-                           :value="item.nickName" />
+            <el-form-item label="涓氬姟鍛橈細" prop="salesman">
+              <el-select v-model="form.salesman" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'">
+                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
+                  :value="item.nickName" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
-            <el-form-item label="瀹㈡埛鍚堝悓鍙凤細"
-                          prop="customerContractNo">
-              <el-input v-model="form.customerContractNo"
-                        placeholder="璇疯緭鍏�"
-                        clearable
-                        :disabled="operationType === 'view'" />
+            <el-form-item label="瀹㈡埛鍚堝悓鍙凤細" prop="customerContractNo">
+              <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="瀹㈡埛鍚嶇О锛�"
-                          prop="customerId">
-              <el-select v-model="form.customerId"
-                         placeholder="璇烽�夋嫨"
-                         clearable
-                         :disabled="operationType === 'view'">
-                <el-option v-for="item in customerOption"
-                           :key="item.id"
-                           :label="item.customerName"
-                           :value="item.id">
+            <el-form-item label="瀹㈡埛鍚嶇О锛�" prop="customerId">
+              <el-select v-model="form.customerId" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'">
+                <el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.id">
                   {{
                     item.customerName + "鈥斺��" + item.taxpayerIdentificationNumber
                   }}
@@ -308,155 +160,134 @@
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
-            <el-form-item label="椤圭洰鍚嶇О锛�"
-                          prop="projectName">
-              <el-input v-model="form.projectName"
-                        placeholder="璇疯緭鍏�"
-                        clearable
-                        :disabled="operationType === 'view'" />
+            <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="绛捐鏃ユ湡锛�"
-                          prop="executionDate">
-              <el-date-picker style="width: 100%"
-                              v-model="form.executionDate"
-                              value-format="YYYY-MM-DD"
-                              format="YYYY-MM-DD"
-                              type="date"
-                              placeholder="璇烽�夋嫨"
-                              clearable
-                              :disabled="operationType === 'view'" />
-            </el-form-item>
-          </el-col>
+					<el-col :span="12">
+						<el-form-item label="绛捐鏃ユ湡锛�" prop="executionDate">
+							<el-date-picker style="width: 100%" v-model="form.executionDate" value-format="YYYY-MM-DD"
+															format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'" />
+						</el-form-item>
+					</el-col>
         </el-row>
         <el-row :gutter="30">
+					<el-col :span="12">
+						<el-form-item label="褰曞叆浜猴細" prop="entryPerson">
+							<el-select v-model="form.entryPerson" placeholder="璇烽�夋嫨" clearable @change="changs" disabled>
+								<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+							</el-select>
+						</el-form-item>
+					</el-col>
           <el-col :span="12">
-            <el-form-item label="褰曞叆浜猴細"
-                          prop="entryPerson">
-              <el-select v-model="form.entryPerson"
-                         placeholder="璇烽�夋嫨"
-                         clearable
-                         @change="changs"
-                         disabled>
-                <el-option v-for="item in userList"
-                           :key="item.userId"
-                           :label="item.nickName"
-                           :value="item.userId" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="褰曞叆鏃ユ湡锛�"
-                          prop="entryDate">
-              <el-date-picker style="width: 100%"
-                              v-model="form.entryDate"
-                              value-format="YYYY-MM-DD"
-                              format="YYYY-MM-DD"
-                              type="date"
-                              placeholder="璇烽�夋嫨"
-                              clearable />
+            <el-form-item label="褰曞叆鏃ユ湡锛�" prop="entryDate">
+              <el-date-picker style="width: 100%" v-model="form.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+                type="date" placeholder="璇烽�夋嫨" clearable />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="浠樻鏂瑰紡">
-              <el-input v-model="form.paymentMethod"
-                        placeholder="璇疯緭鍏�"
-                        clearable
-                        :disabled="operationType === 'view'" />
+              <el-input v-model="form.paymentMethod" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="閿�鍞被鍨嬶細" prop="salesType">
+              <el-select
+                v-model="form.salesType"
+                placeholder="璇烽�夋嫨"
+                clearable
+                :disabled="operationType === 'view'"
+                style="width: 100%"
+              >
+                <el-option label="鏅��" value="鏅��" />
+                <el-option label="绱ф��" value="绱ф��" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-form-item label="浜у搧淇℃伅锛�"
-                        prop="entryDate">
-            <el-button v-if="operationType !== 'view'"
-                       type="primary"
-                       @click="openProductForm('add')">娣诲姞</el-button>
-            <el-button v-if="operationType !== 'view'"
-                       plain
-                       type="danger"
-                       @click="deleteProduct">鍒犻櫎</el-button>
+          <el-col :span="24">
+            <el-form-item v-if="operationType !== 'view'">
+              <template #label>
+                <span>瀹℃壒浜洪�夋嫨锛�</span>
+                <el-button type="primary" @click="addApproverNode" style="margin-left: 8px;">鏂板鑺傜偣</el-button>
+              </template>
+              <div style="display: flex; align-items: flex-end; flex-wrap: wrap;">
+                <div
+                  v-for="(node, index) in approverNodes"
+                  :key="node.id"
+                  style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
+                >
+                  <div>
+                    <span>瀹℃壒浜�</span>
+                    鈫�
+                  </div>
+                  <el-select
+                    v-model="node.userId"
+                    placeholder="閫夋嫨浜哄憳"
+                    style="width: 140px; margin-bottom: 8px;"
+                  >
+                    <el-option
+                      v-for="user in userList"
+                      :key="user.userId"
+                      :label="user.nickName"
+                      :value="user.userId"
+                    />
+                  </el-select>
+                  <div>
+                    <el-button
+                      type="danger"
+                      size="small"
+                      @click="removeApproverNode(index)"
+                      v-if="approverNodes.length > 1"
+                    >鍒犻櫎</el-button>
+                  </div>
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-form-item label="浜у搧淇℃伅锛�" prop="entryDate">
+            <el-button v-if="operationType !== 'view'" type="primary" @click="openProductForm('add')">娣诲姞</el-button>
+            <el-button v-if="operationType !== 'view'" plain type="danger" @click="deleteProduct" >鍒犻櫎</el-button>
           </el-form-item>
         </el-row>
-        <el-table :data="productData"
-                  border
-                  @selection-change="productSelected"
-                  show-summary
-                  :summary-method="summarizeMainTable">
-          <el-table-column align="center"
-                           type="selection"
-                           width="55"
-                           v-if="operationType !== 'view'" />
-          <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="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="taxInclusiveTotalPrice"
-                           :formatter="formattedNumber" />
-          <el-table-column label="涓嶅惈绋庢�讳环(鍏�)"
-                           prop="taxExclusiveTotalPrice"
-                           :formatter="formattedNumber" />
-          <el-table-column fixed="right"
-                           label="鎿嶄綔"
-                           min-width="60"
-                           align="center"
-                           v-if="operationType !== 'view'">
+        <el-table :data="productData" border @selection-change="productSelected" show-summary
+          :summary-method="summarizeMainTable">
+          <el-table-column align="center" type="selection" width="55" v-if="operationType !== 'view'" />
+          <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="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="taxInclusiveTotalPrice" :formatter="formattedNumber" />
+          <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
+          <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center" v-if="operationType !== 'view'">
             <template #default="scope">
-              <el-button link
-                         type="primary"
-                         size="small"
-                         @click="openProductForm('edit', scope.row,scope.$index)">缂栬緫</el-button>
+              <el-button link type="primary" size="small" @click="openProductForm('edit', scope.row,scope.$index)">缂栬緫</el-button>
             </template>
           </el-table-column>
         </el-table>
         <el-row :gutter="30">
           <el-col :span="24">
-            <el-form-item label="澶囨敞路锛�"
-                          prop="remark">
-              <el-input v-model="form.remark"
-                        placeholder="璇疯緭鍏�"
-                        clearable
-                        type="textarea"
-                        :rows="2"
-                        :disabled="operationType === 'view'" />
+            <el-form-item label="澶囨敞路锛�" prop="remark">
+              <el-input v-model="form.remark" placeholder="璇疯緭鍏�" clearable type="textarea" :rows="2" :disabled="operationType === 'view'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="24">
-            <el-form-item label="闄勪欢鏉愭枡锛�"
-                          prop="remark">
-              <el-upload v-model:file-list="fileList"
-                         :action="upload.url"
-                         multiple
-                         ref="fileUpload"
-                         auto-upload
-                         :headers="upload.headers"
-                         :before-upload="handleBeforeUpload"
-                         :on-error="handleUploadError"
-                         :on-success="handleUploadSuccess"
-                         :on-remove="handleRemove">
-                <el-button type="primary"
-                           v-if="operationType !== 'view'">涓婁紶</el-button>
-                <template #tip
-                          v-if="operationType !== 'view'">
+            <el-form-item label="闄勪欢鏉愭枡锛�" prop="remark">
+              <el-upload v-model:file-list="fileList" :action="upload.url" multiple ref="fileUpload" auto-upload
+                :headers="upload.headers" :before-upload="handleBeforeUpload" :on-error="handleUploadError"
+                :on-success="handleUploadSuccess" :on-remove="handleRemove">
+                <el-button type="primary" v-if="operationType !== 'view'">涓婁紶</el-button>
+                <template #tip v-if="operationType !== 'view'">
                   <div class="el-upload__tip">
                     鏂囦欢鏍煎紡鏀寔
                     doc锛宒ocx锛寈ls锛寈lsx锛宲pt锛宲ptx锛宲df锛宼xt锛寈ml锛宩pg锛宩peg锛宲ng锛実if锛宐mp锛宺ar锛寊ip锛�7z
@@ -469,140 +300,84 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary"
-                     @click="submitForm">纭</el-button>
+          <el-button type="primary" @click="submitForm">纭</el-button>
           <el-button @click="closeDia">鍙栨秷</el-button>
         </div>
       </template>
     </el-dialog>
-    <el-dialog v-model="productFormVisible"
-               :title="productOperationType === 'add' ? '鏂板浜у搧' : '缂栬緫浜у搧'"
-               width="40%"
-               @close="closeProductDia">
-      <el-form :model="productForm"
-               label-width="140px"
-               label-position="top"
-               :rules="productRules"
-               ref="productFormRef">
+    <el-dialog v-model="productFormVisible" :title="productOperationType === 'add' ? '鏂板浜у搧' : '缂栬緫浜у搧'" width="40%"
+      @close="closeProductDia">
+      <el-form :model="productForm" label-width="140px" label-position="top" :rules="productRules" ref="productFormRef">
         <el-row :gutter="30">
           <el-col :span="24">
-            <el-form-item label="浜у搧澶х被锛�"
-                          prop="productCategory">
+            <el-form-item label="浜у搧澶х被锛�" prop="productCategory">
               <!-- <el-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable>
                 <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
               </el-select> -->
-              <el-tree-select v-model="productForm.productCategory"
-                              placeholder="璇烽�夋嫨"
-                              clearable
-                              check-strictly
-                              @change="getModels"
-                              :data="productOptions"
-                              :render-after-expand="false"
-                              style="width: 100%" />
+              <el-tree-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable check-strictly
+                @change="getModels" :data="productOptions" :render-after-expand="false" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="24">
-            <el-form-item label="瑙勬牸鍨嬪彿锛�"
-                          prop="productModelId">
-              <el-select v-model="productForm.productModelId"
-                         placeholder="璇烽�夋嫨"
-                         clearable
-                         @change="getProductModel">
-                <el-option v-for="item in modelOptions"
-                           :key="item.id"
-                           :label="item.model"
-                           :value="item.id" />
+            <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+              <el-select v-model="productForm.productModelId" placeholder="璇烽�夋嫨" clearable @change="getProductModel">
+                <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
-            <el-form-item label="鍗曚綅锛�"
-                          prop="unit">
-              <el-input v-model="productForm.unit"
-                        placeholder="璇疯緭鍏�"
-                        clearable />
+            <el-form-item label="鍗曚綅锛�" prop="unit">
+              <el-input v-model="productForm.unit" placeholder="璇疯緭鍏�" clearable />
+            </el-form-item>
+          </el-col>
+					<el-col :span="12">
+						<el-form-item label="绋庣巼(%)锛�" prop="taxRate">
+							<el-select v-model="productForm.taxRate" placeholder="璇烽�夋嫨" clearable @change="calculateFromTaxRate">
+								<el-option label="1" value="1" />
+								<el-option label="6" value="6" />
+								<el-option label="13" value="13" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="鍚◣鍗曚环(鍏�)锛�" prop="taxInclusiveUnitPrice">
+              <el-input-number :step="0.01" :min="0" v-model="productForm.taxInclusiveUnitPrice" style="width: 100%"
+															 :precision="2"
+															 placeholder="璇疯緭鍏�" clearable @change="calculateFromUnitPrice" />
+            </el-form-item>
+          </el-col>
+					<el-col :span="12">
+						<el-form-item label="鏁伴噺锛�" prop="quantity">
+							<el-input-number  :step="0.1" :min="0" v-model="productForm.quantity" placeholder="璇疯緭鍏�" clearable
+																:precision="2"
+																@change="calculateFromQuantity" style="width: 100%" />
+						</el-form-item>
+					</el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="鍚◣鎬讳环(鍏�)锛�" prop="taxInclusiveTotalPrice">
+              <el-input v-model="productForm.taxInclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable @change="calculateFromTotalPrice" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="绋庣巼(%)锛�"
-                          prop="taxRate">
-              <el-select v-model="productForm.taxRate"
-                         placeholder="璇烽�夋嫨"
-                         clearable
-                         @change="calculateFromTaxRate">
-                <el-option label="1"
-                           value="1" />
-                <el-option label="6"
-                           value="6" />
-                <el-option label="13"
-                           value="13" />
-              </el-select>
+            <el-form-item label="涓嶅惈绋庢�讳环(鍏�)锛�" prop="taxExclusiveTotalPrice">
+              <el-input v-model="productForm.taxExclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable @change="calculateFromExclusiveTotalPrice" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
-            <el-form-item label="鍚◣鍗曚环(鍏�)锛�"
-                          prop="taxInclusiveUnitPrice">
-              <el-input-number :step="0.01"
-                               :min="0"
-                               v-model="productForm.taxInclusiveUnitPrice"
-                               style="width: 100%"
-                               :precision="2"
-                               placeholder="璇疯緭鍏�"
-                               clearable
-                               @change="calculateFromUnitPrice" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="鏁伴噺锛�"
-                          prop="quantity">
-              <el-input-number :step="0.1"
-                               :min="0"
-                               v-model="productForm.quantity"
-                               placeholder="璇疯緭鍏�"
-                               clearable
-                               :precision="2"
-                               @change="calculateFromQuantity"
-                               style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="鍚◣鎬讳环(鍏�)锛�"
-                          prop="taxInclusiveTotalPrice">
-              <el-input v-model="productForm.taxInclusiveTotalPrice"
-                        placeholder="璇疯緭鍏�"
-                        clearable
-                        @change="calculateFromTotalPrice" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="涓嶅惈绋庢�讳环(鍏�)锛�"
-                          prop="taxExclusiveTotalPrice">
-              <el-input v-model="productForm.taxExclusiveTotalPrice"
-                        placeholder="璇疯緭鍏�"
-                        clearable
-                        @change="calculateFromExclusiveTotalPrice" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="鍙戠エ绫诲瀷锛�"
-                          prop="invoiceType">
-              <el-select v-model="productForm.invoiceType"
-                         placeholder="璇烽�夋嫨"
-                         clearable>
-                <el-option label="澧炴櫘绁�"
-                           value="澧炴櫘绁�" />
-                <el-option label="澧炰笓绁�"
-                           value="澧炰笓绁�" />
+            <el-form-item label="鍙戠エ绫诲瀷锛�" prop="invoiceType">
+              <el-select v-model="productForm.invoiceType" placeholder="璇烽�夋嫨" clearable>
+                <el-option label="澧炴櫘绁�" value="澧炴櫘绁�" />
+                <el-option label="澧炰笓绁�" value="澧炰笓绁�" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -610,704 +385,661 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary"
-                     @click="submitProduct">纭</el-button>
+          <el-button type="primary" @click="submitProduct">纭</el-button>
           <el-button @click="closeProductDia">鍙栨秷</el-button>
         </div>
       </template>
     </el-dialog>
-    <!-- 鎵撳嵃棰勮寮圭獥 -->
-    <el-dialog v-model="printPreviewVisible"
-               title="鎵撳嵃棰勮"
-               width="90%"
-               :close-on-click-modal="false"
-               class="print-preview-dialog">
-      <div class="print-preview-container">
-        <div class="print-preview-header">
-          <el-button type="primary"
-                     @click="executePrint">鎵ц鎵撳嵃</el-button>
-          <el-button @click="printPreviewVisible = false">鍏抽棴棰勮</el-button>
-        </div>
-        <div class="print-preview-content">
-          <div v-if="printData.length === 0"
-               style="text-align: center; padding: 50px; color: #999;">
-            鏆傛棤鎵撳嵃鏁版嵁
-          </div>
-          <div v-else
-               style="text-align: center; padding: 10px; color: #666; font-size: 14px; background: #e8f4fd; margin-bottom: 10px;">
-            鍏� {{ printData.length }} 鏉℃暟鎹緟鎵撳嵃
-          </div>
-          <div v-for="(item, index) in printData"
-               :key="index"
-               class="print-page">
-            <div class="delivery-note">
-              <div class="header">
-                <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
-                <div class="document-title">闆跺敭鍙戣揣鍗�</div>
-              </div>
-              <div class="info-section">
-                <div class="info-row">
-                  <div>
-                    <span class="label">鍙戣揣鏃ユ湡锛�</span>
-                    <span class="value">{{ formatDate(item.createTime) }}</span>
-                  </div>
-                  <div>
-                    <span class="label">瀹㈡埛鍚嶇О锛�</span>
-                    <span class="value">{{ item.customerName || '寮犵埍鏈�' }}</span>
-                  </div>
-                </div>
-                <div class="info-row">
-                  <span class="label">鍗曞彿锛�</span>
-                  <span class="value">{{ item.salesContractNo }}</span>
-                </div>
-              </div>
-              <div class="table-section">
-                <table class="product-table">
-                  <thead>
-                    <tr>
-                      <th>浜у搧鍚嶇О</th>
-                      <th>瑙勬牸鍨嬪彿</th>
-                      <th>鍗曚綅</th>
-                      <th>鍗曚环</th>
-                      <th>闆跺敭鏁伴噺</th>
-                      <th>闆跺敭閲戦</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr v-for="product in item.products"
-                        :key="product.id">
-                      <td>{{ product.productCategory || '' }}</td>
-                      <td>{{ product.specificationModel || '' }}</td>
-                      <td>{{ product.unit || '' }}</td>
-                      <td>{{ product.taxInclusiveUnitPrice || '0' }}</td>
-                      <td>{{ product.quantity || '0' }}</td>
-                      <td>{{ product.taxInclusiveTotalPrice || '0' }}</td>
-                    </tr>
-                    <tr v-if="!item.products || item.products.length === 0">
-                      <td colspan="6"
-                          style="text-align: center; color: #999;">鏆傛棤浜у搧鏁版嵁</td>
-                    </tr>
-                  </tbody>
-                  <tfoot>
-                    <tr>
-                      <td class="label">鍚堣</td>
-                      <td class="total-value"></td>
-                      <td class="total-value"></td>
-                      <td class="total-value"></td>
-                      <td class="total-value">{{ getTotalQuantity(item.products) }}</td>
-                      <td class="total-value">{{ getTotalAmount(item.products) }}</td>
-                    </tr>
-                  </tfoot>
-                </table>
-              </div>
-              <div class="footer-section">
-                <div class="footer-row">
-                  <div class="footer-item">
-                    <span class="label">鏀惰揣鐢佃瘽锛�</span>
-                    <span class="value"></span>
-                  </div>
-                  <div class="footer-item">
-                    <span class="label">鏀惰揣浜猴細</span>
-                    <span class="value"></span>
-                  </div>
-                  <div class="footer-item address-item">
-                    <span class="label">鏀惰揣鍦板潃锛�</span>
-                    <span class="value address-value"></span>
-                  </div>
-                </div>
-                <div class="footer-row">
-                  <div class="footer-item">
-                    <span class="label">鎿嶄綔鍛橈細</span>
-                    <span class="value">{{ userStore.nickName || '鎾曞紑鍓�' }}</span>
-                  </div>
-                  <div class="footer-item">
-                    <span class="label">鎵撳嵃鏃ユ湡锛�</span>
-                    <span class="value">{{ formatDateTime(new Date()) }}</span>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-dialog>
-    <!-- 鍙戣揣寮规 -->
-    <el-dialog v-model="deliveryFormVisible"
-               title="鍙戣揣淇℃伅"
-               width="40%"
-               @close="closeDeliveryDia">
-      <el-form :model="deliveryForm"
-               label-width="120px"
-               label-position="top"
-               :rules="deliveryRules"
-               ref="deliveryFormRef">
-        <el-row :gutter="30">
-          <el-col :span="24">
-            <el-form-item label="鍙戣揣鏃ユ湡锛�"
-                          prop="shippingDate">
-              <el-date-picker style="width: 100%"
-                              v-model="deliveryForm.shippingDate"
-                              value-format="YYYY-MM-DD"
-                              format="YYYY-MM-DD"
-                              type="date"
-                              placeholder="璇烽�夋嫨鍙戣揣鏃ユ湡"
-                              clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="24">
-            <el-form-item label="鍙戣揣杞︾墝鍙凤細"
-                          prop="shippingCarNumber">
-              <el-input v-model="deliveryForm.shippingCarNumber"
-                        placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
-                        clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="24">
-            <el-form-item label="瀹℃壒浜猴細"
-                          prop="approverId">
-              <el-select v-model="deliveryForm.approverId"
-                         placeholder="璇烽�夋嫨瀹℃壒浜�"
-                         clearable
-                         :disabled="operationType === 'view'">
-                <el-option v-for="item in userList"
-                           :key="item.userId"
-                           :label="item.nickName"
-                           :value="item.userId" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary"
-                     @click="submitDelivery">纭鍙戣揣</el-button>
-          <el-button @click="closeDeliveryDia">鍙栨秷</el-button>
-        </div>
-      </template>
-    </el-dialog>
+		<!-- 鎵撳嵃棰勮寮圭獥 -->
+		<el-dialog
+			v-model="printPreviewVisible"
+			title="鎵撳嵃棰勮"
+			width="90%"
+			:close-on-click-modal="false"
+			class="print-preview-dialog"
+		>
+			<div class="print-preview-container">
+				<div class="print-preview-header">
+					<el-button type="primary" @click="executePrint">鎵ц鎵撳嵃</el-button>
+					<el-button @click="printPreviewVisible = false">鍏抽棴棰勮</el-button>
+				</div>
+				<div class="print-preview-content">
+					<div v-if="printData.length === 0" style="text-align: center; padding: 50px; color: #999;">
+						鏆傛棤鎵撳嵃鏁版嵁
+					</div>
+					<div v-else style="text-align: center; padding: 10px; color: #666; font-size: 14px; background: #e8f4fd; margin-bottom: 10px;">
+						鍏� {{ printData.length }} 鏉℃暟鎹緟鎵撳嵃
+					</div>
+					<div v-for="(item, index) in printData" :key="index" class="print-page">
+						<div class="delivery-note">
+							<div class="header">
+								<div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
+								<div class="document-title">闆跺敭鍙戣揣鍗�</div>
+							</div>
+
+							<div class="info-section">
+								<div class="info-row">
+									<div>
+										<span class="label">鍙戣揣鏃ユ湡锛�</span>
+										<span class="value">{{ formatDate(item.createTime) }}</span>
+									</div>
+									<div>
+
+										<span class="label">瀹㈡埛鍚嶇О锛�</span>
+										<span class="value">{{ item.customerName || '寮犵埍鏈�' }}</span>
+									</div>
+								</div>
+								<div class="info-row">
+									<span class="label">鍗曞彿锛�</span>
+									<span class="value">{{ item.salesContractNo }}</span>
+								</div>
+							</div>
+
+							<div class="table-section">
+								<table class="product-table">
+									<thead>
+									<tr>
+										<th>浜у搧鍚嶇О</th>
+										<th>瑙勬牸鍨嬪彿</th>
+										<th>鍗曚綅</th>
+										<th>鍗曚环</th>
+										<th>闆跺敭鏁伴噺</th>
+										<th>闆跺敭閲戦</th>
+									</tr>
+									</thead>
+									<tbody>
+									<tr v-for="product in item.products" :key="product.id">
+										<td>{{ product.productCategory || '' }}</td>
+										<td>{{ product.specificationModel || '' }}</td>
+										<td>{{ product.unit || '' }}</td>
+										<td>{{ product.taxInclusiveUnitPrice || '0' }}</td>
+										<td>{{ product.quantity || '0' }}</td>
+										<td>{{ product.taxInclusiveTotalPrice || '0' }}</td>
+									</tr>
+									<tr v-if="!item.products || item.products.length === 0">
+										<td colspan="6" style="text-align: center; color: #999;">鏆傛棤浜у搧鏁版嵁</td>
+									</tr>
+									</tbody>
+									<tfoot>
+									<tr>
+										<td class="label">鍚堣</td>
+										<td class="total-value"></td>
+										<td class="total-value"></td>
+										<td class="total-value"></td>
+										<td class="total-value">{{ getTotalQuantity(item.products) }}</td>
+										<td class="total-value">{{ getTotalAmount(item.products) }}</td>
+									</tr>
+									</tfoot>
+								</table>
+							</div>
+
+							<div class="footer-section">
+								<div class="footer-row">
+									<div class="footer-item">
+										<span class="label">鏀惰揣鐢佃瘽锛�</span>
+										<span class="value"></span>
+									</div>
+									<div class="footer-item">
+										<span class="label">鏀惰揣浜猴細</span>
+										<span class="value"></span>
+									</div>
+									<div class="footer-item address-item">
+										<span class="label">鏀惰揣鍦板潃锛�</span>
+										<span class="value address-value"></span>
+									</div>
+								</div>
+								<div class="footer-row">
+									<div class="footer-item">
+										<span class="label">鎿嶄綔鍛橈細</span>
+										<span class="value">{{ userStore.nickName || '鎾曞紑鍓�' }}</span>
+									</div>
+									<div class="footer-item">
+										<span class="label">鎵撳嵃鏃ユ湡锛�</span>
+										<span class="value">{{ formatDateTime(new Date()) }}</span>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</el-dialog>
+		<!-- 鍙戣揣寮规 -->
+		<el-dialog
+			v-model="deliveryFormVisible"
+			title="鍙戣揣淇℃伅"
+			width="40%"
+			@close="closeDeliveryDia"
+		>
+			<el-form :model="deliveryForm" label-width="120px" label-position="top" :rules="deliveryRules" ref="deliveryFormRef">
+				<el-row :gutter="30">
+					<el-col :span="24">
+						<el-form-item label="鍙戣揣鏃ユ湡锛�" prop="shippingDate">
+							<el-date-picker
+								style="width: 100%"
+								v-model="deliveryForm.shippingDate"
+								value-format="YYYY-MM-DD"
+								format="YYYY-MM-DD"
+								type="date"
+								placeholder="璇烽�夋嫨鍙戣揣鏃ユ湡"
+								clearable
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="30">
+					<el-col :span="24">
+						<el-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber">
+							<el-input
+								v-model="deliveryForm.shippingCarNumber"
+								placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
+								clearable
+							/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button type="primary" @click="submitDelivery">纭鍙戣揣</el-button>
+					<el-button @click="closeDeliveryDia">鍙栨秷</el-button>
+				</div>
+			</template>
+		</el-dialog>
     <FileList ref="fileListRef" />
   </div>
 </template>
 
 <script setup>
-  import { getToken } from "@/utils/auth";
-  import pagination from "@/components/PIMTable/Pagination.vue";
-  import { onMounted, ref } from "vue";
-  import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
-  import { ElMessage, ElMessageBox } from "element-plus";
-  import useUserStore from "@/store/modules/user";
-  import { userListNoPage } from "@/api/system/user.js";
-  import FileList from "./fileList.vue";
-  import {
-    ledgerListPage,
-    productList,
-    customerList,
-    addOrUpdateSalesLedger,
-    getSalesLedgerWithProducts,
-    delLedger,
-    addOrUpdateSalesLedgerProduct,
-    delProduct,
-    delLedgerFile,
-    getProductInventory,
-    judgmentInventory,
-  } from "@/api/salesManagement/salesLedger.js";
-  import { modelList, productTreeList } from "@/api/basicData/product.js";
-  import useFormData from "@/hooks/useFormData.js";
-  import dayjs from "dayjs";
+import { getToken } from "@/utils/auth";
+import pagination from "@/components/PIMTable/Pagination.vue";
+import {onMounted, ref} from "vue";
+import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
+import {ElMessage, ElMessageBox} from "element-plus";
+import useUserStore from "@/store/modules/user";
+import { userListNoPage } from "@/api/system/user.js";
+import FileList from "./fileList.vue";
+import {
+  ledgerListPage,
+  productList,
+  customerList,
+  addOrUpdateSalesLedger,
+  getSalesLedgerWithProducts,
+  delLedger,
+  addOrUpdateSalesLedgerProduct,
+  delProduct,
+  delLedgerFile, getProductInventory,
+} from "@/api/salesManagement/salesLedger.js";
+import { modelList, productTreeList } from "@/api/basicData/product.js";
+import useFormData from "@/hooks/useFormData.js";
+import dayjs from "dayjs";
+import {
+  getStockInPage
+} from "@/api/inventoryManagement/stockIn.js";
 
-  const userStore = useUserStore();
-  const { proxy } = getCurrentInstance();
-  const tableData = ref([]);
-  const productData = ref([]);
-  const selectedRows = ref([]);
-  const productSelectedRows = ref([]);
-  const userList = ref([]);
-  const customerOption = ref([]);
-  const productOptions = ref([]);
-  const modelOptions = ref([]);
-  const tableLoading = ref(false);
-  const page = reactive({
-    current: 1,
-    size: 100,
-  });
-  const total = ref(0);
-  const fileList = ref([]);
 
-  // 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
-  const operationType = ref("");
-  const dialogFormVisible = ref(false);
-  const data = reactive({
-    searchForm: {
-      customerName: "", // 瀹㈡埛鍚嶇О
-      customerContractNo: "", // 瀹㈡埛鍚堝悓缂栧彿
-      salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
-      projectName: "", // 椤圭洰鍚嶇О
-      entryDate: null, // 褰曞叆鏃ユ湡
-      entryDateStart: undefined,
-      entryDateEnd: undefined,
-    },
-    form: {
-      salesContractNo: "",
-      salesman: "",
-      customerContractNo: "",
-      customerId: "",
-      projectName: "",
-      entryPerson: "",
-      entryDate: "",
-      maintenanceTime: "",
-      productData: [],
-      executionDate: "",
-      paymentMethod: "",
-    },
-    rules: {
-      salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-      customerContractNo: [
-        { required: true, message: "璇疯緭鍏�", trigger: "blur" },
-      ],
-      customerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-      projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-      entryPerson: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-      entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-      executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    },
-  });
-  const { form, rules } = toRefs(data);
-  const { form: searchForm } = useFormData(data.searchForm);
-  // 浜у搧琛ㄥ崟寮规鏁版嵁
-  const productFormVisible = ref(false);
-  const productOperationType = ref("");
-  const currentId = ref("");
-  const productFormData = reactive({
-    productForm: {
-      productCategory: "",
-      specificationModel: "",
-      unit: "",
-      quantity: "",
-      taxInclusiveUnitPrice: "",
-      taxRate: "",
-      taxInclusiveTotalPrice: "",
-      taxExclusiveTotalPrice: "",
-      invoiceType: "",
-    },
-    productRules: {
-      productCategory: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-      productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-      specificationModel: [
-        { required: true, message: "璇烽�夋嫨", trigger: "change" },
-      ],
-      unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-      quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-      taxInclusiveUnitPrice: [
-        { required: true, message: "璇疯緭鍏�", trigger: "blur" },
-      ],
-      taxRate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-      taxInclusiveTotalPrice: [
-        { required: true, message: "璇疯緭鍏�", trigger: "blur" },
-      ],
-      taxExclusiveTotalPrice: [
-        { required: true, message: "璇疯緭鍏�", trigger: "blur" },
-      ],
-      invoiceType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    },
-  });
-  const { productForm, productRules } = toRefs(productFormData);
-  // 闃叉寰幆璁$畻鐨勬爣蹇�
-  const isCalculating = ref(false);
-  const upload = reactive({
-    // 涓婁紶鐨勫湴鍧�
-    url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
-    // 璁剧疆涓婁紶鐨勮姹傚ご閮�
-    headers: { Authorization: "Bearer " + getToken() },
-  });
-  // 鎵撳嵃鐩稿叧
-  const printPreviewVisible = ref(false);
-  const printData = ref([]);
+const userStore = useUserStore();
+const { proxy } = getCurrentInstance();
+const tableData = ref([]);
+const productData = ref([]);
+const selectedRows = ref([]);
+const productSelectedRows = ref([]);
+const userList = ref([]);
+const customerOption = ref([]);
+const productOptions = ref([]);
+const modelOptions = ref([]);
+const tableLoading = ref(false);
+const page = reactive({
+  current: 1,
+  size: 100,
+});
+const total = ref(0);
+const fileList = ref([]);
+const approverNodes = ref([{ id: 1, userId: null }]);
+let nextApproverId = 2;
 
-  // 鍙戣揣鐩稿叧
-  const deliveryFormVisible = ref(false);
-  const currentDeliveryRow = ref(null);
-  const deliveryFormData = reactive({
-    deliveryForm: {
-      shippingDate: "",
-      shippingCarNumber: "",
-    },
-    deliveryRules: {
-      shippingDate: [
-        { required: true, message: "璇烽�夋嫨鍙戣揣鏃ユ湡", trigger: "change" },
-      ],
-      shippingCarNumber: [
-        { required: true, message: "璇疯緭鍏ュ彂璐ц溅鐗屽彿", trigger: "blur" },
-      ],
-      approverId: [
-        {
-          required: true,
-          message: "",
-        },
-      ],
-    },
-  });
-  const { deliveryForm, deliveryRules } = toRefs(deliveryFormData);
+// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
+const operationType = ref("");
+const dialogFormVisible = ref(false);
+const data = reactive({
+  searchForm: {
+    customerName: "", // 瀹㈡埛鍚嶇О
+    customerContractNo: "", // 瀹㈡埛鍚堝悓缂栧彿
+    salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
+    projectName: "", // 椤圭洰鍚嶇О
+    entryDate: null, // 褰曞叆鏃ユ湡
+    entryDateStart: undefined,
+    entryDateEnd: undefined,
+  },
+  form: {
+    salesContractNo: "",
+    salesman: "",
+    customerContractNo: "",
+    customerId: "",
+    projectName: "",
+    entryPerson: "",
+    entryDate: "",
+    maintenanceTime: "",
+    productData: [],
+    executionDate: "",
+    paymentMethod: "",
+    salesType: "鏅��",
+  },
+  rules: {
+    salesType: [{ required: true, message: "璇烽�夋嫨閿�鍞被鍨�", trigger: "change" }],
+    salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    customerContractNo: [
+      { required: true, message: "璇疯緭鍏�", trigger: "blur" },
+    ],
+    customerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+    entryPerson: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+  },
+});
+const { form, rules } = toRefs(data);
+const { form: searchForm } = useFormData(data.searchForm);
+const addApproverNode = () => {
+  approverNodes.value.push({ id: nextApproverId++, userId: null });
+};
+const removeApproverNode = (index) => {
+  approverNodes.value.splice(index, 1);
+};
+// 浜у搧琛ㄥ崟寮规鏁版嵁
+const productFormVisible = ref(false);
+const productOperationType = ref("");
+const currentId = ref("");
+const productFormData = reactive({
+  productForm: {
+    productCategory: "",
+    specificationModel: "",
+    unit: "",
+    quantity: "",
+    taxInclusiveUnitPrice: "",
+    taxRate: "",
+    taxInclusiveTotalPrice: "",
+    taxExclusiveTotalPrice: "",
+    invoiceType: "",
+  },
+  productRules: {
+    productCategory: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+		productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    specificationModel: [
+      { required: true, message: "璇烽�夋嫨", trigger: "change" },
+    ],
+    unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+    quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+    taxInclusiveUnitPrice: [
+      { required: true, message: "璇疯緭鍏�", trigger: "blur" },
+    ],
+    taxRate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    taxInclusiveTotalPrice: [
+      { required: true, message: "璇疯緭鍏�", trigger: "blur" },
+    ],
+    taxExclusiveTotalPrice: [
+      { required: true, message: "璇疯緭鍏�", trigger: "blur" },
+    ],
+    invoiceType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+  },
+});
+const { productForm, productRules } = toRefs(productFormData);
+// 闃叉寰幆璁$畻鐨勬爣蹇�
+const isCalculating = ref(false);
+const upload = reactive({
+  // 涓婁紶鐨勫湴鍧�
+  url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
+  // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+  headers: { Authorization: "Bearer " + getToken() },
+});
+// 鎵撳嵃鐩稿叧
+const printPreviewVisible = ref(false);
+const printData = ref([]);
 
-  const changeDaterange = value => {
-    if (value) {
-      searchForm.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD");
-      searchForm.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD");
-    } else {
-      searchForm.entryDateStart = undefined;
-      searchForm.entryDateEnd = undefined;
-    }
-    handleQuery();
-  };
+// 鍙戣揣鐩稿叧
+const deliveryFormVisible = ref(false);
+const currentDeliveryContext = ref(null);
+const deliveryFormData = reactive({
+  deliveryForm: {
+    shippingDate: "",
+    shippingCarNumber: "",
+  },
+  deliveryRules: {
+    shippingDate: [
+      { required: true, message: "璇烽�夋嫨鍙戣揣鏃ユ湡", trigger: "change" }
+    ],
+    shippingCarNumber: [
+      { required: true, message: "璇疯緭鍏ュ彂璐ц溅鐗屽彿", trigger: "blur" }
+    ],
+  },
+});
+const { deliveryForm, deliveryRules } = toRefs(deliveryFormData);
 
-  // 鏌ヨ鍒楄〃
-  /** 鎼滅储鎸夐挳鎿嶄綔 */
-  const handleQuery = () => {
-    page.current = 1;
-    expandedRowKeys.value = [];
-    getList();
-  };
-  const paginationChange = obj => {
-    page.current = obj.page;
-    page.size = obj.limit;
-    getList();
-  };
-  const getList = async () => {
-    let userLists = await userListNoPage();
-    userList.value = userLists.data;
-    tableLoading.value = true;
-    const { entryDate, ...rest } = searchForm;
-    ledgerListPage({ ...rest, ...page })
-      .then(res => {
-        tableLoading.value = false;
-        tableData.value = res.records;
-        tableData.value.map(item => {
-          item.children = [];
-        });
-        total.value = res.total;
-      })
-      .catch(() => {
-        tableLoading.value = false;
-      });
-  };
-  // 鑾峰彇浜у搧澶х被tree鏁版嵁
-  const getProductOptions = () => {
-    productTreeList().then(res => {
-      productOptions.value = convertIdToValue(res);
-    });
-  };
-  const formattedNumber = (row, column, cellValue) => {
-    return parseFloat(cellValue).toFixed(2);
-  };
-  // 鑾峰彇tree瀛愭暟鎹�
-  const getModels = value => {
-    productForm.value.productCategory = findNodeById(productOptions.value, value);
-    modelList({ id: value }).then(res => {
-      modelOptions.value = res;
-    });
-  };
-  const getProductModel = value => {
-    console.log("value", value);
-    const index = modelOptions.value.findIndex(item => item.id === value);
-    if (index !== -1) {
-      productForm.value.specificationModel = modelOptions.value[index].model;
-      productForm.value.unit = modelOptions.value[index].unit;
-    } else {
-      productForm.value.specificationModel = null;
-      productForm.value.unit = null;
-    }
-  };
-  const findNodeById = (nodes, productId) => {
-    for (let i = 0; i < nodes.length; i++) {
-      if (nodes[i].value === productId) {
-        return nodes[i].label; // 鎵惧埌鑺傜偣锛岃繑鍥炶鑺傜偣
-      }
-      if (nodes[i].children && nodes[i].children.length > 0) {
-        const foundNode = findNodeById(nodes[i].children, productId);
-        if (foundNode) {
-          return foundNode; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝杩斿洖璇ヨ妭鐐�
-        }
-      }
-    }
-    return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
-  };
-  function convertIdToValue(data) {
-    return data.map(item => {
-      const { id, children, ...rest } = item;
-      const newItem = {
-        ...rest,
-        value: id, // 灏� id 鏀逛负 value
-      };
-      if (children && children.length > 0) {
-        newItem.children = convertIdToValue(children);
-      }
-
-      return newItem;
-    });
+const changeDaterange = (value) => {
+  if (value) {
+    searchForm.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD");
+    searchForm.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD");
+  } else {
+    searchForm.entryDateStart = undefined;
+    searchForm.entryDateEnd = undefined;
   }
-  // 琛ㄦ牸閫夋嫨鏁版嵁
-  const handleSelectionChange = selection => {
-    // 杩囨护鎺夊瓙鏁版嵁
-    selectedRows.value = selection.filter(item => item.children !== undefined);
-    console.log("selection", selectedRows.value);
-  };
-  const productSelected = selectedRows => {
-    productSelectedRows.value = selectedRows;
-  };
-  const expandedRowKeys = ref([]);
-  // 灞曞紑琛岋紙濮嬬粓鍙睍寮�涓�琛岋級
-  const expandChange = row => {
-    const rowKey = row.id;
-    const isExpanded = expandedRowKeys.value.includes(rowKey);
+  handleQuery();
+};
 
-    if (isExpanded) {
-      // 褰撳墠琛屽凡灞曞紑 -> 鏀惰捣
-      expandedRowKeys.value = [];
-      return;
+// 鏌ヨ鍒楄〃
+/** 鎼滅储鎸夐挳鎿嶄綔 */
+const handleQuery = () => {
+  page.current = 1;
+	expandedRowKeys.value = [];
+  getList();
+};
+const paginationChange = (obj) => {
+  page.current = obj.page;
+  page.size = obj.limit;
+  getList();
+};
+const getList = () => {
+  tableLoading.value = true;
+  const { entryDate, ...rest } = searchForm;
+  ledgerListPage({ ...rest, ...page })
+    .then((res) => {
+      tableLoading.value = false;
+      tableData.value = res.records;
+      tableData.value.map((item) => {
+        item.children = [];
+      });
+      total.value = res.total;
+    })
+    .catch(() => {
+      tableLoading.value = false;
+    });
+};
+// 鑾峰彇浜у搧澶х被tree鏁版嵁
+const getProductOptions = () => {
+  productTreeList().then((res) => {
+    productOptions.value = convertIdToValue(res);
+  });
+};
+const formattedNumber = (row, column, cellValue) => {
+  return parseFloat(cellValue).toFixed(2);
+};
+// 鑾峰彇tree瀛愭暟鎹�
+const getModels = (value) => {
+  productForm.value.productCategory = findNodeById(productOptions.value, value);
+  modelList({ id: value }).then((res) => {
+    modelOptions.value = res;
+  });
+};
+const getProductModel = (value) => {
+  console.log("value", value);
+  const index = modelOptions.value.findIndex((item) => item.id === value);
+  if (index !== -1) {
+    productForm.value.specificationModel = modelOptions.value[index].model;
+    productForm.value.unit = modelOptions.value[index].unit;
+  } else {
+    productForm.value.specificationModel = null;
+    productForm.value.unit = null;
+  }
+};
+const findNodeById = (nodes, productId) => {
+  for (let i = 0; i < nodes.length; i++) {
+    if (nodes[i].value === productId) {
+      return nodes[i].label; // 鎵惧埌鑺傜偣锛岃繑鍥炶鑺傜偣
+    }
+    if (nodes[i].children && nodes[i].children.length > 0) {
+      const foundNode = findNodeById(nodes[i].children, productId);
+      if (foundNode) {
+        return foundNode; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝杩斿洖璇ヨ妭鐐�
+      }
+    }
+  }
+  return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
+};
+function convertIdToValue(data) {
+  return data.map((item) => {
+    const { id, children, ...rest } = item;
+    const newItem = {
+      ...rest,
+      value: id, // 灏� id 鏀逛负 value
+    };
+    if (children && children.length > 0) {
+      newItem.children = convertIdToValue(children);
     }
 
-    // 灞曞紑褰撳墠琛屽墠锛屽厛鏀惰捣鍏跺畠琛�
+    return newItem;
+  });
+}
+// 琛ㄦ牸閫夋嫨鏁版嵁
+const handleSelectionChange = (selection) => {
+  // 杩囨护鎺夊瓙鏁版嵁
+  selectedRows.value = selection.filter((item) => item.children !== undefined);
+  console.log("selection", selectedRows.value);
+};
+const productSelected = (selectedRows) => {
+  productSelectedRows.value = selectedRows;
+};
+const expandedRowKeys = ref([]);
+// 灞曞紑琛�
+const expandChange = (row, expandedRows) => {
+  if (expandedRows.length > 0) {
     expandedRowKeys.value = [];
-
     try {
-      productList({ salesLedgerId: row.id, type: 1 }).then(res => {
-        const index = tableData.value.findIndex(item => item.id === row.id);
+      productList({ salesLedgerId: row.id, type: 1 }).then((res) => {
+        const index = tableData.value.findIndex((item) => item.id === row.id);
         if (index > -1) {
           tableData.value[index].children = res.data;
         }
-        // 鍙繚鐣欏綋鍓嶈繖涓�琛屽浜庡睍寮�鐘舵��
-        expandedRowKeys.value = [rowKey];
+        expandedRowKeys.value.push(row.id);
       });
     } catch (error) {
       console.log(error);
     }
-  };
-  // 涓昏〃鍚堣鏂规硶
-  const summarizeMainTable = param => {
-    return proxy.summarizeTable(param, [
-      "contractAmount",
-      "taxInclusiveTotalPrice",
-      "taxExclusiveTotalPrice",
-    ]);
-  };
-  // 瀛愯〃鍚堣鏂规硶
-  const summarizeChildrenTable = param => {
-    return proxy.summarizeTable(param, [
-      "taxInclusiveUnitPrice",
-      "taxInclusiveTotalPrice",
-      "taxExclusiveTotalPrice",
-    ]);
-  };
-  // 鎵撳紑寮规
-  const openForm = async (type, row) => {
-    operationType.value = type;
-    form.value = {};
-    productData.value = [];
-    customerList().then(res => {
-      customerOption.value = res;
+  } else {
+    expandedRowKeys.value = [];
+  }
+};
+// 涓昏〃鍚堣鏂规硶
+const summarizeMainTable = (param) => {
+  return proxy.summarizeTable(param, [
+    "contractAmount",
+    "taxInclusiveTotalPrice",
+    "taxExclusiveTotalPrice",
+  ]);
+};
+// 瀛愯〃鍚堣鏂规硶
+const summarizeChildrenTable = (param) => {
+  return proxy.summarizeTable(param, [
+    "taxInclusiveUnitPrice",
+    "taxInclusiveTotalPrice",
+    "taxExclusiveTotalPrice",
+  ]);
+};
+// 鎵撳紑寮规
+const openForm = async (type, row) => {
+  operationType.value = type;
+  form.value = {};
+  productData.value = [];
+  approverNodes.value = [{ id: 1, userId: null }];
+  nextApproverId = 2;
+  let userLists = await userListNoPage();
+  userList.value = userLists.data;
+  customerList().then((res) => {
+    customerOption.value = res;
+  });
+  form.value.entryPerson = userStore.id;
+  if (type !== "add") {
+    currentId.value = row.id;
+    getSalesLedgerWithProducts({ id: row.id, type: 1 }).then((res) => {
+      form.value = { ...res };
+      form.value.entryPerson = Number(res.entryPerson);
+      if (!form.value.salesType) {
+        form.value.salesType = "鏅��";
+      }
+      productData.value = form.value.productData;
+      fileList.value = form.value.salesLedgerFiles;
+      const approveUserIds = form.value.approveUserIds || form.value.approverIds;
+      if (approveUserIds) {
+        const ids = String(approveUserIds)
+          .split(",")
+          .map((id) => Number(id.trim()))
+          .filter((id) => !Number.isNaN(id));
+        if (ids.length > 0) {
+          approverNodes.value = ids.map((id, idx) => ({ id: idx + 1, userId: id }));
+          nextApproverId = ids.length + 1;
+        }
+      }
     });
-    form.value.entryPerson = userStore.id;
-    if (type !== "add") {
-      currentId.value = row.id;
-      getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => {
-        form.value = { ...res };
-        form.value.entryPerson = Number(res.entryPerson);
-        productData.value = form.value.productData;
-        fileList.value = form.value.salesLedgerFiles;
-      });
-    }
-    // let userAll = await userStore.getInfo()
-    // userList.value.forEach(element => {
-    //   if(userAll.user.nickName === element.nickName && userAll.user.userName === element.userName) {
-    //     form.value.entryPerson = userAll.user.userId // 璁剧疆榛樿涓氬姟鍛樹负褰撳墠鐢ㄦ埛
-    //   }
-    // });
-    form.value.entryDate = getCurrentDate(); // 璁剧疆榛樿褰曞叆鏃ユ湡涓哄綋鍓嶆棩鏈�
-    dialogFormVisible.value = true;
-  };
-  function changs(val) {
-    console.log(val);
   }
-  // 涓婁紶鍓嶆牎妫�
-  function handleBeforeUpload(file) {
-    // 鏍℃鏂囦欢澶у皬
-    // if (file.size > 1024 * 1024 * 10) {
-    //   proxy.$modal.msgError("涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!");
-    //   return false;
-    // }
-    proxy.$modal.loading("姝e湪涓婁紶鏂囦欢锛岃绋嶅��...");
-    return true;
+  // let userAll = await userStore.getInfo()
+  // userList.value.forEach(element => {
+  //   if(userAll.user.nickName === element.nickName && userAll.user.userName === element.userName) {
+  //     form.value.entryPerson = userAll.user.userId // 璁剧疆榛樿涓氬姟鍛樹负褰撳墠鐢ㄦ埛
+  //   }
+  // });
+  form.value.entryDate = getCurrentDate(); // 璁剧疆榛樿褰曞叆鏃ユ湡涓哄綋鍓嶆棩鏈�
+  if (type === "add") {
+    form.value.salesType = "鏅��";
   }
-  // 涓婁紶澶辫触
-  function handleUploadError(err) {
-    proxy.$modal.msgError("涓婁紶鏂囦欢澶辫触");
-    proxy.$modal.closeLoading();
+  dialogFormVisible.value = true;
+};
+function changs(val) {
+  console.log(val);
+}
+// 涓婁紶鍓嶆牎妫�
+function handleBeforeUpload(file) {
+  // 鏍℃鏂囦欢澶у皬
+  // if (file.size > 1024 * 1024 * 10) {
+  //   proxy.$modal.msgError("涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!");
+  //   return false;
+  // }
+  proxy.$modal.loading("姝e湪涓婁紶鏂囦欢锛岃绋嶅��...");
+  return true;
+}
+// 涓婁紶澶辫触
+function handleUploadError(err) {
+  proxy.$modal.msgError("涓婁紶鏂囦欢澶辫触");
+  proxy.$modal.closeLoading();
+}
+// 涓婁紶鎴愬姛鍥炶皟
+function handleUploadSuccess(res, file, uploadFiles) {
+  proxy.$modal.closeLoading();
+  if (res.code === 200) {
+    file.tempId = res.data.tempId;
+    proxy.$modal.msgSuccess("涓婁紶鎴愬姛");
+  } else {
+    proxy.$modal.msgError(res.msg);
+    proxy.$refs.fileUpload.handleRemove(file);
   }
-  // 涓婁紶鎴愬姛鍥炶皟
-  function handleUploadSuccess(res, file, uploadFiles) {
-    proxy.$modal.closeLoading();
-    if (res.code === 200) {
-      file.tempId = res.data.tempId;
-      proxy.$modal.msgSuccess("涓婁紶鎴愬姛");
-    } else {
-      proxy.$modal.msgError(res.msg);
-      proxy.$refs.fileUpload.handleRemove(file);
-    }
+}
+// 绉婚櫎鏂囦欢
+function handleRemove(file) {
+  if (operationType.value === "edit") {
+    let ids = [];
+    ids.push(file.id);
+    delLedgerFile(ids).then((res) => {
+      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+    });
   }
-  // 绉婚櫎鏂囦欢
-  function handleRemove(file) {
-    if (operationType.value === "edit") {
-      let ids = [];
-      ids.push(file.id);
-      delLedgerFile(ids).then(res => {
-        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      });
-    }
-  }
-  // 鎻愪氦琛ㄥ崟
-  const submitForm = () => {
-    proxy.$refs["formRef"].validate(valid => {
-      if (valid) {
-        console.log("productData.value--", productData.value);
-        if (productData.value !== null && productData.value.length > 0) {
-          form.value.productData = proxy.HaveJson(productData.value);
-        } else {
-          proxy.$modal.msgWarning("璇锋坊鍔犱骇鍝佷俊鎭�");
+}
+// 鎻愪氦琛ㄥ崟
+const submitForm = () => {
+  proxy.$refs["formRef"].validate((valid) => {
+    if (valid) {
+      if (operationType.value !== "view") {
+        const hasEmptyApprover = approverNodes.value.some((node) => !node.userId);
+        if (hasEmptyApprover) {
+          proxy.$modal.msgWarning("璇蜂负鎵�鏈夊鎵硅妭鐐归�夋嫨瀹℃壒浜�");
           return;
         }
-        let tempFileIds = [];
-        if (fileList.value !== null && fileList.value.length > 0) {
-          tempFileIds = fileList.value.map(item => item.tempId);
-        }
-        form.value.tempFileIds = tempFileIds;
-        form.value.type = 1;
-        addOrUpdateSalesLedger(form.value).then(res => {
-          proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
-          closeDia();
-          getList();
-        });
+        form.value.approveUserIds = approverNodes.value.map((node) => node.userId).join(",");
       }
-    });
-  };
-  // 鍏抽棴寮规
-  const closeDia = () => {
-    proxy.resetForm("formRef");
-    dialogFormVisible.value = false;
-  };
+			console.log('productData.value--', productData.value)
+      if (productData.value !== null && productData.value.length > 0) {
+        form.value.productData = proxy.HaveJson(productData.value);
+      } else {
+        proxy.$modal.msgWarning("璇锋坊鍔犱骇鍝佷俊鎭�");
+        return;
+      }
+      let tempFileIds = [];
+      if (fileList.value !== null && fileList.value.length > 0) {
+        tempFileIds = fileList.value.map((item) => item.tempId);
+      }
+      form.value.tempFileIds = tempFileIds;
+      form.value.type = 1;
+      addOrUpdateSalesLedger(form.value).then((res) => {
+        proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+        closeDia();
+        getList();
+      });
+    }
+  });
+};
+// 鍏抽棴寮规
+const closeDia = () => {
+  proxy.resetForm("formRef");
+  dialogFormVisible.value = false;
+};
 
-  const productIndex = ref(0);
-  // 鎵撳紑浜у搧寮规
-  const openProductForm = (type, row, index) => {
-    productOperationType.value = type;
-    productForm.value = {};
-    proxy.resetForm("productFormRef");
-    if (type === "edit") {
-      productForm.value = { ...row };
-      productIndex.value = index;
-    }
-    productFormVisible.value = true;
-    getProductOptions();
-  };
-  // 鎻愪氦浜у搧琛ㄥ崟
-  const submitProduct = () => {
-    proxy.$refs["productFormRef"].validate(valid => {
-      if (valid) {
-        if (operationType.value === "edit") {
-          submitProductEdit();
-        } else {
-          if (productOperationType.value === "add") {
-            productData.value.push({ ...productForm.value });
-          } else {
-            productData.value[productIndex.value] = { ...productForm.value };
-          }
-          closeProductDia();
+const productIndex = ref(0);
+// 鎵撳紑浜у搧寮规
+const openProductForm = (type, row,index) => {
+  productOperationType.value = type;
+  productForm.value = {};
+  proxy.resetForm("productFormRef");
+  if (type === "edit") {
+    productForm.value = { ...row };
+    productIndex.value = index;
+  }
+  productFormVisible.value = true;
+  getProductOptions();
+};
+// 鎻愪氦浜у搧琛ㄥ崟
+const submitProduct = () => {
+  proxy.$refs["productFormRef"].validate((valid) => {
+    if (valid) {
+      if (operationType.value === "edit") {
+        submitProductEdit();
+      } else {
+        if(productOperationType.value === "add"){
+          productData.value.push({ ...productForm.value });
+        }else{
+          productData.value[productIndex.value] = { ...productForm.value }
         }
+        closeProductDia();
+      }
+    }
+  });
+};
+const submitProductEdit = () => {
+  productForm.value.salesLedgerId = currentId.value;
+  productForm.value.type = 1
+  addOrUpdateSalesLedgerProduct(productForm.value).then((res) => {
+    proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+    closeProductDia();
+    getSalesLedgerWithProducts({ id: currentId.value, type: 1 }).then((res) => {
+      productData.value = res.productData;
+    });
+  });
+};
+// 鍒犻櫎浜у搧
+const deleteProduct = () => {
+  if (productSelectedRows.value.length === 0) {
+    proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+    return;
+  }
+  if (operationType.value === "add") {
+    productSelectedRows.value.forEach((selectedRow) => {
+      const index = productData.value.findIndex(
+        (product) => product.id === selectedRow.id
+      );
+      if (index !== -1) {
+        productData.value.splice(index, 1);
       }
     });
-  };
-  const submitProductEdit = () => {
-    productForm.value.salesLedgerId = currentId.value;
-    productForm.value.type = 1;
-    addOrUpdateSalesLedgerProduct(productForm.value).then(res => {
-      proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
-      closeProductDia();
-      getSalesLedgerWithProducts({ id: currentId.value, type: 1 }).then(res => {
-        productData.value = res.productData;
-      });
-    });
-  };
-  // 鍒犻櫎浜у搧
-  const deleteProduct = () => {
-    if (productSelectedRows.value.length === 0) {
-      proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
-      return;
-    }
-    if (operationType.value === "add") {
-      productSelectedRows.value.forEach(selectedRow => {
-        const index = productData.value.findIndex(
-          product => product.id === selectedRow.id
-        );
-        if (index !== -1) {
-          productData.value.splice(index, 1);
-        }
-      });
-    } else {
-      let ids = [];
-      if (productSelectedRows.value.length > 0) {
-        ids = productSelectedRows.value.map(item => item.id);
-      }
-      ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
-        confirmButtonText: "纭",
-        cancelButtonText: "鍙栨秷",
-        type: "warning",
-      })
-        .then(() => {
-          delProduct(ids).then(res => {
-            proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-            closeProductDia();
-            getSalesLedgerWithProducts({ id: currentId.value, type: 1 }).then(
-              res => {
-                productData.value = res.productData;
-              }
-            );
-          });
-        })
-        .catch(() => {
-          proxy.$modal.msg("宸插彇娑�");
-        });
-    }
-  };
-  // 鍏抽棴浜у搧寮规
-  const closeProductDia = () => {
-    proxy.resetForm("productFormRef");
-    productFormVisible.value = false;
-  };
-  // 瀵煎嚭
-  const handleOut = () => {
-    ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
-      confirmButtonText: "纭",
-      cancelButtonText: "鍙栨秷",
-      type: "warning",
-    })
-      .then(() => {
-        proxy.download("/sales/ledger/export", {}, "閿�鍞彴璐�.xlsx");
-      })
-      .catch(() => {
-        proxy.$modal.msg("宸插彇娑�");
-      });
-  };
-  // 鍒犻櫎
-  const handleDelete = () => {
+  } else {
     let ids = [];
-    if (selectedRows.value.length > 0) {
-      ids = selectedRows.value.map(item => item.id);
-    } else {
-      proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
-      return;
+    if (productSelectedRows.value.length > 0) {
+      ids = productSelectedRows.value.map((item) => item.id);
     }
     ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
       confirmButtonText: "纭",
@@ -1315,844 +1047,843 @@
       type: "warning",
     })
       .then(() => {
-        delLedger(ids).then(res => {
+        delProduct(ids).then((res) => {
           proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          getList();
+          closeProductDia();
+          getSalesLedgerWithProducts({ id: currentId.value, type: 1 }).then(
+            (res) => {
+              productData.value = res.productData;
+            }
+          );
         });
       })
       .catch(() => {
         proxy.$modal.msg("宸插彇娑�");
       });
-  };
-
-  // 鎵撳嵃鍔熻兘
-  const handlePrint = async () => {
-    if (selectedRows.value.length === 0) {
-      proxy.$modal.msgWarning("璇烽�夋嫨瑕佹墦鍗扮殑鏁版嵁");
-      return;
-    }
-
-    // 鏄剧ず鍔犺浇鐘舵��
-    proxy.$modal.loading("姝e湪鑾峰彇浜у搧鏁版嵁锛岃绋嶅��...");
-
-    try {
-      // 涓烘瘡涓�変腑鐨勯攢鍞彴璐﹁褰曟煡璇㈠搴旂殑浜у搧鏁版嵁
-      const printDataWithProducts = [];
-
-      for (const row of selectedRows.value) {
-        try {
-          // 璋冪敤productList鎺ュ彛鏌ヨ浜у搧鏁版嵁
-          const productRes = await productList({
-            salesLedgerId: row.id,
-            type: 1,
-          });
-
-          // 灏嗕骇鍝佹暟鎹暣鍚堝埌閿�鍞彴璐﹁褰曚腑
-          const rowWithProducts = {
-            ...row,
-            products: productRes.data || [],
-          };
-
-          printDataWithProducts.push(rowWithProducts);
-        } catch (error) {
-          console.error(`鑾峰彇閿�鍞彴璐� ${row.id} 鐨勪骇鍝佹暟鎹け璐�:`, error);
-          // 鍗充娇鏌愪釜璁板綍鐨勪骇鍝佹暟鎹幏鍙栧け璐ワ紝涔熻鍖呭惈璇ヨ褰�
-          printDataWithProducts.push({
-            ...row,
-            products: [],
-          });
-        }
-      }
-
-      printData.value = printDataWithProducts;
-      console.log("鎵撳嵃鏁版嵁锛堝寘鍚骇鍝侊級:", printData.value);
-      printPreviewVisible.value = true;
-    } catch (error) {
-      console.error("鑾峰彇浜у搧鏁版嵁澶辫触:", error);
-      proxy.$modal.msgError("鑾峰彇浜у搧鏁版嵁澶辫触锛岃閲嶈瘯");
-    } finally {
-      proxy.$modal.closeLoading();
-    }
-  };
-  // 鎵ц鎵撳嵃
-  const executePrint = () => {
-    console.log("寮�濮嬫墽琛屾墦鍗帮紝鏁版嵁鏉℃暟:", printData.value.length);
-    console.log("鎵撳嵃鏁版嵁:", printData.value);
-
-    // 鍒涘缓涓�涓柊鐨勬墦鍗扮獥鍙�
-    const printWindow = window.open("", "_blank", "width=800,height=600");
-
-    // 鏋勫缓鎵撳嵃鍐呭
-    let printContent = `
-                            <!DOCTYPE html>
-                            <html>
-                            <head>
-                              <meta charset="UTF-8">
-                              <title>鎵撳嵃棰勮</title>
-                              <style>
-                                body {
-                                  margin: 0;
-                                  padding: 0;
-                                  font-family: "SimSun", serif;
-                                  background: white;
-                                }
-                                                                             .print-page {
-                                    width: 200mm;
-                                    height: 75mm;
-                                    padding: 10mm;
-                                    padding-left: 20mm;
-                                    background: white;
-                                    box-sizing: border-box;
-                                    page-break-after: always;
-                                    page-break-inside: avoid;
-                                  }
-                                 .print-page:last-child {
-                                   page-break-after: avoid;
-                                 }
-                                .delivery-note {
-                                  width: 100%;
-                                  height: 100%;
-                                  font-size: 12px;
-                                  line-height: 1.2;
-                                  display: flex;
-                                  flex-direction: column;
-                                  color: #000;
-                                }
-                                .header {
-                                  text-align: center;
-                                  margin-bottom: 8px;
-                                }
-                                .company-name {
-                                  font-size: 18px;
-                                  font-weight: bold;
-                                  margin-bottom: 4px;
-                                }
-                                .document-title {
-                                  font-size: 16px;
-                                  font-weight: bold;
-                                }
-                                .info-section {
-                                  margin-bottom: 8px;
-                                  display: flex;
-                                  justify-content: space-between;
-                                  align-items: center;
-                                }
-                                .info-row {
-                                  line-height: 20px;
-                                }
-                                .label {
-                                  font-weight: bold;
-                                  width: 60px;
-                                  font-size: 12px;
-                                }
-                                .value {
-                                  margin-right: 20px;
-                                  min-width: 80px;
-                                  font-size: 12px;
-                                }
-                                         .table-section {
-                                         margin-bottom: 40px;
-                                  //  flex: 0.6;
-                                 }
-                                .product-table {
-                                  width: 100%;
-                                  border-collapse: collapse;
-                                  border: 1px solid #000;
-                                }
-                                         .product-table th, .product-table td {
-                                   border: 1px solid #000;
-                                   padding: 6px;
-                                   text-align: center;
-                                   font-size: 12px;
-                                   line-height: 1.4;
-                                 }
-                                .product-table th {
-                                  font-weight: bold;
-                                }
-                                .total-value {
-                                  font-weight: bold;
-                                }
-                                .footer-section {
-                                  margin-top: auto;
-                                }
-                                .footer-row {
-                                  display: flex;
-                                  margin-bottom: 3px;
-                                  line-height: 22px;
-                                  justify-content: space-between;
-                                }
-                                .footer-item {
-                                  display: flex;
-                                  margin-right: 20px;
-                                }
-                                .footer-item .label {
-                                  font-weight: bold;
-                                  width: 80px;
-                                  font-size: 12px;
-                                }
-                                .footer-item .value {
-                                  min-width: 80px;
-                                  font-size: 12px;
-                                }
-                                .address-item .address-value {
-                                  min-width: 200px;
-                                }
-                                @media print {
-                                  body {
-                                    margin: 0;
-                                    padding: 0;
-                                  }
-                                             .print-page {
-                                     margin: 0;
-                                     padding: 10mm;
-                                     /* padding-left: 20mm; */
-                                     page-break-inside: avoid;
-                                     page-break-after: always;
-                                   }
-                                   .print-page:last-child {
-                                     page-break-after: avoid;
-                                   }
-                                }
-                              </style>
-                            </head>
-                            <body>
-                          `;
-
-    // 涓烘瘡鏉℃暟鎹敓鎴愭墦鍗伴〉闈�
-    printData.value.forEach((item, index) => {
-      printContent += `
-                              <div class="print-page">
-                                <div class="delivery-note">
-                                  <div class="header">
-                                    <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
-                                    <div class="document-title">闆跺敭鍙戣揣鍗�</div>
-                                  </div>
-                                  
-                                  <div class="info-section">
-                                    <div class="info-row">
-                                      <div>
-                                        <span class="label">鍙戣揣鏃ユ湡锛�</span>
-                                        <span class="value">${formatDate(
-                                          item.createTime
-                                        )}</span>
-                                      </div>
-                                      <div>
-                                        <span class="label">瀹㈡埛鍚嶇О锛�</span>
-                                        <span class="value">${
-                                          item.customerName || "寮犵埍鏈�"
-                                        }</span>
-                                      </div>
-                                    </div>
-                                    <div class="info-row">
-                                      <span class="label">鍗曞彿锛�</span>
-                                      <span class="value">${
-                                        item.salesContractNo || ""
-                                      }</span>
-                                    </div>
-                                  </div>
-
-                                  <div class="table-section">
-                                    <table class="product-table">
-                                      <thead>
-                                        <tr>
-                                          <th>浜у搧鍚嶇О</th>
-                                          <th>瑙勬牸鍨嬪彿</th>
-                                          <th>鍗曚綅</th>
-                                          <th>鍗曚环</th>
-                                          <th>闆跺敭鏁伴噺</th>
-                                          <th>闆跺敭閲戦</th>
-                                        </tr>
-                                      </thead>
-                                      <tbody>
-                                        ${
-                                          item.products &&
-                                          item.products.length > 0
-                                            ? item.products
-                                                .map(
-                                                  product => `
-                                            <tr>
-                                              <td>${
-                                                product.productCategory || ""
-                                              }</td>
-                                              <td>${
-                                                product.specificationModel || ""
-                                              }</td>
-                                              <td>${product.unit || ""}</td>
-                                              <td>${
-                                                product.taxInclusiveUnitPrice ||
-                                                "0"
-                                              }</td>
-                                              <td>${product.quantity || "0"}</td>
-                                              <td>${
-                                                product.taxInclusiveTotalPrice ||
-                                                "0"
-                                              }</td>
-                                            </tr>
-                                          `
-                                                )
-                                                .join("")
-                                            : '<tr><td colspan="6" style="text-align: center; color: #999;">鏆傛棤浜у搧鏁版嵁</td></tr>'
-                                        }
-                                      </tbody>
-                                      <tfoot>
-                                        <tr>
-                                          <td class="label">鍚堣</td>
-                                          <td class="total-value"></td>
-                                          <td class="total-value"></td>
-                                          <td class="total-value"></td>
-                                          <td class="total-value">${getTotalQuantityForPrint(
-                                            item.products
-                                          )}</td>
-                                          <td class="total-value">${getTotalAmountForPrint(
-                                            item.products
-                                          )}</td>
-                                        </tr>
-                                      </tfoot>
-                                    </table>
-                                  </div>
-
-                                  <div class="footer-section">
-                                    <div class="footer-row">
-                                      <div class="footer-item">
-                                        <span class="label">鏀惰揣鐢佃瘽锛�</span>
-                                        <span class="value"></span>
-                                      </div>
-                                      <div class="footer-item">
-                                        <span class="label">鏀惰揣浜猴細</span>
-                                        <span class="value"></span>
-                                      </div>
-                                      <div class="footer-item address-item">
-                                        <span class="label">鏀惰揣鍦板潃锛�</span>
-                                        <span class="value address-value"></span>
-                                      </div>
-                                    </div>
-                                    <div class="footer-row">
-                                      <div class="footer-item">
-                                        <span class="label">鎿嶄綔鍛橈細</span>
-                                        <span class="value">${
-                                          userStore.nickName || "鎾曞紑鍓�"
-                                        }</span>
-                                      </div>
-                                      <div class="footer-item">
-                                        <span class="label">鎵撳嵃鏃ユ湡锛�</span>
-                                        <span class="value">${formatDateTime(
-                                          new Date()
-                                        )}</span>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            `;
+  }
+};
+// 鍏抽棴浜у搧寮规
+const closeProductDia = () => {
+  proxy.resetForm("productFormRef");
+  productFormVisible.value = false;
+};
+// 瀵煎嚭
+const handleOut = () => {
+  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+    confirmButtonText: "纭",
+    cancelButtonText: "鍙栨秷",
+    type: "warning",
+  })
+    .then(() => {
+      proxy.download("/sales/ledger/export", {}, "閿�鍞彴璐�.xlsx");
+    })
+    .catch(() => {
+      proxy.$modal.msg("宸插彇娑�");
     });
+};
+// 鍒犻櫎
+const handleDelete = () => {
+  let ids = [];
+  if (selectedRows.value.length > 0) {
+    ids = selectedRows.value.map((item) => item.id);
+  } else {
+    proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+    return;
+  }
+  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
+    confirmButtonText: "纭",
+    cancelButtonText: "鍙栨秷",
+    type: "warning",
+  })
+    .then(() => {
+      delLedger(ids).then((res) => {
+        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        getList();
+      });
+    })
+    .catch(() => {
+      proxy.$modal.msg("宸插彇娑�");
+    });
+};
 
-    printContent += `
-                            </body>
-                            </html>
-                          `;
+// 鎵撳嵃鍔熻兘
+const handlePrint = async () => {
+	if (selectedRows.value.length === 0) {
+		proxy.$modal.msgWarning("璇烽�夋嫨瑕佹墦鍗扮殑鏁版嵁");
+		return;
+	}
 
-    // 鍐欏叆鍐呭鍒版柊绐楀彛
-    printWindow.document.write(printContent);
-    printWindow.document.close();
+	// 鏄剧ず鍔犺浇鐘舵��
+	proxy.$modal.loading("姝e湪鑾峰彇浜у搧鏁版嵁锛岃绋嶅��...");
 
-    // 绛夊緟鍐呭鍔犺浇瀹屾垚鍚庢墦鍗�
-    printWindow.onload = () => {
-      setTimeout(() => {
-        printWindow.print();
-        printWindow.close();
-        printPreviewVisible.value = false;
-      }, 500);
-    };
-  };
-  // 鏍煎紡鍖栨棩鏈�
-  const formatDate = dateString => {
-    if (!dateString) return getCurrentDate();
-    const date = new Date(dateString);
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, "0");
-    const day = String(date.getDate()).padStart(2, "0");
-    return `${year}/${month}/${day}`;
-  };
-  // 鏍煎紡鍖栨棩鏈熸椂闂�
-  const formatDateTime = date => {
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, "0");
-    const day = String(date.getDate()).padStart(2, "0");
-    const hours = String(date.getHours()).padStart(2, "0");
-    const minutes = String(date.getMinutes()).padStart(2, "0");
-    const seconds = String(date.getSeconds()).padStart(2, "0");
-    return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
-  };
-  // 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
-  function getCurrentDate() {
-    const today = new Date();
-    const year = today.getFullYear();
-    const month = String(today.getMonth() + 1).padStart(2, "0"); // 鏈堜唤浠�0寮�濮�
-    const day = String(today.getDate()).padStart(2, "0");
-    return `${year}-${month}-${day}`;
+	try {
+		// 涓烘瘡涓�変腑鐨勯攢鍞彴璐﹁褰曟煡璇㈠搴旂殑浜у搧鏁版嵁
+		const printDataWithProducts = [];
+
+		for (const row of selectedRows.value) {
+			try {
+				// 璋冪敤productList鎺ュ彛鏌ヨ浜у搧鏁版嵁
+				const productRes = await productList({ salesLedgerId: row.id, type: 1 });
+
+				// 灏嗕骇鍝佹暟鎹暣鍚堝埌閿�鍞彴璐﹁褰曚腑
+				const rowWithProducts = {
+					...row,
+					products: productRes.data || []
+				};
+
+				printDataWithProducts.push(rowWithProducts);
+			} catch (error) {
+				console.error(`鑾峰彇閿�鍞彴璐� ${row.id} 鐨勪骇鍝佹暟鎹け璐�:`, error);
+				// 鍗充娇鏌愪釜璁板綍鐨勪骇鍝佹暟鎹幏鍙栧け璐ワ紝涔熻鍖呭惈璇ヨ褰�
+				printDataWithProducts.push({
+					...row,
+					products: []
+				});
+			}
+		}
+
+		printData.value = printDataWithProducts;
+		console.log('鎵撳嵃鏁版嵁锛堝寘鍚骇鍝侊級:', printData.value);
+		printPreviewVisible.value = true;
+
+	} catch (error) {
+		console.error('鑾峰彇浜у搧鏁版嵁澶辫触:', error);
+		proxy.$modal.msgError("鑾峰彇浜у搧鏁版嵁澶辫触锛岃閲嶈瘯");
+	} finally {
+		proxy.$modal.closeLoading();
+	}
+};
+// 鎵ц鎵撳嵃
+const executePrint = () => {
+	console.log('寮�濮嬫墽琛屾墦鍗帮紝鏁版嵁鏉℃暟:', printData.value.length);
+	console.log('鎵撳嵃鏁版嵁:', printData.value);
+
+	// 鍒涘缓涓�涓柊鐨勬墦鍗扮獥鍙�
+	const printWindow = window.open('', '_blank', 'width=800,height=600');
+
+	// 鏋勫缓鎵撳嵃鍐呭
+	let printContent = `
+    <!DOCTYPE html>
+    <html>
+    <head>
+      <meta charset="UTF-8">
+      <title>鎵撳嵃棰勮</title>
+      <style>
+        body {
+          margin: 0;
+          padding: 0;
+          font-family: "SimSun", serif;
+          background: white;
+        }
+                                                     .print-page {
+            width: 200mm;
+            height: 75mm;
+            padding: 10mm;
+            padding-left: 20mm;
+            background: white;
+            box-sizing: border-box;
+            page-break-after: always;
+            page-break-inside: avoid;
+          }
+         .print-page:last-child {
+           page-break-after: avoid;
+         }
+        .delivery-note {
+          width: 100%;
+          height: 100%;
+          font-size: 12px;
+          line-height: 1.2;
+          display: flex;
+          flex-direction: column;
+          color: #000;
+        }
+        .header {
+          text-align: center;
+          margin-bottom: 8px;
+        }
+        .company-name {
+          font-size: 18px;
+          font-weight: bold;
+          margin-bottom: 4px;
+        }
+        .document-title {
+          font-size: 16px;
+          font-weight: bold;
+        }
+        .info-section {
+          margin-bottom: 8px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+        }
+        .info-row {
+          line-height: 20px;
+        }
+        .label {
+          font-weight: bold;
+          width: 60px;
+          font-size: 12px;
+        }
+        .value {
+          margin-right: 20px;
+          min-width: 80px;
+          font-size: 12px;
+        }
+                 .table-section {
+                 margin-bottom: 40px;
+          //  flex: 0.6;
+         }
+        .product-table {
+          width: 100%;
+          border-collapse: collapse;
+          border: 1px solid #000;
+        }
+                 .product-table th, .product-table td {
+           border: 1px solid #000;
+           padding: 6px;
+           text-align: center;
+           font-size: 12px;
+           line-height: 1.4;
+         }
+        .product-table th {
+          font-weight: bold;
+        }
+        .total-value {
+          font-weight: bold;
+        }
+        .footer-section {
+          margin-top: auto;
+        }
+        .footer-row {
+          display: flex;
+          margin-bottom: 3px;
+          line-height: 22px;
+          justify-content: space-between;
+        }
+        .footer-item {
+          display: flex;
+          margin-right: 20px;
+        }
+        .footer-item .label {
+          font-weight: bold;
+          width: 80px;
+          font-size: 12px;
+        }
+        .footer-item .value {
+          min-width: 80px;
+          font-size: 12px;
+        }
+        .address-item .address-value {
+          min-width: 200px;
+        }
+        @media print {
+          body {
+            margin: 0;
+            padding: 0;
+          }
+                     .print-page {
+             margin: 0;
+             padding: 10mm;
+             /* padding-left: 20mm; */
+             page-break-inside: avoid;
+             page-break-after: always;
+           }
+           .print-page:last-child {
+             page-break-after: avoid;
+           }
+        }
+      </style>
+    </head>
+    <body>
+  `;
+
+	// 涓烘瘡鏉℃暟鎹敓鎴愭墦鍗伴〉闈�
+	printData.value.forEach((item, index) => {
+		printContent += `
+      <div class="print-page">
+        <div class="delivery-note">
+          <div class="header">
+            <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
+            <div class="document-title">闆跺敭鍙戣揣鍗�</div>
+          </div>
+
+          <div class="info-section">
+            <div class="info-row">
+              <div>
+                <span class="label">鍙戣揣鏃ユ湡锛�</span>
+                <span class="value">${formatDate(item.createTime)}</span>
+              </div>
+              <div>
+                <span class="label">瀹㈡埛鍚嶇О锛�</span>
+                <span class="value">${item.customerName || '寮犵埍鏈�'}</span>
+              </div>
+            </div>
+            <div class="info-row">
+              <span class="label">鍗曞彿锛�</span>
+              <span class="value">${item.salesContractNo || ''}</span>
+            </div>
+          </div>
+
+          <div class="table-section">
+            <table class="product-table">
+              <thead>
+                <tr>
+                  <th>浜у搧鍚嶇О</th>
+                  <th>瑙勬牸鍨嬪彿</th>
+                  <th>鍗曚綅</th>
+                  <th>鍗曚环</th>
+                  <th>闆跺敭鏁伴噺</th>
+                  <th>闆跺敭閲戦</th>
+                </tr>
+              </thead>
+              <tbody>
+                ${item.products && item.products.length > 0 ?
+                  item.products.map(product => `
+                    <tr>
+                      <td>${product.productCategory || ''}</td>
+                      <td>${product.specificationModel || ''}</td>
+                      <td>${product.unit || ''}</td>
+                      <td>${product.taxInclusiveUnitPrice || '0'}</td>
+                      <td>${product.quantity || '0'}</td>
+                      <td>${product.taxInclusiveTotalPrice || '0'}</td>
+                    </tr>
+                  `).join('') :
+                  '<tr><td colspan="6" style="text-align: center; color: #999;">鏆傛棤浜у搧鏁版嵁</td></tr>'
+                }
+              </tbody>
+              <tfoot>
+                <tr>
+                  <td class="label">鍚堣</td>
+                  <td class="total-value"></td>
+                  <td class="total-value"></td>
+                  <td class="total-value"></td>
+                  <td class="total-value">${getTotalQuantityForPrint(item.products)}</td>
+                  <td class="total-value">${getTotalAmountForPrint(item.products)}</td>
+                </tr>
+              </tfoot>
+            </table>
+          </div>
+
+          <div class="footer-section">
+            <div class="footer-row">
+              <div class="footer-item">
+                <span class="label">鏀惰揣鐢佃瘽锛�</span>
+                <span class="value"></span>
+              </div>
+              <div class="footer-item">
+                <span class="label">鏀惰揣浜猴細</span>
+                <span class="value"></span>
+              </div>
+              <div class="footer-item address-item">
+                <span class="label">鏀惰揣鍦板潃锛�</span>
+                <span class="value address-value"></span>
+              </div>
+            </div>
+            <div class="footer-row">
+              <div class="footer-item">
+                <span class="label">鎿嶄綔鍛橈細</span>
+                <span class="value">${userStore.nickName || '鎾曞紑鍓�'}</span>
+              </div>
+              <div class="footer-item">
+                <span class="label">鎵撳嵃鏃ユ湡锛�</span>
+                <span class="value">${formatDateTime(new Date())}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    `;
+	});
+
+	printContent += `
+    </body>
+    </html>
+  `;
+
+	// 鍐欏叆鍐呭鍒版柊绐楀彛
+	printWindow.document.write(printContent);
+	printWindow.document.close();
+
+	// 绛夊緟鍐呭鍔犺浇瀹屾垚鍚庢墦鍗�
+	printWindow.onload = () => {
+		setTimeout(() => {
+			printWindow.print();
+			printWindow.close();
+			printPreviewVisible.value = false;
+		}, 500);
+	};
+};
+// 鏍煎紡鍖栨棩鏈�
+const formatDate = (dateString) => {
+	if (!dateString) return getCurrentDate();
+	const date = new Date(dateString);
+	const year = date.getFullYear();
+	const month = String(date.getMonth() + 1).padStart(2, "0");
+	const day = String(date.getDate()).padStart(2, "0");
+	return `${year}/${month}/${day}`;
+};
+// 鏍煎紡鍖栨棩鏈熸椂闂�
+const formatDateTime = (date) => {
+	const year = date.getFullYear();
+	const month = String(date.getMonth() + 1).padStart(2, "0");
+	const day = String(date.getDate()).padStart(2, "0");
+	const hours = String(date.getHours()).padStart(2, "0");
+	const minutes = String(date.getMinutes()).padStart(2, "0");
+	const seconds = String(date.getSeconds()).padStart(2, "0");
+	return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
+};
+// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
+function getCurrentDate() {
+  const today = new Date();
+  const year = today.getFullYear();
+  const month = String(today.getMonth() + 1).padStart(2, "0"); // 鏈堜唤浠�0寮�濮�
+  const day = String(today.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
+
+// 璁$畻浜у搧鎬绘暟閲�
+const getTotalQuantity = (products) => {
+  if (!products || products.length === 0) return '0';
+  const total = products.reduce((sum, product) => {
+    return sum + (parseFloat(product.quantity) || 0);
+  }, 0);
+  return total.toFixed(2);
+};
+
+// 璁$畻浜у搧鎬婚噾棰�
+const getTotalAmount = (products) => {
+  if (!products || products.length === 0) return '0';
+  const total = products.reduce((sum, product) => {
+    return sum + (parseFloat(product.taxInclusiveTotalPrice) || 0);
+  }, 0);
+  return total.toFixed(2);
+};
+
+// 鐢ㄤ簬鎵撳嵃鐨勮绠楀嚱鏁�
+const getTotalQuantityForPrint = (products) => {
+  if (!products || products.length === 0) return '0';
+  const total = products.reduce((sum, product) => {
+    return sum + (parseFloat(product.quantity) || 0);
+  }, 0);
+  return total.toFixed(2);
+};
+
+const getTotalAmountForPrint = (products) => {
+  if (!products || products.length === 0) return '0';
+  const total = products.reduce((sum, product) => {
+    return sum + (parseFloat(product.taxInclusiveTotalPrice) || 0);
+  }, 0);
+  return total.toFixed(2);
+};
+
+const mathNum = () => {
+  console.log("productForm.value", productForm.value);
+  if (!productForm.value.taxInclusiveUnitPrice) {
+    return;
+  }
+  if (!productForm.value.quantity) {
+    return;
+  }
+  // 鍚◣鎬讳环璁$畻
+  productForm.value.taxInclusiveTotalPrice =
+    proxy.calculateTaxIncludeTotalPrice(
+      productForm.value.taxInclusiveUnitPrice,
+      productForm.value.quantity
+    );
+  if (productForm.value.taxRate) {
+    // 涓嶅惈绋庢�讳环璁$畻
+    productForm.value.taxExclusiveTotalPrice =
+      proxy.calculateTaxExclusiveTotalPrice(
+        productForm.value.taxInclusiveTotalPrice,
+        productForm.value.taxRate
+      );
+  }
+};
+
+// 鏍规嵁鍚◣鎬讳环璁$畻鍚◣鍗曚环鍜屾暟閲�
+const calculateFromTotalPrice = () => {
+  if (isCalculating.value) return;
+
+  const totalPrice = parseFloat(productForm.value.taxInclusiveTotalPrice);
+  const quantity = parseFloat(productForm.value.quantity);
+
+  if (!totalPrice || !quantity || quantity <= 0) {
+    return;
   }
 
-  // 璁$畻浜у搧鎬绘暟閲�
-  const getTotalQuantity = products => {
-    if (!products || products.length === 0) return "0";
-    const total = products.reduce((sum, product) => {
-      return sum + (parseFloat(product.quantity) || 0);
-    }, 0);
-    return total.toFixed(2);
-  };
+  isCalculating.value = true;
 
-  // 璁$畻浜у搧鎬婚噾棰�
-  const getTotalAmount = products => {
-    if (!products || products.length === 0) return "0";
-    const total = products.reduce((sum, product) => {
-      return sum + (parseFloat(product.taxInclusiveTotalPrice) || 0);
-    }, 0);
-    return total.toFixed(2);
-  };
+  // 璁$畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
+  productForm.value.taxInclusiveUnitPrice = (totalPrice / quantity).toFixed(2);
 
-  // 鐢ㄤ簬鎵撳嵃鐨勮绠楀嚱鏁�
-  const getTotalQuantityForPrint = products => {
-    if (!products || products.length === 0) return "0";
-    const total = products.reduce((sum, product) => {
-      return sum + (parseFloat(product.quantity) || 0);
-    }, 0);
-    return total.toFixed(2);
-  };
-
-  const getTotalAmountForPrint = products => {
-    if (!products || products.length === 0) return "0";
-    const total = products.reduce((sum, product) => {
-      return sum + (parseFloat(product.taxInclusiveTotalPrice) || 0);
-    }, 0);
-    return total.toFixed(2);
-  };
-
-  const mathNum = () => {
-    console.log("productForm.value", productForm.value);
-    if (!productForm.value.taxInclusiveUnitPrice) {
-      return;
-    }
-    if (!productForm.value.quantity) {
-      return;
-    }
-    // 鍚◣鎬讳环璁$畻
-    productForm.value.taxInclusiveTotalPrice =
-      proxy.calculateTaxIncludeTotalPrice(
-        productForm.value.taxInclusiveUnitPrice,
-        productForm.value.quantity
-      );
-    if (productForm.value.taxRate) {
-      // 涓嶅惈绋庢�讳环璁$畻
-      productForm.value.taxExclusiveTotalPrice =
-        proxy.calculateTaxExclusiveTotalPrice(
-          productForm.value.taxInclusiveTotalPrice,
-          productForm.value.taxRate
-        );
-    }
-  };
-
-  // 鏍规嵁鍚◣鎬讳环璁$畻鍚◣鍗曚环鍜屾暟閲�
-  const calculateFromTotalPrice = () => {
-    if (isCalculating.value) return;
-
-    const totalPrice = parseFloat(productForm.value.taxInclusiveTotalPrice);
-    const quantity = parseFloat(productForm.value.quantity);
-
-    if (!totalPrice || !quantity || quantity <= 0) {
-      return;
-    }
-
-    isCalculating.value = true;
-
-    // 璁$畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
-    productForm.value.taxInclusiveUnitPrice = (totalPrice / quantity).toFixed(2);
-
-    // 濡傛灉鏈夌◣鐜囷紝璁$畻涓嶅惈绋庢�讳环
-    if (productForm.value.taxRate) {
-      productForm.value.taxExclusiveTotalPrice =
-        proxy.calculateTaxExclusiveTotalPrice(
-          totalPrice,
-          productForm.value.taxRate
-        );
-    }
-
-    isCalculating.value = false;
-  };
-
-  // 鏍规嵁涓嶅惈绋庢�讳环璁$畻鍚◣鍗曚环鍜屾暟閲�
-  const calculateFromExclusiveTotalPrice = () => {
-    if (!productForm.value.taxRate) {
-      proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
-      return;
-    }
-    if (isCalculating.value) return;
-
-    const exclusiveTotalPrice = parseFloat(
-      productForm.value.taxExclusiveTotalPrice
-    );
-    const quantity = parseFloat(productForm.value.quantity);
-    const taxRate = parseFloat(productForm.value.taxRate);
-
-    if (!exclusiveTotalPrice || !quantity || quantity <= 0 || !taxRate) {
-      return;
-    }
-
-    isCalculating.value = true;
-
-    // 鍏堣绠楀惈绋庢�讳环 = 涓嶅惈绋庢�讳环 / (1 - 绋庣巼/100)
-    const taxRateDecimal = taxRate / 100;
-    const inclusiveTotalPrice = exclusiveTotalPrice / (1 - taxRateDecimal);
-    productForm.value.taxInclusiveTotalPrice = inclusiveTotalPrice.toFixed(2);
-
-    // 璁$畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
-    productForm.value.taxInclusiveUnitPrice = (
-      inclusiveTotalPrice / quantity
-    ).toFixed(2);
-
-    isCalculating.value = false;
-  };
-
-  // 鏍规嵁鏁伴噺鍙樺寲璁$畻鎬讳环
-  const calculateFromQuantity = () => {
-    // 杩欓噷
-    if (!productForm.value.taxRate) {
-      proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
-      return;
-    }
-    if (isCalculating.value) return;
-    newfunction();
-    const quantity = parseFloat(productForm.value.quantity);
-    const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
-
-    if (!quantity || quantity <= 0 || !unitPrice) {
-      return;
-    }
-
-    isCalculating.value = true;
-
-    // 璁$畻鍚◣鎬讳环
-    productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
-
-    // 濡傛灉鏈夌◣鐜囷紝璁$畻涓嶅惈绋庢�讳环
-    if (productForm.value.taxRate) {
-      productForm.value.taxExclusiveTotalPrice =
-        proxy.calculateTaxExclusiveTotalPrice(
-          productForm.value.taxInclusiveTotalPrice,
-          productForm.value.taxRate
-        );
-    }
-
-    isCalculating.value = false;
-  };
-  const newfunction = () => {
-    // productForm.value.productModelId;
-    // productForm.quantity
-    judgmentInventory({
-      productModelId: productForm.value.productModelId,
-      quantity: productForm.value.quantity,
-    }).then(res => {
-      console.log("res", res);
-      // if (res.code === 200) {
-      //   proxy.$modal.msgSuccess("搴撳瓨鍏呰冻");
-      // } else {
-      //   proxy.$modal.msgError(res.msg);
-      // }
-    });
-  };
-  // 鏍规嵁鍚◣鍗曚环鍙樺寲璁$畻鎬讳环
-  const calculateFromUnitPrice = () => {
-    if (!productForm.value.taxRate) {
-      proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
-      return;
-    }
-    if (isCalculating.value) return;
-
-    const quantity = parseFloat(productForm.value.quantity);
-    const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
-
-    if (!quantity || quantity <= 0 || !unitPrice) {
-      return;
-    }
-
-    isCalculating.value = true;
-
-    // 璁$畻鍚◣鎬讳环
-    productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
-
-    // 濡傛灉鏈夌◣鐜囷紝璁$畻涓嶅惈绋庢�讳环
-    if (productForm.value.taxRate) {
-      productForm.value.taxExclusiveTotalPrice =
-        proxy.calculateTaxExclusiveTotalPrice(
-          productForm.value.taxInclusiveTotalPrice,
-          productForm.value.taxRate
-        );
-    }
-
-    isCalculating.value = false;
-  };
-
-  // 鏍规嵁绋庣巼鍙樺寲璁$畻涓嶅惈绋庢�讳环
-  const calculateFromTaxRate = () => {
-    if (!productForm.value.taxRate) {
-      proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
-      return;
-    }
-    if (isCalculating.value) return;
-
-    const inclusiveTotalPrice = parseFloat(
-      productForm.value.taxInclusiveTotalPrice
-    );
-    const taxRate = parseFloat(productForm.value.taxRate);
-
-    if (!inclusiveTotalPrice || !taxRate) {
-      return;
-    }
-
-    isCalculating.value = true;
-
-    // 璁$畻涓嶅惈绋庢�讳环
+  // 濡傛灉鏈夌◣鐜囷紝璁$畻涓嶅惈绋庢�讳环
+  if (productForm.value.taxRate) {
     productForm.value.taxExclusiveTotalPrice =
-      proxy.calculateTaxExclusiveTotalPrice(inclusiveTotalPrice, taxRate);
+      proxy.calculateTaxExclusiveTotalPrice(
+        totalPrice,
+        productForm.value.taxRate
+      );
+  }
 
-    isCalculating.value = false;
-  };
-  /**
-   * 涓嬭浇鏂囦欢
-   *
-   * @param row 涓嬭浇鏂囦欢鐨勭浉鍏充俊鎭璞�
-   */
-  const fileListRef = ref(null);
-  const downLoadFile = row => {
-    getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => {
-      fileListRef.value.open(res.salesLedgerFiles);
-    });
-  };
+  isCalculating.value = false;
+};
 
-  // 鎵撳紑鍙戣揣寮规
-  const openDeliveryForm = row => {
+// 鏍规嵁涓嶅惈绋庢�讳环璁$畻鍚◣鍗曚环鍜屾暟閲�
+const calculateFromExclusiveTotalPrice = () => {
+	if (!productForm.value.taxRate) {
+		proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+		return;
+	}
+  if (isCalculating.value) return;
+
+  const exclusiveTotalPrice = parseFloat(productForm.value.taxExclusiveTotalPrice);
+  const quantity = parseFloat(productForm.value.quantity);
+  const taxRate = parseFloat(productForm.value.taxRate);
+
+  if (!exclusiveTotalPrice || !quantity || quantity <= 0 || !taxRate) {
+    return;
+  }
+
+  isCalculating.value = true;
+
+  // 鍏堣绠楀惈绋庢�讳环 = 涓嶅惈绋庢�讳环 / (1 - 绋庣巼/100)
+  const taxRateDecimal = taxRate / 100;
+  const inclusiveTotalPrice = exclusiveTotalPrice / (1 - taxRateDecimal);
+  productForm.value.taxInclusiveTotalPrice = inclusiveTotalPrice.toFixed(2);
+
+  // 璁$畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
+  productForm.value.taxInclusiveUnitPrice = (inclusiveTotalPrice / quantity).toFixed(2);
+
+  isCalculating.value = false;
+};
+
+// 鏍规嵁鏁伴噺鍙樺寲璁$畻鎬讳环
+const calculateFromQuantity = () => {
+	if (!productForm.value.taxRate) {
+		proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+		return;
+	}
+  if (isCalculating.value) return;
+
+  const quantity = parseFloat(productForm.value.quantity);
+  const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
+
+  if (!quantity || quantity <= 0 || !unitPrice) {
+    return;
+  }
+
+  isCalculating.value = true;
+
+  // 璁$畻鍚◣鎬讳环
+  productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
+
+  // 濡傛灉鏈夌◣鐜囷紝璁$畻涓嶅惈绋庢�讳环
+  if (productForm.value.taxRate) {
+    productForm.value.taxExclusiveTotalPrice =
+      proxy.calculateTaxExclusiveTotalPrice(
+        productForm.value.taxInclusiveTotalPrice,
+        productForm.value.taxRate
+      );
+  }
+
+  isCalculating.value = false;
+};
+
+// 鏍规嵁鍚◣鍗曚环鍙樺寲璁$畻鎬讳环
+const calculateFromUnitPrice = () => {
+	if (!productForm.value.taxRate) {
+		proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+		return;
+	}
+  if (isCalculating.value) return;
+
+  const quantity = parseFloat(productForm.value.quantity);
+  const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
+
+  if (!quantity || quantity <= 0 || !unitPrice) {
+    return;
+  }
+
+  isCalculating.value = true;
+
+  // 璁$畻鍚◣鎬讳环
+  productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
+
+  // 濡傛灉鏈夌◣鐜囷紝璁$畻涓嶅惈绋庢�讳环
+  if (productForm.value.taxRate) {
+    productForm.value.taxExclusiveTotalPrice =
+      proxy.calculateTaxExclusiveTotalPrice(
+        productForm.value.taxInclusiveTotalPrice,
+        productForm.value.taxRate
+      );
+  }
+
+  isCalculating.value = false;
+};
+
+// 鏍规嵁绋庣巼鍙樺寲璁$畻涓嶅惈绋庢�讳环
+const calculateFromTaxRate = () => {
+	if (!productForm.value.taxRate) {
+		proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+		return;
+	}
+  if (isCalculating.value) return;
+
+  const inclusiveTotalPrice = parseFloat(productForm.value.taxInclusiveTotalPrice);
+  const taxRate = parseFloat(productForm.value.taxRate);
+
+  if (!inclusiveTotalPrice || !taxRate) {
+    return;
+  }
+
+  isCalculating.value = true;
+
+  // 璁$畻涓嶅惈绋庢�讳环
+  productForm.value.taxExclusiveTotalPrice =
+    proxy.calculateTaxExclusiveTotalPrice(
+      inclusiveTotalPrice,
+      taxRate
+    );
+
+  isCalculating.value = false;
+};
+/**
+ * 涓嬭浇鏂囦欢
+ *
+ * @param row 涓嬭浇鏂囦欢鐨勭浉鍏充俊鎭璞�
+ */
+const fileListRef = ref(null)
+const downLoadFile = (row) => {
+  getSalesLedgerWithProducts({ id: row.id, type: 1 }).then((res) => {
+    fileListRef.value.open(res.salesLedgerFiles)
+  });
+}
+
+// 鎵撳紑鍙戣揣寮规
+const openDeliveryForm = (row) => {
+  getProductInventory({ salesLedgerId: row.id, type:1 }).then((res) => {
     currentDeliveryRow.value = row;
     deliveryForm.value = {
-      shippingDate: "", // 绉婚櫎榛樿鍊艰缃�
+      shippingDate: getCurrentDate(),
       shippingCarNumber: "",
     };
     deliveryFormVisible.value = true;
-  };
-
-  // 鎻愪氦鍙戣揣琛ㄥ崟
-  const submitDelivery = () => {
-    proxy.$refs["deliveryFormRef"].validate(valid => {
-      if (valid) {
-        addShippingInfo({
-          approverId: deliveryForm.value.approverId,
-          salesLedgerId: currentDeliveryRow.value.salesLedgerId,
-          salesLedgerProductId: currentDeliveryRow.value.id,
-          shippingDate: deliveryForm.value.shippingDate,
-          shippingCarNumber: deliveryForm.value.shippingCarNumber,
-        })
-          .then(() => {
-            proxy.$modal.msgSuccess("鍙戣揣鎴愬姛");
-            closeDeliveryDia();
-            getList();
-            expandedRowKeys.value = [];
-          })
-          .catch(() => {
-            proxy.$modal.msgError("鍙戣揣澶辫触锛岃閲嶈瘯");
-          });
-      }
-    });
-  };
-
-  // 鍏抽棴鍙戣揣寮规
-  const closeDeliveryDia = () => {
-    proxy.resetForm("deliveryFormRef");
-    deliveryFormVisible.value = false;
-    currentDeliveryRow.value = null;
-  };
-
-  onMounted(() => {
-    getList();
+  }).catch(err => {
+    ElMessage.error(err.msg);
   });
+};
+
+// 鎻愪氦鍙戣揣琛ㄥ崟
+const submitDelivery = () => {
+  proxy.$refs["deliveryFormRef"].validate((valid) => {
+    if (valid) {
+      addShippingInfo({
+        salesLedgerId: currentDeliveryContext.value.parentRow.id,
+        salesLedgerProductId: currentDeliveryContext.value.productRow.id,
+        shippingDate: deliveryForm.value.shippingDate,
+        shippingCarNumber: deliveryForm.value.shippingCarNumber,
+      })
+        .then(() => {
+          proxy.$modal.msgSuccess("鍙戣揣鎴愬姛");
+          closeDeliveryDia();
+        })
+        .catch(() => {
+          proxy.$modal.msgError("鍙戣揣澶辫触锛岃閲嶈瘯");
+        });
+    }
+  });
+};
+
+// 鍏抽棴鍙戣揣寮规
+const closeDeliveryDia = () => {
+  proxy.resetForm("deliveryFormRef");
+  deliveryFormVisible.value = false;
+  currentDeliveryContext.value = null;
+};
+
+onMounted(() => {
+	getList();
+});
 </script>
 
 <style scoped lang="scss">
-  .ml-10 {
-    margin-left: 10px;
-  }
+.ml-10 {
+  margin-left: 10px;
+}
 
-  .table_list {
-    margin-top: unset;
-  }
+.table_list {
+  margin-top: unset;
+}
 
-  .actions {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 10px;
-  }
-  .print-preview-dialog {
-    .el-dialog__body {
-      padding: 0;
-      max-height: 80vh;
-      overflow-y: auto;
-    }
-  }
+.actions {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
+.print-preview-dialog {
+	.el-dialog__body {
+		padding: 0;
+		max-height: 80vh;
+		overflow-y: auto;
+	}
+}
 
-  .print-preview-container {
-    .print-preview-header {
-      padding: 15px;
-      border-bottom: 1px solid #e4e7ed;
-      text-align: center;
+.print-preview-container {
+	.print-preview-header {
+		padding: 15px;
+		border-bottom: 1px solid #e4e7ed;
+		text-align: center;
 
-      .el-button {
-        margin: 0 10px;
-      }
-    }
+		.el-button {
+			margin: 0 10px;
+		}
+	}
 
-    .print-preview-content {
-      padding: 20px;
-      background-color: #f5f5f5;
-      min-height: 400px;
-    }
-  }
+	.print-preview-content {
+		padding: 20px;
+		background-color: #f5f5f5;
+		min-height: 400px;
+	}
+}
 
-  .print-page {
-    width: 220mm;
-    height: 90mm;
-    padding: 10mm;
-    margin: 0 auto;
-    background: white;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-    margin-bottom: 10px;
-    box-sizing: border-box;
-  }
+.print-page {
+	width: 220mm;
+	height: 90mm;
+	padding: 10mm;
+	margin: 0 auto;
+	background: white;
+	box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+	margin-bottom: 10px;
+	box-sizing: border-box;
+}
 
-  .delivery-note {
-    width: 100%;
-    height: 100%;
-    font-family: "SimSun", serif;
-    font-size: 10px;
-    line-height: 1.2;
-    display: flex;
-    flex-direction: column;
-  }
+.delivery-note {
+	width: 100%;
+	height: 100%;
+	font-family: "SimSun", serif;
+	font-size: 10px;
+	line-height: 1.2;
+	display: flex;
+	flex-direction: column;
+}
 
-  .header {
-    text-align: center;
-    margin-bottom: 8px;
+.header {
+	text-align: center;
+	margin-bottom: 8px;
 
-    .company-name {
-      font-size: 18px;
-      font-weight: bold;
-      margin-bottom: 4px;
-    }
+	.company-name {
+		font-size: 18px;
+		font-weight: bold;
+		margin-bottom: 4px;
+	}
 
-    .document-title {
-      font-size: 16px;
-      font-weight: bold;
-    }
-  }
+	.document-title {
+		font-size: 16px;
+		font-weight: bold;
+	}
+}
 
-  .info-section {
-    margin-bottom: 8px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+.info-section {
+	margin-bottom: 8px;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
 
-    .info-row {
-      line-height: 20px;
+	.info-row {
+		line-height: 20px;
 
-      .label {
-        font-weight: bold;
-        width: 60px;
-        font-size: 14px;
-      }
+		.label {
+			font-weight: bold;
+			width: 60px;
+			font-size: 14px;
+		}
 
-      .value {
-        margin-right: 20px;
-        min-width: 80px;
-        font-size: 14px;
-      }
-    }
-  }
+		.value {
+			margin-right: 20px;
+			min-width: 80px;
+			font-size: 14px;
+		}
+	}
+}
 
-  .table-section {
-    margin-bottom: 4px;
-    flex: 1;
+.table-section {
+	margin-bottom: 4px;
+	flex: 1;
 
-    .product-table {
-      width: 100%;
-      border-collapse: collapse;
-      border: 1px solid #000;
+	.product-table {
+		width: 100%;
+		border-collapse: collapse;
+		border: 1px solid #000;
 
-      th,
-      td {
-        border: 1px solid #000;
-        padding: 6px;
-        text-align: center;
-        font-size: 14px;
-        line-height: 1.4;
-      }
+		th, td {
+			border: 1px solid #000;
+			padding: 6px;
+			text-align: center;
+			font-size: 14px;
+			line-height: 1.4;
+		}
 
-      th {
-        font-weight: bold;
-      }
+		th {
+			font-weight: bold;
+		}
 
-      .total-label {
-        text-align: right;
-        font-weight: bold;
-      }
+		.total-label {
+			text-align: right;
+			font-weight: bold;
+		}
 
-      .total-value {
-        font-weight: bold;
-      }
-    }
-  }
+		.total-value {
+			font-weight: bold;
+		}
+	}
+}
 
-  .footer-section {
-    .footer-row {
-      display: flex;
-      margin-bottom: 3px;
-      line-height: 20px;
-      justify-content: space-between;
+.footer-section {
+	.footer-row {
+		display: flex;
+		margin-bottom: 3px;
+		line-height: 20px;
+		justify-content: space-between;
 
-      .footer-item {
-        display: flex;
-        margin-right: 20px;
+		.footer-item {
+			display: flex;
+			margin-right: 20px;
 
-        .label {
-          font-weight: bold;
-          width: 80px;
-          font-size: 14px;
-        }
+			.label {
+				font-weight: bold;
+				width: 80px;
+				font-size: 14px;
+			}
 
-        .value {
-          min-width: 80px;
-          font-size: 14px;
-        }
+			.value {
+				min-width: 80px;
+				font-size: 14px;
+			}
 
-        &.address-item {
-          .address-value {
-            min-width: 200px;
-          }
-        }
-      }
-    }
-  }
+			&.address-item {
+				.address-value {
+					min-width: 200px;
+				}
+			}
+		}
+	}
+}
 
-  @media print {
-    .app-container {
-      display: none;
-    }
+@media print {
+	.app-container {
+		display: none;
+	}
 
-    .print-page {
-      box-shadow: none;
-      margin: 0;
-      padding: 10mm;
-      padding-left: 20mm;
-      page-break-inside: avoid;
-      page-break-after: always;
-    }
-    .print-page:last-child {
-      page-break-after: avoid;
-    }
-  }
+	.print-page {
+		box-shadow: none;
+		margin: 0;
+		padding: 10mm;
+		padding-left: 20mm;
+		page-break-inside: avoid;
+		page-break-after: always;
+	}
+	.print-page:last-child {
+		page-break-after: avoid;
+	}
+}
 </style>

--
Gitblit v1.9.3