From 6faf65a6a7e72b7ecff52355f798fd00a516ba77 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

---
 src/views/salesManagement/deliveryLedger/index.vue |  550 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 448 insertions(+), 102 deletions(-)

diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index b10c80e..8305e8b 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -4,14 +4,21 @@
       <el-form :model="searchForm" :inline="true">
         <el-form-item label="閿�鍞鍗曞彿锛�">
           <el-input v-model="searchForm.salesContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
-            @change="handleQuery" />
+                    style="width: 200px"
+                    @change="handleQuery"/>
         </el-form-item>
         <el-form-item label="杞︾墝鍙凤細">
           <el-input v-model="searchForm.shippingCarNumber" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
-            @change="handleQuery" />
+                    style="width: 200px"
+                    @change="handleQuery"/>
+        </el-form-item>
+        <el-form-item label="蹇�掑崟鍙凤細">
+          <el-input v-model="searchForm.expressNumber" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+                    style="width: 200px"
+                    @change="handleQuery"/>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleQuery"> 鎼滅储 </el-button>
+          <el-button type="primary" @click="handleQuery"> 鎼滅储</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -24,62 +31,124 @@
         </div>
       </div>
       <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
-        :row-key="(row) => row.id" style="width: 100%" height="calc(100vh - 18.5em)">
-        <el-table-column align="center" type="selection" width="55" />
-        <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-        <el-table-column label="閿�鍞鍗�" prop="salesContractNo" show-overflow-tooltip />
-        <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip />
-        <el-table-column label="鍙戣揣鏃堕棿" prop="shippingDate" show-overflow-tooltip />
-        <el-table-column label="鍙戣揣杞︾墝鍙�" prop="shippingCarNumber" show-overflow-tooltip />
-        <el-table-column fixed="right" label="鎿嶄綔" width="150" align="center">
+                :row-key="(row) => row.id" style="width: 100%" height="calc(100vh - 21.5em)">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column align="center" label="搴忓彿" type="index" width="60"/>
+        <el-table-column label="閿�鍞鍗�" prop="salesContractNo" show-overflow-tooltip/>
+        <el-table-column label="鍙戣揣璁㈠崟鍙�" prop="shippingNo" show-overflow-tooltip/>
+        <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip/>
+        <el-table-column label="浜у搧鍚嶇О" prop="productName" show-overflow-tooltip/>
+        <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip/>
+        <el-table-column label="鍙戣揣鏃堕棿" prop="shippingDate" show-overflow-tooltip/>
+        <el-table-column label="鍙戣揣杞︾墝鍙�" prop="shippingCarNumber" show-overflow-tooltip/>
+        <el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip/>
+        <el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip/>
+        <el-table-column label="瀹℃牳鐘舵��" prop="status" align="center" width="120">
           <template #default="scope">
