dengzhiguo 6 years ago
parent
commit
6a8aa74815

+ 13 - 1
js/component/dataDic.js

@@ -2514,7 +2514,6 @@ module.exports = {
 	    }
     ],
     //交易渠道1
-   
      transactionChannel:[
         {
            value: "0",
@@ -2527,6 +2526,19 @@ module.exports = {
            key: "银联"
        }
    ],
+   //交易渠道1
+     cuikuan:[
+        {
+           value: "0",
+           key: "未启动"
+       }, {
+           value: "1",
+           key: "催款中"
+       }, {
+           value: "2",
+           key: "已完成"
+       }
+   ],
     //交易科目		
    transactionProject:[
         {

+ 2 - 4
js/component/manageCenter/order/orderNew/addService.jsx

@@ -6,7 +6,7 @@ import '../userMangagement.less';
 import moment from 'moment';
 import Picture from '@/manageCenter/publicComponent/picture';
 import {orderTypes,customerType,jiedian,tepi,boutique} from '../../../dataDic.js';  
-import {splitUrl,getTransactionProject,getChangeState,getTransactionChannel,beforeUploadFile,getProcessStatus,getLiquidationStatus,getboutique,getApprovedState,getjiedian} from '../../../tools.js';
+import {splitUrl,beforeUploadFile,getProcessStatus,getLiquidationStatus,getboutique,getApprovedState,getjiedian,getCuikuan} from '../../../tools.js';
 const Option = AutoComplete.Option;
 //图片组件
 const PicturesWall = React.createClass({
@@ -262,9 +262,7 @@ const NewService = Form.create()(React.createClass({
 					title: '催款状态',
 					dataIndex: 'dunStatus',
 					key: 'dunStatus',
-					render: (text, record, index) => {
-						return text?'已完成':'催款中'
-					}
+					render:text=>{return getCuikuan(text)}
 				},
 				{
 					title: '操作',

+ 2 - 4
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -5,7 +5,7 @@ import $ from 'jquery/src/ajax';
 import Jquery from 'jquery/dist/jquery.js';
 import moment from 'moment';
 import {boutique } from '@/dataDic.js';
-import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique} from '@/tools.js';
+import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique,getCuikuan} from '@/tools.js';
 import './customer.less';
 const TabPane = Tabs.TabPane;
 const Dragger = Upload.Dragger;
@@ -263,9 +263,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					title: '催款状态',
 					dataIndex: 'dunStatus',
 					key: 'dunStatus',
-					render: (text) => {
-						return text?'已完成':'催款中'
-					}
+					render:text=>{return getCuikuan(text)}
 				},
 			],
 		}

+ 7 - 5
js/component/manageCenter/order/orderNew/billing.jsx

@@ -6,8 +6,8 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import NewService from "./addService.jsx";
 import moment from 'moment';
 import '../userMangagement.less';
-import {intentProgress,transactionProgress,contractProgress,projectProgress,orderType, orderStage, orderState,paymentState,specially,specialBatchState, projectState,orderChannel, approvedState, lock,paymentMethod,transactionChannel} from '../../../dataDic.js';
-import {getIntentProgress,getTransactionProgress,getProjectState,getContractProgress,getProjectProgress,splitUrl,getOrderType,getOrderStage,getOrderState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel,getProcessStatus,getLiquidationStatus} from '../../../tools.js';
+import {projectProgress,specially} from '../../../dataDic.js';
+import {getApprovedState,getProcessStatus,getLiquidationStatus,getNewOrderStatus} from '../../../tools.js';
 
 const MyService=Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -51,6 +51,7 @@ const MyService=Form.create()(React.createClass({
 	                         salesmanName:thisdata.salesmanName,//营销员名称
 	                         financeName:thisdata.financeName,//财务名称
 	                         createDate:thisdata.createDate,//下单时间
+	                         orderStatus:thisdata.orderStatus,//订单状态
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -137,9 +138,10 @@ const MyService=Form.create()(React.createClass({
                     key: 'approval',
                     render:text=>{return getApprovedState(text)}
                 },{
-                    title: '订单负责人',
-                    dataIndex: 'salesmanName',
-                    key: 'salesmanName'
+                    title: '订单状态',
+                    dataIndex: 'orderStatus',
+                    key: 'orderStatus',
+                    render:text=>{return getNewOrderStatus(text)}
                 },{
                     title: '财务负责人',
                     dataIndex: 'financeName',

+ 2 - 4
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -6,7 +6,7 @@ import Jquery from 'jquery/dist/jquery.js';
 import Picture from '@/manageCenter/publicComponent/picture';
 import moment from 'moment';
 import {boutique ,tepi,jiedian} from '@/dataDic.js';
-import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique,getNewOrderStatus,getRefundStatus} from '@/tools.js';
+import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique,getNewOrderStatus,getRefundStatus,getCuikuan} from '@/tools.js';
 import './customer.less';
 const TabPane = Tabs.TabPane;
 const Dragger = Upload.Dragger;
@@ -266,9 +266,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					title: '催款状态',
 					dataIndex: 'dunStatus',
 					key: 'dunStatus',
-					render: (text) => {
-						return text?'已完成':'催款中'
-					}
+					render:text=>{return getCuikuan(text)}
 				},
 			],
 		};

+ 2 - 4
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -5,7 +5,7 @@ import $ from 'jquery/src/ajax';
 import Jquery from 'jquery/dist/jquery.js';
 import moment from 'moment';
 import {boutique } from '@/dataDic.js';
-import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique} from '@/tools.js';
+import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique,getCuikuan} from '@/tools.js';
 import './customer.less';
 const TabPane = Tabs.TabPane;
 const Dragger = Upload.Dragger;
@@ -263,9 +263,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					title: '催款状态',
 					dataIndex: 'dunStatus',
 					key: 'dunStatus',
-					render: (text) => {
-						return text?'已完成':'催款中'
-					}
+					render:text=>{return getCuikuan(text)}
 				},
 			],
 		}

