From c391bf92060a370c1f22e5e3b7d17c2ebfd048c7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 08 四月 2026 14:25:36 +0800
Subject: [PATCH] fix: 销售台账新增修改

---
 src/views/salesManagement/deliveryLedger/index.vue |  341 +++++++++++++++++++++-----------------------------------
 1 files changed, 128 insertions(+), 213 deletions(-)

diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index b10c80e..9c22014 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -2,89 +2,93 @@
   <div class="app-container">
     <div class="search_form">
       <el-form :model="searchForm" :inline="true">
-        <el-form-item label="閿�鍞鍗曞彿锛�">
-          <el-input v-model="searchForm.salesContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
-            @change="handleQuery" />
+        <el-form-item label="娴佹按鍙凤細">
+          <el-input v-model="searchForm.serialNo" placeholder="璇疯緭鍏�" clearable 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" />
+        <el-form-item label="杞﹀彿锛�">
+          <el-input v-model="searchForm.carNo" placeholder="璇疯緭鍏�" clearable style="width: 200px" @change="handleQuery" />
+        </el-form-item>
+        <el-form-item label="璐у悕锛�">
+          <el-input v-model="searchForm.goodsName" placeholder="璇疯緭鍏�" clearable style="width: 200px" @change="handleQuery" />
+        </el-form-item>
+        <el-form-item label="鏀惰揣鍗曚綅锛�">
+          <el-input v-model="searchForm.receiveUnit" placeholder="璇疯緭鍏�" clearable 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>
+
     <div class="table_list">
       <div class="actions">
-        <div></div>
+        <div />
         <div>
-          <el-button @click="handleOut">瀵煎嚭</el-button>
+          <el-button type="primary" plain @click="openImportDialog">瀵煎叆</el-button>
           <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
         </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
+        :data="tableData"
+        border
+        v-loading="tableLoading"
+        @selection-change="handleSelectionChange"
+        :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="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">
-          <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>
-          </template>
-        </el-table-column>
+        <el-table-column label="娴佹按鍙�" prop="serialNo" show-overflow-tooltip min-width="120" />
+        <el-table-column label="杞﹀彿" prop="carNo" show-overflow-tooltip min-width="120" />
+        <el-table-column label="鍙戣揣鍗曚綅" prop="shipUnit" show-overflow-tooltip min-width="140" />
+        <el-table-column label="鏀惰揣鍗曚綅" prop="receiveUnit" show-overflow-tooltip min-width="140" />
+        <el-table-column label="璐у悕" prop="goodsName" show-overflow-tooltip min-width="120" />
+        <el-table-column label="瑙勬牸" prop="specification" show-overflow-tooltip min-width="120" />
+        <el-table-column label="姣涢噸" prop="grossWeight" show-overflow-tooltip min-width="100" />
+        <el-table-column label="鐨噸" prop="tareWeight" show-overflow-tooltip min-width="100" />
+        <el-table-column label="鍑�閲�" prop="netWeight" show-overflow-tooltip min-width="100" />
+        <el-table-column label="涓�娆¤繃纾呮椂闂�" prop="firstWeighTime" show-overflow-tooltip min-width="180" />
+        <el-table-column label="浜屾杩囩鏃堕棿" prop="secondWeighTime" show-overflow-tooltip min-width="180" />
+        <el-table-column label="鍘熷彂" prop="originalSender" show-overflow-tooltip min-width="100" />
+        <el-table-column label="鏇存柊浜�" prop="updateBy" show-overflow-tooltip min-width="120" />
       </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="50%"
