Merge branch 'master' of http://gitlab.fecribd.com/root/webapp_tfse_admin

.gitlab-ci.yml

@@ -4,12 +4,12 @@ stages:
 job:
   stage: deploy
   script:
-    - docker stop tfse_admin
+    - docker stop tfse_admin_webapp_v0.2
-    - docker rm tfse_admin
+    - docker rm tfse_admin_webapp_v0.2
-    - docker build -t tfse_admin .
+    - docker build -t tfse_admin_webapp_v0.2 .
-    - docker run -d --restart=always -p 51004:51004 --name tfse_admin tfse_admin
+    - docker run -d --restart=always -p 51004:51004 --name tfse_admin_webapp_v0.2 tfse_admin_webapp_v0.2
   only:
     - master
   tags:
-    - tfse_admin
+    - tfse_admin_webapp_v0.2
  

src/pages/home/branch/test/company.js

@@ -14,11 +14,11 @@ class TestCompany extends Component {
     this.state = {
       data: [
         { title: "企业认证", desc: "根据企业名称、统一社会信用代码、法人姓名进行企业认证", obj: { company: "", code: "", legal_person: "", cid: "" }, label: ["企业名称", "统一社会信用代码", "法人姓名", "企业ID"], url: "/admin/test/enterprise_certification", method: 'post' },
-        { title: "级联删除企业ID", desc: "根据cid，删除与其有关的所有记录", obj: { cid: "", "企业数据": [] }, label: ["企业ID", "企业数据"], url: "/admin/test/delete_cid_cascade", method: 'post', plainOptions: ['综合评价分析', '指标明细', '风险要素分析', '财务要素分析', 'ESG要素分析'] },
+        { title: "级联删除企业ID", desc: "根据cid，删除与其有关的所有记录", obj: { cid: "", data: [] }, label: ["企业ID", "企业数据"], url: "/admin/test/delete_cid_cascade", method: 'post' },
-        { title: "级联删除评价ID", desc: "根据rid，删除与其有关的所有记录", obj: { rid: "", type: "", "评价记录": [] }, label: ["评价ID", "评价类型", "评价记录"], url: "/admin/test/delete_rid_cascade", method: 'post', plainOptions: ['评价结果', '报告数据', '综合信用报告', '评价证书', '综合评价填报'] },
+        { title: "级联删除评价ID", desc: "根据rid，删除与其有关的所有记录", obj: { rid: "", record: "", data: [] }, label: ["评价ID", "评价类型", "评价记录"], url: "/admin/test/delete_rid_cascade", method: 'post' },
         { title: "企业认证状态修改", desc: "修改企业认证状态，只能修改为未认证，如需认证则通过认证接口", obj: { cid: "" }, label: ["企业ID"], url: "/admin/test/change_verified", method: 'get' },
-        { title: "级联生成企业主页", desc: "根据rid，生成企业主页信息", obj: { rid: "", type: "" }, label: ["评价ID", "评价类型"], url: "/admin/test/delete_rid_cascade", method: 'post' },
+        { title: "级联生成企业主页", desc: "根据rid，生成企业主页信息", obj: { rid: "", types: "" }, label: ["评价ID", "评价类型"], url: "/admin/test/generate_rid_information", method: 'post' },
-        { title: "新增测试企业", desc: "新增一家测试测试", obj: { email: "", company: "",code:"",legal_person:"" }, label: ["邮箱", "企业","统一社会信用代码","法人"], url: "/admin/test/new_company", method: 'post' },
+        { title: "新增测试企业", desc: "新增一家测试测试", obj: { email: "", company: "", code: "", legal_person: "" }, label: ["邮箱", "企业", "统一社会信用代码", "法人"], url: "/admin/test/new_company", method: 'post' },
       ],
       setIsModalVisible: false,
       form: {},
@@ -29,16 +29,18 @@ class TestCompany extends Component {
       indeterminate: false,
       checkAll: false,
       checkState: false,
-      loading:false
+      loading: false,
+      plainOptions: []
     }
   }
 
+  componentDidMount() {
+
+  }
+
   form = React.createRef()
 
   showModal = (val) => {
-    if (val.plainOptions) {
-      plainOptions = val.plainOptions
-    }
     this.setState({
       setIsModalVisible: true,
       form: val.obj,
@@ -58,24 +60,42 @@ class TestCompany extends Component {
 
   handleOk = () => {
     this.setState({
-      loading:true
+      loading: true
     })
-    const form = this.form.current
+    const form = this.form.current.getFieldsValue()
+
     this.setState({
-      form: form.getFieldsValue()
+      form: (() => {
+        if (form.hasOwnProperty("data")) {
+          return Object.assign(form, { data: this.state.checkedList })
+        } else {
+          return form
+        }
+      })()
     }, () => {
       api[this.state.method](this.state.url, this.state.form)
         .then(res => {
           message.success(res.info);
           this.setState({
-            loading:false,
+            loading: false,
-            setIsModalVisible: false
+            setIsModalVisible: false,
+            checkAll: false
           })
+        }).catch(err=> {
+          message.warning(err.data.info)
         })
     })
   }
 
-  onChange = checkedList => {
+  onRateChange = checkedList => {
+    this.setState({
+      checkedList,
+      indeterminate: !!checkedList.length && checkedList.length < plainOptions.length,
+      checkAll: checkedList.length === this.state.plainOptions.length,
+    });
+  }
+
+  onCompanyChange = checkedList => {
     this.setState({
       checkedList,
       indeterminate: !!checkedList.length && checkedList.length < plainOptions.length,
@@ -83,9 +103,17 @@ class TestCompany extends Component {
     });
   }
 
-  onCheckAllChange = e => {
+  onRateCheckAllChange = e => {
     this.setState({
-      checkedList: e.target.checked ? plainOptions : [],
+      checkedList: e.target.checked ? this.state.plainOptions : [],
+      indeterminate: false,
+      checkAll: e.target.checked,
+    });
+  }
+
+  onCompanyCheckAllChange = e => {
+    this.setState({
+      checkedList: e.target.checked ?plainOptions : [],
       indeterminate: false,
       checkAll: e.target.checked,
     });
@@ -93,33 +121,41 @@ class TestCompany extends Component {
 
   onCheckAllState = e => {
     this.setState({
-      checkedList: e.target.checked ? plainOptions.slice(0, plainOptions.length - 1) : [],
+      checkedList: e.target.checked ? this.state.plainOptions.slice(0, plainOptions.length - 1) : [],
       indeterminate: false,
       checkState: e.target.checked,
       checkAll: false
     });
   }
 
+  getType = e => {
+    api.post("/admin/test/search_evaluate_record", { types: e }).then(res => {
+      this.setState({
+        plainOptions: res.data
+      })
+    })
+  }
+
   analysis(name) {
     if (name === '评价类型') {
-      return <Select>
+      return <Select onChange={this.getType}>
         <Option value="综合信用评价">综合信用评价</Option>
         <Option value="ESG评价">ESG评价</Option>
       </Select>
     } else if (name === "企业数据") {
       return <>
         <Checkbox indeterminate={this.state.indeterminate}
-          onChange={this.onCheckAllChange}
+          onChange={this.onCompanyCheckAllChange}
           checked={this.state.checkAll}>
           删除企业
         </Checkbox>
         <Divider />
-        <CheckboxGroup options={plainOptions} value={this.state.checkedList} onChange={this.onChange} />
+        <CheckboxGroup options={plainOptions} value={this.state.checkedList} onChange={this.onCompanyChange} />
       </>
     } else if (name === "评价记录") {
       return <>
         <Checkbox indeterminate={this.state.indeterminate}
-          onChange={this.onCheckAllChange}
+          onChange={this.onRateCheckAllChange}
           checked={this.state.checkAll}>
           删除记录
         </Checkbox>
@@ -129,7 +165,7 @@ class TestCompany extends Component {
           更改状态
         </Checkbox>
         <Divider />
-        <CheckboxGroup options={plainOptions} value={this.state.checkedList} onChange={this.onChange} />
+        <CheckboxGroup options={this.state.plainOptions} value={this.state.checkedList} onChange={this.onRateChange} />
       </>
     } else {
       return <Input></Input>
@@ -139,7 +175,7 @@ class TestCompany extends Component {
   render() {
     return (
       <React.Fragment>
-        <Modal title="操作" visible={this.state.setIsModalVisible} onCancel={this.handleCancel} onOk={this.handleOk} confirmLoading={this.state.loading}>
+        <Modal title="操作" visible={this.state.setIsModalVisible} onCancel={this.handleCancel} onOk={this.handleOk} >
           <Form ref={this.form} layout="vertical">
             <Row>
               {