From e446a0f0d95283a1c2c44a1f4ef7ac512fdf11ca Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 22 一月 2026 13:37:55 +0800
Subject: [PATCH] 湟水峡 1.发货分开类型货车和快递
---
src/components/ImageUpload/index.vue | 2
src/views/salesManagement/deliveryLedger/index.vue | 281 +++++++++++++++++++++++++++++++----
src/views/salesManagement/salesLedger/index.vue | 158 +++++++++++++++----
3 files changed, 372 insertions(+), 69 deletions(-)
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 9670c72..771f457 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -47,6 +47,8 @@
</template>
<script setup>
+import { ref, computed, watch, getCurrentInstance, onMounted, nextTick } from "vue";
+import { Plus } from "@element-plus/icons-vue";
import { getToken } from "@/utils/auth";
import { isExternal } from "@/utils/validate";
import Sortable from "sortablejs";
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index b10c80e..487ab0a 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -3,11 +3,15 @@
<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"
+ <el-input v-model="searchForm.salesContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search" style="width: 200px"
@change="handleQuery" />
</el-form-item>
<el-form-item label="杞︾墝鍙凤細">
- <el-input v-model="searchForm.shippingCarNumber" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+ <el-input v-model="searchForm.shippingCarNumber" placeholder="璇疯緭鍏�" clearable prefix-icon="Search" 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>
@@ -24,13 +28,15 @@
</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)">
+ :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 label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip />
+ <el-table-column label="蹇�掑崟鍙�" prop="expressNumber" 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>
@@ -41,45 +47,99 @@
<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%"
+ <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="鍙戣揣鍥剧墖锛�">
+ <el-upload
+ v-model:file-list="deliveryFileList"
+ :action="upload.url"
+ multiple
+ ref="deliveryFileUpload"
+ auto-upload
+ :headers="upload.headers"
+ :data="{ type: 9 }"
+ :before-upload="handleDeliveryBeforeUpload"
+ :on-error="handleDeliveryUploadError"
+ :on-success="handleDeliveryUploadSuccess"
+ :on-remove="handleDeliveryRemove"
+ list-type="picture-card"
+ :limit="9"
+ accept="image/png,image/jpeg,image/jpg"
+ >
+ <el-icon class="avatar-uploader-icon"><Plus /></el-icon>
+ <template #tip>
+ <div class="el-upload__tip">
+ 鏀寔 jpg銆乯peg銆乸ng 鏍煎紡锛屾渶澶氫笂浼� 9 寮狅紝鍗曞紶澶у皬涓嶈秴杩� 10MB
+ </div>
+ </template>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -95,6 +155,9 @@
import pagination from "@/components/PIMTable/Pagination.vue";
import { onMounted, ref, reactive, toRefs, getCurrentInstance } from "vue";
import { ElMessageBox } from "element-plus";
+import { Plus } from "@element-plus/icons-vue";
+import { getToken } from "@/utils/auth";
+import { getCurrentDate } from "@/utils/index.js";
import {
deliveryLedgerListPage,
addOrUpdateDeliveryLedger,
@@ -112,6 +175,15 @@
size: 100,
});
const total = ref(0);
+const deliveryFileList = ref([]);
+
+// 涓婁紶閰嶇疆
+const upload = reactive({
+ // 涓婁紶鐨勫湴鍧�
+ url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
+ // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+ headers: { Authorization: "Bearer " + getToken() },
+});
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref("");
@@ -120,19 +192,31 @@
searchForm: {
salesContractNo: "", // 閿�鍞鍗曞彿
shippingCarNumber: "", // 杞︾墝鍙�
+ expressNumber: "", // 蹇�掑崟鍙�
},
form: {
id: null,
salesContractNo: "",
customerName: "",
+ type: "璐ц溅", // 璐ц溅, 蹇��
shippingDate: "",
shippingCarNumber: "",
+ expressCompany: "",
+ expressNumber: "", // 蹇�掑崟鍙�
},
rules: {
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: [{ required: true, message: "璇疯緭鍏ュ彂璐ц溅鐗屽彿", trigger: "blur" }],
+ shippingCarNumber: [
+ { validator: (_, value, callback) => validateShippingCarNumber(value, callback), trigger: "blur" }
+ ],
+ expressCompany: [
+ { validator: (_, value, callback) => validateExpressCompany(value, callback), trigger: "blur" }
+ ],
},
});
const { form, rules } = toRefs(data);
@@ -181,22 +265,87 @@
// 鎵撳紑寮规
const openForm = async (type, row) => {
operationType.value = type;
+ const baseUrl = import.meta.env.VITE_APP_BASE_API;
+
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 ?? "",
};
+ // 濡傛灉鏈夊浘鐗囷紝灏� commonFileList 杞崲涓烘枃浠跺垪琛ㄦ牸寮�
+ if (row.commonFileList && Array.isArray(row.commonFileList) && row.commonFileList.length > 0) {
+ deliveryFileList.value = row.commonFileList.map((file, index) => {
+ // 澶勭悊 URL锛氬皢 Windows 璺緞杞崲涓哄彲璁块棶鐨� URL
+ let fileUrl = file.url || '';
+ console.log('鍘熷 URL:', fileUrl);
+
+ // 濡傛灉 URL 鏄� Windows 璺緞鏍煎紡锛堝寘鍚弽鏂滄潬锛夛紝闇�瑕佽浆鎹�
+ if (fileUrl && fileUrl.indexOf('\\') > -1) {
+ // 鏌ユ壘 uploads 鍏抽敭瀛楃殑浣嶇疆锛屼粠閭ｉ噷寮�濮嬫彁鍙栫浉瀵硅矾寰�
+ const uploadsIndex = fileUrl.toLowerCase().indexOf('uploads');
+ if (uploadsIndex > -1) {
+ // 浠� uploads 寮�濮嬫彁鍙栬矾寰勶紝骞跺皢鍙嶆枩鏉犳浛鎹负姝ｆ枩鏉�
+ const relativePath = fileUrl.substring(uploadsIndex).replace(/\\/g, '/');
+ fileUrl = '/' + relativePath;
+ console.log('杞崲鍚庣殑鐩稿璺緞:', fileUrl);
+ } else {
+ // 濡傛灉娌℃湁鎵惧埌 uploads锛屾彁鍙栨渶鍚庝竴涓洰褰曞拰鏂囦欢鍚�
+ const parts = fileUrl.split('\\');
+ const fileName = parts[parts.length - 1];
+ fileUrl = '/uploads/' + fileName;
+ console.log('鏈壘鍒� uploads锛屼娇鐢ㄦ枃浠跺悕:', fileUrl);
+ }
+ }
+
+ // 纭繚鎵�鏈夐潪 http 寮�澶寸殑 URL 閮芥嫾鎺� baseUrl
+ if (fileUrl && !fileUrl.startsWith('http')) {
+ // 纭繚璺緞浠� / 寮�澶�
+ if (!fileUrl.startsWith('/')) {
+ fileUrl = '/' + fileUrl;
+ }
+ // 鎷兼帴 baseUrl
+ const baseUrl = import.meta.env.VITE_APP_BASE_API;
+ console.log('baseUrl:', baseUrl);
+ fileUrl = baseUrl + fileUrl;
+ console.log('鏈�缁堟嫾鎺ョ殑 URL:', fileUrl);
+ }
+
+ return {
+ uid: file.id || Date.now() + index,
+ name: file.name || `image_${index + 1}.jpg`,
+ url: fileUrl,
+ status: 'success',
+ response: {
+ code: 200,
+ data: {
+ tempId: file.id,
+ url: fileUrl
+ }
+ },
+ tempId: file.id // 淇濆瓨鏂囦欢ID锛岀敤浜庢彁浜ゆ椂浣跨敤
+ };
+ });
+ } else {
+ deliveryFileList.value = [];
+ }
} else {
form.value = {
id: null,
salesContractNo: "",
customerName: "",
+ type: "璐ц溅",
shippingDate: getCurrentDate(),
shippingCarNumber: "",
+ expressCompany: "",
+ expressNumber: "",
};
+ deliveryFileList.value = [];
}
dialogFormVisible.value = true;
@@ -206,10 +355,18 @@
const submitForm = () => {
proxy.$refs["formRef"].validate((valid) => {
if (valid) {
+ let tempFileIds = [];
+ if (deliveryFileList.value !== null && deliveryFileList.value.length > 0) {
+ tempFileIds = deliveryFileList.value.map((item) => item.tempId);
+ }
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 : "",
+ tempFileIds: tempFileIds,
};
addOrUpdateDeliveryLedger(payload).then((res) => {
proxy.$modal.msgSuccess("鎿嶄綔鎴愬姛");
@@ -223,6 +380,7 @@
// 鍏抽棴寮规
const closeDia = () => {
proxy.resetForm("formRef");
+ deliveryFileList.value = []; // 娓呯┖鏂囦欢鍒楄〃
dialogFormVisible.value = false;
};
@@ -284,14 +442,71 @@
});
};
-// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� 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) {
+ // 浠庢枃浠跺垪琛ㄤ腑绉婚櫎
+ 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 = "";
+ }
+};
onMounted(() => {
getList();
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index a1bed58..41aaf1a 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -46,15 +46,6 @@
<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 === 0" type="info">鏈嚭搴�</el-tag>
- <el-tag v-if="scope.row.approveStatus === 1" type="success">宸插嚭搴�</el-tag>
- <el-tag v-if="scope.row.approveStatus === 2" type="warning">瀹℃牳涓�</el-tag>
- <el-tag v-if="scope.row.approveStatus === 3" type="success">瀹℃牳鎴愬姛</el-tag>
- <el-tag v-if="scope.row.approveStatus === 4" type="danger">瀹℃牳澶辫触</el-tag>
- </template>
- </el-table-column>
<el-table-column label="鏁伴噺" prop="quantity" />
<el-table-column label="绋庣巼(%)" prop="taxRate" />
<el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
@@ -73,13 +64,21 @@
<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="shippingCarNumber" width="140" align="center" show-overflow-tooltip />
+ <el-table-column label="鍙戣揣鐘舵��" prop="shippingStatus" width="140" align="center" show-overflow-tooltip />
<el-table-column label="鍙戣揣鏃ユ湡" prop="shippingDate" width="140" align="center" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" min-width="140" align="center">
<template #default="scope">
<el-button link type="primary" size="small" @click="openForm('edit', scope.row)">缂栬緫</el-button>
<el-button link type="primary" size="small" @click="downLoadFile(scope.row)">闄勪欢</el-button>
- <el-button link type="primary" size="small" @click="openDeliveryForm(scope.row)">鍙戣揣</el-button>
+ <el-button
+ link
+ type="primary"
+ size="small"
+ @click="openDeliveryForm(scope.row)"
+ :disabled="scope.row.shippingStatus === '宸插彂璐�'"
+ >
+ 鍙戣揣
+ </el-button>
</template>
</el-table-column>
</el-table>
@@ -426,15 +425,15 @@
<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="shippingType">
+ <el-form-item label="鍙戣揣绫诲瀷锛�" prop="type">
<el-select
- v-model="deliveryForm.shippingType"
+ v-model="deliveryForm.type"
placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
style="width: 100%"
@change="handleShippingTypeChange"
>
- <el-option label="璐ц溅" value="truck" />
- <el-option label="蹇��" value="express" />
+ <el-option label="璐ц溅" value="璐ц溅" />
+ <el-option label="蹇��" value="蹇��" />
</el-select>
</el-form-item>
</el-col>
@@ -455,7 +454,7 @@
</el-col>
</el-row>
<el-row :gutter="30">
- <el-col :span="24" v-if="deliveryForm.shippingType === 'truck'">
+ <el-col :span="24" v-if="deliveryForm.type === '璐ц溅'">
<el-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber">
<el-input
v-model="deliveryForm.shippingCarNumber"
@@ -474,6 +473,46 @@
</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="鍙戣揣鍥剧墖锛�">
+ <el-upload
+ v-model:file-list="deliveryFileList"
+ :action="upload.url"
+ multiple
+ ref="deliveryFileUpload"
+ auto-upload
+ :headers="upload.headers"
+ :data="{ type: 9 }"
+ :before-upload="handleDeliveryBeforeUpload"
+ :on-error="handleDeliveryUploadError"
+ :on-success="handleDeliveryUploadSuccess"
+ :on-remove="handleDeliveryRemove"
+ list-type="picture-card"
+ :limit="9"
+ accept="image/png,image/jpeg,image/jpg"
+ >
+ <el-icon class="avatar-uploader-icon"><Plus /></el-icon>
+ <template #tip>
+ <div class="el-upload__tip">
+ 鏀寔 jpg銆乯peg銆乸ng 鏍煎紡锛屾渶澶氫笂浼� 9 寮狅紝鍗曞紶澶у皬涓嶈秴杩� 10MB
+ </div>
+ </template>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -492,7 +531,7 @@
import {onMounted, ref, getCurrentInstance} from "vue";
import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
import { ElMessageBox, ElMessage } from "element-plus";
-import { UploadFilled } from "@element-plus/icons-vue";
+import { UploadFilled, Plus } from "@element-plus/icons-vue";
import useUserStore from "@/store/modules/user";
import { userListNoPage } from "@/api/system/user.js";
import FileList from '@/views/salesManagement/salesLedger/fileList.vue';
@@ -532,6 +571,7 @@
});
const total = ref(0);
const fileList = ref([]);
+const deliveryFileList = ref([]);
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref("");
@@ -621,13 +661,15 @@
const currentDeliveryRow = ref(null);
const deliveryFormData = reactive({
deliveryForm: {
- shippingType: "truck", // truck: 璐ц溅, express: 蹇��
+ type: "璐ц溅", // 璐ц溅, 蹇��
shippingDate: "",
shippingCarNumber: "",
expressCompany: "",
+ expressNumber: "", // 蹇�掑崟鍙�
+ shippingImages: "", // 鍙戣揣鍥剧墖锛屽涓敤閫楀彿鍒嗛殧
},
deliveryRules: {
- shippingType: [
+ type: [
{ required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }
],
shippingDate: [
@@ -898,6 +940,47 @@
delLedgerFile(ids).then((res) => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
+ }
+}
+// 鍙戣揣鍥剧墖涓婁紶鍓嶆牎妫�
+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) {
+ // 浠庢枃浠跺垪琛ㄤ腑绉婚櫎
+ const index = deliveryFileList.value.findIndex(item => item.uid === file.uid);
+ if (index > -1) {
+ deliveryFileList.value.splice(index, 1);
}
}
// 鎻愪氦琛ㄥ崟
@@ -1447,13 +1530,13 @@
// 鍙戣揣绫诲瀷鏍￠獙锛氳揣杞︽椂瑕佹眰杞︾墝锛屽揩閫掓椂瑕佹眰蹇�掑叕鍙�
const validateShippingCarNumber = (value, callback) => {
- if (deliveryForm.value.shippingType === "truck") {
+ if (deliveryForm.value.type === "璐ц溅") {
if (!value) return callback(new Error("璇疯緭鍏ュ彂璐ц溅鐗屽彿"));
}
callback();
};
const validateExpressCompany = (value, callback) => {
- if (deliveryForm.value.shippingType === "express") {
+ if (deliveryForm.value.type === "蹇��") {
if (!value) return callback(new Error("璇疯緭鍏ュ揩閫掑叕鍙�"));
}
callback();
@@ -1647,23 +1730,16 @@
// 鎵撳紑鍙戣揣寮规
const openDeliveryForm = (row) => {
- // getProductInventory({ salesLedgerId: row.id, type:1 }).then((res) => {
- // currentDeliveryRow.value = row;
- // deliveryForm.value = {
- // shippingDate: getCurrentDate(),
- // shippingCarNumber: "",
- // };
- // deliveryFormVisible.value = true;
- // }).catch(err => {
- // ElMessage.error(err.msg);
- // });
currentDeliveryRow.value = row;
deliveryForm.value = {
- shippingType: "truck",
+ type: "璐ц溅",
shippingDate: getCurrentDate(),
shippingCarNumber: "",
expressCompany: "",
+ expressNumber: "", // 鍒濆鍖栧揩閫掑崟鍙蜂负绌�
+ shippingImages: "", // 鍒濆鍖栧浘鐗囦负绌�
};
+ deliveryFileList.value = []; // 鍒濆鍖栨枃浠跺垪琛ㄤ负绌�
deliveryFormVisible.value = true;
};
@@ -1671,12 +1747,18 @@
const submitDelivery = () => {
proxy.$refs["deliveryFormRef"].validate((valid) => {
if (valid) {
+ let tempFileIds = [];
+ if (deliveryFileList.value !== null && deliveryFileList.value.length > 0) {
+ tempFileIds = deliveryFileList.value.map((item) => item.tempId);
+ }
addShippingInfo({
salesLedgerId: currentDeliveryRow.value.id,
- shippingType: deliveryForm.value.shippingType,
+ type: deliveryForm.value.type,
shippingDate: deliveryForm.value.shippingDate,
- shippingCarNumber: deliveryForm.value.shippingType === "truck" ? deliveryForm.value.shippingCarNumber : "",
- expressCompany: deliveryForm.value.shippingType === "express" ? deliveryForm.value.expressCompany : "",
+ shippingCarNumber: deliveryForm.value.type === "璐ц溅" ? deliveryForm.value.shippingCarNumber : "",
+ expressCompany: deliveryForm.value.type === "蹇��" ? deliveryForm.value.expressCompany : "",
+ expressNumber: deliveryForm.value.type === "蹇��" ? deliveryForm.value.expressNumber : "",
+ tempFileIds: tempFileIds,
})
.then(() => {
proxy.$modal.msgSuccess("鍙戣揣鎴愬姛");
@@ -1693,14 +1775,18 @@
// 鍏抽棴鍙戣揣寮规
const closeDeliveryDia = () => {
proxy.resetForm("deliveryFormRef");
+ deliveryFileList.value = []; // 娓呯┖鏂囦欢鍒楄〃
+ deliveryForm.value.shippingImages = ""; // 娓呯┖鍥剧墖
+ deliveryForm.value.expressNumber = ""; // 娓呯┖蹇�掑崟鍙�
deliveryFormVisible.value = false;
currentDeliveryRow.value = null;
};
// 鍙戣揣绫诲瀷鍒囨崲鏃舵竻绌哄搴斿瓧娈�
const handleShippingTypeChange = (val) => {
- if (val === "truck") {
+ if (val === "璐ц溅") {
deliveryForm.value.expressCompany = "";
+ deliveryForm.value.expressNumber = "";
} else {
deliveryForm.value.shippingCarNumber = "";
}
--
Gitblit v1.9.3