From 759f41097324fa1ade4060fc838d700d8c8fa55f Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 24 四月 2026 11:27:57 +0800
Subject: [PATCH] 提交一版

---
 src/views/productionManagement/processRoute/index.vue      |   93 
 src/views/collaborativeApproval/purchaseApproval/index.vue | 1960 +++++++-------
 src/views/productionManagement/productionOrder/New.vue     |  300 +-
 src/api/productionManagement/processRouteFile.js           |   28 
 src/views/productionManagement/productionOrder/index.vue   |  163 
 src/views/productionPlan/productionPlan/index.vue          |  228 -
 src/api/productionManagement/productionOrder.js            |    4 
 src/views/salesManagement/salesLedger/index.vue            | 4919 ++++++++++++++++++++-----------------
 8 files changed, 4,117 insertions(+), 3,578 deletions(-)

diff --git a/src/api/productionManagement/processRouteFile.js b/src/api/productionManagement/processRouteFile.js
new file mode 100644
index 0000000..e3a9fb4
--- /dev/null
+++ b/src/api/productionManagement/processRouteFile.js
@@ -0,0 +1,28 @@
+import request from "@/utils/request";
+
+// 闄勪欢鍒楄〃
+export function listProcessRouteFiles(query) {
+  return request({
+    url: "/technologyRoutingFile/listPage",
+    method: "get",
+    params: query,
+  });
+}
+
+// 鏂板闄勪欢
+export function addProcessRouteFile(data) {
+  return request({
+    url: "/technologyRoutingFile/add",
+    method: "post",
+    data,
+  });
+}
+
+// 鍒犻櫎闄勪欢
+export function delProcessRouteFile(ids) {
+  return request({
+    url: "/technologyRoutingFile/del",
+    method: "delete",
+    data: ids,
+  });
+}
diff --git a/src/api/productionManagement/productionOrder.js b/src/api/productionManagement/productionOrder.js
index b8468eb..ffcf936 100644
--- a/src/api/productionManagement/productionOrder.js
+++ b/src/api/productionManagement/productionOrder.js
@@ -12,7 +12,7 @@
 
 export function productOrderListPage(query) {
   return request({
-    url: "/productOrder/page",
+    url: "/productionOrder/page",
     method: "get",
     params: query,
   });
@@ -39,7 +39,7 @@
 // 鐢熶骇璁㈠崟-鏂板
 export function addProductOrder(data) {
   return request({
-    url: "/productOrder/addProductOrder",
+    url: "/productionOrder",
     method: "post",
     data: data,
   });
diff --git a/src/views/collaborativeApproval/purchaseApproval/index.vue b/src/views/collaborativeApproval/purchaseApproval/index.vue
index af17bbe..e3680fe 100644
--- a/src/views/collaborativeApproval/purchaseApproval/index.vue
+++ b/src/views/collaborativeApproval/purchaseApproval/index.vue
@@ -2,678 +2,771 @@
   <div class="app-container">
     <div class="search_form">
       <div>
-        <el-form :model="searchForm" :inline="true">
+        <el-form :model="searchForm"
+                 :inline="true">
           <el-form-item label="渚涘簲鍟嗗悕绉帮細">
-            <el-input v-model="searchForm.supplierName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+            <el-input v-model="searchForm.supplierName"
+                      placeholder="璇疯緭鍏�"
+                      clearable
+                      prefix-icon="Search"
                       @change="handleQuery" />
           </el-form-item>
           <el-form-item label="閲囪喘鍚堝悓鍙凤細">
-            <el-input
-                v-model="searchForm.purchaseContractNumber"
-                style="width: 240px"
-                placeholder="璇疯緭鍏�"
-                @change="handleQuery"
-                clearable
-                :prefix-icon="Search"
-            />
+            <el-input v-model="searchForm.purchaseContractNumber"
+                      style="width: 240px"
+                      placeholder="璇疯緭鍏�"
+                      @change="handleQuery"
+                      clearable
+                      :prefix-icon="Search" />
           </el-form-item>
           <el-form-item label="閿�鍞悎鍚屽彿锛�">
-            <el-input v-model="searchForm.salesContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+            <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"
+            <el-input v-model="searchForm.projectName"
+                      placeholder="璇疯緭鍏�"
+                      clearable
+                      prefix-icon="Search"
                       @change="handleQuery" />
           </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>
-
     </div>
     <div class="table_list">
       <div style="display: flex;justify-content: flex-end;margin-bottom: 20px;">
         <el-button @click="handleOut">瀵煎嚭</el-button>
-        <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+        <el-button type="danger"
+                   plain
+                   @click="handleDelete">鍒犻櫎</el-button>
       </div>
-      <el-table
-        :data="tableData"
-        border
-        v-loading="tableLoading"
-        @selection-change="handleSelectionChange"
-        :expand-row-keys="expandedRowKeys"
-        :row-key="(row) => row.id"
-        show-summary
-        :summary-method="summarizeMainTable"
-        @expand-change="expandChange"
-        height="calc(100vh - 18.5em)"
-        :row-class-name="tableRowClassName"
-      >
-        <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
+                :summary-method="summarizeMainTable"
+                @expand-change="expandChange"
+                height="calc(100vh - 18.5em)"
+                :row-class-name="tableRowClassName">
+        <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="鏁伴噺" 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 :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="鏁伴噺"
+                               prop="quantity" />
+              <el-table-column label="绋庣巼(%)"
+                               prop="taxRate" />
+              <el-table-column label="鍚◣鍗曚环(鍏�)"
+                               prop="taxInclusiveUnitPrice"
+                               :formatter="formattedNumber" />
+              <el-table-column label="鍚◣鎬讳环(鍏�)"
+                               prop="taxInclusiveTotalPrice"
+                               :formatter="formattedNumber" />
+              <el-table-column label="涓嶅惈绋庢�讳环(鍏�)"
+                               prop="taxExclusiveTotalPrice"
+                               :formatter="formattedNumber" />
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-        <el-table-column
-          label="閲囪喘鍚堝悓鍙�"
-          prop="purchaseContractNumber"
-          width="200"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          label="閿�鍞悎鍚屽彿"
-          prop="salesContractNo"
-          width="200"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          label="渚涘簲鍟嗗悕绉�"
-          width="240"
-          prop="supplierName"
-          show-overflow-tooltip
-        />
-        <el-table-column label="璁㈠崟鐘舵��" width="100" align="center">
+        <el-table-column align="center"
+                         label="搴忓彿"
+                         type="index"
+                         width="60" />
+        <el-table-column label="閲囪喘鍚堝悓鍙�"
+                         prop="purchaseContractNumber"
+                         width="200"
+                         show-overflow-tooltip />
+        <el-table-column label="閿�鍞悎鍚屽彿"
+                         prop="salesContractNo"
+                         width="200"
+                         show-overflow-tooltip />
+        <el-table-column label="渚涘簲鍟嗗悕绉�"
+                         width="240"
+                         prop="supplierName"
+                         show-overflow-tooltip />
+        <el-table-column label="璁㈠崟鐘舵��"
+                         width="100"
+                         align="center">
           <template #default="scope">
-            <el-tag v-if="scope.row.isInvalid" type="danger" size="small">澶辨晥</el-tag>
-            <el-tag v-else type="success" size="small">姝e父</el-tag>
+            <el-tag v-if="scope.row.isInvalid"
+                    type="danger"
+                    size="small">澶辨晥</el-tag>
+            <el-tag v-else
+                    type="success"
+                    size="small">姝e父</el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          label="椤圭洰鍚嶇О"
-          prop="projectName"
-          width="420"
-          show-overflow-tooltip
-        />
-        <el-table-column
-            label="瀹℃壒鐘舵��"
-            prop="approvalStatus"
-            width="200"
-            show-overflow-tooltip
-        >
+        <el-table-column label="椤圭洰鍚嶇О"
+                         prop="projectName"
+                         width="420"
+                         show-overflow-tooltip />
+        <el-table-column label="瀹℃壒鐘舵��"
+                         prop="approvalStatus"
+                         width="200"
+                         show-overflow-tooltip>
           <template #default="scope">
-            <el-tag
-                size="small"
-            >
+            <el-tag size="small">
               {{ approvalStatusText[scope.row.approvalStatus] || '鏈煡鐘舵��' }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          label="浠樻鏂瑰紡"
-          width="100"
-          prop="paymentMethod"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          label="鍚堝悓閲戦(鍏�)"
-          prop="contractAmount"
-           width="200"
-          show-overflow-tooltip
-          :formatter="formattedNumber"
-        />
-        <el-table-column
-          label="褰曞叆浜�"
-          prop="recorderName"
-           width="100"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          label="褰曞叆鏃ユ湡"
-          prop="entryDate"
-           width="100"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          fixed="right"
-          label="鎿嶄綔"
-          min-width="150"
-          align="center"
-        >
+        <el-table-column label="浠樻鏂瑰紡"
+                         width="100"
+                         prop="paymentMethod"
+                         show-overflow-tooltip />
+        <el-table-column label="鍚堝悓閲戦(鍏�)"
+                         prop="contractAmount"
+                         width="200"
+                         show-overflow-tooltip
+                         :formatter="formattedNumber" />
+        <el-table-column label="褰曞叆浜�"
+                         prop="recorderName"
+                         width="100"
+                         show-overflow-tooltip />
+        <el-table-column label="褰曞叆鏃ユ湡"
+                         prop="entryDate"
+                         width="100"
+                         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="approvePurchase(scope.row)"
-              :disabled="scope.row.approvalStatus !== 0"
-              >瀹℃壒</el-button
-            >
-            <el-button
-                link
-                type="primary"
-                size="small"
-                @click="rejectPurchase(scope.row)"
-                :disabled="scope.row.approvalStatus !== 0"
-            >鎷掔粷瀹℃壒</el-button
-            >
+            <el-button link
+                       type="primary"
+                       size="small"
+                       @click="approvePurchase(scope.row)"
+                       :disabled="scope.row.approvalStatus !== 0">瀹℃壒</el-button>
+            <el-button link
+                       type="primary"
+                       size="small"
+                       @click="rejectPurchase(scope.row)"
+                       :disabled="scope.row.approvalStatus !== 0">鎷掔粷瀹℃壒</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>
   </div>
 </template>
 
 <script setup>
-import { getToken } from "@/utils/auth";
-import pagination from "@/components/PIMTable/Pagination.vue";
-import { ref, onMounted, reactive, toRefs, getCurrentInstance, nextTick } from "vue";
-import { Search } from "@element-plus/icons-vue";
-import { ElMessageBox } from "element-plus";
-import { userListNoPage } from "@/api/system/user.js";
-import {
-  getSalesLedgerWithProducts,
-  addOrUpdateSalesLedgerProduct,
-  delProduct,
-  delLedgerFile,
-  getProductInfoByContractNo,
-} from "@/api/salesManagement/salesLedger.js";
-import {
-  addOrEditPurchase,
-  delPurchase,
-  getSalesNo,
-  purchaseListPage,
-  productList,
-  getPurchaseById,
-  getOptions,
-  createPurchaseNo, updateApprovalStatus,
-} from "@/api/procurementManagement/procurementLedger.js";
-import useFormData from "@/hooks/useFormData.js";
-import QRCode from "qrcode";
+  import { getToken } from "@/utils/auth";
+  import pagination from "@/components/PIMTable/Pagination.vue";
+  import {
+    ref,
+    onMounted,
+    reactive,
+    toRefs,
+    getCurrentInstance,
+    nextTick,
+  } from "vue";
+  import { Search } from "@element-plus/icons-vue";
+  import { ElMessageBox } from "element-plus";
+  import { userListNoPage } from "@/api/system/user.js";
+  import {
+    getSalesLedgerWithProducts,
+    addOrUpdateSalesLedgerProduct,
+    delProduct,
+    delLedgerFile,
+    getProductInfoByContractNo,
+  } from "@/api/salesManagement/salesLedger.js";
+  import {
+    addOrEditPurchase,
+    delPurchase,
+    getSalesNo,
+    purchaseListPage,
+    productList,
+    getPurchaseById,
+    getOptions,
+    createPurchaseNo,
+    updateApprovalStatus,
+  } from "@/api/procurementManagement/procurementLedger.js";
+  import useFormData from "@/hooks/useFormData.js";
+  import QRCode from "qrcode";
 
+  const { proxy } = getCurrentInstance();
+  const tableData = ref([]);
+  const productData = ref([]);
+  const selectedRows = ref([]);
+  const productSelectedRows = ref([]);
+  const modelOptions = ref([]);
+  const userList = ref([]);
+  const productOptions = ref([]);
+  const salesContractList = ref([]);
+  const supplierList = ref([]);
+  const tableLoading = ref(false);
+  const page = reactive({
+    current: 1,
+    size: 100,
+  });
+  const total = ref(0);
+  const fileList = ref([]);
+  import useUserStore from "@/store/modules/user";
+  import { modelList, productTreeList } from "@/api/basicData/product.js";
+  import dayjs from "dayjs";
+  import { getCurrentDate } from "@/utils/index.js";
 
-const { proxy } = getCurrentInstance();
-const tableData = ref([]);
-const productData = ref([]);
-const selectedRows = ref([]);
-const productSelectedRows = ref([]);
-const modelOptions = ref([]);
-const userList = ref([]);
-const productOptions = ref([]);
-const salesContractList = ref([]);
-const supplierList = ref([]);
-const tableLoading = ref(false);
-const page = reactive({
-  current: 1,
-  size: 100,
-});
-const total = ref(0);
-const fileList = ref([]);
-import useUserStore from "@/store/modules/user";
-import { modelList, productTreeList } from "@/api/basicData/product.js";
-import dayjs from "dayjs";
-import { getCurrentDate } from "@/utils/index.js";
+  const userStore = useUserStore();
 
-const userStore = useUserStore();
+  // 浜岀淮鐮佺浉鍏冲彉閲�
+  const qrCodeDialogVisible = ref(false);
+  const qrCodeUrl = ref("");
 
-// 浜岀淮鐮佺浉鍏冲彉閲�
-const qrCodeDialogVisible = ref(false);
-const qrCodeUrl = ref("");
+  // 璁㈠崟瀹℃壒鐘舵�佹樉绀烘枃鏈�
+  const approvalStatusText = {
+    0: "寰呭鎵�",
+    1: "瀹℃壒閫氳繃",
+    2: "瀹℃壒澶辫触",
+  };
 
-// 璁㈠崟瀹℃壒鐘舵�佹樉绀烘枃鏈�
-const approvalStatusText = {
-  0: '寰呭鎵�',
-  1: '瀹℃壒閫氳繃',
-  2: '瀹℃壒澶辫触'
-};
+  // 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
+  const operationType = ref("");
+  const dialogFormVisible = ref(false);
+  const data = reactive({
+    searchForm: {
+      supplierName: "", // 渚涘簲鍟嗗悕绉�
+      purchaseContractNumber: "", // 閲囪喘鍚堝悓缂栧彿
+      salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
+      projectName: "", // 椤圭洰鍚嶇О
+      entryDate: null, // 褰曞叆鏃ユ湡
+      entryDateStart: undefined,
+      entryDateEnd: undefined,
+    },
+    form: {
+      purchaseContractNumber: "",
+      salesLedgerId: "",
+      projectName: "",
+      recorderId: "",
+      entryDate: "",
+      productData: [],
+      supplierName: "",
+      supplierId: "",
+      paymentMethod: "",
+      executionDate: "",
+      approvalStatus: "0",
+    },
+    rules: {
+      purchaseContractNumber: [
+        { required: true, message: "璇疯緭鍏�", trigger: "blur" },
+      ],
+      projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+      supplierId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+      entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+      executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    },
+  });
+  const { form, rules } = toRefs(data);
+  const { form: searchForm } = useFormData(data.searchForm);
 
-// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
-const operationType = ref("");
-const dialogFormVisible = ref(false);
-const data = reactive({
-  searchForm: {
-    supplierName: "", // 渚涘簲鍟嗗悕绉�
-    purchaseContractNumber: "", // 閲囪喘鍚堝悓缂栧彿
-    salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
-    projectName: "", // 椤圭洰鍚嶇О
-    entryDate: null, // 褰曞叆鏃ユ湡
-    entryDateStart: undefined,
-    entryDateEnd: undefined,
-  },
-  form: {
-    purchaseContractNumber: "",
-    salesLedgerId: "",
-    projectName: "",
-    recorderId: "",
-    entryDate: "",
-    productData: [],
-    supplierName: "",
-    supplierId: "",
-    paymentMethod: "",
-		executionDate: "",
-    approvalStatus: "0",
-  },
-  rules: {
-    purchaseContractNumber: [
-      { required: true, message: "璇疯緭鍏�", trigger: "blur" },
-    ],
-    projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    supplierId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-		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 productOperationIndex = ref("");
+  const currentId = ref("");
+  const productFormData = reactive({
+    productForm: {
+      productId: "",
+      productCategory: "",
+      productModelId: "",
+      specificationModel: "",
+      unit: "",
+      quantity: "",
+      taxInclusiveUnitPrice: "",
+      taxRate: "",
+      taxInclusiveTotalPrice: "",
+      taxExclusiveTotalPrice: "",
+      invoiceType: "",
+      warnNum: "",
+    },
+    productRules: {
+      productId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+      productModelId: [{ 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" }],
+      warnNum: [{ required: false, 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 upload = reactive({
+    // 涓婁紶鐨勫湴鍧�
+    url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
+    // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+    headers: { Authorization: "Bearer " + getToken() },
+  });
 
-// 浜у搧琛ㄥ崟寮规鏁版嵁
-const productFormVisible = ref(false);
-const productOperationType = ref("");
-const productOperationIndex = ref("");
-const currentId = ref("");
-const productFormData = reactive({
-  productForm: {
-    productId: "",
-    productCategory: "",
-    productModelId: "",
-    specificationModel: "",
-    unit: "",
-    quantity: "",
-    taxInclusiveUnitPrice: "",
-    taxRate: "",
-    taxInclusiveTotalPrice: "",
-    taxExclusiveTotalPrice: "",
-    invoiceType: "",
-		warnNum: "",
-  },
-  productRules: {
-    productId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    productModelId: [{ 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" }],
-		warnNum: [{ required: false, 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 upload = reactive({
-  // 涓婁紶鐨勫湴鍧�
-  url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
-  // 璁剧疆涓婁紶鐨勮姹傚ご閮�
-  headers: { Authorization: "Bearer " + getToken() },
-});
+  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 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 formattedNumber = (row, column, cellValue) => {
-  return parseFloat(cellValue).toFixed(2);
-};
-// 鏌ヨ鍒楄〃
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-const handleQuery = () => {
-  page.current = 1;
-  getList();
-};
-// 瀛愯〃鍚堣鏂规硶
-const summarizeChildrenTable = (param) => {
-  return proxy.summarizeTable(
-    param,
-    [
+  const formattedNumber = (row, column, cellValue) => {
+    return parseFloat(cellValue).toFixed(2);
+  };
+  // 鏌ヨ鍒楄〃
+  /** 鎼滅储鎸夐挳鎿嶄綔 */
+  const handleQuery = () => {
+    page.current = 1;
+    getList();
+  };
+  // 瀛愯〃鍚堣鏂规硶
+  const summarizeChildrenTable = param => {
+    return proxy.summarizeTable(
+      param,
+      [
+        "taxInclusiveUnitPrice",
+        "taxInclusiveTotalPrice",
+        "taxExclusiveTotalPrice",
+        "ticketsNum",
+        "ticketsAmount",
+        "futureTickets",
+        "futureTicketsAmount",
+      ],
+      {
+        ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+        futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+      }
+    );
+  };
+  const paginationChange = obj => {
+    page.current = obj.page;
+    page.size = obj.limit;
+    getList();
+  };
+  const getList = () => {
+    tableLoading.value = true;
+    const { entryDate, ...rest } = searchForm;
+    purchaseListPage({ ...rest, ...page })
+      .then(res => {
+        tableLoading.value = false;
+        // tableData.value = res.data.records;
+        // 澶勭悊鏁版嵁锛屾坊鍔犲け鏁堢姸鎬佹爣璁�
+        tableData.value = res.data.records.map(record => ({
+          ...record,
+          isInvalid: record.isWhite === 1,
+        }));
+        tableData.value.map(item => {
+          item.children = [];
+        });
+        total.value = res.data.total;
+        expandedRowKeys.value = [];
+      })
+      .catch(() => {
+        tableLoading.value = false;
+      });
+  };
+  // 琛ㄦ牸閫夋嫨鏁版嵁
+  const handleSelectionChange = selection => {
+    selectedRows.value = selection;
+  };
+  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: 2 }).then(res => {
+          const index = tableData.value.findIndex(item => item.id === row.id);
+          if (index > -1) {
+            tableData.value[index].children = res.data;
+          }
+          expandedRowKeys.value.push(row.id);
+        });
+      } catch (error) {
+        console.log(error);
+      }
+    } else {
+      expandedRowKeys.value = [];
+    }
+  };
+  // 涓昏〃鍚堣鏂规硶
+  const summarizeMainTable = param => {
+    return proxy.summarizeTable(param, ["contractAmount"]);
+  };
+  // 瀛愯〃鍚堣鏂规硶
+  const summarizeProTable = param => {
+    return proxy.summarizeTable(param, [
       "taxInclusiveUnitPrice",
       "taxInclusiveTotalPrice",
       "taxExclusiveTotalPrice",
-      "ticketsNum",
-      "ticketsAmount",
-      "futureTickets",
-      "futureTicketsAmount",
-    ],
-    {
-      ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
-      futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
-    }
-  );
-};
-const paginationChange = (obj) => {
-  page.current = obj.page;
-  page.size = obj.limit;
-  getList();
-};
-const getList = () => {
-  tableLoading.value = true;
-  const { entryDate, ...rest } = searchForm;
-  purchaseListPage({ ...rest, ...page })
-    .then((res) => {
-      tableLoading.value = false;
-      // tableData.value = res.data.records;
-      // 澶勭悊鏁版嵁锛屾坊鍔犲け鏁堢姸鎬佹爣璁�
-      tableData.value = res.data.records.map(record => ({
-        ...record,
-        isInvalid: record.isWhite === 1
-      }));
-      tableData.value.map((item) => {
-        item.children = [];
+    ]);
+  };
+  // 鎵撳紑寮规
+  const openForm = (type, row) => {
+    operationType.value = type;
+    form.value = {};
+    productData.value = [];
+    fileList.value = [];
+    if (operationType.value == "add") {
+      createPurchaseNo().then(res => {
+        form.value.purchaseContractNumber = res.data;
       });
-      total.value = res.data.total;
-      expandedRowKeys.value = [];
-    })
-    .catch(() => {
-      tableLoading.value = false;
+    }
+    userListNoPage().then(res => {
+      userList.value = res.data;
     });
-};
-// 琛ㄦ牸閫夋嫨鏁版嵁
-const handleSelectionChange = (selection) => {
-  selectedRows.value = selection;
-};
-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: 2 }).then((res) => {
-        const index = tableData.value.findIndex((item) => item.id === row.id);
-        if (index > -1) {
-          tableData.value[index].children = res.data;
+    getSalesNo().then(res => {
+      salesContractList.value = res;
+    });
+    getOptions().then(res => {
+      // 渚涘簲鍟嗚繃婊ゅ嚭isWhite=0 鐨勬暟鎹�
+      supplierList.value = res.data.filter(item => item.isWhite == 0);
+    });
+    form.value.recorderId = userStore.id;
+    form.value.entryDate = getCurrentDate();
+    if (type === "edit") {
+      currentId.value = row.id;
+      getPurchaseById({ id: row.id, type: 2 }).then(res => {
+        form.value = { ...res };
+        productData.value = form.value.productData;
+        if (form.value.salesLedgerFiles) {
+          fileList.value = form.value.salesLedgerFiles;
+        } else {
+          fileList.value = [];
         }
-        expandedRowKeys.value.push(row.id);
       });
-    } catch (error) {
-      console.log(error);
     }
-  } else {
-    expandedRowKeys.value = [];
+    dialogFormVisible.value = true;
+  };
+  // 涓婁紶鍓嶆牎妫�
+  function handleBeforeUpload(file) {
+    // 鏍℃鏂囦欢澶у皬
+    if (file.size > 1024 * 1024 * 10) {
+      proxy.$modal.msgError("涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!");
+      return false;
+    }
+    proxy.$modal.loading("姝e湪涓婁紶鏂囦欢锛岃绋嶅��...");
+    return true;
   }
-};
-// 涓昏〃鍚堣鏂规硶
-const summarizeMainTable = (param) => {
-  return proxy.summarizeTable(param, ["contractAmount"]);
-};
-// 瀛愯〃鍚堣鏂规硶
-const summarizeProTable = (param) => {
-  return proxy.summarizeTable(param, [
-    "taxInclusiveUnitPrice",
-    "taxInclusiveTotalPrice",
-    "taxExclusiveTotalPrice",
-  ]);
-};
-// 鎵撳紑寮规
-const openForm = (type, row) => {
-  operationType.value = type;
-  form.value = {};
-  productData.value = [];
-  fileList.value = [];
-  if (operationType.value == "add") {
-    createPurchaseNo().then((res) => {
-      form.value.purchaseContractNumber = res.data;
-    });
+  // 涓婁紶澶辫触
+  function handleUploadError(err) {
+    proxy.$modal.msgError("涓婁紶鏂囦欢澶辫触");
+    proxy.$modal.closeLoading();
   }
-  userListNoPage().then((res) => {
-    userList.value = res.data;
-  });
-  getSalesNo().then((res) => {
-    salesContractList.value = res;
-  });
-  getOptions().then((res) => {
-    // 渚涘簲鍟嗚繃婊ゅ嚭isWhite=0 鐨勬暟鎹�
-    supplierList.value = res.data.filter((item) => item.isWhite == 0);
-  });
-  form.value.recorderId = userStore.id;
-  form.value.entryDate = getCurrentDate();
-  if (type === "edit") {
-    currentId.value = row.id;
-    getPurchaseById({ id: row.id, type: 2 }).then((res) => {
-      form.value = { ...res };
-      productData.value = form.value.productData;
-      if (form.value.salesLedgerFiles) {
-        fileList.value = form.value.salesLedgerFiles;
-      } else {
-        fileList.value = [];
+  // 涓婁紶鎴愬姛鍥炶皟
+  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) {
+    console.log("handleRemove", file.id);
+    if (file.size > 1024 * 1024 * 10) {
+      // 浠呭墠绔竻鐞嗭紝涓嶈皟鐢ㄥ垹闄ゆ帴鍙e拰鎻愮ず
+      return;
+    }
+    if (operationType.value === "edit") {
+      let ids = [];
+      ids.push(file.id);
+      delLedgerFile(ids).then(res => {
+        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      });
+    }
+  }
+  // 鎻愪氦琛ㄥ崟
+  const submitForm = n => {
+    proxy.$refs["formRef"].validate(valid => {
+      if (valid) {
+        if (productData.value.length > 0) {
+          form.value.productData = proxy.HaveJson(productData.value);
+        } else {
+          proxy.$modal.msgWarning("璇锋坊鍔犱骇鍝佷俊鎭�");
+          return;
+        }
+        let tempFileIds = [];
+        if (fileList.value.length > 0) {
+          tempFileIds = fileList.value.map(item => item.tempId);
+        }
+        form.value.tempFileIds = tempFileIds;
+        form.value.type = 2;
+        form.value.approvalStatus = n;
+        addOrEditPurchase(form.value).then(res => {
+          proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+          closeDia();
+          getList();
+        });
       }
     });
-  }
-  dialogFormVisible.value = true;
-};
-// 涓婁紶鍓嶆牎妫�
-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 handleRemove(file) {
-  console.log("handleRemove", file.id);
-  if (file.size > 1024 * 1024 * 10) { 
-    // 浠呭墠绔竻鐞嗭紝涓嶈皟鐢ㄥ垹闄ゆ帴鍙e拰鎻愮ず
-    return; 
-  }
-  if (operationType.value === "edit") {
-    let ids = [];
-    ids.push(file.id);
-    delLedgerFile(ids).then((res) => {
-      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+  };
+  // 鍏抽棴寮规
+  const closeDia = () => {
+    proxy.resetForm("formRef");
+    dialogFormVisible.value = false;
+  };
+  // 鎵撳紑浜у搧寮规
+  const openProductForm = (type, row, index) => {
+    productOperationType.value = type;
+    productOperationIndex.value = index;
+    productForm.value = {};
+    proxy.resetForm("productFormRef");
+    if (type === "edit") {
+      productForm.value = { ...row };
+    }
+    productFormVisible.value = true;
+    getProductOptions();
+  };
+  const getProductOptions = () => {
+    productTreeList().then(res => {
+      productOptions.value = convertIdToValue(res);
+    });
+  };
+  const getModels = value => {
+    if (value) {
+      productForm.value.productCategory =
+        findNodeById(productOptions.value, value) || "";
+      modelList({ id: value }).then(res => {
+        modelOptions.value = res;
+      });
+    } else {
+      productForm.value.productCategory = "";
+      modelOptions.value = [];
+    }
+  };
+  const getProductModel = 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; // 鎵惧埌鑺傜偣锛岃繑鍥炶鑺傜偣鐨刲abel
+      }
+      if (nodes[i].children && nodes[i].children.length > 0) {
+        const foundNode = findNodeById(nodes[i].children, productId);
+        if (foundNode) {
+          return foundNode; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝鐩存帴杩斿洖锛堝凡缁忔槸label瀛楃涓诧級
+        }
+      }
+    }
+    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 submitForm = (n) => {
-  proxy.$refs["formRef"].validate((valid) => {
-    if (valid) {
-      if (productData.value.length > 0) {
-        form.value.productData = proxy.HaveJson(productData.value);
-      } else {
-        proxy.$modal.msgWarning("璇锋坊鍔犱骇鍝佷俊鎭�");
+  // 鎻愪氦浜у搧琛ㄥ崟
+  const submitProduct = () => {
+    proxy.$refs["productFormRef"].validate(valid => {
+      if (valid) {
+        if (operationType.value === "edit") {
+          submitProductEdit();
+        } else {
+          if (productOperationType.value === "add") {
+            productData.value.push({ ...productForm.value });
+            console.log("productData.value---", productData.value);
+          } else {
+            productData.value[productOperationIndex.value] = {
+              ...productForm.value,
+            };
+          }
+          closeProductDia();
+        }
+      }
+    });
+  };
+  const submitProductEdit = () => {
+    productForm.value.salesLedgerId = currentId.value;
+    productForm.value.type = 2;
+    addOrUpdateSalesLedgerProduct(productForm.value).then(res => {
+      proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+      closeProductDia();
+      getPurchaseById({ id: currentId.value, type: 2 }).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: 2 }).then(
+              res => {
+                productData.value = res.productData;
+              }
+            );
+          });
+        })
+        .catch(() => {
+          proxy.$modal.msg("宸插彇娑�");
+        });
+    }
+  };
+  // 鍏抽棴浜у搧寮规
+  const closeProductDia = () => {
+    proxy.resetForm("productFormRef");
+    productFormVisible.value = false;
+  };
+  // 瀹℃壒閫氳繃鏂规硶
+  const approvePurchase = row => {
+    ElMessageBox.confirm(
+      `纭閫氳繃閲囪喘鍚堝悓鍙蜂负 ${row.purchaseContractNumber} 鐨勫鎵癸紵`,
+      "瀹℃壒纭",
+      {
+        confirmButtonText: "纭",
+        cancelButtonText: "鍙栨秷",
+        type: "warning",
+      }
+    )
+      .then(() => {
+        updateApprovalStatus({ id: row.id, approvalStatus: 1 }).then(res => {
+          proxy.$modal.msgSuccess("瀹℃壒鎴愬姛");
+          getList();
+        });
+      })
+      .catch(() => {
+        proxy.$modal.msg("宸插彇娑堝鎵�");
+      });
+  };
+
+  // 瀹℃壒鎷掔粷鏂规硶
+  const rejectPurchase = row => {
+    ElMessageBox.confirm(
+      `纭鎷掔粷閲囪喘鍚堝悓鍙蜂负 ${row.purchaseContractNumber} 鐨勫鎵癸紵`,
+      "瀹℃壒纭",
+      {
+        confirmButtonText: "纭",
+        cancelButtonText: "鍙栨秷",
+        type: "warning",
+      }
+    )
+      .then(() => {
+        updateApprovalStatus({ id: row.id, approvalStatus: 2 }).then(res => {
+          proxy.$modal.msgSuccess("瀹℃壒鎴愬姛");
+          getList();
+        });
+      })
+      .catch(() => {
+        proxy.$modal.msg("宸插彇娑堝鎵�");
+      });
+  };
+
+  // 瀵煎嚭
+  const handleOut = () => {
+    ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+      confirmButtonText: "纭",
+      cancelButtonText: "鍙栨秷",
+      type: "warning",
+    })
+      .then(() => {
+        proxy.download("/purchase/ledger/export", {}, "閲囪喘鍙拌处.xlsx");
+      })
+      .catch(() => {
+        proxy.$modal.msg("宸插彇娑�");
+      });
+  };
+  // 鍒犻櫎
+  const handleDelete = () => {
+    let ids = [];
+    if (selectedRows.value.length > 0) {
+      // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
+      const unauthorizedData = selectedRows.value.filter(
+        item => item.recorderName !== userStore.nickName
+      );
+      if (unauthorizedData.length > 0) {
+        proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
         return;
       }
-      let tempFileIds = [];
-      if (fileList.value.length > 0) {
-        tempFileIds = fileList.value.map((item) => item.tempId);
-      }
-      form.value.tempFileIds = tempFileIds;
-      form.value.type = 2;
-      form.value.approvalStatus = n;
-      addOrEditPurchase(form.value).then((res) => {
-        proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
-        closeDia();
-        getList();
-      });
-    }
-  });
-};
-// 鍏抽棴寮规
-const closeDia = () => {
-  proxy.resetForm("formRef");
-  dialogFormVisible.value = false;
-};
-// 鎵撳紑浜у搧寮规
-const openProductForm = (type, row, index) => {
-  productOperationType.value = type;
-  productOperationIndex.value = index;
-  productForm.value = {};
-  proxy.resetForm("productFormRef");
-  if (type === "edit") {
-    productForm.value = { ...row };
-  }
-  productFormVisible.value = true;
-  getProductOptions();
-};
-const getProductOptions = () => {
-  productTreeList().then((res) => {
-    productOptions.value = convertIdToValue(res);
-  });
-};
-const getModels = (value) => {
-  if (value) {
-    productForm.value.productCategory = findNodeById(productOptions.value, value) || "";
-    modelList({ id: value }).then((res) => {
-      modelOptions.value = res;
-    });
-  } else {
-    productForm.value.productCategory = "";
-    modelOptions.value = [];
-  }
-};
-const getProductModel = (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; // 鎵惧埌鑺傜偣锛岃繑鍥炶鑺傜偣鐨刲abel
-    }
-    if (nodes[i].children && nodes[i].children.length > 0) {
-      const foundNode = findNodeById(nodes[i].children, productId);
-      if (foundNode) {
-        return foundNode; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝鐩存帴杩斿洖锛堝凡缁忔槸label瀛楃涓诧級
-      }
-    }
-  }
-  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 submitProduct = () => {
-  proxy.$refs["productFormRef"].validate((valid) => {
-    if (valid) {
-      if (operationType.value === "edit") {
-        submitProductEdit();
-      } else {
-        if (productOperationType.value === "add") {
-          productData.value.push({ ...productForm.value });
-          console.log("productData.value---", productData.value);
-        } else {
-          productData.value[productOperationIndex.value] = {
-            ...productForm.value,
-          };
-        }
-        closeProductDia();
-      }
-    }
-  });
-};
-const submitProductEdit = () => {
-  productForm.value.salesLedgerId = currentId.value;
-  productForm.value.type = 2;
-  addOrUpdateSalesLedgerProduct(productForm.value).then((res) => {
-    proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
-    closeProductDia();
-    getPurchaseById({ id: currentId.value, type: 2 }).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);
+      ids = selectedRows.value.map(item => item.id);
+    } else {
+      proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+      return;
     }
     ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
       confirmButtonText: "纭",
@@ -681,384 +774,313 @@
       type: "warning",
     })
       .then(() => {
-        delProduct(ids).then((res) => {
+        delPurchase(ids).then(res => {
           proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          closeProductDia();
-          getSalesLedgerWithProducts({ id: currentId.value, type: 2 }).then(
-            (res) => {
-              productData.value = res.productData;
-            }
-          );
+          getList();
         });
       })
       .catch(() => {
         proxy.$modal.msg("宸插彇娑�");
       });
-  }
-};
-// 鍏抽棴浜у搧寮规
-const closeProductDia = () => {
-  proxy.resetForm("productFormRef");
-  productFormVisible.value = false;
-};
-// 瀹℃壒閫氳繃鏂规硶
-const approvePurchase = (row) => {
-  ElMessageBox.confirm(`纭閫氳繃閲囪喘鍚堝悓鍙蜂负 ${row.purchaseContractNumber} 鐨勫鎵癸紵`, '瀹℃壒纭', {
-    confirmButtonText: '纭',
-    cancelButtonText: '鍙栨秷',
-    type: 'warning',
-  }).then(() => {
-    updateApprovalStatus({ id: row.id, approvalStatus: 1}).then((res)=>{
-      proxy.$modal.msgSuccess('瀹℃壒鎴愬姛');
-      getList();
-    })
-  }).catch(() => {
-    proxy.$modal.msg('宸插彇娑堝鎵�');
-  });
-};
-
-// 瀹℃壒鎷掔粷鏂规硶
-const rejectPurchase = (row) => {
-  ElMessageBox.confirm(`纭鎷掔粷閲囪喘鍚堝悓鍙蜂负 ${row.purchaseContractNumber} 鐨勫鎵癸紵`, '瀹℃壒纭', {
-    confirmButtonText: '纭',
-    cancelButtonText: '鍙栨秷',
-    type: 'warning',
-  }).then(() => {
-    updateApprovalStatus({ id: row.id, approvalStatus: 2}).then((res)=>{
-      proxy.$modal.msgSuccess('瀹℃壒鎴愬姛');
-      getList();
-    })
-  }).catch(() => {
-    proxy.$modal.msg('宸插彇娑堝鎵�');
-  });
-};
-
-// 瀵煎嚭
-const handleOut = () => {
-  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
-    confirmButtonText: "纭",
-    cancelButtonText: "鍙栨秷",
-    type: "warning",
-  })
-    .then(() => {
-      proxy.download("/purchase/ledger/export", {}, "閲囪喘鍙拌处.xlsx");
-    })
-    .catch(() => {
-      proxy.$modal.msg("宸插彇娑�");
-    });
-};
-// 鍒犻櫎
-const handleDelete = () => {
-  let ids = [];
-  if (selectedRows.value.length > 0) {
-		// 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
-		const unauthorizedData = selectedRows.value.filter(item => item.recorderName !== userStore.nickName);
-		if (unauthorizedData.length > 0) {
-			proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
-			return;
-		}
-    ids = selectedRows.value.map((item) => item.id);
-  } else {
-    proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
-    return;
-  }
-  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
-    confirmButtonText: "纭",
-    cancelButtonText: "鍙栨秷",
-    type: "warning",
-  })
-    .then(() => {
-      delPurchase(ids).then((res) => {
-        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        getList();
-      });
-    })
-    .catch(() => {
-      proxy.$modal.msg("宸插彇娑�");
-    });
-};
-const mathNum = () => {
-	if (!productForm.value.taxRate) {
-		proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
-		return;
-	}
-  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 reverseMathNum = (field) => {
-	if (!productForm.value.taxRate) {
-		proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
-		return;
-	}
-  const taxRate = Number(productForm.value.taxRate);
-  if (!taxRate) return;
-  if (field === 'taxInclusiveTotalPrice') {
-    // 宸茬煡鍚◣鎬讳环鍜屾暟閲忥紝鍙嶇畻鍚◣鍗曚环
-    if (productForm.value.quantity) {
-      productForm.value.taxInclusiveUnitPrice = 
-        (Number(productForm.value.taxInclusiveTotalPrice) / Number(productForm.value.quantity)).toFixed(2);
-    }
-    // 宸茬煡鍚◣鎬讳环鍜屽惈绋庡崟浠凤紝鍙嶇畻鏁伴噺
-    else if (productForm.value.taxInclusiveUnitPrice) {
-      productForm.value.quantity = 
-        (Number(productForm.value.taxInclusiveTotalPrice) / Number(productForm.value.taxInclusiveUnitPrice)).toFixed(2);
-    }
-    // 鍙嶇畻涓嶅惈绋庢�讳环
-    productForm.value.taxExclusiveTotalPrice = 
-      (Number(productForm.value.taxInclusiveTotalPrice) / (1 + taxRate / 100)).toFixed(2);
-  } else if (field === 'taxExclusiveTotalPrice') {
-    // 鍙嶇畻鍚◣鎬讳环
-    productForm.value.taxInclusiveTotalPrice = 
-      (Number(productForm.value.taxExclusiveTotalPrice) * (1 + taxRate / 100)).toFixed(2);
-    // 宸茬煡鏁伴噺锛屽弽绠楀惈绋庡崟浠�
-    if (productForm.value.quantity) {
-      productForm.value.taxInclusiveUnitPrice = 
-        (Number(productForm.value.taxInclusiveTotalPrice) / Number(productForm.value.quantity)).toFixed(2);
-    }
-    // 宸茬煡鍚◣鍗曚环锛屽弽绠楁暟閲�
-    else if (productForm.value.taxInclusiveUnitPrice) {
-      productForm.value.quantity = 
-        (Number(productForm.value.taxInclusiveTotalPrice) / Number(productForm.value.taxInclusiveUnitPrice)).toFixed(2);
-    }
-  }
-};
-// 閿�鍞悎鍚岄�夋嫨鏀瑰彉鏂规硶
-const salesLedgerChange = async (row) => {
-  console.log("row", row);
-  var index = salesContractList.value.findIndex((item) => item.id == row);
-  console.log("index", index);
-  if (index > -1) {
-    form.value.projectName = salesContractList.value[index].projectName;
-    await querygProductInfoByContractNo();
-  }
-};
-
-const querygProductInfoByContractNo = async () => {
-  const { code, data } = await getProductInfoByContractNo({
-    contractNo: form.value.salesLedgerId,
-  });
-  if (code == 200) {
-    productData.value = data;
-  }
-};
-
-// 鏄剧ず浜岀淮鐮�
-const showQRCode = async (row) => {
-  try {
-    // 鏋勫缓浜岀淮鐮佸唴瀹癸紝鍙寘鍚噰璐悎鍚屽彿锛堢函鏂囨湰锛�
-    const qrContent = row.purchaseContractNumber || '';
-    // 妫�鏌ュ唴瀹规槸鍚︿负绌�
-    if (!qrContent || qrContent.trim() === '') {
-      proxy.$modal.msgWarning("璇ヨ娌℃湁閲囪喘鍚堝悓鍙凤紝鏃犳硶鐢熸垚浜岀淮鐮�");
+  };
+  const mathNum = () => {
+    if (!productForm.value.taxRate) {
+      proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
       return;
     }
-    qrCodeUrl.value = await QRCode.toDataURL(qrContent, {
-      width: 200,
-      margin: 2,
-      color: {
-        dark: '#000000',
-        light: '#FFFFFF'
+    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 reverseMathNum = field => {
+    if (!productForm.value.taxRate) {
+      proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+      return;
+    }
+    const taxRate = Number(productForm.value.taxRate);
+    if (!taxRate) return;
+    if (field === "taxInclusiveTotalPrice") {
+      // 宸茬煡鍚◣鎬讳环鍜屾暟閲忥紝鍙嶇畻鍚◣鍗曚环
+      if (productForm.value.quantity) {
+        productForm.value.taxInclusiveUnitPrice = (
+          Number(productForm.value.taxInclusiveTotalPrice) /
+          Number(productForm.value.quantity)
+        ).toFixed(2);
+      }
+      // 宸茬煡鍚◣鎬讳环鍜屽惈绋庡崟浠凤紝鍙嶇畻鏁伴噺
+      else if (productForm.value.taxInclusiveUnitPrice) {
+        productForm.value.quantity = (
+          Number(productForm.value.taxInclusiveTotalPrice) /
+          Number(productForm.value.taxInclusiveUnitPrice)
+        ).toFixed(2);
+      }
+      // 鍙嶇畻涓嶅惈绋庢�讳环
+      productForm.value.taxExclusiveTotalPrice = (
+        Number(productForm.value.taxInclusiveTotalPrice) /
+        (1 + taxRate / 100)
+      ).toFixed(2);
+    } else if (field === "taxExclusiveTotalPrice") {
+      // 鍙嶇畻鍚◣鎬讳环
+      productForm.value.taxInclusiveTotalPrice = (
+        Number(productForm.value.taxExclusiveTotalPrice) *
+        (1 + taxRate / 100)
+      ).toFixed(2);
+      // 宸茬煡鏁伴噺锛屽弽绠楀惈绋庡崟浠�
+      if (productForm.value.quantity) {
+        productForm.value.taxInclusiveUnitPrice = (
+          Number(productForm.value.taxInclusiveTotalPrice) /
+          Number(productForm.value.quantity)
+        ).toFixed(2);
+      }
+      // 宸茬煡鍚◣鍗曚环锛屽弽绠楁暟閲�
+      else if (productForm.value.taxInclusiveUnitPrice) {
+        productForm.value.quantity = (
+          Number(productForm.value.taxInclusiveTotalPrice) /
+          Number(productForm.value.taxInclusiveUnitPrice)
+        ).toFixed(2);
+      }
+    }
+  };
+  // 閿�鍞悎鍚岄�夋嫨鏀瑰彉鏂规硶
+  const salesLedgerChange = async row => {
+    console.log("row", row);
+    var index = salesContractList.value.findIndex(item => item.id == row);
+    console.log("index", index);
+    if (index > -1) {
+      form.value.projectName = salesContractList.value[index].projectName;
+      await querygProductInfoByContractNo();
+    }
+  };
+
+  const querygProductInfoByContractNo = async () => {
+    const { code, data } = await getProductInfoByContractNo({
+      contractNo: form.value.salesLedgerId,
+    });
+    if (code == 200) {
+      productData.value = data;
+    }
+  };
+
+  // 鏄剧ず浜岀淮鐮�
+  const showQRCode = async row => {
+    try {
+      // 鏋勫缓浜岀淮鐮佸唴瀹癸紝鍙寘鍚噰璐悎鍚屽彿锛堢函鏂囨湰锛�
+      const qrContent = row.purchaseContractNumber || "";
+      // 妫�鏌ュ唴瀹规槸鍚︿负绌�
+      if (!qrContent || qrContent.trim() === "") {
+        proxy.$modal.msgWarning("璇ヨ娌℃湁閲囪喘鍚堝悓鍙凤紝鏃犳硶鐢熸垚浜岀淮鐮�");
+        return;
+      }
+      qrCodeUrl.value = await QRCode.toDataURL(qrContent, {
+        width: 200,
+        margin: 2,
+        color: {
+          dark: "#000000",
+          light: "#FFFFFF",
+        },
+      });
+      qrCodeDialogVisible.value = true;
+    } catch (error) {
+      console.error("鐢熸垚浜岀淮鐮佸け璐�:", error);
+      proxy.$modal.msgError("鐢熸垚浜岀淮鐮佸け璐ワ細" + error.message);
+    }
+  };
+
+  // 涓嬭浇浜岀淮鐮�
+  const downloadQRCode = () => {
+    if (!qrCodeUrl.value) {
+      proxy.$modal.msgWarning("浜岀淮鐮佹湭鐢熸垚");
+      return;
+    }
+
+    const a = document.createElement("a");
+    a.href = qrCodeUrl.value;
+    a.download = `閲囪喘鍚堝悓鍙蜂簩缁寸爜_${new Date().getTime()}.png`;
+    document.body.appendChild(a);
+    a.click();
+    document.body.removeChild(a);
+    proxy.$modal.msgSuccess("涓嬭浇鎴愬姛");
+  };
+
+  // 鎵爜鏂板瀵硅瘽妗嗙浉鍏冲彉閲�
+  const scanAddDialogVisible = ref(false);
+  const scanAddForm = reactive({
+    scanContent: "",
+    purchaseContractNumber: "",
+    supplierName: "",
+    projectName: "",
+    contractAmount: "",
+    paymentMethod: "",
+    recorderName: "",
+    scanRemark: "",
+  });
+  const scanAddRules = {
+    purchaseContractNumber: [
+      { required: true, message: "璇疯緭鍏ラ噰璐悎鍚屽彿", trigger: "blur" },
+    ],
+    supplierName: [
+      { required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" },
+    ],
+    projectName: [{ required: true, message: "璇疯緭鍏ラ」鐩悕绉�", trigger: "blur" }],
+  };
+
+  // 鎵爜鐧昏瀵硅瘽妗嗙浉鍏冲彉閲�
+  const scanDialogVisible = ref(false);
+  const scanForm = reactive({
+    purchaseContractNumber: "",
+    supplierName: "",
+    projectName: "",
+    scanTime: "",
+    scannerName: "",
+    scanStatus: "鏈壂鐮�",
+    scanRemark: "",
+  });
+  const scanRules = {
+    scanRemark: [{ required: true, message: "璇疯緭鍏ユ壂鐮佸娉�", trigger: "blur" }],
+  };
+  const scanRecords = ref([]);
+
+  // 鎵撳紑鎵爜鏂板瀵硅瘽妗�
+  const openScanAddDialog = () => {
+    scanAddForm.scanContent = "";
+    scanAddForm.purchaseContractNumber = "";
+    scanAddForm.supplierName = "";
+    scanAddForm.projectName = "";
+    scanAddForm.contractAmount = "";
+    scanAddForm.paymentMethod = "";
+    scanAddForm.recorderName = userStore.nickName;
+    scanAddForm.scanRemark = "";
+    scanAddDialogVisible.value = true;
+  };
+
+  // 瑙f瀽鎵爜鍐呭锛堟ā鎷熻В鏋愪簩缁寸爜鏁版嵁锛�
+  const parseScanContent = content => {
+    if (!content) return;
+
+    // 妯℃嫙瑙f瀽浜岀淮鐮佸唴瀹癸紝杩欓噷鍙互鏍规嵁瀹為檯闇�姹傝皟鏁磋В鏋愰�昏緫
+    // 鍋囪鎵爜鍐呭鏍煎紡涓猴細鍚堝悓鍙穦渚涘簲鍟唡椤圭洰|閲戦|浠樻鏂瑰紡
+    const parts = content.split("|");
+    if (parts.length >= 3) {
+      scanAddForm.purchaseContractNumber = parts[0] || "";
+      scanAddForm.supplierName = parts[1] || "";
+      scanAddForm.projectName = parts[2] || "";
+      scanAddForm.contractAmount = parts[3] || "";
+      scanAddForm.paymentMethod = parts[4] || "";
+    }
+  };
+
+  // 鍏抽棴鎵爜鏂板瀵硅瘽妗�
+  const closeScanAddDialog = () => {
+    scanAddDialogVisible.value = false;
+    proxy.resetForm("scanAddFormRef");
+  };
+
+  // 鎻愪氦鎵爜鏂板
+  const submitScanAdd = () => {
+    proxy.$refs["scanAddFormRef"].validate(valid => {
+      if (valid) {
+        // 鏋勫缓鏂板鏁版嵁
+        const newData = {
+          purchaseContractNumber: scanAddForm.purchaseContractNumber,
+          supplierName: scanAddForm.supplierName,
+          projectName: scanAddForm.projectName,
+          contractAmount: scanAddForm.contractAmount,
+          paymentMethod: scanAddForm.paymentMethod,
+          recorderName: scanAddForm.recorderName,
+          entryDate: getCurrentDate(),
+          remark: scanAddForm.scanRemark,
+          type: 2,
+        };
+
+        // 妯℃嫙鏂板鎴愬姛
+        proxy.$modal.msgSuccess("鎵爜鏂板鎴愬姛锛�");
+        closeScanAddDialog();
+
+        // 鍙互閫夋嫨鏄惁鍒锋柊鍒楄〃
+        // getList();
       }
     });
-    qrCodeDialogVisible.value = true;
-  } catch (error) {
-    console.error('鐢熸垚浜岀淮鐮佸け璐�:', error);
-    proxy.$modal.msgError("鐢熸垚浜岀淮鐮佸け璐ワ細" + error.message);
+  };
+
+  // 鎵撳紑鎵爜鐧昏瀵硅瘽妗�
+  const openScanDialog = row => {
+    scanForm.purchaseContractNumber = row.purchaseContractNumber;
+    scanForm.supplierName = row.supplierName;
+    scanForm.projectName = row.projectName;
+    scanForm.scanTime = getCurrentDateTime();
+    scanForm.scannerName = userStore.nickName;
+    scanForm.scanStatus = "鏈壂鐮�";
+    scanForm.scanRemark = "";
+    scanRecords.value = [];
+    scanDialogVisible.value = true;
+  };
+
+  // 鍏抽棴鎵爜鐧昏瀵硅瘽妗�
+  const closeScanDialog = () => {
+    scanDialogVisible.value = false;
+    proxy.resetForm("scanFormRef");
+  };
+
+  // 鎻愪氦鎵爜鐧昏
+  const submitScan = () => {
+    proxy.$refs["scanFormRef"].validate(valid => {
+      if (valid) {
+        // 娣诲姞鎵爜璁板綍
+        scanRecords.value.push({
+          ...scanForm,
+          id: Date.now(), // 妯℃嫙ID
+          scanTime: getCurrentDateTime(),
+        });
+        scanForm.scanStatus = "宸叉壂鐮�";
+        scanForm.scanRemark = scanForm.scanRemark || "鏃�";
+        proxy.$modal.msgSuccess("鎵爜鐧昏鎴愬姛锛�");
+        closeScanDialog();
+      }
+    });
+  };
+
+  // 鑾峰彇褰撳墠鏃ユ湡鏃堕棿
+  function getCurrentDateTime() {
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = String(now.getMonth() + 1).padStart(2, "0");
+    const day = String(now.getDate()).padStart(2, "0");
+    const hours = String(now.getHours()).padStart(2, "0");
+    const minutes = String(now.getMinutes()).padStart(2, "0");
+    const seconds = String(now.getSeconds()).padStart(2, "0");
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
   }
-};
 
-// 涓嬭浇浜岀淮鐮�
-const downloadQRCode = () => {
-  if (!qrCodeUrl.value) {
-    proxy.$modal.msgWarning("浜岀淮鐮佹湭鐢熸垚");
-    return;
-  }
-  
-  const a = document.createElement('a');
-  a.href = qrCodeUrl.value;
-  a.download = `閲囪喘鍚堝悓鍙蜂簩缁寸爜_${new Date().getTime()}.png`;
-  document.body.appendChild(a);
-  a.click();
-  document.body.removeChild(a);
-  proxy.$modal.msgSuccess("涓嬭浇鎴愬姛");
-};
+  // 娣诲姞琛岀被鍚嶆柟娉�
+  const tableRowClassName = ({ row }) => {
+    return row.isInvalid ? "invalid-row" : "";
+  };
 
-// 鎵爜鏂板瀵硅瘽妗嗙浉鍏冲彉閲�
-const scanAddDialogVisible = ref(false);
-const scanAddForm = reactive({
-  scanContent: "",
-  purchaseContractNumber: "",
-  supplierName: "",
-  projectName: "",
-  contractAmount: "",
-  paymentMethod: "",
-  recorderName: "",
-  scanRemark: "",
-});
-const scanAddRules = {
-  purchaseContractNumber: [{ required: true, message: "璇疯緭鍏ラ噰璐悎鍚屽彿", trigger: "blur" }],
-  supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }],
-  projectName: [{ required: true, message: "璇疯緭鍏ラ」鐩悕绉�", trigger: "blur" }],
-};
-
-// 鎵爜鐧昏瀵硅瘽妗嗙浉鍏冲彉閲�
-const scanDialogVisible = ref(false);
-const scanForm = reactive({
-  purchaseContractNumber: "",
-  supplierName: "",
-  projectName: "",
-  scanTime: "",
-  scannerName: "",
-  scanStatus: "鏈壂鐮�",
-  scanRemark: "",
-});
-const scanRules = {
-  scanRemark: [{ required: true, message: "璇疯緭鍏ユ壂鐮佸娉�", trigger: "blur" }],
-};
-const scanRecords = ref([]);
-
-// 鎵撳紑鎵爜鏂板瀵硅瘽妗�
-const openScanAddDialog = () => {
-  scanAddForm.scanContent = "";
-  scanAddForm.purchaseContractNumber = "";
-  scanAddForm.supplierName = "";
-  scanAddForm.projectName = "";
-  scanAddForm.contractAmount = "";
-  scanAddForm.paymentMethod = "";
-  scanAddForm.recorderName = userStore.nickName;
-  scanAddForm.scanRemark = "";
-  scanAddDialogVisible.value = true;
-};
-
-// 瑙f瀽鎵爜鍐呭锛堟ā鎷熻В鏋愪簩缁寸爜鏁版嵁锛�
-const parseScanContent = (content) => {
-  if (!content) return;
-  
-  // 妯℃嫙瑙f瀽浜岀淮鐮佸唴瀹癸紝杩欓噷鍙互鏍规嵁瀹為檯闇�姹傝皟鏁磋В鏋愰�昏緫
-  // 鍋囪鎵爜鍐呭鏍煎紡涓猴細鍚堝悓鍙穦渚涘簲鍟唡椤圭洰|閲戦|浠樻鏂瑰紡
-  const parts = content.split('|');
-  if (parts.length >= 3) {
-    scanAddForm.purchaseContractNumber = parts[0] || "";
-    scanAddForm.supplierName = parts[1] || "";
-    scanAddForm.projectName = parts[2] || "";
-    scanAddForm.contractAmount = parts[3] || "";
-    scanAddForm.paymentMethod = parts[4] || "";
-  }
-};
-
-// 鍏抽棴鎵爜鏂板瀵硅瘽妗�
-const closeScanAddDialog = () => {
-  scanAddDialogVisible.value = false;
-  proxy.resetForm("scanAddFormRef");
-};
-
-// 鎻愪氦鎵爜鏂板
-const submitScanAdd = () => {
-  proxy.$refs["scanAddFormRef"].validate((valid) => {
-    if (valid) {
-      // 鏋勫缓鏂板鏁版嵁
-      const newData = {
-        purchaseContractNumber: scanAddForm.purchaseContractNumber,
-        supplierName: scanAddForm.supplierName,
-        projectName: scanAddForm.projectName,
-        contractAmount: scanAddForm.contractAmount,
-        paymentMethod: scanAddForm.paymentMethod,
-        recorderName: scanAddForm.recorderName,
-        entryDate: getCurrentDate(),
-        remark: scanAddForm.scanRemark,
-        type: 2
-      };
-      
-      // 妯℃嫙鏂板鎴愬姛
-      proxy.$modal.msgSuccess("鎵爜鏂板鎴愬姛锛�");
-      closeScanAddDialog();
-      
-      // 鍙互閫夋嫨鏄惁鍒锋柊鍒楄〃
-      // getList();
-    }
+  onMounted(() => {
+    getList();
   });
-};
-
-// 鎵撳紑鎵爜鐧昏瀵硅瘽妗�
-const openScanDialog = (row) => {
-  scanForm.purchaseContractNumber = row.purchaseContractNumber;
-  scanForm.supplierName = row.supplierName;
-  scanForm.projectName = row.projectName;
-  scanForm.scanTime = getCurrentDateTime();
-  scanForm.scannerName = userStore.nickName;
-  scanForm.scanStatus = "鏈壂鐮�";
-  scanForm.scanRemark = "";
-  scanRecords.value = [];
-  scanDialogVisible.value = true;
-};
-
-// 鍏抽棴鎵爜鐧昏瀵硅瘽妗�
-const closeScanDialog = () => {
-  scanDialogVisible.value = false;
-  proxy.resetForm("scanFormRef");
-};
-
-// 鎻愪氦鎵爜鐧昏
-const submitScan = () => {
-  proxy.$refs["scanFormRef"].validate((valid) => {
-    if (valid) {
-      // 娣诲姞鎵爜璁板綍
-      scanRecords.value.push({
-        ...scanForm,
-        id: Date.now(), // 妯℃嫙ID
-        scanTime: getCurrentDateTime(),
-      });
-      scanForm.scanStatus = "宸叉壂鐮�";
-      scanForm.scanRemark = scanForm.scanRemark || "鏃�";
-      proxy.$modal.msgSuccess("鎵爜鐧昏鎴愬姛锛�");
-      closeScanDialog();
-    }
-  });
-};
-
-// 鑾峰彇褰撳墠鏃ユ湡鏃堕棿
-function getCurrentDateTime() {
-  const now = new Date();
-  const year = now.getFullYear();
-  const month = String(now.getMonth() + 1).padStart(2, "0");
-  const day = String(now.getDate()).padStart(2, "0");
-  const hours = String(now.getHours()).padStart(2, "0");
-  const minutes = String(now.getMinutes()).padStart(2, "0");
-  const seconds = String(now.getSeconds()).padStart(2, "0");
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-}
-
-// 娣诲姞琛岀被鍚嶆柟娉�
-const tableRowClassName = ({ row }) => {
-  return row.isInvalid ? 'invalid-row' : '';
-};
-
-onMounted(() => {
-  getList();
-});
 </script>
 
 <style scoped lang="scss">
-.invalid-row {
-  opacity: 0.6;
-  background-color: #f5f7fa;
-}
+  .invalid-row {
+    opacity: 0.6;
+    background-color: #f5f7fa;
+  }
 </style>
diff --git a/src/views/productionManagement/processRoute/index.vue b/src/views/productionManagement/processRoute/index.vue
index e30566e..a7d1a4c 100644
--- a/src/views/productionManagement/processRoute/index.vue
+++ b/src/views/productionManagement/processRoute/index.vue
@@ -48,6 +48,14 @@
                      v-model:visible="isShowItemModal"
                      :record="record"
                      @completed="getList" />
+    <FileListDialog ref="fileListDialogRef"
+                    v-model="fileDialogVisible"
+                    :show-upload-button="true"
+                    :show-delete-button="true"
+                    :delete-method="handleAttachmentDelete"
+                    :process-route-id="currentProcessRouteId"
+                    :name-column-label="'闄勪欢鍚嶇О'"
+                    @upload="handleAttachmentUpload" />
   </div>
 </template>
 
@@ -57,7 +65,14 @@
   import EditProcess from "@/views/productionManagement/processRoute/Edit.vue";
   import RouteItemForm from "@/views/productionManagement/processRoute/ItemsForm.vue";
   import { listPage, del } from "@/api/productionManagement/processRoute.js";
+  import {
+    listProcessRouteFiles,
+    addProcessRouteFile,
+    delProcessRouteFile,
+  } from "@/api/productionManagement/processRouteFile.js";
+  import FileListDialog from "@/components/Dialog/FileListDialog.vue";
   import { useRouter } from "vue-router";
+  import { ElMessage, ElMessageBox } from "element-plus";
 
   const router = useRouter();
   const data = reactive({
@@ -108,6 +123,13 @@
             showItemModal(row);
           },
         },
+        {
+          name: "闄勪欢",
+          type: "text",
+          clickFun: row => {
+            openFileDialog(row);
+          },
+        },
       ],
     },
   ]);
@@ -123,8 +145,79 @@
     size: 100,
     total: 0,
   });
+
+  // 闄勪欢鐩稿叧
+  const fileDialogVisible = ref(false);
+  const fileListDialogRef = ref(null);
+  const currentProcessRouteId = ref(null);
+  const filePage = reactive({
+    current: 1,
+    size: 1000,
+    total: 0,
+  });
+
   const { proxy } = getCurrentInstance();
 
+  // 闄勪欢锛氭煡璇�
+  const fetchProcessRouteFiles = async processRouteId => {
+    const params = {
+      current: filePage.current,
+      size: filePage.size,
+      processRouteId,
+    };
+    const res = await listProcessRouteFiles(params);
+    const records = res?.data?.records || [];
+    filePage.total = res?.data?.total || records.length;
+    const mapped = records.map(item => ({
+      id: item.id,
+      name: item.fileName || item.name,
+      url: item.fileUrl || item.url,
+      raw: item,
+    }));
+    fileListDialogRef.value?.setList(mapped);
+  };
+
+  // 鎵撳紑闄勪欢寮圭獥
+  const openFileDialog = async row => {
+    currentProcessRouteId.value = row.id;
+    fileDialogVisible.value = true;
+    await fetchProcessRouteFiles(row.id);
+  };
+
+  // 鍒锋柊闄勪欢鍒楄〃
+  const refreshFileList = async () => {
+    if (!currentProcessRouteId.value) return;
+    await fetchProcessRouteFiles(currentProcessRouteId.value);
+  };
+
+  // 涓婁紶闄勪欢
+  const handleAttachmentUpload = async filePayload => {
+    if (!currentProcessRouteId.value) return;
+    const payload = {
+      fileName: filePayload?.fileName || filePayload?.name,
+      fileUrl: filePayload?.fileUrl || filePayload?.url,
+      processRouteId: currentProcessRouteId.value,
+    };
+    await addProcessRouteFile(payload);
+    ElMessage.success("鏂囦欢涓婁紶鎴愬姛");
+    await refreshFileList();
+  };
+
+  // 鍒犻櫎闄勪欢
+  const handleAttachmentDelete = async row => {
+    if (!row?.id) return false;
+    try {
+      await ElMessageBox.confirm("纭鍒犻櫎璇ラ檮浠讹紵", "鎻愮ず", {
+        type: "warning",
+      });
+    } catch {
+      return false;
+    }
+    await delProcessRouteFile([row.id]);
+    ElMessage.success("鍒犻櫎鎴愬姛");
+    await refreshFileList();
+  };
+
   // 鏌ヨ鍒楄〃
   /** 鎼滅储鎸夐挳鎿嶄綔 */
   const handleQuery = () => {
diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index c9c478b..ea74186 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -1,44 +1,39 @@
 <template>
   <div>
-    <el-dialog
-        v-model="isShow"
-        title="鏂板鐢熶骇璁㈠崟"
-        width="800"
-        @close="closeModal"
-    >
-      <el-form label-width="140px" :model="formState" label-position="top" ref="formRef">
-        <el-form-item
-            label="浜у搧鍚嶇О"
-            prop="productModelId"
-            :rules="[
+    <el-dialog v-model="isShow"
+               title="鏂板鐢熶骇璁㈠崟"
+               width="800"
+               @close="closeModal">
+      <el-form label-width="140px"
+               :model="formState"
+               label-position="top"
+               ref="formRef">
+        <el-form-item label="浜у搧鍚嶇О"
+                      prop="productModelId"
+                      :rules="[
                 {
                 required: true,
                 message: '璇烽�夋嫨浜у搧',
                 trigger: 'change',
               }
-            ]"
-        >
-          <el-button type="primary" @click="showProductSelectDialog = true">
+            ]">
+          <el-button type="primary"
+                     @click="showProductSelectDialog = true">
             {{ formState.productName ? formState.productName : '閫夋嫨浜у搧' }}
           </el-button>
         </el-form-item>
-
-        <el-form-item
-            label="瑙勬牸"
-            prop="productModelName"
-        >
-          <el-input v-model="formState.productModelName"  disabled />
+        <el-form-item label="瑙勬牸"
+                      prop="productModelName">
+          <el-input v-model="formState.productModelName"
+                    disabled />
         </el-form-item>
-
-        <el-form-item
-            label="鍗曚綅"
-            prop="unit"
-        >
-          <el-input v-model="formState.unit"  disabled />
+        <el-form-item label="鍗曚綅"
+                      prop="unit">
+          <el-input v-model="formState.unit"
+                    disabled />
         </el-form-item>
-
         <el-form-item label="宸ヨ壓璺嚎">
-          <el-select v-model="formState.routeId"
+          <el-select v-model="formState.technologyRoutingId"
                      placeholder="璇烽�夋嫨宸ヨ壓璺嚎"
                      style="width: 100%;"
                      :loading="bindRouteLoading">
@@ -48,24 +43,30 @@
                        :value="item.id" />
           </el-select>
         </el-form-item>
-
-        <el-form-item
-            label="闇�姹傛暟閲�"
-            prop="quantity"
-        >
-          <el-input-number v-model="formState.quantity" :step="1" :min="1" style="width: 100%" />
+        <el-form-item label="闇�姹傛暟閲�"
+                      prop="quantity">
+          <el-input-number v-model="formState.quantity"
+                           :step="1"
+                           :min="0"
+                           style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="璁″垝瀹屾垚鏃堕棿"
+                      prop="planCompleteTime">
+          <el-date-picker v-model="formState.planCompleteTime"
+                          type="date"
+                          placeholder="閫夋嫨鏃ユ湡"
+                          value-format="YYYY-MM-DD"
+                          style="width: 100%" />
         </el-form-item>
       </el-form>
-
       <!-- 浜у搧閫夋嫨寮圭獥 -->
-      <ProductSelectDialog
-          v-model="showProductSelectDialog"
-          @confirm="handleProductSelect"
-          single
-      />
+      <ProductSelectDialog v-model="showProductSelectDialog"
+                           @confirm="handleProductSelect"
+                           single />
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="handleSubmit">纭</el-button>
+          <el-button type="primary"
+                     @click="handleSubmit">纭</el-button>
           <el-button @click="closeModal">鍙栨秷</el-button>
         </div>
       </template>
@@ -74,119 +75,130 @@
 </template>
 
 <script setup>
-import {ref, computed, getCurrentInstance} from "vue";
-import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
-import {addProductOrder, listProcessRoute} from "@/api/productionManagement/productionOrder.js";
+  import { ref, computed, getCurrentInstance } from "vue";
+  import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
+  import {
+    addProductOrder,
+    listProcessRoute,
+  } from "@/api/productionManagement/productionOrder.js";
+  import { listPage } from "@/api/productionManagement/processRoute.js";
+  const props = defineProps({
+    visible: {
+      type: Boolean,
+      required: true,
+    },
 
-const props = defineProps({
-  visible: {
-    type: Boolean,
-    required: true,
-  },
+    type: {
+      type: String,
+      required: true,
+      default: "qualified",
+    },
+  });
 
-  type: {
-    type: String,
-    required: true,
-    default: 'qualified',
-  },
-});
+  const emit = defineEmits(["update:visible", "completed"]);
 
-const emit = defineEmits(['update:visible', 'completed']);
-
-// 鍝嶅簲寮忔暟鎹紙鏇夸唬閫夐」寮忕殑 data锛�
-const formState = ref({
-  productId: undefined,
-  productModelId: undefined,
-  routeId: undefined,
-  productName: "",
-  productModelName: "",
-  unit: "",
-  quantity: 0,
-});
-
-const isShow = computed({
-  get() {
-    return props.visible;
-  },
-  set(val) {
-    emit('update:visible', val);
-  },
-});
-
-const showProductSelectDialog = ref(false);
-
-let { proxy } = getCurrentInstance()
-
-const closeModal = () => {
-  // 閲嶇疆琛ㄥ崟鏁版嵁
-  formState.value = {
+  // 鍝嶅簲寮忔暟鎹紙鏇夸唬閫夐」寮忕殑 data锛�
+  const formState = ref({
     productId: undefined,
     productModelId: undefined,
-    routeId: undefined,
+    technologyRoutingId: undefined,
     productName: "",
     productModelName: "",
-    quantity: '',
+    unit: "",
+    quantity: 0,
+    planCompleteTime: "",
+  });
+
+  const isShow = computed({
+    get() {
+      return props.visible;
+    },
+    set(val) {
+      emit("update:visible", val);
+    },
+  });
+
+  const showProductSelectDialog = ref(false);
+
+  let { proxy } = getCurrentInstance();
+
+  const closeModal = () => {
+    // 閲嶇疆琛ㄥ崟鏁版嵁
+    formState.value = {
+      productId: undefined,
+      productModelId: undefined,
+      technologyRoutingId: undefined,
+      productName: "",
+      productModelName: "",
+      unit: "",
+      quantity: "",
+      planCompleteTime: "",
+    };
+    isShow.value = false;
   };
-  isShow.value = false;
-};
 
-// 浜у搧閫夋嫨澶勭悊
-const handleProductSelect = async (products) => {
-  if (products && products.length > 0) {
-    const product = products[0];
-    formState.value.productId = product.productId;
-    formState.value.productName = product.productName;
-    formState.value.productModelName = product.model;
-    formState.value.productModelId = product.id;
-    formState.value.unit = product.unit;
-    showProductSelectDialog.value = false;
-    fetchRouteOptions( product.id);
-    // 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
-    proxy.$refs["formRef"]?.validateField('productModelId');
-  }
-};
-
-const routeOptions = ref([]);
-const bindRouteLoading = ref(false);
-const fetchRouteOptions = (productModelId) => {
-  formState.value.routeId = undefined;
-  routeOptions.value = []
-  bindRouteLoading.value = true;
-  listProcessRoute({ productModelId: productModelId }).then(res => {
-    routeOptions.value = res.data || [];
-  }).finally(() => {
-    bindRouteLoading.value = false;
-  })
-}
-
-const handleSubmit = () => {
-  proxy.$refs["formRef"].validate(valid => {
-    if (valid) {
-      // 楠岃瘉鏄惁閫夋嫨浜嗕骇鍝佸拰瑙勬牸
-      if (!formState.value.productModelId) {
-        proxy.$modal.msgError("璇烽�夋嫨浜у搧");
-        return;
-      }
-      if (!formState.value.productModelId) {
-        proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
-        return;
-      }
-
-      addProductOrder(formState.value).then(res => {
-        // 鍏抽棴妯℃�佹
-        isShow.value = false;
-        // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
-        emit('completed');
-        proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
-      })
+  // 浜у搧閫夋嫨澶勭悊
+  const handleProductSelect = async products => {
+    if (products && products.length > 0) {
+      const product = products[0];
+      formState.value.productId = product.productId;
+      formState.value.productName = product.productName;
+      formState.value.productModelName = product.model;
+      formState.value.productModelId = product.id;
+      formState.value.unit = product.unit;
+      showProductSelectDialog.value = false;
+      fetchRouteOptions(product.id);
+      // 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
+      proxy.$refs["formRef"]?.validateField("productModelId");
     }
-  })
-};
+  };
 
+  const routeOptions = ref([]);
+  const bindRouteLoading = ref(false);
+  const fetchRouteOptions = productModelId => {
+    formState.value.technologyRoutingId = undefined;
+    routeOptions.value = [];
+    bindRouteLoading.value = true;
+    listPage({ productModelId: productModelId })
+      .then(res => {
+        routeOptions.value = res.data.records || [];
+      })
+      .finally(() => {
+        bindRouteLoading.value = false;
+      });
+  };
 
-defineExpose({
-  closeModal,
-  handleSubmit,
-  isShow,
-});
+  const handleSubmit = () => {
+    proxy.$refs["formRef"].validate(valid => {
+      if (valid) {
+        // 楠岃瘉鏄惁閫夋嫨浜嗕骇鍝佸拰瑙勬牸
+        if (!formState.value.productModelId) {
+          proxy.$modal.msgError("璇烽�夋嫨浜у搧");
+          return;
+        }
+        if (!formState.value.productModelId) {
+          proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
+          return;
+        }
+        if (formState.value.quantity <= 0) {
+          proxy.$modal.msgError("闇�姹傛暟閲忓繀椤诲ぇ浜�0");
+          return;
+        }
+
+        addProductOrder(formState.value).then(res => {
+          // 鍏抽棴妯℃�佹
+          isShow.value = false;
+          // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
+          emit("completed");
+          proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+        });
+      }
+    });
+  };
+
+  defineExpose({
+    closeModal,
+    handleSubmit,
+    isShow,
+  });
 </script>
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 667688e..a67130c 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -49,8 +49,10 @@
         </el-form-item>
       </el-form>
       <div class="action-buttons">
-        <el-button type="primary" @click="isShowNewModal = true">鏂板</el-button>
-        <el-button type="danger" @click="handleDelete">鍒犻櫎</el-button>
+        <el-button type="primary"
+                   @click="isShowNewModal = true">鏂板</el-button>
+        <el-button type="danger"
+                   @click="handleDelete">鍒犻櫎</el-button>
         <el-button @click="handleOut">瀵煎嚭</el-button>
       </div>
     </div>
@@ -65,11 +67,9 @@
                 @selection-change="handleSelectionChange"
                 @pagination="pagination">
         <template #completionStatus="{ row }">
-          <el-progress
-            :percentage="toProgressPercentage(row?.completionStatus)"
-            :color="progressColor(toProgressPercentage(row?.completionStatus))"
-            :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''"
-          />
+          <el-progress :percentage="toProgressPercentage(row?.completionStatus)"
+                       :color="progressColor(toProgressPercentage(row?.completionStatus))"
+                       :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
         </template>
       </PIMTable>
     </div>
@@ -98,26 +98,28 @@
         </span>
       </template>
     </el-dialog>
-
-    <MaterialLedgerDialog
-      v-model="materialDialogVisible"
-      :order-row="currentMaterialOrder"
-      @saved="getList"
-    />
-    <MaterialDetailDialog
-      v-model="materialDetailDialogVisible"
-      :order-row="currentMaterialDetailOrder"
-      @confirmed="getList"
-    />
-
+    <MaterialLedgerDialog v-model="materialDialogVisible"
+                          :order-row="currentMaterialOrder"
+                          @saved="getList" />
+    <MaterialDetailDialog v-model="materialDetailDialogVisible"
+                          :order-row="currentMaterialDetailOrder"
+                          @confirmed="getList" />
     <new-product-order v-if="isShowNewModal"
-                         v-model:visible="isShowNewModal"
-                         @completed="handleQuery" />
+                       v-model:visible="isShowNewModal"
+                       @completed="handleQuery" />
   </div>
 </template>
 
 <script setup>
-  import { computed, defineAsyncComponent, getCurrentInstance, onMounted, reactive, ref, toRefs } from "vue";
+  import {
+    computed,
+    defineAsyncComponent,
+    getCurrentInstance,
+    onMounted,
+    reactive,
+    ref,
+    toRefs,
+  } from "vue";
   import { ElMessageBox } from "element-plus";
   import dayjs from "dayjs";
   import { useRouter } from "vue-router";
@@ -125,13 +127,17 @@
     productOrderListPage,
     listProcessRoute,
     bindingRoute,
-    listProcessBom, delProductOrder,
+    listProcessBom,
+    delProductOrder,
   } from "@/api/productionManagement/productionOrder.js";
   import { listMain as getOrderProcessRouteMain } from "@/api/productionManagement/productProcessRoute.js";
   import MaterialLedgerDialog from "@/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue";
   import MaterialDetailDialog from "@/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue";
   import PIMTable from "@/components/PIMTable/PIMTable.vue";
-  const NewProductOrder = defineAsyncComponent(() => import("@/views/productionManagement/productionOrder/New.vue"));
+  import { listPage } from "@/api/productionManagement/processRoute.js";
+  const NewProductOrder = defineAsyncComponent(() =>
+    import("@/views/productionManagement/productionOrder/New.vue")
+  );
 
   const { proxy } = getCurrentInstance();
 
@@ -142,32 +148,32 @@
     {
       label: "鐢熶骇璁㈠崟鍙�",
       prop: "npsNo",
-      width: '150px',
+      width: "150px",
     },
     {
       label: "閿�鍞悎鍚屽彿",
       prop: "salesContractNo",
-      width: '150px',
+      width: "150px",
     },
     {
       label: "瀹㈡埛鍚嶇О",
       prop: "customerName",
-      width: '200px',
+      width: "200px",
     },
     {
       label: "浜у搧鍚嶇О",
-      prop: "productCategory",
-      width: '120px',
+      prop: "productName",
+      width: "120px",
     },
     {
       label: "瑙勬牸",
-      prop: "specificationModel",
-      width: '120px',
+      prop: "model",
+      width: "120px",
     },
     {
       label: "宸ヨ壓璺嚎缂栧彿",
       prop: "processRouteCode",
-      width: '200px',
+      width: "200px",
     },
     {
       label: "闇�姹傛暟閲�",
@@ -197,8 +203,8 @@
       width: 120,
     },
     {
-      label: "浜や粯鏃ユ湡",
-      prop: "deliveryDate",
+      label: "璁″垝瀹屾垚鏃堕棿",
+      prop: "planCompleteTime",
       formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
       width: 120,
     },
@@ -288,18 +294,18 @@
 
   // 娣诲姞琛ㄨ绫诲悕鏂规硶
   const tableRowClassName = ({ row }) => {
-    if (!row.deliveryDate) return '';
-    if (row.isFh) return '';
+    if (!row.planCompleteTime) return "";
+    if (row.isFh) return "";
 
     const diff = row.deliveryDaysDiff;
     if (diff === 15) {
-      return 'yellow';
+      return "yellow";
     } else if (diff === 10) {
-      return 'pink';
+      return "pink";
     } else if (diff === 2) {
-      return 'purple';
+      return "purple";
     } else if (diff < 2) {
-      return 'red';
+      return "red";
     }
   };
 
@@ -329,8 +335,8 @@
     }
     bindRouteLoading.value = true;
     try {
-      const res = await listProcessRoute({ productModelId: row.productModelId });
-      routeOptions.value = res.data || [];
+      const res = await listPage({ productModelId: row.productModelId });
+      routeOptions.value = res.data.records || [];
     } catch (e) {
       console.error("鑾峰彇宸ヨ壓璺嚎鍒楄〃澶辫触锛�", e);
       proxy.$modal.msgError("鑾峰彇宸ヨ壓璺嚎鍒楄〃澶辫触");
@@ -452,14 +458,14 @@
   };
 
   // 琛ㄦ牸閫夋嫨鏁版嵁
-  const handleSelectionChange = (selection) => {
+  const handleSelectionChange = selection => {
     selectedRows.value = selection;
   };
 
   const handleDelete = () => {
     let ids = [];
     if (selectedRows.value.length > 0) {
-      ids = selectedRows.value.map((item) => item.id);
+      ids = selectedRows.value.map(item => item.id);
     } else {
       proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
       return;
@@ -468,14 +474,16 @@
       confirmButtonText: "纭",
       cancelButtonText: "鍙栨秷",
       type: "warning",
-    }).then(() => {
-      delProductOrder(ids).then((res) => {
-        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        getList();
+    })
+      .then(() => {
+        delProductOrder(ids).then(res => {
+          proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          getList();
+        });
+      })
+      .catch(() => {
+        proxy.$modal.msg("宸插彇娑�");
       });
-    }).catch(() => {
-      proxy.$modal.msg("宸插彇娑�");
-    });
   };
 
   // 瀵煎嚭
@@ -486,7 +494,11 @@
       type: "warning",
     })
       .then(() => {
-        proxy.download("/productOrder/export", {...searchForm.value}, "鐢熶骇璁㈠崟.xlsx");
+        proxy.download(
+          "/productOrder/export",
+          { ...searchForm.value },
+          "鐢熶骇璁㈠崟.xlsx"
+        );
       })
       .catch(() => {
         proxy.$modal.msg("宸插彇娑�");
@@ -501,33 +513,32 @@
 </script>
 
 <style scoped lang="scss">
-.search_form{
-  align-items: start;
-}
+  .search_form {
+    align-items: start;
+  }
 
-.action-buttons {
-  display: flex;
-  flex-wrap: nowrap;
-  gap: 8px;
-}
+  .action-buttons {
+    display: flex;
+    flex-wrap: nowrap;
+    gap: 8px;
+  }
 
-:deep(.yellow) {
-  background-color: #FAF0DE;
-}
+  :deep(.yellow) {
+    background-color: #faf0de;
+  }
 
-:deep(.pink) {
-  background-color: #FAE1DE;
-}
+  :deep(.pink) {
+    background-color: #fae1de;
+  }
 
-:deep(.red) {
-  background-color: #f80202;
-}
+  :deep(.red) {
+    background-color: #f80202;
+  }
 
-:deep(.purple){
-  background-color: #F4DEFA;
-}
-.table_list {
-	margin-top: unset;
-}
-
+  :deep(.purple) {
+    background-color: #f4defa;
+  }
+  .table_list {
+    margin-top: unset;
+  }
 </style>
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 182a351..9768093 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -2,16 +2,19 @@
   <div class="app-container">
     <div class="search_form">
       <el-form :model="searchForm"
+               ref="queryRef"
                :inline="true">
         <!-- 绠�鍖栫増鎼滅储鏉′欢 -->
-        <el-form-item label="涓荤敓浜ц鍒掑彿:">
+        <el-form-item label="涓荤敓浜ц鍒掑彿:"
+                      prop="mpsNo">
           <el-input v-model="searchForm.mpsNo"
                     placeholder="璇疯緭鍏�"
                     clearable
                     style="width: 160px;"
                     @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="闇�姹傛棩鏈熻寖鍥�:">
+        <el-form-item label="闇�姹傛棩鏈熻寖鍥�:"
+                      prop="dateRange">
           <el-date-picker v-model="searchForm.dateRange"
                           type="daterange"
                           range-separator="鑷�"
@@ -21,7 +24,8 @@
                           style="width: 240px;"
                           @change="handleQuery" />
         </el-form-item>
-        <el-form-item label="涓嬪彂鐘舵��:">
+        <el-form-item label="涓嬪彂鐘舵��:"
+                      prop="status">
           <el-select v-model="searchForm.status"
                      placeholder="璇烽�夋嫨鐘舵��"
                      clearable
@@ -36,36 +40,22 @@
           </el-select>
         </el-form-item>
         <!-- 灞曞紑鐗堟悳绱㈡潯浠� -->
-        <template v-if="searchFormExpanded">
-          <el-form-item label="浜у搧鍚嶇О:">
-            <el-input v-model="searchForm.productName"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      style="width: 160px;"
-                      @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="浜у搧瑙勬牸:">
-            <el-input v-model="searchForm.model"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      style="width: 160px;"
-                      @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="鐗╂枡缂栫爜:">
-            <el-input v-model="searchForm.materialCode"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      style="width: 160px;"
-                      @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="鐢宠鍗曠紪鍙�:">
-            <el-input v-model="searchForm.applyNo"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      style="width: 160px;"
-                      @keyup.enter="handleQuery" />
-          </el-form-item>
-        </template>
+        <el-form-item label="浜у搧鍚嶇О:"
+                      prop="productName">
+          <el-input v-model="searchForm.productName"
+                    placeholder="璇疯緭鍏�"
+                    clearable
+                    style="width: 160px;"
+                    @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="浜у搧瑙勬牸:"
+                      prop="model">
+          <el-input v-model="searchForm.model"
+                    placeholder="璇疯緭鍏�"
+                    clearable
+                    style="width: 160px;"
+                    @keyup.enter="handleQuery" />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary"
                      @click="handleQuery">鎼滅储</el-button>
@@ -74,6 +64,8 @@
           <el-button type="primary"
                      @click="handleAdd">鏂板</el-button>
           <el-button type="warning"
+                     @click="handleMerge">鍚堝苟涓嬪彂</el-button>
+          <el-button type="warning"
                      @click="handleImport">瀵煎叆</el-button>
           <el-button type="warning"
                      @click="handleExport">瀵煎嚭</el-button>
@@ -81,16 +73,6 @@
       </el-form>
       <div>
       </div>
-    </div>
-    <div class="search-header">
-      <el-button type="text"
-                 @click="toggleSearchForm">
-        <el-icon>
-          <ArrowUp v-if="searchFormExpanded" />
-          <ArrowDown v-else />
-        </el-icon>
-        {{ searchFormExpanded ? '鏀惰捣鎼滅储鏉′欢' : '灞曞紑鎼滅储鏉′欢' }}
-      </el-button>
     </div>
     <div class="table_list">
       <PIMTable rowKey="id"
@@ -117,23 +99,16 @@
                label-width="120px">
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="鐗╂枡缂栫爜">
-              <div class="info-display">{{ mergeForm.materialCode || '-' }}</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
             <el-form-item label="浜у搧鍚嶇О">
               <el-tag class="info-display">{{ mergeForm.productName || '-' }}</el-tag>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="10">
+          <el-col>
             <el-form-item label="浜у搧瑙勬牸">
               <div class="info-display">{{ mergeForm.model || '-' }}</div>
             </el-form-item>
-          </el-col>
-          <el-col :span="10">
           </el-col>
         </el-row>
         <el-form-item label="璁″垝瀹屾垚鏃堕棿">
@@ -142,7 +117,7 @@
                           value-format="YYYY-MM-DD"
                           style="width: 100%" />
         </el-form-item>
-        <el-form-item label="鐢熶骇鏂规暟">
+        <el-form-item label="鐢熶骇鏁伴噺">
           <el-input-number v-model="mergeForm.totalAssignedQuantity"
                            :min="0"
                            :max="sumAssignedQuantity"
@@ -182,16 +157,12 @@
         <el-form-item label="涓荤敓浜ц鍒掑彿"
                       prop="mpsNo">
           <el-input v-model="form.mpsNo"
-                    placeholder="璇疯緭鍏ヤ富鐢熶骇璁″垝鍙�" />
-        </el-form-item>
-        <el-form-item label="鐢宠鍗曠紪鍙�"
-                      prop="applyNo">
-          <el-input v-model="form.applyNo"
-                    placeholder="璇疯緭鍏ョ敵璇峰崟缂栧彿" />
+                    disabled
+                    placeholder="鏂板鍚庤嚜鍔ㄧ敓鎴�" />
         </el-form-item>
         <el-form-item label="浜у搧鍚嶇О"
-                      prop="productMaterialId">
-          <el-tree-select v-model="form.productMaterialId"
+                      prop="productId">
+          <el-tree-select v-model="form.productId"
                           placeholder="璇烽�夋嫨"
                           clearable
                           :data="productOptions"
@@ -279,6 +250,7 @@
     productionPlanAdd,
     productionPlanUpdate,
     productionPlanDelete,
+    productionPlanCombine,
   } from "@/api/productionPlan/productionPlan.js";
   import { productTreeList, modelListPage } from "@/api/basicData/product.js";
   import PIMTable from "./components/PIMTable.vue";
@@ -297,10 +269,10 @@
     return Promise.resolve();
   };
 
-  const productionPlanCombine = payload => {
-    console.log("Mock productionPlanCombine called with:", payload);
-    return Promise.resolve({ code: 200, msg: "鍚堝苟涓嬪彂鎴愬姛" });
-  };
+  // const productionPlanCombine = payload => {
+  //   console.log("Mock productionPlanCombine called with:", payload);
+  //   return Promise.resolve({ code: 200, msg: "鍚堝苟涓嬪彂鎴愬姛" });
+  // };
 
   const tableColumn = ref([
     {
@@ -309,14 +281,13 @@
       width: "150px",
     },
     {
-      label: "鐢宠鍗曠紪鍙�",
-      prop: "applyNo",
+      label: "鏉ユ簮",
+      prop: "source",
       width: "150px",
-    },
-    {
-      label: "鐗╂枡缂栫爜",
-      prop: "materialCode",
-      width: "150px",
+      dataType: "tag",
+      formatType: params => {
+        return params == "鍐呴儴" ? "info" : "primary";
+      },
     },
     {
       label: "浜у搧鍚嶇О",
@@ -401,7 +372,7 @@
       label: "鎿嶄綔",
       align: "center",
       fixed: "right",
-      width: 150,
+      width: 250,
       operation: [
         {
           name: "缂栬緫",
@@ -412,6 +383,23 @@
           },
           clickFun: row => {
             handleEdit(row);
+          },
+        },
+        {
+          name: "涓嬪彂",
+          type: "text",
+          showHide: row => {
+            return row.status == 0;
+          },
+          clickFun: row => {
+            mergeForm.productName = row.productName || "";
+            mergeForm.model = row.model || "";
+            mergeForm.totalAssignedQuantity = Number(row.qtyRequired || 0);
+            mergeForm.planCompleteTime = row.requiredDate || "";
+            mergeForm.productId = row.productId || "";
+            mergeForm.ids = [row.id];
+            sumAssignedQuantity.value = Number(row.qtyRequired || 0);
+            isShowNewModal.value = true;
           },
         },
         {
@@ -446,12 +434,11 @@
   const isShowNewModal = ref(false);
   // 鍚堝苟涓嬪彂琛ㄥ崟鏁版嵁
   const mergeForm = reactive({
-    materialCode: "",
     productName: "",
     model: "",
     totalAssignedQuantity: 0,
     planCompleteTime: "",
-    productMaterialId: "",
+    productId: "",
   });
 
   // 瀵煎叆鐩稿叧
@@ -468,16 +455,15 @@
   const operationType = ref("add"); // add | edit
   const productOptions = ref([]);
   const specificationOptions = ref([]);
+  const queryRef = ref(null);
   const formRef = ref(null);
   const form = reactive({
     id: undefined,
     mpsNo: "",
-    applyNo: "",
-    productMaterialId: undefined,
+    productId: undefined,
     productModelId: undefined,
     productName: "",
     model: "",
-    materialCode: "",
     qtyRequired: 0,
     unit: "鏂�",
     requiredDate: "",
@@ -485,11 +471,7 @@
     remark: "",
   });
   const rules = reactive({
-    mpsNo: [{ required: true, message: "璇疯緭鍏ヤ富鐢熶骇璁″垝鍙�", trigger: "blur" }],
-    applyNo: [{ required: true, message: "璇疯緭鍏ョ敵璇峰崟缂栧彿", trigger: "blur" }],
-    productMaterialId: [
-      { required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" },
-    ],
+    productId: [{ required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" }],
     productModelId: [
       { required: true, message: "璇烽�夋嫨浜у搧瑙勬牸", trigger: "change" },
     ],
@@ -506,7 +488,6 @@
       path: "/productionPlan/trackProgress",
       query: {
         id: row.id,
-        applyNo: row.applyNo,
         productName: row.productName,
         model: row.model,
       },
@@ -539,7 +520,6 @@
   const handleProductChange = value => {
     form.productModelId = undefined;
     form.model = undefined;
-    form.materialCode = undefined;
     // 鏌ユ壘閫変腑鐨勪骇鍝佸悕绉�
     const findProductName = (options, val) => {
       for (const option of options) {
@@ -569,14 +549,12 @@
   };
 
   const handleChangeSpecification = value => {
-    form.materialCode = undefined;
     form.model = undefined;
     form.unit = "";
     const selectedModel = specificationOptions.value.find(
       item => item.id === value
     );
     if (selectedModel) {
-      form.materialCode = selectedModel.materialCode;
       form.model = selectedModel.model;
       form.unit = selectedModel.unit || "鏂�";
     }
@@ -587,8 +565,7 @@
       mpsNo: "",
       productName: "",
       model: "",
-      materialCode: "",
-      applyNo: "",
+      status: "",
       dateRange: [],
     },
     searchFormExpanded: false,
@@ -609,12 +586,14 @@
 
   /** 閲嶇疆鎸夐挳鎿嶄綔 */
   const handleReset = () => {
+    if (proxy.resetForm) {
+      proxy.resetForm("queryRef");
+    }
     Object.assign(searchForm.value, {
       mpsNo: "",
       productName: "",
       model: "",
-      materialCode: "",
-      applyNo: "",
+      status: "",
       dateRange: [],
     });
     page.current = 1;
@@ -631,16 +610,18 @@
 
     // 閬嶅巻琛ㄦ牸鏁版嵁锛屾寜浜у搧绫诲埆姹囨��
     tableData.value.forEach(row => {
-      const category = row.materialCode;
+      const category = row.productName || "鏈煡浜у搧";
       if (!summary[category]) {
         summary[category] = {
           materialCode: category,
           totalAssignedQuantity: 0,
         };
       }
-      summary[category].totalAssignedQuantity += (
-        Number(row.qtyRequired) - Number(row.assignedQuantity)
-      ).toFixed(4);
+      summary[category].totalAssignedQuantity += Number(
+        (
+          Number(row.qtyRequired || 0) - Number(row.assignedQuantity || 0)
+        ).toFixed(4)
+      );
     });
 
     // 杞崲涓烘暟缁勬牸寮�
@@ -651,8 +632,10 @@
     tableLoading.value = true;
     // 鏋勯�犳悳绱㈠弬鏁�
     const params = { ...searchForm.value, ...page };
-    params.requiredDateStart = params.dateRange ? params.dateRange[0] : "";
-    params.requiredDateEnd = params.dateRange ? params.dateRange[1] : "";
+    params.requiredDateStart =
+      params.dateRange && params.dateRange.length > 0 ? params.dateRange[0] : "";
+    params.requiredDateEnd =
+      params.dateRange && params.dateRange.length > 1 ? params.dateRange[1] : "";
     delete params.dateRange;
     productionPlanListPage(params)
       .then(res => {
@@ -667,18 +650,18 @@
       });
   };
 
-  // 閫変腑鐨勫簭鍒楀彿
-  const selectedserialNo = ref("");
+  // 閫変腑鐨勪骇鍝佽鏍糏D
+  const selectedProductModelId = ref("");
 
   // 琛ㄦ牸閫夋嫨鏁版嵁
   const handleSelectionChange = selection => {
     selectedRows.value = selection;
-    // 濡傛灉鏈夐�変腑鐨勮锛岃褰曠涓�涓�変腑琛岀殑搴忓垪鍙�
+    // 濡傛灉鏈夐�変腑鐨勮锛岃褰曠涓�涓�変腑琛岀殑浜у搧瑙勬牸ID
     if (selection.length > 0) {
-      selectedserialNo.value = selection[0].materialCode;
+      selectedProductModelId.value = selection[0].productModelId;
     } else {
-      // 濡傛灉娌℃湁閫変腑鐨勮锛屾竻绌哄簭鍒楀彿
-      selectedserialNo.value = "";
+      // 濡傛灉娌℃湁閫変腑鐨勮锛屾竻绌轰骇鍝佽鏍糏D
+      selectedProductModelId.value = "";
     }
   };
 
@@ -691,11 +674,11 @@
       return false;
     }
     // 濡傛灉娌℃湁閫変腑鐨勮锛屾墍鏈夎閮藉彲閫夋嫨
-    if (!selectedserialNo.value) {
+    if (!selectedProductModelId.value) {
       return true;
     }
-    // 濡傛灉鏈夐�変腑鐨勮锛屽彧鏈夊簭鍒楀彿鐩稿悓鐨勮鎵嶅彲閫夋嫨
-    return row.materialCode === selectedserialNo.value;
+    // 濡傛灉鏈夐�変腑鐨勮锛屽彧鏈変骇鍝佽鏍糏D鐩稿悓鐨勮鎵嶅彲閫夋嫨
+    return row.productModelId === selectedProductModelId.value;
   };
   // 鎷夊彇鏁版嵁鎸夐挳鎿嶄綔
   const loadProdDataLoading = ref(false);
@@ -711,26 +694,18 @@
     const firstRow = selectedRows.value[0];
     const productName = firstRow.productName || "";
 
-    // 璁$畻鎬诲埗閫犳暟閲�
+    // 璁$畻鎬诲埗閫犳暟閲� (榛樿qtyRequired鐨勫拰)
     const totalAssignedQuantity = selectedRows.value.reduce((sum, row) => {
-      return (
-        sum +
-        (row.qtyRequired == null
-          ? 0
-          : Number(
-              Number(row.qtyRequired) - Number(row.assignedQuantity).toFixed(4)
-            ))
-      );
+      return sum + Number(row.qtyRequired || 0);
     }, 0);
     sumAssignedQuantity.value = totalAssignedQuantity;
     console.log(totalAssignedQuantity);
     // 璁剧疆琛ㄥ崟鏁版嵁
-    mergeForm.materialCode = selectedserialNo.value;
     mergeForm.productName = productName;
     mergeForm.model = firstRow.model || "";
     mergeForm.totalAssignedQuantity = totalAssignedQuantity;
-    mergeForm.planCompleteTime = firstRow.planCompleteTime || "";
-    mergeForm.productMaterialId = firstRow.productMaterialId || "";
+    mergeForm.planCompleteTime = firstRow.requiredDate || "";
+    mergeForm.productId = firstRow.productId || "";
     mergeForm.ids = selectedRows.value.map(row => row.id);
 
     // 鎵撳紑寮圭獥
@@ -740,18 +715,14 @@
   // 澶勭悊鍚堝苟涓嬪彂鎻愪氦
   const handleMergeSubmit = () => {
     if (mergeForm.totalAssignedQuantity === 0) {
-      ElMessage.warning("璇疯緭鍏ョ敓浜ф柟鏁�");
+      ElMessage.warning("璇疯緭鍏ョ敓浜ф暟閲�");
       return;
     }
     console.log(sumAssignedQuantity.value, "sumAssignedQuantity");
-    // 璁$畻褰撳墠閫変腑琛岀殑鎬绘暟閲�
-    const totalVolume = selectedRows.value.reduce((sum, row) => {
-      return sum + (Number(row.qtyRequired) - Number(row.assignedQuantity) || 0);
-    }, 0);
 
     // 楠岃瘉totalAssignedQuantity涓嶈兘澶т簬鎬绘柟鏁�
     if (mergeForm.totalAssignedQuantity > sumAssignedQuantity.value) {
-      ElMessage.error("鐢熶骇鏂规暟涓嶈兘澶т簬褰撳墠璁$畻鐨勬�诲��");
+      ElMessage.error("鐢熶骇鏁伴噺涓嶈兘澶т簬褰撳墠璁$畻鐨勬�诲��");
       return;
     }
 
@@ -861,12 +832,10 @@
     Object.assign(form, {
       id: undefined,
       mpsNo: "",
-      applyNo: "",
       productName: "",
-      productMaterialId: undefined,
+      productId: undefined,
       productModelId: undefined,
       model: "",
-      materialCode: "",
       qtyRequired: 0,
       unit: "鏂�",
       requiredDate: "",
@@ -883,12 +852,10 @@
     Object.assign(form, {
       id: row.id,
       mpsNo: row.mpsNo || "",
-      applyNo: row.applyNo || "",
       productName: row.productName || "",
-      productMaterialId: row.productMaterialId || undefined,
+      productId: row.productId || undefined,
       productModelId: row.productModelId || undefined,
       model: row.model || "",
-      materialCode: row.materialCode || "",
       qtyRequired: row.qtyRequired || 0,
       unit: row.unit || "鏂�",
       requiredDate: row.requiredDate || "",
@@ -897,7 +864,7 @@
     });
     dialogVisible.value = true;
     fetchProductOptions();
-    fetchSpecificationOptions(row.productMaterialId);
+    fetchSpecificationOptions(row.productId);
   };
 
   // 鍒犻櫎
@@ -1178,6 +1145,7 @@
     color: #303133;
     font-size: 14px;
     min-height: 32px;
+    width: 100%;
     display: flex;
     align-items: center;
   }
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 6b2cfcf..1185ca9 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -1,25 +1,41 @@
 <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.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>
@@ -27,79 +43,128 @@
       <div class="actions">
         <div></div>
         <div>
-          <el-button type="primary" @click="openForm('add')">
+          <el-button type="primary"
+                     @click="openForm('add')">
             鏂板鍙拌处
           </el-button>
-          <el-button type="primary" plain @click="handleImport">瀵煎叆</el-button>
+          <el-button type="primary"
+                     plain
+                     @click="handleImport">瀵煎叆</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" :row-class-name="tableRowClassName" 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" fixed="left"/>
-        <el-table-column type="expand" width="60" fixed="left">
+      <el-table :data="tableData"
+                border
+                v-loading="tableLoading"
+                @selection-change="handleSelectionChange"
+                :expand-row-keys="expandedRowKeys"
+                :row-key="(row) => row.id"
+                :row-class-name="tableRowClassName"
+                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"
+                         fixed="left" />
+        <el-table-column type="expand"
+                         width="60"
+                         fixed="left">
           <template #default="props">
-            <el-table :data="props.row.children" border show-summary :summary-method="(param) => summarizeChildrenTable(param, props.row)">
-              <el-table-column align="center" label="搴忓彿" type="index"/>
-              <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">
+            <el-table :data="props.row.children"
+                      border
+                      show-summary
+                      :summary-method="(param) => summarizeChildrenTable(param, props.row)">
+              <el-table-column align="center"
+                               label="搴忓彿"
+                               type="index" />
+              <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.approveStatus === 1 && (!scope.row.shippingDate || !scope.row.shippingCarNumber)"
-													type="success">鍏呰冻</el-tag>
-									<el-tag v-else-if="scope.row.approveStatus === 0 && (scope.row.shippingDate || scope.row.shippingCarNumber)"
-													type="success">宸插嚭搴�</el-tag>
-									<el-tag v-else type="danger">涓嶈冻</el-tag>
+                  <el-tag v-if="scope.row.approveStatus === 1 && (!scope.row.shippingDate || !scope.row.shippingCarNumber)"
+                          type="success">鍏呰冻</el-tag>
+                  <el-tag v-else-if="scope.row.approveStatus === 0 && (scope.row.shippingDate || scope.row.shippingCarNumber)"
+                          type="success">宸插嚭搴�</el-tag>
+                  <el-tag v-else
+                          type="danger">涓嶈冻</el-tag>
                 </template>
               </el-table-column>
-							<el-table-column label="鍙戣揣鐘舵��" width="140" align="center">
-								<template #default="scope">
-									<el-tag :type="getShippingStatusType(scope.row)" size="small">
-										{{ getShippingStatusText(scope.row) }}
-									</el-tag>
-								</template>
-							</el-table-column>
-							<el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip />
-							<el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip />
-              <el-table-column label="鍙戣揣杞︾墝" minWidth="100px" align="center">
+              <el-table-column label="鍙戣揣鐘舵��"
+                               width="140"
+                               align="center">
+                <template #default="scope">
+                  <el-tag :type="getShippingStatusType(scope.row)"
+                          size="small">
+                    {{ getShippingStatusText(scope.row) }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="蹇�掑叕鍙�"
+                               prop="expressCompany"
+                               show-overflow-tooltip />
+              <el-table-column label="蹇�掑崟鍙�"
+                               prop="expressNumber"
+                               show-overflow-tooltip />
+              <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>
+                    <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">
+              <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>
+                    <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="sensitiveAmountFormatter" />
-              <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="sensitiveAmountFormatter" />
-              <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="sensitiveAmountFormatter" />
-            <!--鎿嶄綔-->
-              <el-table-column Width="60px" label="鎿嶄綔" align="center">
+              <el-table-column label="鏁伴噺"
+                               prop="quantity" />
+              <el-table-column label="绋庣巼(%)"
+                               prop="taxRate" />
+              <el-table-column label="鍚◣鍗曚环(鍏�)"
+                               prop="taxInclusiveUnitPrice"
+                               :formatter="sensitiveAmountFormatter" />
+              <el-table-column label="鍚◣鎬讳环(鍏�)"
+                               prop="taxInclusiveTotalPrice"
+                               :formatter="sensitiveAmountFormatter" />
+              <el-table-column label="涓嶅惈绋庢�讳环(鍏�)"
+                               prop="taxExclusiveTotalPrice"
+                               :formatter="sensitiveAmountFormatter" />
+              <!--鎿嶄綔-->
+              <el-table-column Width="60px"
+                               label="鎿嶄綔"
+                               align="center">
                 <template #default="scope">
-                  <el-button 
-                    link 
-                    type="primary"
-                    :disabled="!canShip(scope.row)"
-                    @click="openDeliveryForm(scope.row)">
+                  <el-button link
+                             type="primary"
+                             :disabled="!canShip(scope.row)"
+                             @click="openDeliveryForm(scope.row)">
                     鍙戣揣
                   </el-button>
                 </template>
@@ -107,60 +172,139 @@
             </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="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 label="浜や粯鏃ユ湡" prop="deliveryDate" width="120" show-overflow-tooltip />
-        <el-table-column label="澶囨敞" prop="remarks" width="200" show-overflow-tooltip />
-        <el-table-column fixed="right" label="鎿嶄綔" width="130" 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="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 label="浜や粯鏃ユ湡"
+                         prop="deliveryDate"
+                         width="120"
+                         show-overflow-tooltip />
+        <el-table-column label="澶囨敞"
+                         prop="remarks"
+                         width="200"
+                         show-overflow-tooltip />
+        <el-table-column fixed="right"
+                         label="鎿嶄綔"
+                         width="130"
+                         align="center">
           <template #default="scope">
-            <el-button link type="primary" @click="openForm('edit', scope.row)" :disabled="!scope.row.isEdit || scope.row.hasProductionRecord || !canEditLedger(scope.row)">缂栬緫</el-button>
-            <el-button link type="primary" @click="downLoadFile(scope.row)">闄勪欢</el-button>
+            <el-button link
+                       type="primary"
+                       @click="openForm('edit', scope.row)"
+                       :disabled="!scope.row.isEdit || scope.row.hasProductionRecord || !canEditLedger(scope.row)">缂栬緫</el-button>
+            <el-button link
+                       type="primary"
+                       @click="downLoadFile(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>
-    <FormDialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'" :width="'70%'"
-      :operation-type="operationType" @close="closeDia" @confirm="submitForm" @cancel="closeDia">
-      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
-				<!-- 鎶ヤ环鍗曞鍏ュ叆鍙o細鏀惧湪琛ㄥ崟椤堕儴锛岄�夋嫨鍚庡弽鏄惧鎴�/涓氬姟鍛樼瓑 -->
-				<el-row v-if="operationType === 'add'" style="margin-bottom: 10px;">
-					<el-col :span="24" style="text-align: right;">
-						<el-button type="primary" plain @click="openQuotationDialog">
-							浠庨攢鍞姤浠峰鍏�
-						</el-button>
-					</el-col>
-				</el-row>
+    <FormDialog v-model="dialogFormVisible"
+                :title="operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'"
+                :width="'70%'"
+                :operation-type="operationType"
+                @close="closeDia"
+                @confirm="submitForm"
+                @cancel="closeDia">
+      <el-form :model="form"
+               label-width="140px"
+               label-position="top"
+               :rules="rules"
+               ref="formRef">
+        <!-- 鎶ヤ环鍗曞鍏ュ叆鍙o細鏀惧湪琛ㄥ崟椤堕儴锛岄�夋嫨鍚庡弽鏄惧鎴�/涓氬姟鍛樼瓑 -->
+        <el-row v-if="operationType === 'add'"
+                style="margin-bottom: 10px;">
+          <el-col :span="24"
+                  style="text-align: right;">
+            <el-button type="primary"
+                       plain
+                       @click="openQuotationDialog">
+              浠庨攢鍞姤浠峰鍏�
+            </el-button>
+          </el-col>
+        </el-row>
         <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'" filterable>
-                <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'"
+                         filterable>
+                <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="customerId">
-              <el-select v-model="form.customerId" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'" filterable>
-                <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'"
+                         filterable>
+                <el-option v-for="item in customerOption"
+                           :key="item.id"
+                           :label="item.customerName"
+                           :value="item.id">
                   {{
                     item.customerName + "鈥斺��" + item.taxpayerIdentificationNumber
                   }}
@@ -168,1980 +312,2236 @@
               </el-select>
             </el-form-item>
           </el-col>
-					<el-col :span="12">
-						<el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
-							<el-input v-model="form.projectName" 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="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="浠樻鏂瑰紡">
-							<el-input v-model="form.paymentMethod" 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"
-												 filterable
-												 default-first-option
-												 :reserve-keyword="false" placeholder="璇烽�夋嫨" clearable @change="changs">
-								<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>
-					</el-col>
-				</el-row>
-        <el-row :gutter="30">
           <el-col :span="12">
-            <el-form-item label="浜よ揣鏃ユ湡锛�" prop="entryDate">
-              <el-date-picker style="width: 100%" v-model="form.deliveryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-                              type="date" placeholder="璇烽�夋嫨" clearable />
+            <el-form-item label="椤圭洰鍚嶇О锛�"
+                          prop="projectName">
+              <el-input v-model="form.projectName"
+                        placeholder="璇疯緭鍏�"
+                        clearable
+                        :disabled="operationType === 'view'" />
             </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'"
-						:selectable="(row) => !isProductShipped(row)" />
-					<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" 
-								:disabled="isProductShipped(scope.row)"
-								@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="remarks">
-							<el-input v-model="form.remarks" 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="salesLedgerFiles">
-							<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
-									</div>
-								</template>
-							</el-upload>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-		</FormDialog>
-
-		<!-- 浠庢姤浠峰崟瀵煎叆锛堜粎瀹℃壒閫氳繃锛� -->
-		<el-dialog
-			v-model="quotationDialogVisible"
-			title="閫夋嫨瀹℃壒閫氳繃鐨勯攢鍞姤浠峰崟"
-			width="80%"
-			:close-on-click-modal="false"
-		>
-			<div style="margin-bottom: 12px; display:flex; gap: 12px; align-items:center;">
-				<el-input
-					v-model="quotationSearchForm.quotationNo"
-					placeholder="璇疯緭鍏ユ姤浠峰崟鍙�"
-					clearable
-					style="max-width: 260px;"
-					@change="fetchQuotationList"
-				/>
-				<el-input
-					v-model="quotationSearchForm.customer"
-					placeholder="璇疯緭鍏ュ鎴峰悕绉�"
-					clearable
-					style="max-width: 260px;"
-					@change="fetchQuotationList"
-				/>
-				<el-button type="primary" @click="fetchQuotationList">鎼滅储</el-button>
-				<el-button @click="resetQuotationSearch">閲嶇疆</el-button>
-			</div>
-			
-			<el-table
-				:data="quotationList"
-				border
-				stripe
-				v-loading="quotationLoading"
-				height="420px"
-			>
-				<el-table-column align="center" label="搴忓彿" type="index" width="60" />
-				<el-table-column prop="quotationNo" label="鎶ヤ环鍗曞彿" width="180" show-overflow-tooltip />
-				<el-table-column prop="customer" label="瀹㈡埛鍚嶇О" min-width="220" show-overflow-tooltip />
-				<el-table-column prop="salesperson" label="涓氬姟鍛�" width="120" show-overflow-tooltip />
-				<el-table-column prop="quotationDate" label="鎶ヤ环鏃ユ湡" width="140" />
-				<el-table-column prop="status" label="瀹℃壒鐘舵��" width="120" align="center" />
-				<el-table-column prop="totalAmount" label="鎶ヤ环閲戦(鍏�)" width="160" align="right">
-					<template #default="scope">
-						{{ Number(scope.row.totalAmount ?? 0).toFixed(2) }}
-					</template>
-				</el-table-column>
-				<el-table-column fixed="right" label="鎿嶄綔" width="120" align="center">
-					<template #default="scope">
-						<el-button type="primary" link @click="applyQuotation(scope.row)">閫夋嫨</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			
-			<pagination
-				v-show="quotationPage.total > 0"
-				:total="quotationPage.total"
-				layout="total, sizes, prev, pager, next, jumper"
-				:page="quotationPage.current"
-				:limit="quotationPage.size"
-				@pagination="quotationPaginationChange"
-			/>
-			
-			<template #footer>
-				<el-button @click="quotationDialogVisible = false">鍏抽棴</el-button>
-			</template>
-		</el-dialog>
-		<FormDialog
-			v-model="productFormVisible"
-			:title="productOperationType === 'add' ? '鏂板浜у搧' : '缂栬緫浜у搧'"
-			:width="'40%'"
-			:operation-type="productOperationType"
-			@close="closeProductDia"
-			@confirm="submitProduct"
-			@cancel="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-tree-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable filterable 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" filterable>
-								<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>
-					</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="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-select>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-		</FormDialog>
-		<!-- 瀵煎叆寮圭獥 -->
-		<FormDialog
-			v-model="importUpload.open"
-			:title="importUpload.title"
-			:width="'600px'"
-			@close="importUpload.open = false"
-			@confirm="submitImportFile"
-			@cancel="importUpload.open = false"
-		>
-			<el-upload
-				ref="importUploadRef"
-				:limit="1"
-				accept=".xlsx,.xls"
-				:action="importUpload.url"
-				:headers="importUpload.headers"
-				:before-upload="importUpload.beforeUpload"
-				:on-success="importUpload.onSuccess"
-				:on-error="importUpload.onError"
-				:on-progress="importUpload.onProgress"
-				:on-change="importUpload.onChange"
-				:auto-upload="false"
-				drag
-			>
-				<i class="el-icon-upload"></i>
-				<div class="el-upload__text">
-					灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em>
-				</div>
-				<template #tip>
-					<div class="el-upload__tip">
-						浠呮敮鎸� xls/xlsx锛屽ぇ灏忎笉瓒呰繃 10MB銆�
-						<el-button link type="primary" @click="downloadTemplate">涓嬭浇瀵煎叆妯℃澘</el-button>
-					</div>
-				</template>
-			</el-upload>
-		</FormDialog>
-		<!-- 闄勪欢鍒楄〃寮圭獥 -->
-		<FileListDialog
-			ref="fileListRef"
-			v-model="fileListDialogVisible"
-			title="闄勪欢鍒楄〃"
-		/>
-		<!-- 鎵撳嵃棰勮寮圭獥 -->
-		<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="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.shippingCarNumber }}</span>
-									</div>
-								</div>
-								<div class="info-row">
-									<div>
-										<span class="label">瀹㈡埛鍚嶇О锛�</span>
-										<span class="value">{{ item.customerName }}</span>
-									</div>
-									<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="type">
-							<el-select
-								v-model="deliveryForm.type"
-								placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
-								style="width: 100%"
-							>
-								<el-option label="璐ц溅" value="璐ц溅" />
-								<el-option label="蹇��" value="蹇��" />
-							</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>
-	</div>
-</template>
-
-<script setup>
-import { getToken } from "@/utils/auth";
-import pagination from "@/components/PIMTable/Pagination.vue";
-import {onMounted, ref, getCurrentInstance} from "vue";
-import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
-import { ElMessageBox, ElMessage } from "element-plus";
-import { UploadFilled, Download } from "@element-plus/icons-vue";
-import useUserStore from "@/store/modules/user";
-import { userListNoPage } from "@/api/system/user.js";
-import FileListDialog from '@/components/Dialog/FileListDialog.vue';
-import FormDialog from '@/components/Dialog/FormDialog.vue';
-import { getQuotationList } from "@/api/salesManagement/salesQuotation.js";
-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 { getCurrentDate } from "@/utils/index.js";
-import {listCustomerPrivatePool} from "@/api/basicData/customerFile.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: "", // 瀹㈡埛鍚嶇О
-		salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
-		entryDate: null, // 褰曞叆鏃ユ湡
-		entryDateStart: undefined,
-		entryDateEnd: undefined,
-	},
-	form: {
-		salesContractNo: "",
-		salesman: "",
-		customerId: "",
-		entryPerson: "",
-		entryDate: "",
-    deliveryDate: "",
-		maintenanceTime: "",
-		productData: [],
-		executionDate: "",
-    hasProductionRecord: false,
-	},
-	rules: {
-		salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-		customerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-		entryPerson: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-		entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    deliveryDate: [{ 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 quotationDialogVisible = ref(false);
-const quotationLoading = ref(false);
-const quotationList = ref([]);
-const quotationSearchForm = reactive({
-	quotationNo: "",
-	customer: "",
-});
-// 鎶ヤ环鍗曞脊妗嗗垎椤�
-const quotationPage = reactive({
-	current: 1,
-	size: 10,
-	total: 0,
-});
-const selectedQuotation = ref(null);
-
-// 鍙戣揣鐩稿叧
-const deliveryFormVisible = ref(false);
-const currentDeliveryRow = ref(null);
-const deliveryFormData = reactive({
-  deliveryForm: {
-    type: "璐ц溅", // 璐ц溅, 蹇��
-  },
-  deliveryRules: {
-    type: [
-      { required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }
-    ]
-  },
-});
-const { deliveryForm, deliveryRules } = toRefs(deliveryFormData);
-
-// 瀵煎叆鐩稿叧
-const importUploadRef = ref(null);
-const importUpload = reactive({
-	title: "瀵煎叆閿�鍞彴璐�",
-	open: false,
-	url: import.meta.env.VITE_APP_BASE_API + "/sales/ledger/import",
-	headers: { Authorization: "Bearer " + getToken() },
-	isUploading: false,
-	beforeUpload: (file) => {
-		const isExcel = file.name.endsWith('.xlsx') || file.name.endsWith('.xls');
-		const isLt10M = file.size / 1024 / 1024 < 10;
-		if (!isExcel) {
-			proxy.$modal.msgError("涓婁紶鏂囦欢鍙兘鏄� xlsx/xls 鏍煎紡!");
-			return false;
-		}
-		if (!isLt10M) {
-			proxy.$modal.msgError("涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 10MB!");
-			return false;
-		}
-		return true;
-	},
-	onChange: (file, fileList) => {
-		console.log('鏂囦欢鐘舵�佹敼鍙�', file, fileList);
-	},
-	onProgress: (event, file, fileList) => {
-		console.log('涓婁紶涓�...', event.percent);
-	},
-	onSuccess: (response, file, fileList) => {
-		console.log('涓婁紶鎴愬姛', response, file, fileList);
-		importUpload.isUploading = false;
-		if (response.code === 200) {
-			proxy.$modal.msgSuccess("瀵煎叆鎴愬姛");
-			importUpload.open = false;
-			if (importUploadRef.value) {
-				importUploadRef.value.clearFiles();
-			}
-			getList();
-		} else {
-			proxy.$modal.msgError(response.msg || "瀵煎叆澶辫触");
-		}
-	},
-	onError: (error, file, fileList) => {
-		console.error('涓婁紶澶辫触', error, file, fileList);
-		importUpload.isUploading = false;
-		proxy.$modal.msgError("瀵煎叆澶辫触锛岃閲嶈瘯");
-	},
-});
-
-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 handleQuery = () => {
-	// 鍙湁鍦ㄧ偣鍑绘悳绱㈡寜閽椂鎵嶉噸缃〉鐮佸埌绗竴椤�
-	// 閬垮厤琛ㄥ崟瀛楁change浜嬩欢骞叉壈鍒嗛〉
-	if (arguments.length === 0) {
-		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;
-	// 灏嗚寖鍥存棩鏈熷瓧娈典紶閫掔粰鍚庣
-	const params = { ...rest, ...page };
-	// 绉婚櫎褰曞叆鏃ユ湡鐨勯粯璁ゅ�艰缃紝鍙繚鐣欒寖鍥存棩鏈熷瓧娈�
-	delete params.entryDate;
-	return ledgerListPage(params)
-		.then((res) => {
-			tableLoading.value = false;
-			tableData.value = res.records;
-			tableData.value.map((item) => {
-				item.children = [];
-			});
-			total.value = res.total;
-			return res;
-		})
-		.catch(() => {
-			tableLoading.value = false;
-		});
-};
-// 鑾峰彇浜у搧澶х被tree鏁版嵁
-const getProductOptions = () => {
-	// 杩斿洖 Promise锛屼究浜庡湪缂栬緫浜у搧鏃剁瓑寰呭姞杞藉畬鎴�
-	return productTreeList().then((res) => {
-		productOptions.value = convertIdToValue(res);
-		return productOptions.value;
-	});
-};
-const formattedNumber = (row, column, cellValue) => {
-	if (cellValue === undefined || cellValue === null || cellValue === "") {
-		return "0.00";
-	}
-	return parseFloat(cellValue).toFixed(2);
-};
-const findLedgerRecordByRow = (row) => {
-	if (!row) return null;
-	if (
-		row.maintainer !== undefined ||
-		row.maintainerName !== undefined ||
-		row.entryPerson !== undefined ||
-		row.entryPersonName !== undefined
-	) {
-		return row;
-	}
-	if (row.salesLedgerId !== undefined && row.salesLedgerId !== null) {
-		return tableData.value.find((item) => String(item.id) === String(row.salesLedgerId)) || null;
-	}
-	return null;
-};
-const isCurrentUserMaintainer = (row) => {
-	const ledgerRecord = findLedgerRecordByRow(row);
-	if (!ledgerRecord) return true;
-	const currentUserId = String(userStore.id ?? "");
-	const currentNickName = String(userStore.nickName ?? "").trim();
-	const maintainerId = ledgerRecord.maintainerId ?? ledgerRecord.entryPerson;
-	const maintainerName =
-		ledgerRecord.maintainerName ?? ledgerRecord.maintainer ?? ledgerRecord.entryPersonName;
-	if (maintainerId !== undefined && maintainerId !== null && String(maintainerId) !== "") {
-		return String(maintainerId) === currentUserId;
-	}
-	if (maintainerName !== undefined && maintainerName !== null && String(maintainerName).trim() !== "") {
-		return String(maintainerName).trim() === currentNickName;
-	}
-	return true;
-};
-const canEditLedger = (row) => isCurrentUserMaintainer(row);
-const canDeleteLedger = (row) => isCurrentUserMaintainer(row);
-const sensitiveAmountFormatter = (row, column, cellValue) => {
-	if (!isCurrentUserMaintainer(row)) {
-		return "*****";
-	}
-	return formattedNumber(row, column, cellValue);
-};
-// 鑾峰彇tree瀛愭暟鎹�
-const getModels = (value) => {
-	productForm.value.productCategory = findNodeById(productOptions.value, value);
-	modelList({ id: value }).then((res) => {
-		modelOptions.value = res;
-	});
-};
-const getProductModel = (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;
-	});
-}
-// 鏍规嵁鍚嶇О鍙嶆煡浜у搧澶х被 id锛屼究浜庝粎瀛樺悕绉版椂鐨勫弽鏄�
-function findNodeIdByLabel(nodes, label) {
-	if (!label) return null;
-	for (let i = 0; i < nodes.length; i++) {
-		const node = nodes[i];
-		if (node.label === label) return node.value;
-		if (node.children && node.children.length > 0) {
-			const found = findNodeIdByLabel(node.children, label);
-			if (found !== null && found !== undefined) return found;
-		}
-	}
-	return null;
-}
-// 琛ㄦ牸閫夋嫨鏁版嵁
-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);
-				if (index > -1) {
-					tableData.value[index].children = res.data;
-				}
-				expandedRowKeys.value.push(row.id);
-			});
-		} catch (error) {
-			console.log(error);
-		}
-	} else {
-		expandedRowKeys.value = [];
-	}
-};
-
-// 娣诲姞琛ㄨ绫诲悕鏂规硶
-const tableRowClassName = ({ row }) => {
-  if (!row.deliveryDate) return '';
-  if (row.isFh) return '';
-
-  const diff = row.deliveryDaysDiff;
-  if (diff === 15) {
-    return 'yellow';
-  } else if (diff === 10) {
-    return 'pink';
-  } else if (diff === 2) {
-    return 'purple';
-  } else if (diff < 2) {
-    return 'red';
-  }
-};
-// 涓昏〃鍚堣鏂规硶
-const summarizeMainTable = (param) => {
-	return proxy.summarizeTable(param, [
-		"contractAmount",
-		"taxInclusiveTotalPrice",
-		"taxExclusiveTotalPrice",
-	]);
-};
-// 瀛愯〃鍚堣鏂规硶
-const summarizeChildrenTable = (param, parentRow) => {
-	if (!isCurrentUserMaintainer(parentRow)) {
-		const { columns } = param;
-		return columns.map((column, index) => {
-			if (index === 0) {
-				return "鍚堣";
-			}
-			if (["taxInclusiveUnitPrice", "taxInclusiveTotalPrice", "taxExclusiveTotalPrice"].includes(column.property)) {
-				return "*****";
-			}
-			return "";
-		});
-	}
-	return proxy.summarizeTable(param, [
-		"taxInclusiveUnitPrice",
-		"taxInclusiveTotalPrice",
-		"taxExclusiveTotalPrice",
-	]);
-};
-// 鎵撳紑寮规
-const openForm = async (type, row) => {
-	if (type === "edit" && row && !canEditLedger(row)) {
-		proxy.$modal.msgWarning("褰撳墠绯荤粺鐧诲綍浜轰笉鏄淮鎶や汉锛屼笉鑳界紪杈戞暟鎹�");
-		return;
-	}
-	operationType.value = type;
-	form.value = {};
-	productData.value = [];
-	selectedQuotation.value = null;
-	let userLists = await userListNoPage();
-	userList.value = userLists.data;
-	listCustomerPrivatePool({current: -1,size:-1}).then((res) => {
-		customerOption.value = res.data.records;
-	});
-	form.value.entryPerson = userStore.id;
-	if (type === "add") {
-		// 鏂板鏃惰缃綍鍏ユ棩鏈熶负褰撳ぉ
-		form.value.entryDate = getCurrentDate();
-		// 绛捐鏃ユ湡榛樿涓哄綋澶�
-		form.value.executionDate = getCurrentDate();
-	} else {
-		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;
-};
-
-// 鎵撳紑鎶ヤ环鍗曢�夋嫨寮圭獥锛堜粎瀹℃壒閫氳繃锛�
-const openQuotationDialog = async () => {
-	if (operationType.value === "view") return;
-	quotationDialogVisible.value = true;
-	// 鎵撳紑寮圭獥鏃堕噸缃垎椤靛埌绗竴椤�
-	quotationPage.current = 1;
-	// 鍏堢‘淇濆鎴峰垪琛ㄥ凡鍔犺浇锛屼究浜庡悗缁洖濉� customerId
-	if (!customerOption.value || customerOption.value.length === 0) {
-		try {
-			listCustomerPrivatePool({current: -1,size:-1}).then((res) => {
-				customerOption.value = res.data.records;
-			});
-		} catch (e) {
-			// ignore锛屽厑璁哥敤鎴峰悗缁墜鍔ㄩ�夋嫨瀹㈡埛
-		}
-	}
-	await fetchQuotationList();
-};
-
-const fetchQuotationList = async () => {
-	quotationLoading.value = true;
-	try {
-		const params = {
-			// 鍚庣鍒嗛〉瀛楁锛歝urrent / size
-			current: quotationPage.current,
-			size: quotationPage.size,
-			...quotationSearchForm,
-			status: "閫氳繃",
-		};
-		const res = await getQuotationList(params);
-		quotationList.value = res?.data?.records || [];
-		quotationPage.total = res?.data?.total || 0;
-	} finally {
-		quotationLoading.value = false;
-	}
-};
-
-const resetQuotationSearch = async () => {
-	quotationSearchForm.quotationNo = "";
-	quotationSearchForm.customer = "";
-	quotationPage.current = 1;
-	await fetchQuotationList();
-};
-
-// 鎶ヤ环鍗曞脊妗嗗垎椤靛垏鎹�
-const quotationPaginationChange = (obj) => {
-	quotationPage.current = obj.page;
-	quotationPage.size = obj.limit;
-	fetchQuotationList();
-};
-
-// 閫変腑鎶ヤ环鍗曞悗鍥炲~鍒板彴璐﹁〃鍗�
-const applyQuotation = (row) => {
-	if (!row) return;
-	selectedQuotation.value = row;
-	
-	// 涓氬姟鍛�
-	form.value.salesman = (row.salesperson || "").trim();
-	
-	// 瀹㈡埛鍚嶇О -> customerId
-	const qCustomerName = String(row.customer || "").trim();
-	const customer = (customerOption.value || []).find((c) => {
-		const name = String(c.customerName || "").trim();
-		return name === qCustomerName || name.includes(qCustomerName) || qCustomerName.includes(name);
-	});
-	if (customer?.id) {
-		form.value.customerId = customer.id;
-	} else {
-		// 濡傛灉鎵句笉鍒帮紝淇濈暀鍘熷�硷紙鍏佽鐢ㄦ埛鎵嬪姩閫夋嫨/涓嶆墦鏂凡鏈夎緭鍏ワ級
-		form.value.customerId = form.value.customerId || "";
-	}
-	
-	// 浜у搧淇℃伅鏄犲皠锛氭姤浠� products -> 鍙拌处 productData
-	const products = Array.isArray(row.products) ? row.products : [];
-	productData.value = products.map((p) => {
-		const quantity = Number(p.quantity ?? 0) || 0;
-		const unitPrice = Number(p.unitPrice ?? 0) || 0;
-		const taxRate = "13"; // 榛樿 13%锛屼究浜庣洿鎺ユ彁浜わ紙濡傞渶鍙湪浜у搧涓嚜琛屼慨鏀癸級
-		const taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
-		const taxExclusiveTotalPrice = proxy.calculateTaxExclusiveTotalPrice(taxInclusiveTotalPrice, taxRate);
-		return {
-			// 鍙拌处瀛楁
-			productCategory: p.product || p.productName || "",
-			specificationModel: p.specification || "",
-			unit: p.unit || "",
-			quantity: quantity,
-			taxRate: taxRate,
-			taxInclusiveUnitPrice: unitPrice.toFixed(2),
-			taxInclusiveTotalPrice: taxInclusiveTotalPrice,
-			taxExclusiveTotalPrice: taxExclusiveTotalPrice,
-			invoiceType: "澧炴櫘绁�",
-		};
-	});
-	
-	quotationDialogVisible.value = false;
-};
-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 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("璇锋坊鍔犱骇鍝佷俊鎭�");
-				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();
-				expandedRowKeys.value = [];
-				getList();
-			});
-		}
-	});
-};
-// 鍏抽棴寮规
-const closeDia = () => {
-	proxy.resetForm("formRef");
-	dialogFormVisible.value = false;
-};
-
-const productIndex = ref(0);
-// 鎵撳紑浜у搧寮规
-const openProductForm = async (type, row, index) => {
-	// 缂栬緫鏃舵鏌ヤ骇鍝佹槸鍚﹀凡鍙戣揣鎴栧鏍搁�氳繃
-	if (type === "edit" && isProductShipped(row)) {
-		proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
-		return;
-	}
-	
-	productOperationType.value = type;
-	productForm.value = {};
-	proxy.resetForm("productFormRef");
-	if (type === "edit") {
-		productForm.value = { ...row };
-		productIndex.value = index;
-		// 缂栬緫鏃舵牴鎹骇鍝佸ぇ绫诲悕绉板弽鏌� tree 鑺傜偣 id锛屽苟鍔犺浇瑙勬牸鍨嬪彿鍒楄〃
-		try {
-			const options = productOptions.value && productOptions.value.length > 0
-				? productOptions.value
-				: await getProductOptions();
-			const categoryId = findNodeIdByLabel(options, productForm.value.productCategory);
-			if (categoryId) {
-				const models = await modelList({ id: categoryId });
-				modelOptions.value = models || [];
-				// 鏍规嵁褰撳墠瑙勬牸鍨嬪彿鍚嶇О鍙嶆煡骞惰缃� productModelId锛屼究浜庝笅鎷夋鏄剧ず宸查�夊��
-				const currentModel = (modelOptions.value || []).find(
-					(m) => m.model === productForm.value.specificationModel
-				);
-				if (currentModel) {
-					productForm.value.productModelId = currentModel.id;
-				}
-			}
-		} catch (e) {
-			// 鍔犺浇澶辫触鏃朵繚鎸佸彲缂栬緫锛屼笉涓柇寮圭獥
-			console.error("鍔犺浇浜у搧瑙勬牸鍨嬪彿澶辫触", e);
-		}
-	} else {
-		getProductOptions()
-	}
-	productFormVisible.value = true;
-};
-// 鎻愪氦浜у搧琛ㄥ崟
-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;
-	}
-	
-	// 妫�鏌ユ槸鍚︽湁宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝�
-	const shippedProducts = productSelectedRows.value.filter(row => isProductShipped(row));
-	if (shippedProducts.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 handleImport = () => {
-	importUpload.title = "瀵煎叆閿�鍞彴璐�";
-	importUpload.open = true;
-	if (importUploadRef.value) {
-		importUploadRef.value.clearFiles();
-	}
-};
-
-// 涓嬭浇瀵煎叆妯℃澘
-const downloadTemplate = () => {
-	proxy.download("/sales/ledger/exportTemplate", {}, "閿�鍞彴璐﹀鍏ユā鏉�.xlsx");
-};
-
-// 鎻愪氦瀵煎叆鏂囦欢
-const submitImportFile = () => {
-	importUpload.isUploading = true;
-	proxy.$refs["importUploadRef"].submit();
-};
-
-// 瀵煎嚭
-const handleOut = () => {
-	ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
-		confirmButtonText: "纭",
-		cancelButtonText: "鍙栨秷",
-		type: "warning",
-	})
-		.then(() => {
-			proxy.download("/sales/ledger/export", {}, "閿�鍞彴璐�.xlsx");
-		})
-		.catch(() => {
-			proxy.$modal.msg("宸插彇娑�");
-		});
-};
-/** 鍒ゆ柇鍗曚釜浜у搧鏄惁宸插彂璐э紙鏍规嵁shippingStatus鍒ゆ柇锛屽凡鍙戣揣鎴栧鏍搁�氳繃涓嶅彲缂栬緫鍜屽垹闄わ級 */
-const isProductShipped = (product) => {
-	if (!product) return false;
-	const status = String(product.shippingStatus || "").trim();
-	// 濡傛灉鍙戣揣鐘舵�佹槸"宸插彂璐�"鎴�"瀹℃牳閫氳繃"锛屽垯涓嶅彲缂栬緫鍜屽垹闄�
-	return status === "宸插彂璐�" || status === "瀹℃牳閫氳繃";
-};
-
-/** 鍒ゆ柇閿�鍞鍗曚笅鏄惁瀛樺湪宸插彂璐�/鍙戣揣瀹屾垚鐨勪骇鍝侊紙涓嶅彲鍒犻櫎锛� */
-const hasShippedProducts = (products) => {
-	if (!products || !products.length) return false;
-	return products.some((p) => {
-		const status = String(p.shippingStatus || "").trim();
-		// 鏈夊彂璐ф棩鏈熸垨杞︾墝鍙疯涓哄凡鍙戣揣
-		if (p.shippingDate || p.shippingCarNumber) return true;
-		// 宸茶繘琛屽彂璐с�佸彂璐у畬鎴愩�佸凡鍙戣揣 鍧囦笉鍙垹闄�
-		return status === "宸茶繘琛屽彂璐�" || status === "鍙戣揣瀹屾垚" || status === "宸插彂璐�";
-	});
-};
-
-// 鍒犻櫎
-const handleDelete = async () => {
-	if (selectedRows.value.length === 0) {
-		proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
-		return;
-	}
-	const unauthorizedRows = selectedRows.value.filter((row) => !canDeleteLedger(row));
-	if (unauthorizedRows.length > 0) {
-		proxy.$modal.msgWarning("褰撳墠鐧诲綍鐢ㄦ埛涓嶆槸褰曞叆浜猴紝涓嶈兘鍒犻櫎璇ユ暟鎹�");
-		return;
-	}
-	const ids = selectedRows.value.map((item) => item.id);
-
-	// 妫�鏌ユ槸鍚︽湁宸茶繘琛屽彂璐ф垨鍙戣揣瀹屾垚鐨勯攢鍞鍗曪紝鑻ユ湁鍒欎笉鍏佽鍒犻櫎
-	const cannotDeleteNames = [];
-	for (const row of selectedRows.value) {
-		let products = row.children && row.children.length > 0 ? row.children : null;
-		if (!products) {
-			try {
-				const res = await productList({ salesLedgerId: row.id, type: 1 });
-				products = res.data || [];
-			} catch {
-				products = [];
-			}
-		}
-		if (hasShippedProducts(products)) {
-			cannotDeleteNames.push(row.salesContractNo || `ID:${row.id}`);
-		}
-	}
-	if (cannotDeleteNames.length > 0) {
-		proxy.$modal.msgWarning("宸茶繘琛屽彂璐ф垨鍙戣揣瀹屾垚鐨勯攢鍞鍗曚笉鑳藉垹闄わ細" + cannotDeleteNames.join("銆�"));
-		return;
-	}
-
-	ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
-		confirmButtonText: "纭",
-		cancelButtonText: "鍙栨秷",
-		type: "warning",
-	})
-		.then(() => {
-			delLedger(ids).then((res) => {
-				proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-				getList();
-			});
-		})
-		.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="document-title">闆跺敭鍙戣揣鍗�</div>
+        <el-row :gutter="30">
+          <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="浠樻鏂瑰紡">
+              <el-input v-model="form.paymentMethod"
+                        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"
+                         filterable
+                         default-first-option
+                         :reserve-keyword="false"
+                         placeholder="璇烽�夋嫨"
+                         clearable
+                         @change="changs">
+                <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>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="浜よ揣鏃ユ湡锛�"
+                          prop="entryDate">
+              <el-date-picker style="width: 100%"
+                              v-model="form.deliveryDate"
+                              value-format="YYYY-MM-DD"
+                              format="YYYY-MM-DD"
+                              type="date"
+                              placeholder="璇烽�夋嫨"
+                              clearable />
+            </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'"
+                           :selectable="(row) => !isProductShipped(row)" />
+          <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 label="鏄惁鐢熶骇"
+                           prop="isProduction"
+                           width="150">
+            <template #default="scope">
+              <el-tag :type="scope.row.isProduction ? 'success' : 'info'">
+                {{ scope.row.isProduction ? '鏄�' : '鍚�' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <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"
+                         :disabled="isProductShipped(scope.row)"
+                         @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="remarks">
+              <el-input v-model="form.remarks"
+                        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="salesLedgerFiles">
+              <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
+                  </div>
+                </template>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </FormDialog>
+    <!-- 浠庢姤浠峰崟瀵煎叆锛堜粎瀹℃壒閫氳繃锛� -->
+    <el-dialog v-model="quotationDialogVisible"
+               title="閫夋嫨瀹℃壒閫氳繃鐨勯攢鍞姤浠峰崟"
+               width="80%"
+               :close-on-click-modal="false">
+      <div style="margin-bottom: 12px; display:flex; gap: 12px; align-items:center;">
+        <el-input v-model="quotationSearchForm.quotationNo"
+                  placeholder="璇疯緭鍏ユ姤浠峰崟鍙�"
+                  clearable
+                  style="max-width: 260px;"
+                  @change="fetchQuotationList" />
+        <el-input v-model="quotationSearchForm.customer"
+                  placeholder="璇疯緭鍏ュ鎴峰悕绉�"
+                  clearable
+                  style="max-width: 260px;"
+                  @change="fetchQuotationList" />
+        <el-button type="primary"
+                   @click="fetchQuotationList">鎼滅储</el-button>
+        <el-button @click="resetQuotationSearch">閲嶇疆</el-button>
+      </div>
+      <el-table :data="quotationList"
+                border
+                stripe
+                v-loading="quotationLoading"
+                height="420px">
+        <el-table-column align="center"
+                         label="搴忓彿"
+                         type="index"
+                         width="60" />
+        <el-table-column prop="quotationNo"
+                         label="鎶ヤ环鍗曞彿"
+                         width="180"
+                         show-overflow-tooltip />
+        <el-table-column prop="customer"
+                         label="瀹㈡埛鍚嶇О"
+                         min-width="220"
+                         show-overflow-tooltip />
+        <el-table-column prop="salesperson"
+                         label="涓氬姟鍛�"
+                         width="120"
+                         show-overflow-tooltip />
+        <el-table-column prop="quotationDate"
+                         label="鎶ヤ环鏃ユ湡"
+                         width="140" />
+        <el-table-column prop="status"
+                         label="瀹℃壒鐘舵��"
+                         width="120"
+                         align="center" />
+        <el-table-column prop="totalAmount"
+                         label="鎶ヤ环閲戦(鍏�)"
+                         width="160"
+                         align="right">
+          <template #default="scope">
+            {{ Number(scope.row.totalAmount ?? 0).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right"
+                         label="鎿嶄綔"
+                         width="120"
+                         align="center">
+          <template #default="scope">
+            <el-button type="primary"
+                       link
+                       @click="applyQuotation(scope.row)">閫夋嫨</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="quotationPage.total > 0"
+                  :total="quotationPage.total"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :page="quotationPage.current"
+                  :limit="quotationPage.size"
+                  @pagination="quotationPaginationChange" />
+      <template #footer>
+        <el-button @click="quotationDialogVisible = false">鍏抽棴</el-button>
+      </template>
+    </el-dialog>
+    <FormDialog v-model="productFormVisible"
+                :title="productOperationType === 'add' ? '鏂板浜у搧' : '缂栬緫浜у搧'"
+                :width="'40%'"
+                :operation-type="productOperationType"
+                @close="closeProductDia"
+                @confirm="submitProduct"
+                @cancel="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-tree-select v-model="productForm.productCategory"
+                              placeholder="璇烽�夋嫨"
+                              clearable
+                              filterable
+                              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"
+                         filterable>
+                <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>
+          </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="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-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="鏄惁鐢熶骇锛�"
+                          prop="isProduction">
+              <el-radio-group v-model="productForm.isProduction">
+                <el-radio label="鏄�"
+                          :value="true" />
+                <el-radio label="鍚�"
+                          :value="false" />
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </FormDialog>
+    <!-- 瀵煎叆寮圭獥 -->
+    <FormDialog v-model="importUpload.open"
+                :title="importUpload.title"
+                :width="'600px'"
+                @close="importUpload.open = false"
+                @confirm="submitImportFile"
+                @cancel="importUpload.open = false">
+      <el-upload ref="importUploadRef"
+                 :limit="1"
+                 accept=".xlsx,.xls"
+                 :action="importUpload.url"
+                 :headers="importUpload.headers"
+                 :before-upload="importUpload.beforeUpload"
+                 :on-success="importUpload.onSuccess"
+                 :on-error="importUpload.onError"
+                 :on-progress="importUpload.onProgress"
+                 :on-change="importUpload.onChange"
+                 :auto-upload="false"
+                 drag>
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em>
+        </div>
+        <template #tip>
+          <div class="el-upload__tip">
+            浠呮敮鎸� xls/xlsx锛屽ぇ灏忎笉瓒呰繃 10MB銆�
+            <el-button link
+                       type="primary"
+                       @click="downloadTemplate">涓嬭浇瀵煎叆妯℃澘</el-button>
           </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>
+        </template>
+      </el-upload>
+    </FormDialog>
+    <!-- 闄勪欢鍒楄〃寮圭獥 -->
+    <FileListDialog ref="fileListRef"
+                    v-model="fileListDialogVisible"
+                    title="闄勪欢鍒楄〃" />
+    <!-- 鎵撳嵃棰勮寮圭獥 -->
+    <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 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 => `
+          <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="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.shippingCarNumber }}</span>
+                  </div>
+                </div>
+                <div class="info-row">
+                  <div>
+                    <span class="label">瀹㈡埛鍚嶇О锛�</span>
+                    <span class="value">{{ item.customerName }}</span>
+                  </div>
+                  <span class="label">鍗曞彿锛�</span>
+                  <span class="value">{{ item.salesContractNo }}</span>
+                </div>
+              </div>
+              <div class="table-section">
+                <table class="product-table">
+                  <thead>
                     <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>
+                      <th>浜у搧鍚嶇О</th>
+                      <th>瑙勬牸鍨嬪彿</th>
+                      <th>鍗曚綅</th>
+                      <th>鍗曚环</th>
+                      <th>闆跺敭鏁伴噺</th>
+                      <th>闆跺敭閲戦</th>
                     </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>
+                  </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-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 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>
-    `;
-	});
-	
-	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}`;
-};
-// 璁$畻浜у搧鎬绘暟閲�
-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);
-};
+    </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="type">
+              <el-select v-model="deliveryForm.type"
+                         placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
+                         style="width: 100%">
+                <el-option label="璐ц溅"
+                           value="璐ц溅" />
+                <el-option label="蹇��"
+                           value="蹇��" />
+              </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>
+  </div>
+</template>
 
-// 璁$畻浜у搧鎬婚噾棰�
-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);
-};
+<script setup>
+  import { getToken } from "@/utils/auth";
+  import pagination from "@/components/PIMTable/Pagination.vue";
+  import { onMounted, ref, getCurrentInstance } from "vue";
+  import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
+  import { ElMessageBox, ElMessage } from "element-plus";
+  import { UploadFilled, Download } from "@element-plus/icons-vue";
+  import useUserStore from "@/store/modules/user";
+  import { userListNoPage } from "@/api/system/user.js";
+  import FileListDialog from "@/components/Dialog/FileListDialog.vue";
+  import FormDialog from "@/components/Dialog/FormDialog.vue";
+  import { getQuotationList } from "@/api/salesManagement/salesQuotation.js";
+  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 { getCurrentDate } from "@/utils/index.js";
+  import { listCustomerPrivatePool } from "@/api/basicData/customerFile.js";
 
-// 鐢ㄤ簬鎵撳嵃鐨勮绠楀嚱鏁�
-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 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 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 operationType = ref("");
+  const dialogFormVisible = ref(false);
+  const data = reactive({
+    searchForm: {
+      customerName: "", // 瀹㈡埛鍚嶇О
+      salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
+      entryDate: null, // 褰曞叆鏃ユ湡
+      entryDateStart: undefined,
+      entryDateEnd: undefined,
+    },
+    form: {
+      salesContractNo: "",
+      salesman: "",
+      customerId: "",
+      entryPerson: "",
+      entryDate: "",
+      deliveryDate: "",
+      maintenanceTime: "",
+      productData: [],
+      executionDate: "",
+      hasProductionRecord: false,
+    },
+    rules: {
+      salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+      customerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+      entryPerson: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+      entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+      deliveryDate: [{ 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: "",
+      isProduction: false,
+    },
+    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" }],
+      isProduction: [{ 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 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 quotationDialogVisible = ref(false);
+  const quotationLoading = ref(false);
+  const quotationList = ref([]);
+  const quotationSearchForm = reactive({
+    quotationNo: "",
+    customer: "",
+  });
+  // 鎶ヤ环鍗曞脊妗嗗垎椤�
+  const quotationPage = reactive({
+    current: 1,
+    size: 10,
+    total: 0,
+  });
+  const selectedQuotation = ref(null);
 
-// 鏍规嵁鍚◣鎬讳环璁$畻鍚◣鍗曚环鍜屾暟閲�
-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 deliveryFormVisible = ref(false);
+  const currentDeliveryRow = ref(null);
+  const deliveryFormData = reactive({
+    deliveryForm: {
+      type: "璐ц溅", // 璐ц溅, 蹇��
+    },
+    deliveryRules: {
+      type: [{ required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }],
+    },
+  });
+  const { deliveryForm, deliveryRules } = toRefs(deliveryFormData);
 
-// 鏍规嵁涓嶅惈绋庢�讳环璁$畻鍚◣鍗曚环鍜屾暟閲�
-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 importUploadRef = ref(null);
+  const importUpload = reactive({
+    title: "瀵煎叆閿�鍞彴璐�",
+    open: false,
+    url: import.meta.env.VITE_APP_BASE_API + "/sales/ledger/import",
+    headers: { Authorization: "Bearer " + getToken() },
+    isUploading: false,
+    beforeUpload: file => {
+      const isExcel = file.name.endsWith(".xlsx") || file.name.endsWith(".xls");
+      const isLt10M = file.size / 1024 / 1024 < 10;
+      if (!isExcel) {
+        proxy.$modal.msgError("涓婁紶鏂囦欢鍙兘鏄� xlsx/xls 鏍煎紡!");
+        return false;
+      }
+      if (!isLt10M) {
+        proxy.$modal.msgError("涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 10MB!");
+        return false;
+      }
+      return true;
+    },
+    onChange: (file, fileList) => {
+      console.log("鏂囦欢鐘舵�佹敼鍙�", file, fileList);
+    },
+    onProgress: (event, file, fileList) => {
+      console.log("涓婁紶涓�...", event.percent);
+    },
+    onSuccess: (response, file, fileList) => {
+      console.log("涓婁紶鎴愬姛", response, file, fileList);
+      importUpload.isUploading = false;
+      if (response.code === 200) {
+        proxy.$modal.msgSuccess("瀵煎叆鎴愬姛");
+        importUpload.open = false;
+        if (importUploadRef.value) {
+          importUploadRef.value.clearFiles();
+        }
+        getList();
+      } else {
+        proxy.$modal.msgError(response.msg || "瀵煎叆澶辫触");
+      }
+    },
+    onError: (error, file, fileList) => {
+      console.error("涓婁紶澶辫触", error, file, fileList);
+      importUpload.isUploading = false;
+      proxy.$modal.msgError("瀵煎叆澶辫触锛岃閲嶈瘯");
+    },
+  });
 
-// 鏍规嵁鏁伴噺鍙樺寲璁$畻鎬讳环
-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 getShippingStatusText = (row) => {
-	// 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀�"宸插彂璐�"
-	if (row.shippingDate || row.shippingCarNumber) {
-		return '宸插彂璐�';
-	}
-	
-	// 鑾峰彇鍙戣揣鐘舵�佸瓧娈�
-	const status = row.shippingStatus;
-	
-	// 濡傛灉鐘舵�佷负绌烘垨鏈畾涔夛紝榛樿涓�"寰呭彂璐�"
-	if (status === null || status === undefined || status === '') {
-		return '寰呭彂璐�';
-	}
-	
-	// 鐘舵�佹槸瀛楃涓�
-	const statusStr = String(status).trim();
-	const statusTextMap = {
-		'寰呭彂璐�': '寰呭彂璐�',
-		'寰呭鏍�': '寰呭鏍�',
-		'瀹℃牳涓�': '瀹℃牳涓�',
-		'瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
-		'瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
-		'宸插彂璐�': '宸插彂璐�'
-	};
-	return statusTextMap[statusStr] || '寰呭彂璐�';
-};
-
-/**
- * 鑾峰彇鍙戣揣鐘舵�佹爣绛剧被鍨嬶紙棰滆壊锛�
- * @param row 琛屾暟鎹�
- */
-const getShippingStatusType = (row) => {
-	// 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀虹豢鑹�
-	if (row.shippingDate || row.shippingCarNumber) {
-		return 'success';
-	}
-	
-	// 鑾峰彇鍙戣揣鐘舵�佸瓧娈�
-	const status = row.shippingStatus;
-	
-	// 濡傛灉鐘舵�佷负绌烘垨鏈畾涔夛紝榛樿涓虹伆鑹诧紙寰呭彂璐э級
-	if (status === null || status === undefined || status === '') {
-		return 'info';
-	}
-	
-	// 鐘舵�佹槸瀛楃涓�
-	const statusStr = String(status).trim();
-	const typeTextMap = {
-		'寰呭彂璐�': 'info',
-		'寰呭鏍�': 'info',
-		'瀹℃牳涓�': 'warning',
-		'瀹℃牳鎷掔粷': 'danger',
-		'瀹℃牳閫氳繃': 'success',
-		'宸插彂璐�': 'success'
-	};
-	return typeTextMap[statusStr] || 'info';
-};
-
-/**
- * 鍒ゆ柇鏄惁鍙互鍙戣揣
- * 鍙湁鍦ㄤ骇鍝佺姸鎬佹槸鍏呰冻锛屽彂璐х姸鎬佹槸寰呭彂璐у拰瀹℃牳鎷掔粷鐨勬椂鍊欐墠鍙互鍙戣揣
- * @param row 琛屾暟鎹�
- */
-const canShip = (row) => {
-	// 浜у搧鐘舵�佸繀椤绘槸鍏呰冻锛坅pproveStatus === 1锛�
-	if (row.approveStatus !== 1) {
-		return false;
-	}
-	
-	// 鑾峰彇鍙戣揣鐘舵��
-	const shippingStatus = row.shippingStatus;
-	
-	// 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屼笉鑳藉啀娆″彂璐�
-	if (row.shippingDate || row.shippingCarNumber) {
-		return false;
-	}
-	
-	// 鍙戣揣鐘舵�佸繀椤绘槸"寰呭彂璐�"鎴�"瀹℃牳鎷掔粷"
-	const statusStr = shippingStatus ? String(shippingStatus).trim() : '';
-	return statusStr === '寰呭彂璐�' || statusStr === '瀹℃牳鎷掔粷';
-};
-
-/**
- * 涓嬭浇鏂囦欢
- *
- * @param row 涓嬭浇鏂囦欢鐨勭浉鍏充俊鎭璞�
- */
-const fileListRef = ref(null)
-const fileListDialogVisible = ref(false)
-const downLoadFile = (row) => {
-	getSalesLedgerWithProducts({ id: row.id, type: 1 }).then((res) => {
-		if (fileListRef.value) {
-			fileListRef.value.open(res.salesLedgerFiles)
-		}
-	});
-}
-
-// 鎵撳紑鍙戣揣寮规
-const openDeliveryForm = (row) => {
-	// 妫�鏌ユ槸鍚﹀彲浠ュ彂璐�
-	if (!canShip(row)) {
-		proxy.$modal.msgWarning("鍙湁鍦ㄤ骇鍝佺姸鎬佹槸鍏呰冻锛屽彂璐х姸鎬佹槸寰呭彂璐ф垨瀹℃牳鎷掔粷鐨勬椂鍊欐墠鍙互鍙戣揣");
-		return;
-	}
-	
-	currentDeliveryRow.value = row;
-  deliveryForm.value = {
-    type: "璐ц溅",
+  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();
   };
-	deliveryFormVisible.value = true;
-};
 
-// 鎻愪氦鍙戣揣琛ㄥ崟
-const submitDelivery = () => {
-  proxy.$refs["deliveryFormRef"].validate((valid) => {
-    if (valid) {
-      // 淇濆瓨褰撳墠灞曞紑鐨勮ID锛屼互渚垮彂璐у悗閲嶆柊鍔犺浇瀛愯〃鏍兼暟鎹�
-      const currentExpandedKeys = [...expandedRowKeys.value];
-      const salesLedgerId = currentDeliveryRow.value.salesLedgerId;
-      addShippingInfo({
-        salesLedgerId: salesLedgerId,
-        salesLedgerProductId: currentDeliveryRow.value.id,
-        type: deliveryForm.value.type,
+  // 鏌ヨ鍒楄〃
+  /** 鎼滅储鎸夐挳鎿嶄綔 */
+  const handleQuery = () => {
+    // 鍙湁鍦ㄧ偣鍑绘悳绱㈡寜閽椂鎵嶉噸缃〉鐮佸埌绗竴椤�
+    // 閬垮厤琛ㄥ崟瀛楁change浜嬩欢骞叉壈鍒嗛〉
+    if (arguments.length === 0) {
+      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;
+    // 灏嗚寖鍥存棩鏈熷瓧娈典紶閫掔粰鍚庣
+    const params = { ...rest, ...page };
+    // 绉婚櫎褰曞叆鏃ユ湡鐨勯粯璁ゅ�艰缃紝鍙繚鐣欒寖鍥存棩鏈熷瓧娈�
+    delete params.entryDate;
+    return ledgerListPage(params)
+      .then(res => {
+        tableLoading.value = false;
+        tableData.value = res.records;
+        tableData.value.map(item => {
+          item.children = [];
+        });
+        total.value = res.total;
+        return res;
+      })
+      .catch(() => {
+        tableLoading.value = false;
+      });
+  };
+  // 鑾峰彇浜у搧澶х被tree鏁版嵁
+  const getProductOptions = () => {
+    // 杩斿洖 Promise锛屼究浜庡湪缂栬緫浜у搧鏃剁瓑寰呭姞杞藉畬鎴�
+    return productTreeList().then(res => {
+      productOptions.value = convertIdToValue(res);
+      return productOptions.value;
+    });
+  };
+  const formattedNumber = (row, column, cellValue) => {
+    if (cellValue === undefined || cellValue === null || cellValue === "") {
+      return "0.00";
+    }
+    return parseFloat(cellValue).toFixed(2);
+  };
+  const findLedgerRecordByRow = row => {
+    if (!row) return null;
+    if (
+      row.maintainer !== undefined ||
+      row.maintainerName !== undefined ||
+      row.entryPerson !== undefined ||
+      row.entryPersonName !== undefined
+    ) {
+      return row;
+    }
+    if (row.salesLedgerId !== undefined && row.salesLedgerId !== null) {
+      return (
+        tableData.value.find(
+          item => String(item.id) === String(row.salesLedgerId)
+        ) || null
+      );
+    }
+    return null;
+  };
+  const isCurrentUserMaintainer = row => {
+    const ledgerRecord = findLedgerRecordByRow(row);
+    if (!ledgerRecord) return true;
+    const currentUserId = String(userStore.id ?? "");
+    const currentNickName = String(userStore.nickName ?? "").trim();
+    const maintainerId = ledgerRecord.maintainerId ?? ledgerRecord.entryPerson;
+    const maintainerName =
+      ledgerRecord.maintainerName ??
+      ledgerRecord.maintainer ??
+      ledgerRecord.entryPersonName;
+    if (
+      maintainerId !== undefined &&
+      maintainerId !== null &&
+      String(maintainerId) !== ""
+    ) {
+      return String(maintainerId) === currentUserId;
+    }
+    if (
+      maintainerName !== undefined &&
+      maintainerName !== null &&
+      String(maintainerName).trim() !== ""
+    ) {
+      return String(maintainerName).trim() === currentNickName;
+    }
+    return true;
+  };
+  const canEditLedger = row => isCurrentUserMaintainer(row);
+  const canDeleteLedger = row => isCurrentUserMaintainer(row);
+  const sensitiveAmountFormatter = (row, column, cellValue) => {
+    if (!isCurrentUserMaintainer(row)) {
+      return "*****";
+    }
+    return formattedNumber(row, column, cellValue);
+  };
+  // 鑾峰彇tree瀛愭暟鎹�
+  const getModels = value => {
+    productForm.value.productCategory = findNodeById(productOptions.value, value);
+    modelList({ id: value }).then(res => {
+      modelOptions.value = res;
+    });
+  };
+  const getProductModel = 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;
+    });
+  }
+  // 鏍规嵁鍚嶇О鍙嶆煡浜у搧澶х被 id锛屼究浜庝粎瀛樺悕绉版椂鐨勫弽鏄�
+  function findNodeIdByLabel(nodes, label) {
+    if (!label) return null;
+    for (let i = 0; i < nodes.length; i++) {
+      const node = nodes[i];
+      if (node.label === label) return node.value;
+      if (node.children && node.children.length > 0) {
+        const found = findNodeIdByLabel(node.children, label);
+        if (found !== null && found !== undefined) return found;
+      }
+    }
+    return null;
+  }
+  // 琛ㄦ牸閫夋嫨鏁版嵁
+  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);
+          if (index > -1) {
+            tableData.value[index].children = res.data;
+          }
+          expandedRowKeys.value.push(row.id);
+        });
+      } catch (error) {
+        console.log(error);
+      }
+    } else {
+      expandedRowKeys.value = [];
+    }
+  };
+
+  // 娣诲姞琛ㄨ绫诲悕鏂规硶
+  const tableRowClassName = ({ row }) => {
+    if (!row.deliveryDate) return "";
+    if (row.isFh) return "";
+
+    const diff = row.deliveryDaysDiff;
+    if (diff === 15) {
+      return "yellow";
+    } else if (diff === 10) {
+      return "pink";
+    } else if (diff === 2) {
+      return "purple";
+    } else if (diff < 2) {
+      return "red";
+    }
+  };
+  // 涓昏〃鍚堣鏂规硶
+  const summarizeMainTable = param => {
+    return proxy.summarizeTable(param, [
+      "contractAmount",
+      "taxInclusiveTotalPrice",
+      "taxExclusiveTotalPrice",
+    ]);
+  };
+  // 瀛愯〃鍚堣鏂规硶
+  const summarizeChildrenTable = (param, parentRow) => {
+    if (!isCurrentUserMaintainer(parentRow)) {
+      const { columns } = param;
+      return columns.map((column, index) => {
+        if (index === 0) {
+          return "鍚堣";
+        }
+        if (
+          [
+            "taxInclusiveUnitPrice",
+            "taxInclusiveTotalPrice",
+            "taxExclusiveTotalPrice",
+          ].includes(column.property)
+        ) {
+          return "*****";
+        }
+        return "";
+      });
+    }
+    return proxy.summarizeTable(param, [
+      "taxInclusiveUnitPrice",
+      "taxInclusiveTotalPrice",
+      "taxExclusiveTotalPrice",
+    ]);
+  };
+  // 鎵撳紑寮规
+  const openForm = async (type, row) => {
+    if (type === "edit" && row && !canEditLedger(row)) {
+      proxy.$modal.msgWarning("褰撳墠绯荤粺鐧诲綍浜轰笉鏄淮鎶や汉锛屼笉鑳界紪杈戞暟鎹�");
+      return;
+    }
+    operationType.value = type;
+    form.value = {};
+    productData.value = [];
+    selectedQuotation.value = null;
+    let userLists = await userListNoPage();
+    userList.value = userLists.data;
+    listCustomerPrivatePool({ current: -1, size: -1 }).then(res => {
+      customerOption.value = res.data.records;
+    });
+    form.value.entryPerson = userStore.id;
+    if (type === "add") {
+      // 鏂板鏃惰缃綍鍏ユ棩鏈熶负褰撳ぉ
+      form.value.entryDate = getCurrentDate();
+      // 绛捐鏃ユ湡榛樿涓哄綋澶�
+      form.value.executionDate = getCurrentDate();
+    } else {
+      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;
+  };
+
+  // 鎵撳紑鎶ヤ环鍗曢�夋嫨寮圭獥锛堜粎瀹℃壒閫氳繃锛�
+  const openQuotationDialog = async () => {
+    if (operationType.value === "view") return;
+    quotationDialogVisible.value = true;
+    // 鎵撳紑寮圭獥鏃堕噸缃垎椤靛埌绗竴椤�
+    quotationPage.current = 1;
+    // 鍏堢‘淇濆鎴峰垪琛ㄥ凡鍔犺浇锛屼究浜庡悗缁洖濉� customerId
+    if (!customerOption.value || customerOption.value.length === 0) {
+      try {
+        listCustomerPrivatePool({ current: -1, size: -1 }).then(res => {
+          customerOption.value = res.data.records;
+        });
+      } catch (e) {
+        // ignore锛屽厑璁哥敤鎴峰悗缁墜鍔ㄩ�夋嫨瀹㈡埛
+      }
+    }
+    await fetchQuotationList();
+  };
+
+  const fetchQuotationList = async () => {
+    quotationLoading.value = true;
+    try {
+      const params = {
+        // 鍚庣鍒嗛〉瀛楁锛歝urrent / size
+        current: quotationPage.current,
+        size: quotationPage.size,
+        ...quotationSearchForm,
+        status: "閫氳繃",
+      };
+      const res = await getQuotationList(params);
+      quotationList.value = res?.data?.records || [];
+      quotationPage.total = res?.data?.total || 0;
+    } finally {
+      quotationLoading.value = false;
+    }
+  };
+
+  const resetQuotationSearch = async () => {
+    quotationSearchForm.quotationNo = "";
+    quotationSearchForm.customer = "";
+    quotationPage.current = 1;
+    await fetchQuotationList();
+  };
+
+  // 鎶ヤ环鍗曞脊妗嗗垎椤靛垏鎹�
+  const quotationPaginationChange = obj => {
+    quotationPage.current = obj.page;
+    quotationPage.size = obj.limit;
+    fetchQuotationList();
+  };
+
+  // 閫変腑鎶ヤ环鍗曞悗鍥炲~鍒板彴璐﹁〃鍗�
+  const applyQuotation = row => {
+    if (!row) return;
+    selectedQuotation.value = row;
+
+    // 涓氬姟鍛�
+    form.value.salesman = (row.salesperson || "").trim();
+
+    // 瀹㈡埛鍚嶇О -> customerId
+    const qCustomerName = String(row.customer || "").trim();
+    const customer = (customerOption.value || []).find(c => {
+      const name = String(c.customerName || "").trim();
+      return (
+        name === qCustomerName ||
+        name.includes(qCustomerName) ||
+        qCustomerName.includes(name)
+      );
+    });
+    if (customer?.id) {
+      form.value.customerId = customer.id;
+    } else {
+      // 濡傛灉鎵句笉鍒帮紝淇濈暀鍘熷�硷紙鍏佽鐢ㄦ埛鎵嬪姩閫夋嫨/涓嶆墦鏂凡鏈夎緭鍏ワ級
+      form.value.customerId = form.value.customerId || "";
+    }
+
+    // 浜у搧淇℃伅鏄犲皠锛氭姤浠� products -> 鍙拌处 productData
+    const products = Array.isArray(row.products) ? row.products : [];
+    productData.value = products.map(p => {
+      const quantity = Number(p.quantity ?? 0) || 0;
+      const unitPrice = Number(p.unitPrice ?? 0) || 0;
+      const taxRate = "13"; // 榛樿 13%锛屼究浜庣洿鎺ユ彁浜わ紙濡傞渶鍙湪浜у搧涓嚜琛屼慨鏀癸級
+      const taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
+      const taxExclusiveTotalPrice = proxy.calculateTaxExclusiveTotalPrice(
+        taxInclusiveTotalPrice,
+        taxRate
+      );
+      return {
+        // 鍙拌处瀛楁
+        productCategory: p.product || p.productName || "",
+        specificationModel: p.specification || "",
+        unit: p.unit || "",
+        quantity: quantity,
+        taxRate: taxRate,
+        taxInclusiveUnitPrice: unitPrice.toFixed(2),
+        taxInclusiveTotalPrice: taxInclusiveTotalPrice,
+        taxExclusiveTotalPrice: taxExclusiveTotalPrice,
+        invoiceType: "澧炴櫘绁�",
+        isProduction: true,
+      };
+    });
+
+    quotationDialogVisible.value = false;
+  };
+  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 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("璇锋坊鍔犱骇鍝佷俊鎭�");
+          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();
+          expandedRowKeys.value = [];
+          getList();
+        });
+      }
+    });
+  };
+  // 鍏抽棴寮规
+  const closeDia = () => {
+    proxy.resetForm("formRef");
+    dialogFormVisible.value = false;
+  };
+
+  const productIndex = ref(0);
+  // 鎵撳紑浜у搧寮规
+  const openProductForm = async (type, row, index) => {
+    // 缂栬緫鏃舵鏌ヤ骇鍝佹槸鍚﹀凡鍙戣揣鎴栧鏍搁�氳繃
+    if (type === "edit" && isProductShipped(row)) {
+      proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
+      return;
+    }
+
+    productOperationType.value = type;
+    productForm.value = {};
+    if (type === "add") {
+      productForm.value.isProduction = true;
+    }
+    proxy.resetForm("productFormRef");
+    if (type === "edit") {
+      productForm.value = { ...row };
+      productIndex.value = index;
+      // 缂栬緫鏃舵牴鎹骇鍝佸ぇ绫诲悕绉板弽鏌� tree 鑺傜偣 id锛屽苟鍔犺浇瑙勬牸鍨嬪彿鍒楄〃
+      try {
+        const options =
+          productOptions.value && productOptions.value.length > 0
+            ? productOptions.value
+            : await getProductOptions();
+        const categoryId = findNodeIdByLabel(
+          options,
+          productForm.value.productCategory
+        );
+        if (categoryId) {
+          const models = await modelList({ id: categoryId });
+          modelOptions.value = models || [];
+          // 鏍规嵁褰撳墠瑙勬牸鍨嬪彿鍚嶇О鍙嶆煡骞惰缃� productModelId锛屼究浜庝笅鎷夋鏄剧ず宸查�夊��
+          const currentModel = (modelOptions.value || []).find(
+            m => m.model === productForm.value.specificationModel
+          );
+          if (currentModel) {
+            productForm.value.productModelId = currentModel.id;
+          }
+        }
+      } catch (e) {
+        // 鍔犺浇澶辫触鏃朵繚鎸佸彲缂栬緫锛屼笉涓柇寮圭獥
+        console.error("鍔犺浇浜у搧瑙勬牸鍨嬪彿澶辫触", e);
+      }
+    } else {
+      getProductOptions();
+    }
+    productFormVisible.value = true;
+  };
+  // 鎻愪氦浜у搧琛ㄥ崟
+  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;
+    }
+
+    // 妫�鏌ユ槸鍚︽湁宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝�
+    const shippedProducts = productSelectedRows.value.filter(row =>
+      isProductShipped(row)
+    );
+    if (shippedProducts.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 handleImport = () => {
+    importUpload.title = "瀵煎叆閿�鍞彴璐�";
+    importUpload.open = true;
+    if (importUploadRef.value) {
+      importUploadRef.value.clearFiles();
+    }
+  };
+
+  // 涓嬭浇瀵煎叆妯℃澘
+  const downloadTemplate = () => {
+    proxy.download("/sales/ledger/exportTemplate", {}, "閿�鍞彴璐﹀鍏ユā鏉�.xlsx");
+  };
+
+  // 鎻愪氦瀵煎叆鏂囦欢
+  const submitImportFile = () => {
+    importUpload.isUploading = true;
+    proxy.$refs["importUploadRef"].submit();
+  };
+
+  // 瀵煎嚭
+  const handleOut = () => {
+    ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+      confirmButtonText: "纭",
+      cancelButtonText: "鍙栨秷",
+      type: "warning",
+    })
+      .then(() => {
+        proxy.download("/sales/ledger/export", {}, "閿�鍞彴璐�.xlsx");
+      })
+      .catch(() => {
+        proxy.$modal.msg("宸插彇娑�");
+      });
+  };
+  /** 鍒ゆ柇鍗曚釜浜у搧鏄惁宸插彂璐э紙鏍规嵁shippingStatus鍒ゆ柇锛屽凡鍙戣揣鎴栧鏍搁�氳繃涓嶅彲缂栬緫鍜屽垹闄わ級 */
+  const isProductShipped = product => {
+    if (!product) return false;
+    const status = String(product.shippingStatus || "").trim();
+    // 濡傛灉鍙戣揣鐘舵�佹槸"宸插彂璐�"鎴�"瀹℃牳閫氳繃"锛屽垯涓嶅彲缂栬緫鍜屽垹闄�
+    return status === "宸插彂璐�" || status === "瀹℃牳閫氳繃";
+  };
+
+  /** 鍒ゆ柇閿�鍞鍗曚笅鏄惁瀛樺湪宸插彂璐�/鍙戣揣瀹屾垚鐨勪骇鍝侊紙涓嶅彲鍒犻櫎锛� */
+  const hasShippedProducts = products => {
+    if (!products || !products.length) return false;
+    return products.some(p => {
+      const status = String(p.shippingStatus || "").trim();
+      // 鏈夊彂璐ф棩鏈熸垨杞︾墝鍙疯涓哄凡鍙戣揣
+      if (p.shippingDate || p.shippingCarNumber) return true;
+      // 宸茶繘琛屽彂璐с�佸彂璐у畬鎴愩�佸凡鍙戣揣 鍧囦笉鍙垹闄�
+      return (
+        status === "宸茶繘琛屽彂璐�" || status === "鍙戣揣瀹屾垚" || status === "宸插彂璐�"
+      );
+    });
+  };
+
+  // 鍒犻櫎
+  const handleDelete = async () => {
+    if (selectedRows.value.length === 0) {
+      proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+      return;
+    }
+    const unauthorizedRows = selectedRows.value.filter(
+      row => !canDeleteLedger(row)
+    );
+    if (unauthorizedRows.length > 0) {
+      proxy.$modal.msgWarning("褰撳墠鐧诲綍鐢ㄦ埛涓嶆槸褰曞叆浜猴紝涓嶈兘鍒犻櫎璇ユ暟鎹�");
+      return;
+    }
+    const ids = selectedRows.value.map(item => item.id);
+
+    // 妫�鏌ユ槸鍚︽湁宸茶繘琛屽彂璐ф垨鍙戣揣瀹屾垚鐨勯攢鍞鍗曪紝鑻ユ湁鍒欎笉鍏佽鍒犻櫎
+    const cannotDeleteNames = [];
+    for (const row of selectedRows.value) {
+      let products =
+        row.children && row.children.length > 0 ? row.children : null;
+      if (!products) {
+        try {
+          const res = await productList({ salesLedgerId: row.id, type: 1 });
+          products = res.data || [];
+        } catch {
+          products = [];
+        }
+      }
+      if (hasShippedProducts(products)) {
+        cannotDeleteNames.push(row.salesContractNo || `ID:${row.id}`);
+      }
+    }
+    if (cannotDeleteNames.length > 0) {
+      proxy.$modal.msgWarning(
+        "宸茶繘琛屽彂璐ф垨鍙戣揣瀹屾垚鐨勯攢鍞鍗曚笉鑳藉垹闄わ細" + cannotDeleteNames.join("銆�")
+      );
+      return;
+    }
+
+    ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
+      confirmButtonText: "纭",
+      cancelButtonText: "鍙栨秷",
+      type: "warning",
+    })
+      .then(() => {
+        delLedger(ids).then(res => {
+          proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          getList();
+        });
+      })
+      .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="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}`;
+  };
+  // 璁$畻浜у搧鎬绘暟閲�
+  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;
+    }
+
+    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;
+
+    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 getShippingStatusText = row => {
+    // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀�"宸插彂璐�"
+    if (row.shippingDate || row.shippingCarNumber) {
+      return "宸插彂璐�";
+    }
+
+    // 鑾峰彇鍙戣揣鐘舵�佸瓧娈�
+    const status = row.shippingStatus;
+
+    // 濡傛灉鐘舵�佷负绌烘垨鏈畾涔夛紝榛樿涓�"寰呭彂璐�"
+    if (status === null || status === undefined || status === "") {
+      return "寰呭彂璐�";
+    }
+
+    // 鐘舵�佹槸瀛楃涓�
+    const statusStr = String(status).trim();
+    const statusTextMap = {
+      寰呭彂璐�: "寰呭彂璐�",
+      寰呭鏍�: "寰呭鏍�",
+      瀹℃牳涓�: "瀹℃牳涓�",
+      瀹℃牳鎷掔粷: "瀹℃牳鎷掔粷",
+      瀹℃牳閫氳繃: "瀹℃牳閫氳繃",
+      宸插彂璐�: "宸插彂璐�",
+    };
+    return statusTextMap[statusStr] || "寰呭彂璐�";
+  };
+
+  /**
+   * 鑾峰彇鍙戣揣鐘舵�佹爣绛剧被鍨嬶紙棰滆壊锛�
+   * @param row 琛屾暟鎹�
+   */
+  const getShippingStatusType = row => {
+    // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀虹豢鑹�
+    if (row.shippingDate || row.shippingCarNumber) {
+      return "success";
+    }
+
+    // 鑾峰彇鍙戣揣鐘舵�佸瓧娈�
+    const status = row.shippingStatus;
+
+    // 濡傛灉鐘舵�佷负绌烘垨鏈畾涔夛紝榛樿涓虹伆鑹诧紙寰呭彂璐э級
+    if (status === null || status === undefined || status === "") {
+      return "info";
+    }
+
+    // 鐘舵�佹槸瀛楃涓�
+    const statusStr = String(status).trim();
+    const typeTextMap = {
+      寰呭彂璐�: "info",
+      寰呭鏍�: "info",
+      瀹℃牳涓�: "warning",
+      瀹℃牳鎷掔粷: "danger",
+      瀹℃牳閫氳繃: "success",
+      宸插彂璐�: "success",
+    };
+    return typeTextMap[statusStr] || "info";
+  };
+
+  /**
+   * 鍒ゆ柇鏄惁鍙互鍙戣揣
+   * 鍙湁鍦ㄤ骇鍝佺姸鎬佹槸鍏呰冻锛屽彂璐х姸鎬佹槸寰呭彂璐у拰瀹℃牳鎷掔粷鐨勬椂鍊欐墠鍙互鍙戣揣
+   * @param row 琛屾暟鎹�
+   */
+  const canShip = row => {
+    // 浜у搧鐘舵�佸繀椤绘槸鍏呰冻锛坅pproveStatus === 1锛�
+    if (row.approveStatus !== 1) {
+      return false;
+    }
+
+    // 鑾峰彇鍙戣揣鐘舵��
+    const shippingStatus = row.shippingStatus;
+
+    // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屼笉鑳藉啀娆″彂璐�
+    if (row.shippingDate || row.shippingCarNumber) {
+      return false;
+    }
+
+    // 鍙戣揣鐘舵�佸繀椤绘槸"寰呭彂璐�"鎴�"瀹℃牳鎷掔粷"
+    const statusStr = shippingStatus ? String(shippingStatus).trim() : "";
+    return statusStr === "寰呭彂璐�" || statusStr === "瀹℃牳鎷掔粷";
+  };
+
+  /**
+   * 涓嬭浇鏂囦欢
+   *
+   * @param row 涓嬭浇鏂囦欢鐨勭浉鍏充俊鎭璞�
+   */
+  const fileListRef = ref(null);
+  const fileListDialogVisible = ref(false);
+  const downLoadFile = row => {
+    getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => {
+      if (fileListRef.value) {
+        fileListRef.value.open(res.salesLedgerFiles);
+      }
+    });
+  };
+
+  // 鎵撳紑鍙戣揣寮规
+  const openDeliveryForm = row => {
+    // 妫�鏌ユ槸鍚﹀彲浠ュ彂璐�
+    if (!canShip(row)) {
+      proxy.$modal.msgWarning(
+        "鍙湁鍦ㄤ骇鍝佺姸鎬佹槸鍏呰冻锛屽彂璐х姸鎬佹槸寰呭彂璐ф垨瀹℃牳鎷掔粷鐨勬椂鍊欐墠鍙互鍙戣揣"
+      );
+      return;
+    }
+
+    currentDeliveryRow.value = row;
+    deliveryForm.value = {
+      type: "璐ц溅",
+    };
+    deliveryFormVisible.value = true;
+  };
+
+  // 鎻愪氦鍙戣揣琛ㄥ崟
+  const submitDelivery = () => {
+    proxy.$refs["deliveryFormRef"].validate(valid => {
+      if (valid) {
+        // 淇濆瓨褰撳墠灞曞紑鐨勮ID锛屼互渚垮彂璐у悗閲嶆柊鍔犺浇瀛愯〃鏍兼暟鎹�
+        const currentExpandedKeys = [...expandedRowKeys.value];
+        const salesLedgerId = currentDeliveryRow.value.salesLedgerId;
+        addShippingInfo({
+          salesLedgerId: salesLedgerId,
+          salesLedgerProductId: currentDeliveryRow.value.id,
+          type: deliveryForm.value.type,
+        }).then(() => {
           proxy.$modal.msgSuccess("鍙戣揣鎴愬姛");
           closeDeliveryDia();
           // 鍒锋柊涓昏〃鏁版嵁
@@ -2150,12 +2550,16 @@
             if (currentExpandedKeys.length > 0) {
               // 浣跨敤 Promise.all 骞惰鍔犺浇鎵�鏈夊睍寮�琛岀殑瀛愯〃鏍兼暟鎹�
               const loadPromises = currentExpandedKeys.map(ledgerId => {
-                return productList({ salesLedgerId: ledgerId, type: 1 }).then((res) => {
-                  const index = tableData.value.findIndex((item) => item.id === ledgerId);
-                  if (index > -1) {
-                    tableData.value[index].children = res.data;
+                return productList({ salesLedgerId: ledgerId, type: 1 }).then(
+                  res => {
+                    const index = tableData.value.findIndex(
+                      item => item.id === ledgerId
+                    );
+                    if (index > -1) {
+                      tableData.value[index].children = res.data;
+                    }
                   }
-                });
+                );
               });
               Promise.all(loadPromises).then(() => {
                 // 鎭㈠灞曞紑鐘舵��
@@ -2163,225 +2567,226 @@
               });
             }
           });
-        })
-    }
-  });
-};
+        });
+      }
+    });
+  };
 
-// 鍏抽棴鍙戣揣寮规
-const closeDeliveryDia = () => {
-  proxy.resetForm("deliveryFormRef");
-  deliveryFormVisible.value = false;
-  currentDeliveryRow.value = null;
-};
-const currentFactoryName = ref("");
-const getCurrentFactoryName = async () => {
-	let res = await userStore.getInfo();
-	currentFactoryName.value = res.user.currentFactoryName;
-};
-onMounted(() => {
-	getList();
-	userListNoPage().then(res => {
-		userList.value = res.data;
-	})
-	getCurrentFactoryName();
-});
+  // 鍏抽棴鍙戣揣寮规
+  const closeDeliveryDia = () => {
+    proxy.resetForm("deliveryFormRef");
+    deliveryFormVisible.value = false;
+    currentDeliveryRow.value = null;
+  };
+  const currentFactoryName = ref("");
+  const getCurrentFactoryName = async () => {
+    let res = await userStore.getInfo();
+    currentFactoryName.value = res.user.currentFactoryName;
+  };
+  onMounted(() => {
+    getList();
+    userListNoPage().then(res => {
+      userList.value = res.data;
+    });
+    getCurrentFactoryName();
+  });
 </script>
 
 <style scoped lang="scss">
-.ml-10 {
-	margin-left: 10px;
-}
+  .ml-10 {
+    margin-left: 10px;
+  }
 
-:deep(.yellow) {
-  background-color: #FAF0DE;
-}
+  :deep(.yellow) {
+    background-color: #faf0de;
+  }
 
-:deep(.pink) {
-  background-color: #FAE1DE;
-}
+  :deep(.pink) {
+    background-color: #fae1de;
+  }
 
-:deep(.red) {
-  background-color: #FAE1DE;
-}
+  :deep(.red) {
+    background-color: #fae1de;
+  }
 
-:deep(.purple){
-  background-color: #F4DEFA;
-}
+  :deep(.purple) {
+    background-color: #f4defa;
+  }
 
-.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;
-		
-		.el-button {
-			margin: 0 10px;
-		}
-	}
-	
-	.print-preview-content {
-		padding: 20px;
-		background-color: #f5f5f5;
-		min-height: 400px;
-	}
-}
+  .print-preview-container {
+    .print-preview-header {
+      padding: 15px;
+      border-bottom: 1px solid #e4e7ed;
+      text-align: center;
 
-.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;
-}
+      .el-button {
+        margin: 0 10px;
+      }
+    }
 
