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

src/components/CustomPages/FO/FO021ShowPrint.js

@@ -346,6 +346,25 @@ class FO021ShowPrint extends React.Component {
                                                 : data.Nav_JobNameOut?.Nav_MonitorUser?.NAME
                                         }</td>
                                 </tr>
+                                <tr>
+                                    <td colSpan={2} className={styles.fontBold}>完工验收人签字</td>
+                                    <td colSpan={8} className={styles.fontBold}>{
+                                        data.Nav_AcceptUsers && data.Nav_AcceptUsers.map((item, i) => {
+                                            if (item.DEAL_STATUS == 1) {
+                                                if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
+                                                    return <img style={{ margin: "0 0 0 8px", width: '150px' }} alt={item.Nav_User.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
+                                                else
+                                                    return <img style={{ margin: "0 0 0 8px", width: '150px' }} title={item.Nav_User.NAME} />
+                                            }
+                                            else if (item.DEAL_STATUS == 0)
+                                            {
+                                                if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
+                                                    return <label style={{ color: 'red' }} title='未签到'> {item.Nav_User.NAME}</label>
+                                                else
+                                                    return item.Nav_User.NAME
+                                           }
+                                        })}</td>
+                                </tr>
                             </tbody>
                         </table> : null
                 }

src/components/CustomPages/SK/SK004CheckListNew.js

