From ade66cf1e8dab781da4fe45ebbabe89d444de98b Mon Sep 17 00:00:00 2001
From: topfunplusnew <ming10655@outlook.com>
Date: Mon, 12 Jan 2026 16:41:49 +0800
Subject: [PATCH 1/8] =?UTF-8?q?Refactor:=20Rename=20'=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91'=20to=20'=E5=8E=82=E5=AE=B6?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91'=20in=20MoneyChangeTotalAmount=20an?=
 =?UTF-8?q?d=20totalMoneyChange=20components?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/Statement/MoneyChangeTotalAmount.vue       | 2 +-
 .../src/views/system/Statement/totalMoneyChange.vue             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue b/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue
index 9174041a..f752826e 100644
--- a/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue
+++ b/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue
@@ -288,7 +288,7 @@ export default {
 				createRow('②所有银行卡资金合计', startTimeMoney.selfCompanyTotalFunds, endTimeMoney.selfCompanyTotalFunds, data.selfCompanyTotalFunds, `selfCompanyTotalFunds`),
 				createRow('⑤其他应收-个人从公司借款', startTimeMoney.loanFromCompany, endTimeMoney.loanFromCompany, data.loanFromCompany, `loanFromCompany`),
 				createRow('⑥期货保证金', startTimeMoney.futuresMarginBalance, endTimeMoney.futuresMarginBalance, data.futuresMarginBalance, `futuresMarginBalance`),
-				createRow('⑦支付保证金', startTimeMoney.paymentMarginBalance, endTimeMoney.paymentMarginBalance, data.paymentMarginBalance, `paymentMarginBalance`),
+				createRow('⑦厂家保证金', startTimeMoney.paymentMarginBalance, endTimeMoney.paymentMarginBalance, data.paymentMarginBalance, `paymentMarginBalance`),
 				createRow('⓪库存金额', startTimeMoney.remainingInventoryAmount, endTimeMoney.remainingInventoryAmount, data.remainingInventoryAmount, `remainingInventoryAmount`),
 				createRow('③欠厂家货款', startTimeMoney.supplierTotalBalance, endTimeMoney.supplierTotalBalance, data.supplierTotalBalance, `supplierTotalBalance`),
 				createRow('④未支付运费合计', startTimeMoney.driverUnpaidAmount, endTimeMoney.driverUnpaidAmount, data.driverUnpaidAmount, `driverUnpaidAmount`),
diff --git a/packages/order-system/src/views/system/Statement/totalMoneyChange.vue b/packages/order-system/src/views/system/Statement/totalMoneyChange.vue
index 9eb32f84..b34951aa 100644
--- a/packages/order-system/src/views/system/Statement/totalMoneyChange.vue
+++ b/packages/order-system/src/views/system/Statement/totalMoneyChange.vue
@@ -60,7 +60,7 @@ export default {
 				createRow('④未支付运费合计', data.driverUnpaidAmount),
 				createRow('⑤其他应收-个人从公司借款', data.loanFromCompany),
 				createRow('⑥期货保证金', data.futuresMarginBalance),
-				createRow('⑦支付保证金', data.paymentMarginBalance),
+				createRow('⑦厂家保证金', data.paymentMarginBalance),
 				createRow('⑧收取保证金', data.receiveMarginBalance),
 				createRow('⑨公司从外面借款合计', data.loanBalance),
 				createRow('客户票点合计', data.companyTotalInvoiceAmount),

From 1be5e73a64e906485b7088336a75c16e4994cdc1 Mon Sep 17 00:00:00 2001
From: topfunplusnew <ming10655@outlook.com>
Date: Mon, 12 Jan 2026 16:25:51 +0800
Subject: [PATCH 2/8] Refactor: Update loan description in
 MoneyChangeTotalAmount and totalMoneyChange components

---
 .../src/views/system/Statement/MoneyChangeTotalAmount.vue       | 2 +-
 .../src/views/system/Statement/totalMoneyChange.vue             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue b/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue
index f752826e..e2edc962 100644
--- a/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue
+++ b/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue
@@ -286,7 +286,7 @@ export default {
 				createRow('资金总额=①+②-③-④+⑤+⑥+⑦-⑧-⑨+⓪', this.calculateTotalBalance(startTimeMoney), this.calculateTotalBalance(endTimeMoney), this.calculateTotalBalance(data), null),
 				createRow('①客户欠款合计数', startTimeMoney.companyTotalBalance, endTimeMoney.companyTotalBalance, data.companyTotalBalance, `companyTotalBalance`),
 				createRow('②所有银行卡资金合计', startTimeMoney.selfCompanyTotalFunds, endTimeMoney.selfCompanyTotalFunds, data.selfCompanyTotalFunds, `selfCompanyTotalFunds`),
-				createRow('⑤其他应收-个人从公司借款', startTimeMoney.loanFromCompany, endTimeMoney.loanFromCompany, data.loanFromCompany, `loanFromCompany`),
+				createRow('⑤其他应收-个人/公司从公司借款', startTimeMoney.loanFromCompany, endTimeMoney.loanFromCompany, data.loanFromCompany, `loanFromCompany`),
 				createRow('⑥期货保证金', startTimeMoney.futuresMarginBalance, endTimeMoney.futuresMarginBalance, data.futuresMarginBalance, `futuresMarginBalance`),
 				createRow('⑦厂家保证金', startTimeMoney.paymentMarginBalance, endTimeMoney.paymentMarginBalance, data.paymentMarginBalance, `paymentMarginBalance`),
 				createRow('⓪库存金额', startTimeMoney.remainingInventoryAmount, endTimeMoney.remainingInventoryAmount, data.remainingInventoryAmount, `remainingInventoryAmount`),
diff --git a/packages/order-system/src/views/system/Statement/totalMoneyChange.vue b/packages/order-system/src/views/system/Statement/totalMoneyChange.vue
index b34951aa..dea032ff 100644
--- a/packages/order-system/src/views/system/Statement/totalMoneyChange.vue
+++ b/packages/order-system/src/views/system/Statement/totalMoneyChange.vue
@@ -58,7 +58,7 @@ export default {
 				createRow('②所有银行卡资金合计', data.selfCompanyTotalFunds),
 				createRow('③欠厂家货款', data.supplierTotalBalance),
 				createRow('④未支付运费合计', data.driverUnpaidAmount),
-				createRow('⑤其他应收-个人从公司借款', data.loanFromCompany),
+				createRow('⑤其他应收-个人/公司从公司借款', data.loanFromCompany),
 				createRow('⑥期货保证金', data.futuresMarginBalance),
 				createRow('⑦厂家保证金', data.paymentMarginBalance),
 				createRow('⑧收取保证金', data.receiveMarginBalance),

From c707800aa5e9568d76ff23f6032b4c3710f69898 Mon Sep 17 00:00:00 2001
From: topfunplusnew <ming10655@outlook.com>
Date: Tue, 13 Jan 2026 21:56:43 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=B4=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order-system/src/views/system/orderfreight/index.vue    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/order-system/src/views/system/orderfreight/index.vue b/packages/order-system/src/views/system/orderfreight/index.vue
index 090f8a7e..ca79b5d9 100644
--- a/packages/order-system/src/views/system/orderfreight/index.vue
+++ b/packages/order-system/src/views/system/orderfreight/index.vue
@@ -165,8 +165,8 @@
 					</el-tooltip>
 				</template>
 			</el-table-column>
-			<el-table-column v-if="columns[9].visible" label="运费来源" align="center" prop="source" width="100" show-overflow-tooltip>
-				<template #default="scope">
+			<el-table-column v-if="columns[9].visible" label="运费来源" align="center" prop="sourceType" width="100" show-overflow-tooltip>
+				<!-- <template #default="scope">
 					<el-tooltip effect="light" placement="top" enterable :open-delay="1000">
 						<div slot="content">
 							<span v-if="scope.row.source === FREIGHT_TYPE.GOODS_ORDER">订单</span>
@@ -175,7 +175,7 @@
 						<el-tag v-if="scope.row.source === FREIGHT_TYPE.GOODS_ORDER">订单</el-tag>
 						<el-tag v-if="scope.row.source === FREIGHT_TYPE.INVENTORY">库存</el-tag>
 					</el-tooltip>
-				</template>
+				</template> -->
 			</el-table-column>
 			<el-table-column v-if="columns[10].visible" label="支付状态" align="center" prop="paymentState" width="100" show-overflow-tooltip>
 				<template #default="scope">

From db1d4eb219d1c2b446badb9c4cd72f98495c9c49 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Tue, 13 Jan 2026 14:43:30 +0000
Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=E5=80=9F=E5=85=A5=E6=AC=BE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=A4=8D=E6=A0=B8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=8F=8A=E8=AE=A1=E7=AE=97=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 `borrowedMoneyAudit` API 方法。
- 更新 `BorrowedMoney` 页面，增加“已还款金额”、“未还款金额”、“已还款利息”列。
- 使用 `mathjs` 实现新列的计算逻辑。
- 添加带权限检查和切换功能的“复核”按钮。
---
 .../src/api/system/borrowedMoney.js           | 12 +++
 .../src/views/system/borrowedmoney/index.vue  | 89 ++++++++++++++++++-
 2 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/packages/order-system/src/api/system/borrowedMoney.js b/packages/order-system/src/api/system/borrowedMoney.js
index f6118399..da82df84 100644
--- a/packages/order-system/src/api/system/borrowedMoney.js
+++ b/packages/order-system/src/api/system/borrowedMoney.js
@@ -50,3 +50,15 @@ export function getBorrowedMoneyByUuid(uuid) {
 		method: 'GET'
 	});
 }
+
+// 复核从外部借款信息
+export function borrowedMoneyAudit(params) {
+	return request({
+		url: '/system/borrowedmoney/audit',
+		method: 'put',
+		params: {
+			id: params.id,
+			auditStatus: params.auditStatus
+		}
+	});
+}
diff --git a/packages/order-system/src/views/system/borrowedmoney/index.vue b/packages/order-system/src/views/system/borrowedmoney/index.vue
index d935d0bf..ae3d8744 100644
--- a/packages/order-system/src/views/system/borrowedmoney/index.vue
+++ b/packages/order-system/src/views/system/borrowedmoney/index.vue
@@ -53,7 +53,17 @@
 			<el-table-column v-if="columns[6].visible" label="抵押担保" align="center" prop="mortgageGuarantee" show-overflow-tooltip />
 			<el-table-column v-if="columns[7].visible" label="打入账户" align="center" prop="acountsName" show-overflow-tooltip />
 			<el-table-column v-if="columns[8].visible" label="打入账号" align="center" prop="bankNo" show-overflow-tooltip />
+			<el-table-column v-if="columns[9] && columns[9].visible" label="已还款金额" align="center" prop="repaidAmount" show-overflow-tooltip />
+			<el-table-column v-if="columns[10] && columns[10].visible" label="未还款金额" align="center" prop="unrepaidAmount" show-overflow-tooltip />
+			<el-table-column v-if="columns[11] && columns[11].visible" label="已还款利息" align="center" prop="repaidInterest" show-overflow-tooltip />
 			<el-table-column label="备注" align="center" prop="comments" show-overflow-tooltip />
+			<el-table-column label="复核状态" align="center" class-name="small-padding fixed-width" width="80" fixed="right">
+				<template slot-scope="scope">
+					<el-tooltip :content="hasAuditPermission ? '点击切换复核状态' : '您没有复核权限'" placement="top">
+						<el-switch v-model="scope.row.auditState" :disabled="!hasAuditPermission" :active-value="'1'" :inactive-value="'0'" active-color="#13ce66" inactive-color="#ff4949" @change="value => hasAuditPermission && handleBorrowedMoneyAudit(scope.row, value)" />
+					</el-tooltip>
+				</template>
+			</el-table-column>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px" fixed="right">
 				<template slot-scope="scope">
 					<el-button size="mini" type="text" @click="checkDetail(scope.row)">查看历史还款</el-button>
@@ -218,7 +228,7 @@
 </template>
 
 <script>
-import { listBorrowedMoney, getBorrowedMoney, delBorrowedMoney, addBorrowedMoney, updateBorrowedMoney } from '@/api/system/borrowedMoney';
+import { listBorrowedMoney, getBorrowedMoney, delBorrowedMoney, addBorrowedMoney, updateBorrowedMoney, borrowedMoneyAudit } from '@/api/system/borrowedMoney';
 import { mapGetters, mapState } from 'vuex';
 import { addRepayment, getRepaymentMoneyNoPage } from '@/api/system/repayment';
 import SearchOption from '@/components/SearchOption.vue';
@@ -230,6 +240,9 @@ import { excludeParams } from '@/api/tool/exclude';
 import { mixin_printHTML } from '../../dashboard/mixins/print';
 import { mixin_bankType } from '../../dashboard/mixins/common/common_bankType';
 import InfoDialog from '@/components/InfoDialog.vue';
+import * as math from 'mathjs';
+import { checkPermi } from '@/utils/permission';
+import { debounce } from '@/utils/trash/utils';
 
 export default {
 	name: 'BorrowedMoney',
@@ -412,7 +425,10 @@ export default {
 				{ key: 5, label: `贷款年限`, visible: true },
 				{ key: 6, label: `抵押担保`, visible: true },
 				{ key: 7, label: `打入账户`, visible: true },
-				{ key: 8, label: `打入账号`, visible: true }
+				{ key: 8, label: `打入账号`, visible: true },
+				{ key: 9, label: `已还款金额`, visible: true },
+				{ key: 10, label: `未还款金额`, visible: true },
+				{ key: 11, label: `已还款利息`, visible: true }
 				/* {key: 9, label: `已还款标记`, visible: true},*/
 			],
 			// 还款弹窗
@@ -463,6 +479,10 @@ export default {
 		this.$store.dispatch('money/getTempBorrowedMoneyList');
 	},
 	computed: {
+		// 检查是否有复核权限（包含admin权限）
+		hasAuditPermission() {
+			return checkPermi(['system:borrowedmoney:audit']);
+		},
 		TableName() {
 			return TableName;
 		},
@@ -605,11 +625,76 @@ export default {
 				this.borrowedMoneyList = response.rows;
 				this.borrowedMoneyList.forEach(item => {
 					item.isEnd = item.isEnd ? '是' : '否';
+
+					// 规范化 auditState
+					if (item.auditState === null || item.auditState === undefined || item.auditState === '0' || item.auditState === 0 || item.auditState === false) {
+						item.auditState = '0';
+					} else if (item.auditState === '1' || item.auditState === 1 || item.auditState === true) {
+						item.auditState = '1';
+					}
+
+					// 计算已还款金额、未还款金额、已还款利息
+					try {
+						const moneyAmount = math.bignumber(item.moneyAmount || 0);
+						const unrepaidAmount = math.bignumber(item.unrepaidAmount || 0);
+						// 已还款金额 = moneyAmount - unrepaidAmount
+						item.repaidAmount = math.format(math.subtract(moneyAmount, unrepaidAmount), { notation: 'fixed', precision: 2 });
+						// 未还款金额 (格式化)
+						item.unrepaidAmount = math.format(unrepaidAmount, { notation: 'fixed', precision: 2 });
+
+						// 已还款利息 = repayments数组中ratio的求和
+						if (item.repayments && Array.isArray(item.repayments)) {
+							const totalInterest = item.repayments.reduce((sum, repayment) => {
+								return math.add(sum, math.bignumber(repayment.ratio || 0));
+							}, math.bignumber(0));
+							item.repaidInterest = math.format(totalInterest, { notation: 'fixed', precision: 2 });
+						} else {
+							item.repaidInterest = '0.00';
+						}
+					} catch (e) {
+						console.error('Calculation error:', e);
+						item.repaidAmount = '0.00';
+						item.repaidInterest = '0.00';
+					}
 				});
 				this.total = response.total;
 				this.loading = false;
 			});
 		},
+		// 复核操作
+		handleBorrowedMoneyAudit(row, e) {
+			// 检查是否有权限
+			if (!this.hasAuditPermission) {
+				this.$message({
+					type: 'warning',
+					message: '您没有复核权限！'
+				});
+				// 还原开关状态
+				row.auditState = e === '1' ? '0' : '1';
+				return;
+			}
+
+			const debouncedBorrowedMoneyAudit = debounce(function (row, auditStatus) {
+				borrowedMoneyAudit({ id: row.id, auditStatus })
+					.then(() => {
+						const message = auditStatus === '1' ? '复核成功!' : '取消复核!';
+						this.$message({
+							type: 'success',
+							message: message
+						});
+						this.getList();
+					})
+					.catch(() => {
+						// 如果API调用失败，还原开关状态
+						row.auditState = auditStatus === '1' ? '0' : '1';
+					});
+			}, 1000);
+
+			// 更新视图 (v-model already updated it, but just to be safe or if we want to manually control it)
+			// row.auditState = e;
+			// 调用防抖后的函数，传递最新的 row 和 auditStatus
+			debouncedBorrowedMoneyAudit.call(this, row, e);
+		},
 		// 取消按钮
 		cancel() {
 			this.open = false;

From 06ddd5ca4f814435059065c0793f239b060ee154 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Tue, 13 Jan 2026 14:54:56 +0000
Subject: [PATCH 5/8] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4BorrowedMoney?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9C=AC=E5=9C=B0=E5=AD=98=E5=82=A8columns?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 `created` 钩子中读取和设置 `localStorage` 的逻辑。
- 移除 `watch` 中监听 `columns` 变化并写入 `localStorage` 的逻辑。
- 使用云端配置 (RightToolbar) 进行管理。
---
 .../src/views/system/borrowedmoney/index.vue      | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/packages/order-system/src/views/system/borrowedmoney/index.vue b/packages/order-system/src/views/system/borrowedmoney/index.vue
index ae3d8744..9ef656c2 100644
--- a/packages/order-system/src/views/system/borrowedmoney/index.vue
+++ b/packages/order-system/src/views/system/borrowedmoney/index.vue
@@ -470,12 +470,6 @@ export default {
 	},
 	created() {
 		this.getList();
-		if (localStorage.getItem('borrowedmoney-columns') === 'null' || !localStorage.getItem('borrowedmoney-columns')) {
-			// 设置localStorage
-			localStorage.setItem('borrowedmoney-columns', JSON.stringify(this.columns));
-		} else {
-			this.columns = JSON.parse(localStorage.getItem('borrowedmoney-columns'));
-		}
 		this.$store.dispatch('money/getTempBorrowedMoneyList');
 	},
 	computed: {
@@ -489,14 +483,7 @@ export default {
 		...mapGetters(['tempBorrowedMoneyList'])
 	},
 	// 展示与隐藏
-	watch: {
-		columns: {
-			handler: function (newVal) {
-				localStorage.setItem('borrowedmoney-columns', JSON.stringify(newVal));
-			},
-			deep: true
-		}
-	},
+	watch: {},
 	methods: {
 		listCompany,
 		listBankAccount,

From f682530c7216e8a86a87e7792b032deb06e0c291 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Wed, 14 Jan 2026 15:50:36 +0000
Subject: [PATCH 6/8] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E5=8D=95?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=94=B9=E7=94=A8=20el-table=20=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整单模式下使用 el-table + el-table-column 展示数据，订单模式继续沿用原虚拟表格逻辑。

Co-authored-by: ming10655 <ming10655@gmail.com>
---
 .../components/goodsOrder/ElTableOrder.vue    | 181 +++++++++++++++++-
 1 file changed, 180 insertions(+), 1 deletion(-)

diff --git a/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue b/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue
index 47dd656f..b86735b5 100644
--- a/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue
+++ b/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue
@@ -36,6 +36,46 @@ export default {
 	computed: {
 		PUBLIC_DICT_TYPE() {
 			return PUBLIC_DICT_TYPE;
+		},
+		// 调整单：使用 el-table + el-table-column（订单模式不变）
+		adjustTableColumns() {
+			const dataCols = [
+				{ idx: 0, label: 'ID', prop: 'id', fixed: 'left' },
+				{ idx: 1, label: '日期', prop: 'orderDate', fixed: 'left', width: 200 },
+				{ idx: 2, label: '客户', prop: 'customer', fixed: 'left', width: 196 },
+				{ idx: 3, label: '供应商/仓库', prop: 'supplierNames', fixed: 'left', width: 280 },
+				{ idx: 4, label: '陆运车牌', prop: 'landCarNo', fixed: 'left', width: 112 },
+				{ idx: 5, label: '审核', prop: 'checkState', width: 112 },
+				{ idx: 6, label: '车队', prop: 'fleet', width: 112 },
+				{ idx: 7, label: '陆运电话', prop: 'landDriverTel', width: 176 },
+				{ idx: 8, label: '司机', prop: 'landDriverName', width: 84 },
+				{ idx: 9, label: '海运柜号', prop: 'seaCarNo', width: 176 },
+				{ idx: 10, label: '海运电话', prop: 'seaDriverTel', width: 176 },
+				{ idx: 11, label: '海运公司', prop: 'seaDriverName', width: 168 },
+				{ idx: 12, label: '总货款', prop: 'allPayments', width: 144 },
+				{ idx: 13, label: '总吨位', prop: 'allTonnage', width: 80 },
+				{ idx: 14, label: '出厂货款', prop: 'allPaymentFactory', width: 144 },
+				{ idx: 15, label: '陆运费', prop: 'landFreight', width: 112 },
+				{ idx: 16, label: '海运费', prop: 'seaFreight', width: 112 },
+				{ idx: 17, label: '含税利润', prop: 'allProfit', width: 112 },
+				{ idx: 18, label: '不含税利润', prop: 'allProfitNoTax', width: 112 },
+				{ idx: 19, label: '销售经理', prop: 'saleManager', width: 112 },
+				{ idx: 20, label: '录入员', prop: 'userName', width: 84 },
+				{ idx: 21, label: '备注', prop: 'comments', width: 140 },
+				{ idx: 22, label: '出库单', prop: 'path', width: 84 },
+				{ idx: 23, label: '收到条附件', prop: 'receiveProof' },
+				{ idx: 24, label: '可否编辑', prop: 'isedit', width: 112 },
+				{ idx: 25, label: '客户含税', prop: 'customerTaxIncluded', width: 112 },
+				{ idx: 26, label: '出厂含税', prop: 'supplierTaxIncluded', width: 112 },
+				{ idx: 27, label: '审核人', prop: 'checkUserName', width: 112 }
+			];
+
+			return [
+				{ idx: 'index', label: '序号', fixed: 'left', width: 50, align: 'center' },
+				{ idx: 'rowActions', label: '行操作', fixed: 'left', width: 100, align: 'center' },
+				...dataCols.filter(col => this.columns[col.idx] && this.columns[col.idx].visible),
+				{ idx: 'orderActions', label: '订单操作', fixed: 'right', width: 250, align: 'center' }
+			];
 		}
 	},
 	components: {
@@ -1082,7 +1122,7 @@ export default {
 		</div>
 
 		<!--    订单表格  -->
-		<virtual-scroll ref="virtualScroll" :data="goodsOrderList" :item-size="30" key-prop="id" @change="orderDataAppendChange">
+		<virtual-scroll v-if="!isAdjustOrder" ref="virtualScroll" :data="goodsOrderList" :item-size="30" key-prop="id" @change="orderDataAppendChange">
 			<template slot-scope="{ headerCellFixedStyle, cellFixedStyle }">
 				<el-table
 					border
@@ -1505,6 +1545,145 @@ export default {
 				</el-table>
 			</template>
 		</virtual-scroll>
+		<el-table
+			v-else
+			border
+			ref="orderTable"
+			id="printBox"
+			:row-key="row => row.id"
+			v-loading="loading"
+			size="mini"
+			height="650"
+			style="width: 100%"
+			:data="goodsOrderList"
+			tooltip-effect="light"
+			:row-style="rowStyle"
+			show-summary
+			:summary-method="getSummary"
+			@header-dragend="onHeaderDragend"
+		>
+			<el-table-column v-for="col in adjustTableColumns" :key="col.idx" :label="col.label" :prop="col.prop" :width="col.width" :fixed="col.fixed" :align="col.align || 'center'" show-overflow-tooltip>
+				<template slot-scope="scope">
+					<!-- 序号 -->
+					<template v-if="col.idx === 'index'">
+						{{ scope.row && scope.row._rowIndex !== undefined && scope.row._rowIndex !== null ? scope.row._rowIndex : scope.$index + 1 }}
+					</template>
+					<!-- 行操作 -->
+					<template v-else-if="col.idx === 'rowActions'">
+						<el-dropdown size="mini" trigger="hover" @command="command => handleCommand(command, scope.row)">
+							<el-button size="mini" type="text" @click.stop="checkOrderItemInfo(scope.row)">
+								<span v-once>查看</span>
+								<i class="el-icon-arrow-down el-icon--right" />
+							</el-button>
+							<el-dropdown-menu slot="dropdown">
+								<el-dropdown-item v-hasPermi="['system:goodsorder:edit']" command="handleUpdate" :disabled="!scope.row.isedit || scope.row.isAdjust < 0 || isOrderExpired(scope.row.addtime)">
+									<span :title="isOrderExpired(scope.row.addtime) ? '订单已超过7天，无法修改' : ''">修改</span>
+								</el-dropdown-item>
+								<el-dropdown-item v-hasPermi="['system:goodsorder:remove']" command="handleDelete">
+									<span>删除</span>
+								</el-dropdown-item>
+								<el-dropdown-item :disabled="scope.row.historyCount === 0" divided command="checkHistoryList">
+									<span>修改记录</span>
+								</el-dropdown-item>
+							</el-dropdown-menu>
+						</el-dropdown>
+					</template>
+					<!-- 供应商/仓库 -->
+					<template v-else-if="col.idx === 3">
+						<div class="supplier-warehouse-container">
+							<span v-if="(scope.row._uniqueSuppliers || []).length === 0 && (scope.row._uniqueWarehouses || []).length === 0" class="empty-item">-</span>
+							<span v-else>
+								<span v-for="supplier in scope.row._uniqueSuppliers || []" :key="`supplier-${supplier.supplierID}`" class="supplier-name" @click="updateOrderItemVisibleSupplierInvoice(scope.row, supplier.supplierID)">
+									{{ supplier.supplier }}
+								</span>
+								<span v-for="warehouse in scope.row._uniqueWarehouses || []" :key="`warehouse-${warehouse.storeHouseID}`" class="warehouse-name">
+									{{ warehouse.storeHouseName }}
+								</span>
+							</span>
+						</div>
+					</template>
+					<!-- 审核 -->
+					<template v-else-if="col.idx === 5">
+						<el-row v-if="scope.row.checkState === '已审核'">
+							<StateTag :state-title="scope.row.checkState" :state-mapper="{ 2: '已审核' }" @click.native.stop="hasPermission(['finance', 'admin']) && handleReCheck(scope.row)" :style="{ cursor: hasPermission(['finance', 'admin']) ? 'pointer' : 'default' }" />
+						</el-row>
+						<el-row v-else>
+							<el-button v-if="hasPermission(['finance', 'admin'])" type="text" size="mini" @click.stop="handleCheck(scope.row)">
+								<span>审核</span>
+							</el-button>
+							<span v-else style="color: #909399; font-size: 12px">待审核</span>
+						</el-row>
+					</template>
+					<!-- 出库单 -->
+					<template v-else-if="col.idx === 22">
+						<div v-if="Array.isArray(scope.row.attachmentList)">
+							<CheckFiles :attachmentList="scope.row.attachmentList" :flag="'path'" @needToUpdate="value => handleUpdateFilePath(value, scope.row, getGoodsOrder, updateGoodsOrder)" />
+						</div>
+						<el-tag v-else type="danger">加载错误</el-tag>
+					</template>
+					<!-- 收到条附件 -->
+					<template v-else-if="col.idx === 23">
+						<div v-if="Array.isArray(scope.row.attachmentList)">
+							<CheckFiles :attachmentList="scope.row.attachmentList" :flag="'receiveProof'" @needToUpdate="value => handleUpdateFilePath(value, scope.row, getGoodsOrder, updateGoodsOrder)" />
+						</div>
+						<el-tag v-else type="danger">加载错误</el-tag>
+					</template>
+					<!-- 可否编辑 -->
+					<template v-else-if="col.idx === 24">
+						<StateTag :state-title="scope.row.isedit === 0 ? '否' : '是'" :state-mapper="{ 0: '否', 2: '是' }" />
+					</template>
+					<!-- 客户含税 -->
+					<template v-else-if="col.idx === 25">
+						<template v-if="hasInvoice(scope.row, PUBLIC_DICT_TYPE.CUSTOMER)">
+							<el-button type="text" size="mini" @click="showCustomerInvoiceList(scope.row)">{{ scope.row.customerInvoiceStatus }}</el-button>
+						</template>
+						<StateTag v-else :state-title="'否'" :state-mapper="{ 3: '否' }" />
+					</template>
+					<!-- 出厂含税 -->
+					<template v-else-if="col.idx === 26">
+						<template v-if="hasInvoice(scope.row, PUBLIC_DICT_TYPE.SUPPLIER)">
+							<el-button type="text" size="mini" @click="showSupplierInvoiceList(scope.row)">{{ scope.row.supplierInvoiceStatus }}</el-button>
+						</template>
+						<StateTag v-else :state-title="'否'" :state-mapper="{ 3: '否' }" />
+					</template>
+					<!-- 订单操作 -->
+					<template v-else-if="col.idx === 'orderActions'">
+						<div>
+							<el-button size="mini" :disabled="scope.row.isAdjusted !== 1" v-if="!isAdjustOrder" @click="handleCheckAdjust(scope.row)">查看调整单</el-button>
+							<el-button size="mini" :disabled="scope.row.isAdjusted === 1" @click="handleOrderItemInfo(scope.row)">调整单</el-button>
+							<el-button v-if="isAdjustOrder" size="mini" @click="handleCheckPrevious(scope.row)">查看原单据</el-button>
+							<el-button size="mini" @click="handleOrder1(scope.row)">发货单1</el-button>
+							<el-dropdown size="mini" trigger="click">
+								<el-button type="text" size="mini">
+									<span v-once>发货单</span>
+									<i class="el-icon-arrow-down el-icon--right" />
+								</el-button>
+								<el-dropdown-menu slot="dropdown">
+									<el-dropdown-item>
+										<el-button size="mini" @click="handleOrder2(scope.row)">发货单2</el-button>
+									</el-dropdown-item>
+									<el-dropdown-item>
+										<el-button size="mini" @click="handleOrder3(scope.row)">发货单3</el-button>
+									</el-dropdown-item>
+								</el-dropdown-menu>
+							</el-dropdown>
+						</div>
+					</template>
+					<!-- 默认展示 -->
+					<template v-else>
+						<template v-if="[12, 13, 14, 17, 18].includes(col.idx)">
+							{{ scope.row[col.prop] | changeNumber(changeLength) }}
+						</template>
+						<template v-else-if="[9, 10, 11].includes(col.idx)">
+							{{ scope.row[col.prop] || '无' }}
+						</template>
+						<template v-else>
+							{{ scope.row[col.prop] || (scope.row[col.prop] === 0 ? 0 : '') }}
+						</template>
+					</template>
+				</template>
+			</el-table-column>
+		</el-table>
 		<!--    分页组件-->
 		<pagination v-if="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 

From f9914285be52a2b4253115f66a27661d7c2ff505 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Wed, 14 Jan 2026 16:03:39 +0000
Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=8D=95=E8=A1=8C?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E8=83=8C=E6=99=AF=E8=89=B2=E4=B8=8D=E7=94=9F?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

改用 row-class-name + td 背景色样式，避免被 ElementUI 单元格背景/hover 覆盖。

Co-authored-by: ming10655 <ming10655@gmail.com>
---
 .../components/goodsOrder/ElTableOrder.vue    | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue b/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue
index b86735b5..e9d2cbe1 100644
--- a/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue
+++ b/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue
@@ -378,6 +378,17 @@ export default {
 			}
 			return {};
 		},
+		// 调整单行高亮：ElementUI 的背景通常绘制在 td 上，使用 row-class-name + CSS 更稳定
+		getAdjustRowClassName({ row }) {
+			if (!this.isAdjustOrder) return '';
+			const adjust = Number(row && row.isAdjust);
+			if (!adjust) return '';
+			if (adjust < 0) return 'adjust-row-negative';
+			if (adjust === 1) return 'adjust-row-1';
+			if (adjust === 2) return 'adjust-row-2';
+			if (adjust === 3) return 'adjust-row-3';
+			return 'adjust-row-gt3';
+		},
 		// 获取客户开票列表
 		async getCustomerInvoiceList(orderId) {
 			this.customerInvoiceListLoading = true;
@@ -1557,7 +1568,7 @@ export default {
 			style="width: 100%"
 			:data="goodsOrderList"
 			tooltip-effect="light"
-			:row-style="rowStyle"
+			:row-class-name="getAdjustRowClassName"
 			show-summary
 			:summary-method="getSummary"
 			@header-dragend="onHeaderDragend"
@@ -2406,6 +2417,20 @@ export default {
 	opacity: 0;
 }
 
+// 调整单行高亮：需要作用到 td（ElementUI 背景绘制在单元格上）
+::v-deep tr.adjust-row-1 > td {
+	background: #f0f0f0 !important;
+}
+::v-deep tr.adjust-row-2 > td {
+	background: #f0f9eb !important;
+}
+::v-deep tr.adjust-row-3 > td {
+	background: #fdf6ec !important;
+}
+::v-deep tr.adjust-row-gt3 > td {
+	background: #ffcccc !important;
+}
+
 @keyframes fadeInRow {
 	from {
 		opacity: 0;

From cc043d1081ed0cd854a0502d1cbcbfa5f9e3c3e4 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Wed, 14 Jan 2026 16:33:48 +0000
Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=8D=95=E8=A1=8C?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E5=9C=A8=E6=AD=A3=E5=B8=B8=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E4=B8=8D=E6=98=8E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

提高高亮样式选择器优先级并覆盖固定列区域，同时加深背景色，避免只有弹窗遮罩时才看得出。

Co-authored-by: ming10655 <ming10655@gmail.com>
---
 .../components/goodsOrder/ElTableOrder.vue    | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue b/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue
index e9d2cbe1..51996dd7 100644
--- a/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue
+++ b/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue
@@ -2418,17 +2418,26 @@ export default {
 }
 
 // 调整单行高亮：需要作用到 td（ElementUI 背景绘制在单元格上）
-::v-deep tr.adjust-row-1 > td {
-	background: #f0f0f0 !important;
+// 同时覆盖：主表体 / 左固定列 / 右固定列（它们是不同的 wrapper）
+::v-deep .el-table__body-wrapper tr.adjust-row-1 > td,
+::v-deep .el-table__fixed-body-wrapper tr.adjust-row-1 > td,
+::v-deep .el-table__fixed-right .el-table__fixed-body-wrapper tr.adjust-row-1 > td {
+	background-color: #e9e9e9 !important;
 }
-::v-deep tr.adjust-row-2 > td {
-	background: #f0f9eb !important;
+::v-deep .el-table__body-wrapper tr.adjust-row-2 > td,
+::v-deep .el-table__fixed-body-wrapper tr.adjust-row-2 > td,
+::v-deep .el-table__fixed-right .el-table__fixed-body-wrapper tr.adjust-row-2 > td {
+	background-color: #e1f3d8 !important;
 }
-::v-deep tr.adjust-row-3 > td {
-	background: #fdf6ec !important;
+::v-deep .el-table__body-wrapper tr.adjust-row-3 > td,
+::v-deep .el-table__fixed-body-wrapper tr.adjust-row-3 > td,
+::v-deep .el-table__fixed-right .el-table__fixed-body-wrapper tr.adjust-row-3 > td {
+	background-color: #faecd8 !important;
 }
-::v-deep tr.adjust-row-gt3 > td {
-	background: #ffcccc !important;
+::v-deep .el-table__body-wrapper tr.adjust-row-gt3 > td,
+::v-deep .el-table__fixed-body-wrapper tr.adjust-row-gt3 > td,
+::v-deep .el-table__fixed-right .el-table__fixed-body-wrapper tr.adjust-row-gt3 > td {
+	background-color: #fbc4c4 !important;
 }
 
 @keyframes fadeInRow {