xlyErp / xlyUmi

Commit 5fd2185e5ef1d0f4a10919129b0ce1eba9ed20b3

Authored by Min
1 parent cdb8dc43

1.销售订单 部件,材料，工序增加商机机会表

Inline Side-by-side
Showing 2 changed files with 22 additions and 12 deletions
src/components/Common/CommonBillEvent.js
  View file @5fd2185
... ... @@ -312,18 +312,23 @@ export default (ChildComponent) => {
312 312 const config = {};
313 313 let addState1 = {};
314 314 if (sModelsType.includes('sales/salesOrder')) {
315   - const controlConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrol'.toUpperCase())[0];
  315 + const controlConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrol'.toUpperCase()
  316 + || item.sTbName.toUpperCase() === 'salsalesorderchancecontrol'.toUpperCase() )[0];
316 317 const controlColumn = commonFunc.getHeaderConfig(controlConfig);
317   - const materialsConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordermaterials'.toUpperCase())[0];
  318 + const materialsConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordermaterials'.toUpperCase() ||
  319 + item.sTbName.toUpperCase() === 'salsalesorderchancematerials'.toUpperCase() )[0];
318 320 const materialsColumn = commonFunc.getHeaderConfig(materialsConfig);
319   - const processConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderprocess'.toUpperCase())[0];
  321 + const processConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderprocess'.toUpperCase() ||
  322 + item.sTbName.toUpperCase() === 'salsalesorderchanceprocess'.toUpperCase())[0];
320 323 const processColumn = commonFunc.getHeaderConfig(processConfig);
321   - const colorConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderparam'.toUpperCase())[0];
  324 + const colorConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderparam'.toUpperCase() ||
  325 + item.sTbName.toUpperCase() === 'salsalesorderchanceparam'.toUpperCase())[0];
322 326 let colorColumn;
323 327 if (commonUtils.isNotEmptyObject(colorConfig)) {
324 328 colorColumn = commonFunc.getHeaderConfig(colorConfig);
325 329 }
326   - const packConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrolcombine'.toUpperCase())[0];
  330 + const packConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrolcombine'.toUpperCase() ||
  331 + item.sTbName.toUpperCase() === 'salsalesorderchancecontrolcombine')[0];
327 332 let packColumn;
328 333 if (commonUtils.isNotEmptyObject(packConfig)) {
329 334 packColumn = commonFunc.getHeaderConfig(packConfig);
... ... @@ -400,18 +405,23 @@ export default (ChildComponent) => {
400 405 } else {
401 406 this.handleGetData(masterConfig, slaveConfig, checkConfig);
402 407 if (sModelsType.includes('sales/salesOrder')) {
403   - const controlConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrol'.toUpperCase())[0];
  408 + const controlConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrol'.toUpperCase()
  409 + || item.sTbName.toUpperCase() === 'salsalesorderchancecontrol'.toUpperCase() )[0];
404 410 const controlColumn = commonFunc.getHeaderConfig(controlConfig);
405   - const materialsConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordermaterials'.toUpperCase())[0];
  411 + const materialsConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordermaterials'.toUpperCase() ||
  412 + item.sTbName.toUpperCase() === 'salsalesorderchancematerials'.toUpperCase() )[0];
406 413 const materialsColumn = commonFunc.getHeaderConfig(materialsConfig);
407   - const processConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderprocess'.toUpperCase())[0];
  414 + const processConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderprocess'.toUpperCase() ||
  415 + item.sTbName.toUpperCase() === 'salsalesorderchanceprocess'.toUpperCase())[0];
408 416 const processColumn = commonFunc.getHeaderConfig(processConfig);
409   - const colorConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderparam'.toUpperCase())[0];
  417 + const colorConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderparam'.toUpperCase() ||
  418 + item.sTbName.toUpperCase() === 'salsalesorderchanceparam'.toUpperCase())[0];
410 419 let colorColumn;
411 420 if (commonUtils.isNotEmptyObject(colorConfig)) {
412 421 colorColumn = commonFunc.getHeaderConfig(colorConfig);
413 422 }
414   - const packConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrolcombine'.toUpperCase())[0];
  423 + const packConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrolcombine'.toUpperCase() ||
  424 + item.sTbName.toUpperCase() === 'salsalesorderchancecontrolcombine')[0];
415 425 let packColumn;
416 426 if (commonUtils.isNotEmptyObject(packConfig)) {
417 427 packColumn = commonFunc.getHeaderConfig(packConfig);
... ...
src/components/Common/commonFunc.js
  View file @5fd2185
... ... @@ -232,7 +232,7 @@ export function getDefaultData(config, allTableData = {}, extraData = {}) {
232 232 } else if (sDefault.split(',').length > 1 && sDefault.split(':').length > 1) {
233 233 sDefault.split(',').forEach(item => {
234 234 const oldFieldName = item.split(':')[1];
235   - const [tableName, oldTableFieldName] = oldFieldName.split('.');
  235 + const [tableName, oldTableFieldName] = oldFieldName.split('.');
236 236 const newFieldName = item.split(':')[0];
237 237 returnData[newFieldName] = allTableData[tableName][oldTableFieldName];
238 238 });
... ... @@ -922,4 +922,4 @@ export function getEvalResult(params) {
922 922 return result;
923 923 }
924 924  
925   -export function getControlConfig() {}
926 925 \ No newline at end of file
  926 +export function getControlConfig() {}
... ...