From 945e2e65de5edde82f831d77d5ce2ab76e73cb9a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 23 五月 2026 12:33:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/procurementManagement/procurementLedger/index.vue | 12
src/views/collaborativeApproval/purchaseApproval/index.vue | 12
multiple/config.json | 119 +-------
multiple/assets/logo/SDTXLogo.png | 0
src/views/equipmentManagement/measurementEquipment/filesDia.vue | 72 ++---
src/views/salesManagement/salesLedger/index.vue | 548 +++++++++++++++++++++--------------------
multiple/assets/favicon/SDTXfavicon.ico | 0
7 files changed, 330 insertions(+), 433 deletions(-)
diff --git a/multiple/assets/favicon/SDTXfavicon.ico b/multiple/assets/favicon/SDTXfavicon.ico
new file mode 100644
index 0000000..6e84a60
--- /dev/null
+++ b/multiple/assets/favicon/SDTXfavicon.ico
Binary files differ
diff --git a/multiple/assets/logo/SDTXLogo.png b/multiple/assets/logo/SDTXLogo.png
new file mode 100644
index 0000000..f69cf0b
--- /dev/null
+++ b/multiple/assets/logo/SDTXLogo.png
Binary files differ
diff --git a/multiple/config.json b/multiple/config.json
index 8ec096b..64f0b2d 100644
--- a/multiple/config.json
+++ b/multiple/config.json
@@ -15,33 +15,6 @@
"logo": "logo/Logo.png",
"favicon": "favicon/favicon.ico"
},
- "SDJC": {
- "env": {
- "VITE_APP_TITLE": "榛庡煄鍘胯儨寰峰缓鏉愭湁闄愬叕鍙�",
- "VITE_BASE_API": "http://36.138.236.153:9000",
- "VITE_JAVA_API": "http://36.138.236.153:9001"
- },
- "logo": "logo/SDJCLogo.png",
- "favicon": "favicon/SDJCfavicon.ico"
- },
- "KS": {
- "env": {
- "VITE_APP_TITLE": "榛庡煄搴锋．鍟嗙牸鏈夐檺鍏徃",
- "VITE_BASE_API": "http://36.138.236.176:9000",
- "VITE_JAVA_API": "http://36.138.236.176:9001"
- },
- "logo": "logo/KSLogo.png",
- "favicon": "favicon/KSfavicon.ico"
- },
- "DZZB": {
- "env": {
- "VITE_APP_TITLE": "灞辫タ涓规湵瑁呭鍒堕�犺偂浠芥湁闄愬叕鍙�",
- "VITE_BASE_API": "http://36.138.236.176:9000",
- "VITE_JAVA_API": "http://36.138.236.176:9001"
- },
- "logo": "logo/DZZBLogo.png",
- "favicon": "favicon/DZZBfavicon.ico"
- },
"BTYX": {
"env": {
"VITE_APP_TITLE": "娌冲崡甯お浼橀�夐鍝佹湁闄愬叕鍙�",
@@ -60,41 +33,32 @@
"logo": "logo/ZXZNLogo.png",
"favicon": "favicon/ZXZNfavicon.ico"
},
- "HYZC": {
+ "SDTX": {
"env": {
- "VITE_APP_TITLE": "灞辫タ鍗庝嚎浼楁垚寤烘潗鏈夐檺鍏徃",
- "VITE_BASE_API": "http://36.137.13.103:9001",
- "VITE_JAVA_API": "http://36.137.13.103:9000"
+ "VITE_APP_TITLE": "娌冲崡鍠勯紟閫氫俊绉戞妧鏈夐檺鍏徃",
+ "VITE_BASE_API": "http://36.213.156.184:9001",
+ "VITE_JAVA_API": "http://36.213.156.184:9000"
},
- "logo": "logo/HYZCLogo.png",
- "favicon": "favicon/HYZCfavicon.ico"
+ "logo": "logo/SDTXLogo.png",
+ "favicon": "favicon/SDTXfavicon.ico"
},
- "WTXC": {
+ "QXY": {
"env": {
- "VITE_APP_TITLE": "瀹佸涓囬�氭柊鏉�",
- "VITE_BASE_API": "http://42.63.71.140:9001",
- "VITE_JAVA_API": "http://42.63.71.140:9000"
+ "VITE_APP_TITLE": "寮轰俊瀹囩數鍣ㄧ鐞嗙郴缁�",
+ "VITE_BASE_API": "http://36.134.154.10:9001",
+ "VITE_JAVA_API": "http://36.134.154.10:9000"
},
- "logo": "logo/WTXCLogo.png",
- "favicon": "favicon/WTXCfavicon.ico"
+ "logo": "logo/QXYLogo.png",
+ "favicon": "favicon/QXYfavicon.ico"
},
- "KYHG": {
+ "XCDQ": {
"env": {
- "VITE_APP_TITLE": "灞辫タ鍧ゆ簮鍖栧伐鏈夐檺鍏徃",
- "VITE_BASE_API": "http://36.137.13.29:9001",
- "VITE_JAVA_API": "http://36.137.13.29:9000"
+ "VITE_APP_TITLE": "鏃櫒鐢靛櫒绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://36.133.45.183:9001",
+ "VITE_JAVA_API": "http://36.133.45.183:9002"
},
- "logo": "logo/KYHGLogo.png",
- "favicon": "favicon/KYHGfavicon.ico"
- },
- "DYKJ": {
- "env": {
- "VITE_APP_TITLE": "灞辫タ寰风泭绉戞妧鏈夐檺鍏徃",
- "VITE_BASE_API": "http://36.137.12.37:9001",
- "VITE_JAVA_API": "http://36.137.12.37:9000"
- },
- "logo": "logo/DYKJLogo.png",
- "favicon": "favicon/DYKJfavicon.ico"
+ "logo": "logo/XCDQLogo.png",
+ "favicon": "favicon/XCDQfavicon.ico"
},
"ZQSY": {
"env": {
@@ -168,51 +132,6 @@
"logo": "logo/XCDQLogo.png",
"favicon": "favicon/XCDQfavicon.ico"
},
- "YSJX": {
- "env": {
- "VITE_APP_TITLE": "瀹佸鐜夊北鏈烘璁惧鍒堕�犳湁闄愬叕鍙�",
- "VITE_BASE_API": "http://36.133.45.183:9001",
- "VITE_JAVA_API": "http://36.133.45.183:9002"
- },
- "logo": "logo/YSJXLogo.png",
- "favicon": "favicon/YSJXico.ico"
- },
- "XLZB": {
- "env": {
- "VITE_APP_TITLE": "瀹佸鍗忓姏瑁呭鏈夐檺鍏徃",
- "VITE_BASE_API": "http://36.133.45.183:9001",
- "VITE_JAVA_API": "http://36.133.45.183:9002"
- },
- "logo": "logo/XLZBLogo.png",
- "favicon": "favicon/XLZBico.ico"
- },
- "JXSM": {
- "env": {
- "VITE_APP_TITLE": "瑗勫灒鍘挎磥閼晢璐告湁闄愬叕鍙�",
- "VITE_BASE_API": "http://36.133.45.183:9001",
- "VITE_JAVA_API": "http://36.133.45.183:9002"
- },
- "logo": "logo/JXSMLogo.png",
- "favicon": "favicon/JXSMico.ico"
- },
- "JHHG": {
- "env": {
- "VITE_APP_TITLE": "瀹佸涔濇硴鍖栧伐绉戞妧鏈夐檺鍏徃",
- "VITE_BASE_API": "http://42.63.70.90:9001",
- "VITE_JAVA_API": "http://42.63.70.90:9002"
- },
- "logo": "logo/JHHGLogo.png",
- "favicon": "favicon/JHHGfavicon.ico"
- },
- "LFJZ": {
- "env": {
- "VITE_APP_TITLE": "鍔涘彂寤虹瓚瑁呴グ鏈夐檺鍏徃",
- "VITE_BASE_API": "http://36.212.201.241:9001",
- "VITE_JAVA_API": "http://36.212.201.241:9000"
- },
- "logo": "logo/LFJZLogo.png",
- "favicon": "favicon/LFJZfavicon.ico"
- },
"logo": "/src/assets/logo/logo.png",
"favicon": "/public/favicon.ico"
-}
+}
\ No newline at end of file
diff --git a/src/views/collaborativeApproval/purchaseApproval/index.vue b/src/views/collaborativeApproval/purchaseApproval/index.vue
index fe90686..b276bec 100644
--- a/src/views/collaborativeApproval/purchaseApproval/index.vue
+++ b/src/views/collaborativeApproval/purchaseApproval/index.vue
@@ -654,14 +654,10 @@
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) {
diff --git a/src/views/equipmentManagement/measurementEquipment/filesDia.vue b/src/views/equipmentManagement/measurementEquipment/filesDia.vue
index 9d78891..045ebc0 100644
--- a/src/views/equipmentManagement/measurementEquipment/filesDia.vue
+++ b/src/views/equipmentManagement/measurementEquipment/filesDia.vue
@@ -1,38 +1,16 @@
<template>
<div>
- <el-dialog
- v-model="dialogFormVisible"
- title="涓婁紶闄勪欢"
- width="50%"
- @close="closeDia"
- >
+ <el-dialog v-model="dialogFormVisible" title="涓婁紶闄勪欢" width="50%" @close="closeDia">
<div style="margin-bottom: 10px;text-align: right">
- <el-upload
- v-model:file-list="fileList"
- class="upload-demo"
- :action="uploadUrl"
- :on-success="handleUploadSuccess"
- :on-error="handleUploadError"
- name="files"
- :show-file-list="false"
- :headers="headers"
- style="display: inline;margin-right: 10px"
- >
+ <el-upload v-model:file-list="fileList" class="upload-demo" :action="uploadUrl"
+ :on-success="handleUploadSuccess" :on-error="handleUploadError" name="files" :show-file-list="false"
+ :headers="headers" style="display: inline;margin-right: 10px">
<el-button type="primary">涓婁紶闄勪欢</el-button>
</el-upload>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
- <PIMTable
- rowKey="id"
- :column="tableColumn"
- :tableData="tableData"
- :page="page"
- :tableLoading="tableLoading"
- :isSelection="true"
- @selection-change="handleSelectionChange"
- @pagination="paginationSearch"
- height="500"
- >
+ <PIMTable rowKey="id" :column="tableColumn" :tableData="tableData" :page="page" :tableLoading="tableLoading"
+ :isSelection="true" @selection-change="handleSelectionChange" @pagination="paginationSearch" height="500">
</PIMTable>
<template #footer>
<div class="dialog-footer">
@@ -45,9 +23,9 @@
</template>
<script setup>
-import {ref, reactive, getCurrentInstance} from "vue";
-import {ElMessageBox} from "element-plus";
-import {getToken} from "@/utils/auth.js";
+import { ref, reactive, getCurrentInstance } from "vue";
+import { ElMessageBox } from "element-plus";
+import { getToken } from "@/utils/auth.js";
import filePreview from '@/components/filePreview/index.vue'
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import {
@@ -90,9 +68,9 @@
},
]);
const page = reactive({
- current: 1,
- size: 100,
- total: 0,
+ current: 1,
+ size: 100,
+ total: 0,
});
const tableData = ref([]);
const fileList = ref([]);
@@ -104,22 +82,22 @@
const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 涓婁紶鐨勬湇鍔″櫒鍦板潃
// 鎵撳紑寮规
-const openDialog = (row,type) => {
+const openDialog = (row, type) => {
accountType.value = type;
dialogFormVisible.value = true;
currentId.value = row.id;
getList()
}
const paginationSearch = (obj) => {
- page.current = obj.page;
- page.size = obj.limit;
- // 鍓嶇鍒嗛〉鏆備笉澶勭悊锛岀洿鎺ヨ皟鐢ㄨ幏鍙栧叏閲忓垪琛�
- getList();
+ page.current = obj.page;
+ page.size = obj.limit;
+ // 鍓嶇鍒嗛〉鏆備笉澶勭悊锛岀洿鎺ヨ皟鐢ㄨ幏鍙栧叏閲忓垪琛�
+ getList();
};
const getList = () => {
- getStorageAttachmentList({recordId: currentId.value, recordType: accountType.value}).then(res => {
+ getStorageAttachmentList({ recordId: currentId.value, recordType: accountType.value }).then(res => {
tableData.value = res.data;
- page.total = res.data ? res.data.length : 0;
+ page.total = res.data ? res.data.length : 0;
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -136,7 +114,11 @@
function handleUploadSuccess(res, file) {
// 濡傛灉涓婁紶鎴愬姛
if (res.code == 200 && res.data && res.data.length > 0) {
- const mergedFiles = [...tableData.value, ...res.data];
+ const newFiles = res.data.map(item => ({
+ ...item,
+ name: item.originalFilename || item.name
+ }));
+ const mergedFiles = [...(tableData.value || []), ...newFiles];
const storageAttachmentDTO = {
recordType: accountType.value,
recordId: currentId.value,
@@ -157,7 +139,7 @@
}
// 涓嬭浇闄勪欢
const downLoadFile = (row) => {
- proxy.$download.byUrl(row.url, row.originalFilename);
+ proxy.$download.byUrl(row.url, row.originalFilename);
}
// 鍒犻櫎
const handleDelete = () => {
@@ -191,6 +173,4 @@
});
</script>
-<style scoped>
-
-</style>
\ No newline at end of file
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 87fbbb0..dad6a26 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -1640,14 +1640,10 @@
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) {
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 284c13b..a757edc 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -285,13 +285,13 @@
<el-form-item label="閿�鍞悎鍚屽彿锛�"
prop="salesContractNo">
<div style="display: flex; align-items: center; gap: 12px;width: 100%;">
- <el-checkbox v-model="form.autoGenerateContractNo" v-if="operationType === 'add'">鑷姩鐢熸垚
+ <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" />
-
</div>
</el-form-item>
</el-col>
@@ -920,7 +920,8 @@
</el-col>
</el-row>
<el-row :gutter="30">
- <el-col :span="24" v-if="deliveryForm.type === '璐ц溅'">
+ <el-col :span="24"
+ v-if="deliveryForm.type === '璐ц溅'">
<el-form-item label="鍙戣揣杞︾墝鍙凤細"
prop="shippingCarNumber">
<el-input v-model="deliveryForm.shippingCarNumber"
@@ -928,7 +929,8 @@
clearable />
</el-form-item>
</el-col>
- <el-col :span="24" v-else>
+ <el-col :span="24"
+ v-else>
<el-form-item label="蹇�掑叕鍙革細"
prop="expressCompany">
<el-input v-model="deliveryForm.expressCompany"
@@ -937,7 +939,8 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30" v-if="deliveryForm.type === '蹇��'">
+ <el-row :gutter="30"
+ v-if="deliveryForm.type === '蹇��'">
<el-col :span="24">
<el-form-item label="蹇�掑崟鍙凤細"
prop="expressNumber">
@@ -950,7 +953,8 @@
<el-row :gutter="30">
<el-col :span="24">
<el-form-item label="鍙戣揣鍥剧墖锛�">
- <ImageUpload v-model:file-list="deliveryFileList" :limit="9" />
+ <ImageUpload v-model:file-list="deliveryFileList"
+ :limit="9" />
</el-form-item>
</el-col>
</el-row>
@@ -1271,7 +1275,9 @@
shippingCarNumber: [
{ validator: validateDeliveryShippingCarNumber, trigger: "blur" },
],
- expressCompany: [{ validator: validateDeliveryExpressCompany, trigger: "blur" }],
+ expressCompany: [
+ { validator: validateDeliveryExpressCompany, trigger: "blur" },
+ ],
type: [{ required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }],
},
});
@@ -1725,7 +1731,7 @@
invoiceType: "澧炴櫘绁�",
isProduction: true,
productId: p.productId,
- productModelId: p.productModelId
+ productModelId: p.productModelId,
};
});
@@ -1750,7 +1756,7 @@
form.value.storageBlobDTOs = fileList;
form.value.type = 1;
if (form.value.autoGenerateContractNo) {
- form.value.salesContractNo = '';
+ form.value.salesContractNo = "";
}
addOrUpdateSalesLedger(form.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
@@ -1860,14 +1866,10 @@
}
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) {
@@ -2069,286 +2071,286 @@
// 鏋勫缓鎵撳嵃鍐呭
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 {
+ <!DOCTYPE html>
+ <html>
+ <head>
+ <meta charset="UTF-8">
+ <title>鎵撳嵃棰勮</title>
+ <style>
body {
margin: 0;
padding: 0;
+ font-family: "SimSun", serif;
+ background: white;
}
- .print-page {
- margin: 0;
- padding: 10mm;
- /* padding-left: 20mm; */
- page-break-inside: avoid;
- page-break-after: always;
- }
+ .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;
}
- }
- </style>
- </head>
- <body>
- `;
+ .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 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>
- <span class="label">瀹㈡埛鍚嶇О锛�</span>
+ <div class="info-row">
+ <span class="label">鍗曞彿锛�</span>
<span class="value">${
- item.customerName
+ item.salesContractNo ||
+ ""
}</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(
+ <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 ||
""
- )
- : '<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>
+ }</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-row">
- <div class="footer-item">
- <span class="label">鎿嶄綔鍛橈細</span>
- <span class="value">${
- userStore.nickName ||
- "鎾曞紑鍓�"
- }</span>
+
+ <div class="footer-section">
+ <div class="footer-row">
+ <div class="footer-item">
+ <span class="label">鏀惰揣鐢佃瘽锛�</span>
+ <span class="value"></span>
+ </div>
+ <div class="footer-item">
+ <span class="label">鏀惰揣浜猴細</span>
+ <span class="value"></span>
+ </div>
+ <div class="footer-item address-item">
+ <span class="label">鏀惰揣鍦板潃锛�</span>
+ <span class="value address-value"></span>
+ </div>
</div>
- <div class="footer-item">
- <span class="label">鎵撳嵃鏃ユ湡锛�</span>
- <span class="value">${formatDateTime(
- new Date()
- )}</span>
+ <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>
- `;
+ `;
});
printContent += `
- </body>
- </html>
- `;
+ </body>
+ </html>
+ `;
// 鍐欏叆鍐呭鍒版柊绐楀彛
printWindow.document.write(printContent);
@@ -2676,7 +2678,11 @@
// 鍙戣揣鐘舵�佸繀椤绘槸"寰呭彂璐�"鎴�"瀹℃牳鎷掔粷"
const statusStr = shippingStatus ? String(shippingStatus).trim() : "";
- return statusStr === "寰呭彂璐�" || statusStr === "瀹℃牳鎷掔粷" || statusStr === "閮ㄥ垎鍙戣揣";
+ return (
+ statusStr === "寰呭彂璐�" ||
+ statusStr === "瀹℃牳鎷掔粷" ||
+ statusStr === "閮ㄥ垎鍙戣揣"
+ );
};
// 鎵撳紑闄勪欢寮圭獥
--
Gitblit v1.9.3