dev01 преди 2 години
родител
ревизия
98d050b193
променени са 52 файла, в които са добавени 1032 реда и са изтрити 152 реда
  1. 4 4
      js/component/account/services/annualReport.less
  2. 2 2
      js/component/account/services/contract/contract.less
  3. 4 4
      js/component/account/services/contract/contractAdd.jsx
  4. 2 2
      js/component/account/services/copyright/copyright.less
  5. 2 2
      js/component/account/services/patent.less
  6. 1 1
      js/component/account/services/techProduct.jsx
  7. 1 1
      js/component/account/services/technology.less
  8. 1 1
      js/component/account/set/hrSituation.less
  9. 1 1
      js/component/account/set/person.less
  10. 5 5
      js/component/certify/certify.less
  11. 1 2
      js/component/common/projectOperation/vip.jsx
  12. 14 14
      js/component/common/tabelContent/index.jsx
  13. 4 4
      js/component/groupCertify/certify.less
  14. 4 4
      js/component/manageCenter/customer/NEW/crm/patentPayment.jsx
  15. 5 2
      js/component/manageCenter/financialManage/distribute/projectvip.jsx
  16. 5 5
      js/component/manageCenter/financialManage/distribute/projectvipall.jsx
  17. 10 0
      js/component/manageCenter/order/content.jsx
  18. 1 1
      js/component/manageCenter/order/flowSettlement/billManage/myBillDetaile.jsx
  19. 1 1
      js/component/manageCenter/order/flowSettlement/billQuery/myBillDetaile.jsx
  20. 1 1
      js/component/manageCenter/order/flowSettlement/myBill/myBillDetaile.jsx
  21. 1 1
      js/component/manageCenter/order/orderNew/addService.jsx
  22. 1 1
      js/component/manageCenter/order/orderNew/addorders.js
  23. 8 5
      js/component/manageCenter/order/orderNew/approvedvipproject.jsx
  24. 1 1
      js/component/manageCenter/order/orderNew/customer.less
  25. 776 0
      js/component/manageCenter/order/orderNew/myprojectvip.jsx
  26. 1 1
      js/component/manageCenter/order/orderNew/press.jsx
  27. 132 41
      js/component/manageCenter/order/orderNew/pressList.jsx
  28. 1 1
      js/component/manageCenter/order/orderNew/reject.jsx
  29. 1 1
      js/component/manageCenter/order/source/index.less
  30. 2 2
      js/component/manageCenter/project/task/myTask.jsx
  31. 2 2
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  32. 2 2
      js/component/manageCenter/servicesManage/contract/contract.less
  33. 4 4
      js/component/manageCenter/servicesManage/contract/contractAdd.jsx
  34. 2 2
      js/component/manageCenter/servicesManage/copyright/copyright.less
  35. 4 4
      js/component/manageCenter/servicesManage/highTech/fosterDesc/annualReport.less
  36. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.less
  37. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx
  38. 1 1
      js/component/manageCenter/servicesManage/highTech/highTechFoster.less
  39. 1 1
      js/component/manageCenter/servicesManage/patent/comprehensive.less
  40. 2 2
      js/component/manageCenter/servicesManage/projectOrder/contract.less
  41. 1 1
      js/component/manageCenter/servicesManage/technology/technology.less
  42. 1 1
      js/component/manageCenter/set/userManagementS/newUser.jsx
  43. 1 1
      js/component/manageCenter/userManage/userList.less
  44. 1 1
      js/component/portal/portal.less
  45. 2 2
      js/component/portal/search/subscriberOrg.jsx
  46. 2 2
      js/component/portal/search/subscriberUser.jsx
  47. 4 4
      js/component/sign/account.less
  48. 4 4
      js/component/sign/group.less
  49. 1 1
      js/component/subscriberDetail/detail.less
  50. 1 1
      package.json
  51. 1 1
      webpack-dll.config.js
  52. 0 2
      webpack.config.js

+ 4 - 4
js/component/account/services/annualReport.less

