diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js index a2e7342..a40eed1 100644 --- a/src/components/Common/CommonBillEvent.js +++ b/src/components/Common/CommonBillEvent.js @@ -2605,8 +2605,10 @@ export default (ChildComponent) => { } const sOldData = commonUtils.getOldDataFromProps(this.props); console.log('组装后的原始数据', sOldData); + const sOperationType = masterData?.handleType === 'add' ? '1' : '2' ; - this.handleSaveData({ data, sClientType: '1', sSysLogSrcId: masterData.sId, sOldData }); + this.handleSaveData({ data, sClientType: '1', sSysLogSrcId: masterData.sId, + sOldData, sOperationType, sBillNo: masterData.sBillNo }); } }); }; @@ -3125,7 +3127,8 @@ export default (ChildComponent) => { sMasterTable: masterConfig.sTbName, sId: [masterData.sId], }, - sOldData + sOldData, + sSysLogSrcId: masterData.sId, }; const sSlaveTable = []; if (commonUtils.isNotEmptyObject(slaveConfig)) { diff --git a/src/components/Common/commonBusiness.js b/src/components/Common/commonBusiness.js index bfe6a84..48e115c 100644 --- a/src/components/Common/commonBusiness.js +++ b/src/components/Common/commonBusiness.js @@ -285,7 +285,7 @@ export async function saveData(param) { * delTmpData 表单删除数据 * bAll 不过滤增加数据还是修改数据 */ export function mergeData(name, sTbName, saveTmpData, delTmpData, bAll) { - if (name === 'master' && commonUtils.isNotEmptyArr(saveTmpData)) { + if (name === 'master' && commonUtils.isNotEmptyArr(saveTmpData) && sTbName?.toLowerCase()?.includes('quoquo')) { saveTmpData[0].handleType = saveTmpData[0].handleType ? saveTmpData[0].handleType : 'update'; } const delData = commonUtils.isEmptyArr(delTmpData) ? [] : delTmpData; diff --git a/src/utils/config.js b/src/utils/config.js index 252e3ec..cfdf579 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -9,11 +9,11 @@ const API = process.env.API; const bHttps = false; export const webSite = { faceAddress: isDev ? '//118.178.19.35:8088/xlyFace' : '//' + location.host + '/xlyFace', - ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/', + ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//192.168.2.19:8080/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 ? '//8.130.144.93:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/', interfaceAddress: localStorage.apiAddress ? localStorage.apiAddress : isDev ? '//118.178.19.35:8088/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址 - fileAddress: isDev ? '//118.178.19.35:8088/xlyReport/' : '//' + location.host + '/xlyReport/', // 接口地址 + fileAddress: isDev ? '//118.178.19.35:8088/xlyReport/' : '//' + location.host + '/xlyReport/', // 接口地址1 fileAddressEbc: isDev ? '//118.178.19.35:8088/xlyReport/' : '//' + location.host + '/xlyReport/', };