3 Commits fb498ed6bf ... ba2c49fca0

Autor SHA1 Mensaje Fecha
  dev01 ba2c49fca0 项目和客户模块优化 hace 2 meses
  dev01 9e6ea18b0e bug调整 hace 2 meses
  dev01 c8904a0cc3 项目子表列宽优化 hace 2 meses
Se han modificado 25 ficheros con 479 adiciones y 130 borrados
  1. 7 2
      js/component/common/enterpriseNameChange/inforChange.jsx
  2. 176 38
      js/component/common/projectOperation/newAddProject.jsx
  3. 4 4
      js/component/common/projectOperation/newEditProject.jsx
  4. 2 2
      js/component/manageCenter/customer/NEW/crm/customerProfile.jsx
  5. 21 0
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/contactPerson.jsx
  6. 17 7
      js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx
  7. 15 5
      js/component/manageCenter/customer/NEW/query/queryCutomer.jsx
  8. 18 0
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/contactPerson.jsx
  9. 9 2
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  10. 21 10
      js/component/manageCenter/order/orderNew/addService.jsx
  11. 9 0
      js/component/manageCenter/order/orderNew/approveds.jsx
  12. 9 0
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  13. 9 0
      js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx
  14. 15 0
      js/component/manageCenter/order/orderNew/examine.jsx
  15. 9 0
      js/component/manageCenter/order/orderNew/examinejl.jsx
  16. 9 0
      js/component/manageCenter/order/orderNew/examineyybz.jsx
  17. 9 0
      js/component/manageCenter/order/orderNew/inquiry.jsx
  18. 9 0
      js/component/manageCenter/order/orderNew/reject.jsx
  19. 9 0
      js/component/manageCenter/project/project/projectAssignment.jsx
  20. 9 0
      js/component/manageCenter/project/summary/projectDetails.jsx
  21. 41 32
      js/component/manageCenter/project/task/myTask.jsx
  22. 9 0
      js/component/manageCenter/project/task/taskAssignment.jsx
  23. 9 0
      js/component/manageCenter/project/task/taskQuery.jsx
  24. 34 27
      js/component/manageCenter/set/userManagementS/newUser.jsx
  25. 0 1
      js/component/project.jsx

+ 7 - 2
js/component/common/enterpriseNameChange/inforChange.jsx

