Browse Source

专利成本修改

HW 3 years ago
parent
commit
ba53d9345c

+ 3 - 3
js/component/common/projectOperation/index.jsx

@@ -91,7 +91,7 @@ class ProjectOperation extends Component{
                 message.warning("请选择官费!");
                 return false;
             }
-            if (this.state.costReduction === "" && (this.state.patentType === 0 || this.state.patentType === 2)) {
+            if (this.state.costReduction === "" && (this.state.patentType === 0 || this.state.patentType === 2) && this.state.officialCost === 1) {
                 message.warning("请选择费减!");
                 return false;
             }
@@ -133,7 +133,7 @@ class ProjectOperation extends Component{
 
             main: this.state.main, //是否为主要项目
             officialCost: this.state.displayFees==='block' ? this.state.officialCost : '', //是否有官费
-            costReduction: this.state.displayFees==='block' && (this.state.patentType === 0 || this.state.patentType === 2) ?this.state.costReduction : '', //是否有费减
+            costReduction: this.state.displayFees==='block' ? ((this.state.patentType === 0 || this.state.patentType === 2) ? (this.state.officialCost === 1 ? this.state.costReduction : 0) : 0) : '', //是否有费减
             patentType: this.state.displayFees==='block' ? this.state.patentType : '', // 专利类型
         }
         if(this.state.addProjectType === 5){
@@ -197,7 +197,7 @@ class ProjectOperation extends Component{
                 commodityQuantity: this.state.commodityQuantity, //数量
                 taskComment: this.state.taskComment, //备注
                 officialCost: this.state.displayFees==='block' ? this.state.officialCost : '', //是否有官费
-                costReduction: this.state.displayFees==='block' && (this.state.patentType === 0 || this.state.patentType === 2) ?this.state.costReduction : '', //是否有费减
+                costReduction: this.state.displayFees==='block' ? ((this.state.patentType === 0 || this.state.patentType === 2) ? (this.state.officialCost === 1 ? this.state.costReduction : 0) : 0) : '', //是否有费减
                 patentType: this.state.displayFees==='block' ? this.state.patentType : '', //专利类型
                 declarationBatch: this.state.declarationBatch || undefined,//申报批次
                 ifCertificationFee: isNaN(parseInt(this.state.ifCertificationFee)) ? undefined : this.state.ifCertificationFee,

+ 4 - 1
js/component/manageCenter/components/checkProject/applyPaymentModal.js

@@ -34,6 +34,10 @@ class ApplyPaymentModal extends Component{
             if (err) {
                 return;
             }
+            if(values.quantity<1){
+                message.warning('申请支付数量不能小于零');
+                return false;
+            }
             this.setState({
                 loading: true
             })
@@ -242,7 +246,6 @@ class ApplyPaymentModal extends Component{
                                         style={{ width: '200px' }}
                                         precision={0}
                                         placeholder="请输入本次申请支付数量"
-                                        min={1}
                                         onChange={(e)=>{
                                             //0正常 1专利 2软著 3审计
                                             //软著 专利申请不需要计算,因为单价未知

+ 87 - 16
js/component/manageCenter/customer/statistics/departmentStatistics/index.jsx

@@ -32,7 +32,7 @@ class DepartmentStatistics extends Component{
                     width: '25%',
                 },
                 {
-                    title: "客户总数",
+                    title: "私有数",
                     dataIndex: "userCount",
                     key: "userCount",
                     className: 'tableRowStyle',
@@ -56,9 +56,9 @@ class DepartmentStatistics extends Component{
                     },
                 },
                 {
-                    title: "成交客户总数",
-                    dataIndex: "completeCount",
-                    key: "completeCount",
+                    title: "渠道数",
+                    dataIndex: "channelCount",
+                    key: "channelCount",
                     className: 'tableRowStyle',
                     render: (text, record) => {
                         return (
@@ -70,7 +70,7 @@ class DepartmentStatistics extends Component{
                                         this.setState({
                                             customerVisible: true,
                                             aid: record.aid,
-                                            type: 3,
+                                            type: 1,
                                         })
                                     }
                                 }}>
@@ -80,9 +80,9 @@ class DepartmentStatistics extends Component{
                     },
                 },
                 {
-                    title: "新增客户数",
-                    dataIndex: "inputCount",
-                    key: "inputCount",
+                    title: "签单数",
+                    dataIndex: "signCount",
+                    key: "signCount",
                     className: 'tableRowStyle',
                     render: (text, record) => {
                         return (
@@ -94,7 +94,7 @@ class DepartmentStatistics extends Component{
                                         this.setState({
                                             customerVisible: true,
                                             aid: record.aid,
-                                            type: 1,
+                                            type: 2,
                                         })
                                     }
                                 }}>
@@ -104,9 +104,33 @@ class DepartmentStatistics extends Component{
                     },
                 },
                 {
-                    title: "新增面谈数",
-                    dataIndex: "interviewCount",
-                    key: "interviewCount",
+                    title: "私有新增数",
+                    dataIndex: "newCount",
+                    key: "newCount",
+                    className: 'tableRowStyle',
+                    render: (text, record) => {
+                        return (
+                            <div
+                                className={record.aid ? 'receiveCount' : ''}
+                                onClick={(e)=>{
+                                    if(record.aid){
+                                        e.stopPropagation();
+                                        this.setState({
+                                            customerVisible: true,
+                                            aid: record.aid,
+                                            type: 3,
+                                        })
+                                    }
+                                }}>
+                                {text}
+                            </div>
+                        );
+                    },
+                },
+                {
+                    title: "渠道新增数",
+                    dataIndex: "channelNewCount",
+                    key: "channelNewCount",
                     className: 'tableRowStyle',
                     render: (text, record) => {
                         return (
@@ -128,7 +152,55 @@ class DepartmentStatistics extends Component{
                     },
                 },
                 {
-                    title: "新增领取客户数",
+                    title: "私有面谈数",
+                    dataIndex: "completeCount",
+                    key: "completeCount",
+                    className: 'tableRowStyle',
+                    render: (text, record) => {
+                        return (
+                            <div
+                                className={record.aid ? 'receiveCount' : ''}
+                                onClick={(e)=>{
+                                    if(record.aid){
+                                        e.stopPropagation();
+                                        this.setState({
+                                            customerVisible: true,
+                                            aid: record.aid,
+                                            type: 5,
+                                        })
+                                    }
+                                }}>
+                                {text}
+                            </div>
+                        );
+                    },
+                },
+                {
+                    title: "渠道面谈数",
+                    dataIndex: "channelCompleteCount",
+                    key: "channelCompleteCount",
+                    className: 'tableRowStyle',
+                    render: (text, record) => {
+                        return (
+                            <div
+                                className={record.aid ? 'receiveCount' : ''}
+                                onClick={(e)=>{
+                                    if(record.aid){
+                                        e.stopPropagation();
+                                        this.setState({
+                                            customerVisible: true,
+                                            aid: record.aid,
+                                            type: 6,
+                                        })
+                                    }
+                                }}>
+                                {text}
+                            </div>
+                        );
+                    },
+                },
+                {
+                    title: "私有领取数",
                     dataIndex: "receiveCount",
                     key: "receiveCount",
                     className: 'tableRowStyle',
@@ -142,7 +214,7 @@ class DepartmentStatistics extends Component{
                                         this.setState({
                                             customerVisible: true,
                                             aid: record.aid,
-                                            type: 2,
+                                            type: 7,
                                         })
                                     }
                                 }}>
@@ -206,7 +278,6 @@ class DepartmentStatistics extends Component{
                     data.data.children = data.data.children.concat(data.data.aList);
                     theArr.push(data.data);
                     theArr = this.handleTabsInfor(theArr);
-                    console.log(theArr,'表格数据')
                     this.setState({
                         ispage: data.data.pageNo,
                         dataSource: theArr,
@@ -419,4 +490,4 @@ class DepartmentStatistics extends Component{
     }
 }
 
-export default DepartmentStatistics;
+export default DepartmentStatistics;

+ 0 - 9
js/component/manageCenter/order/content.jsx

@@ -199,15 +199,6 @@ class Content extends Component {
           });
         });
         break;
-        //专利成本审核列表(专利经理查看)
-      case "patentCostList":
-        require.ensure([], () => {
-          const CostAuditList = require("../order/orderNew/costAuditList").default;
-          this.setState({
-            component: <CostAuditList isPatentManager/>,
-          });
-        });
-      break;
       case "serviceManage":
         require.ensure([], () => {
           const ServiceManage = require("./departmentOrder/servicesOrder/serviceManage")

+ 14 - 54
js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx

@@ -6,6 +6,7 @@ import '../../userMangagement.less';
 import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionChannel ,getTransactionProject } from '../../../../tools.js';
 import OrderItemStatus from "../../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../../common/enterpriseNameChange";
+import ProjectOperation from "../../../../common/projectOperation";
 
 //图片组件
 const PicturesWall = React.createClass({
@@ -323,7 +324,6 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 	                         billNo: thisdata.billNo,
 	                         transactionAmount:thisdata.transactionAmount,
 	                         createTime:thisdata.createTime,
-	                         transactionAmount:thisdata.transactionAmount,
 	                         payerName:thisdata.payerName,
 	                         payeeName:thisdata.payeeName,
 	                         transactionSubject:thisdata.transactionSubject,
@@ -358,7 +358,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 	tableRowClick(record, index) {
        this.setState({
         	editFw:record,
-        	addnextVisible:true,
+		   projectOperationVisible:true,
         });
     },
 	componentWillMount() {
@@ -378,7 +378,6 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			labelCol: { span: 8 },
 			wrapperCol: { span: 14 },
 		};
-		const editFws=this.state.editFw || [];
 		const orderDetaiel=this.state.orderList || [];
 		return(
 			<div>
@@ -543,57 +542,18 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='550px'
-                        title='查看项目详细'
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-	                        	   <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="业务项目名称" >
-		                    			<span>{editFws.commodityName}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务市价" >
-		                    			<span>{editFws.commodityPrice+'万元'}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="实签价格" >
-		                    			<span>{editFws.discountPrice+'万元'}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务数量" >
-		                    			<span>{editFws.commodityQuantity}</span>
-			                    	</FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="市场首付金额" >
-		                                <span>{editFws.commodityFirstPayment+'万元'}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单首付金额" >
-		                                <span>{editFws.discountFirstPayment+'万元'}</span>
-				                    </FormItem>
-				                    <div className='clearfix'>
-				                    	<FormItem
-				                            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-				                            label="项目说明" >
-			                    			<span>{editFws.remarks}</span>
-				                    	</FormItem>
-			                    	</div>
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
+					{this.state.projectOperationVisible ? <ProjectOperation
+						readOnly={true}
+						orderNo={this.state.orderNo}
+						visible={this.state.projectOperationVisible}
+						dataInfor={this.state.editFw}
+						onCancel={()=>{
+							this.setState({
+								projectOperationVisible: false,
+								editFw:{},
+							});
+						}}
+					/> : null}
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
                         width='1300px'

+ 44 - 84
js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx

@@ -4,6 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
+import ProjectOperation from "../../../../common/projectOperation";
 
 const ApproveDetaile = Form.create()(React.createClass({
 	loadData(record) {
@@ -166,7 +167,7 @@ const ApproveDetaile = Form.create()(React.createClass({
               orderNo: record.orderNo
             },
             success: function (data) {
-                let thisData = data.data;                
+                let thisData = data.data;
                 if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
@@ -189,10 +190,10 @@ const ApproveDetaile = Form.create()(React.createClass({
                 });
             }.bind(this),
        }).always(function () {
-            this.setState({            	
+            this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
        }
     },
 	handleOk(e) {
@@ -239,8 +240,7 @@ const ApproveDetaile = Form.create()(React.createClass({
                              key: i,
 	                         billNo: thisdata.billNo,
 	                         transactionAmount:thisdata.transactionAmount,
-	                         createTime:thisdata.createTime, 
-	                         transactionAmount:thisdata.transactionAmount,
+	                         createTime:thisdata.createTime,
 	                         payerName:thisdata.payerName,
 	                         payeeName:thisdata.payeeName,
 	                         transactionSubject:thisdata.transactionSubject,
@@ -275,11 +275,11 @@ const ApproveDetaile = Form.create()(React.createClass({
 	tableRowClick(record, index) {
        this.setState({
         	editFw:record,
-        	addnextVisible:true,
+		   projectOperationVisible:true,
         });
     },
 	componentWillMount() {
-		
+
 	},
 	componentWillReceiveProps(nextProps) { //props改变时触发
 		this.state.visible = nextProps.showDesc;
@@ -294,14 +294,13 @@ const ApproveDetaile = Form.create()(React.createClass({
 			labelCol: { span: 8 },
 			wrapperCol: { span: 14 },
 		};
-		const editFws=this.state.editFw || [];
 		const orderDetaiel=this.state.orderList || [];
 		return(
 			<div>
             <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
                         width='1000px'
-                        title='订单详情'                     
+                        title='订单详情'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}  >
@@ -315,68 +314,68 @@ const ApproveDetaile = Form.create()(React.createClass({
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="下单时间" >  
+				                            label="下单时间" >
 				                            <span>{orderDetaiel.createTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="客户名称" >  
+				                            label="客户名称" >
 				                            <span>{orderDetaiel.buyerName}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单类型" >  
+				                            label="订单类型" >
 				                            <span>{getOrderType(orderDetaiel.orderType)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单渠道" >  
+				                            label="订单渠道" >
 				                            <span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单状态" >  
+				                            label="订单状态" >
 				                            <span>{getOrderState(orderDetaiel.orderStatus)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="已收款项" >  
+				                            label="已收款项" >
 				                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="结算状态" >  
+				                            label="结算状态" >
 				                            <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="市价订单金额" >    
+				                            label="市价订单金额" >
 			                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="市价首款金额" >   
+				                            label="市价首款金额" >
 				                            <span>{orderDetaiel.firstPayment+'万元'}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签订单金额" >   
+					                            label="实签订单金额" >
 					                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签首款金额" >   
+					                            label="实签首款金额" >
 					                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="特批立项" >   
+					                            label="特批立项" >
 					                            <span>{getApprovedState(orderDetaiel.approval)}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="合同编号" >   
+					                            label="合同编号" >
 					                            <span>{orderDetaiel.contractNo}</span>
 				                    		</FormItem>
 					                        <div className='clearfix'>
@@ -392,45 +391,45 @@ const ApproveDetaile = Form.create()(React.createClass({
 			                        <div className='clearfix'>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单负责人" >  
+				                            label="订单负责人" >
 				                            <span>{orderDetaiel.salesmanName}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="业务品类" >  
+				                            label="业务品类" >
 				                            <span>{orderDetaiel.projectType}</span>
 			                    		</FormItem>
 			                    	</div>
 			                    	<div className='clearfix'>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="意向时间" >  
+				                            label="意向时间" >
 				                            <span>{orderDetaiel.createTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="签单时间" >  
+				                            label="签单时间" >
 				                            <span>{orderDetaiel.signTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="财务负责人" >  
+				                            label="财务负责人" >
 						                    <span>{orderDetaiel.financeName}</span>
 						                    <Button onClick={this.lookflow} style={{float:'right'}}>查看流水</Button>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="项目负责人" >  
+				                            label="项目负责人" >
 				                            <span>{orderDetaiel.technicianName}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="立项时间" >  
+				                            label="立项时间" >
 				                            <span>{orderDetaiel.setUpTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="项目状态" >  
+				                            label="项目状态" >
 				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
 			                    		</FormItem>
 		                    		</div>
@@ -442,69 +441,30 @@ const ApproveDetaile = Form.create()(React.createClass({
 					                        <Table size="middle" columns={this.state.columns}
 					                            dataSource={this.state.dataSource}
 					                            pagination={false}
-					                            onRowClick={this.tableRowClick} 
+					                            onRowClick={this.tableRowClick}
 					                            />
 					                    </Spin>
 						            </div>
 			                    </div>
 			                </Spin>
 			            </Form >
-			        </Modal> 
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='550px'
-                        title='查看项目详细'                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-	                        	   <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="业务项目名称" >
-		                    			<span>{editFws.commodityName}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务市价" >
-		                    			<span>{editFws.commodityPrice+'万元'}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="实签价格" >
-		                    			<span>{editFws.discountPrice+'万元'}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务数量" >
-		                    			<span>{editFws.commodityQuantity}</span>
-			                    	</FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="市场首付金额" >   
-		                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单首付金额" >   
-		                                <span>{editFws.discountFirstPayment+'万元'}</span>    
-				                    </FormItem>
-				                    <div className='clearfix'>
-				                    	<FormItem 
-				                            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-				                            label="项目说明" >
-			                    			<span>{editFws.remarks}</span>
-				                    	</FormItem>
-			                    	</div>
-		                        </div>
-			                </Spin>
-			            </Form >
 			        </Modal>
+					{this.state.projectOperationVisible ? <ProjectOperation
+						readOnly={true}
+						orderNo={this.state.orderNo}
+						visible={this.state.projectOperationVisible}
+						dataInfor={this.state.editFw}
+						onCancel={()=>{
+							this.setState({
+								projectOperationVisible: false,
+								editFw:{},
+							});
+						}}
+					/> : null}
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
                         width='1300px'
-                        title= '查看流水'                   
+                        title= '查看流水'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form">
@@ -523,4 +483,4 @@ const ApproveDetaile = Form.create()(React.createClass({
 	}
 }));
 
-export default ApproveDetaile;
+export default ApproveDetaile;

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

@@ -389,24 +389,6 @@ class CostAuditList extends Component{
                             loading: false,
                         });
                         if (data.error.length === 0) {
-                            // let failLength = data.data.fail.length;
-                            // let okLength = data.data.OK.length;
-                            // Modal.info({
-                            //     title: '操作提醒',
-                            //     content: (
-                            //         <div>
-                            //             <div style={{paddingBottom:'15px'}}>
-                            //                 {'操作成功'+okLength+'条,'+'操作失败'+failLength+'条'}
-                            //             </div>
-                            //             {
-                            //                 failLength !== 0 ?
-                            //                     <div>操作失败序号为:{data.data.fail.join(',')}</div>:
-                            //                     <div/>
-                            //             }
-                            //         </div>
-                            //     ),
-                            //     onOk() {},
-                            // });
                             message.success('审核成功')
                             _this.setState({
                                 selectedRowKeys: [],

+ 16 - 54
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js

@@ -36,6 +36,7 @@ import OrderRiZi from '@/orderRiZi.jsx'
 import moment from "moment";
 import $ from "jquery";
 import EnterpriseNameChange from "../../../../../common/enterpriseNameChange";
+import ProjectOperation from "../../../../../common/projectOperation";
 
 const FormItem = Form.Item
 const { Option } = Select
@@ -497,7 +498,7 @@ class projectOverview extends Component{
     tableRowClickX(record) {
         this.setState({
             editFw:record,
-            addnextVisible: true,
+            projectOperationVisible: true,
         })
     }
 
@@ -1010,59 +1011,20 @@ class projectOverview extends Component{
                         </Spin>
                     </div>
                 </Modal>
-                <Modal maskClosable={false} visible={this.state.addnextVisible} onCancel={()=>{
-                    this.setState({
-                        addnextVisible: false
-                    })
-                }}
-                       width='550px'
-                       title='查看项目详细'
-                       footer=''
-                       className="admin-desc-content">
-                    <Form layout="horizontal" id="demand-form">
-                        <Spin spinning={this.state.loading}>
-                            <div className="clearfix">
-                                <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
-                                    label="项目名称"
-                                >
-                                    <span>{editFw.commodityName}</span>
-                                </FormItem>
-                                <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
-                                    label="项目数量"
-                                >
-                                    <span>{editFw.commodityQuantity}</span>
-                                </FormItem>
-                                <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
-                                    label="金额(万元)"
-                                >
-                                    <span>{editFw.commodityPrice}</span>
-                                </FormItem>
-                                <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
-                                    label="主要项目"
-                                >
-                                    <span>{editFw.main ? '是' : '否'}</span>
-                                </FormItem>
-                                <div className="clearfix">
-                                    <FormItem
-                                        labelCol={{ span: 4 }}
-                                        wrapperCol={{ span: 16 }}
-                                        label="服务说明"
-                                    >
-                                        <span>{editFw.taskComment}</span>
-                                    </FormItem>
-                                </div>
-                            </div>
-                        </Spin>
-                    </Form >
-                </Modal>
+                {this.state.projectOperationVisible ? <ProjectOperation
+                    readOnly={this.state.editFw && Object.keys(this.state.editFw).length > 0 && this.state.processStatus !== 0}
+                    orderNo={this.state.orderNo}
+                    visible={this.state.projectOperationVisible}
+                    dataInfor={this.state.editFw}
+                    onCancel={()=>{
+                        this.setState({
+                            projectOperationVisible: false,
+                            editFw:{},
+                        },()=>{
+                            this.xiangmu(this.state.orderNo);
+                        });
+                    }}
+                /> : null}
             </Form>
         )
     }

+ 9 - 0
js/component/manageCenter/project/content.jsx

@@ -136,6 +136,15 @@ class Content extends Component {
               });
             });
             break;
+        //专利成本审核列表(专利管理员查看)
+        case "patentCostList":
+            require.ensure([], () => {
+                const CostAuditList = require("../order/orderNew/costAuditList").default;
+                this.setState({
+                    component: <CostAuditList isPatentManager/>,
+                });
+            });
+            break;
           //我的任务
           case "myTask":
             require.ensure([], () => {

+ 16 - 54
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -39,6 +39,7 @@ import $ from "jquery";
 import PatentSchedule from '../../patentSchedule';
 import DeclarationProgress from "../../../../../common/declarationProgress";
 import EnterpriseNameChange from "../../../../../common/enterpriseNameChange";
+import ProjectOperation from "../../../../../common/projectOperation";
 
 const FormItem = Form.Item
 const { Option } = Select
@@ -520,7 +521,7 @@ class projectOverview extends Component{
     tableRowClickX(record) {
         this.setState({
             editFw:record,
-            addnextVisible: true,
+            projectOperationVisible: true,
         })
     }
 
@@ -1114,59 +1115,20 @@ class projectOverview extends Component{
                         </Spin>
                     </div>
                 </Modal>
-                <Modal maskClosable={false} visible={this.state.addnextVisible} onCancel={()=>{
-                    this.setState({
-                        addnextVisible: false
-                    })
-                }}
-                       width='550px'
-                       title='查看项目详细'
-                       footer=''
-                       className="admin-desc-content">
-                    <Form layout="horizontal" id="demand-form">
-                        <Spin spinning={this.state.loading}>
-                            <div className="clearfix">
-                                <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
-                                    label="项目名称"
-                                >
-                                    <span>{editFw.commodityName}</span>
-                                </FormItem>
-                                <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
-                                    label="项目数量"
-                                >
-                                    <span>{editFw.commodityQuantity}</span>
-                                </FormItem>
-                                <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
-                                    label="金额(万元)"
-                                >
-                                    <span>{editFw.commodityPrice}</span>
-                                </FormItem>
-                                <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
-                                    label="主要项目"
-                                >
-                                    <span>{editFw.main ? '是' : '否'}</span>
-                                </FormItem>
-                                <div className="clearfix">
-                                    <FormItem
-                                        labelCol={{ span: 4 }}
-                                        wrapperCol={{ span: 16 }}
-                                        label="服务说明"
-                                    >
-                                        <span>{editFw.taskComment}</span>
-                                    </FormItem>
-                                </div>
-                            </div>
-                        </Spin>
-                    </Form >
-                </Modal>
+                {this.state.projectOperationVisible ? <ProjectOperation
+                    readOnly={this.state.editFw && Object.keys(this.state.editFw).length > 0 && this.state.processStatus !== 0}
+                    orderNo={this.state.orderNo}
+                    visible={this.state.projectOperationVisible}
+                    dataInfor={this.state.editFw}
+                    onCancel={()=>{
+                        this.setState({
+                            projectOperationVisible: false,
+                            editFw:{},
+                        },()=>{
+                            this.xiangmu(this.state.orderNo);
+                        });
+                    }}
+                /> : null}
             </Form>
         )
     }

+ 53 - 98
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx

@@ -4,6 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../userMangagement.less';
 import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
+import ProjectOperation from "../../../../common/projectOperation";
 
 const MySettlementDetaile = Form.create()(React.createClass({
 	loadData(record) {
@@ -128,7 +129,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     render:(text,record,index)=>{
                     	return (
                     	    <Popconfirm title={'您确认指定【'+record.departmentName+'-'+record.name+'】为项目负责人?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
-							    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
+							    <Button style={{marginRight:'5px'}} type="primary">选定</Button>
 							</Popconfirm>
 							)
                     }
@@ -218,7 +219,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     dataIndex: 'qq',
                     key: 'qq'
                 },
-                
+
             ],
 		};
 	},
@@ -244,7 +245,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
               uid: this.state.buyerId
             },
             success: function (data) {
-                let thisData = data.data;   
+                let thisData = data.data;
                 if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
@@ -253,13 +254,13 @@ const MySettlementDetaile = Form.create()(React.createClass({
                 };
                 this.setState({
 					contractArr:thisData,
-                });                  
+                });
             }.bind(this),
        }).always(function () {
-            this.setState({            	
+            this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
     },
 	//查看基本详情基本信息
     loaduser(record){
@@ -274,7 +275,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
               orderNo: record
             },
             success: function (data) {
-                let thisData = data.data;                
+                let thisData = data.data;
                 if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
@@ -298,10 +299,10 @@ const MySettlementDetaile = Form.create()(React.createClass({
                 });
             }.bind(this),
        }).always(function () {
-            this.setState({            	
+            this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
        }
     },
 	handleOk(e) {
@@ -316,11 +317,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		});
 		this.props.closeDesc(false);
 	},
-	nextCancel() {
-		this.setState({
-			addnextVisible: false
-		})
-	},
 	lookflow(){
 		this.setState({
 			loading: true,
@@ -348,8 +344,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                              key: i,
 	                         billNo: thisdata.billNo,
 	                         transactionAmount:thisdata.transactionAmount,
-	                         createTime:thisdata.createTime, 
-	                         transactionAmount:thisdata.transactionAmount,
+	                         createTime:thisdata.createTime,
 	                         payerName:thisdata.payerName,
 	                         payeeName:thisdata.payeeName,
 	                         transactionSubject:thisdata.transactionSubject,
@@ -384,7 +379,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	tableRowClick(record, index) {
        this.setState({
         	editFw:record,
-        	addnextVisible:true,
+           projectOperationVisible:true,
         });
     },
     /*
@@ -436,7 +431,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                         mobile:thisdata.mobile,
                         });
                     };
-                  
+
                 };
                 this.setState({
                     distributionList: theArr,
@@ -487,7 +482,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			crossDomain: false,
 			url: globalConfig.context + "/api/admin/organization/selectSuperId",
 			data: {
-				
+
 			},
 			success: function(data) {
 				let thedata = data.data;
@@ -527,7 +522,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
     	});
     },
 	componentWillMount() {
-		
+
 	},
 	componentWillReceiveProps(nextProps) { //props改变时触发
 		this.state.visible = nextProps.showDesc;
@@ -543,14 +538,13 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			labelCol: { span: 8 },
 			wrapperCol: { span: 14 },
 		};
-		const editFws=this.state.editFw || [];
 		const orderDetaiel=this.state.orderList || [];
 		return(
 			<div>
             <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
                         width='1000px'
-                        title='订单详情'                     
+                        title='订单详情'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}  >
@@ -564,59 +558,59 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="下单时间" >  
+				                            label="下单时间" >
 				                            <span>{orderDetaiel.createTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="客户名称" >  
+				                            label="客户名称" >
 				                            <span>{orderDetaiel.buyerName}</span>
 				                            <Button  onClick={this.seeContract} style={{float:'right',fontSize:'12px'}}>查看联系人</Button>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单类型" >  
+				                            label="订单类型" >
 				                            <span>{getOrderType(orderDetaiel.orderType)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单渠道" >  
+				                            label="订单渠道" >
 				                            <span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单状态" >  
+				                            label="订单状态" >
 				                            <span>{getOrderState(orderDetaiel.orderStatus)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="已收款项" >  
+				                            label="已收款项" >
 				                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="结算状态" >  
+				                            label="结算状态" >
 				                            <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
 			                    		</FormItem>
 			                    		<div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签订单金额" >   
+					                            label="实签订单金额" >
 					                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签首款金额" >   
+					                            label="实签首款金额" >
 					                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="特批立项" >   
+					                            label="特批立项" >
 					                            <span>{getApprovedState(orderDetaiel.approval)}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="合同编号" >   
+					                            label="合同编号" >
 					                            <span>{orderDetaiel.contractNo}</span>
 				                    		</FormItem>
 					                        <div className='clearfix'>
@@ -632,46 +626,46 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                        <div className='clearfix'>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单负责人" >  
+				                            label="订单负责人" >
 				                            <span>{orderDetaiel.salesmanName}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="业务品类" >  
+				                            label="业务品类" >
 				                            <span>{orderDetaiel.projectType}</span>
 			                    		</FormItem>
 			                    	</div>
 			                    	<div className='clearfix'>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="意向时间" >  
+				                            label="意向时间" >
 				                            <span>{orderDetaiel.createTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="签单时间" >  
+				                            label="签单时间" >
 				                            <span>{orderDetaiel.signTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="财务负责人" >  
+				                            label="财务负责人" >
 						                    <span>{orderDetaiel.financeName}</span>
 						                    <Button onClick={this.lookflow} style={{float:'right'}}>查看流水</Button>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="项目负责人" >  
+				                            label="项目负责人" >
 				                            <span>{orderDetaiel.technicianName}</span>
 				                            {!orderDetaiel.technicianName?<Button onClick={this.confirmDelet} style={{float:'right'}}>选择负责人</Button>:''}
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="立项时间" >  
+				                            label="立项时间" >
 				                            <span>{orderDetaiel.setUpTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="项目状态" >  
+				                            label="项目状态" >
 				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
 			                    		</FormItem>
 		                    		</div>
@@ -683,69 +677,30 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					                        <Table columns={this.state.columns}
 					                            dataSource={this.state.dataSource}
 					                            pagination={false}
-					                            onRowClick={this.tableRowClick} 
+					                            onRowClick={this.tableRowClick}
 					                            />
 					                    </Spin>
 						            </div>
 			                    </div>
 			                </Spin>
 			            </Form >
-			        </Modal> 
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='550px'
-                        title='查看项目详细'                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-	                        	   <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="业务项目名称" >
-		                    			<span>{editFws.commodityName}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务市价" >
-		                    			<span>{editFws.commodityPrice+'万元'}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="实签价格" >
-		                    			<span>{editFws.discountPrice+'万元'}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务数量" >
-		                    			<span>{editFws.commodityQuantity}</span>
-			                    	</FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="市场首付金额" >   
-		                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单首付金额" >   
-		                                <span>{editFws.discountFirstPayment+'万元'}</span>    
-				                    </FormItem>
-				                    <div className='clearfix'>
-				                    	<FormItem 
-				                            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-				                            label="项目说明" >
-			                    			<span>{editFws.remarks}</span>
-				                    	</FormItem>
-			                    	</div>
-		                        </div>
-			                </Spin>
-			            </Form >
 			        </Modal>
+                    {this.state.projectOperationVisible ? <ProjectOperation
+                        readOnly={true}
+                        orderNo={this.state.orderNo}
+                        visible={this.state.projectOperationVisible}
+                        dataInfor={this.state.editFw}
+                        onCancel={()=>{
+                            this.setState({
+                                projectOperationVisible: false,
+                                editFw:{},
+                            });
+                        }}
+                    /> : null}
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
                         width='1300px'
-                        title= '查看流水'                   
+                        title= '查看流水'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form">
@@ -762,7 +717,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			        <Modal maskClosable={false} visible={this.state.distributionVisible}
                         onOk={this.distributionCancel} onCancel={this.distributionCancel}
                         width='800px'
-                        title='请选择'                     
+                        title='请选择'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
@@ -780,7 +735,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                    </Select>
 				                    <Input placeholder="项目负责人" style={{width:'150px',marginLeft:'10px'}}
 				                        value={this.state.financeNameSearch}
-				                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />  
+				                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />
 				                    <Button type="primary" onClick={this.searchOrder} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
 	                    			<Button onClick={this.resetOrder}>重置</Button>
 			                	</div>
@@ -798,7 +753,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			    <Modal maskClosable={false} visible={this.state.orderVisible}
                         onOk={this.orderCancel} onCancel={this.orderCancel}
                         width='800px'
-                        title='查看联系人'                    
+                        title='查看联系人'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal"  id="demand-form" style={{paddingBottom:'40px'}} >
@@ -819,4 +774,4 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	}
 }));
 
-export default MySettlementDetaile;
+export default MySettlementDetaile;