From 41de91c90854bc2794d4fe5383aa5fb64f464028 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 16 六月 2026 11:27:32 +0800
Subject: [PATCH] pro 1.平遥县盛达铸造厂部署修改

---
 src/views/salesManagement/salesLedger/index.vue | 3300 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 2,417 insertions(+), 883 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 7482d2e..5c643d7 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -3,24 +3,42 @@
     <div class="search_form">
       <el-form :model="searchForm" :inline="true">
         <el-form-item label="瀹㈡埛鍚嶇О锛�">
-          <el-input v-model="searchForm.customerName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
-            @change="handleQuery" />
-        </el-form-item>
-        <el-form-item label="瀹㈡埛鍚堝悓鍙凤細">
-          <el-input v-model="searchForm.customerContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
-            @change="handleQuery" />
+          <el-input
+            v-model="searchForm.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>
@@ -34,81 +52,332 @@
           <el-button type="primary" @click="openForm('add')">
             鏂板鍙拌处
           </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" show-summary style="width: 100%"
-        :summary-method="summarizeMainTable" @expand-change="expandChange" height="calc(100vh - 18.5em)">
-        <el-table-column align="center" type="selection" width="55" />
-        <el-table-column type="expand">
+      <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="summarizeChildrenTable">
-              <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+            <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" type="success"
+                    >鍏呰冻
+                  </el-tag>
+                  <el-tag
+                    v-else-if="
+                      scope.row.approveStatus === 0 &&
+                      scope.row.noQuantity === 0
+                    "
+                    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="瀹℃壒涓暟閲�" width="120" align="center">
+                <template #default="scope">
+                  <span>{{ scope.row.pendingApprovalQuantity || 0 }}</span>
+                </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>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="鍙戣揣鏃ユ湡" minWidth="100px" align="center">
+                <template #default="scope">
+                  <div>
+                    <div v-if="scope.row.shippingDate">
+                      {{ scope.row.shippingDate }}
+                    </div>
+                    <el-tag v-else type="info">- </el-tag>
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column label="鏁伴噺" prop="quantity" />
+              <el-table-column label="寰呭彂璐ф暟閲�" prop="noQuantity" />
               <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="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>
+                </template>
+              </el-table-column>
             </el-table>
           </template>
         </el-table-column>
         <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-        <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" show-overflow-tooltip />
-        <el-table-column label="瀹㈡埛鍚堝悓鍙�" prop="customerContractNo" width="180" show-overflow-tooltip />
-        <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="300" show-overflow-tooltip />
-        <el-table-column label="涓氬姟鍛�" prop="salesman" width="100" show-overflow-tooltip />
-        <el-table-column label="椤圭洰鍚嶇О" prop="projectName" width="180" show-overflow-tooltip />
-        <el-table-column label="浠樻鏂瑰紡" prop="paymentMethod" show-overflow-tooltip />
-        <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" width="220" show-overflow-tooltip
-          :formatter="formattedNumber" />
-        <el-table-column label="褰曞叆浜�" prop="entryPersonName" width="100" show-overflow-tooltip />
-        <el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip />
-        <el-table-column label="绛捐鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip />
-        <el-table-column fixed="right" label="鎿嶄綔" min-width="140" align="center">
+        <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="220" align="center">
           <template #default="scope">
-            <el-button link type="primary" size="small" :disabled="scope.row.invoiceTotal>0 || scope.row.entryPersonName !== userStore.nickName" @click="openForm('edit', scope.row)">缂栬緫</el-button>
-<!--            <el-button link type="primary" size="small" @click="openForm('view', scope.row)">璇︽儏</el-button>-->
-            <el-button link type="primary" size="small" @click="downLoadFile(scope.row)">闄勪欢</el-button>
+            <el-button link type="primary" @click="openForm('view', 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="openFileDialog(scope.row)"
+              >闄勪欢
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
-        :page="page.current" :limit="page.size" @pagination="paginationChange" />
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        :page="page.current"
+        :limit="page.size"
+        @pagination="paginationChange"
+      />
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'" width="70%"
-      @close="closeDia">
-      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
+    <FormDialog
+      v-model="dialogFormVisible"
+      :title="
+        operationType === 'add'
+          ? '鏂板閿�鍞彴璐﹂〉闈�'
+          : operationType === 'edit'
+          ? '缂栬緫閿�鍞彴璐﹂〉闈�'
+          : '閿�鍞彴璐﹁鎯�'
+      "
+      :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 />
+              <div
+                style="
+                  display: flex;
+                  align-items: center;
+                  gap: 12px;
+                  width: 100%;
+                "
+              >
+                <el-checkbox
+                  v-model="form.autoGenerateContractNo"
+                  v-if="operationType === 'add'"
+                  >鑷姩鐢熸垚
+                </el-checkbox>
+                <el-input
+                  v-model="form.salesContractNo"
+                  :placeholder="
+                    form.autoGenerateContractNo ? '淇濆瓨鍚庤嚜鍔ㄧ敓鎴�' : '璇疯緭鍏�'
+                  "
+                  clearable
+                  :disabled="
+                    form.autoGenerateContractNo || operationType === 'view'
+                  "
+                />
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="涓氬姟鍛橈細" prop="salesman">
-              <el-select v-model="form.salesman" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'">
-                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
-                  :value="item.nickName" />
+              <el-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="customerContractNo">
-              <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
             <el-form-item label="瀹㈡埛鍚嶇О锛�" prop="customerId">
-              <el-select v-model="form.customerId" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'">
-                <el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.id">
+              <el-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
                   }}
@@ -116,117 +385,349 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'" />
+              <el-input
+                v-model="form.projectName"
+                placeholder="璇疯緭鍏�"
+                clearable
+                :disabled="operationType === 'view'"
+              />
             </el-form-item>
           </el-col>
-					<el-col :span="12">
-						<el-form-item label="绛捐鏃ユ湡锛�" prop="executionDate">
-							<el-date-picker style="width: 100%" v-model="form.executionDate" value-format="YYYY-MM-DD"
-															format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'" />
-						</el-form-item>
-					</el-col>
         </el-row>
         <el-row :gutter="30">
-					<el-col :span="12">
-						<el-form-item label="褰曞叆浜猴細" prop="entryPerson">
-							<el-select v-model="form.entryPerson" placeholder="璇烽�夋嫨" clearable @change="changs" disabled>
-								<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
-							</el-select>
-						</el-form-item>
-					</el-col>
           <el-col :span="12">
