Explorar el Código

修改项目审核结果展示

mentoswzq hace 4 años
padre
commit
6e898ee231

+ 40 - 38
js/component/manageCenter/components/checkProject/index.jsx

@@ -856,11 +856,16 @@ class CheckProject extends Component {
         </div>
         {
           this.props.projectType === 1?
-              <div>
-                <div style={{padding:'0px 0px 20px 20px',}}>
+              <div style={{
+                display:'flex',
+                flexFlow:'row nowrap',
+                alignItems:'center',
+                padding:'0px 0px 10px 20px'
+              }}>
+                <div>
                   专利类型:<span style={{marginLeft:'15px'}}>{this.props.patentType === 0 ? '专利申请/变更/转让' : '专利买卖'}</span>
                 </div>
-                <div style={{paddingBottom:'20px',paddingLeft:'20px'}}>
+                <div style={{paddingLeft:'100px'}}>
                   专利名称:<span style={{marginLeft:'15px'}}>
                   {
                     this.props.patentNameType === 0 ? '实用新型专利' :
@@ -925,7 +930,7 @@ class CheckProject extends Component {
         <div
           style={{
             borderTop: '1px #000000 dashed',
-            padding: '20px 20px 0px 20px',
+            padding: '10px 20px 0px 20px',
           }}
         >
           <div>
@@ -934,9 +939,9 @@ class CheckProject extends Component {
               {this.props.outsourceRemarks}
             </div>
           </div>
-          {this.props.fileList && this.props.fileList.length > 0 ? <div style={{paddingTop:'20px'}}>
+          {this.props.fileList && this.props.fileList.length > 0 ? <div style={{paddingTop:'10px'}}>
             <div className="title">合同/协议扫描件</div>
-            <div style={{paddingBottom:'10px'}}>
+            <div>
                 <ImgList fileList={this.props.fileList} ItemWidth={'96px'}/>
             </div>
             {/*<Upload*/}
@@ -966,44 +971,41 @@ class CheckProject extends Component {
             </Modal>
           </div> : <div/>}
         </div>
-        {parseInt(this.props.startType) !== 1 ? <div className="outsourceLogConent">
+        {parseInt(this.props.startType) !== 1 && this.state.outsourceLogs.length !== 0 ? <div className="outsourceLogConent">
           <div className="title" style={{
             paddingBottom: 0,
           }}>外包状态</div>
           <div className="outsourceLogList">
             {
-              this.state.outsourceLogs.map((value,index)=>(
+              this.state.outsourceLogs && this.state.outsourceLogs.map((value,index)=>(
                   <div key={index} className="outsourceLogItem outsource">
-                    <Row gutter={16} style={{
-                      paddingBottom: '8px',
-                      paddingTop: '8px',
+                    <div style={{
+                      display:'flex',
+                      flexFlow:'row nowrap',
+                      paddingBottom: '3px',
+                      paddingTop: '3px',
                     }}>
-                      <Col className="gutter-row" span={6}>
-                        <div>
-                          {value.aname}
-                        </div>
-                      </Col>
-                      <Col className="gutter-row" span={6}>
-                        <div className="gutter-box">
-                          {
-                            value.status === 0 ? <Tag color="#2db7f5">发起外包审核</Tag> :
-                                value.status === 1 ? <Tag color="#87d068">通过</Tag> : <Tag color="#f50">驳回</Tag>
-                          }
-                        </div>
-                      </Col>
-                      <Col className="gutter-row" span={6}>
-                        <div className="gutter-box" style={{
-                          wordBreak: 'break-all'
-                        }}>
-                          {value.remarks}
-                        </div>
-                      </Col>
-                      <Col className="gutter-row" span={6}>
-                        <div className="gutter-box">
-                          {value.createTimes}
-                        </div>
-                      </Col>
-                    </Row>
+                      <div>
+                        {value.aname}
+                      </div>
+                      <div style={{paddingLeft:'5px'}}>
+                        {
+                          value.status === 0 ?
+                              <Tag color="#2db7f5">发起外包审核</Tag> :
+                              value.status === 1 ? <Tag color="#87d068">通过</Tag> :
+                                  <Tag color="#f50">驳回</Tag>
+                        }
+                      </div>
+                      <div style={{
+                        wordBreak: 'break-all',
+                        maxWidth:'67%',
+                      }}>
+                        {value.remarks}
+                      </div>
+                      <div style={{paddingLeft: '10px'}}>
+                        {value.createTimes}
+                      </div>
+                    </div>
                   </div>
               ))
             }
@@ -1047,7 +1049,7 @@ class CheckProject extends Component {
               </Col>
             </Row>
           </div>
-          <div className="outsourceLogList" style={{paddingTop:'20px'}}>
+          <div className="outsourceLogList" style={{paddingTop:'5px'}}>
             {
               this.state.selectOrderPayments.map((value,index)=>(
                   <div key={index} className="orderPayItem" onClick={()=>{

+ 18 - 14
js/component/manageCenter/components/checkProject/index.less

@@ -27,7 +27,7 @@
     }
   }
   .outsourceLogConent{
-    padding: 20px 20px 0px 20px;
+    padding: 10px 20px 0px 20px;
     .outsourceLogList{
       .outsourceLogItem{
 
@@ -51,7 +51,7 @@
   .title{
     font-size: 15px;
     font-weight: 800;
-    padding-bottom:10px;
+    padding-bottom:6px;
   }
   .gutter-box{
     display: flex;
@@ -60,19 +60,23 @@
     align-items: center;
   }
 }
-
-.payStateList{
-  border-top: 1px #000 dashed;
-  .listTitle{
-    font-weight: bolder;
-    padding-bottom: 20px;
-  }
-  .payList{
-    .payitem{
-      display: flex;
-      flex-flow: row nowrap;
-      padding-bottom: 10px;
+.payRecordComponent{
+  .payStateList{
+    border-top: 1px #000 dashed;
+    .listTitle{
+      font-weight: bolder;
     }
+    .payList{
+      .payitem{
+        display: flex;
+        flex-flow: row nowrap;
+        padding-bottom: 10px;
+      }
+    }
+  }
+
+  .formItemStyle{
+    margin-bottom: 0 !important;
   }
 }
 

+ 11 - 25
js/component/manageCenter/components/checkProject/payRecord.js

@@ -371,6 +371,7 @@ class PayRecord extends Component{
         const { paymentLogs,paymentDetails,financialPaymentList } = this.state;
         return(
             <Modal
+                className='payRecordComponent'
                 width={700}
                 maskClosable={false}
                 footer={null}
@@ -395,9 +396,7 @@ class PayRecord extends Component{
                         >
                             <Form.Item
                                 {...formItemLayout}
-                                style={{
-                                    display:'flex'
-                                }}
+                                className='formItemStyle'
                                 label="付款单位/个人:"
                             >
                                 <div>{paymentDetails.companyName}</div>
@@ -405,9 +404,7 @@ class PayRecord extends Component{
                             {/*0第三方 1催款 2官费*/}
                             <Form.Item
                                 {...formItemLayout}
-                                style={{
-                                    display:'flex'
-                                }}
+                                className='formItemStyle'
                                 label={'单价(万元):'}
                             >
                                 <div>
@@ -424,9 +421,7 @@ class PayRecord extends Component{
                             </Form.Item>
                             <Form.Item
                                 {...formItemLayout}
-                                style={{
-                                    display:'flex'
-                                }}
+                                className='formItemStyle'
                                 label="数量:"
                             >
                                 {getFieldDecorator('quantity', {
@@ -438,9 +433,7 @@ class PayRecord extends Component{
                             </Form.Item>
                             <Form.Item
                                 {...formItemLayout}
-                                style={{
-                                    display:'flex'
-                                }}
+                                className='formItemStyle'
                                 label="总价(万元):"
                             >
                                 <div>{paymentDetails.initialTotalAmount}</div>
@@ -448,9 +441,7 @@ class PayRecord extends Component{
                             {/*官费不显示已付*/}
                             {paymentDetails.chooseType !== 2 ? <Form.Item
                                 {...formItemLayout}
-                                style={{
-                                    display:'flex'
-                                }}
+                                className='formItemStyle'
                                 label="已付(万元):"
                             >
                                 <div>{paymentDetails.initialPaymentAmount}</div>
@@ -461,9 +452,7 @@ class PayRecord extends Component{
                                 paymentDetails.chooseType === 2 || this.props.projectType === 1 || this.props.projectType === 2 ?
                                     <Form.Item
                                         {...formItemLayout}
-                                        style={{
-                                            display:'flex'
-                                        }}
+                                        className='formItemStyle'
                                         label="本次申请支付数量:"
                                     >
                                         {getFieldDecorator('initialQuantity', {
@@ -480,9 +469,7 @@ class PayRecord extends Component{
                             }
                             <Form.Item
                                 {...formItemLayout}
-                                style={{
-                                    display:'flex'
-                                }}
+                                className='formItemStyle'
                                 label="本次申请支付金额(万元):"
                             >
                                 {getFieldDecorator('applicationAmount', {
@@ -498,9 +485,7 @@ class PayRecord extends Component{
                             </Form.Item>
                             <Form.Item
                                 {...formItemLayout}
-                                style={{
-                                    display:'flex'
-                                }}
+                                className='formItemStyle'
                                 label="备注:"
                             >
                                 {
@@ -534,7 +519,8 @@ class PayRecord extends Component{
                                                 <div style={{
                                                     paddingLeft:'15px',
                                                     paddingRight:'15px',
-                                                    width: '200px',
+                                                    minWidth: '200px',
+                                                    maxWidth: '67%',
                                                     wordBreak: 'break-all'
                                                 }}>
                                                     {

+ 154 - 41
js/component/manageCenter/project/task/myTask.jsx

@@ -25,7 +25,7 @@ import {
   Icon,
   Upload,
   AutoComplete,
-  Tag,
+  Tag, Row,
 } from 'antd'
 import Assign from '@/manageCenter/publicComponent/assign'
 import { areaSelect } from '@/NewDicProvinceList'
@@ -1387,9 +1387,11 @@ const Task = React.createClass({
     this.xiangmu(record.orderNo)
     this.loaduserss(record)
     // 获取第三方信息表格
-    this.thirdTable(record.id)
+    this.thirdTable(record.id);
     //获取支付节点信息表格
-    this.payNodeTable(record.id)
+    this.payNodeTable(record.id);
+    //查看外包状态日志
+    this.getSelectOutsourceLog(record.id);
     // 获取Csort
     this.getCsortData(localStorage.getItem('cSort'))
     this.projectTypeTabContent(record.projectType)
@@ -2167,6 +2169,12 @@ const Task = React.createClass({
       return
     }
 
+    //refundStatus   0-待审核 ,1-审核通过,2-审核拒绝
+    if(!this.state.reason && this.state.refundStatus === 2){
+      message.warning('发起原因不能为空')
+      return
+    }
+
     // if (!this.state.pictureUrl && !Array.isArray(this.state.pictureUrl)) {
     //   message.warning('合同扫描件不能为空')
     //   return
@@ -2199,6 +2207,11 @@ const Task = React.createClass({
             id: _this.state.refundStatus == 2 ? _this.state.mid : undefined,
           }
 
+          //refundStatus   0-待审核 ,1-审核通过,2-审核拒绝    审核被驳回时,要填写发起原因
+          if(_this.state.refundStatus === 2){
+            data.reason = _this.state.reason
+          }
+
           if (_this.state.projectType === 1) {
             data.patentType = _this.state.patentType;
             data.patentNameType = _this.state.patentNameType;
@@ -2634,6 +2647,33 @@ const Task = React.createClass({
       }.bind(this)
     )
   },
+  //外包日志列表
+  getSelectOutsourceLog(tid){
+    $.ajax({
+      method: 'get',
+      dataType: 'json',
+      crossDomain: false,
+      url: globalConfig.context + '/api/admin/outsourceOrg/selectOutsourceLog',
+      data: {
+        tid: tid,
+      },
+      success: function (data) {
+        if (data.error.length) {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.setState({
+            outsourceLogs: data.data
+          })
+        }
+      }.bind(this),
+    }).always(
+        function () {
+
+        }.bind(this)
+    )
+  },
   payNodeTable(id) {
     this.setState({
       loadData: true,
@@ -3295,7 +3335,8 @@ const Task = React.createClass({
               if (e == 2) {
                 this.waiDetail();
                 this.thirdTable(this.state.tid);
-                this.payNodeTable(this.state.tid)
+                this.payNodeTable(this.state.tid);
+                this.getSelectOutsourceLog(this.state.tid);
               }
             }}
           >
@@ -4450,6 +4491,29 @@ const Task = React.createClass({
                       <p style={{ color: 'red' }}>图片建议:要清晰。</p>
                     </FormItem>
                   </div>
+                  {/*只有审核拒绝的时候才要填写发起原因*/}
+                  {this.state.refundStatus === 2 ? <div className="clearfix">
+                    <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label={
+                          <span>
+                          <strong style={{ color: '#f00' }}>*</strong>发起原因
+                        </span>
+                        }
+                    >
+                      <TextArea
+                          rows={4}
+                          value={this.state.reason}
+                          onChange={(e) => {
+                            this.setState({
+                              reason: e.target.value,
+                            })
+                          }}
+                          placeholder="请输入发起原因"
+                      />
+                    </FormItem>
+                  </div> : <div/>}
                   <div className="clearfix">
                     <div
                       style={{
@@ -4498,6 +4562,7 @@ const Task = React.createClass({
                               onRefresh={()=>{
                                 this.waiDetail();
                                 this.thirdTable(this.state.tid);
+                                this.getSelectOutsourceLog(this.state.tid);
                                 this.payNodeTable(this.state.tid)
                                 this.loadData(this.state.page)
                               }}
@@ -4507,46 +4572,94 @@ const Task = React.createClass({
               )}
               {(this.state.refundStatus == 1 ||
               this.state.refundStatus == 0 ||
-              this.state.refundStatus == 2) && this.state.startType !== 1 ? (
-                <div className="clearfix">
+              this.state.refundStatus == 2) &&
+              this.state.startType !== 1
+                  ? (
+                <div className="clearfix"
+                     style={{
+                       display: this.state.refundStatus == 0 ? 'none' : 'block',
+                     }}
+                >
                   <hr className="division" />
-                  <div
-                    className="clearfix"
-                    style={{
-                      display: this.state.refundStatus == 0 ? 'none' : 'block',
-                    }}
-                  >
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="审核意见"
-                    >
-                      <span>{this.state.remarks}</span>
-                    </FormItem>
-                  </div>
-                  {parseInt(this.state.startType) !== 1 ?<div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="审核结果"
-                    >
-                      <span>{getRefundStatus(this.state.refundStatus)}</span>
-                    </FormItem>
+                  {parseInt(this.state.startType) !== 1 ? <div style={{
+                    color:'#F00',
+                    fontWeight: 'bolder',
+                    paddingBottom: '20px',
+                  }}>
+                    审核结果: <span style={{paddingLeft:'20px'}}>{getRefundStatus(this.state.refundStatus)}</span>
                   </div> : <div/>}
-                  <div
-                    className="clearfix"
-                    style={{
-                      display: this.state.refundStatus == 0 ? 'none' : 'block',
-                    }}
-                  >
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="审核时间"
-                    >
-                      <span>{this.state.auditTimes}</span>
-                    </FormItem>
+                  <div className="outsourceLogList">
+                    {
+                      this.state.outsourceLogs && this.state.outsourceLogs.map((value,index)=>(
+                          <div key={index} className="outsourceLogItem outsource">
+                            <div style={{
+                              display:'flex',
+                              flexFlow:'row nowrap',
+                              paddingBottom: '3px',
+                              paddingTop: '3px',
+                            }}>
+                              <div>
+                                {value.aname}
+                              </div>
+                              <div style={{paddingLeft:'5px'}}>
+                                {
+                                  value.status === 0 ?
+                                      <Tag color="#2db7f5">发起外包审核</Tag> :
+                                      value.status === 1 ? <Tag color="#87d068">通过</Tag> :
+                                          <Tag color="#f50">驳回</Tag>
+                                }
+                              </div>
+                              <div style={{
+                                wordBreak: 'break-all',
+                                maxWidth:'67%',
+                              }}>
+                                {value.remarks}
+                              </div>
+                              <div style={{paddingLeft: '10px'}}>
+                                {value.createTimes}
+                              </div>
+                            </div>
+                          </div>
+                      ))
+                    }
                   </div>
+                {/*  <div*/}
+                {/*    className="clearfix"*/}
+                {/*    style={{*/}
+                {/*      display: this.state.refundStatus == 0 ? 'none' : 'block',*/}
+                {/*    }}*/}
+                {/*  >*/}
+                {/*    <FormItem*/}
+                {/*      className="half-item"*/}
+                {/*      {...formItemLayout}*/}
+                {/*      label="审核意见"*/}
+                {/*    >*/}
+                {/*      <span>{this.state.remarks}</span>*/}
+                {/*    </FormItem>*/}
+                {/*  </div>*/}
+                {/*  {parseInt(this.state.startType) !== 1 ?<div className="clearfix">*/}
+                {/*    <FormItem*/}
+                {/*      className="half-item"*/}
+                {/*      {...formItemLayout}*/}
+                {/*      label="审核结果"*/}
+                {/*    >*/}
+                {/*      <span>{getRefundStatus(this.state.refundStatus)}</span>*/}
+                {/*    </FormItem>*/}
+                {/*  </div> : <div/>}*/}
+                {/*  <div*/}
+                {/*    className="clearfix"*/}
+                {/*    style={{*/}
+                {/*      display: this.state.refundStatus == 0 ? 'none' : 'block',*/}
+                {/*    }}*/}
+                {/*  >*/}
+                {/*    <FormItem*/}
+                {/*      className="half-item"*/}
+                {/*      {...formItemLayout}*/}
+                {/*      label="审核时间"*/}
+                {/*    >*/}
+                {/*      <span>{this.state.auditTimes}</span>*/}
+                {/*    </FormItem>*/}
+                {/*  </div>*/}
                 </div>
               ) : (
                 ''

+ 18 - 6
js/component/manageCenter/project/task/newSupplier.js

@@ -19,8 +19,8 @@ class NewSupplier extends Component{
         super(props);
         this.state={
             thirdCompanyName: props.thirdCompanyName && props.thirdCompanyName.split('-')[0],
-            thirdUnitPrice: props.thirdUnitPrice,
-            thirdQuantity: props.thirdQuantity,
+            thirdUnitPrice: props.thirdUnitPrice || 0,
+            thirdQuantity: props.thirdQuantity || 0,
             thirdRemarks: props.thirdRemarks,
             thirdMaterial: props.thirdMaterial,
             thirdUrgent: props.thirdUrgent,
@@ -217,9 +217,9 @@ class NewSupplier extends Component{
                     message.success('保存成功!')
                     this.setState({
                         thirdCompanyName: '', //第三方名称
-                        thirdUnitPrice: '', //单价
-                        thirdQuantity: '', //数量
-                        currentTotalPrice: '', //总价
+                        thirdUnitPrice: 0, //单价
+                        thirdQuantity: 0, //数量
+                        currentTotalPrice: 0, //总价
                         thirdRemarks: '',
                         thirdUrgent: 0,
                     })
@@ -248,7 +248,19 @@ class NewSupplier extends Component{
                     <Spin spinning={this.state.loading}>
                         <div className="clearfix">
                             <div className="clearfix">
-                                <Form.Item {...formItemLayout} label="供应商名称">
+                                {/*
+                                     projectType   0正常 1专利 2软著 3审计
+                                     patentType  0:专利申请/变更/转让  1:专利买卖
+                                 */}
+                                <Form.Item
+                                    {...formItemLayout}
+                                    label="供应商名称"
+                                    help={
+                                        this.props.projectType === 2 ||
+                                        (this.props.projectType === 1 &&
+                                        this.props.patentType === 0) ? '输入供应商关键字,并选择系统后台已有供应商,如“长沙科明”' : ''
+                                    }
+                                >
                                     <AutoComplete
                                         className="certain-category-search"
                                         dropdownClassName="certain-category-search-dropdown"