dengzhiguo 6 years ago
parent
commit
64898a85bb

+ 1 - 0
js/component/manageCenter/customer/customerManagement/adminCustomerStatistics.jsx

@@ -38,6 +38,7 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 				isDistributionFinance: this.state.isDistributionFinance
 			},
 			success: function(data) {
+				console.log(data);
 				let theArr = [];
 				if(!data.data) {
 					if(data.error && data.error.length) {

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

@@ -52,6 +52,7 @@ const PaiDan = React.createClass({
                             sellerName:thisdata.sellerName,
                             createTime:thisdata.createTime?new Date(thisdata.createTime).toLocaleString():'',
                             signTime:thisdata.signTime,
+							contractNo:thisdata.contractNo
                         });
                     };
                 }
@@ -101,6 +102,10 @@ const PaiDan = React.createClass({
                     dataIndex: 'orderNo',
                     key: 'orderNo',
                 }, {
+                    title: '合同编号',
+                    dataIndex: 'contractNo',
+                    key: 'contractNo',
+                }, {
                     title: '下单时间',
                     dataIndex: 'createTime',
                     key: 'createTime',

+ 22 - 6
js/component/manageCenter/order/orderNew/examine.jsx

@@ -4,7 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import Jquery from 'jquery/dist/jquery.js';
 import moment from 'moment';
-import {boutique } from '@/dataDic.js';
+import { boutique } from '@/dataDic.js';
 import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique,getCuikuan,getProjectStatus} from '@/tools.js';
 import './customer.less';
 const TabPane = Tabs.TabPane;
@@ -145,6 +145,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			selectedRowKeys: [],
 			orgCodeUrl:[],
 			paginations:false,
+			confirmLoading: false,
 			pagination: {
 				defaultCurrent: 1,
 				defaultPageSize: 10,
@@ -516,12 +517,26 @@ const IntentionCustomer = Form.create()(React.createClass({
 			noVisible:true
 		})
 	},
+	
+	handleOk(){
+		this.setState({
+			reason:'',
+			confirmLoading: true,
+		});
+		setTimeout(() => {
+			this.setState({
+			noVisible: false,
+			confirmLoading: false,
+		});
+		}, 2000);
+    },
+	
 	//关闭输入理由框
 	noCancel(){
 		this.setState({
 			noVisible:false,
 			reason:'',
-		})
+		});
 	},
 	//搜索
 	search() {
@@ -671,7 +686,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="企业法人" >                             
+			                            label="企业法人" >
 		                                <span>{this.state.legalPerson}</span>
 		                            </FormItem>
 				                     <FormItem className="half-item"
@@ -791,7 +806,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				        </Form>
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
+                        onOk={this.nextCancel} onCancel={this.nextCancel} confirmLoading={this.state.confirmLoading}
                         width='800px'
                         title={'项目任务详情'}                     
                         footer=''
@@ -832,11 +847,12 @@ const IntentionCustomer = Form.create()(React.createClass({
 			            </Form >
 			        </Modal>
 			         <Modal maskClosable={false} visible={this.state.noVisible}
-                        onOk={this.noCancel} onCancel={this.noCancel}
+                        onOk={this.handleOk} onCancel={this.noCancel}
                         width='400px'
                         title={'拒绝理由'}                     
                         footer=''
-                        className="admin-desc-content">
+                        className="admin-desc-content"
+						confirmLoading={this.state.confirmLoading}>
 			            <Form layout="horizontal"  id="demand-form">
 			                <Spin spinning={this.state.loading}>
 				                    <div className='clearfix'>

+ 64 - 65
webpack/module.config.js

@@ -1,67 +1,66 @@
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 
-module.exports = function (theme) {
-  return {
-    rules: [{
-      test: /\.jsx?$/,
-      exclude: /node_modules/,
-      use: {
-        loader: 'babel-loader',
-        options: {
-          "presets": ["es2015", "react"],
-          "plugins": [
-            ["antd", {
-              "style": true
-            }]
-          ]
-        }
-      }
-    }, {
-      test: /\.css$/,
-      use: ExtractTextPlugin.extract({
-        fallback: 'style-loader',
-        use: [{
-          loader: 'css-loader',
-          options: {
-            importLoaders: 1
-          }
-        }]
-      })
-    }, {
-      test: /\.less$/,
-      use: ExtractTextPlugin.extract({
-        fallback: 'style-loader',
-        use: [{
-          loader: 'css-loader',
-          options: {
-            importLoaders: 1
-          }
-        }, {
-          loader: 'less-loader',
-          options: {
-            modifyVars: theme
-          }
-        }]
-      })
-    }, {
-      test: /\.(png|jpg)$/,
-      use: [{
-        loader: 'url-loader',
-        options: {
-          limit: 10240,
-          name: '[path][name].[ext]'
-        }
-      }]
-    }, {
-      test: /\.(woff|svg|eot|ttf)$/,
-      use: [{
-        loader: 'url-loader',
-        options: {
-          limit: 1,
-          name: '[path][name].[ext]'
-        }
-      }]
-    }
-    ]
-  };
-}
+module.exports = function(theme) {
+	return {
+		rules: [{
+			test: /\.jsx?$/,
+			exclude: /node_modules/,
+			use: {
+				loader: 'babel-loader',
+				options: {
+					"presets": ["es2015", "react"],
+					"plugins": [
+						["antd", {
+							"style": true
+						}]
+					]
+				}
+			}
+		}, {
+			test: /\.css$/,
+			use: ExtractTextPlugin.extract({
+				fallback: 'style-loader',
+				use: [{
+					loader: 'css-loader',
+					options: {
+						importLoaders: 1
+					}
+				}]
+			})
+		}, {
+			test: /\.less$/,
+			use: ExtractTextPlugin.extract({
+				fallback: 'style-loader',
+				use: [{
+					loader: 'css-loader',
+					options: {
+						importLoaders: 1
+					}
+				}, {
+					loader: 'less-loader',
+					options: {
+						modifyVars: theme
+					}
+				}]
+			})
+		}, {
+			test: /\.(png|jpg)$/,
+			use: [{
+				loader: 'url-loader',
+				options: {
+					limit: 10240,
+					name: '[path][name].[ext]'
+				}
+			}]
+		}, {
+			test: /\.(woff|svg|eot|ttf)$/,
+			use: [{
+				loader: 'url-loader',
+				options: {
+					limit: 1,
+					name: '[path][name].[ext]'
+				}
+			}]
+		}]
+	};
+}