hujie123456 5 years ago
parent
commit
190ce31696

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

@@ -325,7 +325,7 @@ const approvedOutsourcing = React.createClass({
                     收款
                   </Button>
                 )}
-                {recard.approval === 2 && recard.processStatus < 4 ? (
+                {recard.processStatus < 4 ? (
                   <Button
                     type="primary"
                     onClick={e => {

+ 65 - 6
js/component/manageCenter/financialManage/distribute/huiKuan.jsx

@@ -78,7 +78,10 @@ const HuiKuan = React.createClass({
             let thisdata = data.data.pagination.list[i];
             theArr.push({
               key: thisdata.id,
-              status: thisdata.status,
+              status: {
+                first: thisdata.status,
+                second: thisdata.inptStatus
+              },
               orderNo: thisdata.orderNo,
               contractNo: thisdata.contractNo,
               corporateName: thisdata.corporateName,
@@ -259,17 +262,52 @@ const HuiKuan = React.createClass({
           render: status => {
             let str = "";
             let color = "";
-            if (status == 0) {
-              str = "正常";
+            let str2 = "";
+            let color2 = "";
+            if (status.first == 0) {
               color = "#87d068";
-            } else if (status == 1) {
+              str = "正常"
+              if(status.second == 1) {
+                str = "内容缺失"
+                color = "#000";
+              }else if(status.second == 2) {
+                str = "订单异常"
+                color = "#000";
+              }else if(status.second == 3) {
+                str = "名称不一致"
+                color = "#000";
+              }
+            } else if (status.first == 1) {
               str = "重复";
               color = "#f50";
+              if (status.second == 1) {
+                str2 = "内容缺失";
+                color2 = "#000";
+              } else if (status.second == 2) {
+                str2 = "订单异常";
+                color2 = "#000";
+              } else if (status.second == 3) {
+                str2 = "名称不一致";
+                color2 = "#000";
+              }
             } else {
-              str = "异常";
               color = "#000";
+              if (status.first == 2) {
+                str = "订单异常";
+              } else if (status.first == 3) {
+                str = "金额异常";
+              } else if (status.first == 4) {
+                str = "名称异常";
+              }else {
+                str = "未知异常"
+              }
             }
-            return <Tag color={color}>{str}</Tag>;
+            return (
+              <div>
+                <Tag color={color}>{str}</Tag>
+                <Tag color={color2} style={{ display: status.first == 1 && status.second != 0 ? "inline-blcok" : "none" }}>{str2}</Tag>
+              </div>
+            );
           }
         },
         {
@@ -426,6 +464,10 @@ const HuiKuan = React.createClass({
           } else {
             // console.log("成功", data);
             this.loadData();
+            this.state.selectedRowKeys = [];
+            this.setState({
+              selectedRowKeys: this.state.selectedRowKeys
+            });
             this.setState({ loading: false, visible: false });
           }
         }.bind(this)
@@ -460,6 +502,10 @@ const HuiKuan = React.createClass({
           }else {
             // console.log("成功",data);
             this.loadData()
+            this.state.selectedRowKeys = [];
+            this.setState({
+              selectedRowKeys: this.state.selectedRowKeys
+            });
             this.setState({ loading: false, visible: false });
           }
       }.bind(this)
@@ -501,6 +547,10 @@ const HuiKuan = React.createClass({
     }).always(
       function() {
         this.loadData()
+        this.state.selectedRowKeys = [];
+        this.setState({
+          selectedRowKeys: this.state.selectedRowKeys
+        });
       }.bind(this)
     );
     // this.loadData()
@@ -524,6 +574,10 @@ const HuiKuan = React.createClass({
     }).always(
       function() {
         this.loadData();
+        this.state.selectedRowKeys = [];
+        this.setState({
+          selectedRowKeys: this.state.selectedRowKeys
+        });
       }.bind(this)
     );
     // this.loadData()
@@ -549,6 +603,11 @@ const HuiKuan = React.createClass({
     }).always(
       function() {
         this.loadData();
+        this.state.selectedRowKeys = []
+        this.setState({
+          selectedRowKeys: this.state.selectedRowKeys
+        })
+        // window.location.reload();
       }.bind(this)
     );
     // message.success("合并成功!请在收款列表中,查看已收款情况。");

+ 3 - 0
js/component/manageCenter/financialManage/distribute/shouKuan.less

@@ -0,0 +1,3 @@
+.ant-calendar-picker-input.ant-input {
+    width: 200px !important;
+}

+ 51 - 21
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -2,6 +2,7 @@ import React from "react";
 import $ from "jquery/src/ajax";
 import moment from "moment";
 import "./public.less";
+import "./shouKuan.less";
 import {
   Button,
   Form,
@@ -12,7 +13,8 @@ import {
   message,
   DatePicker,
   Modal,
-  Tabs
+  Tabs,
+  Col
 } from "antd";
 import OrderDesc from "../orderDetail/orderDesc";
 import Receivable from "./receivable";
@@ -90,6 +92,8 @@ const ShouKuang = React.createClass({
         orderNo: this.state.orderNoSearch,
         startTime: this.state.releaseDate[0],
         endTime: this.state.releaseDate[1],
+        startFinalReceivablesTime: this.state.shouKuanDate[0],
+        endFinalReceivablesTime: this.state.shouKuanDate[1],
         departmentId: this.state.departmenttList,
         processStatus: this.state.processStatusSearch,
         contractNo: this.state.contractNoSearch
@@ -143,8 +147,8 @@ const ShouKuang = React.createClass({
           totalPage: data.data.pagination.totalPage,
           dataSource: theArr,
           pagination: this.state.pagination,
-          totalHui: data.data.count ? data.data.count.signTotalAmount : 0 ,
-          hui: data.data.count ? data.data.count.actuallyTotalAmount : 0,
+          totalHui: data.data.count ? data.data.count.signTotalAmount : 0,
+          hui: data.data.count ? data.data.count.actuallyTotalAmount : 0
         });
       }.bind(this)
     }).always(
@@ -162,6 +166,7 @@ const ShouKuang = React.createClass({
       assignVisibleX: false,
       assignVisibleY: false,
       releaseDate: [],
+      shouKuanDate: [],
       assignDataX: [],
       assignDataY: [],
       totalPage: 0,
@@ -408,7 +413,7 @@ const ShouKuang = React.createClass({
                     收款
                   </Button>
                 )}
-                {recard.approval === 2 && recard.processStatus < 4 ? (
+                {recard.processStatus < 4 ? (
                   <Button
                     type="primary"
                     onClick={e => {
@@ -436,15 +441,17 @@ const ShouKuang = React.createClass({
                   </Button>
                 )}
                 {
-                  <Button
-                    type="primary"
-                    style={{ marginLeft: "5px" }}
-                    onClick={e => {
-                      e.stopPropagation(), this.evaluateY(recard, "财务专员");
-                    }}
-                  >
-                    转交
-                  </Button>
+                  // <Button
+                  //   type="primary"
+                  //   style={{ marginLeft: "5px" }}
+                  //   onClick={e => {
+                  //     e.stopPropagation(), this.evaluateY(recard, "财务专员");
+                  //     console.log(recard);
+                      
+                  //   }}
+                  // >
+                  //   转交
+                  // </Button>
                 }
               </div>
             );
@@ -648,6 +655,7 @@ const ShouKuang = React.createClass({
   reset() {
     this.state.nameSearch = "";
     this.state.releaseDate = [];
+    this.state.shouKuanDate = [];
     this.state.orderNoSearch = "";
     this.state.departmenttList = undefined;
     this.state.processStatus = [];
@@ -889,8 +897,7 @@ const ShouKuang = React.createClass({
     const rowSelection = {
       selectedRowKeys,
       onChange: this.onSelectChange,
-      hideDefaultSelections: true,
-      type: "radio"
+      hideDefaultSelections: true
     };
     return (
       <div className="user-content">
@@ -959,7 +966,7 @@ const ShouKuang = React.createClass({
                 <Option value="3">未分配</Option>
                 <Option value="4">已分配</Option>
               </Select>
-              <span style={{ marginRight: 10 }}>下单日期:</span>
+              <span style={{}}>下单日期:</span>
               <RangePicker
                 value={[
                   this.state.releaseDate[0]
@@ -973,6 +980,20 @@ const ShouKuang = React.createClass({
                   this.setState({ releaseDate: dataString });
                 }}
               />
+              <span style={{}}>最近收款:</span>
+              <RangePicker
+                value={[
+                  this.state.shouKuanDate[0]
+                    ? moment(this.state.shouKuanDate[0])
+                    : null,
+                  this.state.shouKuanDate[1]
+                    ? moment(this.state.shouKuanDate[1])
+                    : null
+                ]}
+                onChange={(data, dataString) => {
+                  this.setState({ shouKuanDate: dataString });
+                }}
+              />
               <Button
                 type="primary"
                 onClick={this.search}
@@ -1029,7 +1050,7 @@ const ShouKuang = React.createClass({
             </Button>
             <Button
               type="primary"
-              disabled={!this.state.selectedRowKeys.length}
+              disabled={this.state.selectedRowKeys.length != 1}
               style={{ margin: "0px 0px 10px 10px" }}
               onClick={this.exportKaip}
             >
@@ -1037,7 +1058,7 @@ const ShouKuang = React.createClass({
             </Button>
             <Button
               type="primary"
-              disabled={!this.state.selectedRowKeys.length}
+              disabled={this.state.selectedRowKeys.length != 1}
               style={{ margin: "0px 0px 10px 10px" }}
               onClick={this.exportWater}
             >
@@ -1072,6 +1093,17 @@ const ShouKuang = React.createClass({
               详情收款流水
             </Button>
           </TabPane>
+          <TabPane tab="批量操作" key="6">
+            <Button
+              type="primary"
+              style={{ marginLeft: "5px" }}
+              onClick={e => {
+                e.stopPropagation(), this.evaluateY(this.state.selectedRowKeys, "财务专员");
+              }}
+            >
+              转交
+            </Button>
+          </TabPane>
         </Tabs>
 
         <div className="patent-table">
@@ -1096,9 +1128,7 @@ const ShouKuang = React.createClass({
           >
             {
               <span style={{ marginRight: 10 }}>
-                {`收款金额总计(万元):${
-                  this.state.hui ? this.state.hui : "0"
-                }`}
+                {`收款金额总计(万元):${this.state.hui ? this.state.hui : "0"}`}
               </span>
             }
             {

+ 5 - 3
js/component/manageCenter/order/orderNew/addService.jsx

@@ -156,7 +156,7 @@ const NewService = Form.create()(
         lookflowList: [],
         contractUrl: [],
         applicationUrl: [],
-        changeAmount: 0,
+        changeAmount: "0",
         active: {
           applySign: false
         },
@@ -1300,8 +1300,10 @@ const NewService = Form.create()(
         message.warning("当前订单流程不能发起变更!");
         return false;
       }
-      if(this.state.changeAmount == "" || this.state.changeAmount == undefined || this.state.changeAmount.trim() == "") {
+      if (this.state.changeAmount == "") {
         message.warning("申请退款金额不能为空!");
+        // console.log(this.state.changeAmount);
+
         return false;
       }
       let theorgCodeUrl = [];
@@ -1366,7 +1368,7 @@ const NewService = Form.create()(
         voucherUrl: [],
         totalAmount: undefined,
         settlementAmount: undefined,
-        changeAmount: 0,
+        changeAmount: "0",
         applicant: undefined,
         depNameChange: undefined,
         typeChange: 0

+ 48 - 1
js/component/manageCenter/publicComponent/assign.jsx

@@ -94,11 +94,20 @@ const Assign=React.createClass({
                     key: 'abc',
                     width:100,
                     render:(text,record,index)=>{
-                    	return (
+                        if(record.length){
+                            return (
+                                <Popconfirm title={'您确认将所选订单分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect1(record)}} okText="确认" cancelText="取消">
+                                    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
+                                </Popconfirm>
+                            )
+                        }else {
+                            return (
                                 <Popconfirm title={'您确认将'+this.props.title+' 【'+this.props.data.orderNo+'】 分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
                                     <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
                                 </Popconfirm>
 							)
+                        }
+                    	
                     }
                 }
             ],
@@ -207,6 +216,44 @@ const Assign=React.createClass({
             });
         }.bind(this));
     },
+    confirmSelect1(record){
+    	this.setState({
+            loading: true
+        });
+        console.log(this.state.contact);
+        $.ajax({
+          method: this.props.requestMethod,
+          dataType: "json",
+          crossDomain: false,
+          url: globalConfig.context + this.props.selApi,
+          // 			data:{
+          // 				taskId:this.props.data.id,//任务ID
+          // 				taskReceiverId:this.state.contact?record.id:record.contactId,//分配人物ID
+          // 				specially:this.props.specially,//是否是咨询师管理员
+          // 				orderNo:this.state.orderNo,
+          // 				financeId: this.state.contact?record.id:record.contactId,    //分配人物id
+          // 				approval:this.props.data.approval,   //是否特批
+          // 				newFinance:this.state.contact?record.id:record.contactId
+          //
+          // 			}
+          data: {
+            orderNo: this.state.orderNo,
+            financeId: this.state.contact ? record.id : record.contactId
+          }
+        }).done(
+          function(data) {
+            if (!data.error.length) {
+              message.success("派单成功");
+              this.onShow();
+            } else {
+              message.warning(data.error[0].message);
+            }
+            this.setState({
+              loading: false
+            });
+          }.bind(this)
+        );
+    },
 	
 	/* 区分分派和两种转交 */
 	judge(props,record){

+ 221 - 128
js/component/manageCenter/set/organization/organization.jsx

@@ -186,63 +186,81 @@ const Organization=Form.create()(React.createClass({
     			if(!(superOne==superText)){
 		    		if(confirm('上级组织已修改,是否保存?')){
 			        $.ajax({
-			            method: "post",
-			            dataType: "json",
-			            crossDomain: false,
-			            url:globalConfig.context + '/api/admin/organization/updateOrganization',
-			            data:{
-			            	name:this.state.editName,//组织名称
-			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
-			                superId:this.state.editSuperId,//上级组织
-			                status:this.state.editStatus,//组织状态
-			                remarks:remarksText,//组织职能说明
-			                id:this.state.editId,//组织ID
-							updateOrganization:this.state.updateOrganization,
-							abbreviation:this.state.abbreviation
-			            }
-			        }).done(function (data) { 
-			            this.setState({
-			                loading: false
-			            });
-			            if (!data.error.length) {
-			                message.success('保存成功!'); 
-			                this.edithandleCancel();
-			                this.selectSuperId();
-			            } else {
-			                message.warning(data.error[0].message);
-			            }
-			        }.bind(this));
+                method: "post",
+                dataType: "json",
+                crossDomain: false,
+                url:
+                  globalConfig.context +
+                  "/api/admin/organization/updateOrganization",
+                data: {
+                  name: this.state.editName, //组织名称
+                  type: this.state.editType, //组织类型
+                  managerId: this.state.theTypes
+                    ? this.state.theTypes
+                    : this.state.managerIdOrganizationId, //负责人ID
+                  financeId: this.state.theTypes2
+                    ? this.state.theTypes2
+                    : this.state.financeId, //负责人ID
+                  superId: this.state.editSuperId, //上级组织
+                  status: this.state.editStatus, //组织状态
+                  remarks: remarksText, //组织职能说明
+                  id: this.state.editId, //组织ID
+                  updateOrganization: this.state.updateOrganization,
+                  abbreviation: this.state.abbreviation
+                }
+              }).done(
+                function(data) {
+                  this.setState({
+                    loading: false
+                  });
+                  if (!data.error.length) {
+                    message.success("保存成功!");
+                    this.edithandleCancel();
+                    this.selectSuperId();
+                  } else {
+                    message.warning(data.error[0].message);
+                  }
+                }.bind(this)
+              );
 			        return false
 		        	}
 		    	}else {
 		        	$.ajax({
-			            method: "post",
-			            dataType: "json",
-			            crossDomain: false,
-			            url:globalConfig.context + '/api/admin/organization/updateOrganization',
-			            data:{
-			            	name:this.state.editName,//组织名称
-			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
-			                superId:oldId,//上级组织
-			                status:this.state.editStatus,//组织状态
-			                remarks:remarksText,//组织职能说明
-			                id:this.state.editId,//组织ID
-							abbreviation:this.state.abbreviation
-			            }
-			        }).done(function (data) { 
-			            this.setState({
-			                loading: false
-			            });
-			            if (!data.error.length) {
-			                message.success('保存成功!'); 
-			                this.edithandleCancel();
-			                this.selectSuperId();
-			            } else {
-			                message.warning(data.error[0].message);
-			            }
-			        }.bind(this));
+                method: "post",
+                dataType: "json",
+                crossDomain: false,
+                url:
+                  globalConfig.context +
+                  "/api/admin/organization/updateOrganization",
+                data: {
+                  name: this.state.editName, //组织名称
+                  type: this.state.editType, //组织类型
+                  managerId: this.state.theTypes
+                    ? this.state.theTypes
+                    : this.state.managerIdOrganizationId, //负责人ID
+                  financeId: this.state.theTypes2
+                    ? this.state.theTypes2
+                    : this.state.financeId, //负责人ID
+                  superId: oldId, //上级组织
+                  status: this.state.editStatus, //组织状态
+                  remarks: remarksText, //组织职能说明
+                  id: this.state.editId, //组织ID
+                  abbreviation: this.state.abbreviation
+                }
+              }).done(
+                function(data) {
+                  this.setState({
+                    loading: false
+                  });
+                  if (!data.error.length) {
+                    message.success("保存成功!");
+                    this.edithandleCancel();
+                    this.selectSuperId();
+                  } else {
+                    message.warning(data.error[0].message);
+                  }
+                }.bind(this)
+              );
 		        } 	
     		}
     	}else{
@@ -250,63 +268,81 @@ const Organization=Form.create()(React.createClass({
 		    		if(confirm('上级组织已修改,是否保存?')){
 		    		console.log(this.state.editSuperId);
 			        $.ajax({
-			            method: "post",
-			            dataType: "json",
-			            crossDomain: false,
-			            url:globalConfig.context + '/api/admin/organization/updateOrganization',
-			            data:{
-			            	name:this.state.editName,//组织名称
-			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
-			                superId:this.state.editSuperId,//上级组织
-			                status:this.state.editStatus,//组织状态
-			                remarks:remarksText,//组织职能说明
-			                id:this.state.editId,//组织ID
-							abbreviation:this.state.abbreviation
-			            }
-			        }).done(function (data) { 
-			            this.setState({
-			                loading: false
-			            });
-			            if (!data.error.length) {
-			                message.success('保存成功!'); 
-			                this.edithandleCancel();
-			                this.selectSuperId(); 
-			            } else {
-			                message.warning(data.error[0].message);
-			            }
-			        }.bind(this));
+                method: "post",
+                dataType: "json",
+                crossDomain: false,
+                url:
+                  globalConfig.context +
+                  "/api/admin/organization/updateOrganization",
+                data: {
+                  name: this.state.editName, //组织名称
+                  type: this.state.editType, //组织类型
+                  managerId: this.state.theTypes
+                    ? this.state.theTypes
+                    : this.state.managerIdOrganizationId, //负责人ID
+                  financeId: this.state.theTypes2
+                    ? this.state.theTypes2
+                    : this.state.financeId, //负责人ID
+                  superId: this.state.editSuperId, //上级组织
+                  status: this.state.editStatus, //组织状态
+                  remarks: remarksText, //组织职能说明
+                  id: this.state.editId, //组织ID
+                  abbreviation: this.state.abbreviation
+                }
+              }).done(
+                function(data) {
+                  this.setState({
+                    loading: false
+                  });
+                  if (!data.error.length) {
+                    message.success("保存成功!");
+                    this.edithandleCancel();
+                    this.selectSuperId();
+                  } else {
+                    message.warning(data.error[0].message);
+                  }
+                }.bind(this)
+              );
 			        return false
 		        	}
 		    	}else {
 		    		console.log(this.state.editSuperId);
 		    		$.ajax({
-			            method: "post",
-			            dataType: "json",
-			            crossDomain: false,
-			            url:globalConfig.context + '/api/admin/organization/updateOrganization',
-			            data:{
-			            	name:this.state.editName,//组织名称
-			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
-			                superId:oldId,//上级组织
-			                status:this.state.editStatus,//组织状态
-			                remarks:remarksText,//组织职能说明
-			                id:this.state.editId,//组织ID
-							abbreviation:this.state.abbreviation
-			            }
-			        }).done(function (data) { 
-			            this.setState({
-			                loading: false
-			            });
-			            if (!data.error.length) {
-			                message.success('保存成功!'); 
-			                this.edithandleCancel();
-			                this.selectSuperId();
-			            } else {
-			                message.warning(data.error[0].message);
-			            }
-			        }.bind(this));
+              method: "post",
+              dataType: "json",
+              crossDomain: false,
+              url:
+                globalConfig.context +
+                "/api/admin/organization/updateOrganization",
+              data: {
+                name: this.state.editName, //组织名称
+                type: this.state.editType, //组织类型
+                managerId: this.state.theTypes
+                  ? this.state.theTypes
+                  : this.state.managerIdOrganizationId, //负责人ID
+                financeId: this.state.theTypes2
+                  ? this.state.theTypes2
+                  : this.state.financeId, //负责人ID
+                superId: oldId, //上级组织
+                status: this.state.editStatus, //组织状态
+                remarks: remarksText, //组织职能说明
+                id: this.state.editId, //组织ID
+                abbreviation: this.state.abbreviation
+              }
+            }).done(
+              function(data) {
+                this.setState({
+                  loading: false
+                });
+                if (!data.error.length) {
+                  message.success("保存成功!");
+                  this.edithandleCancel();
+                  this.selectSuperId();
+                } else {
+                  message.warning(data.error[0].message);
+                }
+              }.bind(this)
+            );
 		        } 
     	}
     },  
@@ -336,33 +372,36 @@ const Organization=Form.create()(React.createClass({
                     };
                 } else {
                     theArr.push({
-                         editId: thisdata.id,//每一条记录的ID
-                         editName:thisdata.name,//组织名称
-                         editManagerId:thisdata.managerId,//负责人
-                         editType:thisdata.type,//组织类型
-                         editStatus:thisdata.status,//组织状态 
-                         editSuperId:thisdata.superId,//上级组织
-                         editDepNo: thisdata.depNo,//组织编号
-                         editCreateId:thisdata.createId,//创建人
-                         editTime:thisdata.createTime,//创建时间
-                         editRemarks:thisdata.remarks,//组织职能说明
+                      editId: thisdata.id, //每一条记录的ID
+                      editName: thisdata.name, //组织名称
+                      editManagerId: thisdata.managerId, //负责人
+                      editType: thisdata.type, //组织类型
+                      editStatus: thisdata.status, //组织状态
+                      editSuperId: thisdata.superId, //上级组织
+                      editDepNo: thisdata.depNo, //组织编号
+                      editCreateId: thisdata.createId, //创建人
+                      editTime: thisdata.createTime, //创建时间
+                      editRemarks: thisdata.remarks, //组织职能说明
+                      financeId: thisdata.financeId
                     });
                    
                 };
                 this.setState({
-                	 editId: thisdata.id,//每一条记录的ID
-                	 editName:thisdata.name,//组织名称
-                	 managerIdOrganization:thisdata.managerName,//负责人名字
-                     managerIdOrganizationId:thisdata.managerId,//负责人idmanagerName
-                     editType:thisdata.type,//组织类型
-                     editStatus:thisdata.status,//组织状态 
-                     editSuperId:thisdata.superId,//上级组织
-                     editDepNo: thisdata.depNo,//组织编号
-                     editCreateId:thisdata.createId,//创建人
-                     editTime:thisdata.createTime,//创建时间
-                     editRemarks: thisdata.remarks,//组织职能说明
-                     editDataSource: theArr,
-					 abbreviation:thisdata.abbreviation
+                  editId: thisdata.id, //每一条记录的ID
+                  financeId: thisdata.financeId,
+                  financeName: thisdata.financeName,
+                  editName: thisdata.name, //组织名称
+                  managerIdOrganization: thisdata.managerName, //负责人名字
+                  managerIdOrganizationId: thisdata.managerId, //负责人idmanagerName
+                  editType: thisdata.type, //组织类型
+                  editStatus: thisdata.status, //组织状态
+                  editSuperId: thisdata.superId, //上级组织
+                  editDepNo: thisdata.depNo, //组织编号
+                  editCreateId: thisdata.createId, //创建人
+                  editTime: thisdata.createTime, //创建时间
+                  editRemarks: thisdata.remarks, //组织职能说明
+                  editDataSource: theArr,
+                  abbreviation: thisdata.abbreviation
                 });
             }.bind(this),
         }).always(function (data) {
@@ -501,6 +540,23 @@ const Organization=Form.create()(React.createClass({
 			theTypes:theType
 		})
 	},
+	selectAuto2(value,options){
+		this.setState({
+			financeId:value
+		})
+		let theType='';
+		let contactLists=this.state.customerArr||[];
+			if (value) {
+            contactLists.map(function (item) {
+                if (item.name == value.toString()) {
+                    theType = item.id;
+                }
+           });     
+   	    }
+		this.setState({
+			theTypes2:theType
+		})
+	},
 	//失去焦点时
 	blurChange(e){
 
@@ -514,10 +570,20 @@ const Organization=Form.create()(React.createClass({
 			managerIdOrganization:e
 		})
 	},
+	httpChange2(e){
+		if(e.length>=1){
+			this.supervisor(e); 
+		}	
+		this.setState({
+			financeName:e
+		})
+	},
     addClick() {
     	this.state.theTypes='';
     	this.state.nameOrganization='';//组织名称清零
     	this.state.managerIdOrganization= '';//负责人ID清零
+    	this.state.financeId = "";//负责人ID清零
+    	this.state.financeName = "";//负责人ID清零
         this.state.typeOrganization= undefined; //组织类型清零
         this.state.upOrganization= undefined;//上级组织清零
         this.state.remarksOrganization= '';//组织职能说明清零
@@ -583,6 +649,9 @@ const Organization=Form.create()(React.createClass({
         const options = dataSources.map((group,index) =>
 				      <Option key={index} value={group.name}>{group.name}</Option>
 				     )
+        const options2 = dataSources.map((group,index) =>
+				      <Option key={index} value={group.name}>{group.name}</Option>
+				     )
         return (
             <div className="user-content" >
                 <div className="content-title">
@@ -824,6 +893,30 @@ const Organization=Form.create()(React.createClass({
 				                                onChange={(e)=>{this.setState({abbreviation:e.target.value})}}/>
 					                    </FormItem>
 				                    </div>
+									<div className="clearfix">
+					                    <FormItem 
+			                           		 labelCol={{ span: 7 }}
+				                        	 wrapperCol={{ span: 12}}
+				                             label="财务负责人"
+				                             >
+						                    <AutoComplete
+											        className="certain-category-search"
+											        dropdownClassName="certain-category-search-dropdown"
+											        dropdownMatchSelectWidth={false}
+											        dataSource={options2}
+											        placeholder="输入名称"
+											        value={this.state.financeName}
+											        onChange={this.httpChange2}
+											        filterOption={true}
+											        onBlur={this.blurChange}
+											        onSelect={this.selectAuto2}
+											        style={{width:'95%'}} 
+											      >
+											        <Input />
+											</AutoComplete> 
+											<span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
+							            </FormItem>
+				                    </div>
 		                   		    <div className="clearfix">
 				                    	<FormItem 
 						                    labelCol={{ span: 7 }}