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

src/components/CustomPages/SE/SE061ShowPrint.js

@@ -150,7 +150,7 @@ class SE061ShowPrint extends React.Component {
                             <Descriptions.Item label="截止时间">{data.END_TIME}</Descriptions.Item>
                             <Descriptions.Item label="培训学时">{data.TRAINNING_TIME}</Descriptions.Item>
                             <Descriptions.Item label="培训地点">{data.TAINNING_ADDR}</Descriptions.Item>
-                            <Descriptions.Item label="培训老师">{getArryPropShow(data.Nav_Teachers, "Nav_User.NAME")}</Descriptions.Item>
+                            <Descriptions.Item label="培训老师" >{getArryPropShow(data.Nav_Teachers, "Nav_User.NAME")}</Descriptions.Item>
                             <Descriptions.Item label="培训形式">{enums.TrainType.enums[data.TRAINTYPE]}</Descriptions.Item>
                             <Descriptions.Item label="培训内容" span="3">{data.Nav_Content.NAME}</Descriptions.Item>
                             <Descriptions.Item label="附件" span="2">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>

src/components/CustomPages/SE/SE062ShowPrint.js

@@ -147,9 +147,9 @@ class SE062ShowPrint extends React.Component {
                             <Descriptions.Item label="培训学时">{data ? data.Nav_NewUser.TRAINNING_TIME : null}</Descriptions.Item>
                             <Descriptions.Item label="培训地点">{data ? data.Nav_NewUser.TAINNING_ADDR : null}</Descriptions.Item>
                             {/* <Descriptions.Item label="培训老师">{data ? data.Nav_NewUser.TEACHER : null}</Descriptions.Item> */}
-                            <Descriptions.Item label="培训老师">{getArryPropShow(data.Nav_NewUser.Nav_Teachers, "Nav_User.NAME")}</Descriptions.Item>
+                            <Descriptions.Item label="培训老师" span="2">{getArryPropShow(data.Nav_NewUser.Nav_Teachers, "Nav_User.NAME")}</Descriptions.Item>
                             {/* <Descriptions.Item label="培训形式">{data ? this.returnModel(data.Nav_NewUser.TRAIN_MODEL) : null}</Descriptions.Item>   */}
-                            <Descriptions.Item label="培训形式">{enums.TrainType.enums[data.Nav_NewUser?.TRAINTYPE]}</Descriptions.Item>  
+                            {/* <Descriptions.Item label="培训形式">{enums.TrainType.enums[data.Nav_NewUser?.TRAINTYPE]}</Descriptions.Item>   */}
                             <Descriptions.Item label="培训内容" span="3">{data && data.Nav_NewUser.Nav_Content ? data.Nav_NewUser.Nav_Content.NAME : ''}</Descriptions.Item>
                             <Descriptions.Item label="附件">{showFiles(data.Nav_NewUser.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
                         </Descriptions>

src/components/common/DropDownPagination.js

@@ -259,6 +259,12 @@ class DropDownPagination extends React.Component {
         labelField = 'NAME';
       }
       !autoLoadParam && extendRule(loadParam, labelField, 1, this.state.autoChangeValue)
+      if (this.state.loadParam.FilterGroup.Rules.length > 0) {
+        var par22 = this.state.loadParam.FilterGroup.Rules.find(rule => rule.Field === 'Parameter22');
+        if (par22 && par22.value && par22.value.length > 20) {
+          loadParam.FilterGroup.Rules.push(par22)
+        }
+      }
       dispatch({
         type: 'editPage/getAutoCompleteData',
         payload: loadParam,

src/files/edit/FM212.js

@@ -0,0 +1,62 @@
+import { message } from "antd/lib/index";
+import { Form, Col, Input } from 'antd'
+import DropDownPagination from '../../components/common/DropDownPagination';
+import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
+import BraftEditor from 'braft-editor';
+/**
+ * @return {string}
+ */
+
+export default {
+  handleRenderHeadControl(params) {
+    if (params.colConfig.field == 'CODE') {
+      const onBlur = (e) => {
+        let json = initFilter(params.login.OrgId, e.target.value);
+        params.dispatch({
+          type: 'app/getDataByPost',
+          url: 'FM/FMUserTransfer/GetUserInfoByCode',
+          payload: json,
+          onComplete: (ret) => {
+            let temps = [];
+            if (ret) {
+              temps.push({ field: 'NAME', value: ret.NAME })
+              temps.push({ field: 'CODE', value: ret.CODE })
+              temps.push({ field: 'COMPANYNAME_OLD', value: ret.COMPANYNAME_OLD })
+              temps.push({ field: 'DEPARTMENTNAME_OLD', value: ret.DEPARTMENTNAME_OLD })
+              temps.push({ field: 'DEPARTMENT_ID_OLD', value: ret.DEPARTMENT_ID_OLD })
+              temps.push({ field: 'POSTNAME_OLD', value: ret.POSTNAME_OLD })
+              temps.push({ field: 'POST_ID_OLD', value: ret.POST_ID_OLD })
+              temps.push({ field: 'ORG_ID_OLD', value: ret.ORG_ID_OLD })
+              temps.push({ field: 'USER_ID_OLD', value: ret.USER_ID_OLD })
+            } else {
+              temps.push({ field: 'NAME', value: '' })
+              // temps.push({ field: 'CODE', value: ret.CODE })
+              temps.push({ field: 'COMPANYNAME_OLD', value: '' })
+              temps.push({ field: 'DEPARTMENTNAME_OLD', value: '' })
+              temps.push({ field: 'DEPARTMENT_ID_OLD', value: null })
+              temps.push({ field: 'POSTNAME_OLD', value: '' })
+              temps.push({ field: 'POST_ID_OLD', value: null })
+              temps.push({ field: 'ORG_ID_OLD', value: null })
+              temps.push({ field: 'USER_ID_OLD', value: null })
+            }
+            params.setFieldValueByBatch(temps);
+          }
+        });
+      };
+      const formItemLayout = {
+        labelCol: { span: 24 },
+        wrapperCol: { span: 18 }
+      };
+      const customOrResponse = {
+        lg: 12, xxl: 8
+      }
+      return <>
+        <Col key={params.colConfig.field} {...customOrResponse}>
+          <Form.Item {...formItemLayout} label={params.colConfig.label}  >
+            <Input defaultValue={params.record.CODE} style={{ border: "1px solid #d9d9d9" }} onBlur={onBlur} />
+          </Form.Item>
+        </Col>
+      </>
+    }
+  },
+}