@@ -18,7 +18,11 @@ class SK004CheckListNew extends React.Component {
           inputText2:"",
           inputText3:"",
           inputText4:"",
+          inputText5:"",
+          inputText6:"",
           depart: {},
+          production: {},
+          productionId:null,
           checkType:{},
           data: {},
             dataList: [],
@@ -151,35 +155,35 @@ class SK004CheckListNew extends React.Component {
     loadData2()
     {
       let temp=this.state.data
-      if(this.state.inputText)
+      if(this.state.productionId)
       {
-        let minetype="全公司"
-        if(this.state.inputText === "10")
-        {
-          minetype="选矿厂"
-        }
-        if(this.state.inputText === "20")
-        {
-          minetype="尾矿库"
-        }
-        if(this.state.inputText === "30")
-        {
-          minetype="露天矿"
-        }
-        if(this.state.inputText === "31")
-        {
-          minetype="职能口"
-        }
-        if(this.state.inputText === "32")
-        {
-          minetype="非金属"
-        }
-        if(this.state.inputText === "40")
-        {
-          minetype="地下矿"
-        }
+        // let minetype="全公司"
+        // if(this.state.inputText === "10")
+        // {
+        //   minetype="选矿厂"
+        // }
+        // if(this.state.inputText === "20")
+        // {
+        //   minetype="尾矿库"
+        // }
+        // if(this.state.inputText === "30")
+        // {
+        //   minetype="露天矿"
+        // }
+        // if(this.state.inputText === "31")
+        // {
+        //   minetype="职能口"
+        // }
+        // if(this.state.inputText === "32")
+        // {
+        //   minetype="非金属"
+        // }
+        // if(this.state.inputText === "40")
+        // {
+        //   minetype="地下矿"
+        // }
         
-        temp=temp.filter(t=>t.MineType ==minetype);
+        temp=temp.filter(t=>t.PRODUCTION_UNIT_ID ==this.state.productionId);
       }
       if(this.state.inputText2)
       {
@@ -202,6 +206,10 @@ class SK004CheckListNew extends React.Component {
         // }
         temp=temp.filter(t=>t.CheckLevel==this.state.inputText2);
       }
+      if(this.state.inputText6)
+      {
+        temp=temp.filter(t=>t.CheckCycle==this.state.inputText6);
+      }
       if(this.state.inputText3)
       {
         temp=temp.filter(t=>t.CheckType == this.state.inputText3);
@@ -210,6 +218,10 @@ class SK004CheckListNew extends React.Component {
       {
         temp=temp.filter(t=>t.CheckDepart.includes(this.state.inputText4));
       }
+      if(this.state.inputText5)
+      {
+        temp=temp.filter(t=>t.CheckPost!=null &&t.CheckPost.includes(this.state.inputText5));
+      }
       this.setState({dataList :temp})
     }
     onTableBtnExport() {
@@ -295,15 +307,22 @@ class SK004CheckListNew extends React.Component {
             DetailContents:[]
         });
       };
-      // handleSearch = (evt) => {
-      //   const { value } = evt.target;
-      //   this.setState({ inputText: value ? value : "" });
-      // };
-      handleSearch=(value)=>{
+      handleSearch = ({data, record}) => {
         this.setState({
-          inputText: value
+          production: {
+            ...this.state.production,
+            PRODUCTION_UNIT_ID: data[0],
+            Nav_ProductionUnit: { NAME: record?.NAME },
+          },
+          inputText: record?.NAME,
+          productionId: record?.ID 
         })
-      }
+      };
+      // handleSearch=(value)=>{
+      //   this.setState({
+      //     inputText: value
+      //   })
+      // }
       // handleSearch2 = (evt) => {
       //   const { value } = evt.target;
       //   this.setState({ inputText2: value ? value : "" });
@@ -313,6 +332,11 @@ class SK004CheckListNew extends React.Component {
           inputText2: value
         })
       }
+      handleSearch6=(value)=>{
+        this.setState({
+          inputText6: value
+        })
+      }
       handleSearch3 = ({data, record}) => {
         // const { value } = evt.target;
         // this.setState({ inputText3: value ? value : "" });
@@ -330,6 +354,11 @@ class SK004CheckListNew extends React.Component {
           inputText4: e.target.value
         })
       }
+      handleSearch5=(e)=>{
+        this.setState({
+          inputText5: e.target.value
+        })
+      }
       // handleSearch4 = ({data, record}) => {
       //   this.setState({
       //     depart: {
@@ -386,8 +415,7 @@ class SK004CheckListNew extends React.Component {
                   label={'生产单元'}
                   {...formItemLayout}
                 >
-                   <Select 
-                    // defaultValue="风险管理"
+                   {/* <Select 
                     style={{width:'180px'}}
                     allowClear
                     onChange={this.handleSearch}
@@ -399,11 +427,13 @@ class SK004CheckListNew extends React.Component {
       <Option value="32">非金属</Option>
       <Option value="31">职能口</Option>
       <Option value="40">地下矿</Option>
-                    </Select>
-                    {/* <Input
-                onChange={this.handleSearch}
-                style={{ width: "150px" }}
-              ></Input> */}
+                    </Select> */}
+                   <DropDownPagination inputDataApi={'FM/UserProductionUnitSet/OrderPaged'} fieldName={'Nav_ProductionUnit.NAME'}
+                    data={this.state.production} onSelect={this.handleSearch} onFilter={({ params }) => {
+                      params.OrderType = 1
+                    //   params.Keyword = this.state.inputText3
+                      params.OrgId =  this.props.login.OrgId
+                    }} />
                 </Form.Item>
                
           </Col>
@@ -450,6 +480,25 @@ class SK004CheckListNew extends React.Component {
                
           </Col>
           <Col span={5} style={{ marginLeft: "10px" }}>
+          <Form.Item
+                  label={'检查周期'}
+                  {...formItemLayout}
+                >
+                  <Select 
+                    allowClear
+                    style={{width:'180px'}}
+                    onChange={this.handleSearch6}
+                    >
+                        <Option value="每天">每天</Option>
+      <Option value="每周">每周</Option>
+      <Option value="每月">每月</Option>
+      <Option value="每季度">每季度</Option>
+      <Option value="每半年">每半年</Option>
+      <Option value="每年">每年</Option>
+                    </Select>
+                </Form.Item>
+           </Col>
+          <Col span={5} style={{ marginLeft: "10px" }}> 
           <Form.Item
                   label={'检查部门'}
                   {...formItemLayout}
@@ -465,6 +514,17 @@ class SK004CheckListNew extends React.Component {
                       params.OrgId =  this.props.login.OrgId
                     }} /> */}
                 </Form.Item>
+          </Col>
+          <Col span={5} style={{ marginLeft: "10px" }}> 
+          <Form.Item
+                  label={'检查对象'}
+                  {...formItemLayout}
+                >
+                    <Input
+                onChange={this.handleSearch5}
+                style={{ width: "150px" }}
+              ></Input>
+                </Form.Item>
                
           </Col>
           <Col span={1} style={{ marginLeft: "20px" }}><Button type='primary' onClick={() => this.loadData2()}>查询</Button></Col>

