Browse Source

5-20修改

mentoswzq 4 years ago
parent
commit
392077a66d

+ 45 - 29
js/component/manageCenter/financialManage/content.jsx

@@ -35,7 +35,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/paiDan").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -43,7 +43,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/approvedOutsourcing").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -51,7 +51,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/outsourcingPaiDan").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -59,7 +59,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/outOutsourcingList").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -67,7 +67,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/outInvoiceQuery").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -75,7 +75,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/invoiceApplyList").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -83,7 +83,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/invoiceApplyListQuery").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -91,7 +91,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/invoiceApplyListWai").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -99,7 +99,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/inSpecial").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -107,7 +107,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/outSpecial").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -115,7 +115,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/shouKuang").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -123,7 +123,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/contractChangeCwzy").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -131,7 +131,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/contractChangeCwzj").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -139,7 +139,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/contractChangeCwjl").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -147,7 +147,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/tuiDan").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -155,7 +155,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./flowWater/myWater").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -163,7 +163,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./flowWater/departWater").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -171,7 +171,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./bonus/yxBonus").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -179,7 +179,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./bonus/yxBonusAll").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -187,7 +187,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./bonus/jsBonus").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -195,7 +195,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./bonus/jsBonusAll").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -203,7 +203,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./bonus/jsBonus").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -211,7 +211,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/huiKuan").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -219,7 +219,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/huiKuanLook").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
@@ -227,16 +227,32 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("./distribute/shouKuanAll").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
         break;
       case "approvedOutsourcingAll": //全部外包收款列表
         require.ensure([], () => {
-          let Module = require("./distribute/approvedOutsourcingAll")
-            .default;
+          let Module = require("./distribute/approvedOutsourcingAll").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
+          });
+        });
+        break;
+      //催款统计新
+      case "press":
+        require.ensure([], () => {
+          const Press = require("../order/orderNew/press").default;
+          this.setState({
+            component: <Press />,
+          });
+        });
+        break;
+      case "arrearsList":
+        require.ensure([], () => {
+          const ArrearsList = require("../order/orderNew/arrearsList").default;
+          this.setState({
+            component: <ArrearsList />,
           });
         });
         break;
@@ -244,7 +260,7 @@ class Content extends Component {
         require.ensure([], () => {
           let Module = require("../module").default;
           this.setState({
-            component: <Module />
+            component: <Module />,
           });
         });
     };

+ 14 - 0
js/component/manageCenter/order/orderNew/addService.jsx

