xlyErp / xlyUmi

Commit 2d13f8eb84664c70a78f409af891675432452e7c

Authored by 陈鑫涛
2 parents 4412932f 85efeead

Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

Inline Side-by-side
Showing 2 changed files with 12 additions and 2 deletions
src/components/Common/commonFunc.js
  View file @2d13f8e
... ... @@ -229,6 +229,13 @@ export function getDefaultData(config, allTableData = {}, extraData = {}) {
229 229 }
230 230 });
231 231 returnData[sName] = oldTableFieldName.substring(0, 1) === '&' ? sFormula.split('+').join('') : commonUtils.convertFixNum(eval(sFormula), 6);
  232 + } else if (sDefault.split(',').length > 1 && sDefault.split(':').length > 1) {
  233 + sDefault.split(',').forEach(item => {
  234 + const oldFieldName = item.split(':')[1];
  235 + const [tableName, oldTableFieldName] = oldFieldName.split('.');
  236 + const newFieldName = item.split(':')[0];
  237 + returnData[newFieldName] = allTableData[tableName][oldTableFieldName];
  238 + });
232 239 } else {
233 240 returnData[sName] = allTableData[tableName][oldTableFieldName];
234 241 }
... ...
src/components/QuickQuote/index.jsx
  View file @2d13f8e
... ... @@ -282,6 +282,7 @@ const QuickQuoteEvent = props => {
282 282 handleType: "add",
283 283 sBoxModel: boxModel,
284 284 sTreeNodeName,
  285 + ...commonFunc.getDefaultData(slaveConfig, { tree: selectedNode }),
285 286 });
286 287 } else {
287 288 slaveData[iIndex] = {
... ... @@ -290,7 +291,7 @@ const QuickQuoteEvent = props => {
290 291 sId: slaveData[iIndex].sId,
291 292 sBoxModel: boxModel,
292 293 sTreeNodeName,
293   - ...commonFunc.getDefaultData(slaveConfig),
  294 + ...commonFunc.getDefaultData(slaveConfig, { tree: selectedNode }),
294 295 }
295 296 : slaveData[iIndex]),
296 297 ...changeValue,
... ... @@ -1092,7 +1093,7 @@ const TreeComponent = props => {
1092 1093 props.setState(pre => {
1093 1094 const { slaveData = [], slaveConfig } = pre;
1094 1095 const addState = {};
1095   - const defaultData = commonFunc.getDefaultData(slaveConfig);
  1096 + const defaultData = commonFunc.getDefaultData(slaveConfig, { tree: selectedNode });
1096 1097 const slaveDataNew = slaveData.filter(item => item.sTreeNodeName === selectedNode.showName);
1097 1098 if (!slaveDataNew.length) {
1098 1099 const sAllPartsName = selectedNode.sAllPartsName || selectedNode.showName;
... ... @@ -2166,9 +2167,11 @@ const PrintParamsComponent = props => {
2166 2167 type="primary"
2167 2168 icon={<PlusOutlined />}
2168 2169 onClick={() => {
  2170 + const defaultData = commonFunc.getDefaultData({ ...slaveConfig, gdsconfigformslave: printParamsConfig }, { tree: selectedNode });
2169 2171 sBackProcessData.push({
2170 2172 sId: commonUtils.createSid(),
2171 2173 bPrintParams: true,
  2174 + ...defaultData,
2172 2175 });
2173 2176 slaveData[slaveRowDataIndex] = { ...slaveRowData, sBackProcessData };
2174 2177 setState(pre => {
... ...