src/components/CustomPages/SK/SK010ShowPrint.js

@@ -158,6 +158,7 @@ class SK010ShowPrint extends React.Component {
                         <td className={stylesStep.fontBold}>隐患描述</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患等级</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患地点</td>
+                        <td className={stylesStep.fontBold}>隐患原因</td>
                         <td className={stylesStep.fontBold}>隐患照片</td>
                     </tr>
                     {
@@ -224,6 +225,16 @@ class SK010ShowPrint extends React.Component {
                                         item.HIDDEN_PLACE
                                     }
                                 </td>
+                                <td>
+                                    {
+                                        item?.Nav_CheckRecordDetailReasons && item?.Nav_CheckRecordDetailReasons.map((item2, i) => {
+
+                                            return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
+
+                                            // return <tr><label> {item2.Nav_User?.NAME}</label></tr>
+                                        })
+                                    }
+                                </td>
                                 <td>
                                     {
                                         showFiles(item?.Nav_CheckRecordDetailFiles, config.picServerHost, this)

src/components/CustomPages/SK/SK012ShowPrint.js

@@ -179,6 +179,7 @@ class SK012ShowPrint extends React.Component {
                         <td className={stylesStep.fontBold}>隐患描述</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患等级</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患地点</td>
+                        <td className={stylesStep.fontBold}>隐患原因</td>
                         <td className={stylesStep.fontBold}>隐患照片</td>
                     </tr>
                     {
@@ -245,6 +246,16 @@ class SK012ShowPrint extends React.Component {
                                         item.HIDDEN_PLACE
                                     }
                                 </td>
+                                <td>
+                                    {
+                                        item?.Nav_CheckRecordDetailReasons && item?.Nav_CheckRecordDetailReasons.map((item2, i) => {
+
+                                            return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
+
+                                            // return <tr><label> {item2.Nav_User?.NAME}</label></tr>
+                                        })
+                                    }
+                                </td>
                                 <td>
                                     {
                                         showFiles(item?.Nav_CheckRecordDetailFiles, config.picServerHost, this)

src/components/CustomPages/SK/SK014ShowPrint.js

@@ -154,6 +154,7 @@ class SK014ShowPrint extends React.Component {
                         <td className={stylesStep.fontBold}>隐患描述</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患等级</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患地点</td>
+                        <td className={stylesStep.fontBold}>隐患原因</td>
                         <td width='10%' className={stylesStep.fontBold}>整改责任人</td>
                         <td width='10%' className={stylesStep.fontBold}>整改期限</td>
                         <td className={stylesStep.fontBold}>隐患照片</td>
@@ -189,6 +190,16 @@ class SK014ShowPrint extends React.Component {
                                     {
                                         item.HIDDEN_PLACE
                                     }
+                                </td>
+                                 <td>
+                                    {
+                                        item?.Nav_ReportDetailReasons && item?.Nav_ReportDetailReasons.map((item2, i) => {
+
+                                            return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
+
+                                            // return <tr><label> {item2.Nav_User?.NAME}</label></tr>
+                                        })
+                                    }
                                 </td>
                                 <td>
                                     {

src/components/CustomPages/SK/SK018ShowPrint.js

@@ -38,7 +38,23 @@ class SK018ShowPrint extends React.Component {
         if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
             this.props.data.onCancel();
     }
-
+    onTableBtnAgree() {
+        this.props.dispatch({
+            type: 'app/getDataByPost',
+            url: 'SK/SKHiddenDangerConfirm/IdentityUpdate',
+            payload: {
+                ID: this.props.data.id,
+                TaskID: this.props.data.TaskID,
+            },
+            onComplete: (ret) => {
+                if (ret) {
+                    message.success('确认成功！');
+                    this.setState({ BtnAgreeDisplay: 'none' })
+                    this.BtnClose();
+                }
+            }
+        })
+    }
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
         extendRule(json, 'ID', 1, dataId);
@@ -117,6 +133,7 @@ class SK018ShowPrint extends React.Component {
                     pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
                 />
                 <Button style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
+                <Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >确认</Button>
             </div>
             <div ref={el => (this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id}>
                 <h1 style={{ textAlign: 'center', margin: '15px' }}>隐患确认单</h1>
@@ -147,10 +164,20 @@ class SK018ShowPrint extends React.Component {
                                 <Descriptions.Item label="系统隐患描述">{data.Nav_Question?.DESCREPTION}</Descriptions.Item>
                                 <Descriptions.Item label="隐患等级">{enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]}</Descriptions.Item>
                                 <Descriptions.Item label="整改措施">{data.RECTIFICATION_MEASURES}</Descriptions.Item>
+                                 <Descriptions.Item label="隐患原因">{
+                                    data?.Nav_Reasons && data?.Nav_Reasons.map((item2, i) => {
+
+                                        return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
+
+                                        // return <tr><label> {item2.Nav_User?.NAME}</label></tr>
+                                    })
+                                }</Descriptions.Item>
                                 {/* <Descriptions.Item label="检查层级">{enums.FMDepartmentType.enums[data.DEPARTMENT_TYPE]}</Descriptions.Item>
                                 <Descriptions.Item label="检查类型">{data.Nav_CheckType ? data.Nav_CheckType.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="检查周期">{enums.BSPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]}</Descriptions.Item> */}
-                                <Descriptions.Item label="整改责任人">{data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}</Descriptions.Item>
+                                <Descriptions.Item label="整改责任人">{ data.STATUS == 30 && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
+                                    showUserSign(data.Nav_RecitifyUser, config.picServerHost)
+                                        : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改期限">{moment(data.RECITIFY_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="附件">{
                                     showFiles(data?.Nav_Files, config.picServerHost, this)

src/components/CustomPages/SK/SK020ShowPrint.js

@@ -154,6 +154,7 @@ class SK020ShowPrint extends React.Component {
                         <td className={stylesStep.fontBold}>隐患描述</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患等级</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患地点</td>
+                        <td className={stylesStep.fontBold}>隐患原因</td>
                         <td width='10%' className={stylesStep.fontBold}>整改措施</td>
                         <td width='10%' className={stylesStep.fontBold}>整改期限</td>
                         <td width='10%' className={stylesStep.fontBold}>整改落实人</td>
@@ -191,6 +192,16 @@ class SK020ShowPrint extends React.Component {
                                         item.HIDDEN_PLACE
                                     }
                                 </td>
+                                <td>
+                                    {
+                                        item?.Nav_RectifyDetailReasons && item?.Nav_RectifyDetailReasons.map((item2, i) => {
+
+                                            return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
+
+                                            // return <tr><label> {item2.Nav_User?.NAME}</label></tr>
+                                        })
+                                    }
+                                </td>
                                 <td>
                                     {
                                         item.RECTIFICATION_MEASURES

src/components/CustomPages/SK/SK022ShowPrint.js

@@ -122,6 +122,14 @@ class SK022ShowPrint extends React.Component {
                                 <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                                 <Descriptions.Item label="检查区域">{data.Nav_RiskArea ? data.Nav_RiskArea.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="隐患地点">{data.HIDDEN_PLACE}</Descriptions.Item>
+                                <Descriptions.Item label="隐患原因">{
+                                    data?.Nav_RectifyReasons && data?.Nav_RectifyReasons.map((item2, i) => {
+
+                                        return <a>{(i > 0 ? "," : "") + item2.Nav_Reason.NAME}</a>
+
+                                        // return <tr><label> {item2.Nav_User?.NAME}</label></tr>
+                                    })
+                                }</Descriptions.Item>
                                 <Descriptions.Item label="隐患描述">{data.Nav_Question?.DESCREPTION?data.Nav_Question.DESCREPTION:data.HIDDEN_DESCRIPTION}</Descriptions.Item>
                                 <Descriptions.Item label="隐患等级">{enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]}</Descriptions.Item>
                                 <Descriptions.Item label="整改措施">{data.RECTIFICATION_MEASURES}</Descriptions.Item>

src/files/edit/SK006.js

@@ -15,7 +15,7 @@ export default {
   onBeforeEdit(params){
     const { isNew, isCopy, dispatch, login, setFieldValue,data, stateData ,getFieldValue} = params ? params : {};
    
-    if (isNew) {debugger
+    if (isNew) {
         setFieldValue('MineType', login.currentMineType);
         let json = initFilter(login.OrgId);
         extendRule(json, 'ID', 1, login.user.DEPARTMENT_ID);

src/files/edit/SK016.js

@@ -0,0 +1,40 @@
+import { message } from "antd/lib/index";
+import { getPropertyData, extendInclude,extendIgnoreDataRule, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
+import moment from 'moment';
+import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd';
+/**
+ * @return {string}
+ */
+// 编辑
+export default {
+  onBeforeSaveHandleRecord(params) {
+    params.record.TaskID = params.data.TaskID    //TaskID传递消息表ID
+    params.record.PUBLISH = params.customParams;
+    // params.record.FORM_CODE = params.data.reloadKey.substring(0,params.data.reloadKey.indexOf("_"));
+  },
+  onBeforeEdit(params){
+    const { isNew, isCopy, dispatch, login, setFieldValue,data, stateData ,getFieldValue} = params ? params : {};
+   
+    if (isNew) {
+        setFieldValue('MineType', login.currentMineType);
+        let json = initFilter(login.OrgId);
+        extendRule(json, 'ID', 1, login.user.DEPARTMENT_ID);
+        extendInclude(json, 'Nav_Unit')
+        extendIgnoreDataRule(json)
+        dispatch({
+          type: 'app/getDataByPost',
+          url: 'FM/Department/Get',
+          payload: json,
+          onlyData: false,
+          onComplete: (re) => {
+            if (re && re.IsSuccessful && re.Data) {
+              setFieldValue('Nav_ProdutionUnit.NAME', re.Data?.Nav_Unit?.NAME);
+              setFieldValue('PRODUCTION_UNIT_ID', re.Data.PRODUCTION_UNIT_ID);
+            }
+          }
+        })
+      }
+     
+  },
+ 
+}

src/files/edit/SK020.js

@@ -0,0 +1,37 @@
+import { message } from "antd/lib/index";
+import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
+import moment from 'moment';
+import config from "../../config.js"
+import storage from '../../utils/storage'
+import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd';
+/**
+ * @return {string}
+ */
+// 编辑
+export default {
+  onBeforeSaveHandleRecord(params) {
+    params.record.TaskID = params.data.TaskID    //TaskID传递消息表ID
+    params.record.PUBLISH = params.customParams;
+    // params.record.FORM_CODE = params.data.reloadKey.substring(0,params.data.reloadKey.indexOf("_"));
+  },
+  onBeforeEdit(params) {
+    const { isNew, dispatch, login, setFieldValueByBatch, setFieldEditable, setFieldVisible,stateData } = params ? params : {};
+    if (isNew) {
+
+    }
+    else
+    {
+      if(stateData.HIDDEN_DANGER_CONFIRM_ID && stateData.HIDDEN_DANGER_CONFIRM_ID!==null)
+      {
+        setFieldVisible("Nav_CheckType.NAME", false);
+        setFieldVisible("PLANCHECKFREQUENCY", false);
+        setFieldVisible("DEPARTMENT_TYPE", false);
+      }
+      else
+      {setFieldVisible("Nav_CheckType.NAME", true);
+      setFieldVisible("PLANCHECKFREQUENCY", true);
+        setFieldVisible("DEPARTMENT_TYPE", true);
+    }
+    }
+  },
+}

src/files/edit/SK024.js

@@ -0,0 +1,32 @@
+import { message } from "antd/lib/index";
+import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
+import moment from 'moment';
+import config from "../../config.js"
+import storage from '../../utils/storage'
+import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd';
+/**
+ * @return {string}
+ */
+// 编辑
+export default {
+  onBeforeSaveHandleRecord(params) {
+    params.record.TaskID = params.data.TaskID    //TaskID传递消息表ID
+    params.record.PUBLISH = params.customParams;
+    // params.record.FORM_CODE = params.data.reloadKey.substring(0,params.data.reloadKey.indexOf("_"));
+  },
+  onBeforeEdit(params) {
+    const { isNew, dispatch, login, setFieldValueByBatch, setFieldEditable, setFieldVisible,stateData } = params ? params : {};
+    if (isNew) {
+      setFieldVisible("CONTEXT", false);
+    }
+    else
+    {
+      if(stateData.STATUS === 40)
+      {
+        setFieldVisible("CONTEXT", true);
+      }
+      else
+      {setFieldVisible("CONTEXT", false);}
+    }
+  },
+}