-            <el-button link type="primary" size="small" @click="openForm('edit', scope.row)">缂栬緫</el-button>
-            <el-button link type="danger" size="small" @click="handleDeleteSingle(scope.row)">鍒犻櫎</el-button>
+            <el-tag :type="getApprovalStatusType(scope.row.status)">
+              {{ getApprovalStatusText(scope.row.status) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="鎿嶄綔" width="220" align="center">
+          <template #default="scope">
+            <el-button
+                link
+                type="primary"
+                :disabled="!isApproved(scope.row.status)"
+                @click="openForm('edit', scope.row)">琛ュ厖鍙戣揣淇℃伅
+            </el-button>
+            <el-button
+                link
+                type="primary"
+                style="color: #67C23A"
+                @click="openDetail(scope.row)"
+            >璇︽儏
+            </el-button>
+            <el-button
+                link
+                type="danger"
+                :disabled="isApproving(scope.row.status)"
+                @click="handleDeleteSingle(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" />
+                  :page="page.current" :limit="page.size" @pagination="paginationChange"/>
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍙戣揣鍙拌处' : '缂栬緫鍙戣揣鍙拌处'" width="50%"
-      @close="closeDia">
+    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍙戣揣鍙拌处' : '缂栬緫鍙戣揣鍙拌处'"
+               width="40%"
+               @close="closeDia">
       <el-form :model="form" label-width="120px" label-position="top" :rules="rules" ref="formRef">
         <el-row :gutter="30">
           <el-col :span="24">
-            <el-form-item label="閿�鍞鍗曪細" prop="salesContractNo">
-              <el-select v-model="form.salesContractNo" placeholder="璇烽�夋嫨" clearable filterable 
-                @change="handleSalesOrderChange" style="width: 100%" :disabled="operationType === 'edit'">
-                <el-option v-for="item in salesOrderOptions" :key="item.salesContractNo" 
-                  :label="item.salesContractNo" :value="item.salesContractNo">
-                  {{ item.salesContractNo + ' - ' + item.customerName }}
-                </el-option>
+            <el-form-item label="鍙戣揣绫诲瀷锛�" prop="type">
+              <el-select
+                  v-model="form.type"
+                  placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
+                  style="width: 100%"
+                  @change="handleShippingTypeChange"
+              >
+                <el-option label="璐ц溅" value="璐ц溅"/>
+                <el-option label="蹇��" value="蹇��"/>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="24">
-            <el-form-item label="瀹㈡埛鍚嶇О锛�" prop="customerName">
-              <el-input v-model="form.customerName" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'edit'" />
+            <el-form-item label="鍙戣揣鏃ユ湡锛�" prop="shippingDate">
+              <el-date-picker
+                  style="width: 100%"
+                  v-model="form.shippingDate"
+                  value-format="YYYY-MM-DD"
+                  format="YYYY-MM-DD"
+                  type="date"
+                  placeholder="璇烽�夋嫨鍙戣揣鏃ユ湡"
+                  clearable
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
-          <el-col :span="24">
-            <el-form-item label="鍙戣揣鏃堕棿锛�" prop="shippingDate">
-              <el-date-picker style="width: 100%" v-model="form.shippingDate" value-format="YYYY-MM-DD"
-                format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="24">
+          <el-col :span="24" v-if="form.type === '璐ц溅'">
             <el-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber">
-              <el-input v-model="form.shippingCarNumber" placeholder="璇疯緭鍏�" clearable />
+              <el-input
+                  v-model="form.shippingCarNumber"
+                  placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
+                  clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-else>
+            <el-form-item label="蹇�掑叕鍙革細" prop="expressCompany">
+              <el-input
+                  v-model="form.expressCompany"
+                  placeholder="璇疯緭鍏ュ揩閫掑叕鍙�"
+                  clearable
+              />
             </el-form-item>
           </el-col>
         </el-row>
-        
+        <el-row :gutter="30" v-if="form.type === '蹇��'">
+          <el-col :span="24">
+            <el-form-item label="蹇�掑崟鍙凤細" prop="expressNumber">
+              <el-input
+                  v-model="form.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-form>
       <template #footer>
         <div class="dialog-footer">
@@ -88,21 +157,49 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 璇︽儏寮规 -->
+    <el-dialog v-model="detailDialogVisible" title="鍙戣揣鍙拌处璇︽儏" width="55%" @close="closeDetail">
+      <div v-if="detailRow" class="detail-wrapper">
+        <el-descriptions :column="2" border>
+          <el-descriptions-item label="閿�鍞鍗�">{{ detailRow.salesContractNo || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="鍙戣揣璁㈠崟鍙�">{{ detailRow.shippingNo || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="瀹㈡埛鍚嶇О">{{ detailRow.customerName || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="浜у搧鍚嶇О">{{ detailRow.productName || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="瑙勬牸鍨嬪彿">{{ detailRow.specificationModel || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="鍙戣揣绫诲瀷">{{ detailRow.type || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="鍙戣揣鏃ユ湡">{{ detailRow.shippingDate || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="瀹℃牳鐘舵��">{{ getApprovalStatusText(detailRow.status) }}</el-descriptions-item>
+          <el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{ detailRow.shippingCarNumber || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="蹇�掑叕鍙�">{{ detailRow.expressCompany || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{ detailRow.expressNumber || '--' }}</el-descriptions-item>
+        </el-descriptions>
+        <ImagePreview :file-list="detailRow.storageBlobVOs || []" />
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="closeDetail">鍏抽棴</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
 import pagination from "@/components/PIMTable/Pagination.vue";
-import { onMounted, ref, reactive, toRefs, getCurrentInstance } from "vue";
-import { ElMessageBox } from "element-plus";
+import {onMounted, ref, reactive, toRefs, getCurrentInstance} from "vue";
+import {ElMessageBox} from "element-plus";
+import {getCurrentDate} from "@/utils/index.js";
 import {
   deliveryLedgerListPage,
-  addOrUpdateDeliveryLedger,
-  delDeliveryLedger,
+  delDeliveryLedger, deductStock,
 } from "@/api/salesManagement/deliveryLedger.js";
- 
+import {delLedgerFile} from "@/api/salesManagement/salesLedger.js";
+import ImageUpload from "@/components/AttachmentUpload/image/index.vue";
+import ImagePreview from "@/components/AttachmentPreview/image/index.vue";
 
-const { proxy } = getCurrentInstance();
+
+const {proxy} = getCurrentInstance();
 const tableData = ref([]);
 const selectedRows = ref([]);
 const tableLoading = ref(false);
@@ -112,6 +209,10 @@
   size: 100,
 });
 const total = ref(0);
+const deliveryFileList = ref([]);
+// 璇︽儏寮规
+const detailDialogVisible = ref(false);
+const detailRow = ref(null);
 
 // 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
 const operationType = ref("");
@@ -120,25 +221,38 @@
   searchForm: {
     salesContractNo: "", // 閿�鍞鍗曞彿
     shippingCarNumber: "", // 杞︾墝鍙�
+    expressNumber: "", // 蹇�掑崟鍙�
   },
   form: {
     id: null,
     salesContractNo: "",
     customerName: "",
+    specificationModel: "",
+    productName: "",
+    type: "璐ц溅", // 璐ц溅, 蹇��
     shippingDate: "",
     shippingCarNumber: "",
+    expressCompany: "",
+    expressNumber: "", // 蹇�掑崟鍙�
   },
   rules: {
-    salesContractNo: [{ required: true, message: "璇烽�夋嫨閿�鍞鍗�", trigger: "change" }],
-    customerName: [{ required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: "blur" }],
-    shippingDate: [{ required: true, message: "璇烽�夋嫨鍙戣揣鏃堕棿", trigger: "change" }],
-    shippingCarNumber: [{ required: true, message: "璇疯緭鍏ュ彂璐ц溅鐗屽彿", trigger: "blur" }],
+    salesContractNo: [{required: true, message: "璇烽�夋嫨閿�鍞鍗�", trigger: "change"}],
+    customerName: [{required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: "blur"}],
+    type: [
+      {required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change"}
+    ],
+    shippingDate: [{required: true, message: "璇烽�夋嫨鍙戣揣鏃堕棿", trigger: "change"}],
+    shippingCarNumber: [
+      {validator: (_, value, callback) => validateShippingCarNumber(value, callback), trigger: "blur"}
+    ],
+    expressCompany: [
+      {validator: (_, value, callback) => validateExpressCompany(value, callback), trigger: "blur"}
+    ],
   },
 });
-const { form, rules } = toRefs(data);
-const { searchForm } = toRefs(data);
+const {form, rules} = toRefs(data);
+const {searchForm} = toRefs(data);
 
- 
 
 // 鏌ヨ鍒楄〃
 const handleQuery = () => {
@@ -154,15 +268,15 @@
 
 const getList = () => {
   tableLoading.value = true;
-  deliveryLedgerListPage({ ...searchForm.value, ...page })
-    .then((res) => {
-      tableLoading.value = false;
-      tableData.value = res.data.records || [];
-      total.value = res.data.total || 0;
-    })
-    .catch(() => {
-      tableLoading.value = false;
-    });
+  deliveryLedgerListPage({...searchForm.value, ...page})
+      .then((res) => {
+        tableLoading.value = false;
+        tableData.value = res.data.records || [];
+        total.value = res.data.total || 0;
+      })
+      .catch(() => {
+        tableLoading.value = false;
+      });
 };
 
 // 閿�鍞鍗曞彉鍖栨椂鑷姩濉厖瀹㈡埛鍚嶇О
@@ -180,26 +294,40 @@
 
 // 鎵撳紑寮规
 const openForm = async (type, row) => {
+  // 琛ュ厖鍙戣揣淇℃伅锛氫粎鈥滃鏍搁�氳繃鈥濆厑璁哥紪杈�
+  if (type === 'edit' && row && !isApproved(row.status)) {
+    proxy.$modal.msgWarning("鍙湁瀹℃牳閫氳繃鐨勬暟鎹墠鍙互琛ュ厖鍙戣揣淇℃伅");
+    return;
+  }
+
   operationType.value = type;
+
   if (type === 'edit' && row) {
     form.value = {
       id: row.id ?? null,
       salesContractNo: row.salesContractNo ?? "",
       customerName: row.customerName ?? "",
+      type: row.type || "璐ц溅",
       shippingDate: row.shippingDate || getCurrentDate(),
       shippingCarNumber: row.shippingCarNumber ?? "",
+      expressCompany: row.expressCompany ?? "",
+      expressNumber: row.expressNumber ?? "",
     };
-  } else {
-    form.value = {
-      id: null,
-      salesContractNo: "",
-      customerName: "",
-      shippingDate: getCurrentDate(),
-      shippingCarNumber: "",
-    };
+    deliveryFileList.value = row.storageBlobVOs || [];
   }
-  
+
   dialogFormVisible.value = true;
+};
+
+// 鎵撳紑璇︽儏寮规
+const openDetail = (row) => {
+  detailRow.value = row || null;
+  const list = Array.isArray(row?.commonFileList) ? row.commonFileList : [];
+  detailDialogVisible.value = true;
+};
+const closeDetail = () => {
+  detailDialogVisible.value = false;
+  detailRow.value = null;
 };
 
 // 鎻愪氦琛ㄥ崟
@@ -208,10 +336,14 @@
     if (valid) {
       const payload = {
         id: form.value.id,
+        type: form.value.type,
         shippingDate: form.value.shippingDate,
-        shippingCarNumber: form.value.shippingCarNumber,
+        shippingCarNumber: form.value.type === "璐ц溅" ? form.value.shippingCarNumber : "",
+        expressCompany: form.value.type === "蹇��" ? form.value.expressCompany : "",
+        expressNumber: form.value.type === "蹇��" ? form.value.expressNumber : "",
+        storageBlobDTOs: deliveryFileList.value || [],
       };
-      addOrUpdateDeliveryLedger(payload).then((res) => {
+      deductStock(payload).then((res) => {
         proxy.$modal.msgSuccess("鎿嶄綔鎴愬姛");
         closeDia();
         getList();
@@ -223,6 +355,7 @@
 // 鍏抽棴寮规
 const closeDia = () => {
   proxy.resetForm("formRef");
+  deliveryFileList.value = []; // 娓呯┖鏂囦欢鍒楄〃
   dialogFormVisible.value = false;
 };
 
@@ -233,65 +366,244 @@
     cancelButtonText: "鍙栨秷",
     type: "warning",
   })
-    .then(() => {
-      proxy.download("/shippingInfo/export", {}, "鍙戣揣鍙拌处.xlsx");
-    })
-    .catch(() => {
-      proxy.$modal.msg("宸插彇娑�");
-    });
+      .then(() => {
+        proxy.download("/shippingInfo/export", {}, "鍙戣揣鍙拌处.xlsx");
+      })
+      .catch(() => {
+        proxy.$modal.msg("宸插彇娑�");
+      });
 };
 
 // 鎵归噺鍒犻櫎
 const handleDelete = () => {
-  let ids = [];
-  if (selectedRows.value.length > 0) {
-    ids = selectedRows.value.map((item) => item.id);
-  } else {
+  if (selectedRows.value.length === 0) {
     proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
     return;
   }
+
+  // 妫�鏌ラ�変腑鐨勮鏄惁鏈�"瀹℃牳涓�"鐘舵��
+  const approvingRows = selectedRows.value.filter(row => isApproving(row.status));
+  if (approvingRows.length > 0) {
+    proxy.$modal.msgWarning("瀹℃牳涓殑鏁版嵁涓嶈兘鍒犻櫎");
+    return;
+  }
+
+  const ids = selectedRows.value.map((item) => item.id);
   ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎", {
     confirmButtonText: "纭",
     cancelButtonText: "鍙栨秷",
     type: "warning",
   })
-    .then(() => {
-      delDeliveryLedger(ids).then((res) => {
-        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        getList();
+      .then(() => {
+        delDeliveryLedger(ids).then((res) => {
+          proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          getList();
+        });
+      })
+      .catch(() => {
+        proxy.$modal.msg("宸插彇娑�");
       });
-    })
-    .catch(() => {
-      proxy.$modal.msg("宸插彇娑�");
-    });
 };
 
 // 鍗曚釜鍒犻櫎
 const handleDeleteSingle = (row) => {
+  // 妫�鏌ユ槸鍚︿负"瀹℃牳涓�"鐘舵��
+  if (isApproving(row.status)) {
+    proxy.$modal.msgWarning("瀹℃牳涓殑鏁版嵁涓嶈兘鍒犻櫎");
+    return;
+  }
+
   ElMessageBox.confirm("姝ゆ搷浣滃皢鍒犻櫎璇ヨ褰曪紝鏄惁纭锛�", "鍒犻櫎", {
     confirmButtonText: "纭",
     cancelButtonText: "鍙栨秷",
     type: "warning",
   })
-    .then(() => {
-      delDeliveryLedger([row.id]).then((res) => {
-        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        getList();
+      .then(() => {
+        delDeliveryLedger([row.id]).then((res) => {
+          proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          getList();
+        });
+      })
+      .catch(() => {
+        proxy.$modal.msg("宸插彇娑�");
       });
-    })
-    .catch(() => {
-      proxy.$modal.msg("宸插彇娑�");
-    });
 };
 
-// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
-function getCurrentDate() {
-  const today = new Date();
-  const year = today.getFullYear();
-  const month = String(today.getMonth() + 1).padStart(2, "0");
-  const day = String(today.getDate()).padStart(2, "0");
-  return `${year}-${month}-${day}`;
+// 鍙戣揣绫诲瀷鏍￠獙锛氳揣杞︽椂瑕佹眰杞︾墝锛屽揩閫掓椂瑕佹眰蹇�掑叕鍙�
+const validateShippingCarNumber = (value, callback) => {
+  if (form.value.type === "璐ц溅") {
+    if (!value) return callback(new Error("璇疯緭鍏ュ彂璐ц溅鐗屽彿"));
+  }
+  callback();
+};
+const validateExpressCompany = (value, callback) => {
+  if (form.value.type === "蹇��") {
+    if (!value) return callback(new Error("璇疯緭鍏ュ揩閫掑叕鍙�"));
+  }
+  callback();
+};
+
+// 鍙戣揣鍥剧墖涓婁紶鍓嶆牎妫�
+function handleDeliveryBeforeUpload(file) {
+  // 鏍℃鏂囦欢绫诲瀷
+  const isImage = file.type === 'image/png' || file.type === 'image/jpeg' || file.type === 'image/jpg';
+  if (!isImage) {
+    proxy.$modal.msgError("鍙兘涓婁紶 jpg銆乯peg銆乸ng 鏍煎紡鐨勫浘鐗�!");
+    return false;
+  }
+  // 鏍℃鏂囦欢澶у皬
+  const isLt10M = file.size / 1024 / 1024 < 10;
+  if (!isLt10M) {
+    proxy.$modal.msgError("涓婁紶鍥剧墖澶у皬涓嶈兘瓒呰繃 10MB!");
+    return false;
+  }
+  proxy.$modal.loading("姝ｅ湪涓婁紶鍥剧墖锛岃绋嶅��...");
+  return true;
 }
+
+// 鍙戣揣鍥剧墖涓婁紶澶辫触
+function handleDeliveryUploadError(err) {
+  proxy.$modal.msgError("涓婁紶鍥剧墖澶辫触");
+  proxy.$modal.closeLoading();
+}
+
+// 鍙戣揣鍥剧墖涓婁紶鎴愬姛鍥炶皟
+function handleDeliveryUploadSuccess(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.deliveryFileUpload.handleRemove(file);
+  }
+}
+
+// 绉婚櫎鍙戣揣鍥剧墖
+function handleDeliveryRemove(file) {
+  console.log('file--', file)
+  // 濡傛灉鏄紪杈戞ā寮忎笖鏂囦欢鏈� id锛岄渶瑕佽皟鐢ㄦ帴鍙ｅ垹闄�
+  if (operationType.value === "edit") {
+    let ids = [];
+    ids.push(file.uid);
+    delLedgerFile(ids).then((res) => {
+      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      // 浠庢枃浠跺垪琛ㄤ腑绉婚櫎
+      const index = deliveryFileList.value.findIndex(item => item.uid === file.uid);
+      if (index > -1) {
+        deliveryFileList.value.splice(index, 1);
+      }
+    }).catch(() => {
+      proxy.$modal.msgError("鍒犻櫎澶辫触");
+    });
+  } else {
+    // 鏂板妯″紡鎴栨病鏈� id 鐨勬枃浠讹紝鐩存帴浠庡垪琛ㄤ腑绉婚櫎
+    const index = deliveryFileList.value.findIndex(item => item.uid === file.uid);
+    if (index > -1) {
+      deliveryFileList.value.splice(index, 1);
+    }
+  }
+}
+
+// 鍙戣揣绫诲瀷鍒囨崲鏃舵竻绌哄搴斿瓧娈�
+const handleShippingTypeChange = (val) => {
+  if (val === "璐ц溅") {
+    form.value.expressCompany = "";
+    form.value.expressNumber = "";
+  } else {
+    form.value.shippingCarNumber = "";
+  }
+};
+
+// 鑾峰彇瀹℃牳鐘舵�佹枃鏈�
+const getApprovalStatusText = (status) => {
+  if (status === null || status === undefined || status === '') {
+    return '寰呭鏍�';
+  }
+  // 濡傛灉鏄暟瀛�
+  if (typeof status === 'number') {
+    const statusMap = {
+      0: '寰呭鏍�',
+      1: '瀹℃牳涓�',
+      2: '瀹℃牳鎷掔粷',
+      3: '瀹℃牳閫氳繃'
+    };
+    return statusMap[status] || '寰呭鏍�';
+  }
+  // 濡傛灉鏄瓧绗︿覆锛岀洿鎺ヨ繑鍥炴垨鏄犲皠
+  const statusStr = String(status).trim();
+  const statusTextMap = {
+    '寰呭鏍�': '寰呭鏍�',
+    '瀹℃牳涓�': '瀹℃牳涓�',
+    '瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
+    '瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
+    '宸插彂璐�': '宸插彂璐�',
+    '0': '寰呭鏍�',
+    '1': '瀹℃牳涓�',
+    '2': '瀹℃牳鎷掔粷',
+    '3': '瀹℃牳閫氳繃'
+  };
+  return statusTextMap[statusStr] || statusStr || '寰呭鏍�';
+};
+
+// 鑾峰彇瀹℃牳鐘舵�佹爣绛剧被鍨嬶紙棰滆壊锛�
+const getApprovalStatusType = (status) => {
+  if (status === null || status === undefined || status === '') {
+    return 'info';
+  }
+  // 濡傛灉鏄暟瀛�
+  if (typeof status === 'number') {
+    const typeMap = {
+      0: 'info',      // 寰呭鏍� - 鐏拌壊
+      1: 'warning',   // 瀹℃牳涓� - 榛勮壊
+      2: 'danger',    // 瀹℃牳鎷掔粷 - 绾㈣壊
+      3: 'success'    // 瀹℃牳閫氳繃 - 缁胯壊
+    };
+    return typeMap[status] || 'info';
+  }
+  // 濡傛灉鏄瓧绗︿覆
+  const statusStr = String(status).trim();
+  const typeTextMap = {
+    '寰呭鏍�': 'info',
+    '瀹℃牳涓�': 'warning',
+    '瀹℃牳鎷掔粷': 'danger',
+    '瀹℃牳閫氳繃': 'success',
+    '宸插彂璐�': 'success',
+    '0': 'info',
+    '1': 'warning',
+    '2': 'danger',
+    '3': 'success'
+  };
+  return typeTextMap[statusStr] || 'info';
+};
+
+// 妫�鏌ュ鏍哥姸鎬佹槸鍚︿负"瀹℃牳閫氳繃"
+const isApproved = (status) => {
+  if (status === null || status === undefined || status === '') {
+    return false;
+  }
+  // 濡傛灉鏄暟瀛楋紝3 琛ㄧず瀹℃牳閫氳繃
+  if (typeof status === 'number') {
+    return status === 3;
+  }
+  // 濡傛灉鏄瓧绗︿覆
+  const statusStr = String(status).trim();
+  return statusStr === '瀹℃牳閫氳繃' || statusStr === '3';
+};
+
+// 妫�鏌ュ鏍哥姸鎬佹槸鍚︿负"瀹℃牳涓�"
+const isApproving = (status) => {
+  if (status === null || status === undefined || status === '') {
+    return false;
+  }
+  // 濡傛灉鏄暟瀛楋紝1 琛ㄧず瀹℃牳涓�
+  if (typeof status === 'number') {
+    return status === 1;
+  }
+  // 濡傛灉鏄瓧绗︿覆
+  const statusStr = String(status).trim();
+  return statusStr === '瀹℃牳涓�' || statusStr === '1';
+};
 
 onMounted(() => {
   getList();
@@ -308,5 +620,39 @@
   justify-content: space-between;
   margin-bottom: 10px;
 }
+
+// 闅愯棌鍥剧墖涓婁紶缁勪欢鐨勯瑙堟寜閽紙鏀惧ぇ闀滐級
+:deep(.el-upload-list--picture-card .el-upload-list__item-actions) {
+  .el-upload-list__item-preview {
+    display: none;
+  }
+}
+
+.detail-wrapper {
+  padding: 8px 0;
+}
+
+.detail-images {
+  margin-top: 16px;
+}
+
+.detail-images-title {
+  font-weight: 600;
+  margin-bottom: 10px;
+  color: #303133;
+}
+
+.detail-image {
+  width: 120px;
+  height: 120px;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  border-radius: 6px;
+}
+
+.detail-images-empty {
+  margin-top: 16px;
+  color: #909399;
+}
 </style>
 

--
Gitblit v1.9.3