From 1316ca0c23f826f602aa7ab5c03286a9eb590215 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Thu, 15 Jan 2026 12:06:06 +0800
Subject: [PATCH] 1.补充文件

---
 src/components/Common/CommonSubBillEvent.js |  1 +
 src/utils/config.js                         |  2 +-
 src/utils/utils.js                          | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/components/Common/CommonSubBillEvent.js b/src/components/Common/CommonSubBillEvent.js
index 5cdee9e..023c037 100644
--- a/src/components/Common/CommonSubBillEvent.js
+++ b/src/components/Common/CommonSubBillEvent.js
@@ -1662,6 +1662,7 @@ export default (ChildComponent) => {
           }
         }
       }
+      console.log('slaveChildData', slaveChildData);
       /* 剔除订单到收款单,费用分摊单据新增空行 */
       if (slaveData.length === 0 && commonUtils.isNotEmptyObject(configNew.slaveConfig) && this.props.sModelsType !== 'cashier/receipt' && this.props.sModelsType !== 'cashier/payment' && this.props.sModelsType !== 'cost/cosexpenseshare'
         && sModelsType !== 'sales/salesInvoice' && sModelsType !== 'purchase/purchaseInvoice' && sModelsType !== 'purchase/outsideInvoice') {
diff --git a/src/utils/config.js b/src/utils/config.js
index b76f7c6..05f028d 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -9,7 +9,7 @@ const API = process.env.API;
 const bHttps = false;
 export const webSite = {
   faceAddress: isDev ? '//km5cjx.gnway.cc:36867/xlyFace' : '//' + location.host + '/xlyFace',
-  ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:37845/xlyEntry/' : '//' + location.host + '/xlyEntry/',
+  ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/',
 
   // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//118.178.19.35:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/',
   // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/',
diff --git a/src/utils/utils.js b/src/utils/utils.js
index c0a3e30..ed70b20 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -648,6 +648,39 @@ export function genSlaveNewId(arr, tableName, idName, oldName, baseObj) {
 }
 
 
+/**
+ * 从props中提取带DataOld后缀的字段，组装成以表名为key的原始数据对象
+ * @param {Object} props - 组件的props对象
+ * @returns {Object} - 组装后的sOldData，格式：{ 表名: 对应的数据数组 }
+ */
+export function getOldDataFromProps(props) {
+  // 初始化返回的空对象
+  const sOldData = {};
+
+  // 2. 遍历props的所有key
+  for (const key of Object.keys(props)) {
+    if (key.includes('DataOld')) {
+      // 提取去掉DataOld后的表名前缀
+      const tablename = key.replace('DataOld', '').trim();
+
+      // 获取对应的配置对象（tablename + Config）
+      const tableConfig = props[tablename + 'Config'];
+      // 获取对应的原始数据（tablename + DataOld），默认空数组
+      const tableData = props[tablename + 'DataOld'] || [];
+
+      // 3. 校验配置对象是否有效，避免无配置时赋值
+      if (isNotEmptyObject(tableConfig) && tableConfig.sTbName) {
+        // 以配置中的真实表名为key，存入数据
+        const sTbName = tableConfig.sTbName;
+        sOldData[sTbName] = tableData;
+      }
+    }
+  }
+
+  return sOldData;
+}
+
+
 export const myContext = createContext(null);
 
 export function reducer(state, action) {
--
libgit2 0.22.2