liting2017 6 år sedan
förälder
incheckning
fcccf61ef1

+ 10 - 13
js/component/dataDic.js

@@ -2550,19 +2550,6 @@ module.exports = {
             key: "科技项目"
         }
    ],
-   //营销员发款类型
-   paymentType:[
-    {
-        value: "11",
-        key: "首付奖"
-    }, {
-        value: "12",
-        key: "结算奖"
-    }, {
-        value: "16",
-        key: "退款"
-    }
-    ],
     //技术员发款类型
     jsyPaymentType:[
         {
@@ -2574,6 +2561,16 @@ module.exports = {
         }, {
             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>

+ 2 - 2
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;
 
@@ -173,7 +173,7 @@ const YxBonus = React.createClass({
                     dataIndex: 'bonusSubject',
                     key: 'bonusSubject',
                     render:text=>{
-                        return getPaymentType(text)
+                        return getJsyPaymentType(text)
                     }
                 },
                 {

+ 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 - 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) {