-            <el-form-item label="褰曞叆鏃ユ湡锛�" prop="entryDate">
-              <el-date-picker style="width: 100%" v-model="form.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-                type="date" placeholder="璇烽�夋嫨" clearable disabled />
+            <el-form-item label="绛捐鏃ユ湡锛�" prop="executionDate">
+              <el-date-picker
+                style="width: 100%"
+                v-model="form.executionDate"
+                value-format="YYYY-MM-DD"
+                format="YYYY-MM-DD"
+                type="date"
+                placeholder="璇烽�夋嫨"
+                clearable
+                :disabled="operationType === 'view'"
+              />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="浠樻鏂瑰紡">
-              <el-input v-model="form.paymentMethod" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'" />
+              <el-input
+                v-model="form.paymentMethod"
+                placeholder="璇疯緭鍏�"
+                clearable
+                :disabled="operationType === 'view'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-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
+                :disabled="operationType === 'view'"
+                @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
+                :disabled="operationType === 'view'"
+              />
+            </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
+                :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-button
+              v-if="operationType !== 'view'"
+              type="primary"
+              @click="openProductForm('add')"
+              >娣诲姞
+            </el-button>
+            <el-button
+              v-if="operationType !== 'view'"
+              plain
+              type="danger"
+              @click="deleteProduct"
+              >鍒犻櫎
+            </el-button>
           </el-form-item>
         </el-row>
-        <el-table :data="productData" border @selection-change="productSelected" show-summary
-          :summary-method="summarizeMainTable">
-          <el-table-column align="center" type="selection" width="55" v-if="operationType !== 'view'" />
-          <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+        <el-table
+          :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'">
+          <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-button link type="primary" size="small" @click="openProductForm('edit', scope.row,scope.$index)">缂栬緫</el-button>
+              <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="remark">
-              <el-input v-model="form.remark" placeholder="璇疯緭鍏�" clearable type="textarea" :rows="2" :disabled="operationType === 'view'" />
+            <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-row v-if="operationType !== 'view'" :gutter="30">
           <el-col :span="24">
-            <el-form-item label="闄勪欢鏉愭枡锛�" prop="remark">
-              <el-upload v-model:file-list="fileList" :action="upload.url" multiple ref="fileUpload" auto-upload
-                :headers="upload.headers" :before-upload="handleBeforeUpload" :on-error="handleUploadError"
-                :on-success="handleUploadSuccess" :on-remove="handleRemove">
-                <el-button type="primary" v-if="operationType !== 'view'">涓婁紶</el-button>
-                <template #tip v-if="operationType !== 'view'">
-                  <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 label="闄勪欢鏉愭枡锛�" prop="salesLedgerFiles">
+              <FileUpload
+                v-model:file-list="fileList"
+                :disabled="operationType === 'view'"
+              />
             </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>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">纭</el-button>
-          <el-button @click="closeDia">鍙栨秷</el-button>
-        </div>
+        <el-button @click="quotationDialogVisible = false">鍏抽棴</el-button>
       </template>
     </el-dialog>
-    <el-dialog v-model="productFormVisible" :title="productOperationType === 'add' ? '鏂板浜у搧' : '缂栬緫浜у搧'" width="40%"
-      @close="closeProductDia">
-      <el-form :model="productForm" label-width="140px" label-position="top" :rules="productRules" ref="productFormRef">
+    <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-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable>
-                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
-              </el-select> -->
-              <el-tree-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable check-strictly
-                @change="getModels" :data="productOptions" :render-after-expand="false" style="width: 100%" />
+              <el-tree-select
+                v-model="productForm.productCategory"
+                placeholder="璇烽�夋嫨"
+                clearable
+                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">
-                <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
+              <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>
@@ -234,191 +735,442 @@
         <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="鍗曚綅锛�" prop="unit">
