Parcourir la source

弹窗无法关闭

HW il y a 4 ans
Parent
commit
12a78e946f

+ 8 - 16
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -2505,6 +2505,14 @@ const ShouKuang = React.createClass({
             content={() => this.refs.all}
           />
         </Modal>
+        <Project
+            record={this.state.record}
+            visible={this.state.pvisible}
+            isAuditPayment={true}
+            cancel={() => {
+              this.setState({ pvisible: false });
+            }}
+        />
         <Modal
           visible={this.state.timeVisible}
           footer=""
@@ -2520,14 +2528,6 @@ const ShouKuang = React.createClass({
           }}
         >
           <Spin spinning={this.state.loading}>
-            <Project
-              record={this.state.record}
-              visible={this.state.pvisible}
-              isAuditPayment={true}
-              cancel={() => {
-                this.setState({ pvisible: false });
-              }}
-            />
             <div
               className="patent-table"
               style={
@@ -2680,14 +2680,6 @@ const ShouKuang = React.createClass({
           }}
         >
           <Spin spinning={this.state.loading}>
-            <Project
-              record={this.state.record}
-              visible={this.state.pvisible}
-              isAuditPayment={true}
-              cancel={() => {
-                this.setState({ pvisible: false });
-              }}
-            />
             <div
               className="patent-table"
               style={

+ 6 - 9
js/component/project.jsx

@@ -28,6 +28,7 @@ import ResolutionDetail from '@/resolutionDetail'
 import ImgList from "./common/imgList";
 import CheckProject from "./manageCenter/components/checkProject";
 import { cuiJieDian } from '@/dataDic.js'
+import {getProjectName} from "./tools";
 const { TabPane } = Tabs
 const project = React.createClass({
   getInitialState() {
@@ -39,7 +40,6 @@ const project = React.createClass({
 
       containOfficialFees:0,//官费缴费情况
 
-      visible: false,
       record: this.props.record,
       paginations: false,
       tabsKey: "1",
@@ -173,9 +173,8 @@ const project = React.createClass({
       ],
     }
   },
-  componentWillReceiveProps(nextProps) {
+  componentWillReceiveProps(nextProps){
     this.setState({
-      visible: nextProps.visible,
       record: nextProps.record,
     })
     if (nextProps.record) {
@@ -208,8 +207,6 @@ const project = React.createClass({
       resVisible: false,
     })
   },
-
-  componentDidMount() {},
   xiangqing(id) {
     this.setState({
       loading: true,
@@ -822,12 +819,12 @@ const project = React.createClass({
       },
     }
     return (
-        this.state.visible ? <Modal
+        this.props.visible ? <Modal
         className="customeDetails"
         footer=""
         title=""
         width="900px"
-        visible={this.state.visible}
+        visible={this.props.visible}
         // onOk={this.visitOk}
         onCancel={(e) => {
           this.setState({
@@ -1249,7 +1246,7 @@ const project = React.createClass({
                       {/*    })*/}
                       {/*  }}*/}
                       {/*/>*/}
-                      {this.state.attachmentUrl && this.state.visible && this.state.tabsKey === "1" ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                      {this.state.attachmentUrl && this.props.visible && this.state.tabsKey === "1" ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
                         <ImgList fileList={this.state.attachmentUrl} ItemWidth={'96px'}/>
                       </div> : <div/>}
                       <Modal
@@ -1315,7 +1312,7 @@ const project = React.createClass({
               {this.state.tabsKey === "2" ? <Spin spinning={this.state.loading}>
                 <div>
                   {
-                    this.state.visible && this.state.tabsKey === '2' ?
+                    this.props.visible && this.state.tabsKey === '2' ?
                         <CheckProject
                             {...this.props}
                             tid={this.props.record.id}

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.1.66",
+  "version": "1.1.65",
   "description": "",
   "main": "index.js",
   "scripts": {