Browse Source

财务接口联调部分完成代码上传

liting2017 6 years ago
parent
commit
d4643ae731

+ 0 - 32
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -140,7 +140,6 @@ const PaiDan = React.createClass({
                     render:(text,recard)=>{
                         return <div>
                             <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>分派</Button>
-                            <Button type="danger" onClick={(e)=>{e.stopPropagation(),this.reject(recard)}}>驳回</Button>
                         </div>
                     }
                 }
@@ -217,37 +216,6 @@ const PaiDan = React.createClass({
         this.state.orderNoSearch=''
         this.loadData();
     },
-    //驳回
-    boHuiSubmit(e){
-        e.preventDefault();
-        if(!this.state.content){
-            message.warning('请填写驳回原因');
-            return false;
-        }
-        this.setState({
-            loading:true
-        })
-        $.ajax({
-            method: "POST",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/financial/reject",
-            data: {
-                orderNo: this.state.bohuiData.orderNo,
-                reason:this.state.content
-            }
-        }).done(function (data) {
-            if (!data.error.length) {
-                message.success('驳回成功!');
-                this.boHuiOk();
-            } else {
-                message.warning(data.error[0].message);
-            };
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
     searchSwitch() {
         this.setState({
             searchMore: !this.state.searchMore

+ 2 - 2
js/component/manageCenter/financialManage/flowWater/myWater.jsx

@@ -47,7 +47,7 @@ const MyWater = React.createClass({
 		                    payerName:thisdata.payerName,
 		                    transactionSubject:thisdata.transactionSubject,
 		                    transactionChannel:thisdata.transactionChannel,
-                            financialPayTimes:thisdata.createTime?(new Date(thisdata.createTime)).toLocaleString():'',
+                            financialPayTimes:thisdata.financialPayTimes?(new Date(thisdata.financialPayTimes)).toLocaleString():'',
                             financialPayNo:thisdata.financialPayNo,
 		                    createrName:thisdata.createrName,
 		                    saleName:thisdata.saleName,
@@ -98,7 +98,7 @@ const MyWater = React.createClass({
                     key: 'billNo',   
                 },
                 {
-                    title: '金额',
+                    title: '金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount',
                 },

+ 1 - 1
js/component/manageCenter/financialManage/flowWater/waterDetail.jsx

@@ -87,7 +87,7 @@ const WaterDetail=React.createClass({
                                     <FormItem className="half-item" {...formItemLayout} label="财务流水时间">
 							            <span>{theData.financialPayTimes?(new Date(theData.financialPayTimes)).toLocaleString():''}</span>
                                     </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="金额">
+                                    <FormItem className="half-item" {...formItemLayout} label="金额(万元)">
                                         <span>{theData.transactionAmount}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="流水科目">

+ 3 - 3
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -10,7 +10,7 @@ import {
     Form,
     Table
 } from 'antd';
-import {getOrderType,splitUrl,getNewOrderType,getProcessStatus,getApproval,getLiquidationStatus,getProjectStatus} from '@/tools';
+import {getOrderType,getjiedian,splitUrl,getNewOrderType,getProcessStatus,getApproval,getLiquidationStatus,getProjectStatus} from '@/tools';
 
 const FormItem = Form.Item;
 
@@ -243,7 +243,7 @@ const OrderDetail = Form.create()(React.createClass({
                         <FormItem className="half-item" {...formItemLayout} label="结算状态">
 							<span>{getLiquidationStatus(theData.liquidationStatus)}</span>
 						</FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="已收款">
+                        <FormItem className="half-item" {...formItemLayout} label="已收款(万元)">
 							<span>{theData.settlementAmount}</span>
 						</FormItem>
                         <FormItem className="half-item" {...formItemLayout} label="订单类型">
@@ -286,7 +286,7 @@ const OrderDetail = Form.create()(React.createClass({
 						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="收款节点">
 							{
                                 jsDate.map(item=>{
-                                    return <p>{item.dunSubject} -- {item.money} 万元</p>
+                                    return <p>{getjiedian(item.dunSubject)} -- {item.money} 万元</p>
                                 })
                             }
 						</FormItem>

+ 12 - 4
js/component/manageCenter/publicComponent/assign.jsx

@@ -67,23 +67,31 @@ const Assign=React.createClass({
             	{
                     title: '用户姓名',
                     dataIndex: 'name',
-                    key: 'name'
+                    key: 'name',
+                    width:100
                 },{
                     title: '部门机构',
                     dataIndex: 'departmentName',
-                    key: 'departmentName'
+                    key: 'departmentName',
+                    width:100,
+                    render:text=>{
+                        return text&&text.length>12?<span title={text}>{text.substr(0,12)+'...'}</span>:text
+                    }
                 }, {
                     title: '职务',
                     dataIndex: 'position',
-                    key: 'position'
+                    key: 'position',
+                    width:100
                 },{
                     title: '联系手机',
                     dataIndex: 'mobile',
-                    key: 'mobile'
+                    key: 'mobile',
+                    width:100
                 }, {
                     title: '操作',
                     dataIndex: 'abc',
                     key: 'abc',
+                    width:100,
                     render:(text,record,index)=>{
                     	return (
                                 <Popconfirm title={'您确认将订单 【'+this.props.data.orderNo+'】 分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">

+ 10 - 4
js/component/manageCenter/statistics/order/index.jsx

@@ -132,12 +132,14 @@ const Order = React.createClass({
                 {
                     title: '序号',
                     dataIndex: 'key',
-                    key: 'key',   
+                    key: 'key',  
+                    width:100 
                 },
                 {
                     title: '订单部门',
                     dataIndex: 'department',
                     key: 'department',
+                    width:200
                 }, 
                 {
                     title: '订单类型',
@@ -145,22 +147,26 @@ const Order = React.createClass({
                     key: 'orderType',
                     render:text=>{
                         return getNewOrderType(text)
-                    }
+                    },
+                    width:200
                 },
                 {
                     title: '签单人员',
                     dataIndex: 'signName',
                     key: 'signName',
+                    width:200
                 },
                 {
                     title: '签单数量',
                     dataIndex: 'signNumber',
-                    key: 'signNumber'
+                    key: 'signNumber',
+                    width:200
                 },
                 {
                     title: '累计签单金额(万)',
                     dataIndex: 'signTotalAmount',
-                    key: 'signTotalAmount'
+                    key: 'signTotalAmount',
+                    width:200
                 },
             ],
             dataSource: [],

+ 2 - 2
webpack.config.js

@@ -304,7 +304,7 @@ module.exports = (function () {
     }
 
     //let staticHost = 'http://afts.hnzhiming.com';
-    let staticHost = 'http://192.168.0.190';
+    let staticHost = 'http://192.168.0.188';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://static.jishutao.com';
@@ -343,7 +343,7 @@ module.exports = (function () {
         // }
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.190',
+            host: '192.168.0.188',
             port: 80,
             allowedHosts: ['127.0.0.1','192.168.0.20','192.168.0.99'],
             headers: {