HW 4 anos atrás
pai
commit
5b70a7832f
43 arquivos alterados com 1459 adições e 1446 exclusões
  1. 2 2
      css/base.less
  2. 1 1
      js/component/account/topTab.jsx
  3. 6 4
      js/component/login/loginTop.jsx
  4. 216 216
      js/component/manageCenter/customer/individualCustomer/queryCustomer.jsx
  5. 219 219
      js/component/manageCenter/customer/reviewed/expertReview.jsx
  6. 206 206
      js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx
  7. 79 79
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  8. 85 85
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  9. 128 128
      js/component/manageCenter/operate/messagePush/jitaoMessage.jsx
  10. 129 129
      js/component/manageCenter/operate/messagePush/remindMessage.jsx
  11. 4 4
      js/component/manageCenter/operate/personnel/personnelAll.jsx
  12. 21 20
      js/component/manageCenter/order/orderNew/addService.jsx
  13. 28 28
      js/component/manageCenter/order/orderNew/approveds.jsx
  14. 10 10
      js/component/manageCenter/order/orderNew/arrearsList.jsx
  15. 31 31
      js/component/manageCenter/order/orderNew/billing.jsx
  16. 3 3
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  17. 3 3
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js
  18. 7 7
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js
  19. 3 3
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js
  20. 3 3
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js
  21. 5 5
      js/component/manageCenter/order/orderNew/contractCwjl.js
  22. 5 5
      js/component/manageCenter/order/orderNew/contractCwzj.js
  23. 5 5
      js/component/manageCenter/order/orderNew/contractYxgly.js
  24. 18 18
      js/component/manageCenter/order/orderNew/inquiry.jsx
  25. 5 5
      js/component/manageCenter/order/orderNew/press.jsx
  26. 5 5
      js/component/manageCenter/order/orderNew/pressList.jsx
  27. 5 5
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  28. 1 1
      js/component/manageCenter/project/project/enterpriseProjectQuery.jsx
  29. 1 1
      js/component/manageCenter/project/project/projectAssignment.jsx
  30. 1 1
      js/component/manageCenter/project/project/projectQuery.jsx
  31. 5 5
      js/component/manageCenter/project/summary/highTechConfig.jsx
  32. 30 30
      js/component/manageCenter/project/summary/projecCountConfig.jsx
  33. 22 14
      js/component/manageCenter/project/task/myTask.jsx
  34. 10 10
      js/component/manageCenter/project/task/myTaskCount.jsx
  35. 5 5
      js/component/manageCenter/project/task/taskAssignment.jsx
  36. 10 10
      js/component/manageCenter/project/task/taskCount.jsx
  37. 119 119
      js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx
  38. 1 1
      js/component/manageCenter/set/organization/organization.jsx
  39. 12 10
      js/component/manageCenter/topTab.jsx
  40. 5 5
      js/component/tools.js
  41. 1 1
      package.json
  42. 3 3
      webpack-dll.config.js
  43. 1 1
      webpack.config.js

+ 2 - 2
css/base.less

@@ -499,7 +499,7 @@ body {
 //                .ant-form-item-control  {
 //                    text-align: center;
 //                }
-//            } 
+//            }
 //         }
 //     }
 // }
@@ -533,4 +533,4 @@ body {
   margin-bottom: 10px !important;
   color: rgba(0, 0, 0, 0.65);
   vertical-align: top;
-}
+}

+ 1 - 1
js/component/account/topTab.jsx

@@ -73,4 +73,4 @@ const TopTab = React.createClass({
     }
 });
 
-export default TopTab;
+export default TopTab;

+ 6 - 4
js/component/login/loginTop.jsx

@@ -14,16 +14,18 @@ const LoginTop = React.createClass({
                     <div className="logo">
                         <img src={logo} alt="" />
                     </div>
-                    
+
                     <div className="logo-text">
                         <span>科技交易认知计算平台</span>
-                        <span className="back"><a href={jumpUrl + "/portal/index.html"}>返回首页</a></span>
+                        <span className="back">
+                            {/*<a href={jumpUrl + "/portal/index.html"}>返回首页</a>*/}
+                        </span>
                     </div>
-                    
+
                 </div>
             </div>
         )
     }
 });
 
-export default LoginTop;
+export default LoginTop;

Diferenças do arquivo suprimidas por serem muito extensas
+ 216 - 216
js/component/manageCenter/customer/individualCustomer/queryCustomer.jsx


Diferenças do arquivo suprimidas por serem muito extensas
+ 219 - 219
js/component/manageCenter/customer/reviewed/expertReview.jsx


Diferenças do arquivo suprimidas por serem muito extensas
+ 206 - 206
js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx


