Browse Source

Merge branch 'master' of ssh://git.jishutao.com:55555/jishutao/kede-client

dengzhiguo 6 years ago
parent
commit
58a2065be7

+ 11 - 14
js/component/dataDic.js

@@ -2550,19 +2550,6 @@ module.exports = {
             key: "科技项目"
         }
    ],
-   //营销员发款类型
-   paymentType:[
-    {
-        value: "11",
-        key: "首付奖"
-    }, {
-        value: "12",
-        key: "结算奖"
-    }, {
-        value: "16",
-        key: "退款"
-    }
-    ],
     //技术员发款类型
     jsyPaymentType:[
         {
@@ -2572,8 +2559,18 @@ module.exports = {
             value: "23",
             key: "认证奖"
         }, {
-            value: "34",
+            value: "24",
             key: "认证奖"
+        },
+        {
+            value: "11",
+            key: "首付奖"
+        }, {
+            value: "12",
+            key: "结项奖"
+        }, {
+            value: "16",
+            key: "退款"
         }
     ],
     //奖金发放状态

+ 2 - 2
js/component/manageCenter/financialManage/bonus/bonusDetail.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { Form, Spin, message, Modal } from 'antd';
-import {getProjectStatus,getNewOrderStatus,getPaymentType} from '@/tools.js';
+import {getProjectStatus,getNewOrderStatus,getJsyPaymentType} from '@/tools.js';
 
 const BonusDetail=React.createClass({
     getInitialState() {
@@ -81,7 +81,7 @@ const BonusDetail=React.createClass({
                                         <span>{getProjectStatus(theData.projectStatus)}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="发放类型">
-                                        <span>{getPaymentType(theData.bonusSubject)}</span>
+                                        <span>{getJsyPaymentType(theData.bonusSubject)}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="校对后单量">
                                         <span>{theData.proofCount}</span>

+ 11 - 3
js/component/manageCenter/financialManage/bonus/jsBonus.jsx

@@ -64,6 +64,7 @@ const JsBonus = React.createClass({
                 salesName: this.state.orderRefundSearch,//订单负责人
                 targetName: this.state.projectMenSearch,//项目负责人
                 departmentId:this.state.departmenttList,
+                orderNo:this.state.orderNoSearch,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
                 grantStatus: this.state.grantStatus
@@ -88,6 +89,7 @@ const JsBonus = React.createClass({
 		                    commodityQuantity:thisdata.commodityQuantity,
 		                    projectStatus:thisdata.projectStatus,
                             byName:thisdata.byName,
+                            commodityName:thisdata.commodityName,
                             bonusSubject:thisdata.bonusSubject,
                             grantStatus:thisdata.grantStatus, 
                             grantTime:thisdata.grantTime,
@@ -150,6 +152,11 @@ const JsBonus = React.createClass({
                     key: 'orderNo',
                 }, 
                 {
+                    title: '任务名称',
+                    dataIndex: 'commodityName',
+                    key: 'commodityName',
+                },
+                {
                     title: '任务负责人',
                     dataIndex: 'targetName',
                     key: 'targetName',
@@ -315,6 +322,7 @@ const JsBonus = React.createClass({
         this.state.orderRefundSearch='';
         this.state.projectMenSearch='';
         this.state.releaseDate = [];
+        this.state.orderNoSearch='';
         this.state.grantStatus=undefined;
         this.state.departmenttList=undefined;
         this.loadData();
@@ -352,9 +360,9 @@ const JsBonus = React.createClass({
                             })
                         }
                     </Select>
-                    {/* <Input placeholder="订单负责人"
-                        value={this.state.orderRefundSearch}
-                        onChange={(e) => { this.setState({ orderRefundSearch: e.target.value }); }} />  */}
+                    <Input placeholder="订单编号"
+                        value={this.state.orderNoSearch}
+                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} /> 
                     <Input placeholder="任务负责人"
                         value={this.state.projectMenSearch}
                         onChange={(e) => { this.setState({ projectMenSearch: e.target.value }); }} /> 

+ 6 - 3
js/component/manageCenter/financialManage/bonus/jsBonusDetail.jsx

@@ -56,6 +56,9 @@ const BonusDetail=React.createClass({
                                     <FormItem className="half-item" {...formItemLayout} label="订单编号">
                                         <span>{theData.orderNo}</span>
                                     </FormItem>
+                                    <FormItem className="half-item" {...formItemLayout} label="任务名称">
+                                        <span>{theData.commodityName}</span>
+                                    </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="任务负责人">
                                         <span>{theData.targetName}</span>
                                     </FormItem>
@@ -69,13 +72,13 @@ const BonusDetail=React.createClass({
                                         <span>{getProjectStatus(theData.projectStatus)}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="受理日期">
-							            <span>{theData.acceptTime?(new Date(theData.acceptTime)).toLocaleString():''}</span>
+							            <span>{theData.acceptTime}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="评审日期">
-							            <span>{theData.reviewTime?(new Date(theData.reviewTime)).toLocaleString():''}</span>
+							            <span>{theData.reviewTime}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="下证日期">
-							            <span>{theData.licenceTime?(new Date(theData.licenceTime)).toLocaleString():''}</span>
+							            <span>{theData.licenceTime}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="订单结算状态">
                                         <span>{getLiquidationStatus(theData.liquidationStatus)}</span>

+ 15 - 10
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -4,7 +4,7 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '../distribute/public.less';
 import {  Button, Input, Spin, Table,Select, Switch,InputNumber, message, DatePicker,Modal ,Form } from 'antd';
-import {getNewOrderStatus,getProjectStatus,getPaymentType,getTransactionProject,getBonusState} from '@/tools';
+import {getNewOrderStatus,getProjectStatus,getJsyPaymentType,getBonusState} from '@/tools';
 import BonuseDetail from './bonusDetail';
 const FormItem= Form.Item;
 
@@ -63,6 +63,7 @@ const YxBonus = React.createClass({
                 pageSize:this.state.pagination.pageSize,
                 salesName: this.state.orderRefundSearch,//订单负责人
                 departmentId:this.state.departmenttList,
+                orderNo:this.state.orderNoSearch,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
                 grantStatus:this.state.grantStatus
@@ -121,6 +122,14 @@ const YxBonus = React.createClass({
                     key: 'orderNo',   
                 },
                 {
+                    title: '客户名称',
+                    dataIndex: 'buyName',
+                    key: 'buyName',
+                    render:text=>{
+                        return text&&text>8?text.substr(0,8)+'...':text
+                    }
+                },
+                {
                     title: '订单负责人',
                     dataIndex: 'salesName',
                     key: 'salesName',
@@ -131,14 +140,6 @@ const YxBonus = React.createClass({
                     key: 'signTime',
                 },
                 {
-                    title: '客户名称',
-                    dataIndex: 'buyName',
-                    key: 'buyName',
-                    render:text=>{
-                        return text&&text>8?text.substr(0,8)+'...':text
-                    }
-                },
-                {
                     title: '订单金额(万元)',
                     dataIndex: 'totalAmount',
                     key: 'totalAmount'
@@ -172,7 +173,7 @@ const YxBonus = React.createClass({
                     dataIndex: 'bonusSubject',
                     key: 'bonusSubject',
                     render:text=>{
-                        return getPaymentType(text)
+                        return getJsyPaymentType(text)
                     }
                 },
                 {
@@ -303,6 +304,7 @@ const YxBonus = React.createClass({
     reset() {
         this.state.orderRefundSearch='';
         this.state.releaseDate = [];
+        this.state.orderNoSearch='';
         this.state.departmenttList=undefined;
         this.state.grantStatus=undefined
         this.loadData();
@@ -340,6 +342,9 @@ const YxBonus = React.createClass({
                             })
                         }
                     </Select>
+                    <Input placeholder="订单编号"
+                        value={this.state.orderNoSearch}
+                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} /> 
                     <Input placeholder="订单负责人"
                         value={this.state.orderRefundSearch}
                         onChange={(e) => { this.setState({ orderRefundSearch: e.target.value }); }} /> 

+ 6 - 0
js/component/manageCenter/financialManage/distribute/public.less

@@ -38,6 +38,12 @@ button:focus,button:active{
     width: 50%;
     display: inline-block;
 }
+table tr span,table tr td{
+    overflow: hidden;
+    white-space:nowrap; 
+    text-overflow:ellipsis; 
+    -o-text-overflow:ellipsis;
+}
 .patent-addNew {
     float: right;
     margin-left: 20px;

+ 3 - 3
js/component/manageCenter/financialManage/distribute/tuiDan.jsx

@@ -3,7 +3,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './public.less';
-import {  Button,Form,Select , Input,  Spin, Table, Switch, message, DatePicker } from 'antd';
+import {  Button,InputNumber,Select , Input,  Spin, Table, Switch, message, DatePicker } from 'antd';
 import Receivable from './receivable';
 import Examine from './examine';
 import OrderDesc from '../orderDetail/orderDesc';
@@ -248,9 +248,9 @@ const TuiDan = React.createClass({
                 <span>退单管理</span>
                 </div>
                 <div className="user-search">
-                    <Input placeholder="退单编号"
+                    <InputNumber min={0} max={2147483647} formatter={value => `${value&&!isNaN(value)?parseInt(value):''}`} style={{marginRight:10,width:120}} placeholder="退单编号"
                         value={this.state.orderRefundSearch}
-                        onChange={(e) => { this.setState({ orderRefundSearch: e.target.value }); }} /> 
+                        onChange={(e) => { this.setState({ orderRefundSearch: e}); }} /> 
                     <Input placeholder="订单编号"
                         value={this.state.orderNoSearch}
                         onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />  

+ 1 - 1
js/component/manageCenter/financialManage/orderDetail/orderDesc.jsx

@@ -34,7 +34,7 @@ class DemandDesc extends React.Component {
 					visible={this.state.visible}
 					onOk={this.handOk.bind(this)}
 					onCancel={this.handleCancel.bind(this)}
-					width="1000px"
+					width="800px"
 					title='订单详情'
 					footer=""
 					className="admin-desc-content"

+ 10 - 15
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -86,7 +86,11 @@ const OrderDetail = Form.create()(React.createClass({
                     title: '项目类别',
                     dataIndex: 'cname',
                     key: 'cname'
-                }, {
+                },  {
+                    title: '项目数量(个)',
+                    dataIndex: 'commodityQuantity',
+                    key: 'commodityQuantity'
+                },{
                     title: '服务市价(万元)',
                     dataIndex: 'commodityPrice',
                     key: 'commodityPrice'
@@ -97,17 +101,8 @@ const OrderDetail = Form.create()(React.createClass({
                     render:text=>{
                         return getProjectStatus(text);
                     }
-                },{
-                    title: '项目负责人',
-                    dataIndex: 'contacts',
-                    key: 'contacts'
-                }, 
-                {
-                    title: '联系方式',
-                    dataIndex: 'contactsMobile',
-                    key: 'contactsMobile'
                 }, {
-                    title: '是否主要联系人',
+                    title: '是否主要项目',
                     dataIndex: 'main',
                     key: 'main',
                     render:text=>{
@@ -219,7 +214,7 @@ const OrderDetail = Form.create()(React.createClass({
         const theData = this.state.orderList || {};
         const FormItem = Form.Item
         const formItemLayout = {
-            labelCol: { span: 6 },
+            labelCol: { span: 10 },
             wrapperCol: { span: 12 },
         };
         const jsDate = this.state.jsDate || [];
@@ -263,7 +258,7 @@ const OrderDetail = Form.create()(React.createClass({
 						</FormItem>}
 					</div>
                     <div className="clearfix">
-                        <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="合同扫描件">
+                        <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 18 }} label="合同扫描件">
                             <Upload className="demandDetailShow-upload"
                                 listType="picture-card"
                                 fileList={this.state.orgCodeUrl}                               
@@ -287,12 +282,12 @@ const OrderDetail = Form.create()(React.createClass({
 						</FormItem>           
                     </div>
                     <div className="clearfix">
-						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="订单留言">
+						<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 18 }} label="订单留言">
 							<span>{theData.orderRemarks}</span>
 						</FormItem>
 					</div>
                     <div className="clearfix">
-						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="收款节点">
+						<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 18 }} label="收款节点">
 							{
                                 jsDate.map(item=>{
                                     return <p>{getjiedian(item.dunSubject)} -- {item.money} 万元</p>

+ 8 - 5
js/component/manageCenter/publicComponent/assign.jsx

@@ -127,11 +127,11 @@ const Assign=React.createClass({
 		this.props.closeDesc(false, true);
 	},
     //分配对象列表
-    contactList(item={}){
+    contactList(item={},nub){
         this.setState({
             loading:true
         });
-        let api = this.state.contact?'/api/admin/frequentContactsList':'/api/admin/superviser/adminList';
+        let api = nub?'/api/admin/frequentContactsList':'/api/admin/superviser/adminList';
         $.ajax({
             method: "get",
             dataType: "json",
@@ -191,7 +191,7 @@ const Assign=React.createClass({
             	taskReceiverId:!this.state.contact?record.id:record.contactId,//分配人物ID
             	specially:this.props.specially//是否是咨询师管理员
             }:{
-            	orderNo:this.props.data.orderNo,
+            	orderNo:this.state.orderNo,
                 financeId: !this.state.contact?record.id:record.contactId,    //分配人物id
                 approval:this.props.data.approval   //是否特批
             }
@@ -208,7 +208,7 @@ const Assign=React.createClass({
         }.bind(this));
     },
     searchOrder(){
-    	this.contactList();
+    	this.contactList({},this.state.contact);
     },
     resetOrder(){
     	this.state.departmenttList=undefined;
@@ -224,8 +224,11 @@ const Assign=React.createClass({
     componentWillReceiveProps(nextProps) {
         this.state.visible=nextProps.showDesc;
         if(nextProps.showDesc){
-            this.contactList(nextProps);
+            this.contactList(nextProps,1);
             this.departmentList()
+            this.setState({
+                orderNo:nextProps.data.orderNo
+            })
         }
         this.setState({
             contact:1

+ 1 - 14
js/component/tools.js

@@ -78,7 +78,7 @@ import {
     dataGrade,
     level,
     xiangmoState,
-    newOrderStatus,refundStatus,approval,projectStatus,processStatus,liquidationStatus,newOrderType,paymentType
+    newOrderStatus,refundStatus,approval,projectStatus,processStatus,liquidationStatus,newOrderType
     ,jsyPaymentType,
     customerType,
     orderTypes,
@@ -1561,19 +1561,6 @@ module.exports = {
             return theType;
         }
     },
-    //营销员发款类型  
-	getPaymentType:function(e){
-        if (e||e==0) {
-            let str=e.toString()
-         let theType = '';
-         paymentType.map(function (item) {
-                if (item.value == str) {
-                    theType = item.key;
-                };
-            });
-            return theType;
-        }
-    },
     //技术员发款类型  
 	getJsyPaymentType:function(e){
         if (e||e==0) {