Browse Source

常用联系人联调

liting2017 6 years ago
parent
commit
bf83bfbf0c

+ 2 - 1
js/component/manageCenter/financialManage/bonus/jsBonus.jsx

@@ -280,7 +280,7 @@ const JsBonus = React.createClass({
             startTime: this.state.releaseDate[0],
             endTime: this.state.releaseDate[1],
         }
-        window.location.href=(globalConfig.context+'/api/admin/financial/exportBillData?'+$.param(data));
+        window.location.href=(globalConfig.context+'/api/admin/bonus/exportTechnicianBonusData?'+$.param(data));
     },
     //保存发放状态
     boHuiSubmit(e){
@@ -363,6 +363,7 @@ const JsBonus = React.createClass({
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                         <span>签单时间 :</span>
                         <RangePicker
+                            format="YYYY-MM"
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
                             this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
                             onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />

+ 1 - 0
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -365,6 +365,7 @@ const YxBonus = React.createClass({
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                         <span>签单时间 :</span>
                         <RangePicker
+                            format="YYYY-MM"
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
                             this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
                             onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />

+ 1 - 1
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -50,7 +50,7 @@ const ShouKuang = React.createClass({
 		                    approval:thisdata.approval,
 		                    buyerName:thisdata.buyerName,
                             actuallyTotalAmount:thisdata.actuallyTotalAmount,
-                            signTime:thisdata.signTime?(new Date(thisdata.signTime)).toLocaleString():'',
+                            signTime:thisdata.signTime,
                             companyId:thisdata.companyId,
                             companyName:thisdata.companyName,
                             buyerId:thisdata.buyerId,

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

@@ -232,7 +232,7 @@ const OrderDetail = Form.create()(React.createClass({
 							<span>{theData.orderNo}</span>
 						</FormItem>
                         <FormItem className="half-item" {...formItemLayout} label="签单时间">
-							<span>{theData.signTime?new Date(theData.signTime).toLocaleString():''}</span>
+							<span>{theData.signDate}</span>
 						</FormItem>
                         <FormItem className="half-item" {...formItemLayout} label="客户名称">
 							<span>{theData.userName}</span>

+ 9 - 12
js/component/manageCenter/index/contacts/index.jsx

@@ -55,10 +55,10 @@ const Contact = React.createClass({
             loading: true
         });
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/order/listAllSettlement",
+            url: globalConfig.context + "/api/admin/frequentContactsList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -80,7 +80,7 @@ const Contact = React.createClass({
 		                    name: thisdata.name,
                             departmentName:thisdata.departmentName,
                             position:thisdata.position,
-                            mobile:thisdata.mobile
+                            contactMobile:thisdata.contactMobile
                         });
                     };
                 }
@@ -129,14 +129,10 @@ const Contact = React.createClass({
                     title: '部门机构',
                     dataIndex: 'departmentName',
                     key: 'departmentName'
-                }, {
-                    title: '职务',
-                    dataIndex: 'position',
-                    key: 'position'
                 },{
                     title: '联系手机',
-                    dataIndex: 'mobile',
-                    key: 'mobile'
+                    dataIndex: 'contactMobile',
+                    key: 'contactMobile'
                 }
             ],
             dataSource: [],
@@ -178,13 +174,14 @@ const Contact = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/user/achievement/delete",
+            url: globalConfig.context + "/api/admin/deleteFrequentContacts",
             data: {
-                ids: deletedIds
+                id: deletedIds[0]
             }
         }).done(function (data) {
             if (!data.error.length) {
                 message.success('删除成功!');
+                this.loadData();
             } else {
                 message.warning(data.error[0].message);
             };
@@ -238,7 +235,7 @@ const Contact = React.createClass({
                     <Spin spinning={this.state.loading}>
                         <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}
-                            rowSelection={rowSelection}
+                            rowSelection={false}
                             pagination={this.state.pagination}
                              />
                     </Spin>

+ 9 - 6
js/component/manageCenter/index/contacts/selContact.jsx

@@ -47,8 +47,8 @@ const Assign=React.createClass({
                     width:150,
                 },{
                     title: '联系手机',
-                    dataIndex: 'mobile',
-                    key: 'mobile',
+                    dataIndex: 'contactMobile',
+                    key: 'contactMobile',
                     width:150,
                 }
             ],
@@ -108,7 +108,7 @@ const Assign=React.createClass({
 	                         departmentName:thisdata.departmentName,
 	                         departmentId:thisdata.departmentId,
 	                         position:thisdata.position,
-	                         mobile:thisdata.mobile,
+	                         contactMobile:thisdata.contactMobile,
                         });
                     };
                 };
@@ -136,9 +136,9 @@ const Assign=React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context +'/api/admin/addContact',
+            url: globalConfig.context +'/api/admin/addFrequentContacts',
             data: {
-            	id:JSON.stringify(idArr)
+            	id:idArr.join(',')
             }
         }).done(function (data) {
             if (!data.error.length) {
@@ -163,10 +163,13 @@ const Assign=React.createClass({
     	});
     },
     componentWillMount() {
-        
+         
     },
     componentWillReceiveProps(nextProps) {
         this.state.visible=nextProps.showDesc;
+        this.state.distributionList=[];
+         this.state.selectedRows=[],
+         this.state.selectedRowKeys=[];
     },
     render() {
         const rowSelection = {

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

@@ -84,8 +84,8 @@ const Assign=React.createClass({
                     width:100
                 },{
                     title: '联系手机',
-                    dataIndex: 'mobile',
-                    key: 'mobile',
+                    dataIndex: 'contactMobile',
+                    key: 'contactMobile',
                     width:100
                 }, {
                     title: '操作',
@@ -127,7 +127,7 @@ const Assign=React.createClass({
         this.setState({
             loading:true
         });
-        let api = this.state.contact?'/api/admin/contacts':'/api/admin/superviser/adminList';
+        let api = this.state.contact?'/api/admin/frequentContactsList':'/api/admin/superviser/adminList';
         $.ajax({
             method: "get",
             dataType: "json",
@@ -156,7 +156,7 @@ const Assign=React.createClass({
 	                         departmentName:thisdata.departmentName,
 	                         departmentId:thisdata.departmentId,
 	                         position:thisdata.position,
-	                         mobile:thisdata.mobile,
+	                         contactMobile:thisdata.contactMobile,
                         });
                     };
                 };

+ 21 - 11
js/component/manageCenter/statistics/order/index.jsx

@@ -128,13 +128,11 @@ const Order = React.createClass({
                     title: '序号',
                     dataIndex: 'key',
                     key: 'key',  
-                    width:100 
                 },
                 {
                     title: '订单部门',
                     dataIndex: 'department',
                     key: 'department',
-                    width:200
                 }, 
                 {
                     title: '订单类型',
@@ -143,25 +141,21 @@ const Order = React.createClass({
                     render:text=>{
                         return getNewOrderType(text)
                     },
-                    width:200
                 },
                 {
                     title: '签单人员',
                     dataIndex: 'signName',
                     key: 'signName',
-                    width:200
                 },
                 {
                     title: '签单数量',
                     dataIndex: 'signNumber',
                     key: 'signNumber',
-                    width:200
                 },
                 {
                     title: '累计签单金额(万)',
                     dataIndex: 'signTotalAmount',
                     key: 'signTotalAmount',
-                    width:200
                 },
             ],
             dataSource: [],
@@ -189,9 +183,26 @@ const Order = React.createClass({
     },
     //导出exec
     exec(){
-        var _headers = [{ k: 'key', v: '序号' }, { k: 'department', v: '订单部门' },
-            { k: 'orderType', v: '订单类型' }, { k: 'signName', v: '签单人员' },{k:'signNumber',v:'签单数量'},{k:'signTotalAmount',v:'累计签单金额'}]
-        exportExcel(_headers,this.state.dataSource,'订单统计报表.xlsx');
+        let departmentName='',
+        depart =this.state.departmentArr || [];
+        depart.map(item=>{
+            if(this.state.departmentId==item.id){
+                departmentName=item.name;
+                return;
+            }
+        });
+        let data = {
+            departmentId:this.state.departmentId,
+            departmentName:departmentName,
+            payeeName: this.state.signName,
+            orderType:this.state.orderType,
+            startTime: this.state.releaseDate[0],
+            endTime: this.state.releaseDate[1],
+        }
+        window.location.href=(globalConfig.context+'/api/admin/financial/exportBillData?'+$.param(data));
+        // var _headers = [{ k: 'key', v: '序号' }, { k: 'department', v: '订单部门' },
+        //     { k: 'orderType', v: '订单类型' }, { k: 'signName', v: '签单人员' },{k:'signNumber',v:'签单数量'},{k:'signTotalAmount',v:'累计签单金额'}]
+        // exportExcel(_headers,this.state.dataSource,'订单统计报表.xlsx');
     },
     render() { 
         const { RangePicker } = DatePicker;
@@ -264,8 +275,7 @@ const Order = React.createClass({
                     <Spin spinning={this.state.loading}>
                         <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}
-                            scroll={{y:500}}
-                            pagination={false}
+                            pagination={this.state.pagination}
                             />
                     </Spin>
                 </div>