Commit fd9771cf69d8aab494059ab97571157ceb62f063

Authored by chenxt
1 parent 89b90f87

刷脸上班传参修改选中行

src/mobile/common/CommobileListEvent.js
@@ -396,7 +396,6 @@ export default (ChildComponent) => { @@ -396,7 +396,6 @@ export default (ChildComponent) => {
396 } else if (name === 'BtnAdd') { 396 } else if (name === 'BtnAdd') {
397 this.handleAdd(); 397 this.handleAdd();
398 } else if (name.includes('BtnScanFace')) { 398 } else if (name.includes('BtnScanFace')) {
399 - console.log("🚀 ~ name:", name)  
400 this.startCamera() 399 this.startCamera()
401 } 400 }
402 }; 401 };
@@ -501,7 +500,6 @@ export default (ChildComponent) => { @@ -501,7 +500,6 @@ export default (ChildComponent) => {
501 faceData: result, 500 faceData: result,
502 ...dataReturn, 501 ...dataReturn,
503 onSuccess: (_, dataset) => { 502 onSuccess: (_, dataset) => {
504 - console.log("🚀 ~ dataset:", dataset)  
505 const { proData = [] } = dataset.rows[0].dataSet; 503 const { proData = [] } = dataset.rows[0].dataSet;
506 const { [`${addData}Data`]: tableData = [], [`${addData}Config`]: config = {} } = this.props; 504 const { [`${addData}Data`]: tableData = [], [`${addData}Config`]: config = {} } = this.props;
507 const copyConfig = config?.gdsconfigformslave?.find(item => item.sControlName.toLowerCase().includes('btnscanface')) 505 const copyConfig = config?.gdsconfigformslave?.find(item => item.sControlName.toLowerCase().includes('btnscanface'))
@@ -580,7 +578,7 @@ export default (ChildComponent) => { @@ -580,7 +578,7 @@ export default (ChildComponent) => {
580 sUserId, 578 sUserId,
581 sParentId, 579 sParentId,
582 sEmployeeNo, 580 sEmployeeNo,
583 - 581 +
584 } = params; 582 } = params;
585 583
586 const currentState = this.props || this.state; 584 const currentState = this.props || this.state;
@@ -735,20 +733,21 @@ export default (ChildComponent) => { @@ -735,20 +733,21 @@ export default (ChildComponent) => {
735 item.iFlag = iFlag; 733 item.iFlag = iFlag;
736 }); 734 });
737 } 735 }
738 - 736 + const slaveRowData = this.props?.slaveData?.find(x => x.sSlaveId === slaveSelectedRowKeys?.[0]) || {}
  737 + const proInparamValue = {
  738 + ...slaveRowData,
  739 + sUserId,
  740 + sParentId,
  741 + sEmployeeNo,
  742 + sFaceParentId: sParentId,
  743 + sFaceEmployeeNo: sEmployeeNo
  744 + }
  745 + // sFaceParentId: faceData[0].sParentId, sFaceEmployeeNo: faceData[0].sEmployeeNo
739 const proInParam = JSON.stringify({ 746 const proInParam = JSON.stringify({
740 params: inParams.map(item => ({ 747 params: inParams.map(item => ({
741 ...item, 748 ...item,
742 sUserName: app.userinfo.sUserName, 749 sUserName: app.userinfo.sUserName,
743 - value: [{  
744 - sUserId,  
745 - sParentId,  
746 - sEmployeeNo,  
747 - sId: slaveSelectedRowKeys[0],  
748 - "sOperate": "start",  
749 - ...commonData,  
750 -  
751 - }] 750 + value: [proInparamValue]
752 })), 751 })),
753 changeValue: sValue, 752 changeValue: sValue,
754 sButtonParam: btn 753 sButtonParam: btn
@@ -763,7 +762,6 @@ export default (ChildComponent) => { @@ -763,7 +762,6 @@ export default (ChildComponent) => {
763 changeValue: sValue, 762 changeValue: sValue,
764 sButtonParam: btn 763 sButtonParam: btn
765 }); 764 });
766 - console.log(value, 'value ');  
767 const url = `${commonConfig.server_host 765 const url = `${commonConfig.server_host
768 }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`; 766 }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
769 const returnData = (await commonServices.postValueService( 767 const returnData = (await commonServices.postValueService(