+ 2 - 4
js/component/manageCenter/order/orderNew/reject.jsx

@@ -5,7 +5,7 @@ import $ from 'jquery/src/ajax';
 import Jquery from 'jquery/dist/jquery.js';
 import moment from 'moment';
 import {boutique ,tepi,jiedian} from '@/dataDic.js';
-import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique} from '@/tools.js';
+import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique,getCuikuan} from '@/tools.js';
 import './customer.less';
 const TabPane = Tabs.TabPane;
 const Dragger = Upload.Dragger;
@@ -278,9 +278,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					title: '催款状态',
 					dataIndex: 'dunStatus',
 					key: 'dunStatus',
-					render: (text, record, index) => {
-						return text?'已完成':'催款中'
-					}
+					render:text=>{return getCuikuan(text)}
 				},
 				{
 					title: '操作',

+ 2 - 1
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -424,6 +424,7 @@ const PaiDan = React.createClass({
 		}.bind(this));
 	},
     closeDesc(e, s) {
+    	console.log(this.state.page);
         this.state.showDesc = e;
         if (s) {
             this.loadData(this.state.page);
@@ -446,7 +447,7 @@ const PaiDan = React.createClass({
         this.state.releaseDate = [];
         this.state.orderNoSearch=''
         this.state.distribution=undefined;
-        this.loadData();
+        this.loadData(this.state.page);
     },
     searchSwitch() {
         this.setState({

+ 1 - 78
js/component/manageCenter/project/project/projectQuery.jsx

@@ -192,24 +192,6 @@ const PaiDan = React.createClass({
                 }
 			],
 			dataSourceX: [],
-			ContactsLists: [{
-					title: '催款科目',
-					dataIndex: 'dunSubject',
-					key: 'dunSubject',
-					render: text=>{return getjiedian(text)}
-				},{
-					title: '金额(万)',
-					dataIndex: 'money',
-					key: 'money',
-				}, {
-					title: '催款状态',
-					dataIndex: 'dunStatus',
-					key: 'dunStatus',
-					render: (text) => {
-						return text?'已完成':'催款中'
-					}
-				},
-			],
         }
     },
     /* 分派 */
@@ -230,7 +212,6 @@ const PaiDan = React.createClass({
         });
         this.xiangqing(record.orderNo);
 		this.xiangmu(record.orderNo);
-		this.jiedian(record.orderNo);
     },
     //订单详情
 	xiangqing(orderNos) {
@@ -329,46 +310,6 @@ const PaiDan = React.createClass({
 			});
 		}.bind(this));
 	},
-	//节点列表
-	jiedian(orderNos) {
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context +"/api/admin/newOrder/selectOrderDun",
-			data: {
-				orderNo:orderNos
-			},
-			success: function(data) {
-				let theArr = [];
-				let thisData=[];
-				if(data.error.length || data.data.list == "") {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-				} else {
-					for(let i = 0; i < data.data.length; i++) {
-                		thisData= data.data[i];  
-	                	theArr.push({
-	                		key:i,
-	                		dunSubject:thisData.dunSubject?thisData.dunSubject.toString():"",//催款科目
-	                		id:thisData.id,//节点Id
-	                		money:thisData.money,//催款金额
-	                		dunStatus:thisData.dunStatus,//催款状态
-	                	})
-                	}
-                	this.setState({
-                		contactList:theArr
-                	})
-				};
-				
-			}.bind(this),
-		}).always(function() {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
@@ -392,7 +333,7 @@ const PaiDan = React.createClass({
         this.state.releaseDate = [];
         this.state.orderNoSearch=''
         this.state.distribution=undefined;
-        this.loadData();
+        this.loadData(this.state.page);
     },
     searchSwitch() {
         this.setState({
@@ -618,24 +559,6 @@ const PaiDan = React.createClass({
                             				<span>{this.state.financeMobile}</span>
 			                    		</FormItem>
 			                    	</div>
-			                    	<div>
-					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>催款节点</span>
-					                	{this.state.processStatus==0?<Button type='primary' onClick={this.addcontact} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加催款节点</Button>:""}
-					                </div>
-					                <div className="clearfix">
-					    			  <Spin spinning={this.state.loading}>
-					    			        <Form layout="horizontal" id="demand-form"  >
-										      	<Table 
-								            	 pagination={false}
-								            	 columns={this.state.ContactsLists} 
-								            	 dataSource={this.state.contactList}
-								            	 />
-						            	        <Col span={24} offset={9} style={{marginTop:'15px'}}>
-									                 
-									            </Col>
-							            	</Form> 
-									   </Spin> 
-									</div>
 						            <div>
 					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
 					                	{this.state.processStatus==0?<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加项目明细</Button>:""}

+ 1 - 1
js/component/manageCenter/project/task/myTask.jsx

@@ -379,7 +379,7 @@ const Task = React.createClass({
         this.state.orderNoSearch='';
         this.state.taskNoSearch='';
         this.state.distribution=undefined;
-        this.loadData();
+        this.loadData(this.state.page);
     },
     searchSwitch() {
         this.setState({

+ 1 - 1
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -346,7 +346,7 @@ const Task = React.createClass({
         this.state.orderNoSearch='';
         this.state.taskNoSearch='';
         this.state.distribution=undefined;
-        this.loadData();
+        this.loadData(this.state.page);
     },
     searchSwitch() {
         this.setState({

+ 1 - 1
js/component/manageCenter/project/task/taskCount.jsx

@@ -250,7 +250,7 @@ const IntentionCustomer = Form.create()(React.createClass({
     	this.state.customerName='';
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
-        this.loadData();       
+        this.loadData(this.state.page);       
     },
     resets(){
     	this.state.orderNo='';

+ 1 - 1
js/component/manageCenter/project/task/taskQuery.jsx

@@ -341,7 +341,7 @@ const Task = React.createClass({
         this.state.orderNoSearch='';
         this.state.taskNoSearch='';
         this.state.distribution=undefined;
-        this.loadData();
+        this.loadData(this.state.page);
     },
     searchSwitch() {
         this.setState({

+ 15 - 1
js/component/tools.js

@@ -83,7 +83,8 @@ import {
     customerType,
     orderTypes,
     bonusState,
-    jiedian
+    jiedian,
+    cuikuan
 } from './dataDic.js';
 
 import { provinceList} from './NewDicProvinceList.js';
@@ -1470,6 +1471,19 @@ module.exports = {
          return theType;
         }
     },
+    //催款状态 
+	getCuikuan:function(e){
+        if (e||e==0) {
+            let str=e.toString()
+         let theType = '';
+         cuikuan.map(function (item) {
+             if (item.value == str) {
+                 theType = item.key;
+             };
+         });
+         return theType;
+        }
+    },
      //退单状态 
 	getRefundStatus:function(e){
         if (e||e==0) {