@@ -952,6 +952,13 @@ const NewService = Form.create()(
                     {record.dunType == 0 ? (
                       <DatePicker
                         style={{ width: 150 }}
+                        disabledDate={(e) => {
+                          let time = moment(e).valueOf();
+                          let today = Date.parse(new Date());
+                          if(time <= today ) {
+                            return true
+                          }
+                        }}
                         onChange={(e, t) => {
                           record.customizeTimes = t;
                         }}
@@ -1396,6 +1403,13 @@ const NewService = Form.create()(
                     {record.dunType == 0 ? (
                       <DatePicker
                         style={{ width: 150 }}
+                        disabledDate={(e) => {
+                          let time = moment(e).valueOf();
+                          let today = Date.parse(new Date());
+                          if (time <= today) {
+                            return true;
+                          }
+                        }}
                         onChange={(e, t) => {
                           record.customizeTimes = t;
                         }}

+ 1 - 0
js/component/manageCenter/order/orderNew/billing.jsx

@@ -1807,6 +1807,7 @@ const MyService = Form.create()(
                   </Select>
                   <span style={{ marginRight: "10px" }}>下单时间 :</span>
                   <RangePicker
+                  style={{ width:200 }}
                     value={[
                       this.state.releaseDate[0]
                         ? moment(this.state.releaseDate[0])

+ 9 - 0
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -12,8 +12,10 @@ import {
   Popconfirm,
   Modal,
   AutoComplete,
+  DatePicker
 } from "antd";
 import $ from "jquery/src/ajax";
+import moment from "moment";
 import ResolutionDetail from "@/resolutionDetail";
 import PicturesWall from "./picturesWall";
 import Rizhi from "./rizhi";
@@ -301,6 +303,13 @@ class ChangeApply extends Component {
                 {record.dunType == 0 ? (
                   <DatePicker
                     style={{ width: 150 }}
+                    disabledDate={(e) => {
+                      let time = moment(e).valueOf();
+                      let today = Date.parse(new Date());
+                      if (time <= today) {
+                        return true;
+                      }
+                    }}
                     onChange={(e, t) => {
                       record.customizeTimes = t;
                     }}

+ 12 - 3
js/component/manageCenter/order/orderNew/press.jsx

@@ -494,7 +494,12 @@ const IntentionCustomer = Form.create()(React.createClass({
             <TabPane tab="搜索" key="1">
               <Input
                 placeholder="客户名称"
-                style={{ width: "150px", marginBottom: "10px", marginLeft: 10 }}
+                style={{
+                  width: "150px",
+                  marginBottom: "10px",
+                  marginLeft: 10,
+                  marginRight: 10,
+                }}
                 value={this.state.customerName}
                 onChange={(e) => {
                   this.setState({ customerName: e.target.value });
@@ -502,7 +507,11 @@ const IntentionCustomer = Form.create()(React.createClass({
               />
               <Input
                 placeholder="营销员名称"
-                style={{ width: "150px", marginBottom: "10px" }}
+                style={{
+                  width: "150px",
+                  marginBottom: "10px",
+                  marginRight: 10,
+                }}
                 value={this.state.adminName}
                 onChange={(e) => {
                   this.setState({ adminName: e.target.value });
@@ -510,7 +519,7 @@ const IntentionCustomer = Form.create()(React.createClass({
               />
               <Input
                 placeholder="订单编号"
-                style={{ width: "150px" }}
+                style={{ width: "150px", marginRight: 10 }}
                 value={this.state.orderNo}
                 onChange={(e) => {
                   this.setState({ orderNo: e.target.value });

+ 204 - 120
js/component/manageCenter/set/userManagementS/addjurisdiction.jsx

@@ -30,28 +30,31 @@ const Addjurisdiction = Form.create()(React.createClass({
                     loading: true
                 });
                 $.ajax({
-                    method: "POST",
-                    dataType: "json",
-                    crossDomain: false,
-                    url: globalConfig.context + api,
-                    data: {
-                    	id:this.state.ids,
-                        name:this.state.name, //接口名称
-						url:this.state.url,//接口路径
-						type:this.state.urlType||'0',
-						superId:this.state.auto,//接口上级模板功能
-                    }
-                }).done(function (data) { 
+                  method: "POST",
+                  dataType: "json",
+                  crossDomain: false,
+                  url: globalConfig.context + api,
+                  data: {
+                    id: this.state.ids,
+                    name: this.state.name, //接口名称
+                    url: this.state.url, //接口路径
+                    type: this.state.urlType || "0",
+                    superId: this.state.auto, //接口上级模板功能
+                    showOrder: this.state.showOrder,
+                  },
+                }).done(
+                  function (data) {
                     this.setState({
-                        loading: false
+                      loading: false,
                     });
                     if (!data.error.length) {
-                        message.success('保存成功!');
-                        this.props.closeDesc(false,true);
+                      message.success("保存成功!");
+                      this.props.closeDesc(false, true);
                     } else {
-                        message.warning(data.error[0].message);
+                      message.warning(data.error[0].message);
                     }
-                }.bind(this));
+                  }.bind(this)
+                );
             }
         });
     },
@@ -132,16 +135,17 @@ const Addjurisdiction = Form.create()(React.createClass({
                     thisData = {};
                 }; 
                 this.setState({
-                	ids:thisData.id,
-                	name:thisData.name, //接口名称
-                	urlType:thisData.type.toString(),
-					url:thisData.url,//接口路径
-					preModule:thisData.preModule,//接口上级模板功能
-                	createId:thisData.createId,
-                	createTime:(new Date(thisData.createTime)).toLocaleString(),
-                	updateTime:(new Date(thisData.updateTime)).toLocaleString(),
-                	autNo:thisData.autNo,
-                	auto:thisData.superId,
+                  ids: thisData.id,
+                  name: thisData.name, //接口名称
+                  urlType: thisData.type.toString(),
+                  url: thisData.url, //接口路径
+                  preModule: thisData.preModule, //接口上级模板功能
+                  createId: thisData.createId,
+                  createTime: new Date(thisData.createTime).toLocaleString(),
+                  updateTime: new Date(thisData.updateTime).toLocaleString(),
+                  autNo: thisData.autNo,
+                  auto: thisData.superId,
+                  showOrder: thisData.showOrder,
                 });                  
             }.bind(this),
        }).always(function () {
@@ -187,99 +191,179 @@ const Addjurisdiction = Form.create()(React.createClass({
 				      <Option key={index} value={group.name}>{group.name}</Option>
 				     )
         return (
-        <div>
-           <Modal maskClosable={false} visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='600px'
-                        title={this.props.userDetaile?'权限详情':'新建权限'}                      
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form">
-			                <Spin spinning={this.state.loading}>
-			                        <div className="clearfix">
-				                    	<FormItem className="half-middle"
-					                            {...formItemLayout}
-					                            label="接口名称" >   			                           
-				                                    <Input placeholder="接口名称" value={this.state.name} style={{width:'230px'}}
-				                                    onChange={(e)=>{this.setState({name:e.target.value})}} required="required"/>
-					                   			<span className="mandatory">*</span>
-					                   </FormItem>
-					                    <FormItem className="half-middle"
-					                            {...formItemLayout}
-					                            label="接口路径" >   
-				                                    <Input placeholder="接口路径" value={this.state.url} style={{width:'230px'}}
-				                                    onChange={(e)=>{this.setState({url:e.target.value})}} required="required"/>
-					                    		<span className="mandatory">*</span>	
-					                    </FormItem>
-					                    <FormItem className="half-middle"
-					                            {...formItemLayout}
-					                            label="接口类型" >   
-			                                    {this.props.userDetaile?<Select placeholder="选择接口类型" style={{width:'230px'}}
-						                            value={this.state.urlType}
-						                            onChange={(e) => { this.setState({ urlType: e }) }}>
-						                            {
-					                                    urlType.map(function (item) {
-					                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-					                                    })
-					                                }
-							                    </Select>:
-							                    <span>导航</span>
-					                    		}	
-					                    </FormItem>
-				                    </div>
-				                    <div className="clearfix" style={{display:this.props.userDetaile?'block':'none'}}>
-				                    	<FormItem className="half-middle"
-					                            {...formItemLayout}
-					                            label="上级功能模块" >   
-				                                    <AutoComplete
-											        className="certain-category-search"
-											        dropdownClassName="certain-category-search-dropdown"
-											        dropdownMatchSelectWidth={false}
-											        dropdownStyle={{ width: 230 }}
-											        size="large"
-											        style={{ width: '230px' }}
-											        dataSource={options}
-											        placeholder="输入名称"
-											        value={this.state.auto}
-											        onChange={this.httpChange}
-											        filterOption={true}
-											        onBlur={this.blurChange}
-											        onSelect={this.selectAuto}
-											      >
-											        <Input/>
-											      </AutoComplete> 
-											      <span className="mandatory">*</span>
-					                    </FormItem>
-				                    	<FormItem className="half-middle"
-					                            {...formItemLayout}
-					                            label="权限编号" >   
-					                            <span>{this.state.autNo}</span>
-					                    </FormItem>
-					                    <FormItem className="half-middle"
-					                            {...formItemLayout}
-					                            label="创建人" >   
-					                            <span>{this.state.createId}</span>
-					                    </FormItem>
-			                   		    <FormItem className="half-middle"
-					                            {...formItemLayout}
-					                            label="创建时间" >   
-					                            <span>{this.state.createTime}</span>
-					                    </FormItem>
-					                    <FormItem className="half-middle"
-					                            {...formItemLayout}
-					                            label="更新时间" >   
-					                           <span>{this.state.updateTime}</span>
-					                    </FormItem>
-				                    </div>	
-			                    <FormItem className="half-middle">
-			                        <Button className="set-submit" type="primary" htmlType="submit" style={{marginLeft:'150px'}}>保存</Button>  
-			                        <Button className="set-submit" type="ghost" onClick={this.handleCancel}>取消</Button>
-			                    </FormItem> 
-			                </Spin>
-			            </Form >
-			        </Modal>    
-    	    </div>
-        )
+          <div>
+            <Modal
+              maskClosable={false}
+              visible={this.state.visible}
+              onOk={this.handleOk}
+              onCancel={this.handleCancel}
+              width="600px"
+              title={this.props.userDetaile ? "权限详情" : "新建权限"}
+              footer=""
+              className="admin-desc-content"
+            >
+              <Form
+                layout="horizontal"
+                onSubmit={this.handleSubmit}
+                id="demand-form"
+              >
+                <Spin spinning={this.state.loading}>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-middle"
+                      {...formItemLayout}
+                      label="接口名称"
+                    >
+                      <Input
+                        placeholder="接口名称"
+                        value={this.state.name}
+                        style={{ width: "230px" }}
+                        onChange={(e) => {
+                          this.setState({ name: e.target.value });
+                        }}
+                        required="required"
+                      />
+                      <span className="mandatory">*</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-middle"
+                      {...formItemLayout}
+                      label="接口路径"
+                    >
+                      <Input
+                        placeholder="接口路径"
+                        value={this.state.url}
+                        style={{ width: "230px" }}
+                        onChange={(e) => {
+                          this.setState({ url: e.target.value });
+                        }}
+                        required="required"
+                      />
+                      <span className="mandatory">*</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-middle"
+                      {...formItemLayout}
+                      label="接口类型"
+                    >
+                      {this.props.userDetaile ? (
+                        <Select
+                          placeholder="选择接口类型"
+                          style={{ width: "230px" }}
+                          value={this.state.urlType}
+                          onChange={(e) => {
+                            this.setState({ urlType: e });
+                          }}
+                        >
+                          {urlType.map(function (item) {
+                            return (
+                              <Select.Option key={item.value}>
+                                {item.key}
+                              </Select.Option>
+                            );
+                          })}
+                        </Select>
+                      ) : (
+                        <span>导航</span>
+                      )}
+                    </FormItem>
+                  </div>
+                  <div
+                    className="clearfix"
+                    style={{
+                      display: this.props.userDetaile ? "block" : "none",
+                    }}
+                  >
+                    <FormItem
+                      className="half-middle"
+                      {...formItemLayout}
+                      label="上级功能模块"
+                    >
+                      <AutoComplete
+                        className="certain-category-search"
+                        dropdownClassName="certain-category-search-dropdown"
+                        dropdownMatchSelectWidth={false}
+                        dropdownStyle={{ width: 230 }}
+                        size="large"
+                        style={{ width: "230px" }}
+                        dataSource={options}
+                        placeholder="输入名称"
+                        value={this.state.auto}
+                        onChange={this.httpChange}
+                        filterOption={true}
+                        onBlur={this.blurChange}
+                        onSelect={this.selectAuto}
+                      >
+                        <Input />
+                      </AutoComplete>
+                      <span className="mandatory">*</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-middle"
+                      {...formItemLayout}
+                      label="排序"
+                    >
+                      <Input
+                        placeholder="排序数字"
+                        value={this.state.showOrder}
+                        style={{ width: "230px" }}
+                        onChange={(e) => {
+                          this.setState({ showOrder: e.target.value });
+                        }}
+                        required="required"
+                      />
+                    </FormItem>
+                    <FormItem
+                      className="half-middle"
+                      {...formItemLayout}
+                      label="权限编号"
+                    >
+                      <span>{this.state.autNo}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-middle"
+                      {...formItemLayout}
+                      label="创建人"
+                    >
+                      <span>{this.state.createId}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-middle"
+                      {...formItemLayout}
+                      label="创建时间"
+                    >
+                      <span>{this.state.createTime}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-middle"
+                      {...formItemLayout}
+                      label="更新时间"
+                    >
+                      <span>{this.state.updateTime}</span>
+                    </FormItem>
+                  </div>
+                  <FormItem className="half-middle">
+                    <Button
+                      className="set-submit"
+                      type="primary"
+                      htmlType="submit"
+                      style={{ marginLeft: "150px" }}
+                    >
+                      保存
+                    </Button>
+                    <Button
+                      className="set-submit"
+                      type="ghost"
+                      onClick={this.handleCancel}
+                    >
+                      取消
+                    </Button>
+                  </FormItem>
+                </Spin>
+              </Form>
+            </Modal>
+          </div>
+        );
     }
 }));
 

+ 9 - 0
js/component/manageCenter/statistics/content.jsx

@@ -46,6 +46,15 @@ class Content extends Component {
               });
             });
             break;
+          //催款列表
+          case "pressList":
+            require.ensure([], () => {
+              const PressList = require("../order/orderNew/pressList").default;
+              this.setState({
+                component: <PressList />,
+              });
+            });
+            break;
           case "bonusList":
             require.ensure([], () => {
               const BonusList = require("./personnel/bonusList").default;

+ 1 - 0
js/component/manageCenter/statistics/personnel/addPicModal.jsx

@@ -2,6 +2,7 @@ import React from "react";
 import { Spin, Button, Tabs, Table, message, Modal, Upload, Form, Input } from "antd";
 import { splitUrl } from "@/tools";
 import PicturesWall from "./picturesWall";
+import "./remove.less"
 const FormItem = Form.Item;
 
 const AddPicModal = React.createClass({

+ 81 - 25
js/component/manageCenter/statistics/personnel/personnelAll.jsx

@@ -149,9 +149,9 @@ const PersonnelAll = React.createClass({
       },
       columns: [
         {
-          title: "人事编号",
-          dataIndex: "id",
-          key: "id",
+          title: "员工编号",
+          dataIndex: "employeeId",
+          key: "employeeId",
         },
         {
           title: "门禁编号",
@@ -197,14 +197,17 @@ const PersonnelAll = React.createClass({
           title: "转正时间",
           dataIndex: "promotionTimes",
           key: "promotionTimes",
-          render: text => {
+          render: (text) => {
             let time = moment(text).valueOf();
             let today = Date.parse(new Date());
-            if(today > time) {
-              return <span style={{ color: "red", fontWeight: 900 }}>{text}</span>
+            let sevenDay = 604800000;
+            if (time - today < sevenDay) {
+              return (
+                <span style={{ color: "red", fontWeight: 900 }}>{text}</span>
+              );
             }
-            return text
-          }
+            return text;
+          },
         },
         {
           title: "生日日期",
@@ -276,11 +279,16 @@ const PersonnelAll = React.createClass({
           dataIndex: "contractStart",
           key: "contractStart",
           render: (text, record) => {
-            let end = moment(record.contractEnd).valueOf()
-            let today = Date.parse(new Date())
+            let end = moment(record.contractEnd).valueOf();
+            let today = Date.parse(new Date());
+            let sevenDay = 604800000;
             if (text) {
-              if(today > end) {
-                return <span style={{color: "red", fontWeight: 900}}>{text + "~" + record.contractEnd}</span>;
+              if (end - today < sevenDay) {
+                return (
+                  <span style={{ color: "red", fontWeight: 900 }}>
+                    {text + "~" + record.contractEnd}
+                  </span>
+                );
               }
               return text + "~" + record.contractEnd;
             }
@@ -484,7 +492,7 @@ const PersonnelAll = React.createClass({
       table: [
         {
           key: "员工编号",
-          value: "id",
+          value: "employeeId",
         },
         {
           key: "姓名",
@@ -830,6 +838,7 @@ const PersonnelAll = React.createClass({
       certificationAuthority: undefined,
       marriage: undefined,
       politicalOutlook: undefined,
+      employeeId: undefined,
       son: undefined,
       girl: undefined,
       birthdays: undefined,
@@ -847,6 +856,35 @@ const PersonnelAll = React.createClass({
       url: globalConfig.context + "/api/admin/personnel/checkDoorId",
       data: {
         doorId: this.state.doorId,
+        id: this.state.id,
+      },
+      success: function (data) {
+        if (data.error && data.error.length) {
+          message.warning(data.error[0].message);
+        } else {
+          message.success("此编号未被占用");
+        }
+      }.bind(this),
+    }).always(
+      function () {
+        this.setState({
+          loading: false,
+        });
+      }.bind(this)
+    );
+  },
+  verifyId() {
+    this.setState({
+      loading: true,
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/personnel/checkEmployeeId",
+      data: {
+        employeeId: this.state.employeeId,
+        id: this.state.id
       },
       success: function (data) {
         if (data.error && data.error.length) {
@@ -895,6 +933,7 @@ const PersonnelAll = React.createClass({
         girl: this.state.girl,
         birthdays: this.state.birthdays,
         marriage: this.state.marriage,
+        employeeId: this.state.employeeId,
       },
       success: function (data) {
         let theArr = [];
@@ -947,6 +986,7 @@ const PersonnelAll = React.createClass({
         girl: this.state.girl,
         birthdays: this.state.birthdays,
         marriage: this.state.marriage,
+        employeeId: this.state.employeeId,
       },
       success: function (data) {
         let theArr = [];
@@ -995,9 +1035,11 @@ const PersonnelAll = React.createClass({
       marriage: this.state.ModalData.marriage,
       son: this.state.ModalData.son,
       girl: this.state.ModalData.girl,
-      politicalOutlook: this.state.ModalData.politicalOutlook ? this.state.ModalData.politicalOutlook : undefined,
-      marriage: this.state.ModalData.marriage,
+      politicalOutlook: this.state.ModalData.politicalOutlook || this.state.ModalData.politicalOutlook == 0
+        ? this.state.ModalData.politicalOutlook
+        : undefined,
       marriage: this.state.ModalData.marriage,
+      employeeId: this.state.ModalData.employeeId,
     });
   },
   stayModal(id) {
@@ -3704,16 +3746,23 @@ const PersonnelAll = React.createClass({
                   label="员工编号"
                 >
                   <Input
-                    placeholder=""
+                    placeholder="请输入员工编号"
                     style={{ width: 200 }}
-                    disabled
-                    value={!this.state.isAddPeo ? this.state.id : undefined}
+                    value={this.state.employeeId}
                     onChange={(e) => {
                       this.setState({
-                        id: e.target.value,
+                        employeeId: e.target.value,
                       });
                     }}
                   />
+                  <Button
+                    disabled={this.state.employeeId || this.state.employeeId == 0 ? false : true}
+                    style={{ position: "absolute" }}
+                    type={"primary"}
+                    onClick={this.verifyId}
+                  >
+                    验证重复
+                  </Button>
                 </FormItem>
                 <FormItem
                   className="half-item"
@@ -3731,7 +3780,7 @@ const PersonnelAll = React.createClass({
                     }}
                   />
                   <Button
-                    disabled={this.state.doorId ? false : true}
+                    disabled={this.state.doorId || this.state.doorId == 0 ? false : true}
                     style={{ position: "absolute" }}
                     type={"primary"}
                     onClick={this.verifyDoor}
@@ -4042,16 +4091,23 @@ const PersonnelAll = React.createClass({
                 label="员工编号"
               >
                 <Input
-                  placeholder=""
+                  placeholder="请输入员工编号"
                   style={{ width: 200 }}
-                  disabled
-                  value={this.state.id}
+                  value={this.state.employeeId}
                   onChange={(e) => {
                     this.setState({
-                      id: e.target.value,
+                      employeeId: e.target.value,
                     });
                   }}
                 />
+                <Button
+                  disabled={this.state.employeeId || this.state.employeeId == 0 ? false : true}
+                  style={{ position: "absolute" }}
+                  type={"primary"}
+                  onClick={this.verifyId}
+                >
+                  验证重复
+                </Button>
               </FormItem>
               <FormItem
                 className="half-item"
@@ -4069,7 +4125,7 @@ const PersonnelAll = React.createClass({
                   }}
                 />
                 <Button
-                  disabled={this.state.doorId ? false : true}
+                  disabled={this.state.doorId || this.state.doorId == 0 ? false : true}
                   style={{ position: "absolute" }}
                   type={"primary"}
                   onClick={this.verifyDoor}

+ 1 - 0
js/component/manageCenter/statistics/personnel/personnelList.less

@@ -22,6 +22,7 @@
         box-sizing: border-box;
         text-align: center;
         line-height: 48px;
+        overflow: hidden;
         .peo-left {
             width: 40%;
             height: 100%;

+ 15 - 4
js/component/manageCenter/statistics/personnel/picModal.jsx

@@ -1,5 +1,14 @@
 import React from "react";
-import { Spin, Button, Tabs, Table, message, Modal, Upload } from "antd";
+import {
+  Spin,
+  Button,
+  Tabs,
+  Table,
+  message,
+  Modal,
+  Upload,
+  Tooltip,
+} from "antd";
 import { splitUrl } from "@/tools";
 import "./remove.less"
 
@@ -85,9 +94,11 @@ const PicModal = React.createClass({
                   });
                 }}
               />
-              <div style={{ textAlign: "center" }}>
-                {this.props.remarks[index]}
-              </div>
+              <Tooltip placement="top" title={this.props.remarks[index]}>
+                <div style={{ textAlign: "center" }}>
+                  {this.props.remarks[index].length > 7 ? this.props.remarks[index].substring(0,7) + "..." : this.props.remarks[index]}
+                </div>
+              </Tooltip>
             </div>
           );
         })}

+ 4 - 1
js/component/manageCenter/statistics/personnel/remove.less

@@ -1,3 +1,6 @@
 // .anticon-delete {
 //     // display: none !important;
-// }
+// }
+.ant-modal-footer {
+    border-top: none;
+}