1.处理处理职员信息,点击人脸采集，入参取主表数据，而非userinfo

Min
1 parent 2301ee40
Showing 4 changed files with 36 additions and 5 deletions
.idea/.gitignore
.idea/vcs.xml
src/components/Common/PersonCenter/PersonCenterAddFace.js
src/components/FaceDetect/index.js
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
 \ No newline at end of file
@@ -25,7 +25,7 @@ const PersonCenterAddFace = Form.create({
           className={styles.changePwd}
         >
           <div className="tab-container">
-            <FaceDetect {...props} actionType="saveFace" onSaveFaceSuccess={props.onSaveFaceSuccess}>
+            <FaceDetect {...props} bClickSource = 'BtnAddFace' actionType="saveFace" onSaveFaceSuccess={props.onSaveFaceSuccess}>
               11
             </FaceDetect>
           </div>
@@ -29,6 +29,7 @@ class FaceDetect extends Component {
  
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.masterData) {
+      console.log('ssss', nextProps.masterData);
       this.user_id = nextProps.masterData.sEmployeeNo;
       this.user_info = JSON.stringify(
         {
@@ -203,19 +204,35 @@ class FaceDetect extends Component {
               } else {
                 _this.changeStatusContent('人脸采集成功');
                 let img = _this.getFace();
-                const userinfo = this.props.app.userinfo;
+                let userinfo = this.props.app.userinfo;
+                const sBrandId = userinfo?.sBrandsId;
+                const sSubsidiaryId = userinfo?.sSubsidiaryId;
+                if(this.props.bClickSource?.includes('BtnAddFace') ){
+                  userinfo = {
+                    sUserName: this.props.masterData?.sEmployeeName,
+                    sEmployeeNo: this.props.masterData?.sEmployeeNo,
+                    sEmployeeId : this.props.masterData?.sEmployeeId,
+                    sDepartName:  this.props.masterData?.sDepartName,
+                    sId :this.props.masterData?.sId
+                  }
+                  console.log('userinfo', userinfo);
+                }
+
                 let item = {
                   "image": img.split(',')[1],
                   "image_type": "BASE64",
                   "sParentId": userinfo.sId,
-                  "sEmployeeId": userinfo.sEmployeeId,
+                  "sEmployeeId": userinfo.sId,
+                  "sEmployeeName": userinfo.sUserName,
+                  "sEmployeeNo": userinfo.sEmployeeNo,
                   "sUserName": userinfo.sUserName,
-                  "sBrandsId": userinfo.sBrandsId,
-                  "sSubsidiaryId": userinfo.sSubsidiaryId,
+                  "sBrandsId": sBrandId,
+                  "sSubsidiaryId": sSubsidiaryId,
                   "quality_control": "NORMAL",
                   "liveness_control": "LOW",
                   "face_field": "feature"
                 }
+                console.log('item', item);
                 //保存URL
                 const url = this.urlpre + `/face/faceAdd`;
                 _this.changeStatusContent('人脸数据处理中，请稍等');