SMS => lcmk SMS

src/baseComponents/EditBaseComponent/index.js

@@ -672,7 +672,7 @@ params【字段属性】=值
                 case 23:
                 case 24: errVerifyMsg = "请选择" + label
                   break;
-                default:errVerifyMsg = "请输入" + label
+                default: errVerifyMsg = "请输入" + label
                   break;
               }
             }
@@ -2751,16 +2751,26 @@ params【字段属性】=值
    */
   doSave = (api, saveData, params) => {
     this.setState({ btnLoading: true });
+    let that = this;
     this.props.dispatch({
       type: 'app/getDataByPost',
       payload: saveData,
       url: api,
       onComplete: (ret) => {
+        var delay = 2000
         if (ret) {
+          if (that.props.data?.onCancel) {
+            that.props.data.onCancel();
+          }
+          if (that.props.data?.close) {
+            //wyw onCancel 在 ShowModal 被赋值 只能添加 close 来处理窗体关闭事件需要的执行（刷新主界面信息）
+            that.props.data.close();
+          }
+          delay = 500//如果需要请求api刷新页面数据 2000感觉太卡了
           message.success('执行成功');
         }
         this.onAfterSave({ ...params, isSuccess: ret, saveData });
-        setTimeout(() => { this.setState({ btnLoading: false }) }, 2000);
+        setTimeout(() => { this.setState({ btnLoading: false }) }, delay);
       }
     });
   };
@@ -2896,6 +2906,16 @@ params【字段属性】=值
                 }
               ];
               tempData.rules = [...rule];
+            } else if (btnConfig.customParams != null && btnConfig.customParams.indexOf('parentRecord') > -1) {
+              //wyw BS057 弹窗 BS077 传递父项信息 到页面
+              let rule = [
+                {
+                  field: "parentRecord",
+                  operator: 1,
+                  value: this.state.data
+                }
+              ];
+              tempData.rules = [...rule];
             }
           } else {
             let cParams = btnConfig.customParams.split('&');

src/baseComponents/EditComponent/index.js

@@ -1535,6 +1535,17 @@ class EditComponent extends EditBaseComponent {
     });
   };
 
