Browse Source

去除部分console.log
修改图片查看

mentoswzq 4 years ago
parent
commit
4519b934b2
23 changed files with 752 additions and 610 deletions
  1. 132 58
      js/component/common/imgList/index.js
  2. 43 36
      js/component/common/imgList/index.less
  3. 0 1
      js/component/manageCenter/achievement/techAchievement.jsx
  4. 13 3
      js/component/manageCenter/components/checkProject/payRecord.js
  5. 0 1
      js/component/manageCenter/customer/customerManagement/organizationManages.jsx
  6. 0 3
      js/component/manageCenter/customer/customerMarketing/diurnalStatistics.jsx
  7. 0 3
      js/component/manageCenter/customer/customerMarketing/diurnalStatisticsOne.jsx
  8. 0 3
      js/component/manageCenter/customer/reviewed/identityAudits.jsx
  9. 0 2
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  10. 0 2
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  11. 0 1
      js/component/manageCenter/financialManage/distribute/invoiceApplyListQuery.jsx
  12. 0 1
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  13. 0 1
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/index.js
  14. 8 9
      js/component/manageCenter/order/orderNew/costAuditList/index.js
  15. 0 5
      js/component/manageCenter/order/orderNew/reject.jsx
  16. 518 298
      js/component/manageCenter/project/task/myTask.jsx
  17. 29 168
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  18. 6 2
      js/component/manageCenter/project/task/newSupplier.js
  19. 0 1
      js/component/manageCenter/project/task/operationPayNode.js
  20. 1 9
      js/component/manageCenter/publicComponent/assign.jsx
  21. 1 1
      js/component/manageCenter/set/projectConfigure/addPatentPrice.js
  22. 0 1
      js/component/manageCenter/statistics/personnel/personnelAll.jsx
  23. 1 1
      package.json

+ 132 - 58
js/component/common/imgList/index.js

@@ -1,88 +1,162 @@
 import React,{Component} from 'react';
-import {Icon,Modal} from 'antd';
+import {Button, Icon, message, Modal, Upload} from 'antd';
 import './index.less';
 import $ from "jquery";
 
