三级安全教育 添加删除 和新增功能

src/components/common/ShowModal.js

@@ -69,7 +69,7 @@ class ShowModal extends React.Component {
       <div style={{ display: "inline-block" }}>
         <span onClick={this.handleClick}>{this.props.children}</span>
         <Modal
-          title={this.props.title === "新增" ? this.props.title + "-" +(this.props.login.currActivatedMenu!=null? this.props.login.currActivatedMenu.NAME:'') +  ((this.props.login.currActivatedMenu!=null&& this.props.login.currActivatedMenu.Nav_MenuForm!=null) ?("[" + this.props.login.currActivatedMenu?.Nav_MenuForm?.CODE + "]"):'') : this.props.title}
+          title={this.props.title === "新增" ? this.props.title + "-" + ((this.props.login != null && this.props.login.currActivatedMenu != null) ? this.props.login.currActivatedMenu.NAME : '') + ((this.props.login != null && this.props.login.currActivatedMenu != null && this.props.login.currActivatedMenu.Nav_MenuForm != null) ? ("[" + this.props.login.currActivatedMenu?.Nav_MenuForm?.CODE + "]") : '') : this.props.title}
           visible={this.state.visible}
           onCancel={this.handleCloseModal}
           maskClosable={false}

src/files/edit/SE061.js

@@ -1,7 +1,10 @@
-import { message } from "antd/lib/index";
+// import { message } from "antd/lib/index";
 import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, empty } from "../../utils/common";
 import { connect } from 'dva';
-// import { forEach } from "core-js/core/array";
+import { Button, Input, Modal, message } from 'antd'
+import FormPage from '../../components/FormPage';
+import ShowModal from '../../components/common/ShowModal';
+
 /**
  * @return {string}
  */
@@ -56,5 +59,35 @@ export default {
         setFieldValue("TRAINNING_TIME", minutes.toFixed(1));
       }
     }
+  },
+  btnSubAdd: ({ record, setState, data, close, loadData, login, btn, closeForm, onCancel, stateData }) => {//setStateData 报错
+    let dataSubForm = {
+      content: <FormPage formCode={btn.FORM_CODE} data={{
+        id: '',//(record ? record.ID : ''),只做新增
+        homeReload: true,
+        rules: { "EDU_CARD_ID": data.id },
+        close: () => {
+          debugger
+          if (login.RegD && login.RegD.EDU_CARD_ID && login.RegD.EDU_CARD_ID.length > 0) {
+            if (stateData["Nav_NewUserDetail"] == null) {
+              stateData["Nav_NewUserDetail"] = []
             }
+            stateData["Nav_NewUserDetail"].push(login.RegD)
+          }
+
+          login.RegD = {}
+          // loadData();//数据已处理无需继续刷新
+        },
+        onCancel: () => {
+          //wyw 此方法要有不能被删除  别处会重写
+          debugger
+        },
+      }} />,
+    };
+    return {
+      content: <ShowModal data={dataSubForm} login={login} title={btn.LABEL}>
+        <Button type={btn.CSS} icon={btn.ICON}>{btn.LABEL}</Button>
+      </ShowModal>
+    }
+  },
 }

src/files/edit/SE075.js

@@ -0,0 +1,71 @@
+import ConfirmButton from '../../components/common/ConfirmButton';
+import { Button, message } from 'antd'
+import storage from '../../utils/storage'
+import config from "../../config.js"
+import { extendInclude, extendRule, getDataFieldValue, initFilter, empty, extendOrder, guid, getSubTableData, onBeforeSaveHandleRecordLog, auditOptionShow2 } from "../../utils/common";
+import Item from 'antd/lib/list/Item';
+import styles from '../../components/CustomPages/HI/StepForm.css';
+import EditRowShowModal from '../../components/common/EditRowShowModal';
+import FormPage from '../../components/FormPage';
+export default {
+
+  onBeforeEdit: ({ data, setFieldValue }) => {
+    if (data.rules && data.rules.EDU_CARD_ID && data.rules.EDU_CARD_ID.length > 0) {
+      setFieldValue("EDU_CARD_ID", data.rules.EDU_CARD_ID)
+    }
+  },
+
+  //保存
+  UpdateRefresh: (params) => {
+    // var tmpData = {
+    //   ID: params.stateData.ID,
+    //   ORG_ID: params.stateData.ORG_ID,
+    //   Name: params.stateData.Name,
+    //   Sex: params.stateData.Sex,
+    //   Phone: params.stateData.Phone,
+    //   Code: params.stateData.Code,
+    //   ID_CARD: params.stateData.ID_CARD,
+    //   InTime: params.stateData.InTime,
+    //   WORKINGYEAR: params.stateData.WORKINGYEAR,
+    //   DEPARTMENT_ID: params.stateData.DEPARTMENT_ID,
+    //   POST_ID: params.stateData.POST_ID,
+    //   EDU_CARD_ID: params.stateData.EDU_CARD_ID,
+    //   CREATE_TIME: new Date(),
+    // }
+    // params.login.RegD = tmpData//params.stateData.copy() //本来可以传值
+
+    //添加
+    // params.stateData.Nav_JobTypes = null
+    // params.stateData.Nav_WorkType = null
+    params.dispatch({
+      type: 'app/getDataByPost',
+      payload: params.stateData,
+      url: 'SE/SENewUsers/RegisterUser',
+      onComplete: (ret) => {
+        debugger
+        if (ret) {
+          params.login.RegD = ret
+          message.success('执行成功');
+          params.onCancel()//弹窗关闭
+          params.data.close()//主界面回调刷新
+          params.stateData.ID = guid()
+          params.stateData.NAME = ''
+          params.stateData.Sex = '1'
+          params.stateData.PHONE = ''
+          params.stateData.CODE = ''
+          params.stateData.ID_CARD = ''
+          params.stateData.InTime = ''
+          params.stateData.WORKINGYEAR = ''
+          params.stateData.DEPARTMENT_ID = ''
+          params.stateData.POST_ID = ''
+          params.stateData.Nav_Department.NAME = ''
+          params.stateData.Nav_Post.NAME = ''
+          // params.stateData.EDU_CARD_ID = ''
+        } else {
+          params.login.RegD = {}
+        }
+      }
+    });
+
+  },
+}

src/utils/request.js

@@ -7,14 +7,13 @@ import { history } from './history'
 import storage from './storage'
 
 export function request(url, options, onlyData, requestKey, onException) {
-
   return fetch(
     config.serviceHost('api/' + url),
     options || {}
   ).then(response => {
-
+    console.log('response', response)
     // 登陆过期
-    if (response.status === 401) {
+    if (response == null || response.status === 401) {
       window.localStorage.removeItem('accessToken')
       history.replace({ pathname: '/login' })
       //throw new Error('token过期')