Bladeren bron

隐藏 支付节点

mentoswzq 4 jaren geleden
bovenliggende
commit
1bbbecba2e

+ 11 - 6
js/component/manageCenter/components/checkProject/index.jsx

@@ -902,7 +902,8 @@ class CheckProject extends Component {
             </Spin>
           </div>
         </div>
-        <div className="thirdParty">
+        {/*如果是软著类或者专利类的专利申请,隐藏付款节点*/}
+        {!((this.props.projectType === 1 && this.props.patentType === 0) || this.props.projectType === 2) ? <div className="thirdParty">
           <div>
             <span className="title">
               付款节点
@@ -926,7 +927,7 @@ class CheckProject extends Component {
               </Form>
             </Spin>
           </div>
-        </div>
+        </div> : <div/>}
         <div
           style={{
             borderTop: '1px #000000 dashed',
@@ -1033,9 +1034,9 @@ class CheckProject extends Component {
                 </div>
               </Col>
               <Col className="gutter-row" span={4}>
-                <div className="gutter-box">
-                  申请支付金额(万元)
-                </div>
+                    <div className="gutter-box">
+                      {this.props.projectType === 2 || (this.props.projectType === 1 && this.props.patentType === 0) ? '申请支付数量' : '申请支付金额(万元)'}
+                    </div>
               </Col>
               <Col className="gutter-row" span={4}>
                 <div className="gutter-box">
@@ -1081,7 +1082,11 @@ class CheckProject extends Component {
                       </Col>
                       <Col className="gutter-row" span={4}>
                         <div className="gutter-box">
-                          {value.applicationAmount}
+                          {
+                            this.props.projectType === 2 || (this.props.projectType === 1 && this.props.patentType === 0) ?
+                                value.quantity:
+                                value.applicationAmount
+                          }
                         </div>
                       </Col>
                       <Col className="gutter-row" span={4}>

+ 1 - 1
js/component/manageCenter/components/checkProject/index.less

@@ -70,7 +70,7 @@
       .payitem{
         display: flex;
         flex-flow: row nowrap;
-        padding-bottom: 10px;
+        padding-bottom: 2px;
       }
     }
   }

+ 4 - 4
js/component/manageCenter/project/task/myTask.jsx

@@ -4356,10 +4356,10 @@ const Task = React.createClass({
                       </Form>
                     </Spin>
                   </div>
-                  {/*如果是软著类或者专利类,隐藏付款节点*/}
+                  {/*如果是软著类或者专利类的专利申请,隐藏付款节点*/}
                   <div
                     style={{
-                      display: this.state.projectType === 1 || this.state.projectType === 2? 'none' : 'block',  //0正常 1专利 2软著 3审计
+                      display: (this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2? 'none' : 'block',  //0正常 1专利 2软著 3审计
                     }}
                   >
                     <span
@@ -4391,11 +4391,11 @@ const Task = React.createClass({
                       +新增付款节点
                     </Button>
                   </div>
-                  {/*如果是软著类或者专利类,隐藏付款节点*/}
+                  {/*如果是软著类或者专利类的专利申请,隐藏付款节点*/}
                   <div
                     className="clearfix"
                     style={{
-                      display: this.state.projectType === 1 || this.state.projectType === 2? 'none' : 'block',  //0正常 1专利 2软著 3审计
+                      display: (this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2? 'none' : 'block',  //0正常 1专利 2软著 3审计
                     }}
                   >
                     <Spin spinning={this.state.loading}>

+ 1 - 1
js/component/manageCenter/project/task/newSupplier.js

@@ -66,7 +66,7 @@ class NewSupplier extends Component{
             url: globalConfig.context + '/api/admin/company/selectVague',
             data: {
                 name: e,
-                type: this.props.projectType === 2 ? 0 :
+                type: this.props.projectType === 2 || (this.props.projectType === 1 && this.props.patentType === 1) ? 0 :
                     (this.props.projectType === 1 && this.props.patentType === 0) ? 2 : 1     //this.props.projectType 0正常 1专利 2软著 3审计    this.props.patentType 0:专利申请/变更/转让  1:专利买卖
             },
             success: function (data) {