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

src/components/CustomPages/SE/SE061PaperPage.js

@@ -54,10 +54,12 @@ class SE061PaperPage extends React.Component {
         if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
             this.props.data.onCancel();
     }
-    getUsers = () => {
+    getUsers = (dataid) => {
+        debugger
         let json = initFilter(this.props.login.OrgId);
         json.OrgType = 2;
-        extendRule(json, 'RECORD_ID', 1, this.props.data.id);
+        // extendRule(json, 'RECORD_ID', 1, this.props.data.id);
+        extendRule(json, 'RECORD_ID', 1, dataid);
         extendInclude(json, 'Nav_User');
         this.state.loading = true;
         this.props.dispatch({
@@ -88,6 +90,12 @@ class SE061PaperPage extends React.Component {
                             message.warn("当前用户没有问卷");
                         }
                     }
+                } else {
+                    this.setState({
+                        SelUsrID: '',
+                        papers: []
+                    })
+
                 }
             }
         });
@@ -142,10 +150,10 @@ class SE061PaperPage extends React.Component {
             }
         });
     }
-    loadData = () => {
+    loadData = (dataid) => {
         if (this.props.data.id == "")
             return;
-        this.getUsers();
+        this.getUsers(dataid);
     }
     onSave = () => {
         if (this.state.readonly) {

src/files/edit/HM041.js

@@ -0,0 +1,59 @@
+import { message } from "antd/lib/index";
+import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, empty,extendOrder, guid } from "../../utils/common";
+import { connect } from 'dva';
+/**
+ * @return {string}
+ */
+// 编辑
+export default {
+  onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => {
+    if (!(colInfo.FIELD_NAME == 'Nav_OperationStep.NAME'))
+    return;
+
+    let code = getFieldValue('OPERATION_STEP_ID')  
+    if(code && code!==null && code!==undefined)
+    {
+      let json = initFilter(login.OrgId);
+      extendRule(json, 'ID', 1, code);
+      extendInclude(json, 'Nav_SafeConfirms');
+      extendInclude(json, 'Nav_SafeMeasures');
+      extendInclude(json, 'Nav_DealMeasures');
+      dispatch({
+        type: 'app/getDataByPost',
+        url: 'HM/OperationStep/Get',
+        payload: json,
+        onlyData: false,
+        onComplete: (re) => {
+          if (re && re.IsSuccessful && re.Data) {
+              let temps = [];
+              let detailConfirms=re.Data.Nav_SafeConfirms?.map((item,i)=>{
+                item['ROW_NO'] = item.NUM;
+                  item['NUM'] = item.NUM;
+                  item['NAME']=item.NAME;
+                  return item;
+               });
+               let detailMeasures=re.Data.Nav_SafeMeasures?.map((item,i)=>{
+                item['ROW_NO'] = item.NUM;
+                item['NUM'] = item.NUM;
+                  item['NAME']=item.NAME;
+                return item;
+             });
+             let detailDeal=re.Data.Nav_DealMeasures?.map((item,i)=>{
+              item['ROW_NO'] = item.NUM;
+              item['NUM'] = item.NUM;
+                  item['NAME']=item.NAME;
+              return item;
+           });
+              temps.push({ field: 'Nav_SafeConfirms', value: detailConfirms.sort((x, y) => (parseInt(x.NUM) > parseInt(y.NUM)) ? 1 : -1) })
+              temps.push({ field: 'Nav_SafeMeasures', value: detailMeasures.sort((x, y) => (parseInt(x.NUM) > parseInt(y.NUM)) ? 1 : -1) })
+              temps.push({ field: 'Nav_DealMeasures', value: detailDeal.sort((x, y) => (parseInt(x.NUM) > parseInt(y.NUM)) ? 1 : -1) })
+              // temps.push({ field: 'SafeMeasuresStr', value: re.Data.SafeMeasuresStr})
+              setFieldValueByBatch(temps);
+              //updateSubTableData(params.pageCode,detail,true)
+          }
+        }
+      })
+    }
+   
+  },
+}

src/files/edit/SK014.js

@@ -30,55 +30,30 @@ export default {
     }
      
   },
-  updateCheckUser: ({ row, pageCode, record, colInfo, resetFields, stateData, saveHeadRecord, saveRowRecord, getSelectedRecords, setState, emptyEditSelectedKeys }) => {
+ //向下同步培训组织  单选
-    //,state const temps = state['editTableSelectedKeysT_BS_SAFE_CHECK_DETAIL'];// + editCode + (parentId ? parentId : '')
+ updateCheckUser: ({ stateData, saveRowRecord }) => {
-    let DetailCheck = getSelectedRecords();
+  var totalCount = stateData.Nav_ReportDetails.length
-    if (DetailCheck && DetailCheck.length > 1) {
+  if (totalCount < 2) {
-      let ListCheckUserFirst = DetailCheck[0].Nav_RecitifyUser;
-      if (ListCheckUserFirst == null || ListCheckUserFirst.length < 1) {
-        message.error("请选择需要同步的检查人员!")
     return
   }
-      var isNeedEmpty = false;
-      //更新行数据
-      for (let i = 1; i < DetailCheck.length; i++) {
-        //组装数据
-        if (ListCheckUserFirst != undefined && ListCheckUserFirst) {
 
-          let iRow = { ...DetailCheck[i] };
+  var user = {}
-          iRow.Nav_RecitifyUser = ListCheckUserFirst;
+  for (var i = 1; i < totalCount; i++) {
-          saveRowRecord({ record: iRow, editCode: "T_SK_HIDDEN_DANGER_REPORT_DETAIL" })
+    //本行数据 如果为空 取上一行的 RECITIFY_USER_ID  Nav_RecitifyUser
-
+    if ((stateData.Nav_ReportDetails[i].RECITIFY_USER_ID == null || stateData.Nav_ReportDetails[i].RECITIFY_USER_ID == undefined) && stateData.Nav_ReportDetails[i - 1].RECITIFY_USER_ID) {
-          for (var x = 0; x < stateData.Nav_ReportDetails.length; x++) {
+      user = {
-            if (iRow.ID == stateData.Nav_ReportDetails[x].ID) {
+        ID: stateData.Nav_ReportDetails[i - 1].RECITIFY_USER_ID,
-              stateData.Nav_ReportDetails[x].Nav_RecitifyUser = ListCheckUserFirst;
+        NAME: stateData.Nav_ReportDetails[i - 1].Nav_RecitifyUser.NAME
       }
-          }
+      if (user.ID != null && user.ID != undefined) {
-        } else {
+        let iRow = { ...stateData.Nav_ReportDetails[i] };
-          //人员删除
+        iRow.RECITIFY_USER_ID = user.ID
-          let iRow = { ...DetailCheck[i] };
+        iRow.Nav_RecitifyUser = user
-          iRow.Nav_RecitifyUser.IS_DELETED = true
         saveRowRecord({ record: iRow, editCode: "T_SK_HIDDEN_DANGER_REPORT_DETAIL" })
       }
-        isNeedEmpty = true
-        //更新选中人员
-        for (var x = 0; x < stateData.Nav_ReportDetails.length; x++) {
-          let users = stateData.Nav_ReportDetails[x].Nav_RecitifyUser
-          if (users && !users.IS_DELETED) {
-            stateData.CheckUsers = users
     }
   }
-        setState({ data: stateData });
+},
-      }
-      if (isNeedEmpty) {
-        emptyEditSelectedKeys()
-      }
-    }else
-    {
-      message.error("请选择需要同步的整改责任人!")
-      return
-    }
-  },
   btnSubAdd: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => {
     let DetailCheck = getSelectedRecords();
       if(login.tempContents && login.tempContents.length>0)