+// const url1 = 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1600944413153&di=0b64017df8b86076cdba052010ee7516&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F70%2F91%2F01300000261284122542917592865.jpg';
+// const url2 = 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1600944610499&di=e72ee8d92fa8ce27c09abb2a50aa5f9d&imgtype=0&src=http%3A%2F%2Fa4.att.hudong.com%2F22%2F59%2F19300001325156131228593878903.jpg';
 class ImgList extends Component{
     constructor(props) {
         super(props);
         this.state={
             seeMore: false,
             previewVisible: false,
-            previewImage: ''
+            previewImage: '',
+            rotateDeg: 0,
+            fileList: props.fileList.map((v,i)=>{
+                v.index = i;
+                // v.url = i%2 ? url1 : url2;
+                return v
+            }) || [],
+            selectImgIndex: 0, //选择的图片索引
         }
         this.handleCancel = this.handleCancel.bind(this);
-    }
-
-    componentDidMount() {
-        $(".fileItem").bind("mouseover",function (){
-            $(this).children().first().css({
-                "background": "rgba(0,0,0,.6)",
-                "display":"flex"
-            });
-
-        });
-        $(".fileItem").bind("mouseout",function (){
-            $(this).children().first().css("display","none");
-
-        });
+        this.downImg = this.downImg.bind(this);
+        this.upImg = this.upImg.bind(this);
+        this.rotate = this.rotate.bind(this);
     }
 
     handleCancel() {
         this.setState({
             previewVisible:false,
             previewImage: '',
+            rotateDeg: 0,
+            selectImgIndex: 0,
         })
     }
 
+    rotate() {
+        let rotateDeg = this.state.rotateDeg + 90;
+        this.setState({
+            rotateDeg,
+        })
+    }
+
+    upImg() {
+        const {fileList} = this.state;
+        let index = this.state.selectImgIndex - 1;
+        if(index < 0){
+            message.info('已经是第一张了哦')
+        }else{
+            let file = fileList[index];
+            this.setState({
+                previewImage: file.url || file.thumbUrl,
+                selectImgIndex: index,
+                rotateDeg: 0,
+            })
+        }
+    }
+
+    downImg() {
+        const {fileList} = this.state;
+        let index = this.state.selectImgIndex + 1;
+        if(index >= fileList.length){
+            message.info('已经是最后一张了哦')
+        }else{
+            let file = fileList[index];
+            this.setState({
+                previewImage: file.url || file.thumbUrl,
+                selectImgIndex: index,
+                rotateDeg: 0,
+            })
+        }
+    }
+
     render() {
+        const {fileList} = this.state;
         return (
-            <div>
+            <div className='ImgListComponent'>
                 <div className='ImgList'>
-                    {
-                        this.props.fileList && this.props.fileList.slice(0,10).map((value,index)=>(
-                            <div key={index} className='fileItem' style={{
-                                width: this.props.ItemWidth ? this.props.ItemWidth : '100px',
-                                height: this.props.ItemWidth ? this.props.ItemWidth : '100px',
-                            }}>
-                                <div className='coveringLayer'>
-                                    <Icon type="eye-o" onClick={()=>{
-                                        this.setState({
-                                            previewVisible: true,
-                                            previewImage: value.url
-                                        })
-                                    }}/>
-                                </div>
-                                <img src={value.url} className='imgFile'/>
-                            </div>
-                        ))
-                    }
-                    {
-                        this.props.fileList && this.props.fileList.slice(10).map((value,index)=>(
-                            <div key={index} className='fileItem' style={{
-                                width: this.props.ItemWidth ? this.props.ItemWidth : '100px',
-                                height: this.props.ItemWidth ? this.props.ItemWidth : '100px',
-                                display: this.state.seeMore ? 'block' : 'none',
-                            }}>
-                                <div className='coveringLayer'>
-                                    <Icon type="eye-o" onClick={()=>{
-                                        this.setState({
-                                            previewVisible: true,
-                                            previewImage: value.url || value.thumbUrl
-                                        })
-                                    }}/>
-                                </div>
-                                <img src={value.url} className='imgFile'/>
-                            </div>
-                        ))
-                    }
-                    {/*{console.log(this.props.fileList,'图片')}*/}
+                    <Upload
+                      className="demandDetailShow-upload"
+                      listType="picture-card"
+                      fileList={
+                          this.state.seeMore?
+                              fileList :
+                              fileList.slice(0,10)
+                      }
+                      onPreview={(file) => {
+                        this.setState({
+                            previewImage: file.url || file.thumbUrl,
+                            previewVisible: true,
+                            selectImgIndex: file.index,
+                        })
+                      }}
+                    />
                 </div>
-                {this.props.fileList && this.props.fileList.length > 10 ? <div className='seeMore' onClick={()=>{this.setState({seeMore:!this.state.seeMore})}}>
+                {fileList.length > 10 ? <div className='seeMore' onClick={()=>{this.setState({seeMore:!this.state.seeMore})}}>
                     {this.state.seeMore ? '收起' : '查看更多'}
                 </div> : <div/>}
-                <Modal visible={this.state.previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={this.state.previewImage} />
+                <Modal
+                    maskClosable={false}
+                    footer={null}
+                    width={'80%'}
+                    visible={this.state.previewVisible}
+                    onCancel={this.handleCancel}
+                >
+                    <div className='actionBar'>
+                        <div
+                            style={{
+                                cursor:"pointer",
+                                background:'rgba(0,0,0,0)'
+                            }}
+                            onClick={this.upImg}>
+                            <Icon
+                                type="left-circle-o"
+                                style={{
+                                    fontSize:'50px',
+                                    marginRight:'20px'
+                                }}
+                            />
+                        </div>
+                        <div style={{
+                            flex:1
+                        }}>
+                            <img
+                                alt=""
+                                style={{
+                                    width: '100%',
+                                    marginTop: '15px',
+                                    transform: `rotate(${this.state.rotateDeg}deg)`,
+                                }}
+                                src={this.state.previewImage || ''}
+                            />
+                        </div>
+                        <div
+                            style={{
+                                cursor:"pointer",
+                                background:'rgba(0,0,0,0)'
+                            }}
+                            onClick={this.downImg}>
+                            <Icon
+                                type="right-circle-o"
+                                style={{
+                                    fontSize:'50px',
+                                    marginLeft:'20px'
+                                }}
+                            />
+                        </div>
+                    </div>
+                    <div style={{
+                        display:'flex',
+                        flexFlow:'row',
+                        marginTop:'20px',
+                        justifyContent:'center'
+                    }}>
+                        <Button onClick={this.rotate}>
+                            旋转
+                        </Button>
+                    </div>
                 </Modal>
             </div>
         )

+ 43 - 36
js/component/common/imgList/index.less

@@ -1,43 +1,50 @@
-.ImgList{
-  width: 100%;
-  display: flex;
-  flex-flow: row wrap;
-  .fileItem{
-    margin: 0 12px 12px 0;
-    padding: 8px;
-    border-radius: 4px;
-    border: 1px solid #d9d9d9;
-    position: relative;
-    .imgFile{
-      width: 100%;
-      height: 100%;
-      overflow: hidden;
+.ImgListComponent{
+  .ImgList{
+    width: 100%;
+    display: flex;
+    flex-flow: row wrap;
+    .fileItem{
+      margin: 0 12px 12px 0;
+      padding: 8px;
+      border-radius: 4px;
+      border: 1px solid #d9d9d9;
+      position: relative;
+      .imgFile{
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        border-radius: 4px;
+      }
+    }
+    .flexRowWrap{
+      display: flex;
+      flex-flow: row wrap;
+    }
+    .coveringLayer{
+      display: none;
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
       border-radius: 4px;
+      flex-flow: row nowrap;
+      align-items: center;
+      justify-content: center;
     }
   }
-  .flexRowWrap{
-    display: flex;
-    flex-flow: row wrap;
+
+  .seeMore{
+    padding-right: 20px;
+    color: #58a3ff;
   }
-  .coveringLayer{
-    display: none;
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    border-radius: 4px;
-    flex-flow: row nowrap;
-    align-items: center;
-    justify-content: center;
+  .seeMore:hover{
+    color: #0e77ca;
+    cursor: pointer;
   }
 }
-
-.seeMore{
-  padding-right: 20px;
-  color: #58a3ff;
-}
-.seeMore:hover{
-  color: #0e77ca;
-  cursor: pointer;
+.actionBar{
+  display: flex;
+  flex-flow: row nowrap;
+  align-items: center;
 }

+ 0 - 1
js/component/manageCenter/achievement/techAchievement.jsx

@@ -183,7 +183,6 @@ const AchievementList = React.createClass({
         let data=localStorage.getItem('newData');
     	if(data!='{}'&&data){
     		var newData = JSON.parse(data);
-    		console.log(newData);
     		this.tableRowClick(newData);
     	}
         this.loadData();

+ 13 - 3
js/component/manageCenter/components/checkProject/payRecord.js

@@ -407,7 +407,7 @@ class PayRecord extends Component{
                             <Form.Item
                                 {...formItemLayout}
                                 className='formItemStyle'
-                                label={'单价(万元):'}
+                                label={paymentDetails.chooseType === 2 ? '官费(万元):' : '单价(万元):'}
                             >
                                 <div>
                                     {/* projectType 0正常 1专利 2软著 3审计*/}
@@ -465,7 +465,15 @@ class PayRecord extends Component{
                                                 type={'number'}
                                                 style={{ width: '200px' }}
                                                 disabled={ this.props.isAuditPayment ? this.state.paymentDetails.status !== 0 : this.state.paymentDetails.status !== 2}
-                                                placeholder="请输入本次申请支付数量"/>
+                                                placeholder="请输入本次申请支付数量"
+                                                onChange={(e)=>{
+                                                    if(!isNaN(parseFloat(paymentDetails.initialUnitPrice))){
+                                                        this.props.form.setFieldsValue({
+                                                            applicationAmount: ((parseFloat(paymentDetails.initialUnitPrice) * 1000000) * e.target.value) / 1000000,
+                                                        })
+                                                    }
+                                                }}
+                                            />
                                         )}
                                     </Form.Item> : <div/>
                             }
@@ -532,7 +540,9 @@ class PayRecord extends Component{
                                                 }}>
                                                     {
                                                         value.status === 0 ? '(发起)' :
-                                                            value.status === 1 ? '(通过)': '(驳回)'
+                                                            value.status === 1 ? '(通过)':
+                                                                value.status === 2 ? '(驳回)' :
+                                                                    value.status === 3 ? '(完成)' : ''
                                                     }
                                                     {value.remarks}
                                                 </span>

+ 0 - 1
js/component/manageCenter/customer/customerManagement/organizationManages.jsx

@@ -487,7 +487,6 @@ const PublicCustomer = Form.create()(React.createClass({
 					dataIndex: 'dels',
 					key: 'dels',
 					render: (text, record, index) => {
-						console.log(record.name)
 						return <div>{adminData.isSuperAdmin ? 
 		                            <Popconfirm title="是否删除?" onConfirm={(e)=>{this.confirmDelet(record)}} okText="删除" cancelText="不删除">
 									    <Button style={{marginRight:'10px',color:'#ffffff',background:'#f00',border:'none'}}>删除</Button>

+ 0 - 3
js/component/manageCenter/customer/customerMarketing/diurnalStatistics.jsx

@@ -244,7 +244,6 @@ const DiurnalStatistics = React.createClass({
 				idTmr = window.setInterval("Cleanup();", 1);
 			}
 		} else {
-			console.log(table);
 			this.tableToExcel(table,this.getExplorer());
 		}
 		function Cleanup() {
@@ -264,9 +263,7 @@ const DiurnalStatistics = React.createClass({
 						return c[p];
 					})
 			}
-			console.log(table.nodeType);
 			if(!table.nodeType) table = document.getElementById(table);
-			console.log(table);
 			var ctx = {
 				worksheet: name || 'Worksheet',
 				table: table.innerHTML

+ 0 - 3
js/component/manageCenter/customer/customerMarketing/diurnalStatisticsOne.jsx

@@ -239,7 +239,6 @@ const DiurnalStatisticsOne = React.createClass({
 				idTmr = window.setInterval("Cleanup();", 1);
 			}
 		} else {
-			console.log(table);
 			this.tableToExcel(table,this.getExplorer());
 		}
 		function Cleanup() {
@@ -259,9 +258,7 @@ const DiurnalStatisticsOne = React.createClass({
 						return c[p];
 					})
 			}
-			console.log(table.nodeType);
 			if(!table.nodeType) table = document.getElementById(table);
-			console.log(table);
 			var ctx = {
 				worksheet: name || 'Worksheet',
 				table: table.innerHTML

+ 0 - 3
js/component/manageCenter/customer/reviewed/identityAudits.jsx

@@ -717,7 +717,6 @@ const PublicCustomer = Form.create()(React.createClass({
 			if(rowItem.id) {
 				deletedIds = rowItem.id;
 			};
-			console.log(rowItem);
 		};
 		this.setState({
 			selectedRowKeys: [],
@@ -733,7 +732,6 @@ const PublicCustomer = Form.create()(React.createClass({
 			},
 			success: function(data) {
 				let thisData = data.data;
-				console.log(thisData);
 				$.ajax({
 					method: "post",
 					dataType: "json",
@@ -782,7 +780,6 @@ const PublicCustomer = Form.create()(React.createClass({
 			},
 			success: function(data) {
 				let thisData = data.data;
-				console.log(thisData);
 				$.ajax({
 					method: "post",
 					dataType: "json",

+ 0 - 2
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -2036,7 +2036,6 @@ const approvedOutsourcing = React.createClass({
     //     }
     //   }
     // }
-    console.log(selectedRowKeys)
 
     this.setState({ selectedRowKeys })
   },
@@ -3827,7 +3826,6 @@ const approvedOutsourcing = React.createClass({
               rows={4}
               value={this.state.reason}
               onChange={(e) => {
-                console.log(e.target.value)
                 this.setState({
                   reason: e.target.value,
                 })

+ 0 - 2
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -1996,7 +1996,6 @@ const approvedOutsourcing = React.createClass({
     //     }
     //   }
     // }
-    console.log(selectedRowKeys);
 
     this.setState({ selectedRowKeys });
   },
@@ -3747,7 +3746,6 @@ const approvedOutsourcing = React.createClass({
               rows={4}
               value={this.state.reason}
               onChange={(e) => {
-                console.log(e.target.value);
                 this.setState({
                   reason: e.target.value,
                 });

+ 0 - 1
js/component/manageCenter/financialManage/distribute/invoiceApplyListQuery.jsx

@@ -574,7 +574,6 @@ const invoiceApplyListQuery = React.createClass({
     });
   },
   tableRowClick(record) {
-    console.log(record);
 
     this.state.RowData = record;
     this.setState({

+ 0 - 1
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -255,7 +255,6 @@ class OrderDetail extends Component {
     });
   }
   downImg() {
-    console.log(this.props.pictureUrl);
     const data = this.props.orderData;
     let num = 0;
     for (

+ 0 - 1
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/index.js

@@ -184,7 +184,6 @@ class DetailsModal extends Component{
                     let payNodeArr = []
                     let thisData = []
                     let arr = data.data || []
-                    // console.log('this.state.paySubject', this.state.paySubject)
                     //对#5283自定义的补充展示
                     this.state.paySubject.push({ key: '自定义', value: '0' })
                     for (let i = 0; i < arr.length; i++) {

+ 8 - 9
js/component/manageCenter/order/orderNew/costAuditList/index.js

@@ -100,14 +100,6 @@ class CostAuditList extends Component{
                     },
                 },
                 {
-                    title: "本次付款金额",
-                    dataIndex: "paymentAmount",
-                    key: "paymentAmount",
-                    render: (text) => {
-                        return isNaN(parseFloat(text)) ? text : parseFloat(text);
-                    },
-                },
-                {
                     title: "本次申请金额",
                     dataIndex: "applicationAmount",
                     key: "applicationAmount",
@@ -116,6 +108,14 @@ class CostAuditList extends Component{
                     }
                 },
                 {
+                    title: "已支付",
+                    dataIndex: "paymentAmount",
+                    key: "paymentAmount",
+                    render: (text) => {
+                        return isNaN(parseFloat(text)) ? text : parseFloat(text);
+                    },
+                },
+                {
                     title: "申请人",
                     dataIndex: "aname",
                     key: "aname",
@@ -199,7 +199,6 @@ class CostAuditList extends Component{
                 pageSize: 10,
                 onChange: function (page) {
                     this.loadData(page);
-                    console.log(page)
                 }.bind(this),
                 showTotal: function (total) {
                     return "共" + total + "条数据";

+ 0 - 5
js/component/manageCenter/order/orderNew/reject.jsx

@@ -504,7 +504,6 @@ const IntentionCustomer = Form.create()(
                           boFlag: false,
                         });
                       }
-                      console.log(e);
                     }}
                   >
                     {arr.map((item) => {
@@ -683,9 +682,7 @@ const IntentionCustomer = Form.create()(
                   style={{ width: "150px" }}
                   disabled={this.state.yearFlag ? true : false}
                   onChange={(e) => {
-                    console.log("ee", e);
                     record.effectiveCount = e;
-                    console.log("year", record);
                   }}
                 >
                   {/* <Select.Option key={null}>无</Select.Option> */}
@@ -1610,7 +1607,6 @@ const IntentionCustomer = Form.create()(
           this.setState({
             departmentArr: theArr,
           });
-          console.log(this.state.departmentArr);
         }.bind(this),
       }).always(
         function () {
@@ -1682,7 +1678,6 @@ const IntentionCustomer = Form.create()(
     },
 
     rizhi() {
-      console.log(this.state.orderNo);
       this.setState({
         loading: true,
       });

+ 518 - 298
js/component/manageCenter/project/task/myTask.jsx

@@ -1438,7 +1438,6 @@ const Task = React.createClass({
     // 获取Csort
     this.getCsortData(localStorage.getItem('cSort'))
     this.projectTypeTabContent(record.projectType)
-    console.log('项目类型',record.projectType)
   },
   //点击修改项目详情
   tijiaoOk() {
@@ -2253,7 +2252,7 @@ const Task = React.createClass({
             outsourceRemarks: _this.state.outsourceRemarks,
             unitNumber: _this.state.unitNumber,
             unitPrice: _this.state.unitPrice,
-            id: _this.state.refundStatus == 2 ? _this.state.mid : undefined,
+            id: _this.state.refundStatus === 2 ? _this.state.mid : undefined,//被拒绝外包申请时,需要传id
           }
 
           //refundStatus   0-待审核 ,1-审核通过,2-审核拒绝    审核被驳回时和第一次发起外包时,要填写发起原因
@@ -2368,34 +2367,37 @@ const Task = React.createClass({
                         url
                     )
                     : [], //图片地址
-              }
+              },
             })
           }else{
             this.setState({
-              startType: data.data.startType, //类型
-              patentType: data.data.patentType, //专利类型
-              patentNameType: data.data.patentNameType, //专利名称类型
-              patentName: data.data.patentName, //专利名称
-              outsourceRemarks: data.data.outsourceRemarks,
-              remarks: data.data.remarks,
-              companyName: data.data.companyName,
-              amount: data.data.amount,
-              mid: data.data.id,
-              unitPrice: data.data.unitPrice,
-              refundStatus: data.data.refundStatus,
-              unitNumber: data.data.unitNumber,     //如果存在 证明是以前的旧数据
-              pictureUrl: data.data.pictureUrl
-                  ? splitUrl(
-                      data.data.pictureUrl,
-                      ',',
-                      globalConfig.avatarHost + '/upload',
-                      url
-                  )
-                  : [], //图片地址
-              createTimes: data.data.createTimes,
-              auditTimes: data.data.auditTimes,
+              oldInfor: {},
             })
           }
+          this.setState({
+            startType: data.data.startType, //类型
+            patentType: data.data.patentType, //专利类型
+            patentNameType: data.data.patentNameType, //专利名称类型
+            patentName: data.data.patentName, //专利名称
+            outsourceRemarks: data.data.outsourceRemarks,
+            remarks: data.data.remarks,
+            companyName: data.data.companyName,
+            amount: data.data.amount,
+            mid: data.data.id,
+            unitPrice: data.data.unitPrice,
+            refundStatus: data.data.refundStatus,
+            unitNumber: data.data.unitNumber,     //如果存在 证明是以前的旧数据
+            pictureUrl: data.data.pictureUrl
+                ? splitUrl(
+                    data.data.pictureUrl,
+                    ',',
+                    globalConfig.avatarHost + '/upload',
+                    url
+                )
+                : [], //图片地址
+            createTimes: data.data.createTimes,
+            auditTimes: data.data.auditTimes,
+          })
         } else if (data.error && data.error.length) {
           message.warning(data.error[0].message)
         } else if (!data.data) {
@@ -5481,307 +5483,525 @@ const Task = React.createClass({
                 </Button>
               </div>
             </TabPane>
-            <TabPane tab="外包(不走本部)" key="2">
+            <TabPane tab="外包/供应商信息" key="2">
               {this.state.refundStatus != 0 && this.state.refundStatus != 1 ? (
-                <div style={{ marginTop: 10 }}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label={
-                        <span>
+                  <div style={{ marginTop: 10 }}>
+                    <div className="clearfix">
+                      <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label={
+                            <span>
                           <strong style={{ color: '#f00' }}>*</strong>
-                          外包公司
+                          类型
                         </span>
-                      }
-                    >
-                      <Input
-                        value={this.state.companyName}
-                        onChange={(e) => {
-                          this.setState({
-                            companyName: e.target.value,
-                          })
+                          }
+                      >
+                        <Radio.Group
+                            value={this.state.startType}
+                            onChange={(e) => {
+                              this.setState({ startType: e.target.value })
+                            }}
+                        >
+                          <Radio value={0}>外包(不走总部)</Radio>
+                          <Radio value={1}>供应商信息</Radio>
+                        </Radio.Group>
+                      </FormItem>
+                    </div>
+                    {/* 专利类型 */}
+                    <div
+                        className="clearfix"
+                        style={{
+                          display: this.state.projectType === 1 ? 'block' : 'none',
                         }}
-                        placeholder="请填写外包公司名称"
-                      />
-                    </FormItem>
-                    <span className="tip" style={{ color: 'red' }}>
-                      如多个公司,请用间隔
-                    </span>
-                  </div>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label={
-                        <span>
-                          <strong style={{ color: '#f00' }}>*</strong>
-                          单价(万元)
-                        </span>
-                      }
                     >
-                      <Input
-                        value={this.state.unitPrice}
-                        onChange={(e) => {
-                          this.setState({
-                            unitPrice: e.target.value,
-                          })
-                        }}
-                        placeholder="请填写本次外包公司的价格"
-                      />
-                    </FormItem>
-                  </div>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label={
-                        <span>
+                      <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label={
+                            <span>
                           <strong style={{ color: '#f00' }}>*</strong>
-                          数量(个)
+                          专利类型
                         </span>
-                      }
-                    >
-                      <Input
-                        value={this.state.unitNumber}
-                        onChange={(e) => {
-                          this.setState({
-                            unitNumber: e.target.value,
-                          })
+                          }
+                      >
+                        <Radio.Group
+                            value={this.state.patentType}
+                            onChange={(e) => {
+                              let _this = this;
+                              if(this.state.thirdInfoList.length >0){
+                                confirm({
+                                  title: '确定要切换吗?',
+                                  content: '切换将删除所有第三信息和付款节点',
+                                  onOk() {
+                                    return new Promise((resolve, reject) => {
+                                      _this.setState({ patentType: e.target.value },()=>{
+                                        _this.projectTypeTabContent(_this.state.projectType);
+                                      })
+                                      _this.confirmDeletNew(-1,resolve,reject)
+                                      if(_this.state.payNodeList.length > 0){
+                                        _this.payNodeConfirmDeletNew(-1,resolve,reject);
+                                      }
+                                    }).catch(() => console.log('Oops errors!'));
+                                  },
+                                  onCancel() {},
+                                });
+                              }else{
+                                this.setState({ patentType: e.target.value },()=>{
+                                  this.projectTypeTabContent(this.state.projectType);
+                                })
+                              }
+                            }}
+                        >
+                          <Radio value={0}>专利申请/变更/转让</Radio>
+                          <Radio value={1}>专利买卖</Radio>
+                        </Radio.Group>
+                      </FormItem>
+                    </div>
+                    <div
+                        className="clearfix"
+                        style={{
+                          display: this.state.projectType === 1? 'block' : 'none',
                         }}
-                        placeholder="请填写本次外包公司的价格"
-                      />
-                    </FormItem>
-                  </div>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label={
-                        <span>
+                    >
+                      <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label={
+                            <span>
                           <strong style={{ color: '#f00' }}>*</strong>
-                          总金额(万元)
+                          专利名称
                         </span>
-                      }
-                    >
-                      <Input
-                        value={this.state.amount}
-                        onChange={(e) => {
-                          this.setState({
-                            amount: e.target.value,
-                          })
+                          }
+                      >
+                        <Radio.Group
+                            value={this.state.patentNameType}
+                            onChange={(e) => {
+                              let _this = this;
+                              if(this.state.thirdInfoList.length >0){
+                                confirm({
+                                  title: '确定要切换吗?',
+                                  content: '切换将删除所有第三信息和付款节点',
+                                  onOk() {
+                                    return new Promise((resolve, reject) => {
+                                      _this.setState({ patentNameType: e.target.value },()=>{
+                                        _this.projectTypeTabContent(_this.state.projectType);
+                                      })
+                                      _this.confirmDeletNew(-1,resolve,reject)
+                                      if(_this.state.payNodeList.length > 0){
+                                        _this.payNodeConfirmDeletNew(-1,resolve,reject);
+                                      }
+                                    }).catch(() => console.log('Oops errors!'));
+                                  },
+                                  onCancel() {},
+                                });
+                              }else{
+                                this.setState({ patentNameType: e.target.value },()=>{
+                                  this.projectTypeTabContent(this.state.projectType);
+                                })
+                              }
+                            }}
+                        >
+                          <Radio value={0}>实用新型专利</Radio>
+                          <Radio value={1}>发明专利</Radio>
+                          <Radio value={2}>外观专利</Radio>
+                          {/*<Radio value={3}>*/}
+                          {/*  其他*/}
+                          {/*  <Input*/}
+                          {/*    disabled={this.state.patentNameType !== 3}*/}
+                          {/*    value={this.state.patentName}*/}
+                          {/*    style={{ marginLeft: '15px' }}*/}
+                          {/*    onChange={(e) => {*/}
+                          {/*      this.setState({*/}
+                          {/*        patentName: e.target.value,*/}
+                          {/*      })*/}
+                          {/*    }}*/}
+                          {/*    placeholder="请填写专利名称"*/}
+                          {/*  />*/}
+                          {/*</Radio>*/}
+                        </Radio.Group>
+                      </FormItem>
+                    </div>
+                    {/* 第三方信息专利 */}
+                    <div
+                        style={{
+                          // display: this.state.type == 1 ? "block" : "none",
+                          display: this.state.type == 1 ? 'block' : 'block',
                         }}
-                        placeholder="请填写本次外包公司的价格"
-                      />
-                    </FormItem>
-                  </div>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label={
-                        <span>
-                          <strong style={{ color: '#f00' }}>*</strong>备注
-                        </span>
-                      }
                     >
-                      <TextArea
-                        rows={4}
-                        value={this.state.outsourceRemarks}
-                        onChange={(e) => {
-                          this.setState({
-                            outsourceRemarks: e.target.value,
-                          })
+                    <span
+                        style={{
+                          marginLeft: '50px',
+                          fontSize: '18px',
                         }}
-                        placeholder="请输入备注"
-                      />
-                    </FormItem>
-                  </div>
-                  <p
-                    className="tip"
-                    style={{
-                      paddingBottom: '12px',
-                      width: '240px',
-                      marginLeft: '145px',
-                      color: 'red',
-                    }}
-                  >
-                    首次派单项目,需上传协议,第2次起,同项目,只需写外包公司
-                  </p>
-                  <div className="clearfix">
-                    <FormItem
-                      labelCol={{ span: 4 }}
-                      wrapperCol={{ span: 18 }}
-                      label={
-                        <span>
-                          合同/协议扫描件
-                        </span>
-                      }
-                    >
-                      <PicturesWall
-                        fileList={this.getOrgCodeUrlWai}
-                        pictureUrl={this.state.pictureUrl}
-                      />
-                      <p style={{ color: 'red' }}>图片建议:要清晰。</p>
-                    </FormItem>
-                  </div>
-                  <div className="clearfix">
-                    <div
-                      style={{
-                        display: 'inline-black',
-                        textAlign: 'center',
-                      }}
                     >
+                      第三方信息
+                    </span>
+                      <span
+                          style={{
+                            display: 'inline-block',
+                            marginLeft: 10,
+                            color: 'red',
+                          }}
+                      >
+                      金额总计(万元): {this.state.allTotalAmount}
+                    </span>
                       <Button
-                        type="primary"
-                        loading={this.state.loading}
-                        onClick={()=>{
-                          this.sureOut(this.state.startType);
-                        }}
+                          type="primary"
+                          onClick={(e) => {
+                            if(this.state.projectType === 1 && this.state.patentType === -1){
+                              message.info('请先选择专利类型');
+                            }else if(this.state.projectType === 1 && this.state.patentNameType === -1){
+                              message.info('请先选择专利名称');
+                            }
+                            else{
+                              this.addThirdList()
+                            }
+                          }}
+                          style={{
+                            float: 'right',
+                            marginRight: '50px',
+                            marginBottom: '15px',
+                          }}
                       >
-                        {
-                          this.state.startType === 0 ? "确认发起外包,不通过总部" : "提交供应商信息"
-                        }
+                        +新增供应商名称
                       </Button>
-                      <p className="tip" style={{ color: 'red' }}>
-                        {
-                          this.state.startType === 0 ? "提示:高于总部价格,费用个人承担" : "确定提交供应商信息,提交后,不可修改"
-                        }
-                      </p>
                     </div>
-                  </div>
-                </div>
-              ) : (
-                <div>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="外包公司"
-                    >
-                      <span>{this.state.companyName}</span>
-                    </FormItem>
-                  </div>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="单价(万元)"
-                    >
-                      <span>{this.state.unitPrice}</span>
-                    </FormItem>
-                  </div>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="数量(个)"
-                    >
-                      <span>{this.state.unitNumber}</span>
-                    </FormItem>
-                  </div>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="总金额(万元)"
+                    <div
+                        className="clearfix"
+                        style={{
+                          // display: this.state.type == 1 ? "block" : "none",
+                          display: this.state.type == 1 ? 'block' : 'block',
+                        }}
                     >
-                      <span>{this.state.amount}</span>
-                    </FormItem>
-                  </div>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="备注"
+                      <Spin spinning={this.state.loading}>
+                        <Form layout="horizontal">
+                          <Table
+                              pagination={false}
+                              columns={this.state.ContactsListsNew}
+                              dataSource={this.state.thirdInfoList}
+                              onRowClick={this.tableRowClickOne}
+                              scroll={{ x: 'max-content', y: 0 }}
+                              bordered
+                              size="small"
+                          />
+                          <Col
+                              span={24}
+                              offset={9}
+                              style={{ marginTop: '15px' }}
+                          />
+                        </Form>
+                      </Spin>
+                    </div>
+                    {/*如果是软著类或者专利类的专利申请,隐藏付款节点*/}
+                    <div
+                        style={{
+                          display: (this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2? 'none' : 'block',  //0正常 1专利 2软著 3审计
+                        }}
                     >
-                      <span>{this.state.outsourceRemarks}</span>
-                    </FormItem>
-                  </div>
-                  <div className="clearfix">
-                    <FormItem
-                      labelCol={{ span: 4 }}
-                      wrapperCol={{ span: 18 }}
-                      label="合同/协议扫描件"
+                    <span
+                        style={{
+                          marginLeft: '50px',
+                          fontSize: '18px',
+                        }}
                     >
-                      {/*<Upload*/}
-                      {/*  className="demandDetailShow-upload"*/}
-                      {/*  listType="picture-card"*/}
-                      {/*  fileList={this.state.pictureUrl}*/}
-                      {/*  onPreview={(file) => {*/}
-                      {/*    this.setState({*/}
-                      {/*      previewImage: file.url || file.thumbUrl,*/}
-                      {/*      previewVisible: true,*/}
-                      {/*    })*/}
-                      {/*  }}*/}
-                      {/*/>*/}
-                      <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                        <ImgList fileList={this.state.pictureUrl} ItemWidth={'96px'}/>
-                      </div>
-                      <Modal
-                        maskClosable={false}
-                        footer={null}
-                        visible={this.state.previewVisible}
-                        onCancel={() => {
-                          this.setState({ previewVisible: false })
+                      付款节点
+                    </span>
+                      <span
+                          style={{
+                            display: 'inline-block',
+                            marginLeft: 10,
+                            color: 'red',
+                          }}
+                      ></span>
+                      <Button
+                          type="primary"
+                          onClick={(e) => {
+                            this.addPayNode()
+                          }}
+                          style={{
+                            float: 'right',
+                            marginRight: '50px',
+                            marginBottom: '15px',
+                          }}
+                      >
+                        +新增付款节点
+                      </Button>
+                    </div>
+                    {/*如果是软著类或者专利类的专利申请,隐藏付款节点*/}
+                    <div
+                        className="clearfix"
+                        style={{
+                          display: (this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2? 'none' : 'block',  //0正常 1专利 2软著 3审计
                         }}
+                    >
+                      <Spin spinning={this.state.loading}>
+                        <Form layout="horizontal">
+                          <Table
+                              pagination={false}
+                              columns={this.state.PayNodeTableColunms}
+                              dataSource={this.state.payNodeList}
+                              onRowClick={this.payNodeTableRowClickOne}
+                              scroll={{ x: 'max-content', y: 0 }}
+                              bordered
+                              size="small"
+                          />
+                          <Col
+                              span={24}
+                              offset={9}
+                              style={{ marginTop: '15px' }}
+                          />
+                        </Form>
+                      </Spin>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label={
+                            <span>
+                          <strong style={{ color: '#f00' }}>*</strong>备注
+                        </span>
+                          }
                       >
-                        <img
-                          alt=""
-                          style={{ width: '100%' }}
-                          src={this.state.previewImage || ''}
+                        <TextArea
+                            rows={4}
+                            value={this.state.outsourceRemarks}
+                            onChange={(e) => {
+                              this.setState({
+                                outsourceRemarks: e.target.value,
+                              })
+                            }}
+                            placeholder="请输入备注"
                         />
-                      </Modal>
-                    </FormItem>
-                  </div>
-                </div>
-              )}
-              {this.state.refundStatus == 1 ||
-              this.state.refundStatus == 0 ||
-              this.state.refundStatus == 2 ? (
-                <div className="clearfix">
-                  <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>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="审核结果"
-                    >
-                      <span>{getRefundStatus(this.state.refundStatus)}</span>
-                    </FormItem>
-                  </div>
-                  <div
-                    className="clearfix"
-                    style={{
-                      display: this.state.refundStatus == 0 ? 'none' : 'block',
-                    }}
-                  >
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="审核时间"
+                      </FormItem>
+                    </div>
+                    {/*<div className="clearfix">
+										<FormItem className="half-item"
+										    {...formItemLayout}
+										    label="上传协议文件" style={{height:"auto"}}>
+										     <Upload header={{authorization: 'authorization-text'}} action={globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"}
+													data={(e)=>{
+														return {
+															'sign': e.name.substring(0,e.name.lastIndexOf("."))
+														}
+													}}
+													fileList={this.state.fileUrl}
+													onChange={(e)=>{
+														this.setState({
+															attachmentUrl:e.fileList,
+															fileUrl:e.fileList
+														})
+													}}>
+												{fileUrl.length>1?null:<Button>
+												<Icon type="upload" /> 点击上传
+												</Button>}
+										    </Upload>
+										    <span className="tip" style={{display:"inline-block"}}>支持文件格式: doc,excel,ppt</span>
+										</FormItem>
+									</div>*/}
+                    <p
+                        className="tip"
+                        style={{
+                          paddingBottom: '12px',
+                          width: '240px',
+                          marginLeft: '145px',
+                          color: 'red',
+                        }}
                     >
-                      <span>{this.state.auditTimes}</span>
-                    </FormItem>
+                      首次派单项目,需上传协议,第2次起,同项目,只需写外包公司
+                    </p>
+                    <div className="clearfix">
+                      <FormItem
+                          labelCol={{ span: 4 }}
+                          wrapperCol={{ span: 18 }}
+                          label={
+                            <span>
+                          合同/协议扫描件
+                        </span>
+                          }
+                      >
+                        <PicturesWall
+                            fileList={this.getOrgCodeUrlWai}
+                            pictureUrl={this.state.pictureUrl}
+                        />
+                        <p style={{ color: 'red' }}>图片建议:要清晰。</p>
+                      </FormItem>
+                    </div>
+                    {/*只有审核拒绝和第一次发起外包的时候才要填写发起原因*/}
+                    {typeof this.state.refundStatus === 'undefined' || 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={{
+                            display: 'inline-black',
+                            textAlign: 'center',
+                          }}
+                      >
+                        <Button
+                            type="primary"
+                            loading={this.state.loading}
+                            onClick={()=>{
+                              this.sureOut(this.state.startType);
+                            }}
+                        >
+                          {
+                            this.state.startType === 0 ? "确认发起外包,不通过总部" : "提交供应商信息"
+                          }
+                        </Button>
+                        <p className="tip" style={{ color: 'red' }}>
+                          {
+                            this.state.startType === 0 ? "提示:高于总部价格,费用个人承担" : "确定提交供应商信息,提交后,不可修改"
+                          }
+                        </p>
+                      </div>
+                    </div>
                   </div>
-                </div>
               ) : (
-                ''
+                  <div>
+                    {
+                      this.state.speVisible && this.state.activeKey === '2' ?
+                          <CheckProject
+                              {...this.props}
+                              tid={this.state.tid}
+                              oldInfor={this.state.oldInfor}
+                              projectType={this.state.projectType}    //0正常 1专利 2软著 3审计
+                              patentNameType={this.state.patentNameType}
+                              patentName={this.state.patentName}
+                              patentType={this.state.patentType}
+                              status={this.state.refundStatus}
+                              isPreviewPay={true}
+                              thirdInfoList={this.state.thirdInfoList}
+                              dataSource={this.state.payNodeList}
+                              outsourceRemarks={this.state.outsourceRemarks}
+                              fileList={this.state.pictureUrl}
+                              startType={this.state.startType}
+                              projectStatus={this.state.projectStatus}
+                              onRefresh={()=>{
+                                this.waiDetail();
+                                this.thirdTable(this.state.tid);
+                                this.getSelectOutsourceLog(this.state.tid);
+                                this.payNodeTable(this.state.tid)
+                                this.loadData(this.state.page)
+                              }}
+                          /> : <div/>
+                    }
+                  </div>
               )}
+              {(this.state.refundStatus == 1 ||
+                  this.state.refundStatus == 0 ||
+                  this.state.refundStatus == 2) &&
+              this.state.startType !== 1
+                  ? (
+                      <div className="clearfix"
+                           style={{
+                             display: this.state.refundStatus == 0 ? 'none' : 'block',
+                           }}
+                      >
+                        <hr className="division" />
+                        {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="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>
+                  ) : (
+                      ''
+                  )}
             </TabPane>
             {!this.props.isZxs || (this.state.isHuiyuan && this.props.isZxs) ? (
               <TabPane tab="订单详情" key="3">

+ 29 - 168
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -785,7 +785,6 @@ const MyTaskOutsource = React.createClass({
     this.payNodeTable(record.id)
     // 获取Csort
     this.getCsortData(localStorage.getItem('cSort'))
-    console.log('项目类型',record.projectType)
   },
   //点击修改项目详情
   tijiaoOk() {
@@ -1839,26 +1838,11 @@ const MyTaskOutsource = React.createClass({
           for (let i = 0; i < arr.length; i++) {
             thisData = arr[i];
             totalCui += +thisData.money;
-            theArr.push({
-              key: i,
-              dunSubject: thisData.dunSubject
+            thisData.key = i;
+            thisData.dunSubject = thisData.dunSubject
                 ? thisData.dunSubject.toString()
-                : "", //催款科目
-              id: thisData.id, //节点Id
-              money: thisData.money, //催款金额
-              // orderNo: record ? record.orderNo : this.props.datauser.orderNo,
-              commodityName: thisData.commodityName,
-              projectType: thisData.projectType,
-              dunTypeName: thisData.dunTypeName,
-              status: thisData.status,
-              waitDay: thisData.waitDay,
-              effectiveCount: thisData.effectiveCount,
-              startDate: thisData.startDate,
-              dunType: thisData.dunType,
-              appropriationRatio: thisData.appropriationRatio,
-              customizeName: thisData.customizeName,
-              customizeTimes: thisData.customizeTimes,
-            });
+                : ""; //催款科目
+            theArr.push(thisData);
           }
           if (!totalCui) {
             totalCui = 0;
@@ -2999,7 +2983,7 @@ const MyTaskOutsource = React.createClass({
                 </Spin>
               </Form>
             </TabPane>
-            <TabPane tab="外包接单公司信息" key="2">
+            <TabPane tab="外包/供应商信息" key="2">
               {this.state.visible && this.state.modKey === '2'?<CheckProject
                   {...this.props}
                   tid={this.state.tid}
@@ -3687,153 +3671,30 @@ const MyTaskOutsource = React.createClass({
                 </Button>
               </div>
             </TabPane>
-            <TabPane tab="外包接单公司信息" key="2">
-              {/*<Button type="primary" onClick={this.addCompany} style={{float:'right',marginBottom:'10px'}}>+新增接单公司</Button>*/}
-              {
-                <div className="clearfix">
-                  <h3 className="sub-title" style={{ marginBottom: "10px" }}>
-                    新增(编辑)接单公司
-                  </h3>
-                  <FormItem
-                    className="three-item"
-                    {...formItemLayout}
-                    label={
-                      <span>
-                        <strong style={{ color: "#f00" }}>*</strong>公司名称
-                      </span>
-                    }
-                  >
-                    <Input
-                      placeholder="请输入公司名称"
-                      value={this.state.cName}
-                      style={{ width: "200px" }}
-                      onChange={(e) => {
-                        this.setState({ cName: e.target.value });
-                      }}
-                      className="height-input"
-                    />
-                  </FormItem>
-                  <FormItem
-                    className="three-item"
-                    {...formItemLayout}
-                    label={
-                      <span>
-                        <strong style={{ color: "#f00" }}>*</strong>联系人
-                      </span>
-                    }
-                  >
-                    <Input
-                      placeholder="请输入联系人名称"
-                      value={this.state.companyContacts}
-                      style={{ width: "200px" }}
-                      onChange={(e) => {
-                        this.setState({ companyContacts: e.target.value });
-                      }}
-                      className="height-input"
-                    />
-                  </FormItem>
-                  <FormItem
-                    className="three-item"
-                    {...formItemLayout}
-                    label={
-                      <span>
-                        <strong style={{ color: "#f00" }}>*</strong>联系人电话
-                      </span>
-                    }
-                  >
-                    <Input
-                      placeholder="请输入联系人电话"
-                      value={this.state.companyContactsMobile}
-                      style={{ width: "200px" }}
-                      onChange={(e) => {
-                        this.setState({
-                          companyContactsMobile: e.target.value,
-                        });
-                      }}
-                      className="height-input"
-                    />
-                  </FormItem>
-                  <FormItem
-                    className="three-item"
-                    {...formItemLayout}
-                    label="企业地址"
-                  >
-                    <Cascader
-                      options={areaSelect()}
-                      value={this.state.companyProvinceArr}
-                      placeholder="选择城市"
-                      style={{ width: "200px" }}
-                      onChange={(e) => {
-                        this.setState({ companyProvinceArr: e });
-                      }}
-                    />
-                  </FormItem>
-                  <FormItem className="three-item" {...formItemLayout} label="">
-                    <Input
-                      placeholder="请输入详细地址"
-                      value={this.state.companyAddress}
-                      style={{ width: "200px", marginLeft: "12em" }}
-                      onChange={(e) => {
-                        this.setState({ companyAddress: e.target.value });
-                      }}
-                      className="height-input"
-                    />
-                  </FormItem>
-                  <FormItem
-                    className="three-item"
-                    {...formItemLayout}
-                    label=""
-                  />
-                  <div className="clearfix">
-                    <FormItem
-                      labelCol={{ span: 3 }}
-                      wrapperCol={{ span: 16 }}
-                      label="备注"
-                    >
-                      <Input
-                        type="textarea"
-                        placeholder="请输入备注"
-                        rows={4}
-                        value={this.state.companyRemarks}
-                        onChange={(e) => {
-                          this.setState({ companyRemarks: e.target.value });
-                        }}
-                      />
-                    </FormItem>
-                  </div>
-                  <Button
-                    type="primary"
-                    style={{
-                      float: "right",
-                      marginTop: "10px",
-                      marginRight: "50px",
-                    }}
-                    onClick={() => {
-                      this.saveCompany(this.state.companyId);
-                    }}
-                  >
-                    保存
-                  </Button>
-                </div>
-              }
-              <p style={{ color: "red" }}>
-                提示:查看备注请点击表格左侧加号按钮~
-              </p>
-              <div className="patent-table" style={{ marginTop: "10px" }}>
-                <Spin spinning={this.state.loading}>
-                  <Table
-                    columns={this.state.companyColumns}
-                    dataSource={this.state.companys}
-                    scroll={{ x: 300, y: 0 }}
-                    expandedRowRender={(record) => {
-                      return <p>{record.remarks}</p>;
-                    }}
-                    bordered
-                    size="small"
-                    pagination={false}
-                  />
-                </Spin>
-              </div>
+            <TabPane tab="外包/供应商信息" key="2">
+              {this.state.speVisible && this.state.modKey === '2'?<CheckProject
+                  {...this.props}
+                  tid={this.state.tid}
+                  status={this.state.refundStatus}
+                  projectType={this.state.projectType}
+                  oldInfor={this.state.oldInfor}
+                  patentNameType={this.state.patentNameType}
+                  patentName={this.state.patentName}
+                  patentType={this.state.patentType}
+                  isPreviewPay={true}
+                  thirdInfoList={this.state.thirdInfoList}
+                  dataSource={this.state.payNodeList}
+                  outsourceRemarks={this.state.outsourceRemarks}
+                  fileList={this.state.pictureUrl}
+                  startType={this.state.startType}
+                  projectStatus={this.state.projectStatus}
+                  onRefresh={()=>{
+                    this.waiDetail();
+                    this.thirdTable(this.state.tid);
+                    this.payNodeTable(this.state.tid);
+                    this.loadData(this.state.page)
+                  }}
+              />:<div/>}
             </TabPane>
             {!this.props.isZxs || (this.state.isHuiyuan && this.props.isZxs) ? (
               <TabPane tab="订单详情" key="3">

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

@@ -179,7 +179,7 @@ class NewSupplier extends Component{
 
         data.type = this.props.projectType === 1 ? (this.props.patentType === 0 ? 1 : 2) : 0   //0其他 1专利申请 2专利买卖
         if(this.props.projectType === 3){
-            if(!this.state.assets){
+            if(!this.state.audit){
                 message.warning("请选择审计!");
                 return false;
             }
@@ -187,7 +187,7 @@ class NewSupplier extends Component{
                 message.warning("请输入公司资产!");
                 return false;
             }
-            if(!this.state.assets){
+            if(!this.state.income){
                 message.warning("请输入收入!");
                 return false;
             }
@@ -297,6 +297,7 @@ class NewSupplier extends Component{
                             {this.props.projectType !== 2 && !(this.props.projectType === 1 && this.props.patentType ===0) ?<div className="clearfix">
                                 <Form.Item {...formItemLayout} label="单价(万元)">
                                     <InputNumber
+                                        min={0}
                                         value={this.state.thirdUnitPrice}
                                         placeholder="请输入单价(必填项)"
                                         required="required"
@@ -321,6 +322,7 @@ class NewSupplier extends Component{
                             <div className="clearfix">
                                 <Form.Item {...formItemLayout} label="数量">
                                     <InputNumber
+                                        min={0}
                                         value={this.state.thirdQuantity}
                                         placeholder="请输入数量(必填项)"
                                         onBlur={this.calculatedAmount}
@@ -472,6 +474,7 @@ class NewSupplier extends Component{
                                     <div className="clearfix">
                                         <Form.Item {...formItemLayout} label="公司资产(万元)">
                                             <InputNumber
+                                                min={0}
                                                 value={this.state.assets}
                                                 placeholder="请输入公司资产"
                                                 required="required"
@@ -488,6 +491,7 @@ class NewSupplier extends Component{
                                     <div className="clearfix">
                                         <Form.Item {...formItemLayout} label="收入(万元)">
                                             <InputNumber
+                                                min={0}
                                                 value={this.state.income}
                                                 placeholder="请输入收入"
                                                 required="required"

+ 0 - 1
js/component/manageCenter/project/task/operationPayNode.js

@@ -198,7 +198,6 @@ class OperationPayNode extends Component{
                                     })(
                                     <Select
                                         onChange={(val) => {
-                                            console.log(val)
                                             this.setState({
                                                 paySubjectName: val,
                                                 dunType: val,

+ 1 - 9
js/component/manageCenter/publicComponent/assign.jsx

@@ -197,7 +197,6 @@ const Assign = React.createClass({
         this.setState({
             loading: true
         });
-        console.log(this.state.contact);
         $.ajax({
             method: this.props.requestMethod,
             dataType: "json",
@@ -237,14 +236,11 @@ const Assign = React.createClass({
             message.warning("请填写备注信息")
             return
         }
-        console.log(record);
         let orderNo = this.props.data.join(",")
-        console.log(orderNo, record.id, this.props.selApi);
 
         this.setState({
             loading: true
         });
-        console.log(this.state.contact);
         $.ajax({
             method: this.props.requestMethod,
             dataType: "json",
@@ -333,11 +329,7 @@ const Assign = React.createClass({
         });
     },
     //初始加载组件,和主页面一起加载
-    componentDidMount() {
-        console.log(this.props);
-
-
-    },
+    componentDidMount() {},
     //组件调用初始加载函数,可用条件控制,在调用组件时可以拿到参数
     componentWillReceiveProps(nextProps) {
         this.state.visible = nextProps.showDesc;

+ 1 - 1
js/component/manageCenter/set/projectConfigure/addPatentPrice.js

@@ -67,7 +67,7 @@ class AddPatentPrice extends Component{
                                 initialValue: this.props.infor.companyName,
                                 rules: [{ required: true, message: '请输入公司名称!' }],
                             })(
-                                <Input placeholder="请输入公司名称" style={{width:'250px'}}/>
+                                <Input disabled={Object.keys(this.props.infor).length !== 0} placeholder="请输入公司名称" style={{width:'250px'}}/>
                             )}
                         </Form.Item>
                         <Form.Item  label="实用新型(万元)">

+ 0 - 1
js/component/manageCenter/statistics/personnel/personnelAll.jsx

@@ -651,7 +651,6 @@ const PersonnelAll = React.createClass({
     for(let key in data) {
       if(!data[key]) {
         delete data[key]
-        console.log(data);
         
       }
     }

+ 1 - 1
package.json

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