@@ -78,7 +78,7 @@ class InforChange extends Component {
       locationProvince: props.data.locationProvince,
       businessScope: props.data.businessScope,
       intendedProject: props.data.intendedProject,
-      industryName: props.data.industry,
+      industryName: props.data.industryName,
       nature: nature,
       natureText: "",
       natureOther: props.data.natureOther,
@@ -291,7 +291,8 @@ class InforChange extends Component {
       // this.props.onCancel();
     }
     if (this.state.changeType === 4) {
-      data.industry = dataArrar
+      data.industry = dataArrar.join(',')
+      data.industryName = getIndustry(dataArrar)
     }
     if (this.state.changeType === 5) {
       let enterpriseNature = undefined; // 企业性质 0=其他,1=国企,2=央企,3=私企,4=合资企业(含港澳台),5=外资控股
@@ -307,6 +308,9 @@ class InforChange extends Component {
       data.listedNature = listedNature;
       data.natureOther = this.state.natureOther;
     }
+
+
+    console.log(data)
     $.ajax({
       url: globalConfig.context + "/api/admin/customer/updateUserDate",
       method: "post",
@@ -719,6 +723,7 @@ class InforChange extends Component {
                                         dataArrar: e
                                       })
                                     }}
+                                    multiple
                                   >
                                     {
                                       industry.map(function (item) {

+ 176 - 38
js/component/common/projectOperation/newAddProject.jsx

@@ -278,8 +278,21 @@ class NewAddProject extends Component {
       }
     }
 
+    let flag = true;
+    let errorText = '';
+    for (let i=0; i<this.state.subProList.length; i++) {
+      if (!this.state.subProList[i].serviceYear) {
+        flag = false;
+        errorText = "派单年份不能为空!"
+      }
+    }
+    if (!flag) {
+      message.warning(errorText);
+      return;
+    }
+
     let sonList = this.state.subProList.map(item => {
-      if (this.state.projectType == 1) {
+      if (this.state.projectType == 1 && item.newCheck) {
         item.htMember = item.newCheck.includes(1) ? 1 : 0
         item.additionalDeduction = item.newCheck.includes(2) ? 1 : 0
         item.rdAwardsubsidy = item.newCheck.includes(3) ? 1 : 0
@@ -716,6 +729,22 @@ class NewAddProject extends Component {
     return [...new Set(newCheckType)]
   }
 
+  calcNewCheckType(list) {
+    let newCheckType = [];
+    list.map(item => {
+      if (item.htMember == 1) {
+        newCheckType.push(1);
+      }
+      if (item.additionalDeduction == 1) {
+        newCheckType.push(2)
+      }
+      if (item.rdAwardsubsidy == 1) {
+        newCheckType.push(3)
+      }
+    });
+    return newCheckType;
+  }
+
   render() {
     let newOptions = this.state.customerArr.map((group, index) => (
       <Select.Option key={index} value={group.bname}>
@@ -1351,31 +1380,7 @@ class NewAddProject extends Component {
                     </FormItem>
                   </div> : null
               }
-              {((isVip != 6) || (isVip == 6 && !isEdit)) &&
-                <div className="clearfix">
-                  <FormItem
-                    wrapperCol={{ span: 12, offset: 8 }}
-                    className="half-middle"
-                  >
-                    <Button
-                      className="submitSave"
-                      type="primary"
-                      onClick={() => {
-                        this.onSubmit();
-                      }}
-                    >
-                      保存
-                    </Button>
-                    <Button
-                      className="submitSave"
-                      type="ghost"
-                      onClick={this.props.onCancel}
-                    >
-                      取消
-                    </Button>
-                  </FormItem>
-                </div>
-              }
+
               {
                 // 会员项目子集列表
                 isEdit &&
@@ -1466,13 +1471,30 @@ class NewAddProject extends Component {
               }
               { this.state.subProList.map((item, idx) => {
                 return (
-                  <div>
+                  <div style={{margin: '15px 0'}}>
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
-                      label="本次派单"
+                      label="派单年份"
                     >
-                      { item.serviceYear }
+                      <Select
+                        placeholder="请选择本次派单年份"
+                        style={{ width: "200px" }}
+                        value={item.serviceYear}
+                        onChange={(e) => {
+                          item.serviceYear = e;
+                          this.setState({ subProList: this.state.subProList });
+                        }}
+                      >
+                        {this.state.serviceLife.map(year => {
+                          return (
+                            <Select.Option key={year} disabled={this.state.subProList.some(item => item.serviceYear == year)}>
+                              {year}
+                            </Select.Option>
+                          );
+                        })}
+                      </Select>
+                      {<span className="mandatory">*</span>}
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -1509,8 +1531,12 @@ class NewAddProject extends Component {
                             value={item.newCheck}
                             onChange={e => {
                               item.newCheck = e;
+                              item.htMember = item.newCheck.includes(1) ? 1 : 0
+                              item.additionalDeduction = item.newCheck.includes(2) ? 1 : 0;
+                              item.rdAwardsubsidy = item.newCheck.includes(3) ? 1 : 0;
                               this.setState({
-                                subProList: this.state.subProList
+                                subProList: this.state.subProList,
+                                checkType: this.calcNewCheckType(this.state.subProList), // 临时显示
                               })
                             }}
                           />
@@ -1593,6 +1619,117 @@ class NewAddProject extends Component {
                   </div>
                 )
               }) }
+              
+              {((isVip != 6) || (isVip == 6 && !isEdit)) &&
+                <div className="clearfix">
+                  { isVip != 6 ? (
+                    <FormItem
+                      wrapperCol={{ span: 12, offset: 8 }}
+                      className="half-middle"
+                    >
+
+                      <Button
+                        className="submitSave"
+                        type="primary"
+                        onClick={() => {
+                          this.onSubmit();
+                        }}
+                      >
+                        保存
+                      </Button>
+                      <Button
+                        className="submitSave"
+                        type="ghost"
+                        onClick={() => this.props.onCancel()}
+                      >
+                        取消
+                      </Button>
+                      
+                    </FormItem>
+                  ) : (
+                    <FormItem
+                      wrapperCol={{ span: 12, offset: 8 }}
+                      className="half-middle"
+                    >
+                      { this.state.subProList && this.state.subProList.length ? (
+                        <div>
+                          <Button
+                            className="submitSave"
+                            type="primary"
+                            onClick={() => {
+                              const { subProList } = this.state;
+                              if (!subProList[subProList.length - 1].serviceYear) {
+                                message.warning("请先选择上一个派单的年份!");
+                                return;
+                              }
+                              subProList.push({});
+                              this.setState({ subProList });
+                            }}
+                            disabled={this.state.subProList.length >= this.state.serviceLife.length}
+                          >
+                            + 继续添加,本次派单
+                          </Button>
+                          <Button
+                            className="submitSave"
+                            type="primary"
+                            onClick={() => {
+                              this.onSubmit();
+                            }}
+                          >
+                            保存,确定本次派单
+                          </Button>
+                        </div>
+                      ) : (
+                        <div>
+                          <Button
+                            className="submitSave"
+                            type="primary"
+                            onClick={() => {
+                              const { subProList } = this.state;
+                              subProList.push({});
+                              this.setState({ subProList });
+                            }}
+                            >
+                            + 添加本次派单
+                            </Button>
+                            <Button
+                            className="submitSave"
+                            type="primary"
+                            onClick={() => {
+                              this.onSubmit();
+                            }}
+                            >
+                            暂不开启工作
+                          </Button>
+                        </div>
+
+                      ) }
+                      
+                    </FormItem>
+                  ) }
+                  
+                </div>
+              }
+              {/* { this.state.subProList.length < this.state.serviceLife.length &&
+                <div className="clearfix">
+                  <FormItem
+                    wrapperCol={{ span: 19, offset: 8 }}
+                    className="half-middle"
+                  >
+                    <Button
+                      type="primary"
+                      onClick={() => {
+                        const { subProList } = this.state;
+                        subProList.push({});
+                        this.setState({ subProList });
+                      }}
+                    >
+                      + 添加本次派单
+                    </Button>
+                    <span style={{ color: "#61BBE2", marginLeft: 10 }}>请填写本次派单的年份,派单表示立即安排人员开始相关的工作!!!</span>
+                  </FormItem>
+                </div>
+              } */}
               {/* {
                 this.state.splitList.length < this.state.yearSum &&
                 <div
@@ -1814,12 +1951,13 @@ class NewAddProject extends Component {
 
               const { subProList } = this.state;
 
+
               if (this.state.isGive == 0) {
                 this.state.addyear.map(year => {
                   slist.push(year)
-                  if (!subProList.some(item => item.serviceYear == year)) {
-                    subProList.push({ serviceYear: year, newCheck: [] });
-                  }
+                  // if (!subProList.some(item => item.serviceYear == year)) {
+                  //   subProList.push({ serviceYear: year, newCheck: [] });
+                  // }
                 })
                 // slist.push(this.state.addyear)
               } else if (this.state.isGive == 1) {
@@ -1827,17 +1965,17 @@ class NewAddProject extends Component {
                 // slist.push(newYear)
                 this.state.addyear.map(year => {
                   slist.push(year + "(赠)")
-                  if (!subProList.some(item => item.serviceYear == year)) {
-                    subProList.push({ serviceYear: year + "(赠)", newCheck: [] });
-                  }
+                  // if (!subProList.some(item => item.serviceYear == year)) {
+                  //   subProList.push({ serviceYear: year + "(赠)", newCheck: [] });
+                  // }
                 })
               }
-              console.log(subProList)
+
               this.setState({
                 serviceLife: slist,
                 yearSum: slist.length.toString(),
                 addYears: false,
-                subProList,
+                // subProList,
                 addForm: true
               })
             }}

+ 4 - 4
js/component/common/projectOperation/newEditProject.jsx

@@ -229,21 +229,21 @@ class newEditProject extends Component {
     const updatedList = this.getUpdatedSubProject();
     let subLen = updatedList.length;
     if (subLen === 0) {
-      this.saveParentProject();
+      this.saveParentProject(text);
     }
 
     updatedList.map((item) => this.handleUpdateSubProject(item, () => {
       subLen -= 1;
       if (subLen === 0) {
-        this.saveParentProject();
+        this.saveParentProject(text);
       }
     }, () => {
       subLen -= 1;
-      this.saveParentProject();
+      this.saveParentProject(text);
     }));
   }
 
-  saveParentProject() {
+  saveParentProject(text) {
     const { type = "", dataInfor } = this.props
     if (isNaN(parseFloat(this.state.commodityPrice))) {
       message.warning("请输入正确的金额!");

+ 2 - 2
js/component/manageCenter/customer/NEW/crm/customerProfile.jsx

@@ -206,7 +206,7 @@ const IntentionCustomer = Form.create()(React.createClass({
         dataIndex: 'operate',
         key: 'operate',
         width: 120,
-        render: text => {
+        render: (text, record) => {
           return (
             <div>
               <Button
@@ -214,7 +214,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                   e.stopPropagation();
                   this.setState({
                     visible: true,
-                    uid: text
+                    uid: record.id
                   })
                 }} type="primary" style={{ marginLeft: '10px' }}>主营日志</Button>
             </div>

+ 21 - 0
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/contactPerson.jsx

@@ -9,10 +9,13 @@ import {
   Modal,
   Input,
   InputNumber,
+  Radio,
 } from "antd";
 import $ from "jquery/src/ajax";
 import EnterpriseNameChange from '../../../../../../../component/common/enterpriseNameChange';
 import AddContact from "../../../signCustomer/followDetail/addContact";
+const RadioGroup = Radio.Group;
+
 
 const { TextArea } = Input;
 const ContactPerson = React.createClass({
@@ -452,6 +455,7 @@ const ContactPerson = React.createClass({
                       utilityModelCount: detail.utilityModelCount,
                       appearancePatentCount: detail.appearancePatentCount,
                       softwareWorksCount: detail.softwareWorksCount,
+                      standard: detail.standard,
                       otherCount: detail.otherCount,
                     }
                   })
@@ -467,6 +471,7 @@ const ContactPerson = React.createClass({
             实用新型&nbsp;{detail.utilityModelCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
             外观专利&nbsp;{detail.appearancePatentCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
             软著&nbsp;{detail.softwareWorksCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
+            标准&nbsp;{detail.standard == 1 ? '有' : '无'}&nbsp;&nbsp;&nbsp;&nbsp;
             其他&nbsp;{detail.otherCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
           </div>
           <div style={{ fontWeight: "bold", marginTop: 10 }}>
@@ -626,6 +631,22 @@ const ContactPerson = React.createClass({
                   </div>
                 </div>
                 <div className='enterpriseNameItem'>
+                  <div className='enterpriseNameTitle'>标准:</div>
+                  <div className='enterpriseNameValue'>
+                     <RadioGroup onChange={e => {
+                      console.log(e)
+                      this.setState({
+                        upData: Object.assign(upData, {
+                          standard: e.target.value,
+                        }),
+                      })
+                     }} value={upData.standard}>
+                      <Radio value={1}>有</Radio>
+                      <Radio value={0}>无</Radio>
+                    </RadioGroup>
+                  </div>
+                </div>
+                <div className='enterpriseNameItem'>
                   <div className='enterpriseNameTitle'>其他:</div>
                   <div className='enterpriseNameValue'>
                     <InputNumber

+ 17 - 7
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -355,6 +355,17 @@ const QueryCustomer = React.createClass({
           })
         }
 
+        let nature = [];
+        if (!!obj.nature) {
+          nature.push(obj.nature);
+        }
+        if (!!obj.enterpriseNature) {
+          nature.push(obj.enterpriseNature);
+        }
+        if (!!obj.listedNature) {
+          nature.push(obj.listedNature);
+        }
+
         this.setState({
           loading: false,
           verification: true,
@@ -369,7 +380,7 @@ const QueryCustomer = React.createClass({
           businessScope: !!obj.businessScope ? obj.businessScope.split(',') : [],
           selectCooperationProjects: selectCooperationProjects,
           level: obj.level,
-          nature: obj.nature,
+          nature,
           natureOther: obj.natureOther,
         });
       } else {
@@ -523,11 +534,10 @@ const QueryCustomer = React.createClass({
         message.error("请填写正确的联系人,且至少包含一个汉字");
         return false;
       }
-      if (/.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
-      } else {
+      if (!!values.content && /.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
         message.error("请填写正确的职位,且至少包含一个汉字");
         return false;
-      };
+      }
       if (!values.ProvinceCity[1]) {
         message.warning('请选择地区');
         return false;
@@ -819,7 +829,7 @@ const QueryCustomer = React.createClass({
                         {...formItemLayout}
                         label="职位" >
                         {getFieldDecorator('position', {
-                          rules: [{ required: true, message: '此项为必填项!' }],
+                          rules: [{ required: this.state.verificationMyUser != 1, message: '此项为必填项!' }],
                           initialValue: this.state.position
                         })(
                           <Input placeholder="联系人职位" />
@@ -981,7 +991,7 @@ const QueryCustomer = React.createClass({
                       </FormItem>
                     </div>
                     {
-                      this.state.nature == 0 &&
+                      this.state.nature && this.state.nature.length && this.state.nature[0] === 0 ?
                       <div className="clearfix">
                         <FormItem
                           className="mid-item"
@@ -998,7 +1008,7 @@ const QueryCustomer = React.createClass({
                             }}
                           />
                         </FormItem>
-                      </div>
+                      </div> : null
                     }
                   </div>
                   <FormItem wrapperCol={{ span: 12, offset: 6 }}>

+ 15 - 5
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -466,6 +466,17 @@ const QueryCustomer = React.createClass({
           })
         }
 
+        let nature = [];
+        if (!!obj.nature) {
+          nature.push(obj.nature);
+        }
+        if (!!obj.enterpriseNature) {
+          nature.push(obj.enterpriseNature);
+        }
+        if (!!obj.listedNature) {
+          nature.push(obj.listedNature);
+        }
+
         this.setState({
           loading: false,
           verification: true,
@@ -480,7 +491,7 @@ const QueryCustomer = React.createClass({
           businessScope: !!obj.businessScope ? obj.businessScope.split(',') : [],
           selectCooperationProjects: selectCooperationProjects,
           level: obj.level,
-          nature: obj.nature,
+          nature,
           natureOther: obj.natureOther,
         });
       } else {
@@ -519,11 +530,10 @@ const QueryCustomer = React.createClass({
         message.error("请填写正确的联系人,且至少包含一个汉字");
         return false;
       }
-      if (/.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
-      } else {
+      if (!!values.position && /.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
         message.error("请填写正确的职位,且至少包含一个汉字");
         return false;
-      };
+      }
       if (!values.ProvinceCity[1]) {
         message.warning('请选择地区');
         return false;
@@ -996,7 +1006,7 @@ const QueryCustomer = React.createClass({
                         {...formItemLayout}
                         label="职位" >
                         {getFieldDecorator('position', {
-                          rules: [{ required: true, message: '此项为必填项!' }],
+                          rules: [{ required: this.state.verificationMyUser != 1, message: '此项为必填项!' }],
                           initialValue: this.state.position
                         })(
                           <Input placeholder="联系人职位" />

+ 18 - 0
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/contactPerson.jsx

@@ -449,6 +449,7 @@ const ContactPerson = React.createClass({
                     utilityModelCount: detail.utilityModelCount,
                     appearancePatentCount: detail.appearancePatentCount,
                     softwareWorksCount: detail.softwareWorksCount,
+                    standard: detail.standard,
                     otherCount: detail.otherCount,
                   }
                 })
@@ -463,6 +464,7 @@ const ContactPerson = React.createClass({
             实用新型&nbsp;{detail.utilityModelCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
             外观专利&nbsp;{detail.appearancePatentCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
             软著&nbsp;{detail.softwareWorksCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
+            标准&nbsp;{detail.standard == 1 ? '有' : '无'}&nbsp;&nbsp;&nbsp;&nbsp;
             其他&nbsp;{detail.otherCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
           </div>
           <div style={{ fontWeight: "bold", marginTop: 10 }}>
@@ -611,6 +613,22 @@ const ContactPerson = React.createClass({
                   </div>
                 </div>
                 <div className='enterpriseNameItem'>
+                  <div className='enterpriseNameTitle'>标准:</div>
+                  <div className='enterpriseNameValue'>
+                      <RadioGroup onChange={e => {
+                      console.log(e)
+                      this.setState({
+                        upData: Object.assign(upData, {
+                          standard: e.target.value,
+                        }),
+                      })
+                      }} value={upData.standard}>
+                      <Radio value={1}>有</Radio>
+                      <Radio value={0}>无</Radio>
+                    </RadioGroup>
+                  </div>
+                </div>
+                <div className='enterpriseNameItem'>
                   <div className='enterpriseNameTitle'>其他:</div>
                   <div className='enterpriseNameValue'>
                     <InputNumber

+ 9 - 2
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -222,7 +222,6 @@ const OrderDetail = Form.create()(
                 <Tooltip title={textStr}>
                   <div
                     style={{
-                      width: 100,
                       overflow: "hidden",
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
@@ -780,21 +779,28 @@ const OrderDetail = Form.create()(
                 title: "负责人",
                 dataIndex: "receiverName",
                 key: "receiverName",
+                width: 140,
               },
               {
                 title: "负责人电话",
                 dataIndex: "receiverMobile",
                 key: "receiverMobile",
+                align: "center",
+                width: 120,
               },
               {
                 title: "会员负责人",
                 dataIndex: "projectMemberName",
                 key: "projectMemberName",
+                width: 140,
+                align: "center",
               },
               {
                 title: "项目状态",
                 dataIndex: "projectStatus",
                 key: "projectStatus",
+                align: "center",
+                width: 100,
                 render: (text) => {
                   return getProjectName(text);
                 },
@@ -803,6 +809,8 @@ const OrderDetail = Form.create()(
                 title: "本次派单",
                 dataIndex: "serviceYear",
                 key: "serviceYear",
+                width: 80,
+                align: "center"
               },
               {
                 title: "项目说明",
@@ -827,7 +835,6 @@ const OrderDetail = Form.create()(
                     <Tooltip title={textStr}>
                       <div
                         style={{
-                          width: 100,
                           overflow: "hidden",
                           whiteSpace: "nowrap",
                           textOverflow: "ellipsis",

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

@@ -411,7 +411,8 @@ const NewService = Form.create()(
             title: "项目状态",
             dataIndex: "projectStatus",
             key: "projectStatus",
-            width: 70, textAlign: "center",
+            width: 70,
+            textAlign: "center",
             render: (text) => {
               return getProjectName(text);
             },
@@ -480,7 +481,6 @@ const NewService = Form.create()(
                 <Tooltip title={textStr}>
                   <div
                     style={{
-                      width: 100,
                       overflow: "hidden",
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
@@ -722,7 +722,6 @@ const NewService = Form.create()(
                 <Tooltip title={textStr}>
                   <div
                     style={{
-                      width: 100,
                       overflow: "hidden",
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
@@ -926,7 +925,6 @@ const NewService = Form.create()(
                 <Tooltip title={textStr}>
                   <div
                     style={{
-                      width: 100,
                       overflow: "hidden",
                       whiteSpace: "nowrap",
                       textOverflow: "ellipsis",
@@ -5644,7 +5642,6 @@ const NewService = Form.create()(
                     <Tooltip title={textStr}>
                       <div
                         style={{
-                          width: 100,
                           overflow: "hidden",
                           whiteSpace: "nowrap",
                           textOverflow: "ellipsis",
@@ -5872,22 +5869,28 @@ const NewService = Form.create()(
                 title: "负责人",
                 dataIndex: "receiverName",
                 key: "receiverName",
+                width: 140,
               },
               {
                 title: "负责人电话",
                 dataIndex: "receiverMobile",
                 key: "receiverMobile",
+                align: "center",
+                width: 120,
               },
               {
                 title: "会员负责人",
                 dataIndex: "projectMemberName",
                 key: "projectMemberName",
-                width: 90
+                width: 140,
+                align: "center",
               },
               {
                 title: "项目状态",
                 dataIndex: "projectStatus",
                 key: "projectStatus",
+                align: "center",
+                width: 100,
                 render: (text) => {
                   return getProjectName(text);
                 },
@@ -5896,7 +5899,8 @@ const NewService = Form.create()(
                 title: "本次派单",
                 dataIndex: "serviceYear",
                 key: "serviceYear",
-                width: 90
+                width: 80,
+                align: "center"
               },
               {
                 title: "项目说明",
@@ -6090,27 +6094,34 @@ const NewService = Form.create()(
         let columns = [];
         if (data instanceof Array && data.length) {
           if (e.cSort == 6) {
+            
             columns = [
               {
                 title: "负责人",
                 dataIndex: "receiverName",
                 key: "receiverName",
+                width: 140,
               },
               {
                 title: "负责人电话",
                 dataIndex: "receiverMobile",
                 key: "receiverMobile",
+                align: "center",
+                width: 120,
               },
               {
                 title: "会员负责人",
                 dataIndex: "projectMemberName",
                 key: "projectMemberName",
-                width: 90
+                width: 140,
+                align: "center",
               },
               {
                 title: "项目状态",
                 dataIndex: "projectStatus",
                 key: "projectStatus",
+                align: "center",
+                width: 100,
                 render: (text) => {
                   return getProjectName(text);
                 },
@@ -6119,7 +6130,8 @@ const NewService = Form.create()(
                 title: "本次派单",
                 dataIndex: "serviceYear",
                 key: "serviceYear",
-                width: 80
+                width: 80,
+                align: "center"
               },
               {
                 title: "项目说明",
@@ -6144,7 +6156,6 @@ const NewService = Form.create()(
                     <Tooltip title={textStr}>
                       <div
                         style={{
-                          width: 100,
                           overflow: "hidden",
                           whiteSpace: "nowrap",
                           textOverflow: "ellipsis",

+ 9 - 0
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -2000,21 +2000,28 @@ const IntentionCustomer = Form.create()(
                 title: "负责人",
                 dataIndex: "receiverName",
                 key: "receiverName",
+                width: 140,
               },
               {
                 title: "负责人电话",
                 dataIndex: "receiverMobile",
                 key: "receiverMobile",
+                align: "center",
+                width: 120,
               },
               {
                 title: "会员负责人",
                 dataIndex: "projectMemberName",
                 key: "projectMemberName",
+                width: 140,
+                align: "center",
               },
               {
                 title: "项目状态",
                 dataIndex: "projectStatus",
                 key: "projectStatus",
+                align: "center",
+                width: 100,
                 render: (text) => {
                   return getProjectName(text);
                 },
@@ -2023,6 +2030,8 @@ const IntentionCustomer = Form.create()(
                 title: "本次派单",
                 dataIndex: "serviceYear",
                 key: "serviceYear",
+                width: 80,
+                align: "center"
               },
               {
                 title: "项目说明",

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

@@ -508,21 +508,28 @@ class OrderDetail extends Component {
               title: "负责人",
               dataIndex: "receiverName",
               key: "receiverName",
+              width: 140,
             },
             {
               title: "负责人电话",
               dataIndex: "receiverMobile",
               key: "receiverMobile",
+              align: "center",
+              width: 120,
             },
             {
               title: "会员负责人",
               dataIndex: "projectMemberName",
               key: "projectMemberName",
+              width: 140,
+              align: "center",
             },
             {
               title: "项目状态",
               dataIndex: "projectStatus",
               key: "projectStatus",
+              align: "center",
+              width: 100,
               render: (text) => {
                 return getProjectName(text);
               },
@@ -531,6 +538,8 @@ class OrderDetail extends Component {
               title: "本次派单",
               dataIndex: "serviceYear",
               key: "serviceYear",
+              width: 80,
+              align: "center"
             },
             {
               title: "项目说明",

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

@@ -451,21 +451,28 @@ const ProAndCuiList = React.createClass({
               title: "负责人",
               dataIndex: "receiverName",
               key: "receiverName",
+              width: 140,
             },
             {
               title: "负责人电话",
               dataIndex: "receiverMobile",
               key: "receiverMobile",
+              align: "center",
+              width: 120,
             },
             {
               title: "会员负责人",
               dataIndex: "projectMemberName",
               key: "projectMemberName",
+              width: 140,
+              align: "center",
             },
             {
               title: "项目状态",
               dataIndex: "projectStatus",
               key: "projectStatus",
+              align: "center",
+              width: 100,
               render: (text) => {
                 return getProjectName(text);
               },
@@ -474,6 +481,8 @@ const ProAndCuiList = React.createClass({
               title: "本次派单",
               dataIndex: "serviceYear",
               key: "serviceYear",
+              width: 80,
+              align: "center"
             },
             {
               title: "项目说明",

+ 15 - 0
js/component/manageCenter/order/orderNew/examine.jsx

@@ -1554,16 +1554,31 @@ const IntentionCustomer = Form.create()(
                 title: "负责人",
                 dataIndex: "receiverName",
                 key: "receiverName",
+                width: 140,
               },
               {
                 title: "负责人电话",
                 dataIndex: "receiverMobile",
                 key: "receiverMobile",
+                align: "center",
+                width: 120,
               },
               {
                 title: "会员负责人",
                 dataIndex: "projectMemberName",
                 key: "projectMemberName",
+                width: 140,
+                align: "center",
+              },
+              {
+                title: "项目状态",
+                dataIndex: "projectStatus",
+                key: "projectStatus",
+                align: "center",
+                width: 100,
+                render: (text) => {
+                  return getProjectName(text);
+                },
               },
               {
                 title: "项目状态",

+ 9 - 0
js/component/manageCenter/order/orderNew/examinejl.jsx

@@ -1561,21 +1561,28 @@ const IntentionCustomer = Form.create()(
                 title: "负责人",
                 dataIndex: "receiverName",
                 key: "receiverName",
+                width: 140,
               },
               {
                 title: "负责人电话",
                 dataIndex: "receiverMobile",
                 key: "receiverMobile",
+                align: "center",
+                width: 120,
               },
               {
                 title: "会员负责人",
                 dataIndex: "projectMemberName",
                 key: "projectMemberName",
+                width: 140,
+                align: "center",
               },
               {
                 title: "项目状态",
                 dataIndex: "projectStatus",
                 key: "projectStatus",
+                align: "center",
+                width: 100,
                 render: (text) => {
                   return getProjectName(text);
                 },
@@ -1584,6 +1591,8 @@ const IntentionCustomer = Form.create()(
                 title: "本次派单",
                 dataIndex: "serviceYear",
                 key: "serviceYear",
+                width: 80,
+                align: "center"
               },
               {
                 title: "项目说明",

+ 9 - 0
js/component/manageCenter/order/orderNew/examineyybz.jsx

@@ -1554,21 +1554,28 @@ const IntentionCustomer = Form.create()(
                 title: "负责人",
                 dataIndex: "receiverName",
                 key: "receiverName",
+                width: 140,
               },
               {
                 title: "负责人电话",
                 dataIndex: "receiverMobile",
                 key: "receiverMobile",
+                align: "center",
+                width: 120,
               },
               {
                 title: "会员负责人",
                 dataIndex: "projectMemberName",
                 key: "projectMemberName",
+                width: 140,
+                align: "center",
               },
               {
                 title: "项目状态",
                 dataIndex: "projectStatus",
                 key: "projectStatus",
+                align: "center",
+                width: 100,
                 render: (text) => {
                   return getProjectName(text);
                 },
@@ -1577,6 +1584,8 @@ const IntentionCustomer = Form.create()(
                 title: "本次派单",
                 dataIndex: "serviceYear",
                 key: "serviceYear",
+                width: 80,
+                align: "center"
               },
               {
                 title: "项目说明",

+ 9 - 0
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -2540,21 +2540,28 @@ const IntentionCustomer = Form.create()(
                 title: "负责人",
                 dataIndex: "receiverName",
                 key: "receiverName",
+                width: 140,
               },
               {
                 title: "负责人电话",
                 dataIndex: "receiverMobile",
                 key: "receiverMobile",
+                align: "center",
+                width: 120,
               },
               {
                 title: "会员负责人",
                 dataIndex: "projectMemberName",
                 key: "projectMemberName",
+                width: 140,
+                align: "center",
               },
               {
                 title: "项目状态",
                 dataIndex: "projectStatus",
                 key: "projectStatus",
+                align: "center",
+                width: 100,
                 render: (text) => {
                   return getProjectName(text);
                 },
@@ -2563,6 +2570,8 @@ const IntentionCustomer = Form.create()(
                 title: "本次派单",
                 dataIndex: "serviceYear",
                 key: "serviceYear",
+                width: 80,
+                align: "center"
               },
               {
                 title: "项目说明",

+ 9 - 0
js/component/manageCenter/order/orderNew/reject.jsx

@@ -2053,21 +2053,28 @@ const IntentionCustomer = Form.create()(
                 title: "负责人",
                 dataIndex: "receiverName",
                 key: "receiverName",
+                width: 140,
               },
               {
                 title: "负责人电话",
                 dataIndex: "receiverMobile",
                 key: "receiverMobile",
+                align: "center",
+                width: 120,
               },
               {
                 title: "会员负责人",
                 dataIndex: "projectMemberName",
                 key: "projectMemberName",
+                width: 140,
+                align: "center",
               },
               {
                 title: "项目状态",
                 dataIndex: "projectStatus",
                 key: "projectStatus",
+                align: "center",
+                width: 100,
                 render: (text) => {
                   return getProjectName(text);
                 },
@@ -2076,6 +2083,8 @@ const IntentionCustomer = Form.create()(
                 title: "本次派单",
                 dataIndex: "serviceYear",
                 key: "serviceYear",
+                width: 80,
+                align: "center"
               },
               {
                 title: "项目说明",

+ 9 - 0
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -1203,21 +1203,28 @@ const PaiDan = React.createClass({
               title: "负责人",
               dataIndex: "receiverName",
               key: "receiverName",
+              width: 140,
             },
             {
               title: "负责人电话",
               dataIndex: "receiverMobile",
               key: "receiverMobile",
+              align: "center",
+              width: 120,
             },
             {
               title: "会员负责人",
               dataIndex: "projectMemberName",
               key: "projectMemberName",
+              width: 140,
+              align: "center",
             },
             {
               title: "项目状态",
               dataIndex: "projectStatus",
               key: "projectStatus",
+              align: "center",
+              width: 100,
               render: (text) => {
                 return getProjectName(text);
               },
@@ -1226,6 +1233,8 @@ const PaiDan = React.createClass({
               title: "本次派单",
               dataIndex: "serviceYear",
               key: "serviceYear",
+              width: 80,
+              align: "center"
             },
             {
               title: "项目说明",

+ 9 - 0
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -976,21 +976,28 @@ class ProjectDetails extends Component {
               title: "负责人",
               dataIndex: "receiverName",
               key: "receiverName",
+              width: 140,
             },
             {
               title: "负责人电话",
               dataIndex: "receiverMobile",
               key: "receiverMobile",
+              align: "center",
+              width: 120,
             },
             {
               title: "会员负责人",
               dataIndex: "projectMemberName",
               key: "projectMemberName",
+              width: 140,
+              align: "center",
             },
             {
               title: "项目状态",
               dataIndex: "projectStatus",
               key: "projectStatus",
+              align: "center",
+              width: 100,
               render: (text) => {
                 return getProjectName(text);
               },
@@ -999,6 +1006,8 @@ class ProjectDetails extends Component {
               title: "本次派单",
               dataIndex: "serviceYear",
               key: "serviceYear",
+              width: 80,
+              align: "center"
             },
             {
               title: "项目说明",

+ 41 - 32
js/component/manageCenter/project/task/myTask.jsx

@@ -305,40 +305,40 @@ const Task = React.createClass({
           key: 'taskName',
           fixed: 'left',
           width: 150,
-          render: (text, record) => {
-            let typeArr = [];
-            if (record.htMember === 1) {
-              typeArr.push("高新会员");
-            }
-            if (record.additionalDeduction === 1) {
-              typeArr.push("加计扣除");
-            }
-            if (record.rdAwardsubsidy === 1) {
-              typeArr.push("研发奖补");
-            }
-            if (typeArr.length) {
-              return (
-                <div>
-                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-                  <div>{ typeArr.join("&") }</div>
-                </div>
-              )
-            }
-            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
-          }
           // render: (text, record) => {
-          //   return <span>
-          //     {text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}
-          //     <div>
-          //       {record.cSort == 6 && record.projectType == 1 && <span>(含{record.htMember == 1 ? '高新会员&' : ''}{record.additionalDeduction == 1 ? '加计扣除&' : ''}{record.rdAwardsubsidy == 1 ? '研发奖补' : ''})</span>}
-          //         {record.cSort == 6 && ([0, 3].indexOf(record.projectType) > -1) && <span>(仅提供单边会员服务)</span>}
-          //       {record.cSort == 6 && record.projectType == 2 && <span>(仅填报表,仅咨询,不出备查资料)</span>}
-          //       {record.cSort == 3 && <span>{record.technologyProjectType==0?'(简易项目)':record.technologyProjectType==1?'(市区级)':record.technologyProjectType==2?'(省级)':record.technologyProjectType==3?'(国家级)':''}</span>}
-          //       {record.cSort == 8 ? (record.type != 2 && record.patentType == 1) ? <span>(变更)</span> : <span>{record.ordinaryRisk == 0 ? '(普通申请)' : record.ordinaryRisk == 1 ? '(风险代理)' : ''}</span> : ""}
-          //       {record.type == 2 && <span>({record.days == 0 ? '普通' : record.days == 1 ? '加急' : ''}{record.scheme == 0 ? '&无方案' : record.scheme == 1 ? '&有方案' : ''})</span>}
-          //     </div>
-          //   </span>
+          //   let typeArr = [];
+          //   if (record.htMember === 1) {
+          //     typeArr.push("高新会员");
+          //   }
+          //   if (record.additionalDeduction === 1) {
+          //     typeArr.push("加计扣除");
+          //   }
+          //   if (record.rdAwardsubsidy === 1) {
+          //     typeArr.push("研发奖补");
+          //   }
+          //   if (typeArr.length) {
+          //     return (
+          //       <div>
+          //         <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+          //         <div>{ typeArr.join("&") }</div>
+          //       </div>
+          //     )
+          //   }
+          //   return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
           // }
+          render: (text, record) => {
+            return <span>
+              {text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}
+              <div>
+                {record.cSort == 6 && record.projectType == 1 && <span>(含{record.htMember == 1 ? '高新会员&' : ''}{record.additionalDeduction == 1 ? '加计扣除&' : ''}{record.rdAwardsubsidy == 1 ? '研发奖补' : ''})</span>}
+                  {record.cSort == 6 && ([0, 3].indexOf(record.projectType) > -1) && <span>(仅提供单边会员服务)</span>}
+                {record.cSort == 6 && record.projectType == 2 && <span>(仅填报表,仅咨询,不出备查资料)</span>}
+                {record.cSort == 3 && <span>{record.technologyProjectType==0?'(简易项目)':record.technologyProjectType==1?'(市区级)':record.technologyProjectType==2?'(省级)':record.technologyProjectType==3?'(国家级)':''}</span>}
+                {record.cSort == 8 ? (record.type != 2 && record.patentType == 1) ? <span>(变更)</span> : <span>{record.ordinaryRisk == 0 ? '(普通申请)' : record.ordinaryRisk == 1 ? '(风险代理)' : ''}</span> : ""}
+                {record.type == 2 && <span>({record.days == 0 ? '普通' : record.days == 1 ? '加急' : ''}{record.scheme == 0 ? '&无方案' : record.scheme == 1 ? '&有方案' : ''})</span>}
+              </div>
+            </span>
+          }
         },
         {
           title: '项目数量',
@@ -3862,21 +3862,28 @@ const Task = React.createClass({
               title: "负责人",
               dataIndex: "receiverName",
               key: "receiverName",
+              width: 140,
             },
             {
               title: "负责人电话",
               dataIndex: "receiverMobile",
               key: "receiverMobile",
+              align: "center",
+              width: 120,
             },
             {
               title: "会员负责人",
               dataIndex: "projectMemberName",
               key: "projectMemberName",
+              width: 140,
+              align: "center",
             },
             {
               title: "项目状态",
               dataIndex: "projectStatus",
               key: "projectStatus",
+              align: "center",
+              width: 100,
               render: (text) => {
                 return getProjectName(text);
               },
@@ -3885,6 +3892,8 @@ const Task = React.createClass({
               title: "本次派单",
               dataIndex: "serviceYear",
               key: "serviceYear",
+              width: 80,
+              align: "center"
             },
             {
               title: "项目说明",

+ 9 - 0
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -1033,21 +1033,28 @@ const Task = React.createClass({
               title: "负责人",
               dataIndex: "receiverName",
               key: "receiverName",
+              width: 140,
             },
             {
               title: "负责人电话",
               dataIndex: "receiverMobile",
               key: "receiverMobile",
+              align: "center",
+              width: 120,
             },
             {
               title: "会员负责人",
               dataIndex: "projectMemberName",
               key: "projectMemberName",
+              width: 140,
+              align: "center",
             },
             {
               title: "项目状态",
               dataIndex: "projectStatus",
               key: "projectStatus",
+              align: "center",
+              width: 100,
               render: (text) => {
                 return getProjectName(text);
               },
@@ -1056,6 +1063,8 @@ const Task = React.createClass({
               title: "本次派单",
               dataIndex: "serviceYear",
               key: "serviceYear",
+              width: 80,
+              align: "center"
             },
             {
               title: "项目说明",

+ 9 - 0
js/component/manageCenter/project/task/taskQuery.jsx

@@ -1230,21 +1230,28 @@ const Task = React.createClass({
               title: "负责人",
               dataIndex: "receiverName",
               key: "receiverName",
+              width: 140,
             },
             {
               title: "负责人电话",
               dataIndex: "receiverMobile",
               key: "receiverMobile",
+              align: "center",
+              width: 120,
             },
             {
               title: "会员负责人",
               dataIndex: "projectMemberName",
               key: "projectMemberName",
+              width: 140,
+              align: "center",
             },
             {
               title: "项目状态",
               dataIndex: "projectStatus",
               key: "projectStatus",
+              align: "center",
+              width: 100,
               render: (text) => {
                 return getProjectName(text);
               },
@@ -1253,6 +1260,8 @@ const Task = React.createClass({
               title: "本次派单",
               dataIndex: "serviceYear",
               key: "serviceYear",
+              width: 80,
+              align: "center"
             },
             {
               title: "项目说明",

+ 34 - 27
js/component/manageCenter/set/userManagementS/newUser.jsx

@@ -77,8 +77,8 @@ const Newuser = Form.create()(React.createClass({
       Business: [{ reviewerName: "", reviewerId: "" }], // 公出审核
       Coorder: [{ reviewerName: "", reviewerId: "" }],  // 协单审核
 
-      superiorList: [], // 上级主管
-      publicCarbonCopyList: [], // 公出抄送
+      superiorList: [{ superior: '', superiorId: '' }], // 上级主管
+      publicCarbonCopyList: [{ publicCarbonCopy: "", publicCarbonCopyName: "" }], // 公出抄送
     };
   },
   getDefaultProps() {
@@ -102,10 +102,10 @@ const Newuser = Form.create()(React.createClass({
         return false;
       };
     }
-    if (!this.state.theTypes && !this.state.superiorId) {
-      message.warning('请输入正确的上级主管');
-      return false;
-    };
+    // if (!this.state.theTypes && !this.state.superiorId) {
+    //   message.warning('请输入正确的上级主管');
+    //   return false;
+    // };
     if (!this.state.superiorList.length) {
       message.warning('请输入正确的上级主管');
       return false;
@@ -114,27 +114,28 @@ const Newuser = Form.create()(React.createClass({
       let text = '';
       for (let i=0; i<this.state.superiorList.length; i++) {
         let superiorItem = this.state.superiorList[i];
-        if (!superiorItem.superiorId) {
-          text = `第${idx}行请输入正确的上级主管`;
-          flag = false;
-          continue;
-        } else if (this.state.Business.some(item => item.reviewerId == superiorItem.superiorId)) {
-          text = `上级主管【${superiorItem.superior}】在公出审核人员中存在`;
-          flag = false;
-          continue;
-        } else if (this.state.Coorder.some(item => item.reviewerId == superiorItem.superiorId)) {
-          text = `上级主管【${superiorItem.superior}】在协单审核人员中存在`;
-          flag = false;
-          continue;
-        } else if (this.state.managerId == superiorItem.superiorId) {
-          text = `上级主管【${superiorItem.superior}】在经理审核人员中存在`;
-          flag = false;
-          continue;
-        } else if (this.state.publicCarbonCopyList.some(item => item.publicCarbonCopy == superiorItem.superiorId)) {
-          text = `上级主管【${superiorItem.superior}】在公出抄送人员中存在`;
+        if (superiorItem.superior && !superiorItem.superiorId) {
+          text = `第${i + 1}行请输入正确的上级主管`;
           flag = false;
           continue;
         }
+        // else if (this.state.Business.some(item => item.reviewerId == superiorItem.superiorId)) {
+        //   text = `上级主管【${superiorItem.superior}】在公出审核人员中存在`;
+        //   flag = false;
+        //   continue;
+        // } else if (this.state.Coorder.some(item => item.reviewerId == superiorItem.superiorId)) {
+        //   text = `上级主管【${superiorItem.superior}】在协单审核人员中存在`;
+        //   flag = false;
+        //   continue;
+        // } else if (this.state.managerId == superiorItem.superiorId) {
+        //   text = `上级主管【${superiorItem.superior}】在经理审核人员中存在`;
+        //   flag = false;
+        //   continue;
+        // } else if (this.state.publicCarbonCopyList.some(item => item.publicCarbonCopy == superiorItem.superiorId)) {
+        //   text = `上级主管【${superiorItem.superior}】在公出抄送人员中存在`;
+        //   flag = false;
+        //   continue;
+        // }
       }
       if (!flag) {
         message.warning(text);
@@ -151,7 +152,7 @@ const Newuser = Form.create()(React.createClass({
       for (let i=0; i<this.state.publicCarbonCopyList.length; i++) {
         let item = this.state.publicCarbonCopyList[i];
         if (item.publicCarbonCopyName && !item.publicCarbonCopy) {
-          text = `第${i}行请输入正确的公出抄送人员`;
+          text = `第${i + 1}行请输入正确的公出抄送人员`;
           flag = false;
           continue;
         }
@@ -188,6 +189,12 @@ const Newuser = Form.create()(React.createClass({
     this.setState({
       loading: true
     });
+
+    let superReviewerArr = this.state.superiorList;
+    let uniqueSuperArr = [...new Set(superReviewerArr.map(JSON.stringify))].map(JSON.parse);
+
+    let carbonCopyReviewerArr = this.state.publicCarbonCopyList;
+    let uniqueCarbonCopyReviewerArr = [...new Set(carbonCopyReviewerArr.map(JSON.stringify))].map(JSON.parse);
     $.ajax({
       method: "POST",
       dataType: "json",
@@ -222,8 +229,8 @@ const Newuser = Form.create()(React.createClass({
         }),
         publicReviewerIds: getNewArray(this.state.Business, "reviewerId").toString(),// 公出审核
         assistReviewerIds: getNewArray(this.state.Coorder, "reviewerId").toString(),// 协单审核
-        superReviewerIds: this.state.superiorList.map(item => item.superiorId).join(','), // 上级主管
-        carbonCopyReviewerIds: this.state.publicCarbonCopyList.map(item => item.publicCarbonCopy).join(',') // 公出推送
+        superReviewerIds: uniqueSuperArr.map(item => item.superiorId).join(','), // 上级主管
+        carbonCopyReviewerIds: uniqueCarbonCopyReviewerArr.map(item => item.publicCarbonCopy).join(',') // 公出推送
       }
     }).done(function (data) {
       this.setState({

+ 0 - 1
js/component/project.jsx

@@ -157,7 +157,6 @@ const project = React.createClass({
               <Tooltip title={text}>
                 <div
                   style={{
-                    width: 100,
                     overflow: "hidden",
                     whiteSpace: "nowrap",
                     textOverflow: "ellipsis",