-      @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-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>
-          </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-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber">
-              <el-input v-model="form.shippingCarNumber" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        
-      </el-form>
+
+    <el-dialog v-model="importUpload.open" :title="importUpload.title" width="500px" append-to-body>
+      <el-upload
+        ref="importUploadRef"
+        drag
+        :limit="1"
+        :action="importUpload.url"
+        :headers="importUpload.headers"
+        :before-upload="importUpload.beforeUpload"
+        :on-success="importUpload.onSuccess"
+        :on-error="importUpload.onError"
+        :auto-upload="false"
+        accept=".xlsx,.xls"
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em>
+        </div>
+        <template #tip>
+          <div class="el-upload__tip">浠呮敮鎸� xlsx/xls 鏂囦欢</div>
+        </template>
+      </el-upload>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">纭</el-button>
-          <el-button @click="closeDia">鍙栨秷</el-button>
+          <el-button type="primary" :loading="importUpload.isUploading" @click="submitImport">纭畾</el-button>
+          <el-button @click="importUpload.open = false">鍙栨秷</el-button>
         </div>
       </template>
     </el-dialog>
@@ -94,53 +98,62 @@
 <script setup>
 import pagination from "@/components/PIMTable/Pagination.vue";
 import { onMounted, ref, reactive, toRefs, getCurrentInstance } from "vue";
-import { ElMessageBox } from "element-plus";
-import {
-  deliveryLedgerListPage,
-  addOrUpdateDeliveryLedger,
-  delDeliveryLedger,
-} from "@/api/salesManagement/deliveryLedger.js";
- 
+import { getToken } from "@/utils/auth";
+import { weighbridgeLedgerListPage, delWeighbridgeLedger } from "@/api/salesManagement/deliveryLedger.js";
 
 const { proxy } = getCurrentInstance();
+
 const tableData = ref([]);
 const selectedRows = ref([]);
 const tableLoading = ref(false);
-const salesOrderOptions = ref([]);
 const page = reactive({
   current: 1,
   size: 100,
 });
 const total = ref(0);
 
-// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
-const operationType = ref("");
-const dialogFormVisible = ref(false);
 const data = reactive({
   searchForm: {
-    salesContractNo: "", // 閿�鍞鍗曞彿
-    shippingCarNumber: "", // 杞︾墝鍙�
-  },
-  form: {
-    id: null,
-    salesContractNo: "",
-    customerName: "",
-    shippingDate: "",
-    shippingCarNumber: "",
-  },
-  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" }],
+    serialNo: "",
+    carNo: "",
+    goodsName: "",
+    receiveUnit: "",
   },
 });
-const { form, rules } = toRefs(data);
 const { searchForm } = toRefs(data);
 
- 
+const importUploadRef = ref(null);
+const importUpload = reactive({
+  title: "瀵煎叆鍙拌处",
+  open: false,
+  isUploading: false,
+  url: import.meta.env.VITE_APP_BASE_API + "/sales/weighbridgeLedger/import",
+  headers: { Authorization: "Bearer " + getToken() },
+  beforeUpload: (file) => {
+    const isExcel = file.name.endsWith(".xlsx") || file.name.endsWith(".xls");
+    if (!isExcel) {
+      proxy.$modal.msgError("涓婁紶鏂囦欢鍙兘鏄� xlsx/xls 鏍煎紡");
+      return false;
+    }
+    return true;
+  },
+  onSuccess: (res) => {
+    importUpload.isUploading = false;
+    if (res?.code === 200) {
+      proxy.$modal.msgSuccess("瀵煎叆鎴愬姛");
+      importUpload.open = false;
+      importUploadRef.value?.clearFiles();
+      getList();
+      return;
+    }
+    proxy.$modal.msgError(res?.msg || "瀵煎叆澶辫触");
+  },
+  onError: () => {
+    importUpload.isUploading = false;
+    proxy.$modal.msgError("瀵煎叆澶辫触锛岃閲嶈瘯");
+  },
+});
 
