Browse Source

渠道模块修改

dev01 2 years ago
parent
commit
a6d54c76e5
24 changed files with 3257 additions and 3120 deletions
  1. 3 3
      js/component/common/cascaders/index.jsx
  2. 4 5
      js/component/common/projectOperation/newEditProject.jsx
  3. 133 110
      js/component/manageCenter/channelList/channelunit/addchannel.jsx
  4. 6 6
      js/component/manageCenter/channelList/channelunit/detail/contactPerson.jsx
  5. 6 5
      js/component/manageCenter/channelList/channelunit/index.jsx
  6. 5 4
      js/component/manageCenter/channelList/channelunit/publist.jsx
  7. 34 21
      js/component/manageCenter/customer/managementFollow/followUpSummary/index.jsx
  8. 149 163
      js/component/manageCenter/customerService/administration/followUp.jsx
  9. 1 1
      js/component/manageCenter/operate/personnel/personnelAll.jsx
  10. 1 0
      js/component/manageCenter/order/orderNew/chooseList.jsx
  11. 1 1
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js
  12. 1 1
      js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js
  13. 9 13
      js/component/manageCenter/order/orderNew/inquiry.jsx
  14. 19 5
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  15. 55 54
      js/component/manageCenter/project/project/enterpriseProjectQuery.jsx
  16. 19 5
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  17. 134 183
      js/component/manageCenter/project/summary/highTech.jsx
  18. 167 0
      js/component/manageCenter/project/summary/highTechConfig.jsx
  19. 329 405
      js/component/manageCenter/project/summary/projecCount.jsx
  20. 25 15
      js/component/manageCenter/project/task/myTask.jsx
  21. 18 5
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  22. 23 10
      js/component/manageCenter/project/task/taskAssignment.jsx
  23. 2114 2104
      js/component/manageCenter/set/business/businessProject.jsx
  24. 1 1
      package.json

+ 3 - 3
js/component/common/cascaders/index.jsx

