Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

src/components/CustomPages/SE/SE007AllView.js

@@ -84,7 +84,7 @@ class SE007AllView extends React.Component {
                             report: 0,
                         })
                     }
-                    let name = it.Nav_User.Nav_Department.NAME;
+                    let name = it.Nav_User?.Nav_Department?.NAME;
                     if (name == '宁化行洛坑钨矿有限公司') {
                         name = '公司领导';
                     }

src/components/CustomPages/SE/SE062ShowPrint.js

@@ -159,7 +159,8 @@ class SE062ShowPrint extends React.Component {
                             <Descriptions.Item label="部门">{data && data.Nav_Department ? data.Nav_Department.NAME : ''}</Descriptions.Item>
                             <Descriptions.Item label="岗位">{data && data.Nav_Post ? data.Nav_Post.NAME : ''}</Descriptions.Item>
                             <Descriptions.Item label="分数">{data ? data.SCORE : null}</Descriptions.Item>
-                            <Descriptions.Item label="考核结果">{data ? data.EXAMINATION_RESULTS == 1 ? "合格" : "不合格" : null}</Descriptions.Item>
+                            {/* <Descriptions.Item label="考核结果">{data ? data.EXAMINATION_RESULTS == 1 ? "合格" : "不合格" : null}</Descriptions.Item> */}
+                            <Descriptions.Item label="考核结果">{(data && data.EXAMINATION_RESULTS && data.SCORE) ? enums.SEExaminationResultsEnum.enums[data.EXAMINATION_RESULTS] : ""}</Descriptions.Item>
                             <Descriptions.Item label="培训形式">{data ? this.returnModel(data.Nav_NewUser.TRAIN_MODEL) : null}</Descriptions.Item>
                             <Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
                         </Descriptions>

src/components/CustomPages/SE/SEConfigPage.js

@@ -224,7 +224,7 @@ class SEConfigPage extends React.Component {
                                 value={data.SAFE_SERVEY_TRIGGER_TIME ? moment(data.SAFE_SERVEY_TRIGGER_TIME) : null}
                                 onChange={value => {
                                     let data = this.state.data;
-                                    data.SAFE_SERVEY_TRIGGER_TIME = value;
+                                    data.SAFE_SERVEY_TRIGGER_TIME = moment(value);
                                     this.setState(data)
                                 }}
                             />

src/files/edit/SE071.js

@@ -104,23 +104,37 @@ export default {
     if (totalCount < 2) {
       return
     }
+
+    var Department = {}
     for (var i = 1; i < totalCount; i++) {
       //本行数据 如果为空 取上一行的 DEPARTMENT_ID  Nav_Department
-      if (stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == null || stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == undefined) {
+      if ((stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == null || stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == undefined) && stateData.Nav_ListPlanDetail[i - 1].DEPARTMENT_ID) {
+        Department = {
+          ID: stateData.Nav_ListPlanDetail[i - 1].DEPARTMENT_ID,
+          NAME: stateData.Nav_ListPlanDetail[i - 1].Nav_Department.NAME
+        }
+        if (Department.ID != null && Department.ID != undefined) {
           let iRow = { ...stateData.Nav_ListPlanDetail[i] };
-        iRow.DEPARTMENT_ID = stateData.Nav_ListPlanDetail[i - 1].DEPARTMENT_ID
+          iRow.DEPARTMENT_ID = Department.ID
-        iRow.Nav_Department = stateData.Nav_ListPlanDetail[i - 1].Nav_Department
+          iRow.Nav_Department = Department
           saveRowRecord({ record: iRow, editCode: "T_SE_TRAIN_PLAN_DETAIL" })
         }
       }
+    }
   },
   //向下同步被培训组织 多选
   btnSyncListDep: ({ stateData, saveRowRecord }) => {
     var totalCount = stateData.Nav_ListPlanDetail.length
     var listDetailDepartment = []
+    var listDetailDepartmentPer = []
+    debugger
     for (var i = 0; i < totalCount; i++) {
-      if (stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment != null && stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment.length > 0) {
+      listDetailDepartmentPer = stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment
-        listDetailDepartment = stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment //取被同步的数据  只要有数据就赋值
+      if (listDetailDepartmentPer != null && listDetailDepartmentPer.length > 0) {
+        listDetailDepartmentPer = listDetailDepartmentPer.filter(e => e.IS_DELETED == null || !e.IS_DELETED)
+      }
+      if (listDetailDepartmentPer != null && listDetailDepartmentPer.length > 0) {
+        listDetailDepartment = listDetailDepartmentPer //取被同步的数据  只要有数据就赋值
       } else if (listDetailDepartment != null && listDetailDepartment.length > 0) {
         let updateList = [];
         for (let j = 0; j < listDetailDepartment.length; j++) {

src/utils/request.js

@@ -66,6 +66,20 @@ export function getRequestHeaders(url, type = 'post', data, isIgnoreTenant) {
   }
   // 非 OP 路径接口，header 需要添加 Tenant
   const Tenant = storage('lacal').getItem('Tenant').val
+  //wyw 总部数据搜索 子公司切换处理
+  if (data && data.OrgId && data.OrgId === '00300000-0000-0000-0000-000000000000' && url && data.FilterGroup.
+    Groups && data.FilterGroup.Groups.length > 0 && (data.Parameter22 == null || data.Parameter22 === '')) {
+    data.FilterGroup.Groups.forEach(e => {
+      if (e.Rules && e.Rules.length > 0 && (data.Parameter22 == null || data.Parameter22 === '')) {
+        e.Rules.forEach(e => {
+          if (e.Field === "ORG_ID") {
+            data.Parameter22 = e.Value
+          }
+        })
+      }
+    });
+  }
+
   if (url.indexOf('PF/Login/Login') !== -1) {
     // Login接口使用最新的Tenant、Orgid、userid、Username值
     const latestTenant = storage('lacal').getItem('Tenant').val