@@ -5,8 +5,8 @@
         height: auto;
         margin-bottom: 0;
         >p {
-            line-height: 32px;
-            min-height: 32px;
+            line-height: 27px;
+            min-height: 27px;
             color: #000;
         }
         >.item-title {
@@ -21,8 +21,8 @@
             float: left;
             width: 25%;
             >p {
-                line-height: 32px;
-                min-height: 32px;
+                line-height: 27px;
+                min-height: 27px;
                 color: #000;
             }
             >.item-title {

+ 2 - 2
js/component/account/services/contract/contract.less

@@ -2,7 +2,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        line-height: 32px;
+        line-height: 27px;
         >span {
             color: #333;
             font-size: 16px;
@@ -45,7 +45,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        height: 32px;
+        height: 27px;
         margin-bottom: 10px;
         >span {
             color: #333;

+ 4 - 4
js/component/account/services/contract/contractAdd.jsx

@@ -174,7 +174,7 @@ const ContractAddFrom = Form.create()(React.createClass({
                         )}
                 </FormItem>
                 <div className="clearfix">
-                    <span style={{ float: "left", lineHeight: '32px', marginRight: '20px' }}>
+                    <span style={{ float: "left", lineHeight: '27px', marginRight: '20px' }}>
                         <Checkbox checked={this.state.highTechCheck} onChange={(e) => {
                             this.setState({ highTechCheck: e.target.checked });
                         }}></Checkbox>
@@ -194,7 +194,7 @@ const ContractAddFrom = Form.create()(React.createClass({
                     </FormItem>
                 </div>
                 <div className="clearfix">
-                    <span style={{ float: "left", lineHeight: '32px', marginRight: '20px' }}>
+                    <span style={{ float: "left", lineHeight: '27px', marginRight: '20px' }}>
                         <Checkbox checked={this.state.patentCheck} onChange={(e) => {
                             this.setState({ patentCheck: e.target.checked });
                         }}></Checkbox>
@@ -210,7 +210,7 @@ const ContractAddFrom = Form.create()(React.createClass({
                     </FormItem>
                 </div>
                 <div className="clearfix">
-                    <span style={{ float: "left", lineHeight: '32px', marginRight: '20px' }}>
+                    <span style={{ float: "left", lineHeight: '27px', marginRight: '20px' }}>
                         <Checkbox checked={this.state.copyrightCheck} onChange={(e) => {
                             this.setState({ copyrightCheck: e.target.checked });
                         }}></Checkbox>
@@ -226,7 +226,7 @@ const ContractAddFrom = Form.create()(React.createClass({
                     </FormItem>
                 </div>
                 <div className="clearfix">
-                    <span style={{ float: "left", lineHeight: '32px', marginRight: '20px' }}>
+                    <span style={{ float: "left", lineHeight: '27px', marginRight: '20px' }}>
                         <Checkbox checked={this.state.techProjectCheck} onChange={(e) => {
                             this.setState({ techProjectCheck: e.target.checked });
                         }}></Checkbox>

+ 2 - 2
js/component/account/services/copyright/copyright.less

@@ -2,7 +2,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        height: 32px;
+        height: 27px;
         margin-bottom: 10px;
         >span {
             color: #333;
@@ -56,7 +56,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        height: 32px;
+        height: 27px;
         margin-bottom: 10px;
         >span {
             color: #333;

+ 2 - 2
js/component/account/services/patent.less

@@ -2,7 +2,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        height: 32px;
+        height: 27px;
         margin-bottom: 10px;
         >span {
             color: #333;
@@ -77,7 +77,7 @@
         }
         .patent-download {
                 >p {
-                    line-height: 32px;
+                    line-height: 27px;
                 }
             }
     }

+ 1 - 1
js/component/account/services/techProduct.jsx

@@ -268,7 +268,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
                         labelCol={{ span: 0 }}
                         wrapperCol={{ span: 22 }}
                     >
-                        <p style={{ lineHeight: "32px" }}>知识产权获得情况及其对产品(服务)在技术上发挥的支持作用(限400字)*</p>
+                        <p style={{ lineHeight: "27px" }}>知识产权获得情况及其对产品(服务)在技术上发挥的支持作用(限400字)*</p>
                         {getFieldDecorator('conditionEffect', {
                             rules: [{ required: true, message: '此项为必填项!' }],
                             initialValue: theData.conditionEffect

+ 1 - 1
js/component/account/services/technology.less

@@ -2,7 +2,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        height: 32px;
+        height: 27px;
         margin-bottom: 10px;
         >span {
             color: #333;

+ 1 - 1
js/component/account/set/hrSituation.less

@@ -17,7 +17,7 @@
     }
     .hrSituation-span {
         float: left;
-        line-height: 32px;
+        line-height: 27px;
         width: 126px;
         text-align: right;
     }

+ 1 - 1
js/component/account/set/person.less

@@ -28,7 +28,7 @@
             select {
                 margin-right: 20px;
                 width: 80px;
-                height: 32px;
+                height: 27px;
                 border: 1px solid #d9d9d9;
             }
         }

+ 5 - 5
js/component/certify/certify.less

@@ -148,7 +148,7 @@
                     .certify-form {
                         #address {
                             select {
-                                height: 32px;
+                                height: 27px;
                                 border: 1px solid #d9d9d9;
                                 border-radius: 4px;
                                 margin-right: 6px;
@@ -188,9 +188,9 @@
                             }
                         }
                         .getVcode {
-                            height: 32px;
+                            height: 27px;
                             width: 100%;
-                            padding-top: 32px;
+                            padding-top: 27px;
                             position: relative;
                             overflow: hidden;
                             img {
@@ -198,7 +198,7 @@
                                 top: 0;
                                 left: 0;
                                 width: 100%;
-                                height: 32px;
+                                height: 27px;
                             }
                         }
                         .set-submit {
@@ -239,7 +239,7 @@
                                 color: #58a3ff;
                                 text-align: center;
                                 line-height: 40px;
-                                font-size: 32px;
+                                font-size: 27px;
                                 position: absolute;
                                 top: 6px;
                                 left: 0;

+ 1 - 2
js/component/common/projectOperation/vip.jsx

@@ -82,6 +82,7 @@ class ProjectOperationVip extends Component {
       commodityQuantity: this.state.commodityQuantity, //商品数量
       commodityPrice: 0, //签单总价
       taskComment: this.state.taskComment, //服务说明
+      memberType: this.state.memberType,//会员付款状态
     }
     $.ajax({
       method: "POST",
@@ -160,7 +161,6 @@ class ProjectOperationVip extends Component {
       this.supervisor(e);
     }
   }
-
   //加载(自动补全)
   supervisor(e) {
     //服务名称自动补全
@@ -192,7 +192,6 @@ class ProjectOperationVip extends Component {
       }.bind(this)
     );
   }
-
   //上级主管输入框失去焦点是判断客户是否存在
   selectAuto(value) {
     const { customerArr } = this.state;

+ 14 - 14
js/component/common/tabelContent/index.jsx

@@ -301,10 +301,10 @@ class TabelContent extends Component {
                         key={k}
                       >
                         <AutoCompleteSearch
-                          ref={(ref) =>{
-                         
+                          ref={(ref) => {
+
                             // console.log(ref);
-                           
+
                             (this.autoCompleteSearchRef[v.dataKey] = ref)
                           }
                           }
@@ -359,20 +359,20 @@ class TabelContent extends Component {
                               {v.selectOptionList
                                 ? v.selectOptionList()
                                 : (v.type === "departmentSelect"
-                                    ? this.state.contactsOption
-                                    : v.selectList
+                                  ? this.state.contactsOption
+                                  : v.selectList
                                     ? typeof v.selectList === "function"
                                       ? v.selectList()
                                       : v.selectList
                                     : []
-                                  ).map((v) => (
-                                    <Select.Option
-                                      key={v.value}
-                                      value={v.value}
-                                    >
-                                      {v.label}
-                                    </Select.Option>
-                                  ))}
+                                ).map((v) => (
+                                  <Select.Option
+                                    key={v.value}
+                                    value={v.value}
+                                  >
+                                    {v.label}
+                                  </Select.Option>
+                                ))}
                             </Select>
                           }
                         </Spin>
@@ -505,7 +505,7 @@ class TabelContent extends Component {
                   ? this.state.changeList
                   : this.props.columns
               }
-              onRowClick={this.props.onRowClick ? this.props.onRowClick : null}
+              onRowClick={this.props.onRowClick ? this.props.onRowClick : () => { }}
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
             />

+ 4 - 4
js/component/groupCertify/certify.less

@@ -148,7 +148,7 @@
                     .certify-form {
                         #address {
                             select {
-                                height: 32px;
+                                height: 27px;
                                 border: 1px solid #d9d9d9;
                                 border-radius: 4px;
                                 margin-right: 6px;
@@ -184,9 +184,9 @@
                             }
                         }
                         .getVcode {
-                            height: 32px;
+                            height: 27px;
                             width: 100%;
-                            padding-top: 32px;
+                            padding-top: 27px;
                             position: relative;
                             overflow: hidden;
                             img {
@@ -194,7 +194,7 @@
                                 top: 0;
                                 left: 0;
                                 width: 100%;
-                                height: 32px;
+                                height: 27px;
                             }
                         }
                         .set-submit {

+ 4 - 4
js/component/manageCenter/customer/NEW/crm/patentPayment.jsx

@@ -908,7 +908,7 @@ const PatentPayment = Form.create()(React.createClass({
 								{
 									!this.props.isOnlyRead ?
 										<DatePicker
-											style={{ marginTop: "2px", width: "240px", height: "32px" }}
+											style={{ marginTop: "2px", width: "240px", height: "27px" }}
 											showTime
 											format="YYYY-MM-DD"
 											onOk={e => { }}
@@ -931,7 +931,7 @@ const PatentPayment = Form.create()(React.createClass({
 								{
 									!this.props.isOnlyRead ?
 										<DatePicker
-											style={{ marginTop: "2px", width: "240px", height: "32px" }}
+											style={{ marginTop: "2px", width: "240px", height: "27px" }}
 											showTime
 											format="YYYY-MM-DD"
 											onOk={e => { }}
@@ -1155,7 +1155,7 @@ const PatentPayment = Form.create()(React.createClass({
 								}
 							>
 								<DatePicker
-									style={{ marginTop: "2px", width: "240px", height: "32px" }}
+									style={{ marginTop: "2px", width: "240px", height: "27px" }}
 									showTime
 									format="YYYY-MM-DD"
 									onOk={e => { }}
@@ -1203,7 +1203,7 @@ const PatentPayment = Form.create()(React.createClass({
 								}
 							>
 								<DatePicker
-									style={{ marginTop: "2px", width: "240px", height: "32px" }}
+									style={{ marginTop: "2px", width: "240px", height: "27px" }}
 									showTime
 									format="YYYY-MM-DD"
 									onOk={e => { }}

+ 5 - 2
js/component/manageCenter/financialManage/distribute/projectvip.jsx

@@ -10,6 +10,7 @@ import ReactToPrint from "react-to-print";
 import OrderItemStatus from "../../../common/orderItemStatus";
 const { TabPane } = Tabs;
 
+//财务专员会员项目审核
 const ProjectVip = React.createClass({
 
   //
@@ -365,7 +366,7 @@ const ProjectVip = React.createClass({
   },
   // 审核
   toExamine() {
-    if (!this.state.content) {
+    if (!this.state.checkData) {
       message.warning("请填写审核说明~");
       return;
     }
@@ -389,6 +390,8 @@ const ProjectVip = React.createClass({
           message.success("审核成功!");
           this.setState({
             loading: false,
+            checkVisible: false,
+            checkData: '',
           });
           this.loadData()
         } else {
@@ -689,7 +692,7 @@ const ProjectVip = React.createClass({
                 <Option value="1">财务审核</Option>
                 <Option value="2">特批审核</Option>
                 <Option value="3">通过</Option>
-                <Option value="4">全部</Option>
+                <Option value="5">全部</Option>
               </Select>
               <Button
                 type="primary"

+ 5 - 5
js/component/manageCenter/financialManage/distribute/projectvipall.jsx

@@ -1,7 +1,5 @@
 import React from "react";
 import $ from "jquery/src/ajax";
-import "./public.less";
-import "./shouKuan.less";
 import { AutoComplete, Button, Input, Spin, Table, Select, message, Tabs, Tag, Tooltip, Modal } from "antd";
 import OrderDesc from "../orderDetail/orderDesc";
 import ResolutionDetail from "@/resolutionDetail";
@@ -10,6 +8,8 @@ import ReactToPrint from "react-to-print";
 import OrderItemStatus from "../../../common/orderItemStatus";
 const { TabPane } = Tabs;
 
+
+//财务总监会员项目查看
 const ProjectVipAll = React.createClass({
 
   //
@@ -19,7 +19,7 @@ const ProjectVipAll = React.createClass({
       pageNo: 1,
       totalPage: 0,
       searchValues: {
-        status: "4"
+        status: "5"
       },//查询条件
       loading: false,
       changeList: undefined,// 子组件改变的表格title数组
@@ -365,7 +365,7 @@ const ProjectVipAll = React.createClass({
   },
   // 审核
   toExamine() {
-    if (!this.state.content) {
+    if (!this.state.checkData) {
       message.warning("请填写审核说明~");
       return;
     }
@@ -689,7 +689,7 @@ const ProjectVipAll = React.createClass({
                 <Option value="1">财务审核</Option>
                 <Option value="2">特批审核</Option>
                 <Option value="3">通过</Option>
-                <Option value="4">全部</Option>
+                <Option value="5">全部</Option>
               </Select>
               <Button
                 type="primary"

+ 10 - 0
js/component/manageCenter/order/content.jsx

@@ -32,6 +32,16 @@ class Content extends Component {
   }
   getKey(key) {
     switch (key) {
+      //我的会员项目
+      case "myprojectvip":
+        require.ensure([], () => {
+          const MyProjectVip = require("./orderNew/myprojectvip")
+            .default;
+          this.setState({
+            component: <MyProjectVip />,
+          });
+        });
+        break;
       //科技服务订单
       case "myService":
         require.ensure([], () => {

+ 1 - 1
js/component/manageCenter/order/flowSettlement/billManage/myBillDetaile.jsx

@@ -269,7 +269,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 				                            {...formItemLayout}
 				                            label="财务流水时间" >   
 				                            <DatePicker
-				                              style={{marginTop:'0',width:'200px',height:'32px'}}
+				                              style={{marginTop:'0',width:'200px',height:'27px'}}
 										      showTime
 										      format="YYYY-MM-DD HH:mm:ss"
 										      placeholder="选择时间"

+ 1 - 1
js/component/manageCenter/order/flowSettlement/billQuery/myBillDetaile.jsx

@@ -269,7 +269,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 				                            {...formItemLayout}
 				                            label="财务流水时间" >   
 				                            <DatePicker
-				                              style={{marginTop:'0',width:'200px',height:'32px'}}
+				                              style={{marginTop:'0',width:'200px',height:'27px'}}
 										      showTime
 										      format="YYYY-MM-DD HH:mm:ss"
 										      placeholder="选择时间"

+ 1 - 1
js/component/manageCenter/order/flowSettlement/myBill/myBillDetaile.jsx

@@ -272,7 +272,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 				                            {...formItemLayout}
 				                            label="财务流水时间" >   
 				                            <DatePicker
-				                              style={{marginTop:'0',width:'200px',height:'32px'}}
+				                              style={{marginTop:'0',width:'200px',height:'27px'}}
 										      showTime
 										      format="YYYY-MM-DD HH:mm:ss"
 										      placeholder="选择时间"

+ 1 - 1
js/component/manageCenter/order/orderNew/addService.jsx

@@ -5174,7 +5174,7 @@ const NewService = Form.create()(
                                     style={{
                                       marginTop: "2px",
                                       // width: "240px",
-                                      height: "32px",
+                                      height: "27px",
                                     }}
                                     showTime
                                     format="YYYY-MM-DD"

+ 1 - 1
js/component/manageCenter/order/orderNew/addorders.js

@@ -2101,7 +2101,7 @@ const Addorders = Form.create()(
                       style={{
                         marginTop: "2px",
                         width: "240px",
-                        height: "32px",
+                        height: "27px",
                       }}
                       showTime
                       format="YYYY-MM-DD"

+ 8 - 5
js/component/manageCenter/order/orderNew/approvedvipproject.jsx

@@ -8,6 +8,7 @@ import ReactToPrint from "react-to-print";
 import OrderItemStatus from "../../../common/orderItemStatus";
 const { TabPane } = Tabs;
 
+//总裁特批会员项目
 const ApprovedVipProject = React.createClass({
 
   //
@@ -194,7 +195,7 @@ const ApprovedVipProject = React.createClass({
             return (
               <div>
                 {
-                  recard.status == 1 &&
+                  recard.status == 2 &&
                   <Button
                     type="primary"
                     onClick={(e) => {
@@ -206,7 +207,7 @@ const ApprovedVipProject = React.createClass({
                   </Button>
                 }
                 {
-                  recard.status == 1 &&
+                  recard.status == 2 &&
                   <Button
                     type="danger"
                     style={{ marginLeft: "5px", }}
@@ -363,7 +364,7 @@ const ApprovedVipProject = React.createClass({
   },
   // 审核
   toExamine() {
-    if (!this.state.content) {
+    if (!this.state.checkData) {
       message.warning("请填写审核说明~");
       return;
     }
@@ -379,7 +380,7 @@ const ApprovedVipProject = React.createClass({
         id: this.state.checkId,
         remarks: this.state.content,
         result: this.state.result, //1同意 0驳回
-        type: 0, //0财务审核  1特批审核
+        type: 1, //0财务审核  1特批审核
       },
     }).done(
       function (data) {
@@ -387,6 +388,8 @@ const ApprovedVipProject = React.createClass({
           message.success("审核成功!");
           this.setState({
             loading: false,
+            checkVisible: false,
+            checkData: '',
           });
           this.loadData()
         } else {
@@ -687,7 +690,7 @@ const ApprovedVipProject = React.createClass({
                 <Option value="1">财务审核</Option>
                 <Option value="2">特批审核</Option>
                 <Option value="3">通过</Option>
-                <Option value="4">全部</Option>
+                <Option value="5">全部</Option>
               </Select>
               <Button
                 type="primary"

+ 1 - 1
js/component/manageCenter/order/orderNew/customer.less

@@ -41,4 +41,4 @@
 .ant-tabs.ant-tabs-top.test.ant-tabs-line {
     background-color: #f5f5f5;
     margin-bottom: 10px;
-}
+}

+ 776 - 0
js/component/manageCenter/order/orderNew/myprojectvip.jsx

@@ -0,0 +1,776 @@
+import React from "react";
+import $ from "jquery/src/ajax";
+import { AutoComplete, Button, Input, Spin, Table, Select, message, Tabs, Tag, Tooltip, Modal } from "antd";
+// import OrderDesc from "../orderDetail/orderDesc";
+import ResolutionDetail from "@/resolutionDetail";
+import { ChooseList } from "../../order/orderNew/chooseList"
+import ReactToPrint from "react-to-print";
+import OrderItemStatus from "../../../common/orderItemStatus";
+const { TabPane } = Tabs;
+
+//我的会员项目列表
+const MyProjectVip = React.createClass({
+ 
+  //
+  getInitialState() {
+    return {
+      dvisible: false,
+      pageNo: 1,
+      totalPage: 0,
+      searchValues: {},//查询条件
+      loading: false,
+      changeList: undefined,// 子组件改变的表格title数组
+      pagination: {
+        defaultCurrent: 1,
+        defaultPageSize: 10,
+        showQuickJumper: true,
+        pageSize: 10,
+        onChange: function (page) {
+          this.setState({
+            pageNo: page,
+          });
+          this.loadData(page);
+        }.bind(this),
+        showTotal: function (total) {
+          return "共" + total + "条数据";
+        },
+      },
+      columns: [
+        // {
+        //   title: "销售类型",
+        //   dataIndex: "salesType",
+        //   key: "salesType",
+        //   render: (text, record) => {
+        //     return (
+        //       <Tooltip
+        //         title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
+        //       >
+        //         <span>
+        //           {salesList[text]}
+        //         </span>
+        //       </Tooltip>
+        //     );
+        //   },
+        // },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo",
+          width: 160,
+          render: (text, record) => {
+            return (
+              <Tooltip
+                title={
+                  <Button
+                    type="primary"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      let input = document.getElementById("copyText");
+                      input.value = text;
+                      input.select();
+                      document.execCommand("copy");
+                      message.success("复制成功");
+                    }}
+                  >
+                    复制
+                  </Button>
+                }
+              >
+                <div>
+                  {text}
+                  <div style={{ display: "flex" }}>
+                    {/* <OrderItemStatus deleteSign={record.deleteSign} /> */}
+                    {
+                      record.approval == 1
+                        ? <Tag color="#faa755">特批待审</Tag> :
+                        record.approval == 2 && <Tag color="#ff0000">特批通过</Tag>
+                    }
+                  </div>
+                </div>
+              </Tooltip>
+            );
+          },
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName",
+          width: 200,
+          render: text => {
+            return (
+              <Tooltip title={text}>
+                <div>{text}</div>
+              </Tooltip>
+            )
+          }
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo",
+          width: 140,
+          render: (text, record) => {
+            return (
+              <Tooltip
+                title={
+                  <Button
+                    type="primary"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      let input = document.getElementById("copyText");
+                      input.value = text;
+                      input.select();
+                      document.execCommand("copy");
+                      message.success("复制成功");
+                    }}
+                  >
+                    复制
+                  </Button>
+                }
+              >
+                <div>
+                  {text}
+                  <div>
+                    {record.signTotalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
+                    {record.projectType == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
+                  </div>
+                </div>
+              </Tooltip>
+            );
+          },
+        },
+        {
+          title: "订单部门",
+          dataIndex: "depName",
+          key: "depName",
+          className: "title-table",
+        },
+        {
+          title: "订单负责人",
+          dataIndex: "salesmanName",
+          key: "salesmanName",
+          className: "title-table",
+        },
+        {
+          title: "财务负责人",
+          dataIndex: "financeName",
+          key: "financeName",
+          className: "title-table",
+        },
+        {
+          title: "会员项目",
+          dataIndex: "projectName",
+          key: "projectName",
+          className: "title-table",
+        },
+        {
+          title: "项目说明",
+          dataIndex: "projectComment",
+          key: "projectComment",
+          className: "title-table",
+          width: 200,
+        },
+        {
+          title: "状态",
+          dataIndex: "status",
+          key: "status",
+          className: "title-table",
+          render: (text) => {
+            return (
+              <div>
+                {["", "财务审核", "特批审核", "通过", "驳回"][text]}
+              </div>
+            );
+          }
+        },
+        {
+          title: "操作",
+          dataIndex: "caozuo",
+          key: "caouzo",
+          className: "title-table",
+          width: 150,
+          render: (text, recard) => {
+            return (
+              <div>
+                {
+                  <Button
+                    type="primary"
+                    onClick={(e) => {
+
+                    }}
+                  >
+                    编辑
+                  </Button>
+                }
+              </div>
+            );
+          },
+        },
+      ],
+      dataSource: [],
+      fjlist: [],// 营销员列表
+      checkOrderNo: "",//操作订单编号
+      checkData: "",//操作描述
+      checkVisible: "",//审核弹窗开关
+      checkId: "",//会员项目编号
+      result: -1,//1同意 0驳回
+    };
+  },
+
+  componentWillMount() {
+    this.loadData();
+    this.departmentList();
+  },
+  // 获取订单部门
+  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),
+    }).always(
+      function () {
+
+      }.bind(this)
+    );
+  },
+  // 列表数据
+  loadData(pageNo, pageSize) {
+    const { searchValues, pagination } = this.state
+    this.setState({
+      loading: true,
+    });
+    let datas = Object.assign(searchValues, {
+      pageNo: pageNo || 1,
+      pageSize: pageSize || 10,
+      shiroType: 1, //营销员
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderProject/memberList",
+      data: datas,
+      success: function (data) {
+        this.setState({
+          loading: false,
+        });
+        if (data.error && data.error.length === 0) {
+          if (data.data.list) {
+            pagination.current = data.data.pageNo;
+            pagination.total = data.data.totalCount;
+            if (data.data && data.data.list && !data.data.list.length) {
+              pagination.current = 0;
+              pagination.total = 0;
+            }
+            this.setState({
+              dataSource: data.data.list,
+              pagination: this.state.pagination,
+              pageNo: data.data.pageNo,
+              totalPage: data.data.totalPage,
+            });
+          } else {
+            this.setState({
+              dataSource: data.data,
+              pagination: false,
+            });
+          }
+        } else {
+          message.warning(data.error[0].message);
+        }
+      }.bind(this),
+    }).always(
+      function () {
+        this.setState({
+          loading: false,
+        });
+      }.bind(this)
+    );
+  },
+  // 点击行
+  tableRowClick(record) {
+    this.state.RowData = record;
+    this.setState({
+      showDesc: true,
+    });
+  },
+  // 关闭
+  closeDesc(e, s) {
+    this.state.showDesc = e;
+    if (s) {
+      this.loadData(this.state.page);
+    }
+  },
+  // 搜索
+  search() {
+    this.setState({
+      selectedRowKeys: []
+    })
+    this.loadData();
+  },
+  // 重置
+  reset() {
+    this.setState({
+      searchValues: JSON.parse(JSON.stringify({})),
+    }, () => {
+      this.loadData();
+    })
+  },
+  // 更改表格显示数据
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach((item) => {
+      arr.forEach((val) => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr,
+    });
+  },
+  // 导出当前列表
+  exportAll() {
+    message.config({
+      duration: 20,
+    });
+    let loading = message.loading("下载中...");
+    this.setState({
+      exportPendingLoading: true,
+    });
+    let data = {
+      shiroType: 1, //财务审核
+    };
+    let obj1 = JSON.parse(JSON.stringify(this.state.searchValues));
+    data = Object.assign(data, obj1);
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: "/api/admin/orderProject/memberList/export",
+      data,
+      success: function (data) {
+        if (data.error.length === 0) {
+          this.download(data.data);
+        } else {
+          message.warning(data.error[0].message);
+        }
+      }.bind(this),
+    }).always(
+      function () {
+        loading();
+        this.setState({
+          exportPendingLoading: false,
+        });
+      }.bind(this)
+    );
+  },
+  // 打印
+  printAll() {
+    this.setState({
+      dvisible: true,
+    });
+    this.loadData(1, 9999999);
+  },
+  // 下载
+  download(fileName) {
+    window.location.href =
+      globalConfig.context + "/open/download?fileName=" + fileName;
+  },
+  // 查询订单负责人列表
+  followUp(e) {
+    const { searchValues } = this.state;
+    this.setState({
+      searchValues: Object.assign(searchValues, {
+        aname: e,
+      }),
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/customer/listAdminByName",
+      data: {
+        adminName: e,
+      },
+      success: function (data) {
+        let thedata = data.data;
+        if (!thedata) {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+          thedata = {};
+        }
+        this.setState({
+          fjlist: thedata,
+        });
+      }.bind(this),
+    }).always(
+      function () {
+        this.setState({
+          loading: false,
+        });
+      }.bind(this)
+    );
+  },
+  // 选中订单负责人
+  selectF(value) {
+    const { searchValues, fjlist } = this.state;
+    const newdataSources = JSON.stringify(fjlist) == "{}" ? [] : fjlist;
+    this.setState({
+      searchValues: Object.assign(searchValues, {
+        salesmanId: newdataSources.find((item) => item.name == value).id,
+      }),
+    });
+  },
+  // 失去焦点
+  blurChange(e) {
+    let theType = "";
+    let contactLists = this.state.customerArr || [];
+    if (e) {
+      contactLists.map(function (item) {
+        if (item.name == e.toString()) {
+          theType = item.id;
+        }
+      });
+    }
+    this.setState({
+      theTypes: theType,
+    });
+  },
+  // 删除数组最后一项(删除操作列)
+  truncate(arr) {
+    return arr.filter(function (v, i, ar) {
+      return i !== ar.length - 1
+    })
+  },
+
+  render() {
+    const { TextArea } = Input
+    const { searchValues, departmentArr = [] } = this.state
+    const dataSources = this.state.fjlist || [];
+    const options = dataSources.map((group) => (
+      <Select.Option key={group.id} value={group.name}>
+        {group.name}
+      </Select.Option>
+    ));
+    return (
+      <div className="user-content">
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>会员项目审核</span>
+        </div>
+        <Tabs defaultActiveKey="2" onChange={this.callback} className="test">
+          <TabPane tab="更改表格显示数据" key="1">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                columns={this.state.columns}
+                changeFn={this.changeList}
+                changeList={this.state.changeList}
+                top={55}
+                margin={11}
+              />
+            </div>
+          </TabPane>
+          <TabPane tab="搜索" key="2">
+            <div className="user-search" style={{ marginLeft: 10 }}>
+              <Input
+                placeholder="订单编号"
+                value={searchValues["orderNo"]
+                  ? searchValues["orderNo"]
+                  : ""}
+                onChange={(e) => {
+                  searchValues["orderNo"] = e.target.value;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              />
+              <Input
+                placeholder="客户名称"
+                value={searchValues["userName"]
+                  ? searchValues["userName"]
+                  : ""}
+                onChange={(e) => {
+                  searchValues["userName"] = e.target.value;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              />
+              <Select
+                placeholder="订单部门"
+                style={{ width: 190, marginRight: 10 }}
+                value={searchValues["depId"]
+                  ? searchValues["depId"]
+                  : undefined}
+                onChange={(e) => {
+                  searchValues["depId"] = e;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              >
+                {departmentArr.map(function (item) {
+                  return (
+                    <Select.Option key={item.id}>{item.name}</Select.Option>
+                  );
+                })}
+              </Select>
+              <Input
+                placeholder="合同编号"
+                value={searchValues["contractNo"]
+                  ? searchValues["contractNo"]
+                  : ""}
+                onChange={(e) => {
+                  searchValues["contractNo"] = e.target.value;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              />
+              <AutoComplete
+                className="certain-category-search"
+                dropdownClassName="certain-category-search-dropdown"
+                dropdownMatchSelectWidth={false}
+                style={{ width: "120px" }}
+                dataSource={options}
+                placeholder="订单负责人"
+                value={searchValues.aname || undefined}
+                onChange={this.followUp.bind(this)}
+                filterOption={true}
+                onSelect={this.selectF.bind(this)}
+              >
+                <Input />
+              </AutoComplete>
+              <Input
+                placeholder="项目名称"
+                value={searchValues["projectName"]
+                  ? searchValues["projectName"]
+                  : ""}
+                onChange={(e) => {
+                  searchValues["projectName"] = e.target.value;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              />
+              <Select
+                style={{ width: 120 }}
+                placeholder="签单金额"
+                value={searchValues["amountStatus"]
+                  ? searchValues["amountStatus"]
+                  : undefined}
+                onChange={(e) => {
+                  searchValues["amountStatus"] = e;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              >
+                <Option value="0">10万元以下</Option>
+                <Option value="1">10~20万元</Option>
+                <Option value="2">20~30万元</Option>
+                <Option value="3">30~40万元</Option>
+                <Option value="4">40万元以上</Option>
+              </Select>
+              <Select
+                style={{ width: 120 }}
+                placeholder="特批状态"
+                value={searchValues["approval"]
+                  ? searchValues["approval"]
+                  : undefined}
+                onChange={(e) => {
+                  searchValues["approval"] = e;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              >
+                <Option value="0">非特批</Option>
+                <Option value="1">特批待审</Option>
+                <Option value="2">特批通过</Option>
+                <Option value="4">全部特批</Option>
+              </Select>
+              <Select
+                style={{ width: 120 }}
+                placeholder="审核状态"
+                value={searchValues["status"]
+                  ? searchValues["status"]
+                  : undefined}
+                onChange={(e) => {
+                  searchValues["status"] = e;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              >
+                <Option value="1">财务审核</Option>
+                <Option value="2">特批审核</Option>
+                <Option value="3">通过</Option>
+                <Option value="4">驳回</Option>
+                <Option value="5">全部</Option>
+              </Select>
+              <Button
+                type="primary"
+                onClick={this.search}
+                style={{ marginLeft: 10 }}
+                disabled={this.state.loading ? true : false}
+              >
+                搜索
+              </Button>
+              <Button onClick={this.reset}>重置</Button>
+            </div>
+          </TabPane>
+          <TabPane tab="打印" key="3">
+            <Button
+              type="primary"
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={this.printAll}
+            >
+              打印当前列表
+            </Button>
+          </TabPane>
+          <TabPane tab="导出Excel" key="4">
+            <Button
+              type="primary"
+              style={{ margin: "11px 0px 10px 10px" }}
+              onClick={this.exportAll}
+            >
+              导出当前列表
+            </Button>
+          </TabPane>
+        </Tabs>
+        <div className="patent-table">
+          <Spin spinning={this.state.loading}>
+            <Table
+              bordered
+              columns={
+                this.state.changeList == undefined
+                  ? this.state.columns
+                  : this.state.changeList
+              }
+              dataSource={this.state.dataSource}
+              pagination={this.state.pagination}
+              onRowDoubleClick={this.tableRowClick.bind(this)}
+              size="small"
+            />
+          </Spin>
+        </div>
+        {/* 订单详情 */}
+        {/* <OrderDesc
+          data={this.state.RowData}
+          showDesc={this.state.showDesc}
+          closeDesc={this.closeDesc.bind(this)}
+        /> */}
+        {
+          //打印预览
+          this.state.dvisible &&
+          <Modal
+            visible={this.state.dvisible}
+            footer=""
+            title="所有列表信息"
+            className="admin-desc-content"
+            width="1300px"
+            onCancel={() => {
+              this.loadData();
+              this.setState({
+                dvisible: false,
+              });
+            }}
+          >
+            <Spin spinning={this.state.loading}>
+              <div
+                className="patent-table"
+                style={{
+                  padding: "25px 0 30px 30px",
+                }}
+                ref={(e) => {
+                  this.refs.all = e;
+                }}
+              >
+                <Table
+                  columns={this.truncate(this.state.columns)}
+                  dataSource={this.state.dataSource}
+                  pagination={false}
+                  bordered
+                  size="small"
+                />
+              </div>
+            </Spin>
+
+            <ReactToPrint
+              trigger={() => (
+                <Button
+                  type="primary"
+                  style={{
+                    float: "right",
+                    marginTop: 10,
+                    position: "absolute",
+                    top: 0,
+                    right: 30,
+                  }}
+                >
+                  打印
+                </Button>
+              )}
+              content={() => this.refs.all}
+            />
+          </Modal>
+        }
+        {
+          //审核弹窗
+          this.state.checkVisible &&
+          <Modal
+            maskClosable={false}
+            title="审核订单"
+            confirmLoading={this.state.loading}
+            visible={this.state.checkVisible}
+            onOk={this.toExamine}
+            okText={this.state.result == 1 ? "通过" : this.state.result == 0 && "驳回"}
+            onCancel={() => {
+              this.loadData()
+              this.setState({
+                checkVisible: false,
+                checkData: '',
+              })
+            }}
+          >
+            <TextArea
+              value={this.state.checkData}
+              onChange={(e) => {
+                this.setState({
+                  checkData: e.target.value,
+                })
+              }}
+              placeholder="请填写审核内容"
+            />
+          </Modal>
+        }
+      </div>
+    );
+  },
+});
+
+export default MyProjectVip;

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

@@ -622,7 +622,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                         style={{
                           marginTop: "2px",
                           width: "240px",
-                          height: "32px",
+                          height: "27px",
                         }}
                         showTime
                         format="YYYY-MM-DD"

+ 132 - 41
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -26,6 +26,7 @@ import { ChooseList } from "./chooseList";
 import { getProjectName } from "../../../tools";
 import { salesList } from "@/dataDic.js"
 import DepartmentList from "../../../common/departmentList";
+import OrderDesc from "../../financialManage/orderDetail/orderDesc";
 
 const IntentionCustomer = Form.create()(
   React.createClass({
@@ -52,6 +53,9 @@ const IntentionCustomer = Form.create()(
           starTime: this.state.releaseDate[0], //开始时间
           endTime: this.state.releaseDate[1], //结束时间
           newStatus: this.state.newStatus,
+          amountStatus: this.state.amountStatus,//签单金额
+          approval: this.state.approval,//是否特批
+          memberType: this.state.memberType,//会员
         },
         success: function (data) {
           let theArr = [];
@@ -83,9 +87,8 @@ const IntentionCustomer = Form.create()(
                 depName: thisdata.depName, //部门名称
                 dunStatus: thisdata.dunStatus == 0 ? "未触发" : "已触发",
                 commodityName: thisdata.commodityName,
-                salesType:thisdata.salesType, // 销售类型
-                approval:thisdata.approval, //特批状态
-                projectType:thisdata.projectType, //会员状态
+                approval: thisdata.approval, //特批状态
+                memberType: thisdata.memberType, //会员状态
               });
             }
             this.state.pagination.total = data.data.totalCount;
@@ -154,6 +157,7 @@ const IntentionCustomer = Form.create()(
     },
     getInitialState() {
       return {
+        showDesc: false,
         newStatus: 1,
         page: 1,
         releaseDate: [],
@@ -174,27 +178,6 @@ const IntentionCustomer = Form.create()(
         },
         columns: [
           {
-            title: "序号",
-            dataIndex: "key",
-            key: "key",
-          },
-          {
-            title: "销售类型",
-            dataIndex: "salesType",
-            key: "salesType",
-            render: (text, record) => {
-              return (
-                <Tooltip
-                  title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
-                >
-                  <span>
-                    {salesList[text]}
-                  </span>
-                </Tooltip>
-              );
-            },
-          },
-          {
             title: "合同编号",
             dataIndex: "contractNo",
             key: "contractNo",
@@ -259,7 +242,7 @@ const IntentionCustomer = Form.create()(
                     {text}
                     <div>
                       {record.totalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
-                      {record.projectType == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
+                      {record.memberType == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
                     </div>
                   </div>
                 </Tooltip>
@@ -384,12 +367,26 @@ const IntentionCustomer = Form.create()(
                 <div>
                   <Button
                     onClick={(e) => {
-                      e.stopPropagation(), this.visit(record);
+                      e.stopPropagation(),
+                        this.visit(record);
                     }}
                     type="primary"
                   >
                     添加催款记录
                   </Button>
+
+                  <Button
+                    style={{ marginLeft: 5 }}
+                    onClick={(e) => {
+                      e.stopPropagation(),
+                        this.setState({
+                          visibles: true,
+                        });
+                    }}
+                    type="primary"
+                  >
+                    查看催款记录
+                  </Button>
                 </div>
               );
             },
@@ -429,12 +426,12 @@ const IntentionCustomer = Form.create()(
         dunId: record.id,
       });
     },
-    //	//整行点击
+    // 整行点击
     tableRowClick(record) {
+      this.state.RowData = record;
       this.setState({
-        visibles: true,
+        showDesc: true,
       });
-      this.loadDatas(record.id);
     },
 
     //新增催款记录
@@ -497,6 +494,9 @@ const IntentionCustomer = Form.create()(
       this.state.departmenttSearch = undefined;
       this.state.releaseDate[0] = undefined;
       this.state.releaseDate[1] = undefined;
+      this.state.amountStatus = undefined;
+      this.state.approval = undefined;
+      this.state.memberType = undefined;
       this.loadData();
     },
     resets() {
@@ -507,6 +507,9 @@ const IntentionCustomer = Form.create()(
       this.state.departmenttSearch = undefined;
       this.state.releaseDate[0] = undefined;
       this.state.releaseDate[1] = undefined;
+      this.state.amountStatus = undefined;
+      this.state.approval = undefined;
+      this.state.memberType = undefined;
     },
     getOrgCodeUrl(e) {
       this.setState({ orgCodeUrl: e });
@@ -531,9 +534,23 @@ const IntentionCustomer = Form.create()(
       });
       this.resets();
     },
+    // 关闭订单详情
+    closeDesc(e, s) {
+      this.state.showDesc = e;
+      if (s) {
+        this.loadData(this.state.page);
+      }
+    },
     //导出
     exportExec() {
-      var data = {
+      message.config({
+        duration: 20,
+      });
+      let loading = message.loading("下载中...");
+      this.setState({
+        exportPendingLoading: true,
+      });
+      let data = {
         name: this.state.customerName ? this.state.customerName : undefined, //客户名称
         adminName: this.state.adminName ? this.state.adminName : undefined, //订单负责人
         orderNo: this.state.orderNo ? this.state.orderNo : undefined, //订单编号
@@ -550,10 +567,32 @@ const IntentionCustomer = Form.create()(
         pageSize: 9999999,
         newStatus: this.state.newStatus,
       };
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: "/api/admin/newOrder/exportOrderDunData",
+        data,
+        success: function (data) {
+          if (data.error.length === 0) {
+            this.download(data.data);
+          } else {
+            message.warning(data.error[0].message);
+          }
+        }.bind(this),
+      }).always(
+        function () {
+          loading();
+          this.setState({
+            exportPendingLoading: false,
+          });
+        }.bind(this)
+      );
+    },
+    // 下载
+    download(fileName) {
       window.location.href =
-        globalConfig.context +
-        "/api/admin/newOrder/exportOrderDunData?" +
-        $.param(data);
+        globalConfig.context + "/open/download?fileName=" + fileName;
     },
     visitOks() {
       this.setState({
@@ -628,7 +667,7 @@ const IntentionCustomer = Form.create()(
                 <Input
                   placeholder="客户名称"
                   style={{
-                    width: "150px",
+                    width: 170,
                     marginBottom: "10px",
                     marginRight: 10,
                     marginLeft: 10,
@@ -641,7 +680,7 @@ const IntentionCustomer = Form.create()(
                 <Input
                   placeholder="营销员名称"
                   style={{
-                    width: "150px",
+                    width: 170,
                     marginBottom: "10px",
                     marginRight: 10,
                   }}
@@ -653,7 +692,7 @@ const IntentionCustomer = Form.create()(
                 <Input
                   placeholder="订单编号"
                   style={{
-                    width: "150px",
+                    width: 170,
                     marginBottom: "10px",
                     marginRight: 10,
                   }}
@@ -665,7 +704,7 @@ const IntentionCustomer = Form.create()(
                 <Input
                   placeholder="合同编号"
                   style={{
-                    width: "150px",
+                    width: 170,
                     marginBottom: "10px",
                     marginRight: 10,
                   }}
@@ -682,7 +721,7 @@ const IntentionCustomer = Form.create()(
                 />
                 <Select
                   placeholder="选择催款节点类型"
-                  style={{ width: 150, marginRight: "10px" }}
+                  style={{ width: 170, marginRight: "10px" }}
                   value={
                     this.state.newStatus == 0 ? "旧催款节点" : "新催款节点"
                   }
@@ -693,7 +732,51 @@ const IntentionCustomer = Form.create()(
                   <Select.Option key={0}>{"旧催款节点"}</Select.Option>
                   <Select.Option key={1}>{"新催款节点"}</Select.Option>
                 </Select>
-                <span style={{ marginRight: "10px" }}>下单时间 :</span>
+                <Select
+                  style={{ width: 170 }}
+                  placeholder="签单金额"
+                  value={this.state.amountStatus}
+                  onChange={(e) => {
+                    this.setState({
+                      amountStatus: e,
+                    });
+                  }}
+                >
+                  <Option value="0">10万元以下</Option>
+                  <Option value="1">10~20万元</Option>
+                  <Option value="2">20~30万元</Option>
+                  <Option value="3">30~40万元</Option>
+                  <Option value="4">40万元以上</Option>
+                </Select>
+                <Select
+                  style={{ width: 170, marginRight: 60 }}
+                  placeholder="特批状态"
+                  value={this.state.approval}
+                  onChange={(e) => {
+                    this.setState({
+                      approval: e,
+                    });
+                  }}
+                >
+                  <Option value="0">非特批</Option>
+                  <Option value="1">特批待审</Option>
+                  <Option value="2">特批通过</Option>
+                  <Option value="4">全部特批</Option>
+                </Select>
+                <Select
+                  style={{ width: 170, }}
+                  placeholder="会员"
+                  value={this.state.memberType}
+                  onChange={(e) => {
+                    this.setState({
+                      memberType: e,
+                    });
+                  }}
+                >
+                  <Option value="0">否</Option>
+                  <Option value="1">是</Option>
+                </Select>
+                <span style={{ marginRight: 10, marginLeft: 10 }}>下单时间 :</span>
                 <RangePicker
                   value={[
                     this.state.releaseDate[0]
@@ -773,7 +856,7 @@ const IntentionCustomer = Form.create()(
                           style={{
                             marginTop: "2px",
                             width: "240px",
-                            height: "32px",
+                            height: "27px",
                           }}
                           showTime
                           format="YYYY-MM-DD"
@@ -847,13 +930,21 @@ const IntentionCustomer = Form.create()(
                       dataSource={this.state.dataSources}
                       rowSelection={rowSelection}
                       pagination={this.state.paginations}
-                    // onRowClick={this.tableRowClick}
                     />
                   </Spin>
                 </div>
               </div>
             </Modal>
           </div>
+          {
+            // 订单详情
+            this.state.showDesc &&
+            <OrderDesc
+              data={this.state.RowData}
+              showDesc={this.state.showDesc}
+              closeDesc={this.closeDesc.bind(this)}
+            />
+          }
         </div>
       );
     },

+ 1 - 1
js/component/manageCenter/order/orderNew/reject.jsx

@@ -2253,7 +2253,7 @@ const IntentionCustomer = Form.create()(
                         style={{
                           marginTop: "2px",
                           width: "240px",
-                          height: "32px",
+                          height: "27px",
                         }}
                         showTime
                         format="YYYY-MM-DD"

+ 1 - 1
js/component/manageCenter/order/source/index.less

@@ -1,3 +1,3 @@
 .ant-calendar-picker-input{
-  height: 32px;
+  height: 27px;
 }

+ 2 - 2
js/component/manageCenter/project/task/myTask.jsx

@@ -4519,7 +4519,7 @@ const Task = React.createClass({
                                                                     style={{
                                                                         marginTop: '2px',
                                                                         width: '200px',
-                                                                        height: '32px',
+                                                                        height: '27px',
                                                                     }}
                                                                     showTime
                                                                     format="YYYY-MM-DD"
@@ -5271,7 +5271,7 @@ const Task = React.createClass({
                         <div className="clearfix">
                             <FormItem {...formItemLayout} label="工作日期">
                                 <DatePicker
-                                    style={{ marginTop: '2px', width: '200px', height: '32px' }}
+                                    style={{ marginTop: '2px', width: '200px', height: '27px' }}
                                     showTime
                                     format="YYYY-MM-DD"
                                     onOk={() => {

+ 2 - 2
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -4045,7 +4045,7 @@ const MyTaskOutsource = React.createClass({
                                     style={{
                                       marginTop: '2px',
                                       width: '200px',
-                                      height: '32px',
+                                      height: '27px',
                                     }}
                                     showTime
                                     format="YYYY-MM-DD"
@@ -4718,7 +4718,7 @@ const MyTaskOutsource = React.createClass({
               <div className="clearfix">
                 <FormItem {...formItemLayout} label="工作日期">
                   <DatePicker
-                    style={{ marginTop: "2px", width: "200px", height: "32px" }}
+                    style={{ marginTop: "2px", width: "200px", height: "27px" }}
                     showTime
                     format="YYYY-MM-DD"
                     onOk={() => {}}

+ 2 - 2
js/component/manageCenter/servicesManage/contract/contract.less

@@ -2,7 +2,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        line-height: 32px;
+        line-height: 27px;
         >span {
             color: #333;
             font-size: 16px;
@@ -45,7 +45,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        height: 32px;
+        height: 27px;
         margin-bottom: 10px;
         >span {
             color: #333;

+ 4 - 4
js/component/manageCenter/servicesManage/contract/contractAdd.jsx

@@ -399,7 +399,7 @@ const ContractAddFrom = Form.create()(React.createClass({
                         )}
                 </FormItem>
                 <div className="clearfix">
-                    <span style={{ float: "left", lineHeight: '32px', marginLeft: '50px' }}>
+                    <span style={{ float: "left", lineHeight: '27px', marginLeft: '50px' }}>
                         <Checkbox checked={this.state.highTechCheck} onChange={(e) => {
                             this.setState({ highTechCheck: e.target.checked });
                         }}></Checkbox>
@@ -419,7 +419,7 @@ const ContractAddFrom = Form.create()(React.createClass({
                     </FormItem>
                 </div>
                 <div className="clearfix">
-                    <span style={{ float: "left", lineHeight: '32px', marginLeft: '50px' }}>
+                    <span style={{ float: "left", lineHeight: '27px', marginLeft: '50px' }}>
                         <Checkbox checked={this.state.patentCheck} onChange={(e) => {
                             this.setState({ patentCheck: e.target.checked });
                         }}></Checkbox>
@@ -435,7 +435,7 @@ const ContractAddFrom = Form.create()(React.createClass({
                     </FormItem>
                 </div>
                 <div className="clearfix">
-                    <span style={{ float: "left", lineHeight: '32px', marginLeft: '50px' }}>
+                    <span style={{ float: "left", lineHeight: '27px', marginLeft: '50px' }}>
                         <Checkbox checked={this.state.copyrightCheck} onChange={(e) => {
                             this.setState({ copyrightCheck: e.target.checked });
                         }}></Checkbox>
@@ -451,7 +451,7 @@ const ContractAddFrom = Form.create()(React.createClass({
                     </FormItem>
                 </div>
                 <div className="clearfix">
-                    <span style={{ float: "left", lineHeight: '32px', marginLeft: '50px' }}>
+                    <span style={{ float: "left", lineHeight: '27px', marginLeft: '50px' }}>
                         <Checkbox checked={this.state.techProjectCheck} onChange={(e) => {
                             this.setState({ techProjectCheck: e.target.checked });
                         }}></Checkbox>

+ 2 - 2
js/component/manageCenter/servicesManage/copyright/copyright.less

@@ -2,7 +2,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        line-height: 32px;
+        line-height: 27px;
         >span {
             color: #333;
             font-size: 16px;
@@ -45,7 +45,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        height: 32px;
+        height: 27px;
         margin-bottom: 10px;
         >span {
             color: #333;

+ 4 - 4
js/component/manageCenter/servicesManage/highTech/fosterDesc/annualReport.less

@@ -5,8 +5,8 @@
         height: auto;
         margin-bottom: 0;
         >p {
-            line-height: 32px;
-            min-height: 32px;
+            line-height: 27px;
+            min-height: 27px;
             color: #000;
         }
         >.item-title {
@@ -21,8 +21,8 @@
             float: left;
             width: 25%;
             >p {
-                line-height: 32px;
-                min-height: 32px;
+                line-height: 27px;
+                min-height: 27px;
                 color: #000;
             }
             >.item-title {

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.less

@@ -14,7 +14,7 @@
     }
     .hrSituation-span {
         float: left;
-        line-height: 32px;
+        line-height: 27px;
         width: 126px;
         text-align: right;
     }

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx

@@ -265,7 +265,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
                             <Input type='textarea' rows={6} onChange={(e) => { if (e.target.value.length > 400) { return; } }} />
                             )}
                     </FormItem>
-                    <p style={{ lineHeight: "32px" }}>知识产权获得情况及其对产品(服务)在技术上发挥的支持作用(限400字)*</p>
+                    <p style={{ lineHeight: "27px" }}>知识产权获得情况及其对产品(服务)在技术上发挥的支持作用(限400字)*</p>
                     <FormItem className="half-item"
                         labelCol={{ span: 0 }}
                         wrapperCol={{ span: 22 }}

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/highTechFoster.less

@@ -2,7 +2,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        height: 32px;
+        height: 27px;
         margin-bottom: 10px;
         >span {
             color: #333;

+ 1 - 1
js/component/manageCenter/servicesManage/patent/comprehensive.less

@@ -2,7 +2,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        height: 32px;
+        height: 27px;
         margin-bottom: 10px;
         >span {
             color: #333;

+ 2 - 2
js/component/manageCenter/servicesManage/projectOrder/contract.less

@@ -2,7 +2,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        line-height: 32px;
+        line-height: 27px;
         >span {
             color: #333;
             font-size: 16px;
@@ -45,7 +45,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        height: 32px;
+        height: 27px;
         margin-bottom: 10px;
         >span {
             color: #333;

+ 1 - 1
js/component/manageCenter/servicesManage/technology/technology.less

@@ -2,7 +2,7 @@
     padding: 20px;
     background: #fff;
     .content-title {
-        height: 32px;
+        height: 27px;
         margin-bottom: 10px;
         >span {
             color: #333;

+ 1 - 1
js/component/manageCenter/set/userManagementS/newUser.jsx

@@ -436,7 +436,7 @@ const Newuser = Form.create()(React.createClass({
 				                            {...formItemLayout}
 				                            label="入职时间" >
 				                            <DatePicker
-				                              style={{marginTop:'0',width:'200px',height:'32px'}}
+				                              style={{marginTop:'0',width:'200px',height:'27px'}}
 										      showTime
 										      format="YYYY-MM-DD"
 										      placeholder="选择入职时间"

+ 1 - 1
js/component/manageCenter/userManage/userList.less

@@ -102,7 +102,7 @@
     #licenceAddress,
     #locationAddress {
         select {
-            height: 32px;
+            height: 27px;
             border-radius: 4px;
             margin-right: 10px;
             border-color: #d9d9d9;

+ 1 - 1
js/component/portal/portal.less

@@ -516,7 +516,7 @@
 }
 
 .detail_sub {
-    line-height: 32px;
+    line-height: 27px;
     .detail_sub_icon {
         vertical-align: middle;
         display: inline-block;

+ 2 - 2
js/component/portal/search/subscriberOrg.jsx

@@ -289,12 +289,12 @@ const SubContent = React.createClass({
                                         {item.unitName}
                                     </div>
                                     <div className="province">
-                                        <span style={{ letterSpacing: '32px' }}>地</span>
+                                        <span style={{ letterSpacing: '27px' }}>地</span>
                                         <span>区: </span>
                                         <span className="text-address"> {getProvince(item.province)}</span>
                                     </div>
                                     <div className="text">
-                                        <span style={{ letterSpacing: '32px' }}>需</span>
+                                        <span style={{ letterSpacing: '27px' }}>需</span>
                                         <span>求: </span>
                                         <span className="text-Number"> {item.demandNum || 0} </span>
                                         <span className="text-unit"> 条</span>

+ 2 - 2
js/component/portal/search/subscriberUser.jsx

@@ -250,7 +250,7 @@ const SubContent = React.createClass({
                                         </div>
                                         <div className="detail-text">
                                             <div className="text">
-                                                <span style={{ letterSpacing: '32px' }}>需</span>
+                                                <span style={{ letterSpacing: '27px' }}>需</span>
                                                 <span>求: </span>
                                                 <span className="text-Number"> {item.demandNum || 0} </span>
                                                 <span className="text-unit"> 条</span>
@@ -261,7 +261,7 @@ const SubContent = React.createClass({
                                                 <span className="text-unit"> 条</span>
                                             </div>
                                             <div className="text">
-                                                <span style={{ letterSpacing: '32px' }}>粉</span>
+                                                <span style={{ letterSpacing: '27px' }}>粉</span>
                                                 <span>丝: </span>
                                                 <span className="text-Number"> {0}</span>
                                                 <span className="text-unit"> 位</span>

+ 4 - 4
js/component/sign/account.less

@@ -5,9 +5,9 @@
         width: 540px;
         float: left;
         .acc-getVcode {
-            height: 32px;
+            height: 27px;
             width: 100%;
-            padding-top: 32px;
+            padding-top: 27px;
             position: relative;
             overflow: hidden;
             img {
@@ -15,7 +15,7 @@
                 top: 0;
                 left: 0;
                 width: 100%;
-                height: 32px;
+                height: 27px;
             }
         }
         .ant-form-extra {
@@ -32,7 +32,7 @@
         }
         .ant-checkbox-wrapper {
             span {
-                line-height: 32px;
+                line-height: 27px;
             }
         }
     }

+ 4 - 4
js/component/sign/group.less

@@ -4,9 +4,9 @@
     .account-left {
         width: 540px;
         .acc-getVcode {
-            height: 32px;
+            height: 27px;
             width: 100%;
-            padding-top: 32px;
+            padding-top: 27px;
             position: relative;
             overflow: hidden;
             img {
@@ -14,7 +14,7 @@
                 top: 0;
                 left: 0;
                 width: 100%;
-                height: 32px;
+                height: 27px;
             }
         }
         .ant-form-extra {
@@ -31,7 +31,7 @@
         }
         .ant-checkbox-wrapper {
             span {
-                line-height: 32px;
+                line-height: 27px;
             }
         }
     }

+ 1 - 1
js/component/subscriberDetail/detail.less

@@ -173,7 +173,7 @@
             }
         }
         .detial_sub {
-            line-height: 32px;
+            line-height: 27px;
             .detial_sub_icon {
                 vertical-align: middle;
                 display: inline-block;

+ 1 - 1
package.json

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

+ 1 - 1
webpack-dll.config.js

@@ -10,7 +10,7 @@ let theme = {
   '@link-color': '#58a3ff'
 };
 module.exports = (function () {
-  let staticHost = 'http://172.16.0.74';
+  let staticHost = 'http://172.16.1.187';
   switch (argv.env.deploy) {
     case 'test':
       staticHost = 'http://static.jishutao.com';

+ 0 - 2
webpack.config.js

@@ -345,7 +345,6 @@ module.exports = (function () {
     }
 
     //let staticHost = 'http://afts.hnzhiming.com';
-    // let staticHost = 'http://172.16.0.74:80'
     let staticHost = 'http://172.16.1.187:80'
     // let staticHost = "http://192.168.0.106";
     // let staticHost = "http://192.168.0.103";
@@ -391,7 +390,6 @@ module.exports = (function () {
         devServer: {
             disableHostCheck: true,
             host: '172.16.1.187',
-            // host: '172.16.0.74',
             port: 80,
             allowedHosts: ['127.0.0.1', '192.168.0.20', '192.168.0.99'],
             headers: {