-// 鏌ヨ鍒楄〃
 const handleQuery = () => {
   page.current = 1;
   getList();
@@ -154,144 +167,46 @@
 
 const getList = () => {
   tableLoading.value = true;
-  deliveryLedgerListPage({ ...searchForm.value, ...page })
+  weighbridgeLedgerListPage({ ...searchForm.value, ...page })
     .then((res) => {
-      tableLoading.value = false;
-      tableData.value = res.data.records || [];
-      total.value = res.data.total || 0;
+      tableData.value = res?.data?.records || res?.records || [];
+      total.value = res?.data?.total || res?.total || 0;
     })
-    .catch(() => {
+    .finally(() => {
       tableLoading.value = false;
     });
 };
 
-// 閿�鍞鍗曞彉鍖栨椂鑷姩濉厖瀹㈡埛鍚嶇О
-const handleSalesOrderChange = (value) => {
-  const selectedOrder = salesOrderOptions.value.find(item => item.salesContractNo === value);
-  if (selectedOrder) {
-    form.value.customerName = selectedOrder.customerName;
-  }
-};
-
-// 琛ㄦ牸閫夋嫨鏁版嵁
 const handleSelectionChange = (selection) => {
   selectedRows.value = selection;
 };
 
-// 鎵撳紑寮规
-const openForm = async (type, row) => {
-  operationType.value = type;
-  if (type === 'edit' && row) {
-    form.value = {
-      id: row.id ?? null,
-      salesContractNo: row.salesContractNo ?? "",
-      customerName: row.customerName ?? "",
-      shippingDate: row.shippingDate || getCurrentDate(),
-      shippingCarNumber: row.shippingCarNumber ?? "",
-    };
-  } else {
-    form.value = {
-      id: null,
-      salesContractNo: "",
-      customerName: "",
-      shippingDate: getCurrentDate(),
-      shippingCarNumber: "",
-    };
-  }
-  
-  dialogFormVisible.value = true;
-};
-
-// 鎻愪氦琛ㄥ崟
-const submitForm = () => {
-  proxy.$refs["formRef"].validate((valid) => {
-    if (valid) {
-      const payload = {
-        id: form.value.id,
-        shippingDate: form.value.shippingDate,
-        shippingCarNumber: form.value.shippingCarNumber,
-      };
-      addOrUpdateDeliveryLedger(payload).then((res) => {
-        proxy.$modal.msgSuccess("鎿嶄綔鎴愬姛");
-        closeDia();
-        getList();
-      });
-    }
-  });
-};
-
-// 鍏抽棴寮规
-const closeDia = () => {
-  proxy.resetForm("formRef");
-  dialogFormVisible.value = false;
-};
-
-// 瀵煎嚭
-const handleOut = () => {
-  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
-    confirmButtonText: "纭",
-    cancelButtonText: "鍙栨秷",
-    type: "warning",
-  })
-    .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) {
     proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
     return;
   }
-  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎", {
-    confirmButtonText: "纭",
-    cancelButtonText: "鍙栨秷",
-    type: "warning",
-  })
+  const ids = selectedRows.value.map((item) => item.id);
+  proxy.$modal
+    .confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭锛�")
+    .then(() => delWeighbridgeLedger(ids))
     .then(() => {
-      delDeliveryLedger(ids).then((res) => {
-        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        getList();
-      });
+      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      getList();
     })
-    .catch(() => {
-      proxy.$modal.msg("宸插彇娑�");
-    });
+    .catch(() => {});
 };
 
-// 鍗曚釜鍒犻櫎
-const handleDeleteSingle = (row) => {
-  ElMessageBox.confirm("姝ゆ搷浣滃皢鍒犻櫎璇ヨ褰曪紝鏄惁纭锛�", "鍒犻櫎", {
-    confirmButtonText: "纭",
-    cancelButtonText: "鍙栨秷",
-    type: "warning",
-  })
-    .then(() => {
-      delDeliveryLedger([row.id]).then((res) => {
-        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        getList();
-      });
-    })
-    .catch(() => {
-      proxy.$modal.msg("宸插彇娑�");
-    });
+const openImportDialog = () => {
+  importUpload.open = true;
+  importUploadRef.value?.clearFiles();
 };
 
-// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� 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 submitImport = () => {
+  if (!importUploadRef.value) return;
+  importUpload.isUploading = true;
+  importUploadRef.value.submit();
+};
 
 onMounted(() => {
   getList();

--
Gitblit v1.9.3