+  clearData = () => {
+    this.setState({
+      data: {}
+    });
+  }
+
+  setStateData = (tmpData) => {
+    this.setState({
+      data: tmpData
+    });
+  }
 
   onAfterSave(params) {
     super.onAfterSave(params);
@@ -1551,7 +1562,7 @@ class EditComponent extends EditBaseComponent {
       }
       this.useCodeRules = null;
       if (typeof onSave === 'function') {
-        onSave(this.state.data);
+        onSave(this.state.data, this.clearData,this.setStateData);
       }
       if (closeType === 1 && this.billStatus === 1 ||//仅编辑时关闭
         closeType === 2 && this.billStatus !== 1 ||//仅新增时关闭
@@ -1720,10 +1731,16 @@ class EditComponent extends EditBaseComponent {
     else if (btnType === 7) {//自定义
       const clickEventFun = this.getDynJsFunc(clickEventFunName);
       const { validateFieldsAndScroll } = this.props.form;
+      var parentRecordSuit = parentRecord
+      if (btnConfig.customParams != null && btnConfig.customParams.indexOf('parentRecord') > -1 && this.state.data) {
+        // wyw 子表按钮添加主页面信息传参到子页面
+        //wyw BS057 弹窗 BS077 传递父项信息 到页面
+        parentRecordSuit = this.state.data
+      }
       if (typeof clickEventFun === 'function') {
         const btnParam = clickEventFun({
           record,
-          parentRecord: parentRecord,
+          parentRecord: parentRecordSuit,
           dispatch: this.props.dispatch,
           loadData: () => { this.onLoadData() },
           login: this.props.login,

src/components/CustomPages/BS/BS026ShowPrint.js

@@ -138,7 +138,7 @@ class BS026ShowPrint extends React.Component {
                             <Descriptions.Item label="检查项目">{data.Nav_CheckProject?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查项目分类">{data.Nav_CheckProjectCategory?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查内容">{data.CHECKCONTENT}</Descriptions.Item>
-                            <Descriptions.Item label="检查依据">{data.CHECKPROOF}</Descriptions.Item>
+                            {/* <Descriptions.Item label="检查依据">{data.CHECKPROOF}</Descriptions.Item> */}
                             <Descriptions.Item label="检查问题描述">{data.Nav_CheckQuestion?.DESCREPTION}</Descriptions.Item>
                             <Descriptions.Item label="整改建议与措施">{data.Nav_CheckQuestion?.DEMAND}</Descriptions.Item>
                             <Descriptions.Item label="问题等级">{data.QUESTION_LEVE_DESCRIPTION}</Descriptions.Item>

src/components/CustomPages/BS/BS032ShowPrint.js

@@ -240,7 +240,7 @@ class BS032ShowPrint extends React.Component {
                                 <td>检查区域</td>
                                 <td>检查项目</td>
                                 <td>检查内容</td>
-                                <td>检查依据</td>
+                                {/* <td>检查依据</td> */}
                                 {/* <td>问题描述</td> */}
                                 <td style={{ width: '120px' }} >检查人员</td>
                             </tr>
@@ -250,7 +250,7 @@ class BS032ShowPrint extends React.Component {
                                     <td >{item.Nav_CheckArea?.NAME}</td>
                                     <td>{item.Nav_CheckProject?.NAME}</td>
                                     <td>{item.CHECKCONTENT}</td>
-                                    <td>{item.CHECKPROOF}</td>
+                                    {/* <td>{item.CHECKPROOF}</td> */}
                                     {/* <td width="50px">{item.QUESTION_LEVEL_DESCRIPTION}</td> */}
                                     {/* <td width="50px">{item.Nav_CheckMain.Nav_CheckTypeLevel.Nav_Enums.NAME}</td> */}
                                     {/* <td>问题描述</td> */}

src/components/CustomPages/BS/BS034ShowPrint.js

@@ -178,21 +178,22 @@ class BS034ShowPrint extends React.Component {
                             <tr className={styles.PrintFormLightTh}>
                                 <td>检查项目</td>
                                 <td>检查内容</td>
-                                <td>检查依据</td>
+                                {/* <td>检查依据</td> */}
                                 <td>问题描述</td>
                                 <td>问题等级</td>
                                 <td>整改建议与措施</td>
                                 <td>检查人员</td>
-                                <td>备注</td>
+                                {/* <td>备注</td> */}
 
                                 <td>隐患地点</td>
+                                <td>备注</td>
                                 <td>附件</td>
                             </tr>
                             {data.Nav_ListSafeCheckDetail.map((item, i) => {
                                 return <tr>
                                     <td>{item.Nav_CheckProject.NAME}</td>
                                     <td>{item.CHECKCONTENT}</td>
-                                    <td>{item.CHECKPROOF}</td>
+                                    {/* <td>{item.CHECKPROOF}</td> */}
                                     <td>{(item.CHECKRESULT == 0 || (item.CHECKRESULT != null && item.CHECKRESULT == 20)) ?
                                         item.Nav_ListCheckDetailQuestion?.map((question, j) => {
                                             return (j > 0 ? ',' : '') + question.Nav_Question.DESCREPTION
@@ -213,9 +214,10 @@ class BS034ShowPrint extends React.Component {
                                             return (j > 0 ? "," : "") + user.Nav_User?.NAME
                                         })
                                     }</td>
-                                    <td>{item.REMARK_RESULT}</td>
+                                    {/* <td>{item.REMARK_RESULT}</td> */}
 
                                     <td>{item.ADDRESS}</td>
+                                    <td>{item.REMARK}</td>
                                     <td>{
                                         showFiles(item.Nav_Files, config.picServerHost)
                                     }</td>
@@ -227,7 +229,7 @@ class BS034ShowPrint extends React.Component {
                             <tr>
                                 <td>检查人员签字
                                 </td>
-                                <td colSpan={9} style={{ textAlign: "left" }}>
+                                <td colSpan={8} style={{ textAlign: "left" }}>
                                     {
                                         showUsersSign(data.Nav_ListCheckUserSign, config.picServerHost)
                                         // data.Nav_ListCheckUserSign.map((sign, i) => {
@@ -241,7 +243,7 @@ class BS034ShowPrint extends React.Component {
                             <tr>
                                 <td>审核意见
                                 </td>
-                                <td colSpan={9} style={{ textAlign: "left" }}>
+                                <td colSpan={8} style={{ textAlign: "left" }}>
                                     {
                                         showApprove(data.Nav_ApproveCheckAudit?.Nav_ApproveDetails, this.props.app.enums.NodeApproveStatus.enums, config.picServerHost)
 

src/components/CustomPages/BS/BS034View.js

@@ -239,7 +239,7 @@ class BS034View extends React.Component {
                                 <td>问题等级</td>
                                 <td style={{ maxWidth: "20%" }}>整改建议与措施</td>
                                 <td style={{ minWidth: "110px" }} >检查人员</td>
-                                {/* <td>备注</td> */}
+                                <td>备注</td>
                                 <td>附件</td>
                             </tr>
                             {data.Nav_ListSafeCheckDetail.map((item, i) => {
@@ -280,7 +280,7 @@ class BS034View extends React.Component {
                                         })
 
                                     }</td>
-                                    {/* <td>{item.REMARK_RESULT}</td> */}
+                                    <td>{item.REMARK}</td>
 
 
                                     <td>{
@@ -317,7 +317,7 @@ class BS034View extends React.Component {
                             <tr>
                                 <td>检查人员签字
                                 </td>
-                                <td colSpan={7} style={{ textAlign: "left" }}>
+                                <td colSpan={8} style={{ textAlign: "left" }}>
                                     {
                                         showUsersSign(checkSign, config.picServerHost, 200)
                                     }
@@ -326,7 +326,7 @@ class BS034View extends React.Component {
                             <tr>
                                 <td>审核意见
                                 </td>
-                                <td colSpan={7} style={{ textAlign: "left" }}>
+                                <td colSpan={8} style={{ textAlign: "left" }}>
                                     {
                                         showApprove(data.Nav_ApproveCheckAudit?.Nav_ApproveDetails, this.props.app.enums.NodeApproveStatus.enums, config.picServerHost, 200)
 

src/components/CustomPages/BS/BS042ActualCheck.js

@@ -229,6 +229,7 @@ class BS042ActualCheck extends React.Component {
                                 <td style={{ minWidth: '80px' }}>隐患等级</td>
                                 <td>整改建议与措施</td>
                                 <td style={{ minWidth: '110px' }}>隐患地点</td>
+                                <td style={{ minWidth: '110px' }}>备注</td>
                                 <td style={{ minWidth: '100px' }}>整改期限</td>
                                 <td style={{ minWidth: '100px' }}>系统整改期限</td>
                                 <td style={{ minWidth: '110px' }}>整改实施单位</td>
@@ -246,6 +247,7 @@ class BS042ActualCheck extends React.Component {
                                     <td>{this.props.app.enums.BSQuestionLevelEnum.enums[item.QUESTION_LEVEL]}</td>
                                     <td>{item.DEMAND}</td>
                                     <td>{item.ADDRESS}</td>
+                                    <td>{item.REMARK}</td>
                                     <td>{new Date(item.LastDateUser).Format("yyyy-MM-dd")}</td>
                                     <td>{new Date(item.LastDateSystem).Format("yyyy-MM-dd")}</td>
                                     <td> {item.Nav_DepartmentDeal == null ? '' : item.Nav_DepartmentDeal.NAME}</td>

src/components/CustomPages/BS/BS042ShowPrint.js

@@ -290,6 +290,7 @@ class BS042ShowPrint extends React.Component {
                                 <td style={{ minWidth: '80px' }}>隐患等级</td>
                                 <td>整改建议与措施</td>
                                 <td style={{ minWidth: '110px' }}>隐患地点</td>
+                                <td style={{ minWidth: '110px' }}>备注</td>
                                 <td style={{ minWidth: '100px' }}>整改期限</td>
                                 <td style={{ minWidth: '100px' }}>系统整改期限</td>
                                 <td style={{ minWidth: '110px' }}>整改实施单位</td>
@@ -308,6 +309,7 @@ class BS042ShowPrint extends React.Component {
                                     <td>{this.props.app.enums.BSQuestionLevelEnum.enums[item.QUESTION_LEVEL]}</td>
                                     <td>{item.DEMAND}</td>
                                     <td>{item.ADDRESS}</td>
+                                    <td>{item.REMARK}</td>
                                     <td>{new Date(item.LastDateUser).Format("yyyy-MM-dd")}</td>
                                     <td>{new Date(item.LastDateSystem).Format("yyyy-MM-dd")}</td>
                                     <td> {item.Nav_DepartmentDeal == null ? '' : item.Nav_DepartmentDeal.NAME}</td>

src/components/CustomPages/BS/BS044Check.js

@@ -163,6 +163,7 @@ class BS044Check extends React.Component {
                             <Descriptions.Item label="整改建议与措施" >{data.Nav_SubmitContent.DEMAND}</Descriptions.Item>
                             <Descriptions.Item label="整改后情况描述">{data.DEALDESCRIBE}</Descriptions.Item>
                             <Descriptions.Item label="隐患地点">{data.Nav_SubmitContent.ADDRESS}</Descriptions.Item>
+                            <Descriptions.Item label="备注">{data.REMARK}</Descriptions.Item>
                             {/* <hr></hr> */}
                             <Descriptions.Item label="附件（整改前）">{
                                 data.Nav_Files && data.Nav_Files.map((item, i) => {

src/components/CustomPages/BS/BS044Notice.js

@@ -115,7 +115,7 @@ class BS044Notice extends React.Component {
 
                             <Descriptions.Item label="检查问题">{data.Nav_SubmitContent != null ? data.Nav_SubmitContent.DESCREPTION : ""}</Descriptions.Item>
                             <Descriptions.Item label="整改建议与措施">{data.Nav_SubmitContent.DEMAND}</Descriptions.Item>
-                            <Descriptions.Item label="检查依据">{data.Nav_SubmitContent.PROOF}</Descriptions.Item>
+                            {/* <Descriptions.Item label="检查依据">{data.Nav_SubmitContent.PROOF}</Descriptions.Item> */}
 
                             {/* <Descriptions.Item label="附件（检查前）">{
                                 data.Nav_Files && data.Nav_Files.map((item, i) => {

src/components/CustomPages/BS/BS048ShowPrint.js

@@ -98,7 +98,7 @@ class BS048ShowPrint extends React.Component {
 
                             <Descriptions.Item label="整改建议与措施">{data.DEMAND}</Descriptions.Item>
                             <Descriptions.Item label="检查内容">{data.CHECKCONTENT}</Descriptions.Item>
-                            <Descriptions.Item label="检查依据">{data.CHECKPROOF}</Descriptions.Item>
+                            {/* <Descriptions.Item label="检查依据">{data.CHECKPROOF}</Descriptions.Item> */}
                             <Descriptions.Item label="问题等级">{this.props.app.enums.BSQuestionLevelEnum.enums[data.QUESTION_LEVEL]}</Descriptions.Item>
                             <Descriptions.Item label="是否重大隐患">{this.props.app.enums.BSSeriousRiskEnum.enums[data.SERIOUS_RISK]}</Descriptions.Item>
                             <Descriptions.Item label="检查类型">{data.Nav_CheckType.NAME}</Descriptions.Item>

src/components/CustomPages/BS/BS069ShowPrint.js

@@ -94,7 +94,7 @@ class BS069ShowPrint extends React.Component {
                 {
                     data ? <div style={{ width: '95%' }}>
                         <Descriptions title='' size='middle' bordered>
-                            <Descriptions.Item label="退回人">{data.Nav_Reject?.Nav_User.NAME}</Descriptions.Item>
+                            <Descriptions.Item label="退回人">{data.Nav_Reject?.Nav_User?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="退回原因">{data.Nav_Reject?.REASON}</Descriptions.Item>
                             <Descriptions.Item label="附件">{
                                 showFiles(data.Nav_Reject.Nav_Files, config.picServerHost)

src/components/CustomPages/BS/BS070ShowPrint.js

@@ -12,6 +12,7 @@ class BS070ShowPrint extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
+            tmpData: {},
             Nav_SafeCheck: {},
             Nav_ListSafeCheckDetail: [],
             Nav_ApproveApply: {},
@@ -45,6 +46,17 @@ class BS070ShowPrint extends React.Component {
 
     }
 
+    //显示操作日志
+    OperateLogShow() {
+        const newtmpData = {
+            data: { id: this.props.data.id, key: guid() },
+            formCode: "BS076",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
+
     loadData = (id) => {
         // id=  CHECKID +'_'+SUBMITID   CHECKID\SUBMITID 可能只有其一 但是一定会有_
         var orgId = this.props.login ? this.props.login.OrgId : '';
@@ -94,6 +106,8 @@ class BS070ShowPrint extends React.Component {
             <div style={{ padding: '10px' }}>
                 <table>
                     <tr>
+                        {/* <td><Button style={{ margin: "0 0 0 10px" }} icon={'export'} onClick={() => this.OperateLogShow(true)}  >履职记录</Button></td> */}
+                        {/* onClick={() => this.CheckerCheckToActual(10)}  */}
                         <td><ReactToPrint trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>} content={() => this.componentRef} /></td>
                         <td><ExportToExcel fileName='安全检查汇总' tableId={'tableId' + this.props.data.id} /></td>
                     </tr>
@@ -120,7 +134,7 @@ class BS070ShowPrint extends React.Component {
                                 })
 
                             }</p></Descriptions.Item>
-                            <Descriptions.Item label="检查项目分类"><p  style={{ width: '75%' }}>{
+                            <Descriptions.Item label="检查项目分类"><p style={{ width: '75%' }}>{
                                 Nav_SafeCheck.Nav_ListCheckProjectCategory && Nav_SafeCheck.Nav_ListCheckProjectCategory.map((item, i) => {
                                     // return <p className={styles.pLin}> {item.Nav_CheckProjectCategory.NAME}</p>
                                     return (i > 0 ? "，" : "") + item.Nav_CheckProjectCategory.NAME
@@ -151,7 +165,7 @@ class BS070ShowPrint extends React.Component {
                                 <td>检查人员</td>
                                 <td>检查项目</td>
                                 <td>检查内容</td>
-                                <td>检查依据</td>
+                                {/* <td>检查依据</td> */}
                             </tr>
                             {Nav_ListSafeCheckDetail.map((item, i) => {
                                 return <tr>
@@ -169,14 +183,14 @@ class BS070ShowPrint extends React.Component {
 
                                     <td>{item.Nav_CheckProject?.NAME}</td>
                                     <td>{item.CHECKCONTENT}</td>
-                                    <td>{item.CHECKPROOF}</td>
+                                    {/* <td>{item.CHECKPROOF}</td> */}
                                 </tr>
                             })}
 
 
                             <tr>
                                 <td colSpan={2} >任务制定审核人</td>
-                                <td colSpan={4} style={{ textAlign: "left" }}>
+                                <td colSpan={3} style={{ textAlign: "left" }}>
                                     {
                                         showApprove(Nav_ApproveApply?.Nav_ApproveDetails, this.props.app.enums.NodeApproveStatus.enums, config.picServerHost, 200)
                                     }
@@ -187,7 +201,7 @@ class BS070ShowPrint extends React.Component {
                                 Nav_SafeCheck.STATUSPLAN >= 20 ?
                                     <tr >
                                         <td colSpan={2} >检查人员确认</td>
-                                        <td colSpan={4} style={{ textAlign: "left" }}>
+                                        <td colSpan={3} style={{ textAlign: "left" }}>
                                             {
                                                 showUsersSign(Nav_ListApplySign, config.picServerHost, 200, 70)
                                             }
@@ -346,6 +360,8 @@ class BS070ShowPrint extends React.Component {
 
 
             </div>
+
+            <FormPage {...this.state.tmpData} />
         </div>
     }
 }

src/components/CustomPages/BS/BS074ShowPrint.js

@@ -108,6 +108,7 @@ class BS074ShowPrint extends React.Component {
                                     <td>整改建议与措施</td>
                                     <td>检查区域</td>
                                     <td>隐患地点</td>
+                                    <td>备注</td>
                                     <td>整改期限</td>
                                     <td>整改实施单位</td>
                                     <td>整改责任人</td>
@@ -120,6 +121,7 @@ class BS074ShowPrint extends React.Component {
                                         <td>{item.DEMAND} </td>
                                         <td>{item.Nav_RiskArea.NAME} </td>
                                         <td>{item.ADDRESS} </td>
+                                        <td>{item.REMARK} </td>
                                         <td>{item.LastDateUser} </td>
                                         <td>{item.Nav_DepartmentDeal.NAME} </td>
                                         <td>{item.Nav_UserDeal.NAME} </td>

src/components/CustomPages/BS/BS076ShowOperateLog.js

@@ -0,0 +1,84 @@
+import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
+import React from 'react';
+import { initFilter, extendRule, extendInclude, setDataFieldValue, showApprove, guid, initQueryFilter, ShowDateTime, ShowPrintClose, showFiles } from '../../../utils/common';
+import ReactToPrint from 'react-to-print';
+import { ExportToExcel } from '@woowalker/feui'
+import XLSX from 'xlsx';
+import { connect } from 'dva';
+import moment from 'moment';
+import { message } from 'antd/lib/index';
+import styles from '../../../components/CustomPages/HI/StepForm.css';
+import config from '../../../config.js';
+
+class BS076ShowOperateLog extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            data: null,
+            btndisplay: 'none',
+            isCheck: false, //是否待办 审批
+        }
+    }
+
+    componentDidMount() {
+        if (this.props.data?.id)
+            this.loadData(this.props.data?.id);
+    }
+
+    componentWillReceiveProps(NextProps) {
+        if (NextProps.data?.id && this.props.data?.id != NextProps.data?.id) {
+            this.loadData(NextProps.data?.id);
+        }
+    }
+
+
+    loadData = (ids) => {
+        var orgId = this.props.login ? this.props.login.OrgId : '';
+        let json = initFilter(orgId, ids);
+        this.props.dispatch({
+            type: 'app/getDataByPost',
+            payload: json,
+            url: 'BS/BSOperateLog/OrderEntities',
+            onComplete: (ret) => {
+                debugger
+                if (ret) {
+                    this.setState({
+                        data: ret,
+                    })
+                }
+            }
+        });
+    }
+    render() {
+        const { data } = this.state;
+        const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
+        return <div>
+            <div ref={el => (this.componentRef = el)} style={{ padding: '20px', paddingTop: '20px' }} id={'tableId' + this.props.data.id}>
+                <table className={styles.PrintFormLight}>
+                    <tbody>
+                        <tr>
+                            <td colSpan={9} className={styles.showPrintHead2}>履职记录</td>
+                        </tr>
+                        <tr className={styles.PrintFormLightTh}>
+                            <td>操作人</td>
+                            <td>操作类型</td>
+                            <td>开始时间</td>
+                            <td>操作时间</td>
+                            <td>是否按时完成</td>
+                        </tr>
+                        {(data && data.length > 0) ? data.map((item, i) => {
+                            return <tr>
+                                <td>{item.USRTNAME} </td>
+                                <td>{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]} </td>
+                                <td>{item.CREATE_TIME} </td>
+                                <td>{item.OPERTETIME} </td>
+                                <td>{item.ISINTTIME != null ? (item.ISINTTIME ? '是' : '否') : ""} </td>
+                            </tr>
+                        }) : <tr><td colSpan={5} style={{ textAlign: 'left' }}>查无记录</td></tr>}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    }
+}
+export default connect(({ login, app }) => ({ login, app }))(BS076ShowOperateLog) 

src/components/common/ShowModal.js

@@ -54,6 +54,9 @@ class ShowModal extends React.Component {
   showContent = () => {
     let showData = this.props.data;
     if (showData && showData.content) {
+      if (showData.content?.props?.data) {
+        showData.content.props.data.onCancel = this.handleCloseModal
+      }
       if (typeof showData.content === 'function') {
         return showData.content();
       }

src/files/edit/BS032.js

@@ -272,5 +272,18 @@ export default {
     } else {
       return '';
     }
-  }
+  },
+
+  btnCancel: ({ record, onCancel, data, dispatch }) => {
+    let json = initFilter(record.ORG_ID, record.ID, null, null, null, data.TaskID);
+    dispatch({
+      type: 'app/getDataByPost',
+      url: 'BS/BSSafeCheck/Cancel',
+      payload: json,
+      onlyData: false,
+      onComplete: (ret) => {
+        message.success('执行成功', null, onCancel())
+      }
+    })
+  },
 }

src/files/edit/BS034.js

@@ -46,6 +46,7 @@ export default {
         element.QUESTION_LEVEL = null
       } else if (element.CHECKRESULT == 20) {
         if (element.Nav_ListCheckDetailQuestion != null && element.Nav_ListCheckDetailQuestion.length > 0) {
+          strDEMAND = ''
           //显示整改建议与措施
           // strDEMAND = element.Nav_ListCheckDetailQuestion[0].Nav_Question.DEMAND
           for (let i = 0; i < element.Nav_ListCheckDetailQuestion.length; i++) {
@@ -163,13 +164,14 @@ export default {
 
    //退回
   btnBack: ({ record, setState, close, loadData, getLoadParam, login, btn, dispatch }) => {
-    const data={
+    const data = {
-      content: <FormPage formCode={btn.FORM_CODE} data={{id:(record? record.ID:''),
+      content: <FormPage formCode={btn.FORM_CODE} data={{
-      homeReload:true,
+        id: (record ? record.ID : ''),
-      close:()=>{
+        homeReload: true,
-        loadData();
+        close: () => {
-      },
+          loadData();
-      }}/>,
+        },
+      }} />,
     };
     return {
     content: <EditRowShowModal data={data} login={login} title={btn.LABEL}>

src/files/edit/BS057.js

@@ -3,7 +3,7 @@ import ConfirmButton from '../../components/common/ConfirmButton';
 import { Button, Input, Modal, message } from 'antd'
 import storage from '../../utils/storage'
 import config from "../../config.js"
-import { extendInclude, extendRule, getDataFieldValue, initFilter, empty, extendOrder, guid, getSubTableData, onBeforeSaveHandleRecordLog, auditOptionShow2, extend } from "../../utils/common";
+import { extendInclude, extendRule, getDataFieldValue, initFilter, empty, extendOrder, guid, getSubTableData, onBeforeSaveHandleRecordLog, auditOptionShow2, GetRiskReasonShow } from "../../utils/common";
 import Item from 'antd/lib/list/Item';
 import styles from '../../components/CustomPages/HI/StepForm.css';
 import ShowModal from '../../components/common/ShowModal';
@@ -35,6 +35,7 @@ export default {
     // params.record["Nav_CheckMain.Nav_CheckQuestion.DEMAND"] = params.getDataFieldValue("DEMAND_SAME");
     var strDEMAND = ''
     stateData.Nav_ListSafeCheckDetail.forEach(element => {
+      strDEMAND = ''
       if (element.QUESTION_LEVEL != null && element.QUESTION_LEVEL == 0) {
         element.QUESTION_LEVEL = null
       }
@@ -93,7 +94,6 @@ export default {
       })
     }
   },
-
   btnOK: ({ record, close, loadData, getLoadParam, login, btn, dispatch }) => {
     const confirmRevert = () => {
       if (record.Nav_ListCheckDetailUser.length > 0) {
@@ -135,7 +135,6 @@ export default {
   },
 
   handleRenderRowControl(params) {
-    // debugger
     // if (params.colConfig.field === 'Nav_Files') {
     // } else
 
@@ -164,8 +163,34 @@ export default {
             return ""
           }
         }
-
+      } else if (params.record.CHECKRESULT == "20" && params.record.ISAUTOLOAD != null && params.record.ISAUTOLOAD == false) {
-      } else {
+        //只修改手动新增的检查记录
+        if (params.colConfig.field === 'Nav_ListCheckDetailQuestion') {
+          return <>
+            {params.record.CHECKRESULT_DESCRIPTION}
+          </>
+        } else if (params.colConfig.field == 'QUESTION_LEVEL') {
+          return <>
+            {params.record.QUESTION_LEVEL_DESCRIPTION}
+          </>
+        } else if (params.colConfig.field == 'ADDRESS') {
+          return <>
+            {params.record.ADDRESS}
+          </>
+        } else if (params.colConfig.field == 'Nav_ListCheckDetailReason') {
+          // params.record.Nav_ListCheckDetailReason?.forEach((item, i) => {
+          //   return <>
+          //     {item.Nav_RiskReason.NAME}
+          //   </>
+          // })
+          return <>
+            {
+              GetRiskReasonShow(params.record.Nav_ListCheckDetailReason)
+            }
+          </>
+        }
+      }
+      else {
         //填表 如果是 主要选择人   其他 => 控件  无 => 空 有问题 显示等级
         // if (params.colConfig.field === 'QUESTION_LEVEL') {
         //   if (params.record.QUESTION_LEVEL == null && params.record.QUESTION_LEVEL == 0) {
@@ -176,7 +201,6 @@ export default {
         //     return <></>
         //   }
         // }
-
       }
     }
 
@@ -204,7 +228,6 @@ export default {
     if (colInfo.FIELD_NAME == "Nav_ListCheckDetailQuestion") {
       var listQ = record.Nav_ListCheckDetailQuestion.filter(e => e.IS_DELETED == null || e.IS_DELETED == undefined || e.IS_DELETED != true)
       if (listQ == null || listQ.length < 1) {
-        debugger
         //数据清空
         for (let i = 0; i < stateData.Nav_ListSafeCheckDetail.length; i++) {
           if (record.ID == stateData.Nav_ListSafeCheckDetail[i].ID) {
@@ -251,7 +274,7 @@ export default {
                   detailNew.Nav_ListCheckDetailUser.forEach(e => {
                     e.ID = guid()
                     e.SAFE_CHECK_DETAIL_ID = detailNew.ID
-                    debugger
+                    // debugger
                     if (!e.ISMAINCHECK) {
                       e.FLOW_STATUS = 1
                     }
@@ -416,5 +439,58 @@ export default {
       // //   record.QUESTION_LEVEL = 20
       // // }
     }
-  }
+  },
+
+  //新增记录
+  btnAdd: ({ record, data, setState, close, loadData, getLoadParam, login, btn, dispatch }) => {
+    // btnAdd: (params) => {
+    const data1 = {
+      content: <FormPage formCode={btn.FORM_CODE} data={{
+        id: (record ? record.ID : ''),
+        homeReload: true,
+        rules: [record],
+        onCancel: () => {
+          loadData();
+        },
+      }} />,
+    };
+    return {
+      content: <ShowModal data={data1} login={login} title={btn.LABEL}>
+        <Button type={btn.CSS} icon={btn.ICON}>{btn.LABEL}</Button>
+      </ShowModal>
+    }
+  },
+
+  btnSubAdd: ({ record, parentRecord, setState, close, loadData, login, btn, dispatch }) => {
+    //  btnSubAdd: (params) => {
+    //  debugger  
+    let dataSubForm = {
+      content: <FormPage formCode={btn.FORM_CODE} data={{
+        id: (record ? record.ID : ''),
+        homeReload: true,
+        rules: [parentRecord],
+        close: () => {
+          loadData();//onCancel 会被 重新赋值 在此做刷新
+        },
+        onCancel: () => {
+          //此方法要有不能被删除  别处会重写
+        },
+        onSave: (data, clearData, setStateData) => {
+          //wyw 昌老师写的这个不能加，因为这样传参被修改了，限定逻辑不对了（onBeforeEdit 不执行，不知道拿什么去限制不然也是可以传入parentRecord）
+          // let tmpData = {
+          //   SAFE_CHECK_ID: data.SAFE_CHECK_ID,
+          //   ORG_ID: data.ORG_ID,
+          //   Nav_ListUserCheck: data.Nav_ListUserCheck
+          // }
+          // setStateData(tmpData);
+
+        }
+      }} />,
+    };
+    return {
+      content: <ShowModal data={dataSubForm} login={login} title={btn.LABEL}>
+        <Button type={btn.CSS} icon={btn.ICON}>{btn.LABEL}</Button>
+      </ShowModal>
+    }
+  },
 }

src/files/edit/BS077.js

@@ -0,0 +1,50 @@
+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, setFieldEditable, setFieldValueByBatch }) => {
+    if (data.rules && data.rules.length > 0) {
+      // var parentInfo = data.rules[0].value
+      var parentInfo = data.rules[0]//.value
+
+      if (parentInfo.Nav_ListCheckRiskArea && parentInfo.Nav_ListCheckProject && parentInfo.Nav_ListCheckProjectCategory) {
+        var AREA_IDS = ''
+        var PROJECT_IDS = ''
+        var CATEGORY_IDS = ''
+        for (var i = 0; i < parentInfo.Nav_ListCheckRiskArea.length; i++) {
+          AREA_IDS += ',' + parentInfo.Nav_ListCheckRiskArea[i].RISK_AREA_ID
+        }
+        for (var i = 0; i < parentInfo.Nav_ListCheckProject.length; i++) {
+          PROJECT_IDS += ',' + parentInfo.Nav_ListCheckProject[i].CHECK_PROJECT_ID
+        }
+        for (var i = 0; i < parentInfo.Nav_ListCheckProjectCategory.length; i++) {
+          CATEGORY_IDS += ',' + parentInfo.Nav_ListCheckProjectCategory[i].CHECK_PROJECT_CATEGORY_ID
+        }
+        let temps = [];
+        temps.push({ field: "ROW_NO", value: parentInfo.Nav_ListSafeCheckDetail.length });
+        temps.push({ field: "SAFE_CHECK_ID", value: parentInfo.ID });
+        temps.push({ field: "AREA_IDS", value: AREA_IDS });
+        temps.push({ field: "PROJECT_IDS", value: PROJECT_IDS });
+        temps.push({ field: "CATEGORY_IDS", value: CATEGORY_IDS });
+        temps.push({ field: "CHECK_TYPE_ID", value: parentInfo.CHECK_TYPE_ID });
+        temps.push({ field: "CHECK_TYPE_LEVEL_ID", value: parentInfo.CHECK_TYPE_LEVEL_ID });
+        temps.push({ field: "DEPARTMENT_ID", value: parentInfo.DEPARTMENTID });
+        temps.push({ field: "CHECKOBJECT", value: parentInfo.CHECKOBJECT });
+        temps.push({ field: "Nav_ListUserCheck", value: parentInfo.Nav_ListSafeCheckDetail[0].Nav_ListCheckDetailUser });
+        if (parentInfo.Nav_ListCheckRiskArea != null && parentInfo.Nav_ListCheckRiskArea.length == 1) {
+          temps.push({ field: "Nav_CheckArea.NAME", value: parentInfo.Nav_ListCheckRiskArea[0].Nav_RiskArea.NAME });
+          temps.push({ field: "RISK_AREA_ID", value: parentInfo.Nav_ListCheckRiskArea[0].RISK_AREA_ID });
+          // setFieldEditable("Nav_CheckArea.NAME", false)
+        }
+
+        setFieldValueByBatch(temps);
+      }
+    }
+  },
+}

src/utils/common.js

@@ -2031,3 +2031,14 @@ export function getSixMonth(number, yearString = "", monthString = "") {
 
   return retrundate;
 }
+export function GetRiskReasonShow(ListCheckDetailReason) {
+  if (ListCheckDetailReason == null || ListCheckDetailReason.length < 1) {
+    return ''
+  } else {
+    let resultShow = ''
+    ListCheckDetailReason.forEach((item, i) => {
+      resultShow +=((i>0?' ':'')+ item.Nav_RiskReason.NAME)
+    })
+    return resultShow
+  }
+}