+ 79 - 79
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -285,16 +285,16 @@ const ShouKuang = React.createClass({
         //     }
         //   },
         // },
-        {
-          title: "外包(内部)公司",
-          dataIndex: "outsourceName",
-          key: "outsourceName",
-        },
-        {
-          title: "外包(内部)价格",
-          dataIndex: "outsourcePrice",
-          key: "outsourcePrice",
-        },
+        // {
+        //   title: "外包(内部)公司",
+        //   dataIndex: "outsourceName",
+        //   key: "outsourceName",
+        // },
+        // {
+        //   title: "外包(内部)价格",
+        //   dataIndex: "outsourcePrice",
+        //   key: "outsourcePrice",
+        // },
       ],
       qianColumns: [
         {
@@ -361,11 +361,11 @@ const ShouKuang = React.createClass({
           dataIndex: "settlementAmount",
           key: "settlementAmount",
         },
-        {
-          title: "欠款",
-          dataIndex: "orderArrears",
-          key: "orderArrears",
-        },
+        // {
+        //   title: "欠款",
+        //   dataIndex: "orderArrears",
+        //   key: "orderArrears",
+        // },
         {
           title: "催收科目",
           dataIndex: "type",
@@ -461,11 +461,11 @@ const ShouKuang = React.createClass({
           dataIndex: "settlementAmount",
           key: "settlementAmount",
         },
-        {
-          title: "应收款",
-          dataIndex: "accountsReceivable",
-          key: "accountsReceivable",
-        },
+        // {
+        //   title: "应收款",
+        //   dataIndex: "accountsReceivable",
+        //   key: "accountsReceivable",
+        // },
         {
           title: "催收科目",
           dataIndex: "dunSubject",
@@ -658,22 +658,22 @@ const ShouKuang = React.createClass({
           dataIndex: "actuallyTotalAmount",
           key: "actuallyTotalAmount",
         },
-        {
-          title: "总成本(万元)",
-          dataIndex: "costAmount",
-          key: "costAmount",
-          render: (text) => {
-            return isNaN(parseFloat(text)) ? text : parseFloat(text);
-          }
-        },
-        {
-          title: "已付成本(万元)",
-          dataIndex: "paymentAmount",
-          key: "paymentAmount",
-          render: (text) => {
-            return isNaN(parseFloat(text)) ? text : parseFloat(text);
-          },
-        },
+        // {
+        //   title: "总成本(万元)",
+        //   dataIndex: "costAmount",
+        //   key: "costAmount",
+        //   render: (text) => {
+        //     return isNaN(parseFloat(text)) ? text : parseFloat(text);
+        //   }
+        // },
+        // {
+        //   title: "已付成本(万元)",
+        //   dataIndex: "paymentAmount",
+        //   key: "paymentAmount",
+        //   render: (text) => {
+        //     return isNaN(parseFloat(text)) ? text : parseFloat(text);
+        //   },
+        // },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
@@ -792,36 +792,36 @@ const ShouKuang = React.createClass({
           key: "actuallyTotalAmount",
           className: "title-table",
         },
-        {
-          title: "应收款(万元)",
-          dataIndex: "orderReceivables",
-          key: "orderReceivables",
-          className: "title-table",
-        },
-        {
-          title: "欠款(万元)",
-          dataIndex: "orderArrears",
-          key: "orderArrears",
-          className: "title-table",
-        },
-        {
-          title: "总成本(万元)",
-          dataIndex: "costAmount",
-          key: "costAmount",
-          className: "title-table",
-          render: (text) => {
-            return isNaN(parseFloat(text)) ? text : parseFloat(text);
-          }
-        },
-        {
-          title: "已付成本(万元)",
-          dataIndex: "paymentAmount",
-          key: "paymentAmount",
-          className: "title-table",
-          render: (text) => {
-            return isNaN(parseFloat(text)) ? text : parseFloat(text);
-          }
-        },
+        // {
+        //   title: "应收款(万元)",
+        //   dataIndex: "orderReceivables",
+        //   key: "orderReceivables",
+        //   className: "title-table",
+        // },
+        // {
+        //   title: "欠款(万元)",
+        //   dataIndex: "orderArrears",
+        //   key: "orderArrears",
+        //   className: "title-table",
+        // },
+        // {
+        //   title: "总成本(万元)",
+        //   dataIndex: "costAmount",
+        //   key: "costAmount",
+        //   className: "title-table",
+        //   render: (text) => {
+        //     return isNaN(parseFloat(text)) ? text : parseFloat(text);
+        //   }
+        // },
+        // {
+        //   title: "已付成本(万元)",
+        //   dataIndex: "paymentAmount",
+        //   key: "paymentAmount",
+        //   className: "title-table",
+        //   render: (text) => {
+        //     return isNaN(parseFloat(text)) ? text : parseFloat(text);
+        //   }
+        // },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
@@ -1967,19 +1967,19 @@ const ShouKuang = React.createClass({
               >
                 打印工时信息
               </Button>
-              <Button
-                  type="primary"
-                  disabled={this.state.selectedRowKeys.length != 1}
-                  style={{ margin: "11px 0px 10px 10px" }}
-                  onClick={() => {
-                    this.cuiData();
-                    this.setState({
-                      cuiVisible: true,
-                    });
-                  }}
-              >
-                打印催款信息
-              </Button>
+              {/*<Button*/}
+              {/*    type="primary"*/}
+              {/*    disabled={this.state.selectedRowKeys.length != 1}*/}
+              {/*    style={{ margin: "11px 0px 10px 10px" }}*/}
+              {/*    onClick={() => {*/}
+              {/*      this.cuiData();*/}
+              {/*      this.setState({*/}
+              {/*        cuiVisible: true,*/}
+              {/*      });*/}
+              {/*    }}*/}
+              {/*>*/}
+              {/*  打印催款信息*/}
+              {/*</Button>*/}
               <Button
                   type="primary"
                   disabled={this.state.selectedRowKeys.length != 1}

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

@@ -303,16 +303,16 @@ const ShouKuang = React.createClass({
         //     }
         //   },
         // },
-        {
-          title: "外包(内部)公司",
-          dataIndex: "outsourceName",
-          key: "outsourceName",
-        },
-        {
-          title: "外包(内部)价格",
-          dataIndex: "outsourcePrice",
-          key: "outsourcePrice",
-        },
+        // {
+        //   title: "外包(内部)公司",
+        //   dataIndex: "outsourceName",
+        //   key: "outsourceName",
+        // },
+        // {
+        //   title: "外包(内部)价格",
+        //   dataIndex: "outsourcePrice",
+        //   key: "outsourcePrice",
+        // },
       ],
       qianColumns: [
         {
@@ -379,11 +379,11 @@ const ShouKuang = React.createClass({
           dataIndex: "settlementAmount",
           key: "settlementAmount",
         },
-        {
-          title: "欠款",
-          dataIndex: "orderArrears",
-          key: "orderArrears",
-        },
+        // {
+        //   title: "欠款",
+        //   dataIndex: "orderArrears",
+        //   key: "orderArrears",
+        // },
         {
           title: "催收科目",
           dataIndex: "type",
@@ -479,11 +479,11 @@ const ShouKuang = React.createClass({
           dataIndex: "settlementAmount",
           key: "settlementAmount",
         },
-        {
-          title: "应收款",
-          dataIndex: "accountsReceivable",
-          key: "accountsReceivable",
-        },
+        // {
+        //   title: "应收款",
+        //   dataIndex: "accountsReceivable",
+        //   key: "accountsReceivable",
+        // },
         {
           title: "催收科目",
           dataIndex: "dunSubject",
@@ -687,22 +687,22 @@ const ShouKuang = React.createClass({
             return isNaN(parseFloat(text)) ? text : parseFloat(text);
           },
         },
-        {
-          title: "总成本(万元)",
-          dataIndex: "costAmount",
-          key: "costAmount",
-          render: (text) => {
-            return isNaN(parseFloat(text)) ? text : parseFloat(text);
-          }
-        },
-        {
-          title: "已付成本(万元)",
-          dataIndex: "paymentAmount",
-          key: "paymentAmount",
-          render: (text) => {
-            return isNaN(parseFloat(text)) ? text : parseFloat(text);
-          },
-        },
+        // {
+        //   title: "总成本(万元)",
+        //   dataIndex: "costAmount",
+        //   key: "costAmount",
+        //   render: (text) => {
+        //     return isNaN(parseFloat(text)) ? text : parseFloat(text);
+        //   }
+        // },
+        // {
+        //   title: "已付成本(万元)",
+        //   dataIndex: "paymentAmount",
+        //   key: "paymentAmount",
+        //   render: (text) => {
+        //     return isNaN(parseFloat(text)) ? text : parseFloat(text);
+        //   },
+        // },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
@@ -833,42 +833,42 @@ const ShouKuang = React.createClass({
             return isNaN(parseFloat(text)) ? text : parseFloat(text);
           }
         },
-        {
-          title: "应收款(万元)",
-          dataIndex: "orderReceivables",
-          key: "orderReceivables",
-          className: "title-table",
-          render: (text) => {
-            return isNaN(parseFloat(text)) ? text : parseFloat(text);
-          }
-        },
-        {
-          title: "欠款(万元)",
-          dataIndex: "orderArrears",
-          key: "orderArrears",
-          className: "title-table",
-          render: (text) => {
-            return isNaN(parseFloat(text)) ? text : parseFloat(text);
-          }
-        },
-        {
-          title: "总成本(万元)",
-          dataIndex: "costAmount",
-          key: "costAmount",
-          className: "title-table",
-          render: (text) => {
-            return isNaN(parseFloat(text)) ? text : parseFloat(text);
-          }
-        },
-        {
-          title: "已付成本(万元)",
-          dataIndex: "paymentAmount",
-          key: "paymentAmount",
-          className: "title-table",
-          render: (text) => {
-            return isNaN(parseFloat(text)) ? text : parseFloat(text);
-          }
-        },
+        // {
+        //   title: "应收款(万元)",
+        //   dataIndex: "orderReceivables",
+        //   key: "orderReceivables",
+        //   className: "title-table",
+        //   render: (text) => {
+        //     return isNaN(parseFloat(text)) ? text : parseFloat(text);
+        //   }
+        // },
+        // {
+        //   title: "欠款(万元)",
+        //   dataIndex: "orderArrears",
+        //   key: "orderArrears",
+        //   className: "title-table",
+        //   render: (text) => {
+        //     return isNaN(parseFloat(text)) ? text : parseFloat(text);
+        //   }
+        // },
+        // {
+        //   title: "总成本(万元)",
+        //   dataIndex: "costAmount",
+        //   key: "costAmount",
+        //   className: "title-table",
+        //   render: (text) => {
+        //     return isNaN(parseFloat(text)) ? text : parseFloat(text);
+        //   }
+        // },
+        // {
+        //   title: "已付成本(万元)",
+        //   dataIndex: "paymentAmount",
+        //   key: "paymentAmount",
+        //   className: "title-table",
+        //   render: (text) => {
+        //     return isNaN(parseFloat(text)) ? text : parseFloat(text);
+        //   }
+        // },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
@@ -2084,19 +2084,19 @@ const ShouKuang = React.createClass({
               >
                 打印工时信息
               </Button>
-              <Button
-                  type="primary"
-                  disabled={this.state.selectedRowKeys.length != 1}
-                  style={{ margin: "11px 0px 10px 10px" }}
-                  onClick={() => {
-                    this.cuiData();
-                    this.setState({
-                      cuiVisible: true,
-                    });
-                  }}
-              >
-                打印催款信息
-              </Button>
+              {/*<Button*/}
+              {/*    type="primary"*/}
+              {/*    disabled={this.state.selectedRowKeys.length != 1}*/}
+              {/*    style={{ margin: "11px 0px 10px 10px" }}*/}
+              {/*    onClick={() => {*/}
+              {/*      this.cuiData();*/}
+              {/*      this.setState({*/}
+              {/*        cuiVisible: true,*/}
+              {/*      });*/}
+              {/*    }}*/}
+              {/*>*/}
+              {/*  打印催款信息*/}
+              {/*</Button>*/}
               <Button
                   type="primary"
                   disabled={this.state.selectedRowKeys.length != 1}

+ 128 - 128
js/component/manageCenter/operate/messagePush/jitaoMessage.jsx

@@ -118,7 +118,7 @@ const JitaoMessage=Form.create()(React.createClass({
 			data: {
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
-				type: this.state.typeSearch, //名称1   
+				type: this.state.typeSearch, //名称1
 				name: this.state.nameSearch,
 				status: this.state.statusSearch,
 				industry: this.state.industrySearch,
@@ -482,7 +482,7 @@ const JitaoMessage=Form.create()(React.createClass({
             loading: true,
             ispage:pageNo,
         });
-        
+
         let isCountry='';
         let pro='';
         let city='';
@@ -555,7 +555,7 @@ const JitaoMessage=Form.create()(React.createClass({
                             arrProvinceCity:ProvinceCity,
                         });
                     };
-             
+
                     this.state.pagination2.current = data.data.pageNo;
                     this.state.pagination2.total = data.data.totalCount;
                 };
@@ -582,7 +582,7 @@ const JitaoMessage=Form.create()(React.createClass({
 			data: {
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
-				type: this.state.typeSearch, //名称1   
+				type: this.state.typeSearch, //名称1
 				name: this.state.nameSearch,
 				//province: !(this.state.addressSearch).length ? this.state.provinceSearch : this.state.addressSearch[0],
 				//city: !(this.state.addressSearch).length ? '' : this.state.addressSearch[1],
@@ -657,7 +657,7 @@ const JitaoMessage=Form.create()(React.createClass({
 			data: {
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
-				type: this.state.typeSearch, //名称1   
+				type: this.state.typeSearch, //名称1
 				name: this.state.nameSearch,
 				//province: !(this.state.addressSearch).length ? this.state.provinceSearch : this.state.addressSearch[0],
 				//city: !(this.state.addressSearch).length ? '' : this.state.addressSearch[1],
@@ -1008,7 +1008,7 @@ const JitaoMessage=Form.create()(React.createClass({
 					dataIndex: 'status',
 					key: 'status',
 					render: text => { return getStatuslist(text) }
-				}			
+				}
 			],
 			sanhuDataSource: [],
 			sanhuColumns21: [{
@@ -1098,7 +1098,7 @@ const JitaoMessage=Form.create()(React.createClass({
 					dataIndex: 'status',
 					key: 'status',
 					render: text => { return getStatuslist(text) }
-				}			
+				}
 			],
 			sanhuDataSource21: [],
             fengongsiColumns: [
@@ -1128,7 +1128,7 @@ const JitaoMessage=Form.create()(React.createClass({
                     dataIndex: 'status',
                     key: 'status',
                     render: text => { return getCondition(text) }
-                  
+
                 }
             ],
             fengongsiDataSource: [],
@@ -1188,7 +1188,7 @@ const JitaoMessage=Form.create()(React.createClass({
                     title: '所有人名称',
                     dataIndex: 'theName',
                     key: 'theName',
-                }, 
+                },
                 {
                     title: '是否精品',
                     dataIndex: 'boutique',
@@ -1220,7 +1220,7 @@ const JitaoMessage=Form.create()(React.createClass({
                     title: '所有人名称',
                     dataIndex: 'theName',
                     key: 'theName',
-                }, 
+                },
                 {
                     title: '是否精品',
                     dataIndex: 'boutique',
@@ -1253,7 +1253,7 @@ const JitaoMessage=Form.create()(React.createClass({
                     title: '雇主名称',
                     dataIndex: 'theName',
                     key: 'theName',
-                }, 
+                },
               	{
                     title: '是否精品',
                     dataIndex: 'boutique',
@@ -1285,7 +1285,7 @@ const JitaoMessage=Form.create()(React.createClass({
                     title: '雇主名称',
                     dataIndex: 'theName',
                     key: 'theName',
-                }, 
+                },
               	{
                     title: '是否精品',
                     dataIndex: 'boutique',
@@ -1354,7 +1354,7 @@ const JitaoMessage=Form.create()(React.createClass({
 					dataIndex: 'summary',
 					key: 'summary',
 					width:'400',
-					
+
 				},
 				{
 					title: '时间',
@@ -1370,7 +1370,7 @@ const JitaoMessage=Form.create()(React.createClass({
     	this.loadData(1,0);
     },
     //获取上级组织
-    selectSuperId() {  
+    selectSuperId() {
     	this.state.data = []
          $.ajax({
                 method: "get",
@@ -1378,17 +1378,17 @@ const JitaoMessage=Form.create()(React.createClass({
                 crossDomain: false,
                 url: globalConfig.context + "/api/admin/organization/selectSuperId",
                 data:{
-                  
+
                 },
-                success: function (data) {                	  
+                success: function (data) {
                 		let theArr = [];
 					    let thedata=data.data;
 					    if (!thedata) {
 		                    if (data.error && data.error.length) {
 		                        message.warning(data.error[0].message);
-		                    };	
-		                    thedata = {}; 
-		              };   
+		                    };
+		                    thedata = {};
+		              };
 					    var contactIds=[];
 				        //for (let item in data.data) {
 				        	for(var i=0;i<data.data.length;i++){
@@ -1397,12 +1397,12 @@ const JitaoMessage=Form.create()(React.createClass({
 		                        <Select.Option value={i.toString()} key={theData.name}>{theData.name}</Select.Option>
 		                    );
 		                };
-						this.setState({	
+						this.setState({
 							SuperArr:thedata,
-		                    contactsOption: theArr, 
+		                    contactsOption: theArr,
 		                    orderStatusOptions:data.data,
 	                    });
-	                    
+
 					}.bind(this),
 				}).always(function () {
 				this.setState({
@@ -1410,16 +1410,16 @@ const JitaoMessage=Form.create()(React.createClass({
 	            });
 	        }.bind(this));
 	},
-	
+
 	//整行点击
     bianji(record, index) {
-    	
-    	this.state.RowData = record; 
+
+    	this.state.RowData = record;
         this.setState({
         	editvisible: true,
         	selectedRowKeys:[],
         	rowId:record.businessId,
-        })    
+        })
         let deletedIds ='';
         for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
             let rowItem = this.state.selectedRows[idx];
@@ -1428,7 +1428,7 @@ const JitaoMessage=Form.create()(React.createClass({
             };
         };
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context +"/api/admin/organization/selectAllById" ,
@@ -1448,21 +1448,21 @@ const JitaoMessage=Form.create()(React.createClass({
                          editName:thisdata.name,//组织名称
                          editManagerId:thisdata.managerId,//负责人
                          editType:thisdata.type,//组织类型
-                         editStatus:thisdata.status,//组织状态 
+                         editStatus:thisdata.status,//组织状态
                          editSuperId:thisdata.superId,//上级组织
                          editDepNo: thisdata.depNo,//组织编号
                          editCreateId:thisdata.createId,//创建人
                          editTime:thisdata.createTime,//创建时间
                          editRemarks:thisdata.remarks,//组织职能说明
                     });
-                   
+
                 };
                 this.setState({
                 	 editId: thisdata.id,//每一条记录的ID
                 	 editName:thisdata.name,//组织名称
                      editManagerId:thisdata.managerId,//负责人
                      editType:thisdata.type,//组织类型
-                     editStatus:thisdata.status,//组织状态 
+                     editStatus:thisdata.status,//组织状态
                      editSuperId:thisdata.superId,//上级组织
                      editDepNo: thisdata.depNo,//组织编号
                      editCreateId:thisdata.createId,//创建人
@@ -1512,7 +1512,7 @@ const JitaoMessage=Form.create()(React.createClass({
     },
     //新增一条消息,保存
     addhandleSubmit(e,addType){
-    	e.preventDefault();	
+    	e.preventDefault();
     	let duixiang=JSON.stringify(this.state.sanhu)||JSON.stringify(this.state.sanhu21)||JSON.stringify(this.state.shehui)||JSON.stringify(this.state.hangye)||JSON.stringify(this.state.fengongsi)||JSON.stringify(this.state.diqu);
         let xiaoxi=JSON.stringify(this.state.xiaoxi);
         if(!xiaoxi){
@@ -1520,7 +1520,7 @@ const JitaoMessage=Form.create()(React.createClass({
     		return false;
     	}
     	if(!duixiang){
-    		message.warning('请指定发送对象'); 
+    		message.warning('请指定发送对象');
     		return false;
     	}
     	let diquText=this.state.diqu;
@@ -1558,11 +1558,11 @@ const JitaoMessage=Form.create()(React.createClass({
 	    	case '3':expertIds=this.state.xiaoxi.join(",");break;
 	    	case '4':newsIds=this.state.xiaoxi.join(",");break;
 	    }
-		this.props.form.validateFields((err, values) => {                                 
+		this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.setState({
                     loading: true
-                }); 
+                });
                 $.ajax({
                     method: "post",
                     dataType: "json",
@@ -1587,14 +1587,14 @@ const JitaoMessage=Form.create()(React.createClass({
                         industryIds:this.state.hangye?this.state.hangye.join(","):undefined,//行业
                         sourceType:this.state.addContent, //推荐资源类型
                         targetType:this.state.addObject, //推送目标类型
-                        
+
                     }
-                }).done(function (data) { 
+                }).done(function (data) {
                     this.setState({
                         loading: false
                     });
                     if (!data.error.length) {
-                        message.success('保存成功!'); 
+                        message.success('保存成功!');
                         this.handleCancel();
                         this.loadData(1,0);
                     } else {
@@ -1605,11 +1605,11 @@ const JitaoMessage=Form.create()(React.createClass({
         });
     },
     add(e){
-    	e.preventDefault();	
+    	e.preventDefault();
     	this.addhandleSubmit(e,0);
     },
     adds(e){
-    	e.preventDefault();	
+    	e.preventDefault();
     	this.addhandleSubmit(e,1);
     },
    //详情tab切换数据处理
@@ -1667,12 +1667,12 @@ const JitaoMessage=Form.create()(React.createClass({
 			this.zhengceLoadData();
 			this.setState({ visible12: true })
 		}
-		
-		
+
+
 	},
 	changeContent(e){
 		this.xiaoxiReset();
-		
+
 	},
 	//切换创建系统消息中的指定发送对象
 	selectObjects(e) {
@@ -1703,8 +1703,8 @@ const JitaoMessage=Form.create()(React.createClass({
 	//值改变时请求客户名称
 	httpChange(e){
 		if(e.length>=2){
-			this.supervisor(e); 
-		}	
+			this.supervisor(e);
+		}
 		this.setState({
 			managerIdOrganization:e
 		})
@@ -1715,8 +1715,8 @@ const JitaoMessage=Form.create()(React.createClass({
         this.setState({
             visible: true
         });
-        
-        
+
+
     },
     editClick() {
         this.state.RowData = {};
@@ -1795,7 +1795,7 @@ const JitaoMessage=Form.create()(React.createClass({
 						            {item.areaList.map((item) => {
 										return(
 											<TreeNodet title={item.name} key={item.id} dataRef={item}>
-									            
+
 									        </TreeNodet>
 										);
 										})
@@ -1806,7 +1806,7 @@ const JitaoMessage=Form.create()(React.createClass({
 			            }
 			        </TreeNodet>
 				);
-			
+
 			return <TreeNodet {...item} />;
 		});
 	},
@@ -1854,7 +1854,7 @@ const JitaoMessage=Form.create()(React.createClass({
     sanhuReset() {
 		this.state.isMemberSearch = undefined;
 		this.state.internationalSearch = undefined;
-		this.state.typeSearch = undefined; //名称1   
+		this.state.typeSearch = undefined; //名称1
 		this.state.nameSearch = '';
 		this.state.addressSearch = [];
 		this.state.provinceSearch = undefined;
@@ -1878,7 +1878,7 @@ const JitaoMessage=Form.create()(React.createClass({
     sanhuReset21() {
 		this.state.isMemberSearch = undefined;
 		this.state.internationalSearch = undefined;
-		this.state.typeSearch = undefined; //名称1   
+		this.state.typeSearch = undefined; //名称1
 		this.state.nameSearch = '';
 		this.state.addressSearch = [];
 		this.state.provinceSearch = undefined;
@@ -1901,7 +1901,7 @@ const JitaoMessage=Form.create()(React.createClass({
     //把搜索的部分置零
     reset() {
        this.state.sendType = undefined;//组织类型清零
-        this.loadData();      
+        this.loadData();
     },
     //服务项目搜索列表清零
     xiangmuReset() {
@@ -1910,7 +1910,7 @@ const JitaoMessage=Form.create()(React.createClass({
         this.state.ressSearch= undefined;//省市区清零
         this.state.activityFlag = undefined;//活动生效清零
         this.state.status = undefined;//项目状态清零
-        this.xiangmuLoadData(); 
+        this.xiangmuLoadData();
     },
     chengguoReset1(){
     	this.state.serialNumber = undefined;
@@ -1924,7 +1924,7 @@ const JitaoMessage=Form.create()(React.createClass({
         this.state.releaseDate = [];
         this.state.boutique = '';
         this.state.hot='' ;
-        this.chengguoLoadData1(); 
+        this.chengguoLoadData1();
     },
     chengguoReset2(){
     	this.state.serialNumber = undefined;
@@ -1938,7 +1938,7 @@ const JitaoMessage=Form.create()(React.createClass({
         this.state.releaseDate = [];
         this.state.boutique = '';
         this.state.hot='' ;
-        this.chengguoLoadData2(); 
+        this.chengguoLoadData2();
     },
     xuqiuReset1(){
     	this.state.serialNumber = undefined;
@@ -1955,7 +1955,7 @@ const JitaoMessage=Form.create()(React.createClass({
         this.state.auditStatus = undefined;
         this.state.validityPeriodDate = [];
         this.state.releaseDate = [];
-    	this.xuqiuLoadData1(); 
+    	this.xuqiuLoadData1();
     },
     xuqiuReset2(){
     	this.state.serialNumber = undefined;
@@ -1972,16 +1972,16 @@ const JitaoMessage=Form.create()(React.createClass({
         this.state.auditStatus = undefined;
         this.state.validityPeriodDate = [];
         this.state.releaseDate = [];
-        this.xuqiuLoadData2(); 
+        this.xuqiuLoadData2();
     },
     zhuanjiaReset(){
     	this.state.nameSearch = '';
     	this.state.internationalSearch = undefined;
-    	this.zhuanjiaLoadData(); 
+    	this.zhuanjiaLoadData();
     },
     zhengceReset(){
     	this.state.name= '';
-    	this.zhengceLoadData(); 
+    	this.zhengceLoadData();
     },
     searchSwitch() {
         this.setState({
@@ -2143,7 +2143,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <div style={!this.state.bianjiMore ? { display: 'none',float:'right',marginRight:'10px'} : {display: 'inline-block',float:'right',marginRight:'10px',marginTop:'10px'}}>
 			                <Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 							     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px',float:'right'}}
-		                   			 disabled={!hasSelected} 
+		                   			 disabled={!hasSelected}
 		                    		 >删除<Icon type="minus" />
 		           			     </Button>
 							</Popconfirm>
@@ -2164,55 +2164,55 @@ const JitaoMessage=Form.create()(React.createClass({
 	                            onRowClick={this.tableRowClick} />
 	                    </Spin>
 	                </div>
-	             
+
 	                 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.visible}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel}
 	                        width='600px'
-	                        title='新建技淘智推'                       
+	                        title='新建技淘智推'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.add} id="add-form">
 				                <Spin spinning={this.state.loading}>
 				                   <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 				                         	labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 18 }}
 				                           	label="推荐内容"
-				                         > 
-											  <Select placeholder="推荐内容" value={this.state.addContent} 
-				                                onSelect={this.selectContent} onChange={this.changeContent} style={{width:'95%'}} required="required"> 
+				                         >
+											  <Select placeholder="推荐内容" value={this.state.addContent}
+				                                onSelect={this.selectContent} onChange={this.changeContent} style={{width:'95%'}} required="required">
 				                                {
 				                                    featuredContent.map(function(item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                    })
 				                                }
-				                              </Select> 
+				                              </Select>
 				                              <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 				                   		 </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 				                         	labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 18 }}
 				                           	label="指定发送对象"
-				                         > 
-											  <Select placeholder="指定发送对象" value={this.state.addObject} 
-				                                onSelect={this.selectObjects} onChange={this.changeObjects} style={{width:'95%'}} required="required"> 
+				                         >
+											  <Select placeholder="指定发送对象" value={this.state.addObject}
+				                                onSelect={this.selectObjects} onChange={this.changeObjects} style={{width:'95%'}} required="required">
 				                                {
 				                                    designatedObjectes.map(function(item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                    })
 				                                }
-				                              </Select> 
+				                              </Select>
 				                              <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 				                   		 </FormItem>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 18, offset: 5 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">发送</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">发送</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.adds} style={{marginLeft:'10px'}}>存为草稿</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel} style={{marginLeft:'10px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2221,7 +2221,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible6}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel6}
 	                        width='1000px'
-	                        title='服务项目列表'                       
+	                        title='服务项目列表'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.xiaoxiSubmit} id="add-form">
@@ -2231,11 +2231,11 @@ const JitaoMessage=Form.create()(React.createClass({
 					                        value={this.state.bname}
 					                        onChange={(e) => { this.setState({ bname: e.target.value }); }} />
 				                    	<Cascader options={provinceSelect()}  value={this.state.ressSearch} placeholder="选择省份" style={{width:'130px',marginRight:'10px'}}
-				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
 			                    		<Cascader options={citySelect()}  value={this.state.ressSearch} placeholder="选择城市" style={{width:'130px',marginRight:'10px'}}
-				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
 			                    		<Cascader options={areaSelect()}  value={this.state.ressSearch} placeholder="选择地区" style={{width:'130px',marginRight:'10px'}}
-				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
 			                    		<Select placeholder="活动生效标识"
 					                            style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
 					                            value={this.state.activityFlag}
@@ -2263,9 +2263,9 @@ const JitaoMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel6} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2274,7 +2274,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible7}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel7}
 	                        width='800px'
-	                        title='科技成果(组织)列表'                       
+	                        title='科技成果(组织)列表'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.xiaoxiSubmit} id="add-form">
@@ -2308,9 +2308,9 @@ const JitaoMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel7} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2319,7 +2319,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible8}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel8}
 	                        width='800px'
-	                        title='科技成果(个人)列表'                       
+	                        title='科技成果(个人)列表'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.xiaoxiSubmit} id="add-form">
@@ -2353,9 +2353,9 @@ const JitaoMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel8} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2364,7 +2364,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible9}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel9}
 	                        width='1000px'
-	                        title='科技需求(组织)列表'                       
+	                        title='科技需求(组织)列表'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.xiaoxiSubmit} id="add-form">
@@ -2400,9 +2400,9 @@ const JitaoMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel9} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2411,7 +2411,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible10}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel10}
 	                        width='800px'
-	                        title='科技需求(个人)列表'                       
+	                        title='科技需求(个人)列表'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.xiaoxiSubmit} id="add-form">
@@ -2447,9 +2447,9 @@ const JitaoMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel10} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2458,7 +2458,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible11}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel11}
 	                        width='1000px'
-	                        title='专家列表'                       
+	                        title='专家列表'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.xiaoxiSubmit} id="add-form">
@@ -2466,14 +2466,14 @@ const JitaoMessage=Form.create()(React.createClass({
 				                	<div className="user-search">
 					                    <Input placeholder="名称" style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
 					                        value={this.state.nameSearch}
-					                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
+					                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
                     					<Select placeholder="国际" style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
 				                            value={this.state.internationalSearch}
 				                            onChange={(e) => { this.setState({ internationalSearch: e }) }}>
 				                            <Select.Option value="0" >否</Select.Option>
 				                            <Select.Option value="1" >是</Select.Option>
 				                        </Select>
-				                        
+
 					                    <Button type="primary" onClick={this.zhuanjiaSearch} style={{marginRight:'10px'}}>搜索</Button>
 					                    <Button onClick={this.zhuanjiaReset} style={{marginRight:'10px'}}>重置</Button>
 					                </div>
@@ -2487,9 +2487,9 @@ const JitaoMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel11} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2498,7 +2498,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible12}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel12}
 	                        width='800px'
-	                        title='政策列表'                       
+	                        title='政策列表'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.xiaoxiSubmit} id="add-form">
@@ -2520,19 +2520,19 @@ const JitaoMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel12} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
                 	 </div>
-                	 
+
                 	 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.visible1}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel1}
 	                        width='1500px'
-	                        title='个人客户'                       
+	                        title='个人客户'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.sanhuSubmit} id="add-form">
@@ -2604,7 +2604,7 @@ const JitaoMessage=Form.create()(React.createClass({
 				                            value={this.state.lvlSearch}
 				                            onChange={(e) => { this.setState({ lvlSearch: e }) }}>
 				                            {this.state.lvlArrOption}
-				                        </Select>  
+				                        </Select>
 				                        <Select placeholder="会员状态"
 				                             style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
 				                            value={this.state.currentMemberStatusSearch}
@@ -2621,7 +2621,7 @@ const JitaoMessage=Form.create()(React.createClass({
 				                                    })
 				                                }
 				                        </Select>
-					                    
+
 					                    <Button type="primary" onClick={this.sanhusearch} style={{marginRight:'10px'}}>搜索</Button>
 					                    <Button onClick={this.sanhuReset} style={{marginRight:'10px'}}>重置</Button>
 					                </div>
@@ -2635,9 +2635,9 @@ const JitaoMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel1} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2646,7 +2646,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible21}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCance21}
 	                        width='1500px'
-	                        title='单位客户'                       
+	                        title='单位客户'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.sanhuSubmit21} id="add-form">
@@ -2718,7 +2718,7 @@ const JitaoMessage=Form.create()(React.createClass({
 				                            value={this.state.lvlSearch}
 				                            onChange={(e) => { this.setState({ lvlSearch: e }) }}>
 				                            {this.state.lvlArrOption}
-				                        </Select>  
+				                        </Select>
 				                        <Select placeholder="会员状态"
 				                             style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
 				                            value={this.state.currentMemberStatusSearch}
@@ -2735,7 +2735,7 @@ const JitaoMessage=Form.create()(React.createClass({
 				                                    })
 				                                }
 				                        </Select>
-					                    
+
 					                    <Button type="primary" onClick={this.sanhusearch21} style={{marginRight:'10px'}}>搜索</Button>
 					                    <Button onClick={this.sanhuReset21} style={{marginRight:'10px'}}>重置</Button>
 					                </div>
@@ -2749,9 +2749,9 @@ const JitaoMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel21} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2760,23 +2760,23 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible2}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel2}
 	                        width='600px'
-	                        title='社会属性'                       
+	                        title='社会属性'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.shehuiSubmit} id="add-form">
 				                <Spin spinning={this.state.loading}>
-				                    <FormItem  
+				                    <FormItem
 			                         	labelCol={{ span: 7 }}
 				                        wrapperCol={{ span: 12 }}
 			                           	label="请选择社会属性"
-			                         >    
+			                         >
 		                              <CheckboxGroup options={socialAttributeS} value={this.state.shehui} onChange={(e)=>{this.setState({shehui:e})}} />
-		                               
+
 			                   		 </FormItem>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel2} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2785,7 +2785,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible3}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel3}
 	                        width='1200px'
-	                        title='分公司列表'                       
+	                        title='分公司列表'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.fengongsiSubmit} id="add-form">
@@ -2800,9 +2800,9 @@ const JitaoMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel3} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2811,7 +2811,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible4}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel4}
 	                        width='600px'
-	                        title='地区'                       
+	                        title='地区'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.diquSubmit} id="add-form">
@@ -2831,9 +2831,9 @@ const JitaoMessage=Form.create()(React.createClass({
 									      </Tree>
 					                </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel4} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -2842,26 +2842,26 @@ const JitaoMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible5}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel5}
 	                        width='600px'
-	                        title='行业'                       
+	                        title='行业'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.hangyeSubmit} id="add-form">
 				                <Spin spinning={this.state.loading}>
-				                    <FormItem  
+				                    <FormItem
 			                         	labelCol={{ span: 7 }}
 				                        wrapperCol={{ span: 12 }}
 			                           	label="请选择行业"
-			                         > 
+			                         >
 		                              <CheckboxGroup options={industryS} value={this.state.hangye} onChange={(e)=>{this.setState({hangye:e})}} />
 	                                </FormItem>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">选定</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel5} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
-                	 </div> 
+                	 </div>
             	</div>
             </div>
         );

+ 129 - 129
js/component/manageCenter/operate/messagePush/remindMessage.jsx

@@ -17,7 +17,7 @@ const RemindMessage=Form.create()(React.createClass({
         });
         let nameText=this.state.SuperArr;
 		let superText=(this.state.superId)?nameText[parseInt(this.state.superId)].name:"";
-       
+
         $.ajax({
             method: "post",
             dataType: "json",
@@ -49,7 +49,7 @@ const RemindMessage=Form.create()(React.createClass({
                             managerId:thisdata.managerId,//负责人
                             superId:thisdata.superId,//上级组织
                             status:thisdata.status,//组织状态
-                            
+
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -65,7 +65,7 @@ const RemindMessage=Form.create()(React.createClass({
                 loading: false
             });
         }.bind(this));
-       
+
     },
     getInitialState() {
         return {
@@ -185,7 +185,7 @@ const RemindMessage=Form.create()(React.createClass({
     	this.selectSuperId();
     },
     //获取上级组织
-    selectSuperId() {  
+    selectSuperId() {
     	this.state.data = []
          $.ajax({
                 method: "get",
@@ -193,17 +193,17 @@ const RemindMessage=Form.create()(React.createClass({
                 crossDomain: false,
                 url: globalConfig.context + "/api/admin/organization/selectSuperId",
                 data:{
-                  
+
                 },
-                success: function (data) {                	  
+                success: function (data) {
                 		let theArr = [];
 					    let thedata=data.data;
 					    if (!thedata) {
 		                    if (data.error && data.error.length) {
 		                        message.warning(data.error[0].message);
-		                    };	
-		                    thedata = {}; 
-		              };   
+		                    };
+		                    thedata = {};
+		              };
 					    var contactIds=[];
 				        //for (let item in data.data) {
 				        	for(var i=0;i<data.data.length;i++){
@@ -212,12 +212,12 @@ const RemindMessage=Form.create()(React.createClass({
 		                        <Select.Option value={i.toString()} key={theData.name}>{theData.name}</Select.Option>
 		                    );
 		                };
-						this.setState({	
+						this.setState({
 							SuperArr:thedata,
-		                    contactsOption: theArr, 
+		                    contactsOption: theArr,
 		                    orderStatusOptions:data.data,
 	                    });
-	                    
+
 					}.bind(this),
 				}).always(function () {
 				this.loadData();
@@ -228,7 +228,7 @@ const RemindMessage=Form.create()(React.createClass({
 	},
 	//编辑部门,保存
     edithandleSubmit(e){
-    	e.preventDefault();	
+    	e.preventDefault();
     	//上级组织字典
         let nameText=this.state.SuperArr
         let superText=this.state.editSuperId;
@@ -255,12 +255,12 @@ const RemindMessage=Form.create()(React.createClass({
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
 			            }
-			        }).done(function (data) { 
+			        }).done(function (data) {
 			            this.setState({
 			                loading: false
 			            });
 			            if (!data.error.length) {
-			                message.success('保存成功!'); 
+			                message.success('保存成功!');
 			                this.edithandleCancel();
 			                this.selectSuperId();
 			            } else {
@@ -284,19 +284,19 @@ const RemindMessage=Form.create()(React.createClass({
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
 			            }
-			        }).done(function (data) { 
+			        }).done(function (data) {
 			            this.setState({
 			                loading: false
 			            });
 			            if (!data.error.length) {
-			                message.success('保存成功!'); 
+			                message.success('保存成功!');
 			                this.edithandleCancel();
 			                this.selectSuperId();
 			            } else {
 			                message.warning(data.error[0].message);
 			            }
 			        }.bind(this));
-		        } 	
+		        }
     		}
     	}else{
     		if(!(superOne==superText)){
@@ -316,14 +316,14 @@ const RemindMessage=Form.create()(React.createClass({
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
 			            }
-			        }).done(function (data) { 
+			        }).done(function (data) {
 			            this.setState({
 			                loading: false
 			            });
 			            if (!data.error.length) {
-			                message.success('保存成功!'); 
+			                message.success('保存成功!');
 			                this.edithandleCancel();
-			                this.selectSuperId(); 
+			                this.selectSuperId();
 			            } else {
 			                message.warning(data.error[0].message);
 			            }
@@ -345,32 +345,32 @@ const RemindMessage=Form.create()(React.createClass({
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
 			            }
-			        }).done(function (data) { 
+			        }).done(function (data) {
 			            this.setState({
 			                loading: false
 			            });
 			            if (!data.error.length) {
-			                message.success('保存成功!'); 
+			                message.success('保存成功!');
 			                this.edithandleCancel();
 			                this.selectSuperId();
 			            } else {
 			                message.warning(data.error[0].message);
 			            }
 			        }.bind(this));
-		        } 
+		        }
     	}
-    },  
+    },
 	//整行点击
     tableRowClick(record, index) {
     	this.selectSuperId();
-    	this.state.RowData = record; 
+    	this.state.RowData = record;
         this.setState({
         	editvisible: true,
         	selectedRowKeys:[],
         	rowId:record.businessId,
-        })    
+        })
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context +"/api/admin/organization/selectAllById" ,
@@ -390,21 +390,21 @@ const RemindMessage=Form.create()(React.createClass({
                          editName:thisdata.name,//组织名称
                          editManagerId:thisdata.managerId,//负责人
                          editType:thisdata.type,//组织类型
-                         editStatus:thisdata.status,//组织状态 
+                         editStatus:thisdata.status,//组织状态
                          editSuperId:thisdata.superId,//上级组织
                          editDepNo: thisdata.depNo,//组织编号
                          editCreateId:thisdata.createId,//创建人
                          editTime:thisdata.createTime,//创建时间
                          editRemarks:thisdata.remarks,//组织职能说明
                     });
-                   
+
                 };
                 this.setState({
                 	 editId: thisdata.id,//每一条记录的ID
                 	 editName:thisdata.name,//组织名称
                      editManagerId:thisdata.managerId,//负责人
                      editType:thisdata.type,//组织类型
-                     editStatus:thisdata.status,//组织状态 
+                     editStatus:thisdata.status,//组织状态
                      editSuperId:thisdata.superId,//上级组织
                      editDepNo: thisdata.depNo,//组织编号
                      editCreateId:thisdata.createId,//创建人
@@ -454,7 +454,7 @@ const RemindMessage=Form.create()(React.createClass({
     },
     //新增一个部门,保存
     addhandleSubmit(e){
-    	e.preventDefault();	
+    	e.preventDefault();
     	if(!this.state.theTypes){
     		message.warning('请输入负责人姓名');
     		return false;
@@ -464,14 +464,14 @@ const RemindMessage=Form.create()(React.createClass({
     		return false;
     	}
     	if(!this.state.upOrganization){
-    		message.warning('请选择上级组织'); 
+    		message.warning('请选择上级组织');
     		return false;
     	}
-		this.props.form.validateFields((err, values) => {                                 
+		this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.setState({
                     loading: true
-                }); 
+                });
                 //上级组织字典
                 let nameText=this.state.SuperArr
                 let superText=nameText[parseInt(this.state.upOrganization)].name
@@ -487,12 +487,12 @@ const RemindMessage=Form.create()(React.createClass({
                         superId:superText,//上级组织
                         remarks:this.state.remarksOrganization,//组织职能说明
                     	}
-                }).done(function (data) { 
+                }).done(function (data) {
                     this.setState({
                         loading: false
                     });
                     if (!data.error.length) {
-                        message.success('保存成功!'); 
+                        message.success('保存成功!');
                         this.handleCancel();
                         this.selectSuperId();
                     } else {
@@ -502,9 +502,9 @@ const RemindMessage=Form.create()(React.createClass({
             }
         });
     },
-    
+
     //主管初始加载(自动补全)
-	supervisor(e){ 
+	supervisor(e){
 		$.ajax({
             method: "post",
             dataType: "json",
@@ -513,23 +513,23 @@ const RemindMessage=Form.create()(React.createClass({
             data:{
             	name:e
             },
-            success: function (data) {                	  
+            success: function (data) {
 				       let thedata=data.data;
 				    if (!thedata) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
-                    };	
-                    thedata = {}; 
-              }; 
+                    };
+                    thedata = {};
+              };
 					this.setState({
-						customerArr:thedata,	
+						customerArr:thedata,
                     });
 				}.bind(this),
 			}).always(function () {
             this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
 	},
 	//上级主管输入框失去焦点是判断客户是否存在
 	selectAuto(value,options){
@@ -538,7 +538,7 @@ const RemindMessage=Form.create()(React.createClass({
 		})
 	},
 	//失去焦点时
-	blurChange(e){	
+	blurChange(e){
 		this.setState({
 			theTypes:e
 		})
@@ -552,7 +552,7 @@ const RemindMessage=Form.create()(React.createClass({
 			this.loadData();
 		}
 		if(e == 2) {
-			
+
 		}
 	},
 	//切换创建系统消息中的指定发送对象
@@ -582,8 +582,8 @@ const RemindMessage=Form.create()(React.createClass({
 	//值改变时请求客户名称
 	httpChange(e){
 		if(e.length>=2){
-			this.supervisor(e); 
-		}	
+			this.supervisor(e);
+		}
 		this.setState({
 			managerIdOrganization:e
 		})
@@ -599,7 +599,7 @@ const RemindMessage=Form.create()(React.createClass({
             visible: true
         });
         this.selectSuperId();
-        
+
     },
     editClick() {
         this.state.RowData = {};
@@ -654,7 +654,7 @@ const RemindMessage=Form.create()(React.createClass({
 						            {item.areaList.map((item) => {
 										return(
 											<TreeNodet title={item.name} key={item.id} dataRef={item}>
-									            
+
 									        </TreeNodet>
 										);
 										})
@@ -665,7 +665,7 @@ const RemindMessage=Form.create()(React.createClass({
 			            }
 			        </TreeNodet>
 				);
-			
+
 			return <TreeNodet {...item} />;
 		});
 	},
@@ -678,7 +678,7 @@ const RemindMessage=Form.create()(React.createClass({
         this.state.name = '';//组织名称清零
         this.state.type = undefined;//组织类型清零
         this.state.depNo = '';//组织编号清零
-        this.loadData();       
+        this.loadData();
     },
     searchSwitch() {
         this.setState({
@@ -753,7 +753,7 @@ const RemindMessage=Form.create()(React.createClass({
 	                    </Select>
 	                    <Button type="primary" onClick={this.search} style={{marginRight:'10px'}}>搜索</Button>
 	                </div>
-	                
+
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
 	                        <Table columns={this.state.columns}
@@ -763,54 +763,54 @@ const RemindMessage=Form.create()(React.createClass({
 	                            onRowClick={this.tableRowClick} />
 	                    </Spin>
 	                </div>
-	             
+
 	                 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.visible}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel}
 	                        width='600px'
-	                        title='新建技淘智推'                       
+	                        title='新建技淘智推'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.addhandleSubmit} id="add-form">
 				                <Spin spinning={this.state.loading}>
 				                   <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 				                         	labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 18 }}
 				                           	label="推荐内容"
-				                         > 
-											  <Select placeholder="推荐内容" value={this.state.designatedObject} 
-				                                onSelect={this.changeObjects} style={{width:'95%'}} required="required"> 
+				                         >
+											  <Select placeholder="推荐内容" value={this.state.designatedObject}
+				                                onSelect={this.changeObjects} style={{width:'95%'}} required="required">
 				                                {
 				                                    featuredContent.map(function(item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                    })
 				                                }
-				                              </Select> 
+				                              </Select>
 				                              <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 				                   		 </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 				                         	labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 18 }}
 				                           	label="指定发送对象"
-				                         > 
-											  <Select placeholder="指定发送对象" value={this.state.designatedObject} 
-				                                onSelect={this.changeObjects} style={{width:'95%'}} required="required"> 
+				                         >
+											  <Select placeholder="指定发送对象" value={this.state.designatedObject}
+				                                onSelect={this.changeObjects} style={{width:'95%'}} required="required">
 				                                {
 				                                    designatedObjects.map(function(item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                    })
 				                                }
-				                              </Select> 
+				                              </Select>
 				                              <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 				                   		 </FormItem>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -819,37 +819,37 @@ const RemindMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.editvisible}
 	                        onOk={this.checkPatentProcess} onCancel={this.edithandleCancel}
 	                        width='600px'
-	                        title='编辑组织'                       
+	                        title='编辑组织'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.edithandleSubmit} id="edit-form">
 				                <Spin spinning={this.state.loading}>
 				                    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 					                            labelCol={{ span: 7 }}
 					                        	wrapperCol={{ span: 12 }}
 					                            label="组织名称" >
-				                    	     <Input placeholder="组织名称" value={this.state.editName} 
+				                    	     <Input placeholder="组织名称" value={this.state.editName}
 				                                onChange={(e)=>{this.setState({editName:e.target.value})}}/>
 					                    </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 					                            labelCol={{ span: 7 }}
 					                        	wrapperCol={{ span: 12}}
 					                            label="负责人" >
-					                             <Input placeholder="负责人" value={this.state.editManagerId} 
+					                             <Input placeholder="负责人" value={this.state.editManagerId}
 				                                onChange={(e)=>{this.setState({editManagerId:e.target.value})}}/>
 					                    </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-				                    	<FormItem  
+				                    	<FormItem
 				                         	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           	label="组织类型"
-				                         > 
-					                          <Select placeholder="组织类型" value={this.state.editType} 
-				                                onChange={(e)=>{this.setState({editType:e})}}> 
+				                         >
+					                          <Select placeholder="组织类型" value={this.state.editType}
+				                                onChange={(e)=>{this.setState({editType:e})}}>
 				                                {
 				                                    patternOrganization.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -859,13 +859,13 @@ const RemindMessage=Form.create()(React.createClass({
 				                   		 </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-				                    	<FormItem  
+				                    	<FormItem
 				                         	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           	label="组织状态"
-				                         > 
-					                          <Select placeholder="组织状态" value={this.state.editStatus} 
-				                                onChange={(e)=>{this.setState({editStatus:e})}}> 
+				                         >
+					                          <Select placeholder="组织状态" value={this.state.editStatus}
+				                                onChange={(e)=>{this.setState({editStatus:e})}}>
 				                                {
 				                                    conditionOrganization.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -875,20 +875,20 @@ const RemindMessage=Form.create()(React.createClass({
 				                   		 </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-					                    <FormItem  
+					                    <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="上级组织"
-			                               > 
+			                               >
 			                              <Select placeholder="请选择上级组织" value={this.state.editSuperId} onChange={(e)=>{this.setState({editSuperId:e})}}
 				                                notFoundContent="未获取到上级组织列表">
 				                                {this.state.contactsOption}
-				                            </Select> 
-				                            
+				                            </Select>
+
 			                   		    </FormItem>
 		                   		    </div>
 		                   		    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="组织编号"
@@ -897,7 +897,7 @@ const RemindMessage=Form.create()(React.createClass({
 					                    </FormItem>
 					                </div>
 					                <div className="clearfix" >
-				                    	<FormItem 
+				                    	<FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="创建人"
@@ -906,7 +906,7 @@ const RemindMessage=Form.create()(React.createClass({
 					                    </FormItem>
 					                </div>
 					                <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="创建时间"
@@ -918,25 +918,25 @@ const RemindMessage=Form.create()(React.createClass({
 			                   		    <FormItem
 					                        labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="组织职能说明" >					                        
+					                        label="组织职能说明" >
 					                        <Input type="textarea" rows={4} placeholder="组织职能说明" value={this.state.editRemarks}
-	                           				 	onChange={(e) => { this.setState({ editRemarks: e.target.value }) }}/>					                           
+	                           				 	onChange={(e) => { this.setState({ editRemarks: e.target.value }) }}/>
 					                    </FormItem>
-					                </div>    
+					                </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 				                   		<Button className="set-submit" type="ghost" onClick={this.edithandleCancel} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
                 	 </div>
-                	 
+
                 	 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.visible1}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel1}
 	                        width='1200px'
-	                        title='散户列表'                       
+	                        title='散户列表'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.addhandleSubmit} id="add-form">
@@ -947,7 +947,7 @@ const RemindMessage=Form.create()(React.createClass({
 					                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
 					                    <Input placeholder="所属人" style={{width:'150px',marginRight:'10px'}}
 					                        value={this.state.depNo}
-					                        onChange={(e) => { this.setState({ depNo: e.target.value }); }} />    
+					                        onChange={(e) => { this.setState({ depNo: e.target.value }); }} />
 					                    <Select placeholder="上级组织"
 				                            style={{ width:'150px',marginRight:'10px' }}
 				                            value={this.state.superId}
@@ -989,19 +989,19 @@ const RemindMessage=Form.create()(React.createClass({
 					                    </Select>
 						                <span style={{marginRight:'10px',width:'150px',display:'inline-block'}}>
 					                     	<Cascader options={provinceSelect()}  style={{marginRight:'10px',width:'150px',display:'inlineBlock'}} value={this.state.ressSearch} placeholder="选择省份"
-				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
 			                    		</span>
-			                    		<span style={{marginRight:'10px',width:'150px',display:'inline-block'}}>                   
+			                    		<span style={{marginRight:'10px',width:'150px',display:'inline-block'}}>
 					                     	<Cascader options={citySelect()}  style={{marginRight:'10px',width:'150px',display:'inlineBlock'}} value={this.state.ressSearch} placeholder="选择城市"
-				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
 			                    		</span>
 				                    	<span style={{marginRight:'10px',width:'150px',display:'inline-block',marginBottom:'10px'}}>
 					                     	<Cascader options={areaSelect()}  style={{marginRight:'10px',width:'150px',display:'inlineBlock'}} value={this.state.ressSearch} placeholder="选择地区"
-				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+				    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
 			                    		</span>
-				                    	
-					                    
-					                    
+
+
+
 					                    <Button type="primary" onClick={this.search} style={{marginRight:'10px'}}>搜索</Button>
 					                    <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
 					                </div>
@@ -1015,9 +1015,9 @@ const RemindMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel1} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -1026,18 +1026,18 @@ const RemindMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible2}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel2}
 	                        width='600px'
-	                        title='社会属性'                       
+	                        title='社会属性'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.addhandleSubmit} id="add-form">
 				                <Spin spinning={this.state.loading}>
-				                    <FormItem  
+				                    <FormItem
 			                         	labelCol={{ span: 7 }}
 				                        wrapperCol={{ span: 12 }}
 			                           	label="请选择社会属性"
-			                         > 
-				                          <div  value={this.state.editStatus} 
-			                                onChange={(e)=>{this.setState({editStatus:e})}}> 
+			                         >
+				                          <div  value={this.state.editStatus}
+			                                onChange={(e)=>{this.setState({editStatus:e})}}>
 			                                {
 			                                    socialAttribute.map(function (item) {
 			                                        return <Checkbox key={item.value} >{item.key}</Checkbox>
@@ -1046,9 +1046,9 @@ const RemindMessage=Form.create()(React.createClass({
 			                              </div>
 			                   		 </FormItem>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel2} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -1057,7 +1057,7 @@ const RemindMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible3}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel3}
 	                        width='1200px'
-	                        title='分公司列表'                       
+	                        title='分公司列表'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.addhandleSubmit} id="add-form">
@@ -1072,9 +1072,9 @@ const RemindMessage=Form.create()(React.createClass({
 				                        </Spin>
 				                    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel3} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -1083,7 +1083,7 @@ const RemindMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible4}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel4}
 	                        width='600px'
-	                        title='地区'                       
+	                        title='地区'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.addhandleSubmit} id="add-form">
@@ -1103,9 +1103,9 @@ const RemindMessage=Form.create()(React.createClass({
 									      </Tree>
 					                </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel4} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
@@ -1114,18 +1114,18 @@ const RemindMessage=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.visible5}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel5}
 	                        width='600px'
-	                        title='行业'                       
+	                        title='行业'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.addhandleSubmit} id="add-form">
 				                <Spin spinning={this.state.loading}>
-				                    <FormItem  
+				                    <FormItem
 			                         	labelCol={{ span: 7 }}
 				                        wrapperCol={{ span: 12 }}
 			                           	label="请选择行业"
-			                         > 
-				                          <div  value={this.state.editStatus} 
-			                                onChange={(e)=>{this.setState({editStatus:e})}}> 
+			                         >
+				                          <div  value={this.state.editStatus}
+			                                onChange={(e)=>{this.setState({editStatus:e})}}>
 			                                {
 			                                    industry.map(function (item) {
 			                                        return <Checkbox key={item.value} >{item.key}</Checkbox>
@@ -1134,17 +1134,17 @@ const RemindMessage=Form.create()(React.createClass({
 			                              </div>
 			                   		 </FormItem>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel5} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
                 	 </div>
-                	 
-                	 
-                	 
-                	 
+
+
+
+
             	</div>
             </div>
         );

+ 4 - 4
js/component/manageCenter/operate/personnel/personnelAll.jsx

@@ -191,7 +191,7 @@ const PersonnelAll = React.createClass({
                   style={{ margin: "0 10px" }}
                   disabled={record.splitStatus == 1 ? true : false}
                   onClick={(e) => {
-                    e.stopPropagation(), this.evaluate(record, "咨询师经理");
+                    e.stopPropagation(), this.evaluate(record, "技术经理");
                   }}
                 >
                   转交
@@ -201,7 +201,7 @@ const PersonnelAll = React.createClass({
                   style={{ margin: "0 10px" }}
                   disabled={record.splitStatus == 1 ? true : false}
                   onClick={(e) => {
-                    e.stopPropagation(), this.evaluate(record, "咨询师");
+                    e.stopPropagation(), this.evaluate(record, "技术员");
                   }}
                 >
                   分配任务
@@ -691,7 +691,7 @@ const PersonnelAll = React.createClass({
                     style={{ margin: "0 10px" }}
                     disabled={record.distributeSign == 1 ? true : false}
                     onClick={(e) => {
-                      e.stopPropagation(), this.evaluate(record, "咨询师经理");
+                      e.stopPropagation(), this.evaluate(record, "技术经理");
                     }}
                   >
                     转交
@@ -701,7 +701,7 @@ const PersonnelAll = React.createClass({
                     style={{ margin: "0 10px" }}
                     disabled={record.distributeSign == 1 ? true : false}
                     onClick={(e) => {
-                      e.stopPropagation(), this.evaluate(record, "咨询师");
+                      e.stopPropagation(), this.evaluate(record, "技术员");
                     }}
                   >
                     分配任务

+ 21 - 20
js/component/manageCenter/order/orderNew/addService.jsx

@@ -148,6 +148,7 @@ const NewService = Form.create()(
     },
     getInitialState() {
       return {
+        orderType:0,
         rotateDeg: 0,
         isCaoGao: false,
         cuiFlag: false,
@@ -1774,7 +1775,7 @@ const NewService = Form.create()(
         data: !this.props.userDetaile
           ? {
               uid: this.state.autoId,
-              orderType: this.state.orderType,
+              orderType: 0,
             }
           : {
               orderNo: this.state.orderNo, //订单编号
@@ -4317,25 +4318,25 @@ const NewService = Form.create()(
                   {!this.props.userDetaile ? (
                     <div className="clearfix">
                       <div className="clearfix">
-                        <FormItem {...formItemLayout} label="订单类型">
-                          <Select
-                            placeholder="请选择订单类型"
-                            style={{ width: "200px" }}
-                            value={this.state.orderType}
-                            onChange={(e) => {
-                              this.setState({ orderType: e });
-                            }}
-                          >
-                            {orderTypes.map(function (item) {
-                              return (
-                                <Select.Option key={item.value}>
-                                  {item.key}
-                                </Select.Option>
-                              );
-                            })}
-                          </Select>
-                          <span className="mandatory">*</span>
-                        </FormItem>
+                        {/*<FormItem {...formItemLayout} label="订单类型">*/}
+                        {/*  <Select*/}
+                        {/*    placeholder="请选择订单类型"*/}
+                        {/*    style={{ width: "200px" }}*/}
+                        {/*    value={this.state.orderType}*/}
+                        {/*    onChange={(e) => {*/}
+                        {/*      this.setState({ orderType: e });*/}
+                        {/*    }}*/}
+                        {/*  >*/}
+                        {/*    {orderTypes.map(function (item) {*/}
+                        {/*      return (*/}
+                        {/*        <Select.Option key={item.value}>*/}
+                        {/*          {item.key}*/}
+                        {/*        </Select.Option>*/}
+                        {/*      );*/}
+                        {/*    })}*/}
+                        {/*  </Select>*/}
+                        {/*  <span className="mandatory">*</span>*/}
+                        {/*</FormItem>*/}
                       </div>
                       <FormItem {...formItemLayout} label="客户所属类型">
                         <Select

+ 28 - 28
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -780,11 +780,11 @@ const IntentionCustomer = Form.create()(
             dataIndex: "settlementAmount",
             key: "settlementAmount",
           },
-          {
-            title: "应收款",
-            dataIndex: "accountsReceivable",
-            key: "accountsReceivable",
-          },
+          // {
+          //   title: "应收款",
+          //   dataIndex: "accountsReceivable",
+          //   key: "accountsReceivable",
+          // },
           {
             title: "催收科目",
             dataIndex: "dunSubject",
@@ -901,16 +901,16 @@ const IntentionCustomer = Form.create()(
             dataIndex: "taskComment",
             key: "taskComment",
           },
-          {
-            title: "外包(内部)公司",
-            dataIndex: "outsourceName",
-            key: "outsourceName",
-          },
-          {
-            title: "外包(内部)价格",
-            dataIndex: "outsourcePrice",
-            key: "outsourcePrice",
-          },
+          // {
+          //   title: "外包(内部)公司",
+          //   dataIndex: "outsourceName",
+          //   key: "outsourceName",
+          // },
+          // {
+          //   title: "外包(内部)价格",
+          //   dataIndex: "outsourcePrice",
+          //   key: "outsourcePrice",
+          // },
         ],
       };
     },
@@ -2045,19 +2045,19 @@ const IntentionCustomer = Form.create()(
               >
                 打印工时信息
               </Button>
-              <Button
-                type="primary"
-                disabled={this.state.selectedRowKeys.length != 1}
-                style={{ margin: "11px 0px 10px 10px" }}
-                onClick={() => {
-                  this.cuiData();
-                  this.setState({
-                    cuiVisible: true,
-                  });
-                }}
-              >
-                打印催款信息
-              </Button>
+              {/*<Button*/}
+              {/*  type="primary"*/}
+              {/*  disabled={this.state.selectedRowKeys.length != 1}*/}
+              {/*  style={{ margin: "11px 0px 10px 10px" }}*/}
+              {/*  onClick={() => {*/}
+              {/*    this.cuiData();*/}
+              {/*    this.setState({*/}
+              {/*      cuiVisible: true,*/}
+              {/*    });*/}
+              {/*  }}*/}
+              {/*>*/}
+              {/*  打印催款信息*/}
+              {/*</Button>*/}
               <Button
                 type="primary"
                 disabled={this.state.selectedRowKeys.length != 1}

+ 10 - 10
js/component/manageCenter/order/orderNew/arrearsList.jsx

@@ -163,16 +163,16 @@ const ArrearsList = Form.create()(
             dataIndex: "settlementAmount",
             key: "settlementAmount",
           },
-          {
-            title: "应收款(万元)",
-            dataIndex: "orderReceivables",
-            key: "orderReceivables",
-          },
-          {
-            title: "欠款(万元)",
-            dataIndex: "orderArrears",
-            key: "orderArrears",
-          },
+          // {
+          //   title: "应收款(万元)",
+          //   dataIndex: "orderReceivables",
+          //   key: "orderReceivables",
+          // },
+          // {
+          //   title: "欠款(万元)",
+          //   dataIndex: "orderArrears",
+          //   key: "orderArrears",
+          // },
           {
             title: "结算状态",
             dataIndex: "liquidationStatus",

+ 31 - 31
js/component/manageCenter/order/orderNew/billing.jsx

@@ -280,11 +280,11 @@ const MyService = Form.create()(
             dataIndex: "settlementAmount",
             key: "settlementAmount"
           },
-          {
-            title: "应收款",
-            dataIndex: "accountsReceivable",
-            key: "accountsReceivable"
-          },
+          // {
+          //   title: "应收款",
+          //   dataIndex: "accountsReceivable",
+          //   key: "accountsReceivable"
+          // },
           {
             title: "催收科目",
             dataIndex: "dunSubject",
@@ -384,19 +384,19 @@ const MyService = Form.create()(
             dataIndex: "taskComment",
             key: "taskComment"
           },
-          {
-            title: "外包(内部)公司",
-            dataIndex: "outsourceName",
-            key: "outsourceName"
-          },
-          {
-            title: "外包(内部)价格",
-            dataIndex: "outsourcePrice",
-            key: "outsourcePrice",
-            render: text => {
-              return "****";
-            }
-          }
+          // {
+          //   title: "外包(内部)公司",
+          //   dataIndex: "outsourceName",
+          //   key: "outsourceName"
+          // },
+          // {
+          //   title: "外包(内部)价格",
+          //   dataIndex: "outsourcePrice",
+          //   key: "outsourcePrice",
+          //   render: text => {
+          //     return "****";
+          //   }
+          // }
         ],
         columns: [
           {
@@ -1822,19 +1822,19 @@ const MyService = Form.create()(
                 >
                   查看开票记录
                 </Button>
-                <Button
-                  type="primary"
-                  style={{ margin: "11px 0px 10px 10px" }}
-                  onClick={() => {
-                    this.cuiData();
-                    this.setState({
-                      cuiVisible: true
-                    });
-                  }}
-                  disabled={this.state.selectedRowKeys.length != 1}
-                >
-                  查看催款详情
-                </Button>
+                {/*<Button*/}
+                {/*  type="primary"*/}
+                {/*  style={{ margin: "11px 0px 10px 10px" }}*/}
+                {/*  onClick={() => {*/}
+                {/*    this.cuiData();*/}
+                {/*    this.setState({*/}
+                {/*      cuiVisible: true*/}
+                {/*    });*/}
+                {/*  }}*/}
+                {/*  disabled={this.state.selectedRowKeys.length != 1}*/}
+                {/*>*/}
+                {/*  查看催款详情*/}
+                {/*</Button>*/}
                 <Button
                   type="primary"
                   style={{ margin: "11px 0px 10px 10px" }}

+ 3 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -893,7 +893,7 @@ class ChangeDetail extends Component {
                   display: this.props.processState >= 3 ? "block" : "none",
                 }}
               >
-                咨询师
+                技术员
               </Option>
               <Option
                 value="3"
@@ -901,7 +901,7 @@ class ChangeDetail extends Component {
                   display: this.props.processState >= 4 ? "block" : "none",
                 }}
               >
-                咨询师经理
+                技术经理
               </Option>
               <Option
                 value="4"
@@ -909,7 +909,7 @@ class ChangeDetail extends Component {
                   display: this.props.processState >= 5 ? "block" : "none",
                 }}
               >
-                咨询师总监
+                技术总监
               </Option>
               <Option
                 value="5"

+ 3 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -1726,7 +1726,7 @@ class ChangeDetail extends Component {
                     display: this.props.processState >= 3 ? "block" : "none",
                   }}
                 >
-                  咨询师
+                  技术员
                 </Option>
                 <Option
                   value="3"
@@ -1734,7 +1734,7 @@ class ChangeDetail extends Component {
                     display: this.props.processState >= 4 ? "block" : "none",
                   }}
                 >
-                  咨询师经理
+                  技术经理
                 </Option>
                 <Option
                   value="4"
@@ -1742,7 +1742,7 @@ class ChangeDetail extends Component {
                     display: this.props.processState >= 5 ? "block" : "none",
                   }}
                 >
-                  咨询师总监
+                  技术总监
                 </Option>
                 <Option
                   value="5"

+ 7 - 7
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -643,8 +643,8 @@ class ChangeDetail extends Component {
             })}
           </div>
 
-          {/* 
-          
+          {/*
+
             (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
@@ -655,8 +655,8 @@ class ChangeDetail extends Component {
               })}
             </div>
           )
-          
-          
+
+
           */}
           {/* {this.props.data.processState >= 4 ? (
             ""
@@ -814,7 +814,7 @@ class ChangeDetail extends Component {
                     display: this.props.processState >= 3 ? "block" : "none",
                   }}
                 >
-                  咨询师
+                  技术员
                 </Option>
                 <Option
                   value="3"
@@ -822,7 +822,7 @@ class ChangeDetail extends Component {
                     display: this.props.processState >= 4 ? "block" : "none",
                   }}
                 >
-                  咨询师经理
+                  技术经理
                 </Option>
                 <Option
                   value="4"
@@ -830,7 +830,7 @@ class ChangeDetail extends Component {
                     display: this.props.processState >= 5 ? "block" : "none",
                   }}
                 >
-                  咨询师总监
+                  技术总监
                 </Option>
                 <Option
                   value="5"

+ 3 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -665,7 +665,7 @@ class ChangeDetail extends Component {
                   display: this.props.processState >= 3 ? "block" : "none",
                 }}
               >
-                咨询师
+                技术员
               </Option>
               <Option
                 value="3"
@@ -673,7 +673,7 @@ class ChangeDetail extends Component {
                   display: this.props.processState >= 4 ? "block" : "none",
                 }}
               >
-                咨询师经理
+                技术经理
               </Option>
               <Option
                 value="4"
@@ -681,7 +681,7 @@ class ChangeDetail extends Component {
                   display: this.props.processState >= 5 ? "block" : "none",
                 }}
               >
-                咨询师总监
+                技术总监
               </Option>
               <Option
                 value="5"

+ 3 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -749,7 +749,7 @@ class ChangeDetail extends Component {
                   display: this.props.processState >= 3 ? "block" : "none",
                 }}
               >
-                咨询师
+                技术员
               </Option>
               <Option
                 value="3"
@@ -757,7 +757,7 @@ class ChangeDetail extends Component {
                   display: this.props.processState >= 4 ? "block" : "none",
                 }}
               >
-                咨询师经理
+                技术经理
               </Option>
               <Option
                 value="4"
@@ -765,7 +765,7 @@ class ChangeDetail extends Component {
                   display: this.props.processState >= 5 ? "block" : "none",
                 }}
               >
-                咨询师总监
+                技术总监
               </Option>
               <Option
                 value="5"

+ 5 - 5
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -195,11 +195,11 @@ const contractChange = Form.create()(
             dataIndex: "settlementAmount",
             key: "settlementAmount"
           },
-          {
-            title: "欠款(万元)",
-            dataIndex: "arrears",
-            key: "arrears"
-          },
+          // {
+          //   title: "欠款(万元)",
+          //   dataIndex: "arrears",
+          //   key: "arrears"
+          // },
           {
             title: "订单负责人",
             dataIndex: "salesmanName",

+ 5 - 5
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -192,11 +192,11 @@ const contractChange = Form.create()(
             dataIndex: "settlementAmount",
             key: "settlementAmount"
           },
-          {
-            title: "欠款(万元)",
-            dataIndex: "arrears",
-            key: "arrears"
-          },
+          // {
+          //   title: "欠款(万元)",
+          //   dataIndex: "arrears",
+          //   key: "arrears"
+          // },
           {
             title: "订单负责人",
             dataIndex: "salesmanName",

+ 5 - 5
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -185,11 +185,11 @@ const contractChange = Form.create()(
             dataIndex: "settlementAmount",
             key: "settlementAmount"
           },
-          {
-            title: "欠款(万元)",
-            dataIndex: "arrears",
-            key: "arrears"
-          },
+          // {
+          //   title: "欠款(万元)",
+          //   dataIndex: "arrears",
+          //   key: "arrears"
+          // },
           {
             title: "订单负责人",
             dataIndex: "salesmanName",

+ 18 - 18
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -500,11 +500,11 @@ const IntentionCustomer = Form.create()(
             dataIndex: "settlementAmount",
             key: "settlementAmount",
           },
-          {
-            title: "应收款",
-            dataIndex: "accountsReceivable",
-            key: "accountsReceivable",
-          },
+          // {
+          //   title: "应收款",
+          //   dataIndex: "accountsReceivable",
+          //   key: "accountsReceivable",
+          // },
           {
             title: "催收科目",
             dataIndex: "dunSubject",
@@ -624,19 +624,19 @@ const IntentionCustomer = Form.create()(
             dataIndex: "taskComment",
             key: "taskComment",
           },
-          {
-            title: "外包(内部)公司",
-            dataIndex: "outsourceName",
-            key: "outsourceName",
-          },
-          {
-            title: "外包(内部)价格",
-            dataIndex: "outsourcePrice",
-            key: "outsourcePrice",
-            render: (text) => {
-              return "****";
-            },
-          },
+          // {
+          //   title: "外包(内部)公司",
+          //   dataIndex: "outsourceName",
+          //   key: "outsourceName",
+          // },
+          // {
+          //   title: "外包(内部)价格",
+          //   dataIndex: "outsourcePrice",
+          //   key: "outsourcePrice",
+          //   render: (text) => {
+          //     return "****";
+          //   },
+          // },
         ],
         columns: [
           {

+ 5 - 5
js/component/manageCenter/order/orderNew/press.jsx

@@ -225,11 +225,11 @@ const IntentionCustomer = Form.create()(React.createClass({
         //     return getjiedian(text);
         //   }
       },
-      {
-        title: "应收款(万元)",
-        dataIndex: "accountsReceivable",
-        key: "accountsReceivable"
-      },
+      // {
+      //   title: "应收款(万元)",
+      //   dataIndex: "accountsReceivable",
+      //   key: "accountsReceivable"
+      // },
       {
         title: "催款状态",
         dataIndex: "dunStatus",

+ 5 - 5
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -226,11 +226,11 @@ const IntentionCustomer = Form.create()(React.createClass({
           //   return getjiedian(text);
           // }
         },
-        {
-          title: "应收款(万元)",
-          dataIndex: "accountsReceivable",
-          key: "accountsReceivable"
-        },
+        // {
+        //   title: "应收款(万元)",
+        //   dataIndex: "accountsReceivable",
+        //   key: "accountsReceivable"
+        // },
         {
           title: "催款状态",
           dataIndex: "dunStatus",

+ 5 - 5
js/component/manageCenter/personnel/personnel/personnelAll.jsx

@@ -208,7 +208,7 @@ const PersonnelAll = React.createClass({
                   style={{ margin: "0 10px" }}
                   disabled={record.splitStatus == 1 ? true : false}
                   onClick={(e) => {
-                    e.stopPropagation(), this.evaluate(record, "咨询师经理");
+                    e.stopPropagation(), this.evaluate(record, "技术经理");
                   }}
                 >
                   转交
@@ -218,7 +218,7 @@ const PersonnelAll = React.createClass({
                   style={{ margin: "0 10px" }}
                   disabled={record.splitStatus == 1 ? true : false}
                   onClick={(e) => {
-                    e.stopPropagation(), this.evaluate(record, "咨询师");
+                    e.stopPropagation(), this.evaluate(record, "技术员");
                   }}
                 >
                   分配任务
@@ -702,7 +702,7 @@ const PersonnelAll = React.createClass({
                     style={{ margin: "0 10px" }}
                     disabled={record.distributeSign == 1 ? true : false}
                     onClick={(e) => {
-                      e.stopPropagation(), this.evaluate(record, "咨询师经理");
+                      e.stopPropagation(), this.evaluate(record, "技术经理");
                     }}
                   >
                     转交
@@ -712,7 +712,7 @@ const PersonnelAll = React.createClass({
                     style={{ margin: "0 10px" }}
                     disabled={record.distributeSign == 1 ? true : false}
                     onClick={(e) => {
-                      e.stopPropagation(), this.evaluate(record, "咨询师");
+                      e.stopPropagation(), this.evaluate(record, "技术员");
                     }}
                   >
                     分配任务
@@ -854,7 +854,7 @@ const PersonnelAll = React.createClass({
           showDesc={this.state.assignVisible}
           closeDesc={this.closeAssign.bind(this)}
           fenpaiData={8}
-          specially={this.state.nub == "咨询师经理" ? 1 : 0}
+          specially={this.state.nub == "技术经理" ? 1 : 0}
           roleName={this.state.nub}
           requestMethod={"post"}
         />

+ 1 - 1
js/component/manageCenter/project/project/enterpriseProjectQuery.jsx

@@ -99,7 +99,7 @@ class EnterpriseProjectQuery extends Component{
                     key: "techDepName",
                 },
                 {
-                    title: "咨询师/咨询经理",
+                    title: "技术员/咨询经理",
                     dataIndex: "techName",
                     key: "techName",
                 },

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

@@ -1165,7 +1165,7 @@ const PaiDan = React.createClass({
           closeDesc={this.closeAssign.bind(this)}
           fenpaiData={8}
           specially={1}
-          roleName={"咨询师经理"}
+          roleName={"技术经理"}
           requestMethod={"post"}
           reset={this.reset}
         />

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

@@ -830,7 +830,7 @@ const PaiDan = React.createClass({
           closeDesc={this.closeAssign.bind(this)}
           fenpaiData={8}
           specially={1}
-          roleName={"咨询师经理"}
+          roleName={"技术经理"}
         />
         {this.state.visible ? <Modal
           className="customeDetails"

+ 5 - 5
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -63,7 +63,7 @@ const highTechColumns =[
         key: "techDepName"
     },
     {
-        title: "咨询师/咨询经理",
+        title: "技术员/咨询经理",
         dataIndex: "techName",
         key: "techName"
     },
@@ -205,7 +205,7 @@ const doubleSoft = [
         key: "techDepName"
     },
     {
-        title: "咨询师/咨询经理",
+        title: "技术员/咨询经理",
         dataIndex: "techName",
         key: "techName"
     },
@@ -314,7 +314,7 @@ const softWriting = [
         key: "techDepName"
     },
     {
-        title: "咨询师/咨询经理",
+        title: "技术员/咨询经理",
         dataIndex: "techName",
         key: "techName"
     },
@@ -462,7 +462,7 @@ const patent =[
         key: "techDepName"
     },
     {
-        title: "咨询师/咨询经理",
+        title: "技术员/咨询经理",
         dataIndex: "techName",
         key: "techName"
     },
@@ -627,7 +627,7 @@ const currency = [
         key: "techDepName"
     },
     {
-        title: "咨询师/咨询经理",
+        title: "技术员/咨询经理",
         dataIndex: "techName",
         key: "techName"
     },

+ 30 - 30
js/component/manageCenter/project/summary/projecCountConfig.jsx

@@ -93,11 +93,11 @@ const highTechColumns =(fn)=> [
         dataIndex: "amountCount",
         key: "amountCount",
     },
-    {
-        title: "成本(万元)",
-        dataIndex: "costAmount",
-        key: "costAmount",
-    },
+    // {
+    //     title: "成本(万元)",
+    //     dataIndex: "costAmount",
+    //     key: "costAmount",
+    // },
     {
         title: "利润(万元)",
         dataIndex: "profit",
@@ -203,11 +203,11 @@ const invention =(fn)=> [
         dataIndex: "amountCount",
         key: "amountCount",
     },
-    {
-        title: "成本(万元)",
-        dataIndex: "costAmount",
-        key: "costAmount",
-    },
+    // {
+    //     title: "成本(万元)",
+    //     dataIndex: "costAmount",
+    //     key: "costAmount",
+    // },
     {
         title: "利润(万元)",
         dataIndex: "profit",
@@ -308,11 +308,11 @@ const utilityModel =(fn)=> [
         dataIndex: "amountCount",
         key: "amountCount",
     },
-    {
-        title: "成本(万元)",
-        dataIndex: "costAmount",
-        key: "costAmount",
-    },
+    // {
+    //     title: "成本(万元)",
+    //     dataIndex: "costAmount",
+    //     key: "costAmount",
+    // },
     {
         title: "利润(万元)",
         dataIndex: "profit",
@@ -380,11 +380,11 @@ const softWriting =(fn)=> [
         dataIndex: "amountCount",
         key: "amountCount",
     },
-    {
-        title: "成本(万元)",
-        dataIndex: "costAmount",
-        key: "costAmount",
-    },
+    // {
+    //     title: "成本(万元)",
+    //     dataIndex: "costAmount",
+    //     key: "costAmount",
+    // },
     {
         title: "利润(万元)",
         dataIndex: "profit",
@@ -474,11 +474,11 @@ const otherTrademarks =(fn)=> [
         dataIndex: "amountCount",
         key: "amountCount",
     },
-    {
-        title: "成本(万元)",
-        dataIndex: "costAmount",
-        key: "costAmount",
-    },
+    // {
+    //     title: "成本(万元)",
+    //     dataIndex: "costAmount",
+    //     key: "costAmount",
+    // },
     {
         title: "利润(万元)",
         dataIndex: "profit",
@@ -557,11 +557,11 @@ const currency =(fn)=> [
         dataIndex: "amountCount",
         key: "amountCount",
     },
-    {
-        title: "成本(万元)",
-        dataIndex: "costAmount",
-        key: "costAmount",
-    },
+    // {
+    //     title: "成本(万元)",
+    //     dataIndex: "costAmount",
+    //     key: "costAmount",
+    // },
     {
         title: "利润(万元)",
         dataIndex: "profit",

+ 22 - 14
js/component/manageCenter/project/task/myTask.jsx

@@ -358,18 +358,18 @@ const Task = React.createClass({
           dataIndex: "commodityPrice",
           key: "commodityPrice",
         },
-        {
-          title: "外包成本(万元)",
-          dataIndex: "costAmount",
-          key: "costAmount",
-          render: (text, record) => {
-            return (<span>
-              {
-                isNaN(parseFloat(text)) ? text : parseFloat(text)
-              }
-            </span>)
-          }
-        },
+        // {
+        //   title: "外包成本(万元)",
+        //   dataIndex: "costAmount",
+        //   key: "costAmount",
+        //   render: (text, record) => {
+        //     return (<span>
+        //       {
+        //         isNaN(parseFloat(text)) ? text : parseFloat(text)
+        //       }
+        //     </span>)
+        //   }
+        // },
         {
           title: "已付(万元)",
           dataIndex: "partyAmount",
@@ -392,7 +392,7 @@ const Task = React.createClass({
                   <Button
                       type="primary"
                       onClick={(e) => {
-                        e.stopPropagation(), this.evaluate(record, '咨询师')
+                        e.stopPropagation(), this.evaluate(record, '技术员')
                       }}
                   >
                     转交
@@ -402,7 +402,7 @@ const Task = React.createClass({
                       style={{ marginLeft: 10 }}
                       onClick={(e) => {
                         e.stopPropagation(),
-                            this.evaluate(record, '咨询师经理', true)
+                            this.evaluate(record, '技术经理', true)
                       }}
                   >
                     回退
@@ -3567,6 +3567,10 @@ const Task = React.createClass({
                 background: 'rgba(0,0,0,0.7)',
                 borderRadius: '4px',
                 borderTopRightRadius: '96px',
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0,
               }}>
                 <Button
                     type="primary"
@@ -5139,6 +5143,10 @@ const Task = React.createClass({
                 background: 'rgba(0,0,0,0.7)',
                 borderRadius: '4px',
                 borderTopRightRadius: '96px',
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0,
               }}>
                 <Button
                     type="primary"

+ 10 - 10
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -289,16 +289,16 @@ const MyTaskCount = Form.create()(
             dataIndex: "commodityPrice",
             key: "commodityPrice"
           },
-          {
-            title: "实际成本(万元)",
-            dataIndex: "costAmount",
-            key: "costAmount"
-          },
-          {
-            title: "已付成本(万元)",
-            dataIndex: "partyAmount",
-            key: "partyAmount"
-          },
+          // {
+          //   title: "实际成本(万元)",
+          //   dataIndex: "costAmount",
+          //   key: "costAmount"
+          // },
+          // {
+          //   title: "已付成本(万元)",
+          //   dataIndex: "partyAmount",
+          //   key: "partyAmount"
+          // },
           {
             title: "数量(个)",
             dataIndex: "commodityQuantity",

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

@@ -202,7 +202,7 @@ const Task = React.createClass({
                   style={{ margin: "0 10px" }}
                   disabled={record.splitStatus == 1 ? true : false}
                   onClick={(e) => {
-                    e.stopPropagation(), this.evaluate(record, "咨询师经理");
+                    e.stopPropagation(), this.evaluate(record, "技术经理");
                   }}
                 >
                   转交
@@ -212,7 +212,7 @@ const Task = React.createClass({
                   style={{ margin: "0 10px" }}
                   disabled={record.splitStatus == 1 ? true : false}
                   onClick={(e) => {
-                    e.stopPropagation(), this.evaluate(record, "咨询师");
+                    e.stopPropagation(), this.evaluate(record, "技术员");
                   }}
                 >
                   分配任务
@@ -875,7 +875,7 @@ const Task = React.createClass({
                     style={{ margin: "0 10px" }}
                     disabled={record.distributeSign == 1 ? true : false}
                     onClick={(e) => {
-                      e.stopPropagation(), this.evaluate(record, "咨询师经理");
+                      e.stopPropagation(), this.evaluate(record, "技术经理");
                     }}
                   >
                     转交
@@ -885,7 +885,7 @@ const Task = React.createClass({
                     style={{ margin: "0 10px" }}
                     disabled={record.distributeSign == 1 ? true : false}
                     onClick={(e) => {
-                      e.stopPropagation(), this.evaluate(record, "咨询师");
+                      e.stopPropagation(), this.evaluate(record, "技术员");
                     }}
                   >
                     分配任务
@@ -1043,7 +1043,7 @@ const Task = React.createClass({
           showDesc={this.state.assignVisible}
           closeDesc={this.closeAssign.bind(this)}
           fenpaiData={8}
-          specially={this.state.nub == "咨询师经理" ? 1 : 0}
+          specially={this.state.nub == "技术经理" ? 1 : 0}
           // 判断是转交按钮还是分配任务按钮
           // chooseBtn={this.state.nub == "咨询师经理" ? true : false}
           roleName={this.state.nub}

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

@@ -250,16 +250,16 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityPrice",
             key: "commodityPrice"
           },
-          {
-            title: "实际成本(万元)",
-            dataIndex: "costAmount",
-            key: "costAmount"
-          },
-          {
-            title: "已付成本(万元)",
-            dataIndex: "partyAmount",
-            key: "partyAmount"
-          },
+          // {
+          //   title: "实际成本(万元)",
+          //   dataIndex: "costAmount",
+          //   key: "costAmount"
+          // },
+          // {
+          //   title: "已付成本(万元)",
+          //   dataIndex: "partyAmount",
+          //   key: "partyAmount"
+          // },
           {
             title: "数量(个)",
             dataIndex: "commodityQuantity",

+ 119 - 119
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -32,14 +32,14 @@ const MySettlementDetaile = Form.create()(React.createClass({
                         theArr.push({
                              key:i,
                              taskId:thisdata.taskId,
-                             commodityName:thisdata.commodityName, 
-                             commodityQuantity:thisdata.commodityQuantity, 
-                             technicianName:thisdata.technicianName, 
-                             technicianMobile:thisdata.technicianMobile, 
-                             taskStatus:thisdata.taskStatus, 
-                             deleteSign:thisdata.deleteSign, 
-                             taskComment:thisdata.taskComment, 
-                             publishStatus:thisdata.publishStatus, 
+                             commodityName:thisdata.commodityName,
+                             commodityQuantity:thisdata.commodityQuantity,
+                             technicianName:thisdata.technicianName,
+                             technicianMobile:thisdata.technicianMobile,
+                             taskStatus:thisdata.taskStatus,
+                             deleteSign:thisdata.deleteSign,
+                             taskComment:thisdata.taskComment,
+                             publishStatus:thisdata.publishStatus,
                         });
                     };
                    }
@@ -115,9 +115,9 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     	return (
                     		<div style={{display:!this.props.queryProject?'block':'none'}}>
 								{record.taskStatus<=1&&<Popconfirm title={'您将删除项目任务 【'+record.commodityName+'】,系统将自动同步作废项目资料单,请确认!'} onConfirm={(e)=>{this.voidOperation(record)}} okText="确认" cancelText="取消">
-							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>                 
+							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>
 								</Popconfirm>}
-							   	{record.taskStatus<1&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>}                 
+							   	{record.taskStatus<1&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>}
 							</div>
 							)
                     }
@@ -151,10 +151,10 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     render:(text,record,index)=>{
                     	return (
 	                    		<div>{this.state.transferState?<Popconfirm title={'您确认转交给【'+record.departmentName+'-'+record.name+'】'} onConfirm={(e)=>{this.transterSelect(record)}} okText="确认" cancelText="取消">
-									    <Button style={{marginRight:'5px'}} type="primary">转交</Button>                 
+									    <Button style={{marginRight:'5px'}} type="primary">转交</Button>
 									</Popconfirm>:
 		                    	    <Popconfirm title={'您确认将订单分配给【'+record.departmentName+'-'+record.name+'】进行业务跟进?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
-									    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
+									    <Button style={{marginRight:'5px'}} type="primary">选定</Button>
 									</Popconfirm>}
 								</div>
 							)
@@ -194,7 +194,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     dataIndex: 'qq',
                     key: 'qq'
                 },
-                
+
             ],
 		};
 	},
@@ -221,7 +221,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
               uid: this.state.buyerId
             },
             success: function (data) {
-                let thisData = data.data;   
+                let thisData = data.data;
                 if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
@@ -230,13 +230,13 @@ const MySettlementDetaile = Form.create()(React.createClass({
                 };
                 this.setState({
 					contractArr:thisData,
-                });                  
+                });
             }.bind(this),
        }).always(function () {
-            this.setState({            	
+            this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
     },
     //查看订单
 	seeOrderAjax(data){
@@ -255,7 +255,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
               orderNo:data.orderNo
             },
             success: function (data) {
-                let thisData = data.data;                
+                let thisData = data.data;
                 if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
@@ -264,13 +264,13 @@ const MySettlementDetaile = Form.create()(React.createClass({
                 };
                 this.setState({
 					orderArr:thisData,
-                });                  
+                });
             }.bind(this),
        }).always(function () {
-            this.setState({            	
+            this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
     },
     //时间选择
     selTime(e,index){
@@ -298,7 +298,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
               buyerType:record.buyerType
             },
             success: function (data) {
-                let thisData = data.data;                
+                let thisData = data.data;
                 if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
@@ -320,13 +320,13 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					technicianName:thisData.technicianName, //任务负责人
 					selTime:'',
 					setTime:''
-                });                  
+                });
             }.bind(this),
        }).always(function () {
-            this.setState({            	
+            this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
        }
     },
     //删除
@@ -388,7 +388,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		});
 	},
 	componentWillMount() {
-		
+
 	},
 	nextCancel() {
 		this.setState({
@@ -407,7 +407,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	              taskId: record.taskId
 	            },
 	            success: function (data) {
-	                let thisData = data.data;                
+	                let thisData = data.data;
 	                if (!thisData) {
 	                    if (data.error && data.error.length) {
 	                        message.warning(data.error[0].message);
@@ -426,13 +426,13 @@ const MySettlementDetaile = Form.create()(React.createClass({
 						taskAllocatorName:thisData.taskAllocatorName,
 						taskReceiverName:thisData.taskReceiverName,
 						taskDistributionTime:thisData.taskDistributionTime,
-	                });                  
+	                });
 	            }.bind(this),
 	       }).always(function () {
-	            this.setState({            	
+	            this.setState({
 	                loading: false
 	            });
-	        }.bind(this));  
+	        }.bind(this));
 	    }
 	},
 	//创建项目保存
@@ -561,7 +561,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                        });
                    		};
                 	}
-                    
+
                 };
                 this.setState({
                     distributionList: theArr,
@@ -578,7 +578,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
     	this.setState({
             loading: true
         });
-        
+
     	let api = '/api/admin/superviser/adminList';
         $.ajax({
             method: "get",
@@ -627,7 +627,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                        });
                    		};
                 	}
-                    
+
                 };
                 this.setState({
                     distributionList: theArr,
@@ -744,30 +744,30 @@ const MySettlementDetaile = Form.create()(React.createClass({
             }:{
             	businessName:e
             },
-            success: function (data) {                	  
+            success: function (data) {
 				    let thedata=data.data;
 				    if (!thedata) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
-                    };	
-                    thedata = {}; 
-                    }; 
+                    };
+                    thedata = {};
+                    };
 					this.setState({
 						states:state,
-						customerArr:thedata,	
+						customerArr:thedata,
                     });
 				}.bind(this),
 			}).always(function () {
             this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
 	},
 	//服务值改变时请求客户名称
 	httpChange(e){
 		if(e.length>=2){
-			this.supervisor(e,false); 
-		}	
+			this.supervisor(e,false);
+		}
 		this.setState({
 			commodityName:e
 		})
@@ -788,8 +788,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	},
 	customerChange(e){
 		if(e.length>=2){
-			this.supervisor(e,true); 
-		}	
+			this.supervisor(e,true);
+		}
 		this.setState({
 			customerName:e
 		})
@@ -906,7 +906,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				completeComment:this.state.completeComment,
 				signComment:this.state.signComment,
 				signDate:this.state.setTime?this.state.setTime:this.state.signTime,
-				completeDate:this.state.selTime?this.state.selTime:this.state.completeTime  
+				completeDate:this.state.selTime?this.state.selTime:this.state.completeTime
 			}
 		}).done(function(data) {
 			this.setState({
@@ -1103,7 +1103,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			this.setState({
 				distributionList:[],
 			})
-			
+
 		}else{
 			this.setState({
 				lvRadio:e.target.value,
@@ -1111,10 +1111,10 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			})
 			this.contactList();
 		}
-		
+
 	},
-	
-	
+
+
 	tableRowClick(record, index) {
         this.setState({
         	addTaskState:false,
@@ -1155,7 +1155,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                this.setState({
 	                    selectedRows: selectedRows.slice(-1),
 	                    selectedRowKey: selectedRowKey.slice(-1)
-	                }); 
+	                });
             },
             onSelectAll: (selected, selectedRows, changeRows) => {
 			   this.setState({
@@ -1180,7 +1180,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
             <Modal maskClosable={false} visible={this.state.visible}
                     onOk={this.handleOk} onCancel={this.handleCancel}
                     width='1000px'
-                    title={this.props.projectState?'项目管理':'项目详情' }                    
+                    title={this.props.projectState?'项目管理':'项目详情' }
                     footer=''
                     className="admin-desc-content">
 		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} onSubmit={this.handleSubmit}>
@@ -1194,34 +1194,34 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="项目编号" >  
+			                            label="项目编号" >
 			                            <span>{orderDetaiel.serialNumber}</span>
 		                    		</FormItem>
-		                    		
+
 		                    		{orderDetaiel.orderNo&&<div>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单类型" >  
+				                            label="订单类型" >
 				                            <span>{getOrderType(orderArr.orderType)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单渠道" >  
+				                            label="订单渠道" >
 				                            <span>{getOrderChannel(orderArr.orderChannel)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单状态" >  
+				                            label="订单状态" >
 				                            <span>{getOrderState(orderArr.orderStatus)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="已收款项" >  
+				                            label="已收款项" >
 				                            <span>{orderArr.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="结算状态" >  
+				                            label="结算状态" >
 				                            <span>{getPaymentState(orderArr.liquidationStatus)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
@@ -1232,43 +1232,43 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签订单金额" >   
+					                            label="实签订单金额" >
 					                            <span>{orderArr.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签首款金额" >   
+					                            label="实签首款金额" >
 					                            <span>{orderArr.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="合同编号" >  
+					                            label="合同编号" >
 					                            <span>{orderDetaiel.contractNo}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="客户名称" >  
+					                            label="客户名称" >
 					                            <span>{orderDetaiel.buyerName}</span>
 					                            {orderDetaiel.buyerName&&<Button  onClick={this.seeContract} style={{float:'right',fontSize:'12px'}}>查看联系人</Button>}
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="客户省份" >  
+					                            label="客户省份" >
 					                            <span>{orderDetaiel.buyerProvince}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="下单时间" >  
+					                            label="下单时间" >
 					                            <span>{orderArr.createTime}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="营销员" >  
+					                            label="营销员" >
 					                            <span>{orderArr.salesmanName}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="特批立项" >   
+					                            label="特批立项" >
 					                            <span>{getApprovedState(orderArr.approval)}</span>
 				                    		</FormItem>
 					                        <div className='clearfix'>
@@ -1285,23 +1285,23 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                            <div className="clearfix">
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="项目负责人" >  
+			                            label="项目负责人" >
 			                            <span>{orderDetaiel.principalName}</span>
 			                            {!this.props.queryProject?<Button onClick={this.transfer} style={{'float':"right"}}>转交</Button>:''}
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="项目状态" >  
+			                            label="项目状态" >
 			                            <span>{getProjectState(orderDetaiel.projectStatus)}</span>
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="是否锁定" >  
+			                            label="是否锁定" >
 			                            <span>{orderDetaiel.deleteSign==2?'锁定':'未锁定'}</span>
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="立项时间" >  
+			                            label="立项时间" >
 			                            {!this.props.queryProject&&orderDetaiel.projectStatus==2?
 			                            	<DatePicker style={{marginTop:'2px',width:'200px'}}
 										      showTime
@@ -1314,7 +1314,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="业务品类" >  
+			                            label="业务品类" >
 			                            <span>{orderDetaiel.projectType}</span>
 		                    		</FormItem>
 			                       {/* <div className='clearfix'>
@@ -1322,15 +1322,15 @@ const MySettlementDetaile = Form.create()(React.createClass({
 								            labelCol={{ span: 4 }}
 								            wrapperCol={{ span: 16 }}
 								            label="立项说明" >
-							        		{!this.props.queryProject&&orderDetaiel.projectStatus==2?<Input type="textarea" placeholder="请输入立项说明" rows={4}  value={this.state.signComment} 
-													onChange={(e)=>{this.setState({signComment:e.target.value})}}/>:<span>{orderDetaiel.signComment}</span>}		                      
+							        		{!this.props.queryProject&&orderDetaiel.projectStatus==2?<Input type="textarea" placeholder="请输入立项说明" rows={4}  value={this.state.signComment}
+													onChange={(e)=>{this.setState({signComment:e.target.value})}}/>:<span>{orderDetaiel.signComment}</span>}
 								        </FormItem>
 							        </div>*/}
 		                        </div>
 		                        <div className='clearfix'>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="结项日期" > 
+			                            label="结项日期" >
 			                            {!this.props.queryProject&&orderDetaiel.projectStatus==3?
 			                            	<DatePicker style={{marginTop:'2px',width:'200px'}}
 										      showTime
@@ -1344,7 +1344,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		                    		<FormItem className="half-item"
 							            {...formItemLayout}
 							            label="结项说明" >
-						        		{!this.props.queryProject&&orderDetaiel.projectStatus==3?<Input type="textarea" placeholder="请输入结项说明" rows={4}  value={this.state.completeComment} 
+						        		{!this.props.queryProject&&orderDetaiel.projectStatus==3?<Input type="textarea" placeholder="请输入结项说明" rows={4}  value={this.state.completeComment}
 												onChange={(e)=>{this.setState({completeComment:e.target.value})}}/>:
 												<span>{orderDetaiel.completeComment}</span>
 										}
@@ -1353,7 +1353,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		                    	<div className='clearfix'>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="是否作废" >  
+			                            label="是否作废" >
 			                            <span>{orderDetaiel.deleteSign==1?'作废':'未作废'}</span>
 		                    		</FormItem>
 	                    		</div>
@@ -1388,7 +1388,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                        <Table columns={this.state.columns}
 				                            dataSource={this.state.dataSource}
 				                            pagination={false}
-				                            onRowClick={this.tableRowClick} 
+				                            onRowClick={this.tableRowClick}
 				                            />
 				                    </Spin>
 					            </div>
@@ -1399,8 +1399,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					           		</div>
 					           </div>:
 					            <div style={{marginTop:'30px',paddingLeft:'100px'}}>
-					            	{orderDetaiel.projectStatus==3||orderDetaiel.projectStatus==2?<Button type="primary" onClick={this.knotSave} style={{margin:'15px'}}>保存</Button>:''} 
-					            	<Button type="danger" onClick={this.removeItem}>撤项</Button>  
+					            	{orderDetaiel.projectStatus==3||orderDetaiel.projectStatus==2?<Button type="primary" onClick={this.knotSave} style={{margin:'15px'}}>保存</Button>:''}
+					            	<Button type="danger" onClick={this.removeItem}>撤项</Button>
 						            <Button type="primary" onClick={this.Knot} style={{margin:'15px'}}>结项</Button>
 						            <Button type="ghost" onClick={this.handleCancel}>返回</Button>
 					            </div>}
@@ -1411,7 +1411,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		        <Modal maskClosable={false} visible={this.state.addnextVisible}
                         onOk={this.nextCancel} onCancel={this.nextCancel}
                         width='800px'
-                        title={this.state.addTaskState?'添加任务':'任务详情'}                
+                        title={this.state.addTaskState?'添加任务':'任务详情'}
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form" onSubmit={this.taskSumbit}>
@@ -1434,7 +1434,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 										        onSelect={this.selectAuto}
 										      >
 										        <Input/>
-										      </AutoComplete> 
+										      </AutoComplete>
 										      <span className="mandatory">*</span>
 			                    	</FormItem>
 			                    	<FormItem className="half-item"
@@ -1450,9 +1450,9 @@ const MySettlementDetaile = Form.create()(React.createClass({
 								            labelCol={{ span: 4 }}
 								            wrapperCol={{ span: 16 }}
 								            label="任务说明" >
-								                <Input type="textarea" placeholder="请输入订单留言" rows={4}  
+								                <Input type="textarea" placeholder="请输入订单留言" rows={4}
 								                        value={this.state.taskComment}
-									    				onChange={(e)=>{this.setState({taskComment:e.target.value})}}/>			                      
+									    				onChange={(e)=>{this.setState({taskComment:e.target.value})}}/>
 								        </FormItem>
 							        </div>
 		                        </div>:
@@ -1484,7 +1484,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 										        onSelect={this.selectAuto}
 										      >
 										        <Input/>
-										      </AutoComplete> 
+										      </AutoComplete>
 										      <span className="mandatory">*</span>
 			                    	</FormItem>:
 			                    	<FormItem className="half-item"
@@ -1507,8 +1507,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 								            labelCol={{ span: 4 }}
 								            wrapperCol={{ span: 16 }}
 								            label="任务说明" >
-								                <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.taskComment} 
-									    				onChange={(e)=>{this.setState({taskComment:e.target.value})}}/>			                      
+								                <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.taskComment}
+									    				onChange={(e)=>{this.setState({taskComment:e.target.value})}}/>
 								        </FormItem>:
 								        <FormItem className="half-item"
 				                            {...formItemLayout}
@@ -1535,7 +1535,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 							        </div>
 		                        </div>}
 		                        {this.state.taskStatus<1||this.state.addTaskState?<div className="clearfix" style={{marginBottom:'20px'}}>
-				                    <Button className="setSave" type="primary" htmlType="submit">保存</Button>  
+				                    <Button className="setSave" type="primary" htmlType="submit">保存</Button>
 	                                <Button className="cancel" type="ghost" onClick={this.nextCancel}>返回</Button>
 		                        </div>:''}
 			                </Spin>
@@ -1544,7 +1544,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			        <Modal maskClosable={false} visible={this.state.projectVisible}
 	                    onOk={this.projectOk} onCancel={this.projectCancel}
 	                    width='600px'
-	                    title='创建项目'                     
+	                    title='创建项目'
 	                    footer=''
 	                    className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} >
@@ -1552,9 +1552,9 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                        <div className="clearfix">
 						                <div className='clearfix'>
 							                <div className="clearfix">
-							                    <FormItem  
+							                    <FormItem
 							                            {...formItemLayout}
-							                            label="客户名称" >                             
+							                            label="客户名称" >
 						                                    <AutoComplete
 													        className="certain-category-search"
 													        dropdownClassName="certain-category-search-dropdown"
@@ -1571,22 +1571,22 @@ const MySettlementDetaile = Form.create()(React.createClass({
 													        onSelect={this.selectAutoCUT}
 													      >
 													        <Input/>
-													      </AutoComplete> 
+													      </AutoComplete>
 													      <span className="mandatory">*</span>
 							                    </FormItem>
 							                </div>
 							                <div className='clearfix'>
-							                	<FormItem  
+							                	<FormItem
 						                            {...formItemLayout}
-						                            label="项目负责人" > 
+						                            label="项目负责人" >
 						                            <span style={{width:'150px'}}>{this.state.projectName}</span>
 						                    		<Button onClick={this.confirmDelet} style={{float:'right',marginRight:'50px'}}>选择</Button>
 							                    </FormItem>
 							                </div>
 							                <div className='clearfix'>
-							                	<FormItem 
+							                	<FormItem
 							                            {...formItemLayout}
-							                            label="业务品类" > 
+							                            label="业务品类" >
 							                            <Select placeholder="请选择业务品类"
 								                            style={{ width:'200px'}}
 								                            value={this.state.contractType}
@@ -1605,8 +1605,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 										            labelCol={{ span: 8 }}
 										            wrapperCol={{ span: 12 }}
 										            label="项目说明" >
-										                <Input type="textarea" placeholder="请输入签单备注" rows={4}  value={this.state.signComment} 
-											    				onChange={(e)=>{this.setState({signComment:e.target.value})}}/>			                      
+										                <Input type="textarea" placeholder="请输入签单备注" rows={4}  value={this.state.signComment}
+											    				onChange={(e)=>{this.setState({signComment:e.target.value})}}/>
 										        </FormItem>
 									        </div>
 									    </div>
@@ -1614,14 +1614,14 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
 										<Button type="primary" onClick={this.admissibleOrder} style={{marginLeft:'55px'}}>保存</Button>
 				                        <Button className="submitSave" type="ghost" onClick={this.projectCancel}>返回</Button>
-				                    </FormItem> 
+				                    </FormItem>
 	                        </Spin>
 			            </Form >
-			        </Modal> 
+			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.distributionVisible}
                         onOk={this.distributionOk} onCancel={this.distributionCancel}
                         width='800px'
-                        title={this.state.transferState?'转交责任人':'分派任务单' }                    
+                        title={this.state.transferState?'转交责任人':'分派任务单' }
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal"  id="demand-form" style={{paddingBottom:'40px'}} >
@@ -1641,9 +1641,9 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                                    })
 			                                }
 				                    </Select>}
-				                    {!this.state.lvState&&<Input placeholder={this.state.transferState?"责任人":"咨询师"} style={{width:'150px',marginLeft:'10px'}}
+				                    {!this.state.lvState&&<Input placeholder={this.state.transferState?"责任人":"技术员"} style={{width:'150px',marginLeft:'10px'}}
 				                        value={this.state.financeNameSearch}
-				                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />}  
+				                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />}
 				                    {!this.state.lvState&&<Button type="primary" onClick={this.searchOrder} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>}
 	                    			{!this.state.lvState&&<Button onClick={this.resetOrder}>重置</Button>}
 			                	</div>
@@ -1661,7 +1661,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			    <Modal maskClosable={false} visible={this.state.orderVisible}
                         onOk={this.orderCancel} onCancel={this.orderCancel}
                         width='800px'
-                        title={this.state.seeState?'查看订单':'查看联系人'}                     
+                        title={this.state.seeState?'查看订单':'查看联系人'}
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal"  id="demand-form" style={{paddingBottom:'40px'}} >
@@ -1683,7 +1683,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			    <Modal maskClosable={false} visible={this.state.addChangeState}
                         onOk={this.addChangeCancel} onCancel={this.addChangeCancel}
                         width='800px'
-                        title= {this.state.stateAdd?'添加变更':'查看变更记录'}                    
+                        title= {this.state.stateAdd?'添加变更':'查看变更记录'}
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form">
@@ -1694,8 +1694,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 									            labelCol={{ span: 4 }}
 									            wrapperCol={{ span: 16 }}
 									            label="变更说明" >
-								                <Input type="textarea" placeholder="请输入变更说明" rows={4}  value={this.state.changeRemarks} 
-									    				onChange={(e)=>{this.setState({changeRemarks:e.target.value})}}/>			                      
+								                <Input type="textarea" placeholder="请输入变更说明" rows={4}  value={this.state.changeRemarks}
+									    				onChange={(e)=>{this.setState({changeRemarks:e.target.value})}}/>
 									    </FormItem>
 									    <div className="clearfix">
 									    	<Button type="primary" onClick={this.subChangeState} style={{margin:"10px 50px 10px 128px"}}>保存</Button>
@@ -1708,23 +1708,23 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                    			return (<div className="changeBorder" key={index}>
 													    <FormItem className="half-item"
 													            {...formItemLayout}
-													            label="变更发起人" >                             
+													            label="变更发起人" >
 													               <span>{item.creater}</span>
 													    </FormItem>
 													    <FormItem className="half-item"
 													            {...formItemLayout}
-													            label="变更申请时间" >                             
+													            label="变更申请时间" >
 													               <span>{item.createTime}</span>
 													    </FormItem>
 													    <div className='clearfix'>
 													    	<FormItem className="half-item"
 													            {...formItemLayout}
-													            label="变更状态" >                             
+													            label="变更状态" >
 													                <span>{getChangeState(item.changeStatus)}</span>
 													   		</FormItem>
 													   		<FormItem className="half-item"
 													            {...formItemLayout}
-													            label="变更操作" >                             
+													            label="变更操作" >
 													               <Button onClick={(e)=>{this.modifyChange(item)}}>修改</Button>
 													   				{/*<Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>*/}
 													   		</FormItem>
@@ -1745,10 +1745,10 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.modifyChangeState} 
+			        <Modal maskClosable={false} visible={this.state.modifyChangeState}
                         onOk={this.modifyChangeCancel} onCancel={this.modifyChangeCancel}
                         width='600px'
-                        title= "修改变更  "                 
+                        title= "修改变更  "
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form">
@@ -1757,23 +1757,23 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		                       		<div className="clearfix">
 									    <FormItem className="half-item"
 									            {...formItemLayout}
-									            label="变更发起人" >                             
+									            label="变更发起人" >
 									               <span>{this.state.changePromoter}</span>
 									    </FormItem>
 									    <FormItem className="half-item"
 									            {...formItemLayout}
-									            label="变更申请时间" >                             
+									            label="变更申请时间" >
 									               <span>{this.state.changeTime}</span>
 									    </FormItem>
 									    <div className='clearfix'>
-									    	<FormItem 
+									    	<FormItem
 					                             labelCol={{ span: 4 }}
 										         wrapperCol={{ span: 16 }}
-					                             label="变更状态" >  
+					                             label="变更状态" >
 												<Radio.Group onChange={(e)=>{this.setState({changeState:e.target.value})}} value={this.state.changeState}>
 											        <Radio value={1}>变更中</Radio>
 											        <Radio value={2}>变更完成</Radio>
-											    </Radio.Group>    
+											    </Radio.Group>
 						                	</FormItem>
 									    </div>
 									    <div className='clearfix'>
@@ -1781,8 +1781,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 									            labelCol={{ span: 4 }}
 									            wrapperCol={{ span: 16 }}
 									            label="变更说明" >
-								                <Input type="textarea" placeholder="请输入变更说明" rows={4}  value={this.state.changeRemarks} 
-									    				onChange={(e)=>{this.setState({changeRemarks:e.target.value})}}/>			                      
+								                <Input type="textarea" placeholder="请输入变更说明" rows={4}  value={this.state.changeRemarks}
+									    				onChange={(e)=>{this.setState({changeRemarks:e.target.value})}}/>
 									   		</FormItem>
 									    </div>
 									    <div className="clearfix">
@@ -1799,4 +1799,4 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	}
 }));
 
-export default MySettlementDetaile;
+export default MySettlementDetaile;

+ 1 - 1
js/component/manageCenter/set/organization/organization.jsx

@@ -373,7 +373,7 @@ const Organization=Form.create()(React.createClass({
         	rowId:record.businessId,
         })
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context +"/api/admin/organization/selectAllById" ,

+ 12 - 10
js/component/manageCenter/topTab.jsx

@@ -68,7 +68,7 @@ const MessageModal = React.createClass({
 //                          case 10:
 //                              return <a href={globalConfig.context + "/admin/achievement.html?rid=" + record.rid + "#orgTechAchievement"}> {record.noticeTypeName} </a >;
 //                          case 11:
-//                              return <a href={globalConfig.context + "/admin/achievement.html?rid=" + record.rid + "#userTechAchievement"}> {record.noticeTypeName} </a >;                           
+//                              return <a href={globalConfig.context + "/admin/achievement.html?rid=" + record.rid + "#userTechAchievement"}> {record.noticeTypeName} </a >;
 //                      }
 					return (<span>{record.noticeTypeName}</span>)
                     }
@@ -260,7 +260,7 @@ const UserModal = React.createClass({
         this.setState({
             loading: true
         });
-        
+
         $.ajax({
             method: "get",
             dataType: "json",
@@ -333,13 +333,13 @@ const UserModal = React.createClass({
             loading: true
         });
         if(this.state.contactMobile){
-        	if(!(/^1[1-9][0-9]\d{4,8}$/.test(this.state.contactMobile))){ 
-			  message.warning("不是完整的11位手机号或者正确的手机号前七位"); 
+        	if(!(/^1[1-9][0-9]\d{4,8}$/.test(this.state.contactMobile))){
+			  message.warning("不是完整的11位手机号或者正确的手机号前七位");
 			  this.setState({
                     loading: false
                 });
 			  return false;
-			} 
+			}
         }
 //      if(this.state.mobile.length>11){
 //      	message.warning("登录账号不能超过11位");
@@ -465,7 +465,7 @@ const TopTab = React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/api/admin/selectNavList",
             data: {
-            	
+
             },
             success:function(data){
             	if (!data.data) {
@@ -545,7 +545,9 @@ const TopTab = React.createClass({
                         // };
                         this.setState({ userModalShow: true });
                     }}> {adminData.name || adminData.mobile} </a> : <a onClick={this.logOut}>{this.state.username}</a>} <a onClick={this.logOut}>[ 退出 ]</a></span>
-                    <span className="acc-top-user-toindex"><a href={jumpUrl||'' + "/portal/index.html"}>返回首页</a></span>
+                    <span className="acc-top-user-toindex">
+                        {/*<a href={jumpUrl||'' + "/portal/index.html"}>返回首页</a>*/}
+                    </span>
                     {this.props.active ? <a onClick={() => { this.setState({ messageModalShow: true }); }} className="user-badge">
                         <Icon type="mail" />
                         {(() => {
@@ -566,13 +568,13 @@ const TopTab = React.createClass({
                        {/*<Col style={{ display: window.showUserManage ? 'block' : 'none' }} className={this.props.active === 'userManage' ? 'active' : ''} span={2}><a href={globalConfig.context + "/admin/userManage.html"}>用户管理</a></Col>*/}
                         {/*<Col style={{ display: window.showCustomer ? 'block' : 'none' }} className={this.props.active === 'myClient' ? 'active' : ''} span={3}><a href={globalConfig.context + "/admin/customer.html" }>客户管理</a></Col>
                         <Col style={{ display: window.showServices ? 'block' : 'none' }} className={this.props.active === 'services' ? 'active' : ''} span={3}><a href={globalConfig.context + "/admin/servicesManage/contract.html"}>科技服务管理</a></Col>
-                        <Col style={{ display: window.showAchievement ? 'block' : 'none' }} className={this.props.active === 'achievement' ? 'active' : ''} span={3}><a href={globalConfig.context + "/admin/achievement.html"}>科技成果管理</a></Col>                       
+                        <Col style={{ display: window.showAchievement ? 'block' : 'none' }} className={this.props.active === 'achievement' ? 'active' : ''} span={3}><a href={globalConfig.context + "/admin/achievement.html"}>科技成果管理</a></Col>
                         <Col style={{ display: window.showDemand ? 'block' : 'none' }} className={this.props.active === 'demand' ? 'active' : ''} span={3}><a href={globalConfig.context + "/admin/demand.html"}>科技需求管理</a></Col>
                         <Col style={{ display: window.showIdea ? 'block' : 'none' }} className={this.props.active === 'idea' ? 'active' : ''} span={3}><a href={globalConfig.context + "/admin/idea.html"}>科技思想管理</a></Col>
                         <Col style={{ display: window.showUserOrderList ? 'block' : 'none' }} className={this.props.active === 'userOrder' ? 'active' : ''} span={3}><a href={globalConfig.context + "/admin/userOrder.html"}>用户订单管理</a></Col>
                         <Col style={{ display: window.showSystem ? 'block' : 'none' }} className={this.props.active === 'system' ? 'active' : ''} span={3}><a href={globalConfig.context + "/admin/set.html"}>系统设置</a></Col>
                    */}
-    				{this.state.htmlMenus} 
+    				{this.state.htmlMenus}
                     </Row>
                 </div>
                 <UserModal showDesc={this.state.userModalShow} closeDesc={this.closeUserModal} />
@@ -582,4 +584,4 @@ const TopTab = React.createClass({
     }
 });
 
-export default TopTab;
+export default TopTab;

+ 5 - 5
js/component/tools.js

@@ -1666,11 +1666,11 @@ module.exports = {
     } else if (val == 1) {
       return "已派营销管理员";
     } else if (val == 2) {
-      return "已派咨询师";
+      return "已派技术员";
     } else if (val == 3) {
-      return "已派咨询师经理";
+      return "已派技术经理";
     } else if (val == 4) {
-      return "已派咨询师管理员";
+      return "已派技术管理员";
     } else if (val == 5) {
       return "已派财务专员";
     } else if (val == 6) {
@@ -1895,9 +1895,9 @@ module.exports = {
     } else if (pro == 1) {
       str = "营销管理员";
     } else if (pro == 2) {
-      str = "咨询师";
+      str = "技术员";
     } else if (pro == 3) {
-      str = "咨询师经理";
+      str = "技术经理";
     } else if (pro == 4) {
       str = "咨询师总监";
     } else if (pro == 5) {

+ 1 - 1
package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "dlldev": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy dev --env.host 'http://127.0.0.1'",
     "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://static.jishutao.com'",
-    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://s.jishutao.com'",
+    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://127.0.0.1'",
     "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",
     "buildtest": "node --max-old-space-size=8192 bin/clean.js && webpack --progress --colors --env.deploy test",
     "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",

+ 3 - 3
webpack-dll.config.js

@@ -10,13 +10,13 @@ let theme = {
   '@link-color': '#58a3ff'
 };
 module.exports = (function () {
-  let staticHost = 'http://172.16.0.254';
+  let staticHost = 'http://172.16.0.253:80';
   switch (argv.env.deploy) {
     case 'test':
       staticHost = 'http://static.jishutao.com';
       break;
     case 'prod':
-      staticHost = 'http://s.jishutao.com';
+      staticHost = 'http://127.0.0.1';
       break;
     default:
       break;
@@ -63,4 +63,4 @@ module.exports = (function () {
       extensions: ['.js', '.jsx']
     }
   }
-})();
+})();

+ 1 - 1
webpack.config.js

@@ -328,7 +328,7 @@ module.exports = (function () {
             staticHost = 'http://static.jishutao.com'
             break
         case 'prod':
-            staticHost = 'http://s.jishutao.com'
+            staticHost = 'http://172.16.0.188:3000'
             break
         default:
             break