@@ -88,7 +88,7 @@ class Cascaders extends Component {
   // 确定
   onOks() {
     const { authTree } = this.state
-    const { id = "id", children = "children", onSel } = this.props
+    const { id = "id", children = "list", onSel } = this.props
     let list = []
     authTree.forEach((its) => {
       if (its.checked) {
@@ -122,7 +122,7 @@ class Cascaders extends Component {
   }
   // 代码二级联动
   itemHandle(iD, checked = true) {
-    const { id = "id", children = "children" } = this.props
+    const { id = "id", children = "list" } = this.props
     const { authTree } = this.state
     authTree.forEach((item1) => {
       if (item1[id] == iD) {
@@ -196,7 +196,7 @@ class Cascaders extends Component {
       height = 32,
       id = "id",//接口需要的字段名
       name = "name",//显示内容字段名
-      children = "children",//二级列表字段名
+      children = "list",//二级列表字段名
     } = this.props
     const authTreeMap = authTree.map((item1) => (
       // Panel是手风琴

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

@@ -301,7 +301,7 @@ class newEditProject extends Component {
       },
       success: function (data) {
         if (data.error.length === 0) {
-          // this.onChange()
+          this.onChange()
           let splList = splitList
           let hlist = []
           for (var i = 0; i < splitList.length; i++) {
@@ -322,7 +322,6 @@ class newEditProject extends Component {
             splitList: splList,
             histYear: hlist,
           })
-          message.success("操作成功!")
         } else {
           message.warning(data.error[0].message);
         };
@@ -343,7 +342,7 @@ class newEditProject extends Component {
       },
       success: function (data) {
         if (data.error.length === 0) {
-          this.onChange()
+          // this.onChange()
           let splList = splitList
           let histList = histYear
           for (var i = 0; i < splList.length; i++) {
@@ -427,7 +426,7 @@ class newEditProject extends Component {
           _this.deleteMemberSonProject(delid)
         },
         onCancel() {
-          _this.aGain()
+          // _this.aGain()
         },
       });
     } else {
@@ -479,7 +478,7 @@ class newEditProject extends Component {
           loading: false,
         });
         if (!data.error.length) {
-          message.success("添加成功!");
+          message.success("保存成功!");
           let list = this.state.splitList
           let histList = this.state.histYear
           list.push(data.data)

+ 133 - 110
js/component/manageCenter/channelList/channelunit/addchannel.jsx

@@ -48,36 +48,38 @@ const AchievementDetailForm = Form.create()(
           message.warning("渠道名称不能存在特殊符号!");
           return false;
         }
-        if (/.*[\u4e00-\u9fa5]+.*$/.test(values.contacts)) {
-        } else {
-          message.error("请填写正确的联系人,且至少包含一个汉字");
-          return false;
-        }
-        if (/.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
-        } else {
-          message.error("请填写正确的职位,且至少包含一个汉字");
-          return false;
-        }
-        if (!values.ProvinceCity[1]) {
-          message.warning("请选择地区");
-          return false;
-        }
-        if (values.contacts.length > 32) {
-          message.warning("联系人字数不超过32个");
-          return false;
-        }
-        if (values.contactMobile.length > 13) {
-          message.warning("电话号码字数不超过13个");
-          return false;
-        }
-        if (values.introduction.length === 0) {
-          message.warning("请填写渠道简介");
-          return false;
-        }
         if (!values.channelType) {
           message.warning("请选择渠道类别");
           return false;
         }
+        if (values.channelType != 1) {
+          if (!values.ProvinceCity[1]) {
+            message.warning("请选择地区");
+            return false;
+          }
+          if (/.*[\u4e00-\u9fa5]+.*$/.test(values.contacts)) {
+          } else {
+            message.error("请填写正确的联系人,且至少包含一个汉字");
+            return false;
+          }
+          if (values.contacts.length > 32) {
+            message.warning("联系人字数不超过32个");
+            return false;
+          }
+          if (/.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
+          } else {
+            message.error("请填写正确的职位,且至少包含一个汉字");
+            return false;
+          }
+          if (values.contactMobile.length > 13) {
+            message.warning("联系电话字数不超过13个");
+            return false;
+          }
+          if (values.introduction.length === 0) {
+            message.warning("请填写渠道简介");
+            return false;
+          }
+        }
         // let arr = [];
         // for (let i of this.state.selectCooperationProjects) {
         //   arr.push(i.label);
@@ -86,22 +88,28 @@ const AchievementDetailForm = Form.create()(
           this.setState({
             loading: true,
           });
-          $.ajax({
-            method: "POST",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/customer/addChannel",
-            data: {
+          let info = values.channelType != 1 ?
+            {
               name: values.name,
-              contacts: values.contacts,
-              contactMobile: values.contactMobile,
+              channelType: values.channelType,
               province: values.ProvinceCity[0], //省
               city: values.ProvinceCity[1], //市
               area: values.ProvinceCity[2], //区
+              contacts: values.contacts,
               position: values.position,
+              contactMobile: values.contactMobile,
               introduction: values.introduction,
+            } :
+            {
+              name: values.name,
               channelType: values.channelType,
-            },
+            }
+          $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/customer/addChannel",
+            data: info,
           }).done(
             function (data) {
               this.setState({
@@ -278,7 +286,7 @@ const AchievementDetailForm = Form.create()(
 
     render() {
       const theData = this.state.data || {};
-      const { getFieldDecorator } = this.props.form;
+      const { getFieldDecorator, getFieldsValue } = this.props.form;
       const FormItem = Form.Item;
       const formItemLayout = {
         labelCol: { span: 6 },
@@ -345,87 +353,102 @@ const AchievementDetailForm = Form.create()(
                       initialValue: this.state.channelType,
                     })(
                       <Select placeholder="请选择">
-                        <Select.Option value={1}>政府部门</Select.Option>
                         <Select.Option value={2}>民主党派</Select.Option>
                         <Select.Option value={3}>园区</Select.Option>
                         <Select.Option value={4}>民间组织</Select.Option>
-                        <Select.Option value={5}>其他战略合作单位</Select.Option>
+                        <Select.Option value={5}>战略合作单位</Select.Option>
+                        <Select.Option value={1}>其他</Select.Option>
                       </Select>
                     )}
                   </FormItem>
                 </div>
-                <div className="clearfix">
-                  <FormItem {...formItemLayout} label="省-市-区">
-                    {getFieldDecorator("ProvinceCity", {
-                      rules: [{ required: true, message: "此项为必填项!" }],
-                      initialValue: this.state.ProvinceCity,
-                    })(
-                      <Cascader options={areaSelect()} placeholder="选择城市" />
-                    )}
-                  </FormItem>
-                </div>
-                <div className="clearfix">
-                  <FormItem
-                    className="mid-item"
-                    {...formItemLayout}
-                    label="联系人"
-                  >
-                    {getFieldDecorator("contacts", {
-                      rules: [{ required: true, message: "此项为必填项!" }],
-                      initialValue: this.state.contacts,
-                    })(<Input placeholder="联系人姓名" />)}
-                  </FormItem>
-                </div>
-                <div className="clearfix">
-                  <FormItem
-                    className="mid-item"
-                    {...formItemLayout}
-                    label="职位"
-                  >
-                    {getFieldDecorator("position", {
-                      rules: [{ required: true, message: "此项为必填项!" }],
-                      initialValue: this.state.position,
-                    })(<Input placeholder="联系人职位" />)}
-                  </FormItem>
-                </div>
-                <div className="clearfix">
-                  <FormItem
-                    className="mid-item"
-                    {...formItemLayout}
-                    label="联系电话"
-                  >
-                    {getFieldDecorator("contactMobile", {
-                      rules: [{ required: true, message: "此项为必填项!" }],
-                      initialValue: this.state.contactMobile,
-                    })(
-                      <Input placeholder="请填写手机号,仅填座机号时,请后续补充手机号" />
-                    )}
-                  </FormItem>
-                </div>
-                <div className="clearfix">
-                  <FormItem
-                    className="mid-item"
-                    {...formItemLayout}
-                    required
-                    label="渠道简介"
-                  >
-                    {getFieldDecorator("introduction", {
-                      rules: [{ required: true, message: "此项为必填项!" }],
-                      initialValue: this.state.introduction,
-                    })(
-                      <TextArea
-                        style={{ width: "330px", height: "100px" }}
-                        placeholder="请填写渠道简介"
-                        value={this.state.inputValue}
-                        onChange={(e) => {
-                          this.setState({
-                            inputValue: e.target.value,
-                          });
-                        }}
-                      />
-                    )}
-                  </FormItem>
-                </div>
+                {
+                  !!getFieldsValue().channelType && getFieldsValue().channelType != 1 &&
+                  <div className="clearfix">
+                    <FormItem {...formItemLayout} label="省-市-区">
+                      {getFieldDecorator("ProvinceCity", {
+                        rules: [{ required: true, message: "此项为必填项!" }],
+                        initialValue: this.state.ProvinceCity,
+                      })(
+                        <Cascader options={areaSelect()} placeholder="选择城市" />
+                      )}
+                    </FormItem>
+                  </div>
+                }
+                {
+                  !!getFieldsValue().channelType && getFieldsValue().channelType != 1 &&
+                  <div className="clearfix">
+                    <FormItem
+                      className="mid-item"
+                      {...formItemLayout}
+                      label="联系人"
+                    >
+                      {getFieldDecorator("contacts", {
+                        rules: [{ required: true, message: "此项为必填项!" }],
+                        initialValue: this.state.contacts,
+                      })(<Input placeholder="联系人姓名" />)}
+                    </FormItem>
+                  </div>
+                }
+                {
+                  !!getFieldsValue().channelType && getFieldsValue().channelType != 1 &&
+                  <div className="clearfix">
+                    <FormItem
+                      className="mid-item"
+                      {...formItemLayout}
+                      label="职位"
+                    >
+                      {getFieldDecorator("position", {
+                        rules: [{ required: true, message: "此项为必填项!" }],
+                        initialValue: this.state.position,
+                      })(<Input placeholder="联系人职位" />)}
+                    </FormItem>
+                  </div>
+                }
+                {
+                  !!getFieldsValue().channelType && getFieldsValue().channelType != 1 &&
+                  <div className="clearfix">
+                    <FormItem
+                      className="mid-item"
+                      {...formItemLayout}
+                      label="联系电话"
+                    >
+                      {getFieldDecorator("contactMobile", {
+                        rules: [{ required: true, message: "此项为必填项!" }],
+                        initialValue: this.state.contactMobile,
+                      })(
+                        <Input placeholder="请填写手机号,仅填座机号时,请后续补充手机号" />
+                      )}
+                    </FormItem>
+                  </div>
+                }
+                {
+                  !!getFieldsValue().channelType && getFieldsValue().channelType != 1 &&
+                  <div className="clearfix">
+                    <FormItem
+                      className="mid-item"
+                      {...formItemLayout}
+                      required
+                      label="渠道简介"
+                    >
+                      {getFieldDecorator("introduction", {
+                        rules: [{ required: true, message: "此项为必填项!" }],
+                        initialValue: this.state.introduction,
+                      })(
+                        <TextArea
+                          style={{ width: "330px", height: "100px" }}
+                          placeholder="请填写渠道简介"
+                          value={this.state.inputValue}
+                          onChange={(e) => {
+                            this.setState({
+                              inputValue: e.target.value,
+                            });
+                          }}
+                        />
+                      )}
+                    </FormItem>
+                  </div>
+                }
               </div>
               <FormItem wrapperCol={{ span: 12, offset: 6 }}>
                 <Button

+ 6 - 6
js/component/manageCenter/channelList/channelunit/detail/contactPerson.jsx

@@ -180,11 +180,11 @@ const ContactPerson = React.createClass({
         },
       ],
       channeOb: [
-        { name: "政府部门", val: 1 },
         { name: "民主党派", val: 2 },
         { name: "园区", val: 3 },
         { name: "民间组织", val: 4 },
-        { name: "其他战略合作单位", val: 5 },
+        { name: "战略合作单位", val: 5 },
+        { name: "其他", val: 1 },
       ],
       visible: "", //修改弹窗状态
       name: "",
@@ -489,11 +489,11 @@ const ContactPerson = React.createClass({
                 <span>
                   渠道类别:{[
                     "",
-                    "政府部门",
+                    "其他",
                     "民主党派",
                     "园区",
                     "民间组织",
-                    "其他战略合作单位",
+                    "战略合作单位",
                   ][this.state.type]}
                 </span>
                 <Button
@@ -666,11 +666,11 @@ const ContactPerson = React.createClass({
                   <div className="enterpriseNameValue">
                     {[
                       "",
-                      "政府部门",
+                      "其他",
                       "民主党派",
                       "园区",
                       "民间组织",
-                      "其他战略合作单位",
+                      "战略合作单位",
                     ][this.state.type]}</div>
                 </div>
                 <div className="enterpriseNameItem">

+ 6 - 5
js/component/manageCenter/channelList/channelunit/index.jsx

@@ -61,11 +61,11 @@ class ChannelUnit extends Component {
           render: (text) =>
             [
               "",
-              "政府部门",
+              "其他",
               "民主党派",
               "园区",
               "民间组织",
-              "其他战略合作单位",
+              "战略合作单位",
             ][text],
         },
         {
@@ -90,6 +90,7 @@ class ChannelUnit extends Component {
           dataIndex: "op",
           key: "op",
           render: (text, record) => (
+            record.type != 1 &&
             <Button
               type="primary"
               onClick={(e) => {
@@ -101,7 +102,7 @@ class ChannelUnit extends Component {
               }}
             >
               渠道跟进
-            </Button>
+            </Button >
           ),
         },
       ],
@@ -119,11 +120,11 @@ class ChannelUnit extends Component {
         },
       },
       channeOb: [
-        { name: "政府部门", val: 1 },
         { name: "民主党派", val: 2 },
         { name: "园区", val: 3 },
         { name: "民间组织", val: 4 },
-        { name: "其他战略合作单位", val: 5 },
+        { name: "战略合作单位", val: 5 },
+        { name: "其他", val: 1 },
       ],
       fjlist: [], // 查询到的更进人列表
       loading: false,

+ 5 - 4
js/component/manageCenter/channelList/channelunit/publist.jsx

@@ -59,11 +59,11 @@ class ChannelUnit extends Component {
           render: (text) =>
             [
               "",
-              "政府部门",
+              "其他",
               "民主党派",
               "园区",
               "民间组织",
-              "其他战略合作单位",
+              "战略合作单位",
             ][text],
         },
         {
@@ -77,6 +77,7 @@ class ChannelUnit extends Component {
           dataIndex: "op",
           key: "op",
           render: (text, record) => (
+
             <Button
               type="primary"
               onClick={(e) => {
@@ -102,11 +103,11 @@ class ChannelUnit extends Component {
         },
       },
       channeOb: [
-        { name: "政府部门", val: 1 },
         { name: "民主党派", val: 2 },
         { name: "园区", val: 3 },
         { name: "民间组织", val: 4 },
-        { name: "其他战略合作单位", val: 5 },
+        { name: "战略合作单位", val: 5 },
+        { name: "其他", val: 1 },
       ],
       fjlist: [], // 查询到的更进人列表
       loading: false,

+ 34 - 21
js/component/manageCenter/customer/managementFollow/followUpSummary/index.jsx

@@ -196,36 +196,48 @@ class FollowUpSummary extends Component {
     }
 
     componentDidMount() {
-        this.loadData();
+        this.props.shiroType != 2 && this.loadData();
         // this.selectSuperId();
     }
 
     loadData(pageNo) {
+        if (this.state.userName == undefined &&
+            this.state.followName == undefined &&
+            this.state.userType == undefined &&
+            this.state.contactType == undefined &&
+            this.state.deps == undefined &&
+            this.state.releaseDate.length == 0 &&
+            this.state.releaseDate1.length == 0 &&
+            this.state.releaseDate2.length == 0
+        ) {
+            message.warning("请先填写筛选条件!");
+            return
+        }
+        let data = {
+            pageNo: pageNo || 1,
+            pageSize: this.state.pagination.pageSize,
+            userName: this.state.userName || undefined,
+            followName: this.state.followName || undefined,
+            userType: isNaN(parseInt(this.state.userType)) ? undefined : this.state.userType,
+            contactType: isNaN(parseInt(this.state.contactType)) ? undefined : this.state.contactType,
+            deps: this.state.deps || undefined,
+            followStartTime: this.state.releaseDate[0] ? this.state.releaseDate[0] : undefined,
+            followEndTime: this.state.releaseDate[1] ? this.state.releaseDate[1] : undefined,
+            createStartTime: this.state.releaseDate1[0] ? this.state.releaseDate1[0] : undefined,
+            createEndTime: this.state.releaseDate1[1] ? this.state.releaseDate1[1] : undefined,
+            guidanceStartTime: this.state.releaseDate2[0] ? this.state.releaseDate2[0] : undefined,
+            guidanceEndTime: this.state.releaseDate2[1] ? this.state.releaseDate2[1] : undefined,
+            shiroType: this.state.shiroType
+        };
         this.setState({
             loading: true,
         });
-        let api = '/api/admin/userFollowList';
         $.ajax({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + api,
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                userName: this.state.userName || undefined,
-                followName: this.state.followName || undefined,
-                userType: isNaN(parseInt(this.state.userType)) ? undefined : this.state.userType,
-                contactType: isNaN(parseInt(this.state.contactType)) ? undefined : this.state.contactType,
-                deps: this.state.deps || undefined,
-                followStartTime: this.state.releaseDate[0] ? this.state.releaseDate[0] : undefined,
-                followEndTime: this.state.releaseDate[1] ? this.state.releaseDate[1] : undefined,
-                createStartTime: this.state.releaseDate1[0] ? this.state.releaseDate1[0] : undefined,
-                createEndTime: this.state.releaseDate1[1] ? this.state.releaseDate1[1] : undefined,
-                guidanceStartTime: this.state.releaseDate2[0] ? this.state.releaseDate2[0] : undefined,
-                guidanceEndTime: this.state.releaseDate2[1] ? this.state.releaseDate2[1] : undefined,
-                shiroType: this.state.shiroType
-            },
+            url: globalConfig.context + '/api/admin/userFollowList',
+            data,
             success: function (data) {
                 ShowModal(this);
                 if (data.error.length === 0) {
@@ -336,7 +348,7 @@ class FollowUpSummary extends Component {
             tabsKey: '',
         })
         if (s) {
-            this.loadData(this.state.pageNo);
+            this.props.shiroType != 2 && this.loadData(this.state.pageNo);
         }
     }
 
@@ -399,9 +411,10 @@ class FollowUpSummary extends Component {
             releaseDate: [],
             releaseDate1: [],
             releaseDate2: [],
+            dataSource: [],
         }, () => {
             this.Cascaders.empty();
-            this.loadData();
+            this.props.shiroType != 2 && this.loadData();
         })
     }
 

+ 149 - 163
js/component/manageCenter/customerService/administration/followUp.jsx

@@ -1,47 +1,47 @@
-import React,{Component} from "react";
-import {Button, DatePicker, Icon, Input, message, Select, Spin, Table, Tabs, Tag, Tooltip} from "antd";
-import {ChooseList} from "../../order/orderNew/chooseList";
+import React, { Component } from "react";
+import { Button, DatePicker, Icon, Input, message, Select, Spin, Table, Tabs, Tag, Tooltip } from "antd";
+import { ChooseList } from "../../order/orderNew/chooseList";
 import FollowUpDetails from './followUpDetails';
 import CorrespondingDetails from './correspondingDetails';
 import OrderItemStatus from '../../../../component/common/orderItemStatus';
 import $ from "jquery";
-
-import {ShowModal} from "@/tools";
+import { ShowModal } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
 import moment from "moment";
+import Cascaders from "../../../../component/common/cascaders";
 
-const {TabPane} = Tabs;
+const { TabPane } = Tabs;
 const { RangePicker } = DatePicker;
 
-class FollowUp extends Component{
+class FollowUp extends Component {
     constructor(props) {
         super(props);
-        this.state={
-            columns:[
+        this.state = {
+            columns: [
                 {
                     title: "合同编号",
                     dataIndex: "contractNo",
                     key: "contractNo",
                     width: 120,
-                    fixed:'left',
+                    fixed: 'left',
                 },
                 {
                     title: "订单编号",
                     dataIndex: "orderNo",
                     key: "orderNo",
                     width: 140,
-                    fixed:'left',
+                    fixed: 'left',
                 },
                 {
                     title: "状态",
                     dataIndex: "deleteSign",
                     key: "deleteSign",
-                    width:80,
-                    fixed:'left',
+                    width: 80,
+                    fixed: 'left',
                     render: (text) => {
                         //0=正常, 1=作废, 2=锁定, 3=变更中
                         return <div>
-                            <OrderItemStatus deleteSign={text}/>
+                            <OrderItemStatus deleteSign={text} />
                         </div>
                     }
                 },
@@ -50,22 +50,22 @@ class FollowUp extends Component{
                     dataIndex: "depName",
                     key: "depName",
                     width: 160,
-                    fixed:'left',
+                    fixed: 'left',
                 },
                 {
                     title: "客户名称",
                     dataIndex: "userName",
                     key: "userName",
-                    width:150,
-                    fixed:'left',
+                    width: 150,
+                    fixed: 'left',
                     render: text => {
                         return (
                             <Tooltip title={text}>
                                 <div style={{
-                                    maxWidth:'150px',
-                                    overflow:'hidden',
+                                    maxWidth: '150px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -90,10 +90,10 @@ class FollowUp extends Component{
                         return (
                             <Tooltip placement="topLeft" title={text}>
                                 <div style={{
-                                    maxWidth:'80px',
-                                    overflow:'hidden',
+                                    maxWidth: '80px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -108,10 +108,10 @@ class FollowUp extends Component{
                         return (
                             <Tooltip placement="topLeft" title={text}>
                                 <div style={{
-                                    maxWidth:'80px',
-                                    overflow:'hidden',
+                                    maxWidth: '80px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -126,10 +126,10 @@ class FollowUp extends Component{
                         return (
                             <Tooltip placement="topLeft" title={text}>
                                 <div style={{
-                                    maxWidth:'80px',
-                                    overflow:'hidden',
+                                    maxWidth: '80px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -144,10 +144,10 @@ class FollowUp extends Component{
                         return (
                             <Tooltip placement="topLeft" title={text}>
                                 <div style={{
-                                    maxWidth:'80px',
-                                    overflow:'hidden',
+                                    maxWidth: '80px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -168,15 +168,15 @@ class FollowUp extends Component{
                     dataIndex: "addWechat",
                     key: "addWechat",
                     width: 100,
-                    render: (text,record) => {
-                        let str = text === 1 ? '是('+record.wechat+')' : text === 0 ? '否' : '';
+                    render: (text, record) => {
+                        let str = text === 1 ? '是(' + record.wechat + ')' : text === 0 ? '否' : '';
                         return (
                             <Tooltip placement="topLeft" title={str}>
                                 <div style={{
-                                    maxWidth:'100px',
-                                    overflow:'hidden',
+                                    maxWidth: '100px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{str}</div>
                             </Tooltip>
                         )
@@ -187,21 +187,21 @@ class FollowUp extends Component{
                     dataIndex: "renewal",
                     key: "renewal",
                     width: 80,
-                    render: (text,record) => {
+                    render: (text, record) => {
                         let str = text === 0 ? '未联系上当前联系人' :
                             text === 1 ? '企业已签其他机构' :
                                 text === 2 ? '企业自己申报' :
                                     text === 3 ? '企业不打算申报/注销' :
                                         text === 4 ? '待续签,未报价(客服维护中)' :
                                             text === 5 ? '待续签,已报价(客服维护中)' :
-                                                text === 6 ? ('已续签/复审、续签时间、续签项目' + (record.renewalTimes ? '('+record.renewalTimes+')' : '')): ''
+                                                text === 6 ? ('已续签/复审、续签时间、续签项目' + (record.renewalTimes ? '(' + record.renewalTimes + ')' : '')) : ''
                         return (
                             <Tooltip placement="topLeft" title={str}>
                                 <div style={{
-                                    maxWidth:'80px',
-                                    overflow:'hidden',
+                                    maxWidth: '80px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{str}</div>
                             </Tooltip>
                         )
@@ -211,14 +211,14 @@ class FollowUp extends Component{
                     title: "满意度(技术/业务)",
                     dataIndex: "techSatisfaction",
                     key: "techSatisfaction",
-                    render: (text,record) => (
+                    render: (text, record) => (
                         (
                             text === 0 ? '已投诉' :
                                 text === 1 ? '不满意' :
                                     text === 2 ? '一般满意' :
                                         text === 3 ? '非常满意' : '无'
                         )
-                        +'/'+
+                        + '/' +
                         (record.businessSatisfaction === 0 ? '已投诉' :
                             record.businessSatisfaction === 1 ? '不满意' :
                                 record.businessSatisfaction === 2 ? '一般满意' :
@@ -234,10 +234,10 @@ class FollowUp extends Component{
                         return (
                             <Tooltip placement="topLeft" title={text}>
                                 <div style={{
-                                    maxWidth:'80px',
-                                    overflow:'hidden',
+                                    maxWidth: '80px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -248,27 +248,27 @@ class FollowUp extends Component{
                     dataIndex: "a",
                     key: "a",
                     width: 100,
-                    render: (_,record) => {
-                        if(record.projects){
+                    render: (_, record) => {
+                        if (record.projects) {
                             let projectsArr = record.projects.split('/');
                             let consultantsArr = record.consultants.split('/');
                             let declareBatchsArr = record.declareBatchs.split('/');
                             let certificationNosArr = record.certificationNos.split('/');
                             let data = [];
-                            for (let i in projectsArr){
+                            for (let i in projectsArr) {
                                 data.push({
-                                    project:projectsArr[i],
-                                    consultant:consultantsArr[i],
-                                    declareBatch:declareBatchsArr[i],
-                                    certificationNo:certificationNosArr[i],
+                                    project: projectsArr[i],
+                                    consultant: consultantsArr[i],
+                                    declareBatch: declareBatchsArr[i],
+                                    certificationNo: certificationNosArr[i],
                                 })
                             }
                             return (
-                                <Button type="primary" onClick={(e)=>{
+                                <Button type="primary" onClick={(e) => {
                                     e.stopPropagation();
                                     this.setState({
-                                        detailsVisible:true,
-                                        detailsInfor:data
+                                        detailsVisible: true,
+                                        detailsInfor: data
                                     })
                                 }}>查看项目</Button>
                             )
@@ -277,9 +277,9 @@ class FollowUp extends Component{
                     }
                 },
             ],
-            changeList:[],
-            listLoading:false,
-            page:1,
+            changeList: [],
+            listLoading: false,
+            page: 1,
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -292,37 +292,37 @@ class FollowUp extends Component{
                     return "共" + total + "条数据";
                 },
             },
-            departmentArr:[],
-            customerName:'',
-            releaseDate:[],
-            signTimes:[],
+            departmentArr: [],
+            customerName: '',
+            releaseDate: [],
+            signTimes: [],
         }
         this.changeList = this.changeList.bind(this);
         this.loadData = this.loadData.bind(this);
         this.search = this.search.bind(this);
         this.reset = this.reset.bind(this);
-        this.departmentList = this.departmentList.bind(this);
+        this.exportExec = this.exportExec.bind(this);
         this.download = this.download.bind(this);
     }
 
     componentDidMount() {
-        this.departmentList();
         this.loadData();
     }
 
-    search(){
+    search() {
         this.loadData();
     }
 
-    reset(){
+    reset() {
         this.setState({
-            customerName:undefined,
-            depId:undefined,
-            addWechat:undefined,
-            renewal:undefined,
-            releaseDate:[],
-            signTimes:[],
-        },()=>{
+            customerName: undefined,
+            depId: undefined,
+            addWechat: undefined,
+            renewal: undefined,
+            releaseDate: [],
+            signTimes: [],
+        }, () => {
+            this.Cascaders.empty();
             this.loadData();
         })
     }
@@ -339,14 +339,14 @@ class FollowUp extends Component{
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                userName:this.state.customerName || undefined,
-                depId:this.state.depId || undefined,
-                addWechat:this.state.addWechat || undefined,
-                renewal:this.state.renewal || undefined,
-                startFollowTimes:this.state.releaseDate[0] || undefined,
-                endFollowTimes:this.state.releaseDate[1] || undefined,
-                startSignTimes:this.state.signTimes[0] || undefined,
-                endSignTimes:this.state.signTimes[1] || undefined,
+                userName: this.state.customerName || undefined,
+                deps: this.state.depId || undefined,
+                addWechat: this.state.addWechat || undefined,
+                renewal: this.state.renewal || undefined,
+                startFollowTimes: this.state.releaseDate[0] || undefined,
+                endFollowTimes: this.state.releaseDate[1] || undefined,
+                startSignTimes: this.state.signTimes[0] || undefined,
+                endSignTimes: this.state.signTimes[1] || undefined,
             },
             success: function (data) {
                 ShowModal(this);
@@ -366,28 +366,10 @@ class FollowUp extends Component{
                         this.state.pagination.current = 0;
                         this.state.pagination.total = 0;
                     }
-                    let obj = {
-                        userName:this.state.customerName || undefined,
-                        depId:this.state.depId || undefined,
-                        addWechat:this.state.addWechat || undefined,
-                        renewal:this.state.renewal || undefined,
-                        startFollowTimes:this.state.releaseDate[0] || undefined,
-                        endFollowTimes:this.state.releaseDate[1] || undefined,
-                        startSignTimes:this.state.signTimes[0] || undefined,
-                        endSignTimes:this.state.signTimes[1] || undefined,
-                    }
-                    let arr = Object.keys(obj);
-                    let str = '?';
-                    for(let i of arr){
-                        if(obj[i]){
-                            str+=i+'='+obj[i]+'&'
-                        }
-                    }
                     this.setState({
                         dataSource: theArr,
                         page: data.data.pageNo,
                         pagination: this.state.pagination,
-                        downloadSrc:str,
                     });
                 }
             }.bind(this),
@@ -413,45 +395,51 @@ class FollowUp extends Component{
             changeList: newArr
         });
     }
-
-    //部门
-    departmentList() {
+    // 导出excel
+    exportExec() {
+        message.config({
+            duration: 20,
+        });
+        let loading = message.loading("下载中...");
+        this.setState({
+            exportPendingLoading: true,
+        });
+        let data = {
+            userName: this.state.customerName || undefined,
+            deps: this.state.depId || undefined,
+            addWechat: this.state.addWechat || undefined,
+            renewal: this.state.renewal || undefined,
+            startFollowTimes: this.state.releaseDate[0] || undefined,
+            endFollowTimes: this.state.releaseDate[1] || undefined,
+            startSignTimes: this.state.signTimes[0] || undefined,
+            endSignTimes: this.state.signTimes[1] || undefined,
+        };
         $.ajax({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/organization/selectSuperId",
-            data: {},
+            url: "/api/admin/userServiceExport",
+            data,
             success: function (data) {
-                let thedata = data.data;
-                let theArr = [];
-                if (!thedata) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    }
+                if (data.error.length === 0) {
+                    this.download(data.data);
                 } else {
-                    thedata.map(function (item, index) {
-                        theArr.push({
-                            key: index,
-                            name: item.name,
-                            id: item.id,
-                        });
-                    });
+                    message.warning(data.error[0].message);
                 }
-                this.setState({
-                    departmentArr: theArr,
-                });
             }.bind(this),
         }).always(
             function () {
+                loading();
+                this.setState({
+                    exportPendingLoading: false,
+                });
             }.bind(this)
         );
     }
-
-    download() {
+    // 下载
+    download(fileName) {
         window.location.href =
-            globalConfig.context +
-            "/api/admin/userServiceExport" + this.state.downloadSrc
+            globalConfig.context + "/open/download?fileName=" + fileName;
     }
 
     render() {
@@ -459,33 +447,31 @@ class FollowUp extends Component{
             <div className="user-content">
                 <ShowModalDiv ShowModal={this.state.showModal} />
                 <div className="content-title">
-                    <span>客服跟进详情</span>
+                    <span style={{ fontWeight: 900, fontSize: 16 }}>客服跟进详情</span>
                 </div>
                 <Tabs defaultActiveKey="1" className="test">
-                    <TabPane tab="搜索" key="1" style={{padding:'10px 0'}}>
+                    <TabPane tab="搜索" key="1" style={{ padding: '10px 0' }}>
                         <Input
                             placeholder="客户名称"
-                            style={{ width: "150px", marginRight: 10,marginBottom: "10px" }}
+                            style={{ width: "150px", marginRight: 10, marginBottom: "10px" }}
                             value={this.state.customerName}
                             onChange={(e) => {
                                 this.setState({ customerName: e.target.value });
                             }}
                         />
-                        <Select
+                        <Cascaders
+                            ref={node => this.Cascaders = node}
                             placeholder="订单部门"
-                            style={{ width: 150, marginRight: 10,marginBottom: "10px" }}
-                            value={this.state.depId}
-                            onChange={(e) => {
-                                this.setState({ depId: e });
+                            height={28}
+                            onSel={(e) => {
+                                this.setState({
+                                    depId: JSON.stringify(e),
+                                });
                             }}
-                        >
-                            {this.state.departmentArr.map(function (item) {
-                                return <Option key={item.id}>{item.name}</Option>;
-                            })}
-                        </Select>
+                        />
                         <Select
                             placeholder="是否已添微信"
-                            style={{ width: 150, marginRight: 10,marginBottom: "10px" }}
+                            style={{ width: 150, marginRight: 10, marginBottom: "10px" }}
                             value={this.state.addWechat}
                             onChange={(e) => {
                                 this.setState({ addWechat: e });
@@ -496,7 +482,7 @@ class FollowUp extends Component{
                         </Select>
                         <Select
                             placeholder="续签情况"
-                            style={{ width: 250, marginRight: 10,marginBottom: "10px" }}
+                            style={{ width: 250, marginRight: 10, marginBottom: "10px" }}
                             value={this.state.renewal}
                             onChange={(e) => {
                                 this.setState({ renewal: e });
@@ -510,9 +496,9 @@ class FollowUp extends Component{
                             <Option value={1}>企业已签其他机构</Option>
                             <Option value={0}>未联系上当前联系人</Option>
                         </Select>
-                        <span style={{ marginRight: "10px",marginBottom: "10px" }}>跟进时间 :</span>
+                        <span style={{ marginRight: "10px", marginBottom: "10px" }}>跟进时间 :</span>
                         <RangePicker
-                            style={{marginBottom: "10px",width:'187px'}}
+                            style={{ marginBottom: "10px", width: '187px' }}
                             value={[
                                 this.state.releaseDate[0]
                                     ? moment(this.state.releaseDate[0])
@@ -525,9 +511,9 @@ class FollowUp extends Component{
                                 this.setState({ releaseDate: dataString });
                             }}
                         />
-                        <span style={{ marginRight: "10px",marginLeft: "10px",marginBottom: "10px" }}>下单时间 :</span>
+                        <span style={{ marginRight: "10px", marginLeft: "10px", marginBottom: "10px" }}>下单时间 :</span>
                         <RangePicker
-                            style={{marginBottom: "10px",width:'187px'}}
+                            style={{ marginBottom: "10px", width: '187px' }}
                             value={[
                                 this.state.signTimes[0]
                                     ? moment(this.state.signTimes[0])
@@ -543,12 +529,12 @@ class FollowUp extends Component{
                         <Button
                             type="primary"
                             onClick={this.search}
-                            style={{ marginLeft: "10px",marginBottom: "10px" }}
+                            style={{ marginLeft: "10px", marginBottom: "10px" }}
                         >
                             搜索
                             <Icon type="search" />
                         </Button>
-                        <Button onClick={this.reset} style={{ marginLeft: "10px",marginBottom: "10px" }}>
+                        <Button onClick={this.reset} style={{ marginLeft: "10px", marginBottom: "10px" }}>
                             重置 <Icon type="reload" />
                         </Button>
                     </TabPane>
@@ -566,8 +552,8 @@ class FollowUp extends Component{
                     <TabPane tab="操作" key="3">
                         <Button
                             type="primary"
-                            style={{margin: '10px'}}
-                            onClick={this.download}
+                            style={{ margin: '10px' }}
+                            onClick={this.exportExec}
                         >
                             导出
                         </Button>
@@ -581,11 +567,11 @@ class FollowUp extends Component{
                             pagination={this.state.pagination}
                             scroll={{ x: "max-content", y: 0 }}
                             bordered
-                            onRowClick={(record)=>{
+                            onRowClick={(record) => {
                                 this.setState({
-                                    visible:true,
-                                    orderNo:record.orderNo,
-                                    uid:record.uid,
+                                    visible: true,
+                                    orderNo: record.orderNo,
+                                    uid: record.uid,
                                 })
                             }}
                         />
@@ -595,25 +581,25 @@ class FollowUp extends Component{
                     visible={this.state.visible}
                     orderNo={this.state.orderNo}
                     uid={this.state.uid}
-                    onCancel={()=>{
+                    onCancel={() => {
                         this.setState({
-                            visible:false,
-                            orderNo:'',
-                            uid:'',
-                        },()=>{
+                            visible: false,
+                            orderNo: '',
+                            uid: '',
+                        }, () => {
                             this.loadData(this.state.page);
                         })
-                    }}/> : ''}
+                    }} /> : ''}
                 {this.state.detailsVisible ?
                     <CorrespondingDetails
                         visible={this.state.detailsVisible}
                         detailsInfor={this.state.detailsInfor}
-                        onCancel={()=>{
+                        onCancel={() => {
                             this.setState({
-                                detailsVisible:false,
-                                detailsInfor:[],
+                                detailsVisible: false,
+                                detailsInfor: [],
                             })
-                        }}/> : ''}
+                        }} /> : ''}
             </div>
         )
     }

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

@@ -48,7 +48,7 @@ const PersonnelAll = React.createClass({
         name: this.state.nameSearch, //客户名称
         orderNo: this.state.orderNoSearch, //订单编号
         taskId: this.state.taskNoSearch, //任务编号
-        depId: this.state.departmenttSearch, //订单部门
+        deps: this.state.departmenttSearch, //订单部门
         taskStatus: this.state.taskStatus, //任务状态
         adminName: this.state.adminName, //任务受理人
         outsource: 1,

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

@@ -75,6 +75,7 @@ class ChooseList extends Component {
   }
 
   showModal() {
+    this.load()
     this.setState({
       visible: true
     });

+ 1 - 1
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -375,7 +375,7 @@ class projectOverview extends Component {
                 pageSize: this.state.pagination.pageSize,
                 specially: 0, //个人
                 name: this.state.nameSearch, //客户名称
-                depId: this.state.departmenttSearch, //订单部门
+                deps: this.state.departmenttSearch, //订单部门
                 orderNo: this.state.orderNoSearch, //订单编号
                 contractNo: this.state.contractNoSearch, //合同编号
                 taskId: this.state.taskNoSearch, //项目编号

+ 1 - 1
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js

@@ -378,7 +378,7 @@ class projectOverview extends Component {
                 pageSize: this.state.pagination.pageSize,
                 specially: 0, //个人
                 name: this.state.nameSearch, //客户名称
-                depId: this.state.departmenttSearch, //订单部门
+                deps: this.state.departmenttSearch, //订单部门
                 orderNo: this.state.orderNoSearch, //订单编号
                 contractNo: this.state.contractNoSearch, //合同编号
                 taskId: this.state.taskNoSearch, //项目编号

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

@@ -815,12 +815,7 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
-                  }}>{text}</div>
+                  <div>{text}</div>
                 </Tooltip>
               )
             }
@@ -829,17 +824,18 @@ const IntentionCustomer = Form.create()(
             title: "订单部门",
             dataIndex: "depName",
             key: "depName",
-            // fixed: 'left'
           },
           {
             title: "下单时间",
             dataIndex: "createDate",
             key: "createTime",
+            width: 80,
           },
           {
             title: "合同签订时间",
             dataIndex: "signDate",
             key: "signDate",
+            width: 90,
           },
           {
             title: "流程状态",
@@ -2391,12 +2387,12 @@ const IntentionCustomer = Form.create()(
                   return (
                     <Tooltip title={text}>
                       <div
-                        // style={{
-                        //   width: 100,
-                        //   overflow: "hidden",
-                        //   whiteSpace: "nowrap",
-                        //   textOverflow: "ellipsis",
-                        // }}
+                      // style={{
+                      //   width: 100,
+                      //   overflow: "hidden",
+                      //   whiteSpace: "nowrap",
+                      //   textOverflow: "ellipsis",
+                      // }}
                       >{text}</div>
                     </Tooltip>
                   )

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

@@ -28,7 +28,10 @@ import {
 import ShowModalDiv from "@/showModal.jsx";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import Cascaders from "../../../common/cascaders";
 // import ResolutionPro from "../task/resolutionPro";
+
+
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
 const PersonnelAll = React.createClass({
@@ -50,7 +53,7 @@ const PersonnelAll = React.createClass({
         name: this.state.nameSearch, //客户名称
         orderNo: this.state.orderNoSearch, //订单编号
         taskId: this.state.taskNoSearch, //任务编号
-        depId: this.state.departmenttSearch, //订单部门
+        deps: this.state.departmenttSearch, //订单部门
         taskStatus: this.state.taskStatus, //任务状态
         adminName: this.state.adminName, //任务受理人
         outsource: 1,
@@ -342,7 +345,7 @@ const PersonnelAll = React.createClass({
           key: "serviceLife",
           render: (text, record) => {
             return (
-<div>{!!text && JSON.parse(text).toString()}</div>
+              <div>{!!text && JSON.parse(text).toString()}</div>
             );
           }
         },
@@ -396,7 +399,7 @@ const PersonnelAll = React.createClass({
   },
 
   componentWillMount() {
-    this.departmentList();
+    // this.departmentList();
     this.loadData();
   },
   tableRowClick(record) {
@@ -571,6 +574,7 @@ const PersonnelAll = React.createClass({
     this.state.taskNoSearch = "";
     this.state.departmenttSearch = undefined;
     this.state.distribution = undefined;
+    this.Cascaders.empty();
     this.loadData(this.state.page);
   },
   searchSwitch() {
@@ -878,7 +882,17 @@ const PersonnelAll = React.createClass({
                   this.setState({ taskNoSearch: e.target.value });
                 }}
               />
-              <Select
+              <Cascaders
+                ref={ref => this.Cascaders = ref}
+                placeholder="选择部门"
+                height={28}
+                onSel={(e) => {
+                  this.setState({
+                    departmenttSearch: JSON.stringify(e)
+                  })
+                }}
+              />
+              {/* <Select
                 placeholder="选择部门"
                 style={{ width: 150, marginRight: "10px" }}
                 value={this.state.departmenttSearch}
@@ -891,7 +905,7 @@ const PersonnelAll = React.createClass({
                     <Select.Option key={item.id}>{item.name}</Select.Option>
                   );
                 })}
-              </Select>
+              </Select> */}
               <Button type="primary" onClick={this.search}>
                 搜索
               </Button>

+ 55 - 54
js/component/manageCenter/project/project/enterpriseProjectQuery.jsx

@@ -1,6 +1,6 @@
-import React,{Component} from 'react';
-import {Button, DatePicker, Input, message, Select, Spin, Table, Tabs} from "antd";
-import {ChooseList} from "../../order/orderNew/chooseList";
+import React, { Component } from 'react';
+import { Button, DatePicker, Input, message, Select, Spin, Table, Tabs } from "antd";
+import { ChooseList } from "../../order/orderNew/chooseList";
 import $ from "jquery/src/ajax";
 import {
     ShowModal,
@@ -10,14 +10,14 @@ import {
 import moment from "moment";
 import ProjectDetails from "../summary/projectDetails";
 
-const {TabPane} = Tabs;
+const { TabPane } = Tabs;
 const { RangePicker } = DatePicker;
 const { Option } = Select;
 
-class EnterpriseProjectQuery extends Component{
+class EnterpriseProjectQuery extends Component {
     constructor(props) {
         super(props);
-        this.state={
+        this.state = {
             visible: false,
             dataSource: [],
             departmentArr: [],
@@ -54,8 +54,8 @@ class EnterpriseProjectQuery extends Component{
                     title: '订单部门',
                     dataIndex: 'depName',
                     key: 'depName',
-                    render:(text)=>{
-                        return (text&&text.length>8?text.substr(0,8)+'...':text)
+                    render: (text) => {
+                        return (text && text.length > 8 ? text.substr(0, 8) + '...' : text)
                     }
                 },
                 {
@@ -107,7 +107,7 @@ class EnterpriseProjectQuery extends Component{
                     title: "项目状态",
                     dataIndex: "projectStatus",
                     key: "projectStatus",
-                    render:(value)=>(
+                    render: (value) => (
                         getProjectName(parseInt(value))
                     )
                 },
@@ -122,15 +122,15 @@ class EnterpriseProjectQuery extends Component{
                     key: "specialComment",
                 },
             ],
-            releaseDate:[],
+            releaseDate: [],
             searchOrderNo: '',
             searchContractNo: '',
             searchEnterpriseName: '',
             declarationBatch: '',
             projectSituation: '',
             projectAmount: '',
-            depId:'',
-            thchDepId:'',
+            depId: '',
+            thchDepId: '',
             projectType: '',
             projectStatus: '',
 
@@ -168,8 +168,8 @@ class EnterpriseProjectQuery extends Component{
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize || 10,
-                startTime: this.state.releaseDate.length > 0 ? this.state.releaseDate[0]: undefined, //开始时间
-                endTime: this.state.releaseDate.length > 0 ? this.state.releaseDate[1]: undefined, //结束时间
+                startTime: this.state.releaseDate.length > 0 ? this.state.releaseDate[0] : undefined, //开始时间
+                endTime: this.state.releaseDate.length > 0 ? this.state.releaseDate[1] : undefined, //结束时间
                 depId: this.state.depId || undefined,//部门ID
                 techDepId: this.state.thchDepId || undefined,//责任部门ID
                 cid: this.state.projectStatus || undefined,//项目类别
@@ -266,10 +266,10 @@ class EnterpriseProjectQuery extends Component{
             projectSituation: '',
             projectAmount: '',
             projectType: '',
-            depId:'',
-            thchDepId:'',
-            projectStatus:'',
-        },()=>{
+            depId: '',
+            thchDepId: '',
+            projectStatus: '',
+        }, () => {
             this.loadData();
         })
     }
@@ -284,7 +284,7 @@ class EnterpriseProjectQuery extends Component{
             data: {
                 flag: 0
             },
-            success: function(data) {
+            success: function (data) {
                 let theArr = [];
                 let thedata = data.data;
                 if (!thedata) {
@@ -319,8 +319,8 @@ class EnterpriseProjectQuery extends Component{
             data: {
                 pageNo: 1,
                 pageSize: 99999,
-                startTime: this.state.releaseDate.length > 0 ? this.state.releaseDate[0]: undefined, //开始时间
-                endTime: this.state.releaseDate.length > 0 ? this.state.releaseDate[1]: undefined, //结束时间
+                startTime: this.state.releaseDate.length > 0 ? this.state.releaseDate[0] : undefined, //开始时间
+                endTime: this.state.releaseDate.length > 0 ? this.state.releaseDate[1] : undefined, //结束时间
                 depId: this.state.depId || undefined,//部门ID
                 techDepId: this.state.thchDepId || undefined,//责任部门ID
                 cid: this.state.projectStatus || undefined,//项目类别
@@ -336,7 +336,7 @@ class EnterpriseProjectQuery extends Component{
                 if (data.error && data.error.length) {
                     message.warning(data.error[0].message);
                 } else {
-                    download(data.data,true);
+                    download(data.data, true);
                 }
             }.bind(this),
         }).always(
@@ -365,13 +365,13 @@ class EnterpriseProjectQuery extends Component{
                 <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
                     <TabPane tab="搜索" key="1">
                         <div className="user-search" style={{
-                            marginTop:'10px',
-                            marginLeft:'10px',
-                            marginRight:'10px'
+                            marginTop: '10px',
+                            marginLeft: '10px',
+                            marginRight: '10px'
                         }}>
                             <Input
                                 placeholder="订单编号"
-                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                style={{ width: 100, marginRight: '10px', marginBottom: '10px' }}
                                 value={this.state.searchOrderNo}
                                 onChange={e => {
                                     this.setState({ searchOrderNo: e.target.value });
@@ -379,7 +379,7 @@ class EnterpriseProjectQuery extends Component{
                             />
                             <Input
                                 placeholder="合同编号"
-                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                style={{ width: 100, marginRight: '10px', marginBottom: '10px' }}
                                 value={this.state.searchContractNo}
                                 onChange={e => {
                                     this.setState({ searchContractNo: e.target.value });
@@ -387,21 +387,21 @@ class EnterpriseProjectQuery extends Component{
                             />
                             <Input
                                 placeholder="企业名称"
-                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                style={{ width: 100, marginRight: '10px', marginBottom: '10px' }}
                                 value={this.state.searchEnterpriseName}
                                 onChange={e => {
                                     this.setState({ searchEnterpriseName: e.target.value });
                                 }}
                             />
-                            <span style={{display:"inline-block"}}>
-                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目类别 :</span>
+                            <span style={{ display: "inline-block" }}>
+                                <span style={{ marginRight: '10px', marginBottom: '10px' }}>项目类别 :</span>
                                 <Select
                                     value={this.state.projectStatus || undefined}
                                     placeholder="请选择项目类别"
                                     notFoundContent="未获取到上级品类列表"
-                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    style={{ width: 100, marginRight: '10px', marginBottom: '10px' }}
                                     onChange={(e) => {
-                                        let infor = this.state.contactsOptionData.filter((v)=>v.id === e);
+                                        let infor = this.state.contactsOptionData.filter((v) => v.id === e);
                                         this.setState({
                                             projectStatus: e,
                                         })
@@ -410,12 +410,12 @@ class EnterpriseProjectQuery extends Component{
                                     {this.state.contactsOption}
                                 </Select>
                             </span>
-                            <span style={{display:"inline-block"}}>
-                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目分类 :</span>
+                            <span style={{ display: "inline-block" }}>
+                                <span style={{ marginRight: '10px', marginBottom: '10px' }}>项目分类 :</span>
                                 <Select
                                     value={typeof this.state.projectType === 'number' ? this.state.projectType : undefined}
                                     placeholder="请选择项目分类"
-                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    style={{ width: 100, marginRight: '10px', marginBottom: '10px' }}
                                     onChange={(e) => {
                                         this.setState({
                                             projectType: e,
@@ -430,14 +430,15 @@ class EnterpriseProjectQuery extends Component{
                                     <Option value={4}>双软</Option>
                                     <Option value={5}>高新</Option>
                                     <Option value={6}>商标</Option>
+                                    <Option value={7}>会员</Option>
                                 </Select>
                             </span>
-                            <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
+                            <span style={{ display: "inline-block", marginRight: '10px', marginBottom: '10px' }}>
                                 <Spin spinning={this.state.departmentListloading}>
                                     <span>订单部门:</span>
                                     <Select
                                         placeholder="请选择部门"
-                                        style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
+                                        style={{ width: 200, marginRight: '10px', marginLeft: '10px', marginBottom: '10px' }}
                                         value={this.state.depId || undefined}
                                         onChange={e => {
                                             this.setState({ depId: e });
@@ -451,11 +452,11 @@ class EnterpriseProjectQuery extends Component{
                                     </Select>
                                 </Spin>
                             </span>
-                            <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
+                            <span style={{ display: "inline-block", marginRight: '10px', marginBottom: '10px' }}>
                                 <span>负责部门:</span>
                                 <Select
                                     placeholder="请选择部门"
-                                    style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
+                                    style={{ width: 200, marginRight: '10px', marginLeft: '10px', marginBottom: '10px' }}
                                     value={this.state.thchDepId || undefined}
                                     onChange={e => {
                                         this.setState({ thchDepId: e });
@@ -468,12 +469,12 @@ class EnterpriseProjectQuery extends Component{
                                     }
                                 </Select>
                             </span>
-                            <span style={{display:"inline-block"}}>
-                                <span style={{marginRight:'10px',marginBottom:'10px'}}>申报批次 :</span>
+                            <span style={{ display: "inline-block" }}>
+                                <span style={{ marginRight: '10px', marginBottom: '10px' }}>申报批次 :</span>
                                 <Select
                                     value={this.state.declarationBatch || undefined}
                                     placeholder="请选择批次"
-                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    style={{ width: 100, marginRight: '10px', marginBottom: '10px' }}
                                     onChange={(e) => {
                                         this.setState({
                                             declarationBatch: e,
@@ -486,12 +487,12 @@ class EnterpriseProjectQuery extends Component{
                                     <Option value={4}>第四批</Option>
                                 </Select>
                             </span>
-                            <span style={{display:"inline-block"}}>
-                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目金额 :</span>
+                            <span style={{ display: "inline-block" }}>
+                                <span style={{ marginRight: '10px', marginBottom: '10px' }}>项目金额 :</span>
                                 <Select
                                     value={this.state.projectAmount || undefined}
                                     placeholder="请选择项目金额"
-                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    style={{ width: 100, marginRight: '10px', marginBottom: '10px' }}
                                     onChange={(e) => {
                                         this.setState({
                                             projectAmount: e,
@@ -530,10 +531,10 @@ class EnterpriseProjectQuery extends Component{
                             {/*        <Option value={6}>项目未完成 已退单</Option>*/}
                             {/*    </Select>*/}
                             {/*</span>*/}
-                            <span style={{display:"inline-block"}}>
-                                <span style={{marginRight:'10px',marginBottom:'10px'}}>派单时间 :</span>
+                            <span style={{ display: "inline-block" }}>
+                                <span style={{ marginRight: '10px', marginBottom: '10px' }}>派单时间 :</span>
                                 <RangePicker
-                                    style={{marginRight:'10px',marginBottom:'10px'}}
+                                    style={{ marginRight: '10px', marginBottom: '10px' }}
                                     value={[
                                         this.state.releaseDate[0]
                                             ? moment(this.state.releaseDate[0])
@@ -547,8 +548,8 @@ class EnterpriseProjectQuery extends Component{
                                     }}
                                 />
                             </span>
-                            <Button type="primary" onClick={()=>{this.loadData();}} style={{marginRight:'10px',marginBottom:'10px'}}>搜索</Button>
-                            <Button onClick={this.resetAll} style={{marginRight:'10px',marginBottom:'10px'}}>重置</Button>
+                            <Button type="primary" onClick={() => { this.loadData(); }} style={{ marginRight: '10px', marginBottom: '10px' }}>搜索</Button>
+                            <Button onClick={this.resetAll} style={{ marginRight: '10px', marginBottom: '10px' }}>重置</Button>
                         </div>
                     </TabPane>
                     <TabPane tab="更改表格显示数据" key="2">
@@ -563,7 +564,7 @@ class EnterpriseProjectQuery extends Component{
                         </div>
                     </TabPane>
                     <TabPane tab="导出EXCEL" key="3">
-                        <Button type="primary" style={{margin: '10px'}} onClick={this.exportPending}>导出</Button>
+                        <Button type="primary" style={{ margin: '10px' }} onClick={this.exportPending}>导出</Button>
                     </TabPane>
                 </Tabs>
                 <div className="patent-table">
@@ -580,7 +581,7 @@ class EnterpriseProjectQuery extends Component{
                             style={{
                                 cursor: 'pointer',
                             }}
-                            onRowClick={(record)=>{
+                            onRowClick={(record) => {
                                 this.setState({
                                     projectdetailsId: record.id,
                                     projectdetailsOrderNo: record.orderNo,
@@ -598,12 +599,12 @@ class EnterpriseProjectQuery extends Component{
                     id={this.state.projectdetailsId}
                     orderNo={this.state.projectdetailsOrderNo}
                     taskName={this.state.commodityName}
-                    visitOk={()=>{
+                    visitOk={() => {
                         this.setState({
                             visible: false,
                         });
                     }}
-                    visitCancel={()=>{
+                    visitCancel={() => {
                         this.setState({
                             visible: false,
                         });

+ 19 - 5
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -22,6 +22,8 @@ import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from "../../order/orderNew/changeComponent/orderCoor";
+import Cascaders from "../../../common/cascaders";
+
 const FormItem = Form.Item;
 const { TabPane } = Tabs
 const OutsourceTaskAssignment = React.createClass({
@@ -42,7 +44,7 @@ const OutsourceTaskAssignment = React.createClass({
         name: this.state.nameSearch, //客户名称
         orderNo: this.state.orderNoSearch, //订单编号
         taskId: this.state.taskNoSearch, //任务编号
-        depId: this.state.departmenttSearch, //订单部门
+        deps: this.state.departmenttSearch, //订单部门
         taskStatus: this.state.taskStatus, //任务状态
         adminName: this.state.adminName, //任务受理人
         outsource: 1,
@@ -343,7 +345,7 @@ const OutsourceTaskAssignment = React.createClass({
           key: "serviceLife",
           render: (text, record) => {
             return (
-<div>{!!text && JSON.parse(text).toString()}</div>
+              <div>{!!text && JSON.parse(text).toString()}</div>
             );
           }
         },
@@ -401,7 +403,7 @@ const OutsourceTaskAssignment = React.createClass({
   },
 
   componentWillMount() {
-    this.departmentList();
+    // this.departmentList();
     this.loadData();
   },
   tableRowClick(record) {
@@ -594,6 +596,8 @@ const OutsourceTaskAssignment = React.createClass({
     this.state.taskNoSearch = "";
     this.state.departmenttSearch = undefined;
     this.state.distribution = undefined;
+    this.loadData();
+    this.Cascaders.empty();
   },
   searchSwitch() {
     this.setState({
@@ -1061,7 +1065,17 @@ const OutsourceTaskAssignment = React.createClass({
                   this.setState({ taskNoSearch: e.target.value });
                 }}
               />
-              <Select
+              <Cascaders
+                ref={ref => this.Cascaders = ref}
+                placeholder="选择部门"
+                height={28}
+                onSel={(e) => {
+                  this.setState({
+                    departmenttSearch: JSON.stringify(e)
+                  })
+                }}
+              />
+              {/* <Select
                 placeholder="选择部门"
                 style={{ width: 200, marginRight: "10px" }}
                 value={this.state.departmenttSearch}
@@ -1074,7 +1088,7 @@ const OutsourceTaskAssignment = React.createClass({
                     <Select.Option key={item.id}>{item.name}</Select.Option>
                   );
                 })}
-              </Select>
+              </Select> */}
               <Button type="primary" onClick={this.search}>
                 搜索
               </Button>

+ 134 - 183
js/component/manageCenter/project/summary/highTech.jsx

@@ -8,12 +8,14 @@ import {
   Spin,
   Table,
   Tabs,
+  Cascader,
 } from "antd";
 import { ShowModal } from "@/tools";
 import { ChooseList } from "../../order/orderNew/chooseList";
 import $ from "jquery/src/ajax";
 import moment from "moment";
 import {
+  member,
   highTechColumns,
   doubleSoft,
   softWriting,
@@ -21,6 +23,7 @@ import {
   currency,
 } from "./highTechConfig";
 import ProjectDetails from "./projectDetails";
+import Cascaders from "../../../common/cascaders";
 
 const { TabPane } = Tabs;
 const { RangePicker } = DatePicker;
@@ -56,8 +59,8 @@ class HighTech extends Component {
       declarationBatch: "",
       projectSituation: "",
       projectAmount: "",
-      depId: "",
-      thchDepId: "",
+      deps: "",
+      thchDeps: "",
       projectType: "",
       projectStatus: "",
       departmentArr: [],
@@ -67,7 +70,6 @@ class HighTech extends Component {
     };
     this.resetAll = this.resetAll.bind(this);
     this.changeList = this.changeList.bind(this);
-    this.departmentList = this.departmentList.bind(this);
     this.loadData = this.loadData.bind(this);
     this.selectSuperId = this.selectSuperId.bind(this);
   }
@@ -115,13 +117,10 @@ class HighTech extends Component {
             this.state.releaseDate.length > 0
               ? this.state.releaseDate[1]
               : undefined, //结束时间
-          depId: this.state.depId || undefined, //部门ID
-          thchDepId: this.state.thchDepId || undefined, //责任部门ID
+          deps: this.state.deps || undefined, //部门ID
+          thchDeps: this.state.thchDeps || undefined, //责任部门ID
           projectStatus: this.state.projectStatus || undefined, //项目类别
-          projectType:
-            typeof this.state.projectType === "number"
-              ? this.state.projectType
-              : undefined, //项目分类
+          projectType: !this.state.projectType ? undefined : this.state.projectType, //项目分类
           orderNo: this.state.searchOrderNo || undefined, //订单编号
           contractNo: this.state.searchContractNo || undefined, //合同编号
           userName: this.state.searchEnterpriseName || undefined, //企业名称
@@ -171,6 +170,7 @@ class HighTech extends Component {
   resetAll() {
     this.setState(
       {
+        newArray: [],
         releaseDate: [],
         searchOrderNo: "",
         searchContractNo: "",
@@ -179,48 +179,20 @@ class HighTech extends Component {
         projectSituation: "",
         projectAmount: "",
         projectType: "",
-        depId: "",
-        thchDepId: "",
+        deps: "",
+        thchDeps: "",
         projectStatus: "",
         columns: currency,
         status: 0,
       },
       () => {
+        this.Cascaders1.empty();
+        this.Cascaders2.empty();
         this.defaultcolumns();
         this.loadData();
       }
     );
   }
-  //部门
-  departmentList() {
-    $.ajax({
-      method: "get",
-      dataType: "json",
-      crossDomain: false,
-      url: globalConfig.context + "/api/admin/organization/selectSuperId",
-      data: {},
-      success: function (data) {
-        let thedata = data.data;
-        let theArr = [];
-        if (!thedata) {
-          if (data.error && data.error.length) {
-            message.warning(data.error[0].message);
-          }
-        } else {
-          thedata.map(function (item, index) {
-            theArr.push({
-              key: index,
-              name: item.name,
-              id: item.id,
-            });
-          });
-        }
-        this.setState({
-          departmentArr: theArr,
-        });
-      }.bind(this),
-    });
-  }
   //项目类别
   selectSuperId() {
     $.ajax({
@@ -233,6 +205,7 @@ class HighTech extends Component {
       },
       success: function (data) {
         let theArr = [];
+        let newTheArr = []
         let thedata = data.data;
         if (!thedata) {
           if (data.error && data.error.length) {
@@ -246,82 +219,27 @@ class HighTech extends Component {
               {theData.cname}
             </Select.Option>
           );
+          let newChildren = []
+          for (let j = 0; j < theData.typeList.length; j++) {
+            newChildren.push({
+              label: theData.typeList[j].name,
+              value: theData.typeList[j].id,
+            })
+          }
+          newTheArr.push({
+            label: theData.cname,
+            value: theData.id,
+            children: newChildren
+          })
         }
         this.setState({
           contactsOption: theArr,
-          contactsOptionData: data.data,
+          contactsOptionData: newTheArr,
+          // contactsOptionData: data.data,
         });
       }.bind(this),
     }).always();
   }
-  // 老版导出
-  exportPending() {
-    let url = `/api/admin/statistis/exporTaskList?status=${this.state.status}`;
-    let dep = this.state.departmentArr.filter((e) => e.id === this.state.depId); //订单部门名称
-    let thchDep = this.state.departmentArr.filter((e) => e.id === this.state.thchDepId); //责任部门名称
-    let option = this.state.contactsOptionData.filter((e) => e.id === this.state.projectStatus); //项目类别名称
-    if (dep.length > 0) {
-      url = url + `&depName=${dep[0].name}`;
-    }
-    if (thchDep.length > 0) {
-      url = url + `&thchDepName=${thchDep[0].name}`;
-    }
-    if (option.length > 0) {
-      url = url + `&projectStatusName=${option[0].cname}`;
-    }
-    if (typeof this.state.projectType === "number") {
-      url =
-        url +
-        `&projectTypeName=${this.state.projectType === 0
-          ? "通用"
-          : this.state.projectType === 1
-            ? "专利"
-            : this.state.projectType === 2
-              ? "软著"
-              : this.state.projectType === 3
-                ? "审计"
-                : this.state.projectType === 4
-                  ? "双软"
-                  : this.state.projectType === 5
-                    ? "高新"
-                    : ""
-        }`;
-    }
-    let data = {
-      startDate:
-        this.state.releaseDate.length > 0
-          ? this.state.releaseDate[0]
-          : undefined, //开始时间
-      endDate:
-        this.state.releaseDate.length > 0
-          ? this.state.releaseDate[1]
-          : undefined, //结束时间
-      depId: this.state.depId || undefined, //部门ID
-      thchDepId: this.state.thchDepId || undefined, //责任部门ID
-      projectStatus: this.state.projectStatus || undefined, //项目类别
-      projectType:
-        typeof this.state.projectType === "number"
-          ? this.state.projectType
-          : undefined, //项目分类
-      orderNo: this.state.searchOrderNo || undefined, //订单编号
-      contractNo: this.state.searchContractNo || undefined, //合同编号
-      userName: this.state.searchEnterpriseName || undefined, //企业名称
-      declarationBatch: this.state.declarationBatch || undefined, //申报批次
-      projectSituation:
-        typeof this.state.projectSituation === "number"
-          ? this.state.projectSituation
-          : undefined, //项目情况
-      projectAmount: this.state.projectAmount || undefined, //项目金额
-    };
-
-    for (let key in data) {
-      if (data[key]) {
-        url = url + `&${key}=${data[key]}`;
-      }
-    }
-
-    window.location.href = globalConfig.context + url;
-  }
   // 设置默认table(用来默认不显示某列数据 isNoD:true)
   defaultcolumns() {
     const newArr = [];
@@ -334,6 +252,8 @@ class HighTech extends Component {
     });
     this.setState({
       changeList: newArr,
+    }, () => {
+      this.loadData();
     });
   }
   // 导出excel
@@ -354,13 +274,10 @@ class HighTech extends Component {
         this.state.releaseDate.length > 0
           ? this.state.releaseDate[1]
           : undefined, //结束时间
-      depId: this.state.depId || undefined, //部门ID
-      thchDepId: this.state.thchDepId || undefined, //责任部门ID
+      deps: this.state.deps || undefined, //部门ID
+      thchDeps: this.state.thchDeps || undefined, //责任部门ID
       projectStatus: this.state.projectStatus || undefined, //项目类别
-      projectType:
-        typeof this.state.projectType === "number"
-          ? this.state.projectType
-          : undefined, //项目分类
+      projectType: !this.state.projectType ? undefined : this.state.projectType, //项目分类
       status: this.state.status,
       orderNo: this.state.searchOrderNo || undefined, //订单编号
       contractNo: this.state.searchContractNo || undefined, //合同编号
@@ -397,31 +314,24 @@ class HighTech extends Component {
   }
 
   componentWillMount() {
-    this.defaultcolumns();
-    this.loadData();
+    // this.loadData();
     if (!this.props.introduce) {
-      this.departmentList();
+      this.defaultcolumns();
       this.selectSuperId();
     }
     if (this.props.searchData) {
       let e = this.props.searchData.projectType;
       this.setState({
         columns:
-          e === 0
-            ? currency
-            : e === 1
-              ? patent
-              : e === 2
-                ? softWriting
-                : e === 3
-                  ? currency
-                  : e === 4
-                    ? doubleSoft
-                    : e === 5
-                      ? highTechColumns
-                      : e === 6
-                        ? currency
-                        : currency,
+          e == "0"
+            ? currency : e == "1"
+              ? patent : e == "2"
+                ? softWriting : e == "3"
+                  ? currency : e == "4"
+                    ? doubleSoft : e == "5"
+                      ? highTechColumns : e == "6"
+                        ? currency : e == "7"
+                          ? member : currency,
       });
     }
   }
@@ -440,7 +350,8 @@ class HighTech extends Component {
                   ? "高新" : this.state.status === 2
                     ? "双软" : this.state.status === 3
                       ? "软著" : this.state.status === 4
-                        ? "专利" : "通用"}
+                        ? "专利" : this.state.status === 5
+                          ? "会员" : "通用"}
                 )
               </span>
             </div>
@@ -494,6 +405,45 @@ class HighTech extends Component {
                     }}
                   />
                   <span style={{ display: "inline-block" }}>
+                    <span style={{ marginRight: "10px" }}>项目分类 :</span>
+                    <Cascader
+                      options={this.state.contactsOptionData}
+                      value={this.state.newArray}
+                      placeholder="请选择"
+                      style={{ width: 200, marginRight: 10 }}
+                      onChange={(e, pre) => {
+                        let first = e[0];
+                        let two = e[1];
+                        this.setState({
+                          newArray: e,
+                          projectStatus: first,
+                          projectType: two,
+                          changeList: undefined,
+                          dataSource: [],
+                          status:
+                            two == "4"
+                              ? 2 : two == "2"
+                                ? 3 : two == "1"
+                                  ? 4 : two == "5"
+                                    ? 1 : two == "7"
+                                      ? 5 : 0,
+                          columns:
+                            two == "0"
+                              ? currency : two == "1"
+                                ? patent : two == "2"
+                                  ? softWriting : two == "3"
+                                    ? currency : two == "4"
+                                      ? doubleSoft : two == "5"
+                                        ? highTechColumns : two == "6"
+                                          ? currency : two == "7"
+                                            ? member : currency,
+                        }, () => {
+                          this.defaultcolumns()
+                        })
+                      }}
+                    />
+                  </span>
+                  {/* <span style={{ display: "inline-block" }}>
                     <span style={{ marginRight: "10px" }}>
                       项目类别 :
                     </span>
@@ -512,29 +462,29 @@ class HighTech extends Component {
                         this.setState(
                           {
                             projectStatus: e,
-                          }
-                          // ()=>{
-                          //     if(infor[0].cname === '高新' && typeof this.state.projectType !== 'number'){
-                          //         this.setState({
-                          //             columns: highTechColumns,
-                          //             dataSource:[],
-                          //             changeList: [],
-                          //             status: 1,
-                          //         },()=>{
-                          //             this.loadData();
-                          //         })
-                          //     }else if (typeof this.state.projectType !== 'number'){
-                          //         this.setState({
-                          //             columns: currency,
-                          //             dataSource:[],
-                          //             changeList: [],
-                          //             status: 0,
-                          //         },()=>{
-                          //             this.loadData();
-                          //         })
-                          //     }else{
-                          //         this.loadData();
-                          //     }
+                          },
+                          // () => {
+                          //   if (infor[0].cname === '高新会员服务' && typeof this.state.projectType !== 'number') {
+                          //     this.setState({
+                          //       columns: highTechColumns,
+                          //       dataSource: [],
+                          //       changeList: [],
+                          //       status: 1,
+                          //     }, () => {
+                          //       this.loadData();
+                          //     })
+                          //   } else if (typeof this.state.projectType !== 'number') {
+                          //     this.setState({
+                          //       columns: currency,
+                          //       dataSource: [],
+                          //       changeList: [],
+                          //       status: 0,
+                          //     }, () => {
+                          //       this.loadData();
+                          //     })
+                          //   } else {
+                          //     this.loadData();
+                          //   }
                           // }
                         );
                       }}
@@ -586,7 +536,6 @@ class HighTech extends Component {
                         );
                       }}
                     >
-                      {/*0通用 1专利 2软著 3审计 4双软 5高新*/}
                       <Option value={0}>通用</Option>
                       <Option value={1}>专利</Option>
                       <Option value={2}>软著</Option>
@@ -594,35 +543,26 @@ class HighTech extends Component {
                       <Option value={4}>双软</Option>
                       <Option value={5}>高新</Option>
                       <Option value={6}>商标</Option>
+                      <Option value={7}>会员</Option>
                     </Select>
-                  </span>
+                  </span> */}
                   <span
                     style={{
                       display: "inline-block",
                       marginRight: "10px",
                     }}
                   >
-                    <span>订单部门:</span>
-                    <Select
-                      placeholder="请选择部门"
-                      style={{
-                        width: 200,
-                        marginRight: "10px",
-                        marginLeft: "10px",
-                      }}
-                      value={this.state.depId || undefined}
-                      onChange={(e) => {
-                        this.setState({ depId: e });
+                    <span style={{ marginRight: "10px", marginBottom: "10px" }}>订单部门 : </span>
+                    <Cascaders
+                      ref={ref => this.Cascaders1 = ref}
+                      placeholder="请选择订单部门"
+                      height={28}
+                      onSel={(e) => {
+                        this.setState({
+                          deps: JSON.stringify(e)
+                        })
                       }}
-                    >
-                      {this.state.departmentArr.map(function (item) {
-                        return (
-                          <Select.Option key={item.id} value={item.id}>
-                            {item.name}
-                          </Select.Option>
-                        );
-                      })}
-                    </Select>
+                    />
                   </span>
                   <span
                     style={{
@@ -630,8 +570,18 @@ class HighTech extends Component {
                       marginRight: "10px",
                     }}
                   >
-                    <span>负责部门:</span>
-                    <Select
+                    <span style={{ marginRight: "10px", marginBottom: "10px" }}>负责部门 : </span>
+                    <Cascaders
+                      ref={ref => this.Cascaders2 = ref}
+                      placeholder="请选择负责部门"
+                      height={28}
+                      onSel={(e) => {
+                        this.setState({
+                          thchDeps: JSON.stringify(e)
+                        })
+                      }}
+                    />
+                    {/* <Select
                       placeholder="请选择部门"
                       style={{
                         width: 200,
@@ -650,7 +600,7 @@ class HighTech extends Component {
                           </Select.Option>
                         );
                       })}
-                    </Select>
+                    </Select> */}
                   </span>
                   <span style={{ display: "inline-block" }}>
                     <span style={{ marginRight: "10px", marginBottom: "10px" }}>
@@ -729,6 +679,7 @@ class HighTech extends Component {
                       派单时间 :
                     </span>
                     <RangePicker
+                      allowClear={false}
                       style={{ marginRight: "10px" }}
                       value={[
                         this.state.releaseDate[0]

+ 167 - 0
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -1,6 +1,157 @@
 import { Tooltip } from 'antd';
 import React from 'react';
 import { getProjectName } from '@/tools';
+
+
+// 高新会员服务
+const member = [
+    {
+        title: "序号",
+        dataIndex: "key",
+        key: "key",
+        isNoD: true,
+    },
+    {
+        title: "派单时间",
+        dataIndex: "distributionTime",
+        key: "distributionTime",
+        width: 80,
+    },
+    {
+        title: "派单省份",
+        dataIndex: "province",
+        key: "province"
+    },
+    {
+        title: "订单部门",
+        dataIndex: "depName",
+        key: "depName",
+        isNoD: true,
+    },
+    {
+        title: "营销员",
+        dataIndex: "salesmanName",
+        key: "salesmanName"
+    },
+    {
+        title: "合同编号",
+        dataIndex: "contractNo",
+        key: "contractNo"
+    },
+    {
+        title: "订单编号",
+        dataIndex: "orderNo",
+        key: "orderNo",
+        isNoD: true,
+    },
+    {
+        title: "签单客户",
+        dataIndex: "userName",
+        key: "userName"
+    },
+    {
+        title: "项目类型",
+        dataIndex: "cname",
+        key: "cname"
+    },
+    {
+        title: "项目名称",
+        dataIndex: "pname",
+        key: "pname"
+    },
+    {
+        title: "数量",
+        dataIndex: "commodityQuantity",
+        key: "commodityQuantity"
+    },
+    {
+        title: "负责部门",
+        dataIndex: "techDepName",
+        key: "techDepName",
+        isNoD: true,
+    },
+    {
+        title: "咨询师/咨询经理",
+        dataIndex: "techName",
+        key: "techName"
+    },
+    //0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单
+    {
+        title: "项目状态",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
+        render: (value) => (
+            getProjectName(value)
+        )
+    },
+    {
+        title: "项目金额",
+        dataIndex: "commodityPrice",
+        key: "commodityPrice"
+    },
+    {
+        title: "总年限",
+        dataIndex: "yearsum",
+        key: "yearsum",
+        render: (text, record) => {
+            return (
+                <div>{["", "一年", "二年", "三年", "四年", "五年"][text]}</div>
+            );
+        }
+    },
+    {
+        title: "年限",
+        dataIndex: "serviceLife",
+        key: "serviceLife",
+        render: (text, record) => {
+            return (
+                <div>{!!text && JSON.parse(text).toString()}</div>
+            );
+        }
+    },
+    {
+        title: "本次派单",
+        dataIndex: "serviceYear",
+        key: "serviceYear"
+    },
+    {
+        title: "合同期",
+        dataIndex: "contractTerm",
+        key: "contractTerm",
+        width: 80,
+        render: (text, record) => {
+            let data = !!text ? JSON.parse(text) : [""]
+            return (
+                data.length <= 1
+                    ? data[0]
+                    : <div>
+                        <div>{data[0]}</div>
+                        <div style={{ textAlign: "center" }}>至</div>
+                        <div>{data[1]}</div>
+                    </div>
+            );
+        }
+    },
+    {
+        title: "项目说明",
+        dataIndex: "taskComment",
+        key: "taskComment",
+        width: 200,
+    },
+    {
+        title: "特别说明",
+        dataIndex: "specialComment",
+        key: "specialComment",
+        isNoD: true,
+    },
+    {
+        title: "订单说明",
+        dataIndex: "orderRemarks",
+        key: "orderRemarks",
+        isNoD: true,
+    }
+];
+
 // 高新
 const highTechColumns = [
     {
@@ -103,6 +254,11 @@ const highTechColumns = [
         key: "certificateNumber"
     },
     {
+        title: "申报年份",
+        dataIndex: "serviceYear",
+        key: "serviceYear"
+    },
+    {
         title: "申报批次",
         dataIndex: "declarationBatch",
         key: "declarationBatch"
@@ -686,6 +842,16 @@ const currency = [
         dataIndex: "commodityPrice",
         key: "commodityPrice"
     },
+    // {
+    //     title: "服务年限",
+    //     dataIndex: "serviceLife",
+    //     key: "serviceLife",
+    //     render: (text, record) => {
+    //         return (
+    //             <div>{!!text && JSON.parse(text).toString()}</div>
+    //         );
+    //     }
+    // },
     {
         title: "项目说明",
         dataIndex: "taskComment",
@@ -719,6 +885,7 @@ const currency = [
 ];
 
 export {
+    member,
     highTechColumns,
     doubleSoft,
     softWriting,

+ 329 - 405
js/component/manageCenter/project/summary/projecCount.jsx

@@ -10,6 +10,7 @@ import {
   Spin,
   Table,
   Tabs,
+  Cascader,
 } from "antd";
 import { ShowModal, getNewDiccityArr } from "@/tools";
 import { citySelect } from "../../../NewDicProvinceList";
@@ -26,6 +27,7 @@ import {
 } from "./projecCountConfig";
 import HighTech from "./highTech";
 import "./index.less";
+import Cascaders from "../../../common/cascaders";
 
 const { TabPane } = Tabs;
 const { RangePicker } = DatePicker;
@@ -135,12 +137,9 @@ class ProjecCount extends Component {
             : undefined, //结束时间
         province: this.state.province || undefined,
         projectStatus: this.state.projectStatus || undefined, //项目类别
-        projectType:
-          typeof this.state.projectType === "number"
-            ? this.state.projectType
-            : undefined, //项目分类
+        projectType: !this.state.projectType ? undefined : this.state.projectType, //项目分类
         status: this.state.status,
-        thchDepId: this.state.depId || undefined,
+        thchDeps: this.state.depId || undefined,
         projectId: this.state.kid || undefined,
       },
       success: function (data) {
@@ -211,6 +210,7 @@ class ProjecCount extends Component {
   resetAll() {
     this.setState(
       {
+        newArray: [],
         releaseDate: [],
         searchOrderNo: "",
         searchContractNo: "",
@@ -218,7 +218,7 @@ class ProjecCount extends Component {
         declarationBatch: "",
         province: "",
         depId: "",
-        projectType: "",
+        projectType: undefined,
         projectStatus: "",
         columns: currency((v, screen) => {
           this.openProjectSummary(v, screen);
@@ -232,6 +232,7 @@ class ProjecCount extends Component {
         taberCommodityName: "",
       },
       () => {
+        this.Cascaders.empty();
         this.loadData();
       }
     );
@@ -245,46 +246,23 @@ class ProjecCount extends Component {
     this.setState({
       exportPendingLoading: true,
     });
-
-    let url = `/api/admin/statistis/exporProvincialList?status=${this.state.status}`;
-    let dep = this.state.departmentArr.filter((e) => e.id === this.state.depId); //责任部门名称
     let option = this.state.contactsOptionData.filter(
-      (e) => e.id === this.state.projectStatus
-    ); //项目类别名称
-
-    if (dep.length > 0) {
-      url = url + `&thchDepName=${dep[0].name}`;
-    }
-    if (option.length > 0) {
-      url = url + `&projectStatusName=${option[0].cname}`;
-    }
-    if (typeof this.state.projectType === "number") {
-      url =
-        url +
-        `&projectTypeName=${this.state.projectType === 0
-          ? "通用"
-          : this.state.projectType === 1
-            ? "专利"
-            : this.state.projectType === 2
-              ? "软著"
-              : this.state.projectType === 3
-                ? "审计"
-                : this.state.projectType === 4
-                  ? "双软"
-                  : this.state.projectType === 5
-                    ? "高新"
-                    : this.state.projectType === 6
-                      ? "商标"
-                      : ""
-        }`;
-    }
-    if (this.state.commodityName) {
-      url = url + `&projectName=${this.state.commodityName}`;
-    }
-    if (this.state.province) {
-      url = url + `&provinceName=${getNewDiccityArr(this.state.province)}`;
-    }
-    let data = {
+      (e) => e.value === this.state.projectStatus
+    ); //  项目类别名称
+    let datas = {
+      status: this.state.status,
+      projectStatusName: option.length > 0 ? option[0].label : undefined,
+      projectName:
+        this.state.projectType == "0"
+          ? "通用" : this.state.projectType == "1"
+            ? "专利" : this.state.projectType == "2"
+              ? "软著" : this.state.projectType == "3"
+                ? "审计" : this.state.projectType == "4"
+                  ? "双软" : this.state.projectType == "5"
+                    ? "高新" : this.state.projectType == "6"
+                      ? "商标" : this.state.projectType == "7"
+                        ? "会员" : "",
+      provinceName: !!this.state.province ? getNewDiccityArr(this.state.province) : undefined,
       startDate:
         this.state.releaseDate.length > 0
           ? this.state.releaseDate[0]
@@ -293,28 +271,18 @@ class ProjecCount extends Component {
         this.state.releaseDate.length > 0
           ? this.state.releaseDate[1]
           : undefined, //结束时间
-      thchDepId: this.state.depId || undefined, //责任部门ID
+      thchDeps: this.state.depId || undefined, //责任部门ID
       projectStatus: this.state.projectStatus || undefined, //项目类别
-      projectType:
-        typeof this.state.projectType === "number"
-          ? this.state.projectType
-          : undefined, //项目分类
+      projectType: !this.state.projectType ? undefined : this.state.projectType, //项目分类
       province: this.state.province || undefined,
       projectId: this.state.kid || undefined,
-    };
-
-    for (let key in data) {
-      if (data[key]) {
-        url = url + `&${key}=${data[key]}`;
-      }
     }
-
     $.ajax({
       method: "get",
       dataType: "json",
       crossDomain: false,
-      url: url,
-      data: {},
+      url: "/api/admin/statistis/exporProvincialList",
+      data: datas,
       success: function (data) {
         if (data.error.length === 0) {
           this.download(data.data);
@@ -333,12 +301,9 @@ class ProjecCount extends Component {
   }
 
   exportExcel() {
-    let dep = this.state.departmentArr.filter(
-      (v) => v.id === this.state.taberdepId
-    )[0].name; //责任部门名称
     let option = this.state.contactsOptionData.filter(
-      (v) => v.id === this.state.taberProjectStatus
-    )[0].cname; //项目类别名称
+      (v) => v.value === this.state.taberProjectStatus
+    )[0].label; //项目类别名称
     let data = {
       pageNo: this.state.pageNo || 1,
       pageSize: 9999,
@@ -350,64 +315,53 @@ class ProjecCount extends Component {
         this.state.releaseDate.length > 0
           ? this.state.releaseDate[1]
           : undefined, //结束时间
-      projectType: this.state.projectType.toString(), //项目分类
+      projectType: !this.state.projectType ? undefined : this.state.projectType, //项目分类
       // typeof this.state.projectType === "number"
       //   ? this.state.projectType
       //   : undefined,
-      thchDepName: dep || undefined, //咨询师部门名称
+      thchDepName: undefined, //咨询师部门名称
       projectTypeName:
-        this.state.projectType === 0
+        this.state.projectType == "0"
           ? "通用"
-          : this.state.projectType === 1
+          : this.state.projectType == "1"
             ? "专利"
-            : this.state.projectType === 2
+            : this.state.projectType == "2"
               ? "软著"
-              : this.state.projectType === 3
+              : this.state.projectType == "3"
                 ? "审计"
-                : this.state.projectType === 4
+                : this.state.projectType == "4"
                   ? "双软"
-                  : this.state.projectType === 5
+                  : this.state.projectType == "5"
                     ? "高新"
-                    : this.state.projectType === 6
+                    : this.state.projectType == "6"
                       ? "商标"
-                      : "", //项目分类(中文)
+                      : this.state.projectType == "7"
+                        ? "会员" : "", //项目分类(中文)
       projectStatusName: option || undefined, //项目品类(中文)
       provinceName: getNewDiccityArr(this.state.taberProvince) || undefined, //省份(中文)
       projectId: this.state.kid || undefined,
       province: this.state.taberProvince || undefined,
       projectStatus: this.state.taberProjectStatus || undefined, //项目类别
       thchDepId: this.state.taberdepId || undefined,
-
       status:
-        this.state.projectType === 4
+        this.state.projectType == "4"
           ? 2
-          : this.state.projectType === 2
+          : this.state.projectType == "2"
             ? 3
-            : this.state.projectType === 1
+            : this.state.projectType == "1"
               ? 4
-              : this.state.projectType === 5
+              : this.state.projectType == "5"
                 ? 1
                 : this.state.contactsOptionData.filter(
-                  (v) => v.id === this.state.taberProjectStatus
+                  (v) => v.value === this.state.taberProjectStatus
                 ).length > 0
                   ? this.state.contactsOptionData.filter(
-                    (v) => v.id === this.state.taberProjectStatus
-                  )[0].cname === "高新"
+                    (v) => v.value === this.state.taberProjectStatus
+                  )[0].label === "高新"
                     ? 1
                     : 0
                   : 0,
       screen: this.state.screen.toString(), //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数
-
-
-
-
-
-
-
-
-
-
-
     };
 
     for (let key in data) {
@@ -426,7 +380,6 @@ class ProjecCount extends Component {
     window.location.href =
       globalConfig.context + "/open/download?fileName=" + fileName;
   }
-
   //项目类别
   selectSuperId() {
     $.ajax({
@@ -439,6 +392,7 @@ class ProjecCount extends Component {
       },
       success: function (data) {
         let theArr = [];
+        let newTheArr = []
         let thedata = data.data;
         if (!thedata) {
           if (data.error && data.error.length) {
@@ -452,14 +406,43 @@ class ProjecCount extends Component {
               {theData.cname}
             </Select.Option>
           );
+          let newChildren = []
+          for (let j = 0; j < theData.typeList.length; j++) {
+            newChildren.push({
+              label: theData.typeList[j].name,
+              value: theData.typeList[j].id,
+            })
+          }
+          newTheArr.push({
+            label: theData.cname,
+            value: theData.id,
+            children: newChildren
+          })
         }
         this.setState({
           contactsOption: theArr,
-          contactsOptionData: data.data,
+          contactsOptionData: newTheArr,
+          // contactsOptionData: data.data,
         });
       }.bind(this),
     }).always();
   }
+  // 设置默认table(用来默认不显示某列数据 isNoD:true)
+  defaultcolumns() {
+    const newArr = [];
+    this.state.columns.forEach((item) => {
+      if (item.isNoD) {
+        return
+      } else {
+        newArr.push(item);
+      }
+    });
+    this.setState({
+      changeList: newArr,
+    }, () => {
+      this.loadData();
+    });
+  }
 
   supervisorCui(e) {
     //客户名称与服务名称自动补全
@@ -518,8 +501,9 @@ class ProjecCount extends Component {
   }
 
   componentWillMount() {
-    this.loadData();
-    this.departmentList();
+    this.defaultcolumns();
+    // this.loadData();
+    // this.departmentList();
     this.selectSuperId();
   }
 
@@ -529,6 +513,7 @@ class ProjecCount extends Component {
       taberProvince: record.province,
       taberProjectStatus: record.bpId, //项目类别
       taberdepId: record.thchDepId,
+      thchDepName: record.thchDepName,
       screen: screen,
     });
   }
@@ -574,7 +559,7 @@ class ProjecCount extends Component {
                   marginBottom: "10px",
                 }}
               >
-                <span>项目名称:</span>
+                <span>项目名称 :</span>
                 <AutoComplete
                   className="certain-category-search"
                   dropdownClassName="certain-category-search-dropdown"
@@ -592,143 +577,67 @@ class ProjecCount extends Component {
                 </AutoComplete>
               </span>
               <span style={{ display: "inline-block" }}>
-                <span style={{ marginRight: "10px", marginBottom: "10px" }}>
-                  项目类别 :
-                </span>
-                <Select
-                  value={this.state.projectStatus || undefined}
-                  placeholder="请选择项目类别"
-                  notFoundContent="未获取到上级品类列表"
-                  style={{
-                    width: 100,
-                    marginRight: "10px",
-                    marginBottom: "10px",
-                  }}
-                  onChange={(e) => {
-                    let infor = this.state.contactsOptionData.filter(
-                      (v) => v.id === e
-                    );
-                    this.setState(
-                      {
-                        projectStatus: e,
-                      }
-                      // () => {
-                      //   if (
-                      //     infor.length &&
-                      //     infor[0].cname === "高新" &&
-                      //     typeof this.state.projectType !== "number"
-                      //   ) {
-                      //     this.setState(
-                      //       {
-                      //         columns: highTechColumns((v, screen) => {
-                      //           this.openProjectSummary(v, screen);
-                      //         }),
-                      //         changeList: [],
-                      //         status: 1,
-                      //       },
-                      //       () => {
-                      //         this.loadData();
-                      //       }
-                      //     );
-                      //   } else if (typeof this.state.projectType !== "number") {
-                      //     this.setState(
-                      //       {
-                      //         columns: currency((v, screen) => {
-                      //           this.openProjectSummary(v, screen);
-                      //         }),
-                      //         changeList: [],
-                      //         status: 0,
-                      //       },
-                      //       () => {
-                      //         this.loadData();
-                      //       }
-                      //     );
-                      //   } else {
-                      //     this.loadData();
-                      //   }
-                      // }
-                    );
-                  }}
-                >
-                  {this.state.contactsOption}
-                </Select>
-              </span>
-              <span style={{ display: "inline-block" }}>
-                <span style={{ marginRight: "10px", marginBottom: "10px" }}>
-                  项目分类 :
-                </span>
-                <Select
-                  value={
-                    typeof this.state.projectType === "number"
-                      ? this.state.projectType
-                      : undefined
-                  }
-                  placeholder="请选择项目分类"
-                  style={{
-                    width: 100,
-                    marginRight: "10px",
-                    marginBottom: "10px",
-                  }}
-                  onChange={(e) => {
-                    this.setState(
-                      {
-                        projectType: e,
-                        columns:
-                          e === 0
-                            ? currency((v, screen) => {
+                <span style={{ marginRight: "10px" }}>项目分类 :</span>
+                <Cascader
+                  options={this.state.contactsOptionData}
+                  value={this.state.newArray}
+                  placeholder="请选择"
+                  style={{ width: 200, marginRight: 10 }}
+                  onChange={(e, pre) => {
+                    let first = e[0];
+                    let two = e[1];
+                    this.setState({
+                      newArray: e,
+                      projectStatus: first,
+                      projectType: two,
+                      changeList: undefined,
+                      dataSource: [],
+                      status:
+                        two == "1"
+                          ? 2 : two == "2"
+                            ? 4 : two == "5"
+                              ? 1 : two == "6"
+                                ? 5 : 0,
+                      columns:
+                        two == "0"
+                          ? currency((v, screen) => {
+                            this.openProjectSummary(v, screen);
+                          })
+                          : two == "1"
+                            ? invention((v, screen) => {
                               this.openProjectSummary(v, screen);
                             })
-                            : e === 1
-                              ? invention((v, screen) => {
+                            : two == "2"
+                              ? softWriting((v, screen) => {
                                 this.openProjectSummary(v, screen);
                               })
-                              : e === 2
-                                ? softWriting((v, screen) => {
+                              : two == "3"
+                                ? currency((v, screen) => {
                                   this.openProjectSummary(v, screen);
                                 })
-                                : e === 3
+                                : two == "4"
                                   ? currency((v, screen) => {
                                     this.openProjectSummary(v, screen);
                                   })
-                                  : e === 4
-                                    ? currency((v, screen) => {
+                                  : two == "5"
+                                    ? highTechColumns((v, screen) => {
                                       this.openProjectSummary(v, screen);
                                     })
-                                    : e === 5
-                                      ? highTechColumns((v, screen) => {
+                                    : two == "6"
+                                      ? otherTrademarks((v, screen) => {
                                         this.openProjectSummary(v, screen);
                                       })
-                                      : e === 6
-                                        ? otherTrademarks((v, screen) => {
+                                      : two == "7"
+                                        ? currency((v, screen) => {
                                           this.openProjectSummary(v, screen);
-                                        })
-                                        : [],
-                        changeList: [],
-                        status:
-                          e === 1
-                            ? 2
-                            : e === 2
-                              ? 4
-                              : e === 5
-                                ? 1
-                                : e === 6
-                                  ? 5
-                                  : 0, // 0通用 1高新 2发明专利 3实用新型 4软著 5商标
-                      }
-                      // () => {
-                      //   this.loadData();
-                      // }
-                    );
+                                        }) : currency((v, screen) => {
+                                          this.openProjectSummary(v, screen);
+                                        }),
+                    }, () => {
+                      this.defaultcolumns()
+                    })
                   }}
-                >
-                  <Option value={0}>通用</Option>
-                  <Option value={1}>专利</Option>
-                  <Option value={2}>软著</Option>
-                  <Option value={3}>审计</Option>
-                  <Option value={4}>双软</Option>
-                  <Option value={5}>高新</Option>
-                  <Option value={6}>商标</Option>
-                </Select>
+                />
               </span>
               <span
                 style={{
@@ -767,8 +676,18 @@ class ProjecCount extends Component {
                   marginBottom: "10px",
                 }}
               >
-                <span>负责部门:</span>
-                <Select
+                <span style={{ marginRight: 10, }}>负责部门:</span>
+                <Cascaders
+                  ref={node => this.Cascaders = node}
+                  placeholder="选择负责部门"
+                  height={28}
+                  onSel={(e) => {
+                    this.setState({
+                      depId: JSON.stringify(e),
+                    });
+                  }}
+                />
+                {/* <Select
                   placeholder="请选择部门"
                   style={{
                     width: 200,
@@ -788,7 +707,7 @@ class ProjecCount extends Component {
                       </Select.Option>
                     );
                   })}
-                </Select>
+                </Select> */}
               </span>
               <span style={{ display: "inline-block" }}>
                 <span style={{ marginRight: "10px", marginBottom: "10px" }}>
@@ -866,202 +785,207 @@ class ProjecCount extends Component {
               size="middle"
               scroll={{ x: 800, y: 0 }}
               columns={
-                this.state.changeList
-                  ? this.state.changeList
-                  : this.state.columns
+                this.state.changeList == undefined
+                  ? this.state.columns
+                  : this.state.changeList
               }
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
             />
           </Spin>
         </div>
-        {this.state.projectSummary ? (
-          <Modal
-            maskClosable={false}
-            className="customeDetails"
-            footer=""
-            title=""
-            width="1800px"
-            visible={this.state.projectSummary}
-            onOk={() => {
-              this.setState({
-                projectSummary: false,
-              });
-            }}
-            onCancel={() => {
-              this.setState({
-                projectSummary: false,
-              });
-            }}
-          >
-            <HighTech
-              searchData={{
-                startDate:
-                  this.state.releaseDate.length > 0
-                    ? this.state.releaseDate[0]
-                    : undefined, //开始时间
-                endDate:
-                  this.state.releaseDate.length > 0
-                    ? this.state.releaseDate[1]
-                    : undefined, //结束时间
-                projectType:
-                  typeof this.state.projectType === "number"
-                    ? this.state.projectType
-                    : undefined, //项目分类
-                projectId: this.state.kid || undefined,
-
-                province: this.state.taberProvince || undefined,
-                projectStatus: this.state.taberProjectStatus || undefined, //项目类别
-                thchDepId: this.state.taberdepId || undefined,
-
-                status:
-                  this.state.projectType === 4
-                    ? 2
-                    : this.state.projectType === 2
-                      ? 3
-                      : this.state.projectType === 1
-                        ? 4
-                        : this.state.projectType === 5
-                          ? 1
-                          : this.state.contactsOptionData.filter(
-                            (v) => v.id === this.state.taberProjectStatus
-                          ).length > 0
-                            ? this.state.contactsOptionData.filter(
-                              (v) => v.id === this.state.taberProjectStatus
-                            )[0].cname === "高新"
-                              ? 1
-                              : 0
-                            : 0,
-                screen: this.state.screen, //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数
+        {
+          this.state.projectSummary ? (
+            <Modal
+              maskClosable={false}
+              className="customeDetails"
+              footer=""
+              title=""
+              width="1800px"
+              visible={this.state.projectSummary}
+              onOk={() => {
+                this.setState({
+                  projectSummary: false,
+                });
               }}
-              introduce={() => (
-                <div
-                  className="user-search"
-                  style={{
-                    marginTop: "10px",
-                    marginLeft: "10px",
-                    marginRight: "10px",
-                  }}
-                >
-                  {this.state.taberProvince ? (
-                    <span
-                      style={{
-                        display: "inline-block",
-                        marginRight: "20px",
-                        marginBottom: "10px",
-                      }}
-                    >
-                      <span>派单省份:</span>
-                      <span style={{ width: 100, marginLeft: "10px" }}>
-                        {getNewDiccityArr(this.state.taberProvince)}
+              onCancel={() => {
+                this.setState({
+                  projectSummary: false,
+                });
+              }}
+            >
+              <HighTech
+                searchData={{
+                  startDate:
+                    this.state.releaseDate.length > 0
+                      ? this.state.releaseDate[0]
+                      : undefined, //开始时间
+                  endDate:
+                    this.state.releaseDate.length > 0
+                      ? this.state.releaseDate[1]
+                      : undefined, //结束时间
+                  projectType:
+                    !this.state.projectType
+                      ? undefined
+                      : this.state.projectType, //项目分类
+                  projectId: this.state.kid || undefined,
+
+                  province: this.state.taberProvince || undefined,
+                  projectStatus: this.state.taberProjectStatus || undefined, //项目类别
+                  thchDepId: this.state.taberdepId || undefined,
+
+                  status:
+                    this.state.projectType == "4"
+                      ? 2
+                      : this.state.projectType == "2"
+                        ? 3
+                        : this.state.projectType == "1"
+                          ? 4
+                          : this.state.projectType == "5"
+                            ? 1
+                            : this.state.contactsOptionData.filter(
+                              (v) => v.value === this.state.taberProjectStatus
+                            ).length > 0
+                              ? this.state.contactsOptionData.filter(
+                                (v) => v.value === this.state.taberProjectStatus
+                              )[0].label === "高新"
+                                ? 1
+                                : 0
+                              : 0,
+                  screen: this.state.screen, //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数
+                }}
+                introduce={() => (
+                  <div
+                    className="user-search"
+                    style={{
+                      marginTop: "10px",
+                      marginLeft: "10px",
+                      marginRight: "10px",
+                    }}
+                  >
+                    {this.state.taberProvince ? (
+                      <span
+                        style={{
+                          display: "inline-block",
+                          marginRight: "20px",
+                          marginBottom: "10px",
+                        }}
+                      >
+                        <span>派单省份:</span>
+                        <span style={{ width: 100, marginLeft: "10px" }}>
+                          {getNewDiccityArr(this.state.taberProvince)}
+                        </span>
                       </span>
-                    </span>
-                  ) : null}
-                  {this.state.taberProjectStatus ? (
-                    <span
-                      style={{
-                        display: "inline-block",
-                        marginRight: "20px",
-                        marginBottom: "10px",
-                      }}
-                    >
-                      <span>项目类别 :</span>
-                      <span style={{ width: 100, marginLeft: "10px" }}>
-                        {
-                          this.state.contactsOptionData.filter(
-                            (v) => v.id === this.state.taberProjectStatus
-                          )[0].cname
-                        }
+                    ) : null}
+                    {this.state.taberProjectStatus ? (
+                      <span
+                        style={{
+                          display: "inline-block",
+                          marginRight: "20px",
+                          marginBottom: "10px",
+                        }}
+                      >
+                        <span>项目类别 :</span>
+                        <span style={{ width: 100, marginLeft: "10px" }}>
+                          {
+                            this.state.contactsOptionData.filter(
+                              (v) => v.value === this.state.taberProjectStatus
+                            )[0].label
+                          }
+                        </span>
                       </span>
-                    </span>
-                  ) : null}
-                  {this.state.taberdepId ? (
-                    <span
-                      style={{
-                        display: "inline-block",
-                        marginRight: "20px",
-                        marginBottom: "10px",
-                      }}
-                    >
-                      <span>负责部门:</span>
-                      <span style={{ width: 200, marginLeft: "10px" }}>
-                        {
-                          this.state.departmentArr.filter(
-                            (v) => v.id === this.state.taberdepId
-                          )[0].name
-                        }
+                    ) : null}
+                    {this.state.taberProjectType !== "" ? (
+                      <span
+                        style={{
+                          display: "inline-block",
+                          marginRight: "20px",
+                          marginBottom: "10px",
+                        }}
+                      >
+                        <span>项目分类 :</span>
+                        <span style={{ width: 100, marginRight: "10px" }}>
+                          {this.state.taberProjectType == "0"
+                            ? "通用"
+                            : this.state.taberProjectType == "1"
+                              ? "专利"
+                              : this.state.taberProjectType == "2"
+                                ? "软著"
+                                : this.state.taberProjectType == "3"
+                                  ? "审计"
+                                  : this.state.taberProjectType == "4"
+                                    ? "双软"
+                                    : this.state.taberProjectType == "5"
+                                      ? "高新"
+                                      : this.state.taberProjectType == "6"
+                                        ? "商标"
+                                        : this.state.taberProjectType == "7"
+                                          ? "会员"
+                                          : ""}
+                        </span>
                       </span>
-                    </span>
-                  ) : null}
-
-                  {this.state.taberCommodityName ? (
-                    <span
-                      style={{
-                        display: "inline-block",
-                        marginRight: "20px",
-                        marginBottom: "10px",
-                      }}
-                    >
-                      <span>项目名称:</span>
-                      <span style={{ width: 100, marginLeft: "10px" }}>
-                        {this.state.taberCommodityName}
+                    ) : null}
+                    {this.state.taberdepId ? (
+                      <span
+                        style={{
+                          display: "inline-block",
+                          marginRight: "20px",
+                          marginBottom: "10px",
+                        }}
+                      >
+                        <span>负责部门:</span>
+                        <span style={{ width: 200, marginLeft: "10px" }}>
+                          {this.state.thchDepName}
+                          {/* {
+                            this.state.departmentArr.filter(
+                              (v) => v.id === this.state.taberdepId
+                            )[0].name
+                          } */}
+                        </span>
                       </span>
-                    </span>
-                  ) : null}
-                  {typeof this.state.taberProjectType === "number" ? (
-                    <span
-                      style={{
-                        display: "inline-block",
-                        marginRight: "20px",
-                        marginBottom: "10px",
-                      }}
-                    >
-                      <span>项目分类 :</span>
-                      <span style={{ width: 100, marginRight: "10px" }}>
-                        {this.state.taberProjectType === 0
-                          ? "通用"
-                          : this.state.taberProjectType === 1
-                            ? "专利"
-                            : this.state.taberProjectType === 2
-                              ? "软著"
-                              : this.state.taberProjectType === 3
-                                ? "审计"
-                                : this.state.taberProjectType === 4
-                                  ? "双软"
-                                  : this.state.taberProjectType === 5
-                                    ? "高新"
-                                    : this.state.taberProjectType === 6
-                                      ? "商标"
-                                      : ""}
+                    ) : null}
+
+                    {this.state.taberCommodityName ? (
+                      <span
+                        style={{
+                          display: "inline-block",
+                          marginRight: "20px",
+                          marginBottom: "10px",
+                        }}
+                      >
+                        <span>项目名称:</span>
+                        <span style={{ width: 100, marginLeft: "10px" }}>
+                          {this.state.taberCommodityName}
+                        </span>
                       </span>
-                    </span>
-                  ) : null}
-                  {this.state.taberReleaseDate.length > 0 ? (
-                    <span
-                      style={{
-                        display: "inline-block",
-                        marginRight: "20px",
-                        marginBottom: "10px",
-                      }}
-                    >
-                      <span>派单时间 :</span>
-                      <span style={{ width: 100, marginRight: "10px" }}>
-                        {this.state.taberReleaseDate[0] +
-                          "~" +
-                          this.state.taberReleaseDate[1]}
+                    ) : null}
+                    {this.state.taberReleaseDate.length > 0 ? (
+                      <span
+                        style={{
+                          display: "inline-block",
+                          marginRight: "20px",
+                          marginBottom: "10px",
+                        }}
+                      >
+                        <span>派单时间 :</span>
+                        <span style={{ width: 100, marginRight: "10px" }}>
+                          {this.state.taberReleaseDate[0] +
+                            "~" +
+                            this.state.taberReleaseDate[1]}
+                        </span>
                       </span>
-                    </span>
-                  ) : null}
+                    ) : null}
 
-                  <Button type="primary" onClick={this.exportExcel}>
-                    导出EXCEL
-                  </Button>
-                </div>
-              )}
-            />
-          </Modal>
-        ) : null}
-      </div>
+                    <Button type="primary" onClick={this.exportExcel}>
+                      导出EXCEL
+                    </Button>
+                  </div>
+                )}
+              />
+            </Modal>
+          ) : null
+        }
+      </div >
     );
   }
 }

+ 25 - 15
js/component/manageCenter/project/task/myTask.jsx

@@ -48,7 +48,6 @@ import { cuiJieDian, projectStatusCascader } from '@/dataDic.js'
 import ShowModalDiv from '@/showModal.jsx';
 import NowProjectStatus from '../../../common/nowProjectStatus';
 import DeclarationProgress from '../../../../component/common/declarationProgress';
-
 import CheckProject from '../../components/checkProject';
 import NewSupplier from './newSupplier';
 import ImgList from "../../../common/imgList";
@@ -58,9 +57,9 @@ import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import ProjectLog from './projectLog';
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
-
 import PatentCheck from '../../../common/patentCheck';
 import PaymentRecord from "../../../common/initiateOrder/paymentRecord";
+import Cascaders from "../../../common/cascaders";
 
 const confirm = Modal.confirm
 const FormItem = Form.Item
@@ -122,7 +121,7 @@ const Task = React.createClass({
                 pageSize: this.state.pagination.pageSize,
                 specially: 0, //个人
                 name: this.state.nameSearch, //客户名称
-                depId: this.state.departmenttSearch, //订单部门
+                deps: this.state.departmenttSearch, //订单部门
                 cid: this.state.category,//项目分类
                 orderNo: this.state.orderNoSearch, //订单编号
                 contractNo: this.state.contractNoSearch, //合同编号
@@ -758,7 +757,7 @@ const Task = React.createClass({
     },
 
     componentWillMount() {
-        this.departmentList()
+        // this.departmentList()
         this.categoryList()
         this.loadData()
     },
@@ -2204,6 +2203,7 @@ const Task = React.createClass({
             setUpTime: '',
             highTechStatus: '',
         }, () => {
+            this.Cascaders.empty();
             this.loadData(flag ? '' : this.state.page)
         })
     },
@@ -3557,11 +3557,11 @@ const Task = React.createClass({
     // 可展开颜色不同
     addRowColor(record) {
         if (!!record.splitList && record.splitList.length > 0) {
-          return 'light'
+            return 'light'
         } else {
-          return 'dark'
+            return 'dark'
         }
-      },
+    },
 
 
     render() {
@@ -3602,12 +3602,12 @@ const Task = React.createClass({
                                 return (
                                     <Tooltip title={text}>
                                         <div
-                                            // style={{
-                                            //     width: 100,
-                                            //     overflow: "hidden",
-                                            //     whiteSpace: "nowrap",
-                                            //     textOverflow: "ellipsis",
-                                            // }}
+                                        // style={{
+                                        //     width: 100,
+                                        //     overflow: "hidden",
+                                        //     whiteSpace: "nowrap",
+                                        //     textOverflow: "ellipsis",
+                                        // }}
                                         >{text}</div>
                                     </Tooltip>
                                 )
@@ -3728,7 +3728,17 @@ const Task = React.createClass({
                                     )
                                 })}
                             </Select>
-                            <Select
+                            <Cascaders
+                                ref={ref => this.Cascaders = ref}
+                                placeholder="选择部门"
+                                height={28}
+                                onSel={(e) => {
+                                    this.setState({
+                                        departmenttSearch: JSON.stringify(e)
+                                    })
+                                }}
+                            />
+                            {/* <Select
                                 placeholder="选择部门"
                                 style={{ width: 200, marginRight: '10px' }}
                                 value={this.state.departmenttSearch}
@@ -3741,7 +3751,7 @@ const Task = React.createClass({
                                         <Select.Option key={item.id}>{item.name}</Select.Option>
                                     )
                                 })}
-                            </Select>
+                            </Select> */}
                             <Cascader
                                 placeholder="项目状态"
                                 style={{ width: 150, marginRight: '10px' }}

+ 18 - 5
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -59,6 +59,8 @@ import ProjectLog from "./projectLog";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import PatentCheck from "../../../common/patentCheck";
 import ProjectOperation from "../../../common/projectOperation";
+import Cascaders from "../../../common/cascaders";
+
 const FormItem = Form.Item;
 const { Option } = Select;
 const { TextArea } = Input;
@@ -117,7 +119,7 @@ const MyTaskOutsource = React.createClass({
         pageSize: this.state.pagination.pageSize,
         specially: 0, //个人
         name: this.state.nameSearch, //客户名称
-        depId: this.state.departmenttSearch, //订单部门
+        deps: this.state.departmenttSearch, //订单部门
         orderNo: this.state.orderNoSearch, //订单编号
         contractNo: this.state.contractNoSearch, //合同编号
         taskId: this.state.taskNoSearch, //项目编号
@@ -619,7 +621,7 @@ const MyTaskOutsource = React.createClass({
           key: "serviceLife",
           render: (text, record) => {
             return (
-<div>{!!text && JSON.parse(text).toString()}</div>
+              <div>{!!text && JSON.parse(text).toString()}</div>
             );
           }
         },
@@ -887,7 +889,7 @@ const MyTaskOutsource = React.createClass({
   },
 
   componentWillMount() {
-    this.departmentList();
+    // this.departmentList();
     this.loadData();
   },
   componentDidMount() {
@@ -1741,6 +1743,7 @@ const MyTaskOutsource = React.createClass({
     this.state.outsourceName = ""; //外包公司名称
     this.state.outsourcePrice = ""; //外包价格
     this.state.approvalSearch = undefined;
+    this.Cascaders.empty();
     this.loadData(page || 0);
     this.setState({
       oldInfor: {},
@@ -3261,7 +3264,17 @@ const MyTaskOutsource = React.createClass({
                   this.setState({ taskNoSearch: e.target.value });
                 }}
               />
-              <Select
+              <Cascaders
+                ref={ref => this.Cascaders = ref}
+                placeholder="选择部门"
+                height={28}
+                onSel={(e) => {
+                  this.setState({
+                    departmenttSearch: JSON.stringify(e)
+                  })
+                }}
+              />
+              {/* <Select
                 placeholder="选择部门"
                 style={{ width: 200, marginRight: "10px" }}
                 value={this.state.departmenttSearch}
@@ -3274,7 +3287,7 @@ const MyTaskOutsource = React.createClass({
                     <Select.Option key={item.id}>{item.name}</Select.Option>
                   );
                 })}
-              </Select>
+              </Select> */}
               <Cascader
                 placeholder="项目状态"
                 style={{ width: 150, marginRight: '10px' }}

+ 23 - 10
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -21,6 +21,8 @@ import { ChooseList } from "../../order/orderNew/chooseList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
+import Cascaders from "../../../common/cascaders";
+
 const FormItem = Form.Item;
 const { TabPane } = Tabs
 const Task = React.createClass({
@@ -41,7 +43,7 @@ const Task = React.createClass({
         name: this.state.nameSearch, //客户名称
         orderNo: this.state.orderNoSearch, //订单编号
         taskId: this.state.taskNoSearch, //任务编号
-        depId: this.state.departmenttSearch, //订单部门
+        deps: this.state.departmenttSearch, //订单部门
         taskStatus: this.state.taskStatus, //任务状态
         adminName: this.state.adminName, //任务受理人
       },
@@ -396,7 +398,7 @@ const Task = React.createClass({
   },
 
   componentWillMount() {
-    this.departmentList();
+    // this.departmentList();
     this.loadData();
   },
   tableRowClick(record) {
@@ -588,6 +590,7 @@ const Task = React.createClass({
     this.state.taskNoSearch = "";
     this.state.departmenttSearch = undefined;
     this.state.distribution = undefined;
+    this.Cascaders.empty();
     this.loadData();
   },
   searchSwitch() {
@@ -1042,12 +1045,12 @@ const Task = React.createClass({
                 return (
                   <Tooltip title={text}>
                     <div
-                      // style={{
-                      //   width: 100,
-                      //   overflow: "hidden",
-                      //   whiteSpace: "nowrap",
-                      //   textOverflow: "ellipsis",
-                      // }}
+                    // style={{
+                    //   width: 100,
+                    //   overflow: "hidden",
+                    //   whiteSpace: "nowrap",
+                    //   textOverflow: "ellipsis",
+                    // }}
                     >{text}</div>
                   </Tooltip>
                 )
@@ -1164,7 +1167,17 @@ const Task = React.createClass({
                   this.setState({ taskNoSearch: e.target.value });
                 }}
               />
-              <Select
+              <Cascaders
+                ref={ref => this.Cascaders = ref}
+                placeholder="选择部门"
+                height={28}
+                onSel={(e) => {
+                  this.setState({
+                    departmenttSearch: JSON.stringify(e)
+                  })
+                }}
+              />
+              {/* <Select
                 placeholder="选择部门"
                 style={{ width: 200, marginRight: "10px" }}
                 value={this.state.departmenttSearch}
@@ -1177,7 +1190,7 @@ const Task = React.createClass({
                     <Select.Option key={item.id}>{item.name}</Select.Option>
                   );
                 })}
-              </Select>
+              </Select> */}
               <Button type="primary" onClick={this.search}>
                 搜索
               </Button>

File diff suppressed because it is too large
+ 2114 - 2104
js/component/manageCenter/set/business/businessProject.jsx


+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.2.37",
+  "version": "1.2.38",
   "description": "",
   "main": "index.js",
   "scripts": {