修复部分bug及功能调整

.env.development

@@ -1,9 +1,11 @@
 # base api
-REACT_APP_BASE_API = 'http://112.124.59.133:8081/'
+REACT_APP_BASE_API = 'http://118.31.245.65:8081/'
 
 #112.124.59.133:8081  linux服务器
 #121.43.139.179:8802  公网
 #172.18.116.20:8802 
+#118.31.245.65:8081 
+#192.168.51.76 李加喜
 # http://192.168.51.80:8081/ 本地
 # 192.168.1.45:8088/imed/pfm/
 

.env.production

@@ -1,5 +1,5 @@
 # base api
-REACT_APP_BASE_API = 'http://118.31.245.65:8081/'
+REACT_APP_BASE_API = 'http://118.31.245.65:8113/'
 
 #192.168.51.80
 #http://121.43.139.179:8802 线上环境

src/App.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-04-23 15:39:41
- * @LastEditTime: 2021-07-09 10:39:59
+ * @LastEditTime: 2021-12-06 13:49:57
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /react-antd-admin-template/src/App.js

src/api/checkPointManage.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-04-27 17:11:09
- * @LastEditTime: 2021-05-14 11:26:10
+ * @LastEditTime: 2021-11-16 15:20:03
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /react-antd-admin-template/src/api/checkPointManage.js
@@ -182,7 +182,7 @@ export function delChekPointAndGroup(data) {
 //查核点和条文条款中间关系
 export function checkPointAndArticlePage(data) {
     return request({
-      url: '/checkPoint/checkPointAndArticlePage',
+      url: '/checkPoint/checkPointAndReviewRulesPage',
       method: 'get',
       params:{...data}
     })
@@ -191,9 +191,9 @@ export function checkPointAndArticlePage(data) {
 //删除查核点和条文条款中间关系
 export function delCheckPointAndArticle(data) {
     return request({
-      url: '/checkPoint/delCheckPointAndArticle',
+      url: '/checkPoint/delCheckPointAndReviewRules',
       method: 'post',
-      data
+      data:data
     })
 }
 

src/api/provisionsManage.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-04-28 17:06:16
- * @LastEditTime: 2021-04-28 17:13:52
+ * @LastEditTime: 2021-11-16 11:37:41
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /react-antd-admin-template/src/api/provisionsManage.js
@@ -11,20 +11,20 @@ import request from '@/utils/request'
 //条文条款列表
 export function getProvisionsList(data) {
   return request({
-    url: '/article/list',
+    url: '/pfmreviewrules/listAll',
     method: 'get',
     params:{...data}
   })
 }
 
-//新增条文条款列表
-export function addProvisions(data) {
-    return request({
-      url: '/article/addArticle',
-      method: 'post',
-      data
-    })
-}
+// //新增条文条款列表
+// export function addProvisions(data) {
+//     return request({
+//       url: '/article/addArticle',
+//       method: 'post',
+//       data
+//     })
+// }
 
 //删除条文条款列表
 export function delProvisions(data) {
@@ -38,17 +38,17 @@ export function delProvisions(data) {
 //编辑条文条款列表
 export function editProvisions(data) {
     return request({
-      url: '/article/editArticle',
+      url: '/pfmreviewrules/updateRulesCheckPoint',
       method: 'post',
       data
     })
 }
 
-//编辑条文条款列表
-export function provisionsBindCheckPoint(data) {
-    return request({
-      url: '/article/bindArticleAndCheckPoint',
-      method: 'post',
-      data
-    })
-}
+// //编辑条文条款列表
+// export function provisionsBindCheckPoint(data) {
+//     return request({
+//       url: '/article/bindArticleAndCheckPoint',
+//       method: 'post',
+//       data
+//     })
+// }

src/router/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-04-23 15:39:41
- * @LastEditTime: 2021-04-30 14:16:28
+ * @LastEditTime: 2021-12-06 15:50:41
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /react-antd-admin-template/src/router/index.js
@@ -15,6 +15,7 @@ import Login from "@/views/login";
 
 
 const hospSign = JSON.parse(localStorage.getItem('hospSign'));
+console.log({hospSign});
 const params = hospSign?`?hospSign=${hospSign}`:'';
 // console.log({hospSign});
 class Router extends React.Component {

src/store/actions/auth.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-04-23 15:39:41
- * @LastEditTime: 2021-04-30 11:29:29
+ * @LastEditTime: 2021-12-06 16:24:59
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /react-antd-admin-template/src/store/actions/auth.js
@@ -18,7 +18,6 @@ export const login = (username, password,hospSign) => (dispatch) => {
         console.log({'登录返回':data});
         if (data.status === 200) {
           const token = data.data.token;
-          // console.log({token});
           dispatch(setUserToken(token));
           setToken(token);
           resolve(data.data);
@@ -32,30 +31,10 @@ export const login = (username, password,hospSign) => (dispatch) => {
   });
 };
 
-export const logout = (token) => (dispatch) => {
+export const logout = () => (dispatch) => {
   return new Promise((resolve, reject) => {
-
     dispatch(resetUser());
     removeToken();
-    // resolve(data);
     localStorage.removeItem('userInfo');
-    // reqLogout(token)
-    //   .then((response) => {
-    //     console.log({response});
-    //     const { data } = response;
-    //     console.log({data});
-    //     if (data.status === 0) {
-    //       dispatch(resetUser());
-    //       removeToken();
-    //       resolve(data);
-    //       localStorage.removeItem('userInfo');
-    //     } else {
-    //       const msg = data.message;
-    //       reject(msg);
-    //     }
-    //   })
-    //   .catch((error) => {
-    //     reject(error);
-    //   });
   });
 };

src/store/actions/user.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-04-23 15:39:41
- * @LastEditTime: 2021-04-28 16:02:27
+ * @LastEditTime: 2021-12-06 13:46:20
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /react-antd-admin-template/src/store/actions/user.js
@@ -26,14 +26,6 @@ export const getUserInfo = (data) => (dispatch) => {
       // const msg = data.message;
       // reject(msg);
     }
-    // reqUserInfo(token)
-    //   .then((response) => {
-    //     const { data } = response;
-        
-    //   })
-    //   .catch((error) => {
-    //     reject(error);
-    //   });
   });
 };
 

src/utils/request.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: your name
+ * @Date: 2021-04-23 15:39:41
+ * @LastEditTime: 2021-12-06 16:22:22
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /react-antd-admin-template/src/utils/request.js
+ */
 import axios from "axios";
 import store from "@/store";
 import { Modal } from "antd";
@@ -39,8 +47,7 @@ service.interceptors.response.use(
         title: "抱歉，登录已过期请重新登录！",
         okText: "确定",
         onOk() {
-          let token = store.getState().user.token;
-          store.dispatch(logout(token));
+          store.dispatch(logout());
         },
         onCancel() {
           console.log("Cancel");
@@ -48,62 +55,24 @@ service.interceptors.response.use(
       });
       // return Promise.reject('error');
     }else {
-      console.log('出现错误');
       const {msg} = data;
       Modal.confirm({
         title: "抱歉，出现错误！",
         content:msg,
         okText: "确定",
-        onOk() {
-      
-        }
+        onOk() {}
       });
     }
     
   },
-  /**
-   * 下面的注释为通过在response里，自定义code来标示请求状态
-   * 当code返回如下情况则说明权限有问题，登出并返回到登录页
-   * 如想通过 xmlhttprequest 来状态码标识 逻辑可写在下面error中
-   * 以下代码均为样例，请结合自生需求加以修改，若不需要，则可删除
-   */
-  // response => {
-  //   const res = response.data
-  //   if (res.code !== 20000) {
-  //     Message({
-  //       message: res.message,
-  //       type: 'error',
-  //       duration: 5 * 1000
-  //     })
-  //     // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
-  //     if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
-  //       // 请自行在引入 MessageBox
-  //       // import { Message, MessageBox } from 'element-ui'
-  //       MessageBox.confirm('你已被登出，可以取消继续留在该页面，或者重新登录', '确定登出', {
-  //         confirmButtonText: '重新登录',
-  //         cancelButtonText: '取消',
-  //         type: 'warning'
-  //       }).then(() => {
-  //         store.dispatch('FedLogOut').then(() => {
-  //           location.reload() // 为了重新实例化vue-router对象 避免bug
-  //         })
-  //       })
-  //     }
-  //     return Promise.reject('error')
-  //   } else {
-  //     return response.data
-  //   }
-  // },
   (error) => {
     console.log("err" + error); // for debug
-    const { status,msg } = error.response;
+    const {msg } = error.response;
     Modal.confirm({
       title: "抱歉，出现错误！",
       content:msg,
       okText: "确定",
-      onOk() {
-    
-      }
+      onOk() { }
     });
     return Promise.reject(error);
   }

src/views/checkPointManage/pointAndProvisions/pointAndProvisions.jsx

@@ -19,35 +19,34 @@ const PointAndCheckGroup = () => {
   const columns = [
     {
       title: 'id',
-      dataIndex: 'id',
-      key: 'id',
-      width:'10%',
-      render: text => <a>{text}</a>,
+      dataIndex: 'checkPointRuleId',
+      key: 'checkPointRuleId',
+      width:'10%'
     },
+    {
+      title: '条文条款ID',
+      dataIndex: 'ruleId',
+      key: 'ruleId',
+      editable: true,
+  },
+  {
+      title: '查核要点ID',
+      dataIndex: 'checkPointId',
+      key: 'checkPointId',
+      editable: true,
+  },
     {
       title: '条文四码',
-      dataIndex: 'articleVersion',
-      key: 'articleVersion',
+      dataIndex: 'reviewRulesNumStr',
+      key: 'reviewRulesNumStr',
       width:'10%',
     },
     {
       title: '条文内容',
-      dataIndex: 'articleName',
-      key: 'articleName',
+      dataIndex: 'reviewRulesName',
+      key: 'reviewRulesName',
       editable: true,
     },
-    {
-        title: '条文条款ID',
-        dataIndex: 'articleId',
-        key: 'articleId',
-        editable: true,
-    },
-    {
-        title: '查核要点ID',
-        dataIndex: 'checkPointId',
-        key: 'checkPointId',
-        editable: true,
-    },
     {
         title: '查核要点',
         dataIndex: 'checkPointName',
@@ -80,7 +79,7 @@ const PointAndCheckGroup = () => {
   }
 
   const deleteCallback = (record)=>{
-    delCheckPointAndArticle([record.id]).then(res=>{
+    delCheckPointAndArticle([record.checkPointRuleId]).then(res=>{
         if(res.data.msg=="success"){
                 getData();
         }

src/views/generalSetting/templateMana/drawer.jsx

@@ -76,7 +76,6 @@ class EditableCell extends React.Component {
             <div
                 className="editable-cell-value-wrap"
                 style={{ paddingRight: 24 }}
-            // onClick={this.toggleEdit}
             >
                 {children}
             </div>

src/views/login/index.jsx

@@ -5,6 +5,7 @@ import { connect } from "react-redux";
 import DocumentTitle from "react-document-title";
 import "./index.less";
 import { login, getUserInfo,setUserInfo} from "@/store/actions";
+
 // import encryption from '../../utils/crypto';
 // import axios from "axios";
 
@@ -109,7 +110,7 @@ const Login = (props) => {
         
         <Form onSubmit={handleSubmit} className="content">
           <div className="title">
-            <h2>用户登录</h2>
+            <h2>PFM管理工具</h2>
           </div>
           <Spin spinning={loading} tip="登录中...">
             <Form.Item>

src/views/login/index.less

@@ -1,10 +1,12 @@
+
+
 .login-container {
   height: 100%;
   overflow: hidden;
   position: relative;
-  // background: #2d3a4b;
-  // background-image: url('~@/assets/images/bg.jpg');
-  background-size: 100% 100%;
+  background: #3377FF;
+  background-image: url('~@/assets/loginBg.png');
+  background-size:cover;
   & > .title {
     color: #eee;
     font-size: 26px;

src/views/provisionsManage/provisions.jsx

@@ -1,7 +1,7 @@
 import React,{ useState,useEffect,useRef } from 'react';
 
 import {listAll} from "@/api/checkGroupManage.js";
-import {getProvisionsList,addProvisions,delProvisions,editProvisions,provisionsBindCheckPoint} from "@/api/provisionsManage.js";
+import {getProvisionsList,delProvisions,editProvisions} from "@/api/provisionsManage.js";
 import { Button,Form,Input,Select} from 'antd';
 import EditableFormTable from './table';
 import ModalWrap from '@/components/Modal/modal.js';
@@ -40,32 +40,7 @@ class TableForm extends React.Component {
         });
     };
 
-    handleSelectChange=(value)=>{
-    //   console.log(value);
-      const {id,name} = this.props.content;
-      this.setState({
-        BindStatus:'validating'
-      },()=>{
-          this.bindCheckPoint({
-            "articleId": id,  
-            "checkPointIds": [ 
-                value
-            ]
-          });
-      })
-    }
 
-  
-    bindCheckPoint=(obj)=>{
-        provisionsBindCheckPoint(obj).then(res=>{
-            // console.log({res});
-          if(res.data.msg=="success"){
-               this.setState({
-                BindStatus:'success'
-               })
-          }
-        })
-    }
 
     componentWillUnmount(){
         this.props.form.resetFields();
@@ -73,7 +48,7 @@ class TableForm extends React.Component {
 
     componentDidMount(){
       listAll().then(res=>{
-        // console.log({res});
+        console.log({res});
         const temp = res.data.data;
         this.setState({
           checkPointList:temp
@@ -93,7 +68,7 @@ class TableForm extends React.Component {
         const { getFieldDecorator } = this.props.form;
         const {content,edit} = this.props;
         const {BindStatus,checkPointList} = this.state;
-        const {articleName,articleVersion,id,ruleName} = content;
+        const {numStr,id} = content;
         // const bindGroupDefault = groupManaList.length>0?groupManaList[0].name:'bindGroupDefault';
        
         const formItemLayout = {
@@ -119,18 +94,7 @@ class TableForm extends React.Component {
             <Form {...formItemLayout}  >
                    <Form.Item label="条文条款版本">
                    {
-                        getFieldDecorator('articleVersion',config(articleVersion,[{required: true,message: '请输入条文条款版本!',}]))(<Input />)
-                    }
-                   </Form.Item>
-                   <Form.Item label="条文条款">
-                   {
-                        getFieldDecorator('articleName',config(articleName,[{required: true,message: '请输入条文条款!',}]))(<Input.TextArea autoSize={{minRows:5}} />)
-                    }
-                   </Form.Item>
-                   
-                   <Form.Item label="制度名称">
-                   {
-                        getFieldDecorator('ruleName',config(ruleName,[{required: true,message: '请输入制度名称!',}]))(<Input.TextArea autoSize={{minRows:5}} />)
+                        getFieldDecorator('numStr',config(numStr,[{required: true,message: '请输入条文条款版本!',}]))(<Input disabled style={{width:200}} />)
                     }
                    </Form.Item>
                    {
@@ -144,7 +108,6 @@ class TableForm extends React.Component {
                                 <Select
                                     placeholder=""
                                     style={{width:'25%'}}
-                                    onChange={this.handleSelectChange}
                                     showSearch
                                     optionFilterProp="children"
                                     filterOption={(input, option) =>
@@ -196,39 +159,24 @@ const CheckGroupManage = () => {
     },
     {
       title: '条文四码',
-      dataIndex: 'articleVersion',
-      key: 'articleVersion',
+      dataIndex: 'numStr',
+      key: 'numStr',
       editable: true,
       width:'10%',
     },
     {
       title: '条文内容',
-      dataIndex: 'articleName',
-      key: 'articleName',
+      dataIndex: 'name',
+      key: 'name',
       editable: true,
       width:'30%',
     },
-    {
-        title: '制度类型',
-        dataIndex: 'ruleType',
-        key: 'ruleType',
-        editable: true,
-        width:'10%',
-    },
-    {
-        title: '制度名',
-        dataIndex: 'ruleName',
-        key: 'ruleName',
-        editable: true,
-        // width:'10%',
-    },
   ];
 
 
 
   const getData = async (pageObj)=>{
     let data = await getProvisionsList(pageObj);
-    
     const renderData = data.data.data.list.map((item,index)=>{
           return {
               ...item,
@@ -263,54 +211,20 @@ const CheckGroupManage = () => {
     })
   }
 
-  const handleAdd=()=>{
-
-    setifEdit(false);
-    //初始化表单
-    if(arr[0]){
-        setitem(arr[0]);
-    }else {
-        setitem({
-            "articleName":"", // 条文条款名称
-            "articleVersion": "", // 条文条款版本
-            "ruleName": "", // 制度名称
-            "ruleType": 0  // 制度类型 暂时定死为0
-        });
-    }
-    
-    modalNode.current.showModal();
-  }
+
 
 
 
   const commitForm = async ()=>{  //表单提交
       console.log('提交表单');
-      // console.log({formNode});
       const formData = await formNode.current.handleCommit();
       modalNode.current.handleCancel();
       thisForm.current.resetFields();
       formNode.current.state.BindStatus="";
-      // console.log({formData});
-      if(!ifEdit){
-        const param = {
-            "articleName":formData.articleName, // 条文条款名称
-            "articleVersion":formData.articleVersion, // 条文条款版本
-            "ruleName":formData.ruleName, // 制度名称
-            "ruleType": 0  // 制度类型 暂时定死为0
-        }
-        addProvisions(param).then(res=>{
-          if(res&&res.data.msg=="success"){
-           getData();
-          }
-        })
-      }
       if(ifEdit){
         const param = {
-            "id":item.id,
-            "articleName":formData.articleName, // 条文条款名称
-            "articleVersion":formData.articleVersion, // 条文条款版本
-            "ruleName":formData.ruleName, // 制度名称
-            "ruleType": 0  // 制度类型 暂时定死为0
+            "checkPointId":formData.bindCheckPoint, // 绑定的查核项
+            "reviewRulesNumstr":formData.numStr, // 条文条款四码
         }
         // console.log({param});
         editProvisions(param).then(res=>{
@@ -341,7 +255,7 @@ const CheckGroupManage = () => {
   return ( 
     <div className="app-container">
           <h1>条文条款管理</h1>
-          <ModalWrap width={1000} ref={modalNode} show={ifShowDialog} handleOkCallback={commitForm} >
+          <ModalWrap width={700} ref={modalNode} show={ifShowDialog} handleOkCallback={commitForm} >
                 <WrappedTableForm edit={ifEdit} content={item} ref={thisForm} wrappedComponentRef={formNode} />
           </ModalWrap>
           

src/views/provisionsManage/table.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-04-28 14:17:04
- * @LastEditTime: 2021-04-30 14:22:43
+ * @LastEditTime: 2021-11-16 11:43:10
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /react-antd-admin-template/src/views/provisionsManage/table.js
@@ -34,19 +34,6 @@ import { Table,Popconfirm, Form,Divider} from 'antd';
 
 class EditableTable extends React.Component {
   
-//   static defaultProps = {
-//         editCallback: ()=>{},
-//         deleteCallback:()=>{},
-//         callbackFromChild:()=>{},
-//         config:{
-//             action:{
-//                 deleteBtn:true,
-//                 editBtn:true,  
-//                 editPermissionBtn:false
-//             }
-//         } 
-//   }
-
   constructor(props) {
     super(props);
     this.state = { data:[], editingKey: '',loading:false};
@@ -64,7 +51,7 @@ class EditableTable extends React.Component {
           return (
             <span>
                  <a disabled={editingKey !== ''} onClick={() => this.editItem(record)}>
-                        编辑
+                        关联要点
                  </a>
                  <Divider type="vertical" />
                  <Popconfirm title=" 是否确定删除?" onConfirm={()=>this.delItem(record)}>