-              <el-input v-model="productForm.unit" placeholder="璇疯緭鍏�" clearable />
+              <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-col :span="12">
+            <el-form-item label="绋庣巼(%)锛�" prop="taxRate">
+              <el-select
+                v-model="productForm.taxRate"
+                placeholder="璇烽�夋嫨"
+                clearable
+                @change="calculateFromTaxRate"
+              >
+                <el-option
+                  v-for="dict in tax_rate"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </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-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-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-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
+              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-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>
+        </template>
+      </el-upload>
+    </FormDialog>
+    <!-- // todo 闄勪欢棰勮鐩稿叧 -->
+    <!-- 闄勪欢鍒楄〃寮圭獥 -->
+    <FileList
+      v-if="fileDialogVisible"
+      v-model:visible="fileDialogVisible"
+      record-type="sales_ledger"
+      :record-id="recordId"
+    />
+    <!-- 鎵撳嵃棰勮寮圭獥 -->
+    <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%"
+                @change="handleDeliveryTypeChange"
+              >
+                <el-option label="璐ц溅" value="璐ц溅" />
+                <el-option label="蹇��" value="蹇��" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="寰呭彂璐ф暟閲忥細">
+              <el-input
+                :model-value="currentDeliveryRow?.noQuantity"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="24" v-if="deliveryForm.type === '璐ц溅'">
+            <el-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber">
+              <el-input
+                v-model="deliveryForm.shippingCarNumber"
+                placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-else>
+            <el-form-item label="蹇�掑叕鍙革細" prop="expressCompany">
+              <el-input
+                v-model="deliveryForm.expressCompany"
+                placeholder="璇疯緭鍏ュ揩閫掑叕鍙�"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30" v-if="deliveryForm.type === '蹇��'">
+          <el-col :span="24">
+            <el-form-item label="蹇�掑崟鍙凤細" prop="expressNumber">
+              <el-input
+                v-model="deliveryForm.expressNumber"
+                placeholder="璇疯緭鍏ュ揩閫掑崟鍙�"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="24">
+            <el-form-item label="鍙戣揣鍥剧墖锛�">
+              <ImageUpload v-model:file-list="deliveryFileList" :limit="9" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="24">
+            <el-form-item label="搴撳瓨锛�" prop="batchNo">
+              <el-table
+                :data="deliveryForm.batchNoList"
+                border
+                size="small"
+                max-height="260"
+                style="width: 100%"
+              >
+                <el-table-column label="鎵瑰彿" prop="batchNo" min-width="180" />
+                <el-table-column
+                  label="浜у搧澶х被"
+                  prop="productName"
+                  min-width="100"
+                />
+                <el-table-column
+                  label="瑙勬牸鍨嬪彿"
+                  prop="model"
+                  min-width="100"
+                />
+                <el-table-column label="鍗曚綅" prop="unit" min-width="100" />
+                <el-table-column
+                  label="搴撳瓨鏁伴噺"
+                  min-width="120"
+                  align="center"
+                >
+                  <template #default="scope">
+                    {{ getDeliveryBatchQuantity(scope.row) }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="鍙戣揣鏁伴噺"
+                  min-width="160"
+                  align="center"
+                >
+                  <template #default="scope">
+                    <el-input-number
+                      v-model="scope.row.deliveryQuantity"
+                      :min="0"
+                      :max="getDeliveryBatchDeliveryMax(scope.row)"
+                      :precision="2"
+                      :step="0.01"
+                      controls-position="right"
+                      @change="handleDeliveryBatchQuantityChange(scope.row)"
+                      style="width: 100%"
+                    />
+                  </template>
+                </el-table-column>
+              </el-table>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitProduct">纭</el-button>
-          <el-button @click="closeProductDia">鍙栨秷</el-button>
+          <el-button type="primary" @click="submitDelivery"
+            >纭鍙戣揣
+          </el-button>
+          <el-button @click="closeDeliveryDia">鍙栨秷</el-button>
         </div>
       </template>
     </el-dialog>
-		<!-- 鎵撳嵃棰勮寮圭獥 -->
-		<el-dialog
-			v-model="printPreviewVisible"
-			title="鎵撳嵃棰勮"
-			width="90%"
-			:close-on-click-modal="false"
-			class="print-preview-dialog"
-		>
-			<div class="print-preview-container">
-				<div class="print-preview-header">
-					<el-button type="primary" @click="executePrint">鎵ц鎵撳嵃</el-button>
-					<el-button @click="printPreviewVisible = false">鍏抽棴棰勮</el-button>
-				</div>
-				<div class="print-preview-content">
-					<div v-if="printData.length === 0" style="text-align: center; padding: 50px; color: #999;">
-						鏆傛棤鎵撳嵃鏁版嵁
-					</div>
-					<div v-else style="text-align: center; padding: 10px; color: #666; font-size: 14px; background: #e8f4fd; margin-bottom: 10px;">
-						鍏� {{ printData.length }} 鏉℃暟鎹緟鎵撳嵃
-					</div>
-					<div v-for="(item, index) in printData" :key="index" class="print-page">
-						<div class="delivery-note">
-							<div class="header">
-								<div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
-								<div class="document-title">闆跺敭鍙戣揣鍗�</div>
-							</div>
-							
-							<div class="info-section">
-								<div class="info-row">
-									<div>
-										<span class="label">鍙戣揣鏃ユ湡锛�</span>
-										<span class="value">{{ formatDate(item.createTime) }}</span>
-									</div>
-									<div>
-										
-										<span class="label">瀹㈡埛鍚嶇О锛�</span>
-										<span class="value">{{ item.customerName || '寮犵埍鏈�' }}</span>
-									</div>
-								</div>
-								<div class="info-row">
-									<span class="label">鍗曞彿锛�</span>
-									<span class="value">{{ item.salesContractNo }}</span>
-								</div>
-							</div>
-							
-							<div class="table-section">
-								<table class="product-table">
-									<thead>
-									<tr>
-										<th>浜у搧鍚嶇О</th>
-										<th>瑙勬牸鍨嬪彿</th>
-										<th>鍗曚綅</th>
-										<th>鍗曚环</th>
-										<th>闆跺敭鏁伴噺</th>
-										<th>闆跺敭閲戦</th>
-									</tr>
-									</thead>
-									<tbody>
-									<tr v-for="product in item.products" :key="product.id">
-										<td>{{ product.productCategory || '' }}</td>
-										<td>{{ product.specificationModel || '' }}</td>
-										<td>{{ product.unit || '' }}</td>
-										<td>{{ product.taxInclusiveUnitPrice || '0' }}</td>
-										<td>{{ product.quantity || '0' }}</td>
-										<td>{{ product.taxInclusiveTotalPrice || '0' }}</td>
-									</tr>
-									<tr v-if="!item.products || item.products.length === 0">
-										<td colspan="6" style="text-align: center; color: #999;">鏆傛棤浜у搧鏁版嵁</td>
-									</tr>
-									</tbody>
-									<tfoot>
-									<tr>
-										<td class="label">鍚堣</td>
-										<td class="total-value"></td>
-										<td class="total-value"></td>
-										<td class="total-value"></td>
-										<td class="total-value">{{ getTotalQuantity(item.products) }}</td>
-										<td class="total-value">{{ getTotalAmount(item.products) }}</td>
-									</tr>
-									</tfoot>
-								</table>
-							</div>
-							
-							<div class="footer-section">
-								<div class="footer-row">
-									<div class="footer-item">
-										<span class="label">鏀惰揣鐢佃瘽锛�</span>
-										<span class="value"></span>
-									</div>
-									<div class="footer-item">
-										<span class="label">鏀惰揣浜猴細</span>
-										<span class="value"></span>
-									</div>
-									<div class="footer-item address-item">
-										<span class="label">鏀惰揣鍦板潃锛�</span>
-										<span class="value address-value"></span>
-									</div>
-								</div>
-								<div class="footer-row">
-									<div class="footer-item">
-										<span class="label">鎿嶄綔鍛橈細</span>
-										<span class="value">{{ userStore.nickName || '鎾曞紑鍓�' }}</span>
-									</div>
-									<div class="footer-item">
-										<span class="label">鎵撳嵃鏃ユ湡锛�</span>
-										<span class="value">{{ formatDateTime(new Date()) }}</span>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</el-dialog>
-    <FileList ref="fileListRef" />
   </div>
 </template>
 
 <script setup>
 import { getToken } from "@/utils/auth";
 import pagination from "@/components/PIMTable/Pagination.vue";
-import {onMounted, ref} from "vue";
-import { ElMessageBox } from "element-plus";
+import { onMounted, ref, getCurrentInstance } from "vue";
+import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
+import { ElMessageBox, ElMessage } from "element-plus";
 import useUserStore from "@/store/modules/user";
 import { userListNoPage } from "@/api/system/user.js";
-import FileList from "./fileList.vue";
+import FormDialog from "@/components/Dialog/FormDialog.vue";
+import { getQuotationList } from "@/api/salesManagement/salesQuotation.js";
 import {
   ledgerListPage,
   productList,
@@ -429,13 +1181,26 @@
   addOrUpdateSalesLedgerProduct,
   delProduct,
   delLedgerFile,
+  getProductInventory,
 } from "@/api/salesManagement/salesLedger.js";
+import { getStockInventoryByModelId } from "@/api/inventoryManagement/stockInventory.js";
 import { modelList, productTreeList } from "@/api/basicData/product.js";
 import useFormData from "@/hooks/useFormData.js";
 import dayjs from "dayjs";
+import FileUpload from "@/components/AttachmentUpload/file/index.vue";
+import ImageUpload from "@/components/AttachmentUpload/image/index.vue";
+import { getCurrentDate } from "@/utils/index.js";
+import { listCustomer } from "@/api/basicData/customer.js";
 
+const FileList = defineAsyncComponent(() =>
+  import("@/components/Dialog/FileList.vue")
+);
+
+const router = useRouter();
+const route = useRoute();
 const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
+const { tax_rate } = proxy.useDict("tax_rate");
 const tableData = ref([]);
 const productData = ref([]);
 const selectedRows = ref([]);
@@ -451,6 +1216,7 @@
 });
 const total = ref(0);
 const fileList = ref([]);