-.delivery-note {
-	width: 100%;
-	height: 100%;
-	font-family: "SimSun", serif;
-	font-size: 10px;
-	line-height: 1.2;
-	display: flex;
-	flex-direction: column;
-}
+    .print-preview-content {
+      padding: 20px;
+      background-color: #f5f5f5;
+      min-height: 400px;
+    }
+  }
 
-.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;
-	}
-}
+  .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;
+  }
 
-.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: 14px;
-		}
-		
-		.value {
-			margin-right: 20px;
-			min-width: 80px;
-			font-size: 14px;
-		}
-	}
-}
+  .delivery-note {
+    width: 100%;
+    height: 100%;
+    font-family: "SimSun", serif;
+    font-size: 10px;
+    line-height: 1.2;
+    display: flex;
+    flex-direction: column;
+  }
 
-.table-section {
-	margin-bottom: 4px;
-	flex: 1;
-	
-	.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 {
-			font-weight: bold;
-		}
-		
-		.total-label {
-			text-align: right;
-			font-weight: bold;
-		}
-		
-		.total-value {
-			font-weight: bold;
-		}
-	}
-}
+  .header {
+    text-align: center;
+    margin-bottom: 8px;
 
-.footer-section {
-	.footer-row {
-		display: flex;
-		margin-bottom: 3px;
-		line-height: 20px;
-		justify-content: space-between;
-		
-		.footer-item {
-			display: flex;
-			margin-right: 20px;
-			
-			.label {
-				font-weight: bold;
-				width: 80px;
-				font-size: 14px;
-			}
-			
-			.value {
-				min-width: 80px;
-				font-size: 14px;
-			}
-			
-			&.address-item {
-				.address-value {
-					min-width: 200px;
-				}
-			}
-		}
-	}
-}
+    .company-name {
+      font-size: 18px;
+      font-weight: bold;
+      margin-bottom: 4px;
+    }
 
-@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;
-	}
-}
+    .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: 14px;
+      }
+
+      .value {
+        margin-right: 20px;
+        min-width: 80px;
+        font-size: 14px;
+      }
+    }
+  }
+
+  .table-section {
+    margin-bottom: 4px;
+    flex: 1;
+
+    .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 {
+        font-weight: bold;
+      }
+
+      .total-label {
+        text-align: right;
+        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-item {
+        display: flex;
+        margin-right: 20px;
+
+        .label {
+          font-weight: bold;
+          width: 80px;
+          font-size: 14px;
+        }
+
+        .value {
+          min-width: 80px;
+          font-size: 14px;
+        }
+
+        &.address-item {
+          .address-value {
+            min-width: 200px;
+          }
+        }
+      }
+    }
+  }
+
+  @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;
+    }
+  }
 </style>

--
Gitblit v1.9.3