+const deliveryFileList = ref([]);
 
 // 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
 const operationType = ref("");
@@ -458,38 +1224,31 @@
 const data = reactive({
   searchForm: {
     customerName: "", // 瀹㈡埛鍚嶇О
-    customerContractNo: "", // 瀹㈡埛鍚堝悓缂栧彿
     salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
-    projectName: "", // 椤圭洰鍚嶇О
-    entryDate: [
-      dayjs().format("YYYY-MM-DD"),
-      dayjs().add(1, "day").format("YYYY-MM-DD"),
-    ], // 褰曞叆鏃ユ湡
-    entryDateStart: dayjs().format("YYYY-MM-DD"),
-    entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"),
+    entryDate: null, // 褰曞叆鏃ユ湡
+    entryDateStart: undefined,
+    entryDateEnd: undefined,
   },
   form: {
     salesContractNo: "",
+    autoGenerateContractNo: true,
     salesman: "",
-    customerContractNo: "",
     customerId: "",
-    projectName: "",
     entryPerson: "",
     entryDate: "",
+    deliveryDate: "",
     maintenanceTime: "",
     productData: [],
     executionDate: "",
-    paymentMethod: "",
+    hasProductionRecord: false,
+    createTime: "",
   },
   rules: {
     salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    customerContractNo: [
-      { required: true, message: "璇疯緭鍏�", trigger: "blur" },
-    ],
     customerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
     entryPerson: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
     entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    deliveryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
     executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
   },
 });
@@ -510,10 +1269,11 @@
     taxInclusiveTotalPrice: "",
     taxExclusiveTotalPrice: "",
     invoiceType: "",
+    isProduction: false,
   },
   productRules: {
     productCategory: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-		productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
     specificationModel: [
       { required: true, message: "璇烽�夋嫨", trigger: "change" },
     ],
@@ -530,20 +1290,191 @@
       { 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 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 getDeliveryBatchQuantity = (item) => {
+  const quantity =
+    item?.qualitity ??
+    item?.quantity ??
+    item?.unLockedQuantity ??
+    item?.qualifiedUnLockedQuantity ??
+    item?.qualifiedQuantity ??
+    item?.stockQuantity;
+  return quantity ?? 0;
+};
+const getCurrentDeliveryRowQuantity = () => {
+  return Number(currentDeliveryRow.value?.noQuantity || 0);
+};
+const getDeliveryBatchDeliveryMax = (row) => {
+  const productQuantity = getCurrentDeliveryRowQuantity();
+  const batchQuantity = Number(getDeliveryBatchQuantity(row) || 0);
+  const otherBatchTotal = (deliveryForm.value.batchNoList || []).reduce(
+    (sum, item) => {
+      if (item?.id === row?.id) return sum;
+      return sum + Number(item?.deliveryQuantity || 0);
+    },
+    0
+  );
+  const remainingProductQuantity = Math.max(
+    0,
+    productQuantity - otherBatchTotal
+  );
+  return Math.max(0, Math.min(batchQuantity, remainingProductQuantity));
+};
+const handleDeliveryBatchQuantityChange = (row) => {
+  const productQuantity = getCurrentDeliveryRowQuantity();
+  const batchQuantity = Number(getDeliveryBatchQuantity(row) || 0);
+  const otherBatchTotal = (deliveryForm.value.batchNoList || []).reduce(
+    (sum, item) => {
+      if (item?.id === row?.id) return sum;
+      return sum + Number(item?.deliveryQuantity || 0);
+    },
+    0
+  );
+  const remainingProductQuantity = Math.max(
+    0,
+    productQuantity - otherBatchTotal
+  );
+  const currentValue = Number(row?.deliveryQuantity || 0);
+
+  if (currentValue > batchQuantity) {
+    row.deliveryQuantity = batchQuantity;
+    proxy.$modal.msgWarning("鍙戣揣鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺");
+  } else if (currentValue > remainingProductQuantity) {
+    row.deliveryQuantity = remainingProductQuantity;
+    proxy.$modal.msgWarning("鎵�鏈夋壒娆″彂璐ф暟閲忎箣鍜屼笉鑳藉ぇ浜庡緟鍙戣揣鏁伴噺");
+  }
+};
+const getSelectedDeliveryBatchRows = () => {
+  return (deliveryForm.value.batchNoList || []).filter(
+    (item) => Number(item?.deliveryQuantity || 0) > 0
+  );
+};
+const getDeliveryBatchNoList = async (productModelId) => {
+  if (!productModelId) return [];
+  const res = await getStockInventoryByModelId(productModelId);
+  const rawList = Array.isArray(res?.data)
+    ? res.data
+    : res?.data?.records || res?.data?.rows || [];
+  const seenIds = new Set();
+  return rawList
+    .filter((item) => {
+      if (!item?.id || !item?.batchNo || seenIds.has(item.id)) {
+        return false;
+      }
+      seenIds.add(item.id);
+      return true;
+    })
+    .map((item) => ({
+      ...item,
+      deliveryQuantity: 0,
+    }));
+};
+const validateDeliveryShippingCarNumber = (_rule, value, callback) => {
+  if (deliveryForm.value.type === "璐ц溅" && !value) {
+    return callback(new Error("璇疯緭鍏ュ彂璐ц溅鐗屽彿"));
+  }
+  callback();
+};
+const validateDeliveryExpressCompany = (_rule, value, callback) => {
+  if (deliveryForm.value.type === "蹇��" && !value) {
+    return callback(new Error("璇疯緭鍏ュ揩閫掑叕鍙�"));
+  }
+  callback();
+};
+const deliveryFormData = reactive({
+  deliveryForm: {
+    shippingCarNumber: "",
+    expressCompany: "",
+    expressNumber: "",
+    type: "璐ц溅", // 璐ц溅, 蹇��
+  },
+  deliveryRules: {
+    shippingCarNumber: [
+      { validator: validateDeliveryShippingCarNumber, trigger: "blur" },
+    ],
+    expressCompany: [
+      { validator: validateDeliveryExpressCompany, trigger: "blur" },
+    ],
+    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) {
@@ -559,8 +1490,12 @@
 // 鏌ヨ鍒楄〃
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 const handleQuery = () => {
-  page.current = 1;
-	expandedRowKeys.value = [];
+  // 鍙湁鍦ㄧ偣鍑绘悳绱㈡寜閽椂鎵嶉噸缃〉鐮佸埌绗竴椤�
+  // 閬垮厤琛ㄥ崟瀛楁change浜嬩欢骞叉壈鍒嗛〉
+  if (arguments.length === 0) {
+    page.current = 1;
+  }
+  expandedRowKeys.value = [];
   getList();
 };
 const paginationChange = (obj) => {
@@ -571,7 +1506,11 @@
 const getList = () => {
   tableLoading.value = true;
   const { entryDate, ...rest } = searchForm;
-  ledgerListPage({ ...rest, ...page })
+  // 灏嗚寖鍥存棩鏈熷瓧娈典紶閫掔粰鍚庣
+  const params = { ...rest, ...page };
+  // 绉婚櫎褰曞叆鏃ユ湡鐨勯粯璁ゅ�艰缃紝鍙繚鐣欒寖鍥存棩鏈熷瓧娈�
+  delete params.entryDate;
+  return ledgerListPage(params)
     .then((res) => {
       tableLoading.value = false;
       tableData.value = res.records;
@@ -579,6 +1518,7 @@
         item.children = [];
       });
       total.value = res.total;
+      return res;
     })
     .catch(() => {
       tableLoading.value = false;
@@ -586,12 +1526,70 @@
 };
 // 鑾峰彇浜у搧澶х被tree鏁版嵁
 const getProductOptions = () => {
-  productTreeList().then((res) => {
+  // 杩斿洖 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) => {
@@ -601,7 +1599,6 @@
   });
 };
 const getProductModel = (value) => {
-  console.log("value", value);
   const index = modelOptions.value.findIndex((item) => item.id === value);
   if (index !== -1) {
     productForm.value.specificationModel = modelOptions.value[index].model;
@@ -625,6 +1622,7 @@
   }
   return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
 };
+
 function convertIdToValue(data) {
   return data.map((item) => {
     const { id, children, ...rest } = item;
@@ -639,6 +1637,21 @@
     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) => {
   // 杩囨护鎺夊瓙鏁版嵁
@@ -668,6 +1681,23 @@
     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, [
@@ -677,7 +1707,25 @@
   ]);
 };
 // 瀛愯〃鍚堣鏂规硶
-const summarizeChildrenTable = (param) => {
+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",
@@ -686,22 +1734,38 @@
 };
 // 鎵撳紑寮规
 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;
-  customerList().then((res) => {
-    customerOption.value = res;
+  listCustomer({ current: -1, size: -1, type: 0 }).then((res) => {
+    customerOption.value = res.data.records;
   });
   form.value.entryPerson = userStore.id;
-  if (type !== "add") {
+  if (type === "add") {
+    // 鏂板鏃惰缃綍鍏ユ棩鏈熶负褰撳ぉ
+    form.value.entryDate = getCurrentDate();
+    // 绛捐鏃ユ湡榛樿涓哄綋澶�
+    form.value.executionDate = getCurrentDate();
+    // 鍒涘缓鏃堕棿榛樿涓哄綋澶�
+    form.value.createTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
+    // 榛樿鑷姩鐢熸垚閿�鍞悎鍚屽彿
+    form.value.autoGenerateContractNo = true;
+  } 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;
+      fileList.value = form.value.storageBlobVOs;
+      // 缂栬緫鏃惰缃嚜鍔ㄧ敓鎴愪负false锛屽厑璁告墜鍔ㄤ慨鏀�
+      form.value.autoGenerateContractNo = false;
     });
   }
   // let userAll = await userStore.getInfo()
@@ -713,65 +1777,138 @@
   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 {
+      listCustomer({ 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,
+      productId: p.productId,
+      productModelId: p.productModelId,
+    };
+  });
+
+  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)
+      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.storageBlobDTOs = fileList;
       form.value.type = 1;
+      if (form.value.autoGenerateContractNo) {
+        form.value.salesContractNo = "";
+      }
       addOrUpdateSalesLedger(form.value).then((res) => {
         proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
         closeDia();
+        expandedRowKeys.value = [];
         getList();
       });
     }
@@ -785,16 +1922,51 @@
 
 const productIndex = ref(0);
 // 鎵撳紑浜у搧寮规
-const openProductForm = (type, row,index) => {
+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;
-  getProductOptions();
 };
 // 鎻愪氦浜у搧琛ㄥ崟
 const submitProduct = () => {
@@ -803,10 +1975,10 @@
       if (operationType.value === "edit") {
         submitProductEdit();
       } else {
-        if(productOperationType.value === "add"){
+        if (productOperationType.value === "add") {
           productData.value.push({ ...productForm.value });
-        }else{
-          productData.value[productIndex.value] = { ...productForm.value }
+        } else {
+          productData.value[productIndex.value] = { ...productForm.value };
         }
         closeProductDia();
       }
@@ -815,7 +1987,7 @@
 };
 const submitProductEdit = () => {
   productForm.value.salesLedgerId = currentId.value;
-  productForm.value.type = 1
+  productForm.value.type = 1;
   addOrUpdateSalesLedgerProduct(productForm.value).then((res) => {
     proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
     closeProductDia();
@@ -830,15 +2002,21 @@
     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);
-      }
-    });
+    productData.value = productData.value.filter(
+      (item) => !productSelectedRows.value.includes(item)
+    );
+    productSelectedRows.value = [];
   } else {
     let ids = [];
     if (productSelectedRows.value.length > 0) {
@@ -870,6 +2048,26 @@
   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("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
@@ -884,15 +2082,67 @@
       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 = () => {
-  let ids = [];
-  if (selectedRows.value.length > 0) {
-    ids = selectedRows.value.map((item) => item.id);
-  } else {
+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: "鍙栨秷",
@@ -910,343 +2160,378 @@
 };
 
 // 鎵撳嵃鍔熻兘
-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 handlePrint = async () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$modal.msgWarning("璇烽�夋嫨瑕佹墦鍗扮殑鏁版嵁");
+    return;
+  }
+
+  // 鏄剧ず鍔犺浇鐘舵��
+  proxy.$modal.loading("姝e湪鑾峰彇浜у搧鏁版嵁锛岃绋嶅��...");
+
+  try {
+    // 涓烘瘡涓�変腑鐨勯攢鍞彴璐﹁褰曟煡璇㈠搴旂殑浜у搧鏁版嵁
+    const printDataWithProducts = [];
+
+    for (const row of selectedRows.value) {
+      try {
+        // 璋冪敤productList鎺ュ彛鏌ヨ浜у搧鏁版嵁
+        const productRes = await productList({
+          salesLedgerId: row.id,
+          type: 1,
+        });
+
+        // 灏嗕骇鍝佹暟鎹暣鍚堝埌閿�鍞彴璐﹁褰曚腑
+        const rowWithProducts = {
+          ...row,
+          products: productRes.data || [],
+        };
+
+        printDataWithProducts.push(rowWithProducts);
+      } catch (error) {
+        console.error(`鑾峰彇閿�鍞彴璐� ${row.id} 鐨勪骇鍝佹暟鎹け璐�:`, error);
+        // 鍗充娇鏌愪釜璁板綍鐨勪骇鍝佹暟鎹幏鍙栧け璐ワ紝涔熻鍖呭惈璇ヨ褰�
+        printDataWithProducts.push({
+          ...row,
+          products: [],
+        });
+      }
+    }
+
+    printData.value = printDataWithProducts;
+    console.log("鎵撳嵃鏁版嵁锛堝寘鍚骇鍝侊級:", printData.value);
+    printPreviewVisible.value = true;
+  } catch (error) {
+    console.error("鑾峰彇浜у搧鏁版嵁澶辫触:", error);
+    proxy.$modal.msgError("鑾峰彇浜у搧鏁版嵁澶辫触锛岃閲嶈瘯");
+  } finally {
+    proxy.$modal.closeLoading();
+  }
 };
 // 鎵ц鎵撳嵃
 const executePrint = () => {
-	console.log('寮�濮嬫墽琛屾墦鍗帮紝鏁版嵁鏉℃暟:', printData.value.length);
-	console.log('鎵撳嵃鏁版嵁:', printData.value);
-	
-	// 鍒涘缓涓�涓柊鐨勬墦鍗扮獥鍙�
-	const printWindow = window.open('', '_blank', 'width=800,height=600');
-	
-	// 鏋勫缓鎵撳嵃鍐呭
-	let printContent = `
-    <!DOCTYPE html>
-    <html>
-    <head>
-      <meta charset="UTF-8">
-      <title>鎵撳嵃棰勮</title>
-      <style>
-        body {
-          margin: 0;
-          padding: 0;
-          font-family: "SimSun", serif;
-          background: white;
-        }
-                                                     .print-page {
-            width: 200mm;
-            height: 75mm;
-            padding: 10mm;
-            padding-left: 20mm;
-            background: white;
-            box-sizing: border-box;
-            page-break-after: always;
-            page-break-inside: avoid;
-          }
-         .print-page:last-child {
-           page-break-after: avoid;
-         }
-        .delivery-note {
-          width: 100%;
-          height: 100%;
-          font-size: 12px;
-          line-height: 1.2;
-          display: flex;
-          flex-direction: column;
-          color: #000;
-        }
-        .header {
-          text-align: center;
-          margin-bottom: 8px;
-        }
-        .company-name {
-          font-size: 18px;
-          font-weight: bold;
-          margin-bottom: 4px;
-        }
-        .document-title {
-          font-size: 16px;
-          font-weight: bold;
-        }
-        .info-section {
-          margin-bottom: 8px;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-        }
-        .info-row {
-          line-height: 20px;
-        }
-        .label {
-          font-weight: bold;
-          width: 60px;
-          font-size: 12px;
-        }
-        .value {
-          margin-right: 20px;
-          min-width: 80px;
-          font-size: 12px;
-        }
-                 .table-section {
-                 margin-bottom: 40px;
-          //  flex: 0.6;
-         }
-        .product-table {
-          width: 100%;
-          border-collapse: collapse;
-          border: 1px solid #000;
-        }
-                 .product-table th, .product-table td {
-           border: 1px solid #000;
-           padding: 6px;
-           text-align: center;
-           font-size: 12px;
-           line-height: 1.4;
-         }
-        .product-table th {
-          font-weight: bold;
-        }
-        .total-value {
-          font-weight: bold;
-        }
-        .footer-section {
-          margin-top: auto;
-        }
-        .footer-row {
-          display: flex;
-          margin-bottom: 3px;
-          line-height: 22px;
-          justify-content: space-between;
-        }
-        .footer-item {
-          display: flex;
-          margin-right: 20px;
-        }
-        .footer-item .label {
-          font-weight: bold;
-          width: 80px;
-          font-size: 12px;
-        }
-        .footer-item .value {
-          min-width: 80px;
-          font-size: 12px;
-        }
-        .address-item .address-value {
-          min-width: 200px;
-        }
-        @media print {
-          body {
-            margin: 0;
-            padding: 0;
-          }
-                     .print-page {
-             margin: 0;
-             padding: 10mm;
-             /* padding-left: 20mm; */
-             page-break-inside: avoid;
-             page-break-after: always;
-           }
-           .print-page:last-child {
-             page-break-after: avoid;
-           }
-        }
-      </style>
-    </head>
-    <body>
-  `;
-	
-	// 涓烘瘡鏉℃暟鎹敓鎴愭墦鍗伴〉闈�
-	printData.value.forEach((item, index) => {
-		printContent += `
-      <div class="print-page">
-        <div class="delivery-note">
-          <div class="header">
-            <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
-            <div class="document-title">闆跺敭鍙戣揣鍗�</div>
-          </div>
-          
-          <div class="info-section">
-            <div class="info-row">
-              <div>
-                <span class="label">鍙戣揣鏃ユ湡锛�</span>
-                <span class="value">${formatDate(item.createTime)}</span>
-              </div>
-              <div>
-                <span class="label">瀹㈡埛鍚嶇О锛�</span>
-                <span class="value">${item.customerName || '寮犵埍鏈�'}</span>
-              </div>
-            </div>
-            <div class="info-row">
-              <span class="label">鍗曞彿锛�</span>
-              <span class="value">${item.salesContractNo || ''}</span>
-            </div>
-          </div>
+  console.log("寮�濮嬫墽琛屾墦鍗帮紝鏁版嵁鏉℃暟:", printData.value.length);
+  console.log("鎵撳嵃鏁版嵁:", printData.value);
 
-          <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>
+  // 鍒涘缓涓�涓柊鐨勬墦鍗扮獥鍙�
+  const printWindow = window.open("", "_blank", "width=800,height=600");
 
-          <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);
-	};
+  // 鏋勫缓鎵撳嵃鍐呭
+  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}`;
+  if (!dateString) return getCurrentDate();
+  return dayjs(dateString).format("YYYY/MM/DD HH:mm:ss");
 };
 // 鏍煎紡鍖栨棩鏈熸椂闂�
 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 year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+  return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
 };
-// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
-function getCurrentDate() {
-  const today = new Date();
-  const year = today.getFullYear();
-  const month = String(today.getMonth() + 1).padStart(2, "0"); // 鏈堜唤浠�0寮�濮�
-  const day = String(today.getDate()).padStart(2, "0");
-  return `${year}-${month}-${day}`;
-}
-
 // 璁$畻浜у搧鎬绘暟閲�
 const getTotalQuantity = (products) => {
-  if (!products || products.length === 0) return '0';
+  if (!products || products.length === 0) return "0";
   const total = products.reduce((sum, product) => {
     return sum + (parseFloat(product.quantity) || 0);
   }, 0);
@@ -1255,7 +2540,7 @@
 
 // 璁$畻浜у搧鎬婚噾棰�
 const getTotalAmount = (products) => {
-  if (!products || products.length === 0) return '0';
+  if (!products || products.length === 0) return "0";
   const total = products.reduce((sum, product) => {
     return sum + (parseFloat(product.taxInclusiveTotalPrice) || 0);
   }, 0);
@@ -1264,7 +2549,7 @@
 
 // 鐢ㄤ簬鎵撳嵃鐨勮绠楀嚱鏁�
 const getTotalQuantityForPrint = (products) => {
-  if (!products || products.length === 0) return '0';
+  if (!products || products.length === 0) return "0";
   const total = products.reduce((sum, product) => {
     return sum + (parseFloat(product.quantity) || 0);
   }, 0);
@@ -1272,7 +2557,7 @@
 };
 
 const getTotalAmountForPrint = (products) => {
-  if (!products || products.length === 0) return '0';
+  if (!products || products.length === 0) return "0";
   const total = products.reduce((sum, product) => {
     return sum + (parseFloat(product.taxInclusiveTotalPrice) || 0);
   }, 0);
@@ -1306,19 +2591,19 @@
 // 鏍规嵁鍚◣鎬讳环璁$畻鍚◣鍗曚环鍜屾暟閲�
 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 =
@@ -1327,59 +2612,63 @@
         productForm.value.taxRate
       );
   }
-  
+
   isCalculating.value = false;
 };
 
 // 鏍规嵁涓嶅惈绋庢�讳环璁$畻鍚◣鍗曚环鍜屾暟閲�
 const calculateFromExclusiveTotalPrice = () => {
-	if (!productForm.value.taxRate) {
-		proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
-		return;
-	}
+  if (!productForm.value.taxRate) {
+    proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+    return;
+  }
   if (isCalculating.value) return;
-  
-  const exclusiveTotalPrice = parseFloat(productForm.value.taxExclusiveTotalPrice);
+
+  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);
-  
+  productForm.value.taxInclusiveUnitPrice = (
+    inclusiveTotalPrice / quantity
+  ).toFixed(2);
+
   isCalculating.value = false;
 };
 
 // 鏍规嵁鏁伴噺鍙樺寲璁$畻鎬讳环
 const calculateFromQuantity = () => {
-	if (!productForm.value.taxRate) {
-		proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
-		return;
-	}
+  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 =
@@ -1388,30 +2677,30 @@
         productForm.value.taxRate
       );
   }
-  
+
   isCalculating.value = false;
 };
 
 // 鏍规嵁鍚◣鍗曚环鍙樺寲璁$畻鎬讳环
 const calculateFromUnitPrice = () => {
-	if (!productForm.value.taxRate) {
-		proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
-		return;
-	}
+  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 =
@@ -1420,56 +2709,299 @@
         productForm.value.taxRate
       );
   }
-  
+
   isCalculating.value = false;
 };
 
 // 鏍规嵁绋庣巼鍙樺寲璁$畻涓嶅惈绋庢�讳环
 const calculateFromTaxRate = () => {
-	if (!productForm.value.taxRate) {
-		proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
-		return;
-	}
+  if (!productForm.value.taxRate) {
+    proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+    return;
+  }
   if (isCalculating.value) return;
-  
-  const inclusiveTotalPrice = parseFloat(productForm.value.taxInclusiveTotalPrice);
+
+  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
-    );
-  
+    proxy.calculateTaxExclusiveTotalPrice(inclusiveTotalPrice, taxRate);
+
   isCalculating.value = false;
 };
 /**
- * 涓嬭浇鏂囦欢
- *
- * @param row 涓嬭浇鏂囦欢鐨勭浉鍏充俊鎭璞�
+ * 鑾峰彇鍙戣揣鐘舵�佹枃鏈�
+ * @param row 琛屾暟鎹�
  */
-const fileListRef = ref(null)
-const downLoadFile = (row) => {
-  getSalesLedgerWithProducts({ id: row.id, type: 1 }).then((res) => {
-    fileListRef.value.open(res.salesLedgerFiles)
-  });
+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.shippingStatus === "宸插彂璐�") {
+    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",
+    閮ㄥ垎鍙戣揣: "warning",
+  };
+  return typeTextMap[statusStr] || "info";
+};
+
+/**
+ * 鍒ゆ柇鏄惁鍙互鍙戣揣
+ * 鍙湁鍦ㄤ骇鍝佺姸鎬佹槸鍏呰冻锛屽彂璐х姸鎬佹槸寰呭彂璐с�佸鎵逛腑銆佸鏍告嫆缁濄�侀儴鍒嗗彂璐х殑鏃跺�欐墠鍙互鍙戣揣
+ * @param row 琛屾暟鎹�
+ */
+const canShip = (row) => {
+  // 浜у搧鐘舵�佸繀椤绘槸鍏呰冻锛坅pproveStatus === 1锛�
+  if (row.approveStatus !== 1) {
+    return false;
+  }
+
+  // 鑾峰彇鍙戣揣鐘舵��
+  const shippingStatus = row.shippingStatus;
+
+  // 濡傛灉宸插彂璐э紝涓嶈兘鍐嶆鍙戣揣
+  if (shippingStatus === "宸插彂璐�") {
+    return false;
+  }
+
+  // 鍙戣揣鐘舵�佸繀椤绘槸"寰呭彂璐�"銆�"瀹℃壒涓�"銆�"瀹℃牳鎷掔粷"鎴�"閮ㄥ垎鍙戣揣"
+  const statusStr = shippingStatus ? String(shippingStatus).trim() : "";
+  return (
+    statusStr === "寰呭彂璐�" ||
+    statusStr === "瀹℃壒涓�" ||
+    statusStr === "瀹℃牳鎷掔粷" ||
+    statusStr === "閮ㄥ垎鍙戣揣"
+  );
+};
+
+// 鎵撳紑闄勪欢寮圭獥
+const recordId = ref(0);
+const fileDialogVisible = ref(false);
+
+// 鎵撳紑闄勪欢寮规
+const openFileDialog = async (row) => {
+  recordId.value = row.id;
+  fileDialogVisible.value = true;
+};
+
+// 鎵撳紑鍙戣揣寮规
+const openDeliveryForm = async (row) => {
+  // 妫�鏌ユ槸鍚﹀彲浠ュ彂璐�
+  if (!canShip(row)) {
+    proxy.$modal.msgWarning(
+      "鍙湁鍦ㄤ骇鍝佺姸鎬佹槸鍏呰冻锛屽彂璐х姸鎬佹槸寰呭彂璐с�佸鎵逛腑銆佸鏍告嫆缁濇垨閮ㄥ垎鍙戣揣鐨勬椂鍊欐墠鍙互鍙戣揣"
+    );
+    return;
+  }
+
+  currentDeliveryRow.value = row;
+  const batchNoList = await getDeliveryBatchNoList(
+    row.productModelId || row.modelId
+  );
+  deliveryForm.value = {
+    shippingCarNumber: "",
+    expressCompany: "",
+    expressNumber: "",
+    type: "璐ц溅",
+    batchNo: [],
+    batchNoList,
+  };
+  deliveryFileList.value = [];
+  deliveryFormVisible.value = true;
+};
+
+// 鎻愪氦鍙戣揣琛ㄥ崟
+const submitDelivery = () => {
+  proxy.$refs["deliveryFormRef"].validate((valid) => {
+    if (valid) {
+      const selectedBatchRows = getSelectedDeliveryBatchRows();
+      if (selectedBatchRows.length === 0) {
+        proxy.$modal.msgWarning("璇疯嚦灏戝~鍐欎竴涓壒鍙风殑鍙戣揣鏁伴噺");
+        return;
+      }
+      const totalDeliveryQuantity = selectedBatchRows.reduce(
+        (sum, item) => sum + Number(item.deliveryQuantity || 0),
+        0
+      );
+      const currentRowNoQuantity = Number(
+        currentDeliveryRow.value?.noQuantity || 0
+      );
+      if (
+        currentRowNoQuantity > 0 &&
+        totalDeliveryQuantity > currentRowNoQuantity
+      ) {
+        proxy.$modal.msgWarning("鎵瑰彿鍙戣揣鎬绘暟涓嶈兘瓒呰繃寰呭彂璐ф暟閲�");
+        return;
+      }
+      // 淇濆瓨褰撳墠灞曞紑鐨勮ID锛屼互渚垮彂璐у悗閲嶆柊鍔犺浇瀛愯〃鏍兼暟鎹�
+      const currentExpandedKeys = [...expandedRowKeys.value];
+      const salesLedgerId = currentDeliveryRow.value.salesLedgerId;
+      deliveryForm.value.batchNo = selectedBatchRows.map((item) => item.id);
+      const productModelId =
+        currentDeliveryRow.value.productModelId ||
+        currentDeliveryRow.value.modelId;
+      addShippingInfo({
+        salesLedgerId: salesLedgerId,
+        salesLedgerProductId: currentDeliveryRow.value.id,
+        type: deliveryForm.value.type,
+        shippingCarNumber:
+          deliveryForm.value.type === "璐ц溅"
+            ? deliveryForm.value.shippingCarNumber
+            : "",
+        expressCompany:
+          deliveryForm.value.type === "蹇��"
+            ? deliveryForm.value.expressCompany
+            : "",
+        expressNumber:
+          deliveryForm.value.type === "蹇��"
+            ? deliveryForm.value.expressNumber
+            : "",
+        storageBlobDTOs: deliveryFileList.value || [],
+        batchNo: deliveryForm.value.batchNo,
+        batchNoDetailList: selectedBatchRows.map((item) => ({
+          stockInventoryId: item.id,
+          batchNo: item.batchNo,
+          quantity: Number(item.deliveryQuantity || 0),
+          productModelId: productModelId,
+        })),
+      }).then(() => {
+        proxy.$modal.msgSuccess("鍙戣揣鎴愬姛");
+        closeDeliveryDia();
+        // 鍒锋柊涓昏〃鏁版嵁
+        getList().then(() => {
+          // 濡傛灉涔嬪墠鏈夊睍寮�鐨勮锛岄噸鏂板姞杞借繖浜涜鐨勫瓙琛ㄦ牸鏁版嵁
+          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;
+                  }
+                }
+              );
+            });
+            Promise.all(loadPromises).then(() => {
+              // 鎭㈠灞曞紑鐘舵��
+              expandedRowKeys.value = currentExpandedKeys;
+            });
+          }
+        });
+      });
+    }
+  });
+};
+
+// 鍏抽棴鍙戣揣寮规
+const handleDeliveryTypeChange = (val) => {
+  if (val === "璐ц溅") {
+    deliveryForm.value.expressCompany = "";
+    deliveryForm.value.expressNumber = "";
+  } else {
+    deliveryForm.value.shippingCarNumber = "";
+  }
+};
+
+const closeDeliveryDia = () => {
+  proxy.resetForm("deliveryFormRef");
+  deliveryFileList.value = [];
+  deliveryFormVisible.value = false;
+  currentDeliveryRow.value = null;
+};
+const currentFactoryName = ref("");
+const getCurrentFactoryName = async () => {
+  let res = await userStore.getInfo();
+  currentFactoryName.value = res.user.currentFactoryName;
+};
 onMounted(() => {
-	getList();
+  searchForm.salesContractNo = route.query.salesContractNo;
+  getList();
+  userListNoPage().then((res) => {
+    userList.value = res.data;
+  });
+  getCurrentFactoryName();
 });
 </script>
 
 <style scoped lang="scss">
 .ml-10 {
   margin-left: 10px;
+}
+
+:deep(.yellow) {
+  background-color: #faf0de;
+}
+
+:deep(.pink) {
+  background-color: #fae1de;
+}
+
+:deep(.red) {
+  background-color: #fae1de;
+}
+
+:deep(.purple) {
+  background-color: #f4defa;
 }
 
 .table_list {
@@ -1481,170 +3013,172 @@
   justify-content: space-between;
   margin-bottom: 10px;
 }
+
 .print-preview-dialog {
-	.el-dialog__body {
-		padding: 0;
-		max-height: 80vh;
-		overflow-y: auto;
-	}
+  .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-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-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;
+  width: 220mm;
+  height: 90mm;
+  padding: 10mm;
+  margin: 0 auto;
+  background: white;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  margin-bottom: 10px;
+  box-sizing: border-box;
 }
 
 .delivery-note {
-	width: 100%;
-	height: 100%;
-	font-family: "SimSun", serif;
-	font-size: 10px;
-	line-height: 1.2;
-	display: flex;
-	flex-direction: column;
+  width: 100%;
+  height: 100%;
+  font-family: "SimSun", serif;
+  font-size: 10px;
+  line-height: 1.2;
+  display: flex;
+  flex-direction: column;
 }
 
 .header {
-	text-align: center;
-	margin-bottom: 8px;
-	
-	.company-name {
-		font-size: 18px;
-		font-weight: bold;
-		margin-bottom: 4px;
-	}
-	
-	.document-title {
-		font-size: 16px;
-		font-weight: bold;
-	}
+  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: 14px;
-		}
-		
-		.value {
-			margin-right: 20px;
-			min-width: 80px;
-			font-size: 14px;
-		}
-	}
+  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;
-		}
-	}
+  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;
-				}
-			}
-		}
-	}
+  .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;
-	}
+  .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>
+</style>
\ No newline at end of file

--
Gitblit v1.9.3