Kaynağa Gözat

搜索排版优化

dev01 2 yıl önce
ebeveyn
işleme
407055f203
63 değiştirilmiş dosya ile 10862 ekleme ve 11038 silme
  1. 19 1
      js/component/common/flowchart/index.jsx
  2. 6 10
      js/component/common/tabelContent/index.jsx
  3. 13 0
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx
  4. 571 569
      js/component/manageCenter/customer/managementFollow/followUpSummary/index.jsx
  5. 10 10
      js/component/manageCenter/customerService/administration/order.jsx
  6. 9 9
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  7. 9 9
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  8. 6 6
      js/component/manageCenter/financialManage/distribute/huiKuan.jsx
  9. 11 11
      js/component/manageCenter/financialManage/distribute/inSpecial.jsx
  10. 8 8
      js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx
  11. 7 7
      js/component/manageCenter/financialManage/distribute/invoiceApplyListQuery.jsx
  12. 6 6
      js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx
  13. 7 7
      js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx
  14. 9 9
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  15. 9 9
      js/component/manageCenter/financialManage/distribute/outSpecial.jsx
  16. 18 18
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  17. 18 18
      js/component/manageCenter/financialManage/distribute/paiDan.jsx
  18. 18 18
      js/component/manageCenter/financialManage/distribute/projectvip.jsx
  19. 19 19
      js/component/manageCenter/financialManage/distribute/projectvipall.jsx
  20. 10 10
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  21. 11 11
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  22. 0 1
      js/component/manageCenter/financialManage/distribute/tuiDan.jsx
  23. 490 490
      js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx
  24. 21 19
      js/component/manageCenter/order/orderNew/arrearsList.jsx
  25. 10 10
      js/component/manageCenter/order/orderNew/billing.jsx
  26. 32 11
      js/component/manageCenter/order/orderNew/changeComponent/searchInput.js
  27. 45 44
      js/component/manageCenter/order/orderNew/chargeback.jsx
  28. 4 29
      js/component/manageCenter/order/orderNew/contractCwjl.js
  29. 4 29
      js/component/manageCenter/order/orderNew/contractCwzj.js
  30. 4 29
      js/component/manageCenter/order/orderNew/contractCwzy.js
  31. 4 29
      js/component/manageCenter/order/orderNew/contractJsjl.js
  32. 4 29
      js/component/manageCenter/order/orderNew/contractJsy.js
  33. 4 29
      js/component/manageCenter/order/orderNew/contractJszj.js
  34. 5 33
      js/component/manageCenter/order/orderNew/contractYxgly.js
  35. 4 29
      js/component/manageCenter/order/orderNew/contractYxjl.js
  36. 6 36
      js/component/manageCenter/order/orderNew/contractYxy.js
  37. 284 284
      js/component/manageCenter/order/orderNew/costAuditList/filterColumn.js
  38. 187 187
      js/component/manageCenter/order/orderNew/glCostAuditList/filterColumn.js
  39. 424 424
      js/component/manageCenter/order/orderNew/glCostAuditList/index.js
  40. 12 12
      js/component/manageCenter/order/orderNew/myprojectvip.jsx
  41. 13 13
      js/component/manageCenter/order/orderNew/mysuspend.jsx
  42. 57 60
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  43. 9 9
      js/component/manageCenter/order/orderNew/press.jsx
  44. 24 31
      js/component/manageCenter/order/orderNew/pressList.jsx
  45. 46 44
      js/component/manageCenter/order/orderNew/reject.jsx
  46. 13 13
      js/component/manageCenter/order/orderNew/suspendexamine.jsx
  47. 4 4
      js/component/manageCenter/order/pressMoney/index.jsx
  48. 1087 1087
      js/component/manageCenter/project/patent/list.jsx
  49. 10 10
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  50. 7 7
      js/component/manageCenter/project/project/projectAssignment.jsx
  51. 7 7
      js/component/manageCenter/project/project/projectQuery.jsx
  52. 7 7
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  53. 10 0
      js/component/manageCenter/project/summary/highTech.jsx
  54. 423 423
      js/component/manageCenter/project/task/businessManagement/index.jsx
  55. 6554 6554
      js/component/manageCenter/project/task/myTask.jsx
  56. 20 20
      js/component/manageCenter/project/task/myTaskCount.jsx
  57. 7 7
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  58. 186 186
      js/component/manageCenter/project/task/payApplyReject/filterColumn.js
  59. 7 7
      js/component/manageCenter/project/task/taskAssignment.jsx
  60. 20 20
      js/component/manageCenter/project/task/taskCount.jsx
  61. 7 7
      js/component/manageCenter/project/task/taskQuery.jsx
  62. 5 2
      js/component/tools.js
  63. 1 1
      package.json

+ 19 - 1
js/component/common/flowchart/index.jsx

@@ -4,7 +4,7 @@ import $ from "jquery/src/ajax";
 import "./index.less";
 
 /**
- * 开单流程图
+ * 开单、变更流程图
  * 派单传订单编号
  * 变更传变更id
  */
@@ -226,12 +226,30 @@ class FlowChart extends Component {
               return v.name != "-"
             })
 
+            // 如果是曹津
+            if (info.special == 1) {
+              for (var i = 0; i < list.length; i++) {
+                // 如果是 退单退款
+                if (info.type == 0) {
+                  // 去掉 董事长审核
+                  list.splice(9, 1);
+                }
+                // 把 总裁审核 改成 董事长审核
+                if (list[i].status == 8) {
+                  list[i].status = 9;
+                  list[i].title = "董事长审核";
+                  list[i].name = info.dsz;
+                }
+              }
+            }
+
             if (info.type == 0 || info.type == 6) {
               list.push({ status: 10, title: "财务退票", name: info.cwzy, time: "" },)
             }
 
             list.push({ status: 11, title: "完成", name: "", time: "" },)
 
+            // 显示当前流程处理
             if (info.status == 0 || info.status == 1 || info.status == 3) {
               list.forEach((item, index) => {
                 if (item.status == info.processState) {

+ 6 - 10
js/component/common/tabelContent/index.jsx

@@ -273,7 +273,7 @@ class TabelContent extends Component {
         <Tabs defaultActiveKey="1" className="test">
           {this.props.searchList && (
             <TabPane tab="搜索" key="1">
-              <div className="user-search" style={{ paddingTop: "10px" }}>
+              <div className="user-search" style={{ paddingTop: 10, paddingLeft: 10 }}>
                 <Form layout="inline">
                   {(this.props.searchList || []).map((v, k) => {
                     return v.type === "text" ? (
@@ -286,7 +286,7 @@ class TabelContent extends Component {
                               : v.defaultValue || undefined
                           }
                           style={
-                            v.style ? v.style : { width: 150, marginRight: 10 }
+                            v.style ? v.style : { width: 150, }
                           }
                           onChange={(e) => {
                             searchValues[v.dataKey] = e.target.value;
@@ -304,15 +304,11 @@ class TabelContent extends Component {
                       >
                         <AutoCompleteSearch
                           ref={(ref) => {
-
-                            // console.log(ref);
-
                             (this.autoCompleteSearchRef[v.dataKey] = ref)
                           }
                           }
                           value={searchValues[v.dataKey]}
                           onSelect={(value, title) => {
-                            // console.log(value, title);
                             searchValues[v.dataKey] = value;
                             searchValues["aName"] = title;
                             if (v.dataTitle) {
@@ -338,7 +334,7 @@ class TabelContent extends Component {
                               style={
                                 v.style
                                   ? v.style
-                                  : { width: 200, marginRight: 10 }
+                                  : { width: 200, }
                               }
                               value={
                                 searchValues[v.dataKey]
@@ -388,7 +384,7 @@ class TabelContent extends Component {
                                 ? moment(searchValues[v.dataKey])
                                 : null
                             }
-                            style={{ marginRight: "10px", marginTop: "2px" }}
+                            style={{ marginTop: "2px" }}
                             onChange={(data, dataString) => {
                               searchValues[v.dataKey] = String(dataString);
                               this.setState({
@@ -398,7 +394,7 @@ class TabelContent extends Component {
                           />
                         ) : (
                           <RangePicker
-                            style={{ marginRight: "10px", marginTop: "2px" }}
+                            style={{ marginTop: "2px" }}
                             value={[
                               searchValues[v.dataKey[0]]
                                 ? moment(searchValues[v.dataKey[0]])
@@ -430,7 +426,7 @@ class TabelContent extends Component {
                         <Select
                           placeholder={v.placeholder}
                           style={
-                            v.style ? v.style : { width: 200, marginRight: 10 }
+                            v.style ? v.style : { width: 200, }
                           }
                           value={
                             searchValues[v.dataKey]

+ 13 - 0
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -894,6 +894,19 @@ const IntentionCustomer = Form.create()(
               className="test"
             >
               <TabPane tab="搜索" key="1">
+                <Button
+                  type="primary"
+                  style={{
+                    float: "right",
+                    marginTop: 10,
+                    marginLeft: 10,
+                    marginRight: 10,
+                  }}
+                  onClick={this.addClick}
+                >
+                  新增客户
+                  <Icon type="plus" />
+                </Button>
                 <Input
                   placeholder="客户名称"
                   value={this.state.nameSearch}

Dosya farkı çok büyük olduğundan ihmal edildi
+ 571 - 569
js/component/manageCenter/customer/managementFollow/followUpSummary/index.jsx


+ 10 - 10
js/component/manageCenter/customerService/administration/order.jsx

@@ -2336,6 +2336,16 @@ const Order = Form.create()(
                     }}
                   />
                   <Input
+                    placeholder="合同编号"
+                    style={{ width: "150px" }}
+                    value={this.state.contractNoSearch}
+                    onChange={(e) => {
+                      this.setState({
+                        contractNoSearch: e.target.value,
+                      });
+                    }}
+                  />
+                  <Input
                     placeholder="客户名称"
                     style={{ width: "150px" }}
                     value={this.state.customerName}
@@ -2368,16 +2378,6 @@ const Order = Form.create()(
                       return <Option key={item.id}>{item.name}</Option>;
                     })}
                   </Select> */}
-                  <Input
-                    placeholder="合同编号"
-                    style={{ width: "150px" }}
-                    value={this.state.contractNoSearch}
-                    onChange={(e) => {
-                      this.setState({
-                        contractNoSearch: e.target.value,
-                      });
-                    }}
-                  />
                   <Select
                     style={{ width: 120 }}
                     placeholder="结算状态"

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

@@ -3016,6 +3016,15 @@ const approvedOutsourcing = React.createClass({
                 }}
               />
               <Input
+                placeholder="合同编号"
+                value={this.state.contractNoSearch}
+                onChange={(e) => {
+                  this.setState({
+                    contractNoSearch: e.target.value,
+                  })
+                }}
+              />
+              <Input
                 placeholder="客户名称"
                 value={this.state.nameSearch}
                 onChange={(e) => {
@@ -3040,15 +3049,6 @@ const approvedOutsourcing = React.createClass({
                 onChange={e => {
                   this.setState({ departmenttList: e });
                 }} /> */}
-              <Input
-                placeholder="合同编号"
-                value={this.state.contractNoSearch}
-                onChange={(e) => {
-                  this.setState({
-                    contractNoSearch: e.target.value,
-                  })
-                }}
-              />
               <Select
                 placeholder="流程状态"
                 onChange={(e) => {

+ 9 - 9
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -2957,6 +2957,15 @@ const approvedOutsourcing = React.createClass({
                 }}
               />
               <Input
+                placeholder="合同编号"
+                value={this.state.contractNoSearch}
+                onChange={(e) => {
+                  this.setState({
+                    contractNoSearch: e.target.value,
+                  });
+                }}
+              />
+              <Input
                 placeholder="客户名称"
                 value={this.state.nameSearch}
                 onChange={(e) => {
@@ -2990,15 +2999,6 @@ const approvedOutsourcing = React.createClass({
                   );
                 })}
               </Select> */}
-              <Input
-                placeholder="合同编号"
-                value={this.state.contractNoSearch}
-                onChange={(e) => {
-                  this.setState({
-                    contractNoSearch: e.target.value,
-                  });
-                }}
-              />
               <Select
                 placeholder="流程状态"
                 onChange={(e) => {

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

@@ -706,17 +706,17 @@ const HuiKuan = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
-                placeholder="合同编号"
-                value={this.state.nameSearch}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={e => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="合同编号"
+                value={this.state.nameSearch}
                 onChange={e => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               <Input

+ 11 - 11
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -622,20 +622,12 @@ const inSpecial = React.createClass({
     return (
       <div className="user-content" style={{ position: "relative" }}>
         <ShowModalDiv ShowModal={this.state.showModal} />
-        <div className="content-title">
-          <span>省内特批</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>省内特批</span>
         </div>
         <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
           <TabPane tab="搜索" key="1">
-            <div className="user-search">
-              <Input
-                placeholder="营销员名称"
-                value={this.state.nameSearch}
-                style={{ marginLeft: 10 }}
-                onChange={(e) => {
-                  this.setState({ nameSearch: e.target.value });
-                }}
-              />
+            <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
                 placeholder="订单编号"
                 value={this.state.orderNoSearch}
@@ -650,6 +642,14 @@ const inSpecial = React.createClass({
                   this.setState({ userName: e.target.value });
                 }}
               />
+              <Input
+                placeholder="营销员名称"
+                value={this.state.nameSearch}
+                style={{ marginLeft: 10 }}
+                onChange={(e) => {
+                  this.setState({ nameSearch: e.target.value });
+                }}
+              />
               <Select
                 placeholder="开票状态"
                 onChange={(e) => {

+ 8 - 8
js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx

@@ -628,20 +628,20 @@ const invoiceApplyList = React.createClass({
         </div>
         <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
           <TabPane tab="搜索" key="1">
-            <div className="user-search">
+            <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
-                placeholder="营销员名称"
-                value={this.state.nameSearch}
-                style={{ marginLeft: 10 }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={(e) => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="营销员名称"
+                value={this.state.nameSearch}
+                style={{ marginLeft: 10 }}
                 onChange={(e) => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               <Cascaders

+ 7 - 7
js/component/manageCenter/financialManage/distribute/invoiceApplyListQuery.jsx

@@ -587,18 +587,18 @@ const invoiceApplyListQuery = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search">
               <Input
-                placeholder="营销员名称"
-                value={this.state.nameSearch}
-                style={{ marginLeft: 10 }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={e => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="营销员名称"
+                value={this.state.nameSearch}
+                style={{ marginLeft: 10 }}
                 onChange={e => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               <Cascaders

+ 6 - 6
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -618,17 +618,17 @@ const invoiceApplyListWai = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search" style={{ padding: "0 10px" }}>
               <Input
-                placeholder="营销员名称"
-                value={this.state.nameSearch}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={(e) => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="营销员名称"
+                value={this.state.nameSearch}
                 onChange={(e) => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               <Cascaders

+ 7 - 7
js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx

@@ -568,18 +568,18 @@ const outInvoiceQuery = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search">
               <Input
-                placeholder="营销员名称"
-                value={this.state.nameSearch}
-                style={{ marginLeft: 10 }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={e => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="营销员名称"
+                value={this.state.nameSearch}
+                style={{ marginLeft: 10 }}
                 onChange={e => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               <Cascaders

+ 9 - 9
js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx

@@ -899,24 +899,24 @@ const outsourcingPaiDan = React.createClass({
         ) : (
           ""
         )}
-        <div className="content-title">
-          <span>外省外包列表</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>外省外包列表</span>
         </div>
         <Tabs defaultActiveKey="1" className="test">
           <TabPane tab="搜索" key="1">
-            <div className="user-search">
+            <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
-                placeholder="客户名称"
-                value={this.state.nameSearch}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={(e) => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="客户名称"
+                value={this.state.nameSearch}
                 onChange={(e) => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               <Select

+ 9 - 9
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -613,25 +613,25 @@ const outSpecial = React.createClass({
     const { TabPane } = Tabs;
     return (
       <div className="user-content">
-        <div className="content-title">
-          <span>省外特批</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>省外特批</span>
         </div>
         <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
           <TabPane tab="搜索" key="1">
             <div className="user-search">
               <Input
-                placeholder="营销员名称"
-                value={this.state.nameSearch}
-                style={{ marginLeft: 10 }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={(e) => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="营销员名称"
+                value={this.state.nameSearch}
+                style={{ marginLeft: 10 }}
                 onChange={(e) => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               {/*<Select placeholder="订单部门"

+ 18 - 18
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -1031,24 +1031,33 @@ const outsourcingPaiDan = React.createClass({
         ) : (
           ""
         )}
-        <div className="content-title">
-          <span>外包派单</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>外包派单</span>
         </div>
         <Tabs defaultActiveKey="1" className="test">
           <TabPane tab="搜索" key="1">
-            <div className="user-search">
+            <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
-                placeholder="客户名称"
-                value={this.state.nameSearch}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={(e) => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="合同编号"
+                value={this.state.contractNoSearch}
                 onChange={(e) => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({
+                    contractNoSearch: e.target.value,
+                  });
+                }}
+              />
+              <Input
+                placeholder="客户名称"
+                value={this.state.nameSearch}
+                onChange={(e) => {
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               <Select
@@ -1074,15 +1083,6 @@ const outsourcingPaiDan = React.createClass({
                 <Option value="2">未分配</Option>
                 <Option value="3">已分配</Option>
               </Select>
-              <Input
-                placeholder="合同编号"
-                value={this.state.contractNoSearch}
-                onChange={(e) => {
-                  this.setState({
-                    contractNoSearch: e.target.value,
-                  });
-                }}
-              />
               <span style={{ marginRight: 10 }}>下单时间 :</span>
               <RangePicker
                 value={[

+ 18 - 18
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -324,24 +324,33 @@ const PaiDan = React.createClass({
     const { RangePicker } = DatePicker;
     return (
       <div className="user-content">
-        <div className="content-title">
-          <span>派单管理</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>派单管理</span>
         </div>
         <Tabs defaultActiveKey="1" className="test">
           <TabPane tab="搜索" key="1">
-            <div className="user-search">
+            <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
-                placeholder="客户名称"
-                value={this.state.nameSearch}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={e => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="合同编号"
+                value={this.state.contractNoSearch}
                 onChange={e => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({
+                    contractNoSearch: e.target.value
+                  });
+                }}
+              />
+              <Input
+                placeholder="客户名称"
+                value={this.state.nameSearch}
+                onChange={e => {
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               <DepartmentList
@@ -360,15 +369,6 @@ const PaiDan = React.createClass({
                 <Option value="2">未分配</Option>
                 <Option value="3">已分配</Option>
               </Select>
-              <Input
-                placeholder="合同编号"
-                value={this.state.contractNoSearch}
-                onChange={e => {
-                  this.setState({
-                    contractNoSearch: e.target.value
-                  });
-                }}
-              />
               <span style={{ marginRight: 10 }}>下单时间 :</span>
               <RangePicker
                 value={[

+ 18 - 18
js/component/manageCenter/financialManage/distribute/projectvip.jsx

@@ -91,12 +91,12 @@ const ProjectVip = React.createClass({
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
                     {
-                        record.approval == 1
-                          ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                            ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                              ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                                ? <Tag color="#ff0000">特批通过</Tag> : ""
-                      }
+                      record.approval == 1
+                        ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
+                          ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
+                            ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
+                              ? <Tag color="#ff0000">特批通过</Tag> : ""
+                    }
                   </div>
                 </div>
               </Tooltip>
@@ -619,6 +619,18 @@ const ProjectVip = React.createClass({
                 }}
               />
               <Input
+                placeholder="合同编号"
+                value={searchValues["contractNo"]
+                  ? searchValues["contractNo"]
+                  : ""}
+                onChange={(e) => {
+                  searchValues["contractNo"] = e.target.value;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              />
+              <Input
                 placeholder="客户名称"
                 value={searchValues["userName"]
                   ? searchValues["userName"]
@@ -663,18 +675,6 @@ const ProjectVip = React.createClass({
                   );
                 })}
               </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"

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

@@ -90,12 +90,12 @@ const ProjectVipAll = React.createClass({
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
                     {
-                        record.approval == 1
-                          ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                            ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                              ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                                ? <Tag color="#ff0000">特批通过</Tag> : ""
-                      }
+                      record.approval == 1
+                        ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
+                          ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
+                            ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
+                              ? <Tag color="#ff0000">特批通过</Tag> : ""
+                    }
                   </div>
                 </div>
               </Tooltip>
@@ -543,7 +543,7 @@ const ProjectVipAll = React.createClass({
       <div className="user-content">
         <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title" style={{ marginBottom: 10 }}>
-          <span style={{ fontWeight: 900, fontSize: 16 }}>会员项目(all)</span>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>会员项目(All)</span>
         </div>
         <Tabs defaultActiveKey="2" onChange={this.callback} className="test">
           <TabPane tab="更改表格显示数据" key="1">
@@ -572,6 +572,18 @@ const ProjectVipAll = React.createClass({
                 }}
               />
               <Input
+                placeholder="合同编号"
+                value={searchValues["contractNo"]
+                  ? searchValues["contractNo"]
+                  : ""}
+                onChange={(e) => {
+                  searchValues["contractNo"] = e.target.value;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              />
+              <Input
                 placeholder="客户名称"
                 value={searchValues["userName"]
                   ? searchValues["userName"]
@@ -616,18 +628,6 @@ const ProjectVipAll = React.createClass({
                   );
                 })}
               </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"

+ 10 - 10
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -2645,6 +2645,15 @@ const ShouKuang = React.createClass({
                 }}
               />
               <Input
+                placeholder="合同编号"
+                value={this.state.contractNoSearch}
+                onChange={(e) => {
+                  this.setState({
+                    contractNoSearch: e.target.value,
+                  });
+                }}
+              />
+              <Input
                 placeholder="客户名称"
                 value={this.state.nameSearch}
                 onChange={(e) => {
@@ -2678,15 +2687,6 @@ const ShouKuang = React.createClass({
                   );
                 })}
               </Select> */}
-              <Input
-                placeholder="合同编号"
-                value={this.state.contractNoSearch}
-                onChange={(e) => {
-                  this.setState({
-                    contractNoSearch: e.target.value,
-                  });
-                }}
-              />
               <Select
                 placeholder="流程状态"
                 onChange={(e) => {
@@ -2757,7 +2757,7 @@ const ShouKuang = React.createClass({
               </Select>
               <span style={{}}>下单日期:</span>
               <RangePicker
-                style={{ width: 170 }}
+                style={{ width: 170, marginRight: 10 }}
                 value={[
                   this.state.releaseDate[0]
                     ? moment(this.state.releaseDate[0])

+ 11 - 11
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -1411,7 +1411,7 @@ const ShouKuang = React.createClass({
                   >
                     通过
                   </Button>}
-                  
+
                 {!(
                   recard.actuallyTotalAmount &&
                   Number(recard.actuallyTotalAmount) > 0
@@ -2742,6 +2742,16 @@ const ShouKuang = React.createClass({
               />
               <Input
                 style={{ width: 200 }}
+                placeholder="合同编号"
+                value={this.state.contractNoSearch}
+                onChange={(e) => {
+                  this.setState({
+                    contractNoSearch: e.target.value,
+                  });
+                }}
+              />
+              <Input
+                style={{ width: 200 }}
                 placeholder="客户名称"
                 value={this.state.nameSearch}
                 onChange={(e) => {
@@ -2775,16 +2785,6 @@ const ShouKuang = React.createClass({
                   );
                 })}
               </Select> */}
-              <Input
-                style={{ width: 200 }}
-                placeholder="合同编号"
-                value={this.state.contractNoSearch}
-                onChange={(e) => {
-                  this.setState({
-                    contractNoSearch: e.target.value,
-                  });
-                }}
-              />
               <Select
                 placeholder="流程状态"
                 onChange={(e) => {

+ 0 - 1
js/component/manageCenter/financialManage/distribute/tuiDan.jsx

@@ -438,7 +438,6 @@ const TuiDan = React.createClass({
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              bordered
               columns={
                 this.state.changeList == undefined
                   ? this.state.columns

Dosya farkı çok büyük olduğundan ihmal edildi
+ 490 - 490
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx


+ 21 - 19
js/component/manageCenter/order/orderNew/arrearsList.jsx

@@ -488,21 +488,13 @@ const ArrearsList = Form.create()(
               <TabPane tab="搜索" key="1">
                 <div className="user-search">
                   <Input
-                    placeholder="客户名称"
+                    placeholder="订单编号"
                     style={{
                       width: "150px",
                       marginBottom: "10px",
                       marginLeft: 10,
                       marginRight: 10,
                     }}
-                    value={this.state.customerName}
-                    onChange={(e) => {
-                      this.setState({ customerName: e.target.value });
-                    }}
-                  />
-                  <Input
-                    placeholder="订单编号"
-                    style={{ width: "150px", marginRight: 10 }}
                     value={this.state.orderNo}
                     onChange={(e) => {
                       this.setState({ orderNo: e.target.value });
@@ -517,6 +509,14 @@ const ArrearsList = Form.create()(
                     }}
                   />
                   <Input
+                    placeholder="客户名称"
+                    style={{ width: "150px", marginRight: 10 }}
+                    value={this.state.customerName}
+                    onChange={(e) => {
+                      this.setState({ customerName: e.target.value });
+                    }}
+                  />
+                  <Input
                     placeholder="营销员名称"
                     style={{
                       width: "150px",
@@ -549,6 +549,7 @@ const ArrearsList = Form.create()(
                 /> */}
                   <span style={{ marginRight: "10px" }}>下单时间 :</span>
                   <RangePicker
+                    style={{ width: 200 }}
                     value={[
                       this.state.releaseDate[0]
                         ? moment(this.state.releaseDate[0])
@@ -563,6 +564,7 @@ const ArrearsList = Form.create()(
                   />
                   <span style={{ marginRight: "10px", marginLeft: 10 }}>触发时间 :</span>
                   <RangePicker
+                    style={{ width: 200 }}
                     value={[
                       this.state.chufaDate[0]
                         ? moment(this.state.chufaDate[0])
@@ -575,16 +577,16 @@ const ArrearsList = Form.create()(
                       this.setState({ chufaDate: dataString });
                     }}
                   />
-                  <div>
-                    <Button
-                      type="primary"
-                      onClick={this.search}
-                      style={{ marginLeft: "10px", marginRight: 10 }}
-                    >
-                      搜索
-                    </Button>
-                    <Button onClick={this.reset}>重置</Button>
-                  </div>
+
+                  <Button
+                    type="primary"
+                    onClick={this.search}
+                    style={{ marginLeft: "10px", marginRight: 10 }}
+                  >
+                    搜索
+                  </Button>
+                  <Button onClick={this.reset}>重置</Button>
+
                 </div>
               </TabPane>
               <TabPane tab="导出催款列表" key="2">

+ 10 - 10
js/component/manageCenter/order/orderNew/billing.jsx

@@ -1911,6 +1911,16 @@ const MyService = Form.create()(
                       }}
                     />
                     <Input
+                      placeholder="合同编号"
+                      style={{ width: "150px", marginRight: 10 }}
+                      value={this.state.contractNoSearch}
+                      onChange={(e) => {
+                        this.setState({
+                          contractNoSearch: e.target.value,
+                        });
+                      }}
+                    />
+                    <Input
                       placeholder="客户名称"
                       style={{ width: "150px", marginRight: "10px" }}
                       value={this.state.customerName}
@@ -1943,16 +1953,6 @@ const MyService = Form.create()(
                         return <Option key={item.id}>{item.name}</Option>;
                       })}
                     </Select> */}
-                    <Input
-                      placeholder="合同编号"
-                      style={{ width: "150px", marginRight: 10 }}
-                      value={this.state.contractNoSearch}
-                      onChange={(e) => {
-                        this.setState({
-                          contractNoSearch: e.target.value,
-                        });
-                      }}
-                    />
                     <Select
                       style={{ width: 120 }}
                       placeholder="结算状态"

+ 32 - 11
js/component/manageCenter/order/orderNew/changeComponent/searchInput.js

@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import { Input, Button, Select, DatePicker } from "antd";
 import moment from "moment";
 import $ from "jquery/src/ajax";
+import Cascaders from "../../../../common/cascaders";
 
 // 搜索输入框
 class PrimaryInput extends Component {
@@ -22,7 +23,8 @@ class PrimaryInput extends Component {
   reset() {
     this.setState(
       {
-        value: this.props.searchInputData.defaultValue
+        // value: this.props.searchInputData.defaultValue
+        value: undefined
       },
       () => {
         this.props.searchInputData.getValue(this.state.value);
@@ -131,6 +133,7 @@ class PrimaryRangePicker extends Component {
     const Datas = this.props.searchRangePickerData;
     return (
       <RangePicker
+        style={{ width: Datas.width, marginRight: 10 }}
         value={[
           this.state.value[0] ? moment(this.state.value[0]) : null,
           this.state.value[1] ? moment(this.state.value[1]) : null
@@ -199,7 +202,7 @@ class SearchInput extends Component {
     const SearchInputData = [
       {
         placeholder: "订单编号",
-        width: 120,
+        width: 150,
         defaultValue: "",
         getValue: value => {
           this.setState({
@@ -210,7 +213,7 @@ class SearchInput extends Component {
       },
       {
         placeholder: "合同编号",
-        width: 120,
+        width: 150,
         defaultValue: "",
         getValue: value => {
           this.setState({
@@ -221,7 +224,7 @@ class SearchInput extends Component {
       },
       {
         placeholder: "客户名称",
-        width: 120,
+        width: 150,
         defaultValue: "",
         getValue: value => {
           this.setState({
@@ -232,7 +235,7 @@ class SearchInput extends Component {
       },
       {
         placeholder: "订单负责人",
-        width: 120,
+        width: 150,
         defaultValue: "",
         getValue: value => {
           this.setState({
@@ -346,7 +349,7 @@ class SearchInput extends Component {
       },
       {
         placeholder: "时间",
-        width: 120,
+        width: 80,
         defaultValue: "1",
         content: [
           {
@@ -370,6 +373,7 @@ class SearchInput extends Component {
     // 时间框数据
     const SearchRangePickerData = [
       {
+        width: 200,
         defaultValue: [],
         getValue: value => {
           this.setState({
@@ -390,6 +394,21 @@ class SearchInput extends Component {
             />
           );
         })}
+
+        <Cascaders
+          ref={node => this.Cascaders = node}
+          placeholder="订单部门"
+          id="id"
+          name="name"
+          children="list"
+          height={28}
+          onSel={(e) => {
+            this.setState({
+              deps: JSON.stringify(e)
+            })
+          }}
+        />
+
         {SearchSelectData.map((item, index) => {
           if (this.props.isYxy) {
             if (item.placeholder == "审核状态") {
@@ -415,9 +434,9 @@ class SearchInput extends Component {
         })}
         <Button
           type="primary"
-          style={{ marginLeft: 10, marginTop: 10 }}
+          style={{ marginRight: 10, marginTop: 10 }}
           onClick={() => {
-            this.props.search(Object.assign(this.state, { isReset: false }));
+            this.props.search(this.state)
           }}
         >
           搜索
@@ -425,12 +444,14 @@ class SearchInput extends Component {
         <Button
           onClick={_e => {
             this.setState({
-              reset: true
+              reset: true,
+              deps: undefined,
             }, () => {
-              this.props.search(Object.assign(this.state, { isReset: true }))
+              this.Cascaders.empty();
+              this.props.search(this.state)
             })
           }}
-          style={{ marginLeft: 10 }}
+          style={{ marginTop: 10 }}
         >
           重置
         </Button>

+ 45 - 44
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -1046,50 +1046,51 @@ const IntentionCustomer = Form.create()(
               className="test"
             >
               <TabPane tab="搜索" key="1">
-                <Input
-                  placeholder="客户名称"
-                  style={{
-                    width: "150px",
-                    marginBottom: "10px",
-                    marginTop: 10,
-                    marginRight: 10,
-                    marginLeft: 10,
-                  }}
-                  value={this.state.customerName}
-                  onChange={(e) => {
-                    this.setState({ customerName: e.target.value });
-                  }}
-                />
-                <Input
-                  placeholder="订单编号"
-                  style={{ width: "150px", marginRight: 10 }}
-                  value={this.state.orderNo}
-                  onChange={(e) => {
-                    this.setState({ orderNo: e.target.value });
-                  }}
-                />
-                <span style={{ marginRight: "10px" }}>下单时间 :</span>
-                <RangePicker
-                  value={[
-                    this.state.releaseDate[0]
-                      ? moment(this.state.releaseDate[0])
-                      : null,
-                    this.state.releaseDate[1]
-                      ? moment(this.state.releaseDate[1])
-                      : null,
-                  ]}
-                  onChange={(data, dataString) => {
-                    this.setState({ releaseDate: dataString });
-                  }}
-                />
-                <Button
-                  type="primary"
-                  onClick={this.search}
-                  style={{ marginLeft: "10px", marginRight: 10 }}
-                >
-                  搜索
-                </Button>
-                <Button onClick={this.reset}>重置</Button>
+                <div style={{ marginLeft: 10 }}>
+                  <Input
+                    placeholder="订单编号"
+                    style={{ width: "150px", marginRight: 10 }}
+                    value={this.state.orderNo}
+                    onChange={(e) => {
+                      this.setState({ orderNo: e.target.value });
+                    }}
+                  />
+                  <Input
+                    placeholder="客户名称"
+                    style={{
+                      width: "150px",
+                      marginBottom: "10px",
+                      marginTop: 10,
+                      marginRight: 10,
+                    }}
+                    value={this.state.customerName}
+                    onChange={(e) => {
+                      this.setState({ customerName: e.target.value });
+                    }}
+                  />
+                  <span style={{ marginRight: "10px" }}>下单时间 :</span>
+                  <RangePicker
+                    value={[
+                      this.state.releaseDate[0]
+                        ? moment(this.state.releaseDate[0])
+                        : null,
+                      this.state.releaseDate[1]
+                        ? moment(this.state.releaseDate[1])
+                        : null,
+                    ]}
+                    onChange={(data, dataString) => {
+                      this.setState({ releaseDate: dataString });
+                    }}
+                  />
+                  <Button
+                    type="primary"
+                    onClick={this.search}
+                    style={{ marginLeft: "10px", marginRight: 10 }}
+                  >
+                    搜索
+                  </Button>
+                  <Button onClick={this.reset}>重置</Button>
+                </div>
               </TabPane>
               <TabPane tab="更改表格显示数据" key="2">
                 <div style={{ marginLeft: 10 }}>

+ 4 - 29
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -24,7 +24,6 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import NewEditProject from "../../../common/projectOperation/newEditProject";
-import Cascaders from "../../../common/cascaders";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -732,20 +731,11 @@ const contractChange = Form.create()(
     },
 
     search(obj) {
-      if (obj.reset) {
-        this.state.searchData.deps = [];
-        this.Cascaders.empty();
+      this.setState({
+        searchData: obj
+      }, () => {
         this.loadData(1);
-      } else {
-        this.setState(
-          {
-            searchData: Object.assign(this.state.searchData, obj)
-          },
-          () => {
-            this.loadData(1);
-          }
-        );
-      }
+      })
     },
 
     rizhi(orderNo) {
@@ -1350,21 +1340,6 @@ const contractChange = Form.create()(
             <Tabs defaultActiveKey="2" className="test">
               <TabPane tab="搜索" key="2">
                 <div style={{ marginLeft: 10 }}>
-                  <Cascaders
-                    ref={node => this.Cascaders = node}
-                    placeholder="订单部门"
-                    id="id"
-                    name="name"
-                    children="list"
-                    height={28}
-                    onSel={(e) => {
-                      const { searchData } = this.state
-                      searchData["deps"] = JSON.stringify(e);
-                      this.setState({
-                        searchData: searchData
-                      })
-                    }}
-                  />
                   <SearchInput search={this.search} />
                 </div>
               </TabPane>

+ 4 - 29
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -23,7 +23,6 @@ import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
-import Cascaders from "../../../common/cascaders";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -663,20 +662,11 @@ const contractChange = Form.create()(
     },
 
     search(obj) {
-      if (obj.reset) {
-        this.state.searchData.deps = [];
-        this.Cascaders.empty();
+      this.setState({
+        searchData: obj
+      }, () => {
         this.loadData(1);
-      } else {
-        this.setState(
-          {
-            searchData: Object.assign(this.state.searchData, obj)
-          },
-          () => {
-            this.loadData(1);
-          }
-        );
-      }
+      })
     },
 
     rizhi(orderNo) {
@@ -1218,21 +1208,6 @@ const contractChange = Form.create()(
               className="test">
               <TabPane tab="搜索" key="1">
                 <div style={{ marginLeft: 10 }}>
-                  <Cascaders
-                    ref={node => this.Cascaders = node}
-                    placeholder="订单部门"
-                    id="id"
-                    name="name"
-                    children="list"
-                    height={28}
-                    onSel={(e) => {
-                      const { searchData } = this.state
-                      searchData["deps"] = JSON.stringify(e);
-                      this.setState({
-                        searchData: searchData
-                      })
-                    }}
-                  />
                   <SearchInput search={this.search} />
                 </div>
               </TabPane>

+ 4 - 29
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -24,7 +24,6 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import NewEditProject from "../../../common/projectOperation/newEditProject";
-import Cascaders from "../../../common/cascaders";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -725,20 +724,11 @@ const contractChange = Form.create()(
     },
 
     search(obj) {
-      if (obj.reset) {
-        this.state.searchData.deps = [];
-        this.Cascaders.empty();
+      this.setState({
+        searchData: obj
+      }, () => {
         this.loadData(1);
-      } else {
-        this.setState(
-          {
-            searchData: Object.assign(this.state.searchData, obj)
-          },
-          () => {
-            this.loadData(1);
-          }
-        );
-      }
+      })
     },
 
     rizhi(orderNo) {
@@ -1358,21 +1348,6 @@ const contractChange = Form.create()(
               </TabPane>
               <TabPane tab="搜索" key="2">
                 <div style={{ marginLeft: 10 }}>
-                  <Cascaders
-                    ref={node => this.Cascaders = node}
-                    placeholder="订单部门"
-                    id="id"
-                    name="name"
-                    children="list"
-                    height={28}
-                    onSel={(e) => {
-                      const { searchData } = this.state
-                      searchData["deps"] = JSON.stringify(e);
-                      this.setState({
-                        searchData: searchData
-                      })
-                    }}
-                  />
                   <SearchInput search={this.search} />
                 </div>
               </TabPane>

+ 4 - 29
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -23,7 +23,6 @@ import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
-import Cascaders from "../../../common/cascaders";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -652,20 +651,11 @@ const contractChange = Form.create()(
     },
 
     search(obj) {
-      if (obj.reset) {
-        this.state.searchData.deps = [];
-        this.Cascaders.empty();
+      this.setState({
+        searchData: obj
+      }, () => {
         this.loadData(1);
-      } else {
-        this.setState(
-          {
-            searchData: Object.assign(this.state.searchData, obj)
-          },
-          () => {
-            this.loadData(1);
-          }
-        );
-      }
+      })
     },
 
     rizhi(orderNo) {
@@ -1214,21 +1204,6 @@ const contractChange = Form.create()(
               className="test">
               <TabPane tab="搜索" key="1">
                 <div style={{ marginLeft: 10 }}>
-                  <Cascaders
-                    ref={node => this.Cascaders = node}
-                    placeholder="订单部门"
-                    id="id"
-                    name="name"
-                    children="list"
-                    height={28}
-                    onSel={(e) => {
-                      const { searchData } = this.state
-                      searchData["deps"] = JSON.stringify(e);
-                      this.setState({
-                        searchData: searchData
-                      })
-                    }}
-                  />
                   <SearchInput search={this.search} />
                 </div>
               </TabPane>

+ 4 - 29
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -23,7 +23,6 @@ import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from '../../../../component/common/orderItemStatus';
-import Cascaders from "../../../common/cascaders";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -618,20 +617,11 @@ const contractChange = Form.create()(
     },
 
     search(obj) {
-      if (obj.reset) {
-        this.state.searchData.deps = [];
-        this.Cascaders.empty();
+      this.setState({
+        searchData: obj
+      }, () => {
         this.loadData(1);
-      } else {
-        this.setState(
-          {
-            searchData: Object.assign(this.state.searchData, obj)
-          },
-          () => {
-            this.loadData(1);
-          }
-        );
-      }
+      })
     },
 
     rizhi(orderNo) {
@@ -1159,21 +1149,6 @@ const contractChange = Form.create()(
               className="test">
               <TabPane tab="搜索" key="1">
                 <div style={{ marginLeft: 10, }}>
-                  <Cascaders
-                    ref={node => this.Cascaders = node}
-                    placeholder="订单部门"
-                    id="id"
-                    name="name"
-                    children="list"
-                    height={28}
-                    onSel={(e) => {
-                      const { searchData } = this.state
-                      searchData["deps"] = JSON.stringify(e);
-                      this.setState({
-                        searchData: searchData
-                      })
-                    }}
-                  />
                   <SearchInput search={this.search} />
                 </div>
               </TabPane>

+ 4 - 29
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -23,7 +23,6 @@ import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
-import Cascaders from "../../../common/cascaders";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -651,20 +650,11 @@ const contractChange = Form.create()(
     },
 
     search(obj) {
-      if (obj.reset) {
-        this.state.searchData.deps = [];
-        this.Cascaders.empty();
+      this.setState({
+        searchData: obj
+      }, () => {
         this.loadData(1);
-      } else {
-        this.setState(
-          {
-            searchData: Object.assign(this.state.searchData, obj)
-          },
-          () => {
-            this.loadData(1);
-          }
-        );
-      }
+      })
     },
 
     rizhi(orderNo) {
@@ -1209,21 +1199,6 @@ const contractChange = Form.create()(
               className="test">
               <TabPane tab="搜索" key="1">
                 <div style={{ marginLeft: 10 }}>
-                  <Cascaders
-                    ref={node => this.Cascaders = node}
-                    placeholder="订单部门"
-                    id="id"
-                    name="name"
-                    children="list"
-                    height={28}
-                    onSel={(e) => {
-                      const { searchData } = this.state
-                      searchData["deps"] = JSON.stringify(e);
-                      this.setState({
-                        searchData: searchData
-                      })
-                    }}
-                  />
                   <SearchInput search={this.search} />
                 </div>
               </TabPane>

+ 5 - 33
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -23,7 +23,6 @@ import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
-import Cascaders from "../../../common/cascaders";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -648,23 +647,11 @@ const contractChange = Form.create()(
     },
 
     search(obj) {
-      if (obj.isReset) {
-        this.state.searchData.deps = [];
-        this.Cascaders.empty();
-        this.setState({
-          searchData: Object.assign(this.state.searchData, obj)
-        }, () => {
-          this.loadData(1);
-        })
-      } else {
-        this.setState(
-          {
-            searchData: Object.assign(this.state.searchData, obj)
-          }, () => {
-            this.loadData(1);
-          }
-        );
-      }
+      this.setState({
+        searchData: obj
+      }, () => {
+        this.loadData(1);
+      })
     },
 
     rizhi(orderNo) {
@@ -1221,21 +1208,6 @@ const contractChange = Form.create()(
               className="test">
               <TabPane tab="搜索" key="1">
                 <div style={{ marginLeft: 10 }}>
-                  <Cascaders
-                    ref={node => this.Cascaders = node}
-                    placeholder="订单部门"
-                    id="id"
-                    name="name"
-                    children="list"
-                    height={28}
-                    onSel={(e) => {
-                      const { searchData } = this.state
-                      searchData["deps"] = JSON.stringify(e);
-                      this.setState({
-                        searchData: searchData
-                      })
-                    }}
-                  />
                   <SearchInput search={this.search} />
                 </div>
               </TabPane>

+ 4 - 29
js/component/manageCenter/order/orderNew/contractYxjl.js

@@ -23,7 +23,6 @@ import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
-import Cascaders from "../../../common/cascaders";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -648,20 +647,11 @@ const contractChange = Form.create()(
     },
 
     search(obj) {
-      if (obj.reset) {
-        this.state.searchData.deps = [];
-        this.Cascaders.empty();
+      this.setState({
+        searchData: obj
+      }, () => {
         this.loadData(1);
-      } else {
-        this.setState(
-          {
-            searchData: Object.assign(this.state.searchData, obj)
-          },
-          () => {
-            this.loadData(1);
-          }
-        );
-      }
+      })
     },
 
     rizhi(orderNo) {
@@ -1218,21 +1208,6 @@ const contractChange = Form.create()(
               className="test">
               <TabPane tab="搜索" key="1">
                 <div style={{ marginLeft: 10 }}>
-                  <Cascaders
-                    ref={node => this.Cascaders = node}
-                    placeholder="订单部门"
-                    id="id"
-                    name="name"
-                    children="list"
-                    height={28}
-                    onSel={(e) => {
-                      const { searchData } = this.state
-                      searchData["deps"] = JSON.stringify(e);
-                      this.setState({
-                        searchData: searchData
-                      })
-                    }}
-                  />
                   <SearchInput search={this.search} />
                 </div>
               </TabPane>

+ 6 - 36
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -26,7 +26,6 @@ import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
-import Cascaders from "../../../common/cascaders";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -662,25 +661,11 @@ const contractChange = Form.create()(
     },
 
     search(obj) {
-      if (obj.reset) {
-        this.Cascaders.empty();
-        this.setState({
-          searchData: {
-            releaseDate: [],
-          }
-        }, () => {
-          this.loadData(1);
-        })
-      } else {
-        this.setState(
-          {
-            searchData: Object.assign(this.state.searchData, obj)
-          },
-          () => {
-            this.loadData(1);
-          }
-        );
-      }
+      this.setState({
+        searchData: obj
+      }, () => {
+        this.loadData(1);
+      })
     },
 
     rizhi(orderNo) {
@@ -1231,22 +1216,7 @@ const contractChange = Form.create()(
           <div className="user-search">
             <Tabs defaultActiveKey="1" className="test">
               <TabPane tab="搜索" key="1">
-                <div>
-                  <Cascaders
-                    ref={node => this.Cascaders = node}
-                    placeholder="订单部门"
-                    id="id"
-                    name="name"
-                    children="list"
-                    height={28}
-                    onSel={(e) => {
-                      const { searchData } = this.state
-                      searchData["deps"] = JSON.stringify(e);
-                      this.setState({
-                        searchData: searchData
-                      })
-                    }}
-                  />
+                <div style={{ marginLeft: 10 }}>
                   <SearchInput search={this.search} isYxy={true} />
                 </div>
               </TabPane>

+ 284 - 284
js/component/manageCenter/order/orderNew/costAuditList/filterColumn.js

@@ -4,215 +4,215 @@ import $ from "jquery/src/ajax";
 import Cascaders from "../../../../common/cascaders"
 
 class FilterColumn extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            departmentArr: [],
-            deps: undefined,
-        }
-        this.handleReset = this.handleReset.bind(this);
-        this.departmentList = this.departmentList.bind(this);
-        this.supervisor = this.supervisor.bind(this);
-        this.httpChange = this.httpChange.bind(this);
-        this.selectAuto = this.selectAuto.bind(this);
-        this.blurChange = this.blurChange.bind(this);
-    }
-
-    componentDidMount() {
-        // this.departmentList();
+  constructor(props) {
+    super(props);
+    this.state = {
+      departmentArr: [],
+      deps: undefined,
     }
+    this.handleReset = this.handleReset.bind(this);
+    this.departmentList = this.departmentList.bind(this);
+    this.supervisor = this.supervisor.bind(this);
+    this.httpChange = this.httpChange.bind(this);
+    this.selectAuto = this.selectAuto.bind(this);
+    this.blurChange = this.blurChange.bind(this);
+  }
 
-    handleReset() {
-        this.state.auto = '';
-        this.state.thchId = undefined;
-        this.state.deps = undefined;
-        this.Cascaders.empty();
-        this.props.form.resetFields();
-        this.props.onResetSearch && this.props.onResetSearch();
-    }
+  componentDidMount() {
+    // this.departmentList();
+  }
 
-    handleSubmit(e) {
-        e.preventDefault();
-        this.props.form.validateFieldsAndScroll((err, values) => {
-            if (err) {
-                return;
-            }
-            this.props.onSearch(Object.assign(
-                values,
-                {
-                    deps: this.state.deps,
-                    thchId: this.state.thchId
-                }
-            ));
-        })
-    }
+  handleReset() {
+    this.state.auto = '';
+    this.state.thchId = undefined;
+    this.state.deps = undefined;
+    this.Cascaders.empty();
+    this.props.form.resetFields();
+    this.props.onResetSearch && this.props.onResetSearch();
+  }
 
-    //部门
-    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)
-        );
-    }
-    // 查询用户
-    supervisor(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({
-                    customerArr: thedata,
-                });
-            }.bind(this),
-        }).always(
-            function () {
+  handleSubmit(e) {
+    e.preventDefault();
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      if (err) {
+        return;
+      }
+      this.props.onSearch(Object.assign(
+        values,
+        {
+          deps: this.state.deps,
+          thchId: this.state.thchId
+        }
+      ));
+    })
+  }
 
-            }.bind(this)
-        );
-    }
-    // 输入触发
-    httpChange(e) {
-        if (e.length >= 1) {
-            this.supervisor(e);
+  //部门
+  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({
-            auto: e,
+          departmentArr: theArr,
         });
-    }
-    // 选中
-    selectAuto(value, options) {
-        let thchId = ""
-        let contactLists = this.state.customerArr || [];
-        if (value) {
-            contactLists.map(function (item) {
-                if (item.name == value.toString()) {
-                    thchId = item.id;
-                }
-            });
+      }.bind(this),
+    }).always(
+      function () {
+      }.bind(this)
+    );
+  }
+  // 查询用户
+  supervisor(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({
-            auto: value,
-            thchId: thchId,
+          customerArr: thedata,
         });
+      }.bind(this),
+    }).always(
+      function () {
+
+      }.bind(this)
+    );
+  }
+  // 输入触发
+  httpChange(e) {
+    if (e.length >= 1) {
+      this.supervisor(e);
     }
-    // 失去焦点
-    blurChange(e) {
-        let thchId = ""
-        let contactLists = this.state.customerArr || [];
-        if (e) {
-            contactLists.map(function (item) {
-                if (item.name == e.toString()) {
-                    thchId = item.id;
-                }
-            });
+    this.setState({
+      auto: e,
+    });
+  }
+  // 选中
+  selectAuto(value, options) {
+    let thchId = ""
+    let contactLists = this.state.customerArr || [];
+    if (value) {
+      contactLists.map(function (item) {
+        if (item.name == value.toString()) {
+          thchId = item.id;
         }
-        this.setState({
-            thchId: thchId,
-        });
+      });
     }
+    this.setState({
+      auto: value,
+      thchId: thchId,
+    });
+  }
+  // 失去焦点
+  blurChange(e) {
+    let thchId = ""
+    let contactLists = this.state.customerArr || [];
+    if (e) {
+      contactLists.map(function (item) {
+        if (item.name == e.toString()) {
+          thchId = item.id;
+        }
+      });
+    }
+    this.setState({
+      thchId: thchId,
+    });
+  }
 
-    render() {
-        const { getFieldDecorator } = this.props.form;
-        const dataSources = this.state.customerArr || [];
-        const options = dataSources.map((group) => (
-            <Select.Option key={group.id} value={group.name}>
-                {group.name}
-            </Select.Option>
-        ));
-        return (
-            <div className="user-search">
-                <Form
-                    layout="inline"
-                    name="basic"
-                    initialValues={{
-                        remember: true,
-                    }}
-                    onSubmit={(e) => {
-                        this.handleSubmit(e)
-                    }}
-                >
-                    <Form.Item
-                        label="合同编号"
-                    >
-                        {getFieldDecorator('contractNo', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: 200, height: 32 }} placeholder="请输入合同编号" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="订单编号"
-                    >
-                        {getFieldDecorator('orderNo', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: 200, height: 32 }} placeholder="请输入订单编号" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="客户名称"
-                    >
-                        {getFieldDecorator('userName', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: 200, height: 32 }} placeholder="请输入客户名称" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="部门"
-                    >
-                        <Cascaders
-                            ref={node => this.Cascaders = node}
-                            placeholder="订单部门"
-                            id="id"
-                            name="name"
-                            children="list"
-                            height={32}
-                            onSel={(e) => {
-                                this.setState({
-                                    deps: JSON.stringify(e),
-                                });
-                            }}
-                        />
-                        {/* {getFieldDecorator('deps', {
+  render() {
+    const { getFieldDecorator } = this.props.form;
+    const dataSources = this.state.customerArr || [];
+    const options = dataSources.map((group) => (
+      <Select.Option key={group.id} value={group.name}>
+        {group.name}
+      </Select.Option>
+    ));
+    return (
+      <div className="user-search">
+        <Form
+          layout="inline"
+          name="basic"
+          initialValues={{
+            remember: true,
+          }}
+          onSubmit={(e) => {
+            this.handleSubmit(e)
+          }}
+        >
+          <Form.Item
+            label="订单编号"
+          >
+            {getFieldDecorator('orderNo', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: 200, height: 32 }} placeholder="请输入订单编号" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="合同编号"
+          >
+            {getFieldDecorator('contractNo', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: 200, height: 32 }} placeholder="请输入合同编号" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="客户名称"
+          >
+            {getFieldDecorator('userName', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: 200, height: 32 }} placeholder="请输入客户名称" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="部门"
+          >
+            <Cascaders
+              ref={node => this.Cascaders = node}
+              placeholder="订单部门"
+              id="id"
+              name="name"
+              children="list"
+              height={32}
+              onSel={(e) => {
+                this.setState({
+                  deps: JSON.stringify(e),
+                });
+              }}
+            />
+            {/* {getFieldDecorator('deps', {
                             rules: [{ required: false, message: '' }],
                         })(
                             <Select
@@ -228,96 +228,96 @@ class FilterColumn extends Component {
                                 }
                             </Select>
                         )} */}
-                    </Form.Item>
-                    <Form.Item
-                        label="发起人"
-                    >
-                        {getFieldDecorator('aname', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: 200, height: 32 }} placeholder="请输入发起人" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="财务名称"
-                    >
-                        {getFieldDecorator('financeName', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: 200, height: 32 }} placeholder="请输入财务名称" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="分类名称"
-                    >
-                        {getFieldDecorator('cname', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: 200, height: 32 }} placeholder="请输入分类名称" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="项目名称"
-                    >
-                        {getFieldDecorator('pname', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: 200, height: 32 }} placeholder="请输入项目名称" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="状态"
-                    >
-                        {getFieldDecorator('status', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Select
-                                placeholder="选择状态"
-                                style={{
-                                    width: 200,
-                                    height: 32,
-                                    marginTop: '0px',
-                                }}
-                            >
-                                <Select.Option value={0}>审核</Select.Option>
-                                <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>
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="咨询师/经理"
-                    >
-                        <AutoComplete
-                            dropdownMatchSelectWidth={false}
-                            style={{ width: 200, marginTop: 0 }}
-                            dataSource={options}
-                            placeholder='请输入姓名'
-                            value={this.state.auto}
-                            onChange={this.httpChange}
-                            filterOption={true}
-                            onBlur={this.blurChange}
-                            onSelect={this.selectAuto}
-                        >
-                            <Input />
-                        </AutoComplete>
-                    </Form.Item>
-                    <Form.Item>
-                        <Button type="primary" htmlType="submit" style={{ marginLeft: 10 }}>
-                            搜索
-                        </Button>
-                    </Form.Item>
-                    <Form.Item>
-                        <Button style={{ marginLeft: 10 }} onClick={this.handleReset}>
-                            重置
-                        </Button>
-                    </Form.Item>
-                </Form>
-            </div>
-        )
-    }
+          </Form.Item>
+          <Form.Item
+            label="发起人"
+          >
+            {getFieldDecorator('aname', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: 200, height: 32 }} placeholder="请输入发起人" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="财务名称"
+          >
+            {getFieldDecorator('financeName', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: 200, height: 32 }} placeholder="请输入财务名称" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="分类名称"
+          >
+            {getFieldDecorator('cname', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: 200, height: 32 }} placeholder="请输入分类名称" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="项目名称"
+          >
+            {getFieldDecorator('pname', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: 200, height: 32 }} placeholder="请输入项目名称" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="状态"
+          >
+            {getFieldDecorator('status', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Select
+                placeholder="选择状态"
+                style={{
+                  width: 200,
+                  height: 32,
+                  marginTop: '0px',
+                }}
+              >
+                <Select.Option value={0}>审核</Select.Option>
+                <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>
+            )}
+          </Form.Item>
+          <Form.Item
+            label="咨询师/经理"
+          >
+            <AutoComplete
+              dropdownMatchSelectWidth={false}
+              style={{ width: 200, marginTop: 0 }}
+              dataSource={options}
+              placeholder='请输入姓名'
+              value={this.state.auto}
+              onChange={this.httpChange}
+              filterOption={true}
+              onBlur={this.blurChange}
+              onSelect={this.selectAuto}
+            >
+              <Input />
+            </AutoComplete>
+          </Form.Item>
+          <Form.Item>
+            <Button type="primary" htmlType="submit" style={{ marginLeft: 10 }}>
+              搜索
+            </Button>
+          </Form.Item>
+          <Form.Item>
+            <Button style={{ marginLeft: 10 }} onClick={this.handleReset}>
+              重置
+            </Button>
+          </Form.Item>
+        </Form>
+      </div>
+    )
+  }
 }
 
 const WrappedNormalLoginForm = Form.create()(FilterColumn);

+ 187 - 187
js/component/manageCenter/order/orderNew/glCostAuditList/filterColumn.js

@@ -4,128 +4,128 @@ import $ from "jquery/src/ajax";
 import Cascaders from "../../../../common/cascaders"
 
 class FilterColumn extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            departmentArr: [],
-        }
-        this.handleReset = this.handleReset.bind(this);
-        this.departmentList = this.departmentList.bind(this);
+  constructor(props) {
+    super(props);
+    this.state = {
+      departmentArr: [],
     }
+    this.handleReset = this.handleReset.bind(this);
+    this.departmentList = this.departmentList.bind(this);
+  }
 
-    componentDidMount() {
-        // this.departmentList();
-    }
+  componentDidMount() {
+    // this.departmentList();
+  }
 
-    handleReset() {
-        this.state.deps = undefined
-        this.Cascaders.empty();
-        this.props.form.resetFields();
-        this.props.onResetSearch && this.props.onResetSearch();
-    }
+  handleReset() {
+    this.state.deps = undefined
+    this.Cascaders.empty();
+    this.props.form.resetFields();
+    this.props.onResetSearch && this.props.onResetSearch();
+  }
 
-    handleSubmit(e) {
-        e.preventDefault();
-        this.props.form.validateFieldsAndScroll((err, values) => {
-            if (err) {
-                return;
-            }
-            this.props.onSearch(Object.assign(values, { deps: this.state.deps }));
-        })
-    }
+  handleSubmit(e) {
+    e.preventDefault();
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      if (err) {
+        return;
+      }
+      this.props.onSearch(Object.assign(values, { deps: this.state.deps }));
+    })
+  }
 
-    //部门
-    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,
-                        });
-                    });
-                }
+  //部门
+  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)
+    );
+  }
+
+  render() {
+    const { getFieldDecorator } = this.props.form;
+    return (
+      <div className="user-search">
+        <Form
+          layout="inline"
+          name="basic"
+          initialValues={{
+            remember: true,
+          }}
+          onSubmit={(e) => {
+            this.handleSubmit(e)
+          }}
+        >
+          <Form.Item
+            label="订单编号"
+          >
+            {getFieldDecorator('orderNo', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入订单编号" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="合同编号"
+          >
+            {getFieldDecorator('contractNo', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入合同编号" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="客户名称"
+          >
+            {getFieldDecorator('userName', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入客户名称" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="部门"
+          >
+            <Cascaders
+              ref={node => this.Cascaders = node}
+              placeholder="订单部门"
+              id="id"
+              name="name"
+              children="list"
+              height={32}
+              onSel={(e) => {
                 this.setState({
-                    departmentArr: theArr,
+                  deps: JSON.stringify(e),
                 });
-            }.bind(this),
-        }).always(
-            function () {
-            }.bind(this)
-        );
-    }
-
-    render() {
-        const { getFieldDecorator } = this.props.form;
-        return (
-            <div className="user-search">
-                <Form
-                    layout="inline"
-                    name="basic"
-                    initialValues={{
-                        remember: true,
-                    }}
-                    onSubmit={(e) => {
-                        this.handleSubmit(e)
-                    }}
-                >
-                    <Form.Item
-                        label="合同编号"
-                    >
-                        {getFieldDecorator('contractNo', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入合同编号" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="订单编号"
-                    >
-                        {getFieldDecorator('orderNo', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入订单编号" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="客户名称"
-                    >
-                        {getFieldDecorator('userName', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入客户名称" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="部门"
-                    >
-                        <Cascaders
-                            ref={node => this.Cascaders = node}
-                            placeholder="订单部门"
-                            id="id"
-                            name="name"
-                            children="list"
-                            height={32}
-                            onSel={(e) => {
-                                this.setState({
-                                    deps: JSON.stringify(e),
-                                });
-                            }}
-                        />
-                        {/* {getFieldDecorator('depId', {
+              }}
+            />
+            {/* {getFieldDecorator('depId', {
                             rules: [{ required: false, message: '' }],
                         })(
                             <Select placeholder="请选择部门" style={{
@@ -140,78 +140,78 @@ class FilterColumn extends Component {
                             </Select>
                         )} */}
 
-                    </Form.Item>
-                    <Form.Item
-                        label="发起人"
-                    >
-                        {getFieldDecorator('aname', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入发起人" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="财务名称"
-                    >
-                        {getFieldDecorator('financeName', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入财务名称" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="分类名称"
-                    >
-                        {getFieldDecorator('cname', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入分类名称" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="项目名称"
-                    >
-                        {getFieldDecorator('pname', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入项目名称" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="状态"
-                    >
-                        {getFieldDecorator('status', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Select
-                                placeholder="选择状态"
-                                style={{
-                                    width: '200px',
-                                    marginTop: '0px',
-                                }}
-                            >
-                                <Select.Option value={0}>审核</Select.Option>
-                                <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>
-                        )}
-                    </Form.Item>
-                    <Form.Item>
-                        <Button type="primary" htmlType="submit" style={{ marginLeft: 10 }}>
-                            搜索
-                        </Button>
-                    </Form.Item>
-                    <Form.Item>
-                        <Button style={{ marginLeft: 10 }} onClick={this.handleReset}>
-                            重置
-                        </Button>
-                    </Form.Item>
-                </Form>
-            </div>
-        )
-    }
+          </Form.Item>
+          <Form.Item
+            label="发起人"
+          >
+            {getFieldDecorator('aname', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入发起人" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="状态"
+          >
+            {getFieldDecorator('status', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Select
+                placeholder="选择状态"
+                style={{
+                  width: '200px',
+                  marginTop: '0px',
+                }}
+              >
+                <Select.Option value={0}>审核</Select.Option>
+                <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>
+            )}
+          </Form.Item>
+          <Form.Item
+            label="分类名称"
+          >
+            {getFieldDecorator('cname', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入分类名称" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="项目名称"
+          >
+            {getFieldDecorator('pname', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入项目名称" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="财务名称"
+          >
+            {getFieldDecorator('financeName', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入财务名称" />
+            )}
+          </Form.Item>
+          <Form.Item>
+            <Button type="primary" htmlType="submit" style={{ marginLeft: 10 }}>
+              搜索
+            </Button>
+          </Form.Item>
+          <Form.Item>
+            <Button style={{ marginLeft: 10 }} onClick={this.handleReset}>
+              重置
+            </Button>
+          </Form.Item>
+        </Form>
+      </div>
+    )
+  }
 }
 
 const WrappedNormalLoginForm = Form.create()(FilterColumn);

+ 424 - 424
js/component/manageCenter/order/orderNew/glCostAuditList/index.js

@@ -1,10 +1,10 @@
 import React, { Component } from 'react';
 import $ from "jquery/src/ajax";
 import {
-    Spin,
-    Table,
-    message,
-    Tooltip, Tabs, Button, Modal
+  Spin,
+  Table,
+  message,
+  Tooltip, Tabs, Button, Modal
 } from "antd";
 import { ShowModal, getProjectName } from "@/tools";
 import FilterColumn from './filterColumn';
@@ -18,438 +18,438 @@ import { ChooseList } from "../chooseList";
 const { TabPane } = Tabs;
 
 class CostAuditList extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            loading: true,
-            columns: [
-                {
-                    title: "支付编号",
-                    dataIndex: "key",
-                    key: "key",
-                },
-                {
-                    title: "项目编号",
-                    dataIndex: "tid",
-                    key: "tid",
-                },
-                {
-                    title: "项目名称",
-                    dataIndex: "pname",
-                    key: "pname",
-                },
-                {
-                    title: "项目状态",
-                    dataIndex: "projectStatus",
-                    key: "projectStatus",
-                    render: (text) => {
-                        return getProjectName(text);
-                    },
-                },
-                {
-                    title: "分类名称",
-                    dataIndex: "cname",
-                    key: "cname",
-                },
-                {
-                    title: "合同编号",
-                    dataIndex: "contractNo",
-                    key: "contractNo",
-                },
-                {
-                    title: "订单编号",
-                    dataIndex: "orderNo",
-                    key: "orderNo",
-                },
-                {
-                    title: "客户名称",
-                    dataIndex: "userName",
-                    key: "userName",
-                    width: 150,
-                    render: (text) => {
-                        return (
-                            <Tooltip placement="bottom" title={text}>
-                                <div style={{
-                                    maxWidth: '150px',
-                                    overflow: 'hidden',
-                                    textOverflow: "ellipsis",
-                                    whiteSpace: 'nowrap',
-                                }}>{text}</div>
-                            </Tooltip>
-                        )
-                    },
-                },
-                {
-                    title: "部门名称",
-                    dataIndex: "depName",
-                    key: "depName",
-                    render: (text) => {
-                        return (
-                            <Tooltip placement="bottom" title={text && text.length > 9 ? text : ''}>
-                                {text && text.length > 9 ? text.substr(0, 9) + "..." : text}
-                            </Tooltip>
-                        )
-                    },
-                },
-                // {
-                //     title: "实际总付款",
-                //     dataIndex: "costAmount",
-                //     key: "costAmount",
-                // },
-                {
-                    title: "付款类型",
-                    dataIndex: "chooseType",
-                    key: "chooseType",
-                    render: (text) => {
-                        return text == 0 ? '第三方成本' :
-                            text == 1 ? '催款节点' : '官费';
-                    },
-                },
-                {
-                    title: "本次申请金额",
-                    dataIndex: "applicationAmount",
-                    key: "applicationAmount",
-                    render: (text) => {
-                        return isNaN(parseFloat(text)) ? text : parseFloat(text);
-                    }
-                },
-                {
-                    title: "已支付",
-                    dataIndex: "paymentAmount",
-                    key: "paymentAmount",
-                    render: (text) => {
-                        return isNaN(parseFloat(text)) ? text : parseFloat(text);
-                    },
-                },
-                {
-                    title: "供应商",
-                    dataIndex: "companyName",
-                    key: "companyName",
-                },
-                {
-                    title: "申请人",
-                    dataIndex: "aname",
-                    key: "aname",
-                },
-                {
-                    title: "财务名称",
-                    dataIndex: "financeName",
-                    key: "financeName",
-                },
-                {
-                    title: "状态",
-                    dataIndex: "status",
-                    key: "status",
-                    render: (text) => {
-                        return text === 0 ? '审核' :
-                            text === 1 ? '待支付' :
-                                text === 2 ? '驳回' :
-                                    text === 3 ? '已支付' :
-                                        text === 4 ? '已取消' : '';
-                    },
-                },
-                {
-                    title: "创建时间",
-                    dataIndex: "createTime",
-                    key: "createTime",
-                },
-                {
-                    title: '操作',
-                    dataIndex: 'action',
-                    key: 'action',
-                    render: (text, record) => {
-                        return (
-                            <div style={{
-                                display: 'flex',
-                                alignItems: 'center',
-                            }}>
-                                <Button type="primary" size="small" onClick={(e) => {
-                                    e.stopPropagation();
-                                    this.setState({
-                                        payRecordVisible: true,
-                                        orderPaymentsId: record.id,
-                                        tid: record.tid,
-                                        projectType: record.projectType,
-                                    })
-                                }}>
-                                    {
-                                        record.status === 0 ? '待审核' :
-                                            record.status === 1 ? '待支付' :
-                                                record.status === 2 ? '查看详情' : '查看详情'
-                                    }
-                                </Button>
-                                <Button
-                                    type="primary"
-                                    style={{
-                                        marginLeft: "10px",
-                                        background: "orangered",
-                                        border: "none"
-                                    }}
-                                    size="small"
-                                    onClick={(e) => {
-                                        e.stopPropagation();
-                                        this.setState({
-                                            paymentVisible: true,
-                                            tid: record.tid,
-                                            projectType: record.projectType,
-                                        })
-                                    }}>
-                                    付款记录
-                                </Button>
-                            </div>
-                        )
-                    }
-                }
-            ],
-            dataSource: [],
-            selectedRowKeys: [],
-            pagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.loadData(page, this.state.searchInfor);
-                }.bind(this),
-                showTotal: function (total) {
-                    return "共" + total + "条数据";
-                },
-            },
-            page: 1,
-            selectInfor: {},
-            visible: false,
-            paymentVisible: false,
-            tid: 0,
-            projectType: 0,
-            payRecordVisible: false,
-            orderPaymentsId: 0,
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: true,
+      columns: [
+        {
+          title: "支付编号",
+          dataIndex: "key",
+          key: "key",
+        },
+        {
+          title: "项目编号",
+          dataIndex: "tid",
+          key: "tid",
+        },
+        {
+          title: "项目名称",
+          dataIndex: "pname",
+          key: "pname",
+        },
+        {
+          title: "项目状态",
+          dataIndex: "projectStatus",
+          key: "projectStatus",
+          render: (text) => {
+            return getProjectName(text);
+          },
+        },
+        {
+          title: "分类名称",
+          dataIndex: "cname",
+          key: "cname",
+        },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo",
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo",
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName",
+          width: 150,
+          render: (text) => {
+            return (
+              <Tooltip placement="bottom" title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
+            )
+          },
+        },
+        {
+          title: "部门名称",
+          dataIndex: "depName",
+          key: "depName",
+          render: (text) => {
+            return (
+              <Tooltip placement="bottom" title={text && text.length > 9 ? text : ''}>
+                {text && text.length > 9 ? text.substr(0, 9) + "..." : text}
+              </Tooltip>
+            )
+          },
+        },
+        // {
+        //     title: "实际总付款",
+        //     dataIndex: "costAmount",
+        //     key: "costAmount",
+        // },
+        {
+          title: "付款类型",
+          dataIndex: "chooseType",
+          key: "chooseType",
+          render: (text) => {
+            return text == 0 ? '第三方成本' :
+              text == 1 ? '催款节点' : '官费';
+          },
+        },
+        {
+          title: "本次申请金额",
+          dataIndex: "applicationAmount",
+          key: "applicationAmount",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
+        },
+        {
+          title: "已支付",
+          dataIndex: "paymentAmount",
+          key: "paymentAmount",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          },
+        },
+        {
+          title: "供应商",
+          dataIndex: "companyName",
+          key: "companyName",
+        },
+        {
+          title: "申请人",
+          dataIndex: "aname",
+          key: "aname",
+        },
+        {
+          title: "财务名称",
+          dataIndex: "financeName",
+          key: "financeName",
+        },
+        {
+          title: "状态",
+          dataIndex: "status",
+          key: "status",
+          render: (text) => {
+            return text === 0 ? '审核' :
+              text === 1 ? '待支付' :
+                text === 2 ? '驳回' :
+                  text === 3 ? '已支付' :
+                    text === 4 ? '已取消' : '';
+          },
+        },
+        {
+          title: "创建时间",
+          dataIndex: "createTime",
+          key: "createTime",
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          key: 'action',
+          render: (text, record) => {
+            return (
+              <div style={{
+                display: 'flex',
+                alignItems: 'center',
+              }}>
+                <Button type="primary" size="small" onClick={(e) => {
+                  e.stopPropagation();
+                  this.setState({
+                    payRecordVisible: true,
+                    orderPaymentsId: record.id,
+                    tid: record.tid,
+                    projectType: record.projectType,
+                  })
+                }}>
+                  {
+                    record.status === 0 ? '待审核' :
+                      record.status === 1 ? '待支付' :
+                        record.status === 2 ? '查看详情' : '查看详情'
+                  }
+                </Button>
+                <Button
+                  type="primary"
+                  style={{
+                    marginLeft: "10px",
+                    background: "orangered",
+                    border: "none"
+                  }}
+                  size="small"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    this.setState({
+                      paymentVisible: true,
+                      tid: record.tid,
+                      projectType: record.projectType,
+                    })
+                  }}>
+                  付款记录
+                </Button>
+              </div>
+            )
+          }
         }
-        this.exportExec = this.exportExec.bind(this);
-        this.changeList = this.changeList.bind(this);
+      ],
+      dataSource: [],
+      selectedRowKeys: [],
+      pagination: {
+        defaultCurrent: 1,
+        defaultPageSize: 10,
+        showQuickJumper: true,
+        pageSize: 10,
+        onChange: function (page) {
+          this.loadData(page, this.state.searchInfor);
+        }.bind(this),
+        showTotal: function (total) {
+          return "共" + total + "条数据";
+        },
+      },
+      page: 1,
+      selectInfor: {},
+      visible: false,
+      paymentVisible: false,
+      tid: 0,
+      projectType: 0,
+      payRecordVisible: false,
+      orderPaymentsId: 0,
     }
+    this.exportExec = this.exportExec.bind(this);
+    this.changeList = this.changeList.bind(this);
+  }
 
-    componentDidMount() {
-        this.loadData()
-    }
+  componentDidMount() {
+    this.loadData()
+  }
 
-    loadData(pageNo, data = {}) {
+  loadData(pageNo, data = {}) {
+    this.setState({
+      loading: true,
+    });
+    data.pageNo = pageNo || 1;
+    data.pageSize = this.state.pagination.pageSize;
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/company/selectPaymentList",
+      data: data,
+      success: function (data) {
+        ShowModal(this);
+        let theArr = [];
+        if (data.error.length || data.data.list == "") {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.setState({
+            page: data.data.pageNo
+          });
+          for (let i = 0; i < data.data.list.length; i++) {
+            let thisdata = data.data.list[i];
+            let obj = thisdata;
+            obj.key = thisdata.id;
+            theArr.push(obj);
+          }
+          this.state.pagination.total = data.data.totalCount;
+        }
+        this.state.pagination.current = data.data.pageNo;
+        this.state.pagination.total = data.data.totalCount;
+        if (data.data && data.data.list && !data.data.list.length) {
+          this.state.pagination.current = 0;
+          this.state.pagination.total = 0;
+        }
         this.setState({
-            loading: true,
+          dataSource: theArr,
+          pagination: this.state.pagination,
         });
-        data.pageNo = pageNo || 1;
-        data.pageSize = this.state.pagination.pageSize;
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/company/selectPaymentList",
-            data: data,
-            success: function (data) {
-                ShowModal(this);
-                let theArr = [];
-                if (data.error.length || data.data.list == "") {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    }
-                } else {
-                    this.setState({
-                        page: data.data.pageNo
-                    });
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
-                        let obj = thisdata;
-                        obj.key = thisdata.id;
-                        theArr.push(obj);
-                    }
-                    this.state.pagination.total = data.data.totalCount;
-                }
-                this.state.pagination.current = data.data.pageNo;
-                this.state.pagination.total = data.data.totalCount;
-                if (data.data && data.data.list && !data.data.list.length) {
-                    this.state.pagination.current = 0;
-                    this.state.pagination.total = 0;
-                }
-                this.setState({
-                    dataSource: theArr,
-                    pagination: this.state.pagination,
-                });
-            }.bind(this),
-        }).always(
-            function () {
-                this.setState({
-                    loading: false,
-                });
-            }.bind(this)
-        );
-    }
-
-    tableRowClick(record) {
+      }.bind(this),
+    }).always(
+      function () {
         this.setState({
-            visible: true,
-            selectInfor: record,
-        })
-    }
+          loading: false,
+        });
+      }.bind(this)
+    );
+  }
 
-    //导出
-    exportExec() {
-        let data = Object.assign({}, this.state.searchInfor);
-        for (let key in data) {
-            if (!data[key]) {
-                delete data[key]
-            }
-        }
-        data.pageSize = 9999999;
-        data.pageNo = 1;
-        window.location.href = (globalConfig.context + '/api/admin/company/exportPaymentList?' + $.param(data));
-    }
+  tableRowClick(record) {
+    this.setState({
+      visible: true,
+      selectInfor: record,
+    })
+  }
 
-    changeList(arr) {
-        const newArr = [];
-        this.state.columns.forEach(item => {
-            arr.forEach(val => {
-                if (val === item.title) {
-                    newArr.push(item);
-                }
-            });
-        });
-        this.setState({
-            changeList: newArr
-        });
+  //导出
+  exportExec() {
+    let data = Object.assign({}, this.state.searchInfor);
+    for (let key in data) {
+      if (!data[key]) {
+        delete data[key]
+      }
     }
+    data.pageSize = 9999999;
+    data.pageNo = 1;
+    window.location.href = (globalConfig.context + '/api/admin/company/exportPaymentList?' + $.param(data));
+  }
+
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  }
 
-    render() {
-        return (
-            <div className="user-content">
-                <div className="content-title" style={{ marginBottom: 10 }}>
-                    <span style={{ fontWeight: 900, fontSize: 16 }}>成本付款申请</span>
-                </div>
-                <Tabs defaultActiveKey="1" className="test">
-                    <TabPane tab="搜索" key="1">
-                        <div style={{ paddingTop: '10px' }}>
-                            <FilterColumn
-                                {...this.props}
-                                onSearch={(data) => {
-                                    this.setState({
-                                        searchInfor: data
-                                    });
-                                    this.loadData(1, data);
-                                }}
-                                onResetSearch={() => {
-                                    this.setState({
-                                        searchInfor: {}
-                                    });
-                                    this.loadData();
-                                }}
-                            />
-                        </div>
-                    </TabPane>
-                    <TabPane tab="操作" key="2">
-                        <Button
-                            type="primary"
-                            onClick={this.exportExec}
-                            style={{ margin: "11px 0px 10px 10px" }}
-                        >
-                            导出财务成本列表
-                        </Button>
-                    </TabPane>
-                    <TabPane tab="更改表格显示数据" key="3">
-                        <div style={{ marginLeft: 10 }}>
-                            <ChooseList
-                                columns={this.state.columns}
-                                changeFn={this.changeList}
-                                changeList={this.state.changeList}
-                                top={55}
-                                margin={11}
-                            />
-                        </div>
-                    </TabPane>
-                </Tabs>
-                <div className="patent-table">
-                    <Spin spinning={this.state.loading}>
-                        <Table
-                            columns={
-                                this.state.changeList
-                                    ? this.state.changeList
-                                    : this.state.columns
-                            }
-                            dataSource={this.state.dataSource}
-                            pagination={this.state.pagination}
-                            onRowClick={(record) => {
-                                this.tableRowClick(record)
-                            }}
-                            style={{
-                                cursor: 'pointer',
-                            }}
-                            scroll={{ x: "max-content", y: 0 }}
-                            bordered
-                            size="small"
-                        />
-                    </Spin>
-                </div>
-                {
-                    this.state.visible ?
-                        <DetailsModal
-                            tid={this.state.selectInfor.tid}
-                            orderNo={this.state.selectInfor.orderNo}
-                            projectType={this.state.selectInfor.projectType}
-                            projectStatus={this.state.selectInfor.projectStatus}
-                            taskName={this.state.selectInfor.pname}
-                            taskID={this.state.selectInfor.tid}
-                            visible={this.state.visible}
-                            refreshList={() => {
-                                this.loadData(this.state.page, this.state.searchInfor);
-                            }}
-                            visitCancel={() => {
-                                this.setState({
-                                    visible: false
-                                })
-                                this.loadData(this.state.page, this.state.searchInfor);
-                            }} /> : <div />
-                }
-                {this.state.paymentVisible ?
-                    <OrderPaymentModal
-                        tid={this.state.tid}
-                        visible={this.state.paymentVisible}
-                        projectType={this.state.projectType}
-                        isAuditPaymentGLY={true}
-                        onCancer={() => {
-                            this.setState({
-                                paymentVisible: false,
-                                tid: 0,
-                                projectType: 0,
-                            });
-                            this.loadData(this.state.page, this.state.searchInfor);
-                        }}
-                        onSuccess={() => {
-                            this.setState({
-                                paymentVisible: false,
-                                tid: 0,
-                                projectType: 0,
-                            });
-                            this.loadData(this.state.page, this.state.searchInfor);
-                        }} /> :
-                    <div />
-                }
-                {this.state.payRecordVisible ? <PayRecord
-                    {...this.props}
-                    payId={this.state.orderPaymentsId}
-                    visible={this.state.payRecordVisible}
-                    tid={this.state.tid}
-                    isAuditPaymentGLY={true}
-                    projectType={this.state.projectType}
-                    changeVisible={() => {
-                        this.loadData(this.state.page, this.state.searchInfor);
-                        this.setState({
-                            payRecordVisible: false,
-                            orderPaymentsId: 0,
-                            tid: 0,
-                            projectType: 0,
-                        })
-                    }}
-                /> : <div />}
+  render() {
+    return (
+      <div className="user-content">
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>成本付款申请</span>
+        </div>
+        <Tabs defaultActiveKey="1" className="test">
+          <TabPane tab="搜索" key="1">
+            <div style={{ paddingTop: 10, paddingLeft: 10 }}>
+              <FilterColumn
+                {...this.props}
+                onSearch={(data) => {
+                  this.setState({
+                    searchInfor: data
+                  });
+                  this.loadData(1, data);
+                }}
+                onResetSearch={() => {
+                  this.setState({
+                    searchInfor: {}
+                  });
+                  this.loadData();
+                }}
+              />
             </div>
-        );
-    }
+          </TabPane>
+          <TabPane tab="操作" key="2">
+            <Button
+              type="primary"
+              onClick={this.exportExec}
+              style={{ margin: "11px 0px 10px 10px" }}
+            >
+              导出财务成本列表
+            </Button>
+          </TabPane>
+          <TabPane tab="更改表格显示数据" key="3">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                columns={this.state.columns}
+                changeFn={this.changeList}
+                changeList={this.state.changeList}
+                top={55}
+                margin={11}
+              />
+            </div>
+          </TabPane>
+        </Tabs>
+        <div className="patent-table">
+          <Spin spinning={this.state.loading}>
+            <Table
+              columns={
+                this.state.changeList
+                  ? this.state.changeList
+                  : this.state.columns
+              }
+              dataSource={this.state.dataSource}
+              pagination={this.state.pagination}
+              onRowClick={(record) => {
+                this.tableRowClick(record)
+              }}
+              style={{
+                cursor: 'pointer',
+              }}
+              scroll={{ x: "max-content", y: 0 }}
+              bordered
+              size="small"
+            />
+          </Spin>
+        </div>
+        {
+          this.state.visible ?
+            <DetailsModal
+              tid={this.state.selectInfor.tid}
+              orderNo={this.state.selectInfor.orderNo}
+              projectType={this.state.selectInfor.projectType}
+              projectStatus={this.state.selectInfor.projectStatus}
+              taskName={this.state.selectInfor.pname}
+              taskID={this.state.selectInfor.tid}
+              visible={this.state.visible}
+              refreshList={() => {
+                this.loadData(this.state.page, this.state.searchInfor);
+              }}
+              visitCancel={() => {
+                this.setState({
+                  visible: false
+                })
+                this.loadData(this.state.page, this.state.searchInfor);
+              }} /> : <div />
+        }
+        {this.state.paymentVisible ?
+          <OrderPaymentModal
+            tid={this.state.tid}
+            visible={this.state.paymentVisible}
+            projectType={this.state.projectType}
+            isAuditPaymentGLY={true}
+            onCancer={() => {
+              this.setState({
+                paymentVisible: false,
+                tid: 0,
+                projectType: 0,
+              });
+              this.loadData(this.state.page, this.state.searchInfor);
+            }}
+            onSuccess={() => {
+              this.setState({
+                paymentVisible: false,
+                tid: 0,
+                projectType: 0,
+              });
+              this.loadData(this.state.page, this.state.searchInfor);
+            }} /> :
+          <div />
+        }
+        {this.state.payRecordVisible ? <PayRecord
+          {...this.props}
+          payId={this.state.orderPaymentsId}
+          visible={this.state.payRecordVisible}
+          tid={this.state.tid}
+          isAuditPaymentGLY={true}
+          projectType={this.state.projectType}
+          changeVisible={() => {
+            this.loadData(this.state.page, this.state.searchInfor);
+            this.setState({
+              payRecordVisible: false,
+              orderPaymentsId: 0,
+              tid: 0,
+              projectType: 0,
+            })
+          }}
+        /> : <div />}
+      </div>
+    );
+  }
 }
 
 export default CostAuditList

+ 12 - 12
js/component/manageCenter/order/orderNew/myprojectvip.jsx

@@ -594,6 +594,18 @@ const MyProjectVip = React.createClass({
                 }}
               />
               <Input
+                placeholder="合同编号"
+                value={searchValues["contractNo"]
+                  ? searchValues["contractNo"]
+                  : ""}
+                onChange={(e) => {
+                  searchValues["contractNo"] = e.target.value;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              />
+              <Input
                 placeholder="客户名称"
                 value={searchValues["userName"]
                   ? searchValues["userName"]
@@ -638,18 +650,6 @@ const MyProjectVip = React.createClass({
                   );
                 })}
               </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"

+ 13 - 13
js/component/manageCenter/order/orderNew/mysuspend.jsx

@@ -418,6 +418,19 @@ const MySuspendList = React.createClass({
                 }}
               />
               <Input
+                placeholder="合同编号"
+                style={{ width: 160 }}
+                value={searchValues["contractNo"]
+                  ? searchValues["contractNo"]
+                  : ""}
+                onChange={(e) => {
+                  searchValues["contractNo"] = e.target.value;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              />
+              <Input
                 placeholder="客户名称"
                 style={{ width: 160 }}
                 value={searchValues["userName"]
@@ -445,19 +458,6 @@ const MySuspendList = React.createClass({
                 }}
               />
               <Input
-                placeholder="合同编号"
-                style={{ width: 160 }}
-                value={searchValues["contractNo"]
-                  ? searchValues["contractNo"]
-                  : ""}
-                onChange={(e) => {
-                  searchValues["contractNo"] = e.target.value;
-                  this.setState({
-                    searchValues: searchValues,
-                  });
-                }}
-              />
-              <Input
                 placeholder="项目名称"
                 style={{ width: 160 }}
                 value={searchValues["projectName"]

+ 57 - 60
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -1544,8 +1544,8 @@ const outsourcingList = Form.create()(
             ""
           )}
           <ShowModalDiv ShowModal={this.state.showModal} />
-          <div className="content-title">
-            <span>外包订单列表</span>
+          <div className="content-title" style={{ marginBottom: 10 }}>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>外包订单列表</span>
           </div>
           <div className="user-search">
             <Tabs
@@ -1554,64 +1554,61 @@ const outsourcingList = Form.create()(
               className="test"
             >
               <TabPane tab="搜索" key="1">
-                <Input
-                  placeholder="客户名称"
-                  style={{
-                    width: "150px",
-                    marginBottom: "10px",
-                    marginLeft: 10,
-                    marginRight: 10,
-                  }}
-                  value={this.state.nameSearch}
-                  onChange={(e) => {
-                    this.setState({ nameSearch: e.target.value });
-                  }}
-                />
-                <Input
-                  placeholder="合同编号"
-                  style={{ width: "150px" }}
-                  value={this.state.contractNoSearch}
-                  onChange={(e) => {
-                    this.setState({ contractNoSearch: e.target.value });
-                  }}
-                />
-                <span style={{ marginRight: "10px" }}>下单时间 :</span>
-                <RangePicker
-                  value={[
-                    this.state.releaseDate[0]
-                      ? moment(this.state.releaseDate[0])
-                      : null,
-                    this.state.releaseDate[1]
-                      ? moment(this.state.releaseDate[1])
-                      : null,
-                  ]}
-                  onChange={(data, dataString) => {
-                    this.setState({ releaseDate: dataString });
-                  }}
-                />
-
-                <Select
-                  value={this.state.refundStatusSearch}
-                  style={{ width: 150, marginLeft: "10px" }}
-                  onChange={(e) => {
-                    this.setState({
-                      refundStatusSearch: e,
-                    });
-                  }}
-                  placeholder="审核状态"
-                >
-                  <Option value={0}>待审核</Option>
-                  <Option value={1}>审核通过</Option>
-                  <Option value={2}>审核驳回</Option>
-                </Select>
-                <Button
-                  type="primary"
-                  onClick={this.search}
-                  style={{ marginLeft: "10px", marginRight: 10 }}
-                >
-                  搜索
-                </Button>
-                <Button onClick={this.reset}>重置</Button>
+                <div style={{ marginLeft: 10, marginRight: 10, }}>
+                  <Input
+                    placeholder="合同编号"
+                    style={{ width: 150, marginRight: 10 }}
+                    value={this.state.contractNoSearch}
+                    onChange={(e) => {
+                      this.setState({ contractNoSearch: e.target.value });
+                    }}
+                  />
+                  <Input
+                    placeholder="客户名称"
+                    style={{ width: 150, marginRight: 10 }}
+                    value={this.state.nameSearch}
+                    onChange={(e) => {
+                      this.setState({ nameSearch: e.target.value });
+                    }}
+                  />
+                  <span style={{ marginRight: "10px" }}>下单时间 :</span>
+                  <RangePicker
+                    style={{ marginRight: 10 }}
+                    value={[
+                      this.state.releaseDate[0]
+                        ? moment(this.state.releaseDate[0])
+                        : null,
+                      this.state.releaseDate[1]
+                        ? moment(this.state.releaseDate[1])
+                        : null,
+                    ]}
+                    onChange={(data, dataString) => {
+                      this.setState({ releaseDate: dataString });
+                    }}
+                  />
+                  <Select
+                    value={this.state.refundStatusSearch}
+                    style={{ width: 150, marginRight: 10 }}
+                    onChange={(e) => {
+                      this.setState({
+                        refundStatusSearch: e,
+                      });
+                    }}
+                    placeholder="审核状态"
+                  >
+                    <Option value={0}>待审核</Option>
+                    <Option value={1}>审核通过</Option>
+                    <Option value={2}>审核驳回</Option>
+                  </Select>
+                  <Button
+                    type="primary"
+                    onClick={this.search}
+                    style={{ marginRight: 10 }}
+                  >
+                    搜索
+                  </Button>
+                  <Button onClick={this.reset}>重置</Button>
+                </div>
               </TabPane>
               <TabPane tab="更改表格显示数据" key="ChooseList">
                 <div style={{ marginLeft: 10 }}>

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

@@ -488,13 +488,21 @@ const IntentionCustomer = Form.create()(React.createClass({
           <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
             <TabPane tab="搜索" key="1">
               <Input
-                placeholder="客户名称"
+                placeholder="订单编号"
                 style={{
                   width: "150px",
                   marginBottom: "10px",
                   marginLeft: 10,
                   marginRight: 10,
                 }}
+                value={this.state.orderNo}
+                onChange={(e) => {
+                  this.setState({ orderNo: e.target.value });
+                }}
+              />
+              <Input
+                placeholder="客户名称"
+                style={{ width: "150px", marginRight: 10 }}
                 value={this.state.customerName}
                 onChange={(e) => {
                   this.setState({ customerName: e.target.value });
@@ -512,14 +520,6 @@ const IntentionCustomer = Form.create()(React.createClass({
                   this.setState({ adminName: e.target.value });
                 }}
               />
-              <Input
-                placeholder="订单编号"
-                style={{ width: "150px", marginRight: 10 }}
-                value={this.state.orderNo}
-                onChange={(e) => {
-                  this.setState({ orderNo: e.target.value });
-                }}
-              />
               <Cascaders
                 ref={node => this.Cascaders = node}
                 placeholder="订单部门"

+ 24 - 31
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -258,7 +258,7 @@ const IntentionCustomer = Form.create()(
             title: "客户名称",
             dataIndex: "userName",
             key: "userName",
-            width: 150,
+            width: 160,
             render: (text) => {
               return (
                 <Tooltip title={text}>
@@ -668,51 +668,43 @@ const IntentionCustomer = Form.create()(
             <TabPane tab="搜索" key="1">
               <div className="user-search" style={{ padding: "0 10px" }}>
                 <Input
-                  placeholder="客户名称"
+                  placeholder="订单编号"
                   style={{
-                    width: 170,
-                    marginBottom: 10,
-                    marginRight: 15,
+                    width: 160,
                   }}
-                  value={this.state.customerName}
+                  value={this.state.orderNo}
                   onChange={(e) => {
-                    this.setState({ customerName: e.target.value });
+                    this.setState({ orderNo: e.target.value });
                   }}
                 />
                 <Input
-                  placeholder="营销员名称"
+                  placeholder="合同编号"
                   style={{
-                    width: 170,
-                    marginBottom: 10,
-                    marginRight: 15,
+                    width: 160,
                   }}
-                  value={this.state.adminName}
+                  value={this.state.contractNo}
                   onChange={(e) => {
-                    this.setState({ adminName: e.target.value });
+                    this.setState({ contractNo: e.target.value });
                   }}
                 />
                 <Input
-                  placeholder="订单编号"
+                  placeholder="客户名称"
                   style={{
-                    width: 170,
-                    marginBottom: 10,
-                    marginRight: 15,
+                    width: 160,
                   }}
-                  value={this.state.orderNo}
+                  value={this.state.customerName}
                   onChange={(e) => {
-                    this.setState({ orderNo: e.target.value });
+                    this.setState({ customerName: e.target.value });
                   }}
                 />
                 <Input
-                  placeholder="合同编号"
+                  placeholder="营销员名称"
                   style={{
-                    width: 170,
-                    marginBottom: 10,
-                    marginRight: 15,
+                    width: 160,
                   }}
-                  value={this.state.contractNo}
+                  value={this.state.adminName}
                   onChange={(e) => {
-                    this.setState({ contractNo: e.target.value });
+                    this.setState({ adminName: e.target.value });
                   }}
                 />
                 <Cascaders
@@ -736,7 +728,7 @@ const IntentionCustomer = Form.create()(
                 /> */}
                 <Select
                   placeholder="选择催款节点类型"
-                  style={{ width: 170, marginRight: 15, marginLeft: 5 }}
+                  style={{ width: 160, marginRight: 10, marginLeft: 5 }}
                   value={
                     this.state.newStatus == 0 ? "旧催款节点" : "新催款节点"
                   }
@@ -748,7 +740,7 @@ const IntentionCustomer = Form.create()(
                   <Select.Option key={1}>{"新催款节点"}</Select.Option>
                 </Select>
                 <Select
-                  style={{ width: 170, marginRight: 15 }}
+                  style={{ width: 160, marginRight: 10 }}
                   placeholder="签单金额"
                   value={this.state.amountStatus}
                   onChange={(e) => {
@@ -764,7 +756,7 @@ const IntentionCustomer = Form.create()(
                   <Option value="4">40万元以上</Option>
                 </Select>
                 <Select
-                  style={{ width: 170, marginRight: 15 }}
+                  style={{ width: 160, marginRight: 10 }}
                   placeholder="特批状态"
                   value={this.state.approval}
                   onChange={(e) => {
@@ -779,7 +771,7 @@ const IntentionCustomer = Form.create()(
                   <Option value="4">全部特批</Option>
                 </Select>
                 <Select
-                  style={{ width: 170, marginRight: 15 }}
+                  style={{ width: 160, marginRight: 10 }}
                   placeholder="会员"
                   value={this.state.memberType}
                   onChange={(e) => {
@@ -791,8 +783,9 @@ const IntentionCustomer = Form.create()(
                   <Option value="0">否</Option>
                   <Option value="1">是</Option>
                 </Select>
-                <span style={{ marginRight: 15, }}>下单时间 :</span>
+                <span style={{ marginRight: 10, }}>下单时间 :</span>
                 <RangePicker
+                  style={{ width: 200 }}
                   value={[
                     this.state.releaseDate[0]
                       ? moment(this.state.releaseDate[0])
@@ -808,7 +801,7 @@ const IntentionCustomer = Form.create()(
                 <Button
                   type="primary"
                   onClick={this.search}
-                  style={{ marginLeft: 15, marginRight: 15, marginBottom: 10 }}
+                  style={{ marginLeft: 10, marginRight: 10 }}
                 >
                   搜索
                 </Button>

+ 46 - 44
js/component/manageCenter/order/orderNew/reject.jsx

@@ -2116,50 +2116,52 @@ const IntentionCustomer = Form.create()(
               className="test"
             >
               <TabPane tab="搜索" key="1">
-                <Input
-                  placeholder="客户名称"
-                  style={{
-                    width: "150px",
-                    marginBottom: "10px",
-                    marginTop: 10,
-                    marginLeft: 10,
-                    marginRight: 10,
-                  }}
-                  value={this.state.customerName}
-                  onChange={(e) => {
-                    this.setState({ customerName: e.target.value });
-                  }}
-                />
-                <Input
-                  placeholder="订单编号"
-                  style={{ width: "150px", marginRight: 10 }}
-                  value={this.state.orderNoSearch}
-                  onChange={(e) => {
-                    this.setState({ orderNoSearch: e.target.value });
-                  }}
-                />
-                <span style={{ marginRight: "10px" }}>下单时间 :</span>
-                <RangePicker
-                  value={[
-                    this.state.releaseDate[0]
-                      ? moment(this.state.releaseDate[0])
-                      : null,
-                    this.state.releaseDate[1]
-                      ? moment(this.state.releaseDate[1])
-                      : null,
-                  ]}
-                  onChange={(data, dataString) => {
-                    this.setState({ releaseDate: dataString });
-                  }}
-                />
-                <Button
-                  type="primary"
-                  onClick={this.search}
-                  style={{ marginLeft: "10px", marginRight: 10 }}
-                >
-                  搜索
-                </Button>
-                <Button onClick={this.resets}>重置</Button>
+                <div style={{ marginLeft: 10 }}>
+                  <Input
+                    placeholder="订单编号"
+                    style={{ width: "150px", marginRight: 10 }}
+                    value={this.state.orderNoSearch}
+                    onChange={(e) => {
+                      this.setState({ orderNoSearch: e.target.value });
+                    }}
+                  />
+                  <Input
+                    placeholder="客户名称"
+                    style={{
+                      width: "150px",
+                      marginBottom: "10px",
+                      marginTop: 10,
+                      marginLeft: 10,
+                      marginRight: 10,
+                    }}
+                    value={this.state.customerName}
+                    onChange={(e) => {
+                      this.setState({ customerName: e.target.value });
+                    }}
+                  />
+                  <span style={{ marginRight: "10px" }}>下单时间 :</span>
+                  <RangePicker
+                    value={[
+                      this.state.releaseDate[0]
+                        ? moment(this.state.releaseDate[0])
+                        : null,
+                      this.state.releaseDate[1]
+                        ? moment(this.state.releaseDate[1])
+                        : null,
+                    ]}
+                    onChange={(data, dataString) => {
+                      this.setState({ releaseDate: dataString });
+                    }}
+                  />
+                  <Button
+                    type="primary"
+                    onClick={this.search}
+                    style={{ marginLeft: "10px", marginRight: 10 }}
+                  >
+                    搜索
+                  </Button>
+                  <Button onClick={this.resets}>重置</Button>
+                </div>
               </TabPane>
               <TabPane tab="更改表格显示数据" key="2">
                 <div style={{ marginLeft: 10 }}>

+ 13 - 13
js/component/manageCenter/order/orderNew/suspendexamine.jsx

@@ -357,6 +357,19 @@ const SuspendExamine = React.createClass({
                 }}
               />
               <Input
+                placeholder="合同编号"
+                style={{ width: 160 }}
+                value={searchValues["contractNo"]
+                  ? searchValues["contractNo"]
+                  : ""}
+                onChange={(e) => {
+                  searchValues["contractNo"] = e.target.value;
+                  this.setState({
+                    searchValues: searchValues,
+                  });
+                }}
+              />
+              <Input
                 placeholder="客户名称"
                 style={{ width: 160 }}
                 value={searchValues["userName"]
@@ -384,19 +397,6 @@ const SuspendExamine = React.createClass({
                 }}
               />
               <Input
-                placeholder="合同编号"
-                style={{ width: 160 }}
-                value={searchValues["contractNo"]
-                  ? searchValues["contractNo"]
-                  : ""}
-                onChange={(e) => {
-                  searchValues["contractNo"] = e.target.value;
-                  this.setState({
-                    searchValues: searchValues,
-                  });
-                }}
-              />
-              <Input
                 placeholder="项目名称"
                 style={{ width: 160 }}
                 value={searchValues["projectName"]

+ 4 - 4
js/component/manageCenter/order/pressMoney/index.jsx

@@ -164,13 +164,13 @@ class PressMoney extends Component {
       searchList: [
         {
           type: "text",
-          dataKey: "userName",
-          placeholder: "请输入客户名称",
+          dataKey: "contractNo",
+          placeholder: "请输入合同编号",
         },
         {
           type: "text",
-          dataKey: "contractNo",
-          placeholder: "请输入合同编号",
+          dataKey: "userName",
+          placeholder: "请输入客户名称",
         },
         {
           type: "autoComplete",

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1087 - 1087
js/component/manageCenter/project/patent/list.jsx


+ 10 - 10
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -1039,25 +1039,25 @@ const OutsourceTaskAssignment = React.createClass({
           loadData={this.loadData}
         />
         <ShowModalDiv ShowModal={this.state.showModal} />
-        <div className="content-title">
-          <span>外包任务派单</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>外包任务派单</span>
         </div>
         <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
           <TabPane tab="搜索" key="1">
-            <div className="user-search">
+            <div className="user-search" style={{ padding: "0px 10px" }}>
               <Input
-                placeholder="客户名称"
-                value={this.state.nameSearch}
-                style={{ marginLeft: 10 }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={(e) => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="客户名称"
+                value={this.state.nameSearch}
+                style={{ marginLeft: 10 }}
                 onChange={(e) => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               <Input

+ 7 - 7
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -1208,18 +1208,18 @@ const PaiDan = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search">
               <Input
-                placeholder="客户名称"
-                value={this.state.customerName}
-                style={{ marginLeft: 10 }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={(e) => {
-                  this.setState({ customerName: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="客户名称"
+                value={this.state.customerName}
+                style={{ marginLeft: 10 }}
                 onChange={(e) => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ customerName: e.target.value });
                 }}
               />
               <Cascaders

+ 7 - 7
js/component/manageCenter/project/project/projectQuery.jsx

@@ -785,18 +785,18 @@ const PaiDan = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search">
               <Input
-                placeholder="客户名称"
-                value={this.state.customerName}
-                style={{ marginLeft: 10 }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={(e) => {
-                  this.setState({ customerName: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="客户名称"
+                value={this.state.customerName}
+                style={{ marginLeft: 10 }}
                 onChange={(e) => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ customerName: e.target.value });
                 }}
               />
               <Cascaders

+ 7 - 7
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -1138,18 +1138,18 @@ const zxsglyOutSourcingPaiDan = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search">
               <Input
-                placeholder="客户名称"
-                value={this.state.customerName}
-                style={{ marginLeft: 10 }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={e => {
-                  this.setState({ customerName: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="客户名称"
+                value={this.state.customerName}
+                style={{ marginLeft: 10 }}
                 onChange={e => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ customerName: e.target.value });
                 }}
               />
               <Cascaders

+ 10 - 0
js/component/manageCenter/project/summary/highTech.jsx

@@ -422,6 +422,15 @@ class HighTech extends Component {
     }
   }
 
+  // 暂停项目 颜色
+  suspendColor(record) {
+    if (record.projectStatus == 29) {
+      return 'light'
+    } else {
+      return 'dark'
+    }
+  }
+
   render() {
     const dataSources = this.state.customerArr || [];
     const options = dataSources.map((group) => (
@@ -880,6 +889,7 @@ class HighTech extends Component {
               style={{
                 cursor: "pointer",
               }}
+              rowClassName={this.suspendColor}
               onRowClick={(record) => {
                 this.setState({
                   projectdetailsId: record.id,

+ 423 - 423
js/component/manageCenter/project/task/businessManagement/index.jsx

@@ -10,341 +10,341 @@ import Cascaders from "../../../../common/cascaders"
 const TabPane = Tabs.TabPane;
 
 class BusinessManagement extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            changeList: [],
-            pageNo: 1,
-            columns: [
-                {
-                    title: '项目编号',
-                    dataIndex: 'id',
-                    key: 'id',
-                    // fixed: 'left',
-                    render: (text, record) => {
-                        if (record.splitStatus == 2) {
-                            return <span>{record.splitSuper + '-' + record.splitId}</span>
-                        } else {
-                            return text
-                        }
-                    },
-                },
-                {
-                    title: '项目名称',
-                    dataIndex: 'commodityName',
-                    key: 'commodityName',
-                    // fixed: 'left',
-                    width: 100,
-                    render: text => {
-                        return (
-                            <Tooltip title={text}>
-                                <div style={{
-                                    maxWidth: '100px',
-                                    overflow: 'hidden',
-                                    textOverflow: "ellipsis",
-                                    whiteSpace: 'nowrap',
-                                }}>{text}</div>
-                            </Tooltip>
-                        )
-                    }
-                },
-                {
-                    title: '项目数量',
-                    dataIndex: 'commodityQuantity',
-                    key: 'commodityQuantity',
-                    width: 50,
-                },
-                {
-                    title: '订单编号',
-                    dataIndex: 'orderNo',
-                    key: 'orderNo',
-                },
-                {
-                    title: '合同编号',
-                    dataIndex: 'contractNo',
-                    key: 'contractNo',
-                },
-                {
-                    title: '客户名称',
-                    dataIndex: 'userName',
-                    key: 'userName',
-                    className: 'userName',
-                    render: text => {
-                        return (
-                            <Tooltip title={text}>
-                                <div style={{
-                                    maxWidth: '100px',
-                                    overflow: 'hidden',
-                                    textOverflow: "ellipsis",
-                                    whiteSpace: 'nowrap',
-                                }}>{text}</div>
-                            </Tooltip>
-                        )
-                    }
-                },
-                {
-                    title: '业务类别',
-                    dataIndex: 'cname',
-                    key: 'cname',
-                },
-                {
-                    title: '分配时间',
-                    dataIndex: 'taskDistributionTime',
-                    key: 'taskDistributionTime',
-                },
-                {
-                    title: '订单部门',
-                    dataIndex: 'depName',
-                    key: 'depName',
-                },
-                {
-                    title: '操作',
-                    dataIndex: 'operation',
-                    key: 'operation',
-                    render: (text, record) => {
-                        return (
-                            <Button
-                                type="primary"
-                                style={{ margin: '0 10px' }}
-                                onClick={(e) => {
-                                    e.stopPropagation();
-                                    this.setState({
-                                        visible: true,
-                                        infor: record
-                                    })
-                                }}
-                            >
-                                核对专利
-                            </Button>
+  constructor(props) {
+    super(props);
+    this.state = {
+      changeList: [],
+      pageNo: 1,
+      columns: [
+        {
+          title: '项目编号',
+          dataIndex: 'id',
+          key: 'id',
+          // fixed: 'left',
+          render: (text, record) => {
+            if (record.splitStatus == 2) {
+              return <span>{record.splitSuper + '-' + record.splitId}</span>
+            } else {
+              return text
+            }
+          },
+        },
+        {
+          title: '项目名称',
+          dataIndex: 'commodityName',
+          key: 'commodityName',
+          // fixed: 'left',
+          width: 100,
+          render: text => {
+            return (
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '100px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
+            )
+          }
+        },
+        {
+          title: '项目数量',
+          dataIndex: 'commodityQuantity',
+          key: 'commodityQuantity',
+          width: 50,
+        },
+        {
+          title: '订单编号',
+          dataIndex: 'orderNo',
+          key: 'orderNo',
+        },
+        {
+          title: '合同编号',
+          dataIndex: 'contractNo',
+          key: 'contractNo',
+        },
+        {
+          title: '客户名称',
+          dataIndex: 'userName',
+          key: 'userName',
+          className: 'userName',
+          render: text => {
+            return (
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '100px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
+            )
+          }
+        },
+        {
+          title: '业务类别',
+          dataIndex: 'cname',
+          key: 'cname',
+        },
+        {
+          title: '分配时间',
+          dataIndex: 'taskDistributionTime',
+          key: 'taskDistributionTime',
+        },
+        {
+          title: '订单部门',
+          dataIndex: 'depName',
+          key: 'depName',
+        },
+        {
+          title: '操作',
+          dataIndex: 'operation',
+          key: 'operation',
+          render: (text, record) => {
+            return (
+              <Button
+                type="primary"
+                style={{ margin: '0 10px' }}
+                onClick={(e) => {
+                  e.stopPropagation();
+                  this.setState({
+                    visible: true,
+                    infor: record
+                  })
+                }}
+              >
+                核对专利
+              </Button>
 
-                        )
-                    }
-                },
-            ],
-            dataSource: [],
-            infor: {},
+            )
+          }
+        },
+      ],
+      dataSource: [],
+      infor: {},
 
 
-            nameSearch: '',
-            orderNoSearch: '',
-            contractNoSearch: undefined,
-            taskNoSearch: '',
-            departmenttSearch: undefined,
-            projectStatusSearch: [], //项目状态
-            approvalSearch: undefined,
-            outsourceStatusSearch: [],
+      nameSearch: '',
+      orderNoSearch: '',
+      contractNoSearch: undefined,
+      taskNoSearch: '',
+      departmenttSearch: undefined,
+      projectStatusSearch: [], //项目状态
+      approvalSearch: undefined,
+      outsourceStatusSearch: [],
 
-            pagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.loadData(page)
-                }.bind(this),
-                showTotal: function (total) {
-                    return '共' + total + '条数据'
-                },
-            },
+      pagination: {
+        defaultCurrent: 1,
+        defaultPageSize: 10,
+        showQuickJumper: true,
+        pageSize: 10,
+        onChange: function (page) {
+          this.loadData(page)
+        }.bind(this),
+        showTotal: function (total) {
+          return '共' + total + '条数据'
+        },
+      },
 
-            departmentArr: []
-        }
-        this.loadData = this.loadData.bind(this);
-        this.changeList = this.changeList.bind(this);
-        this.departmentList = this.departmentList.bind(this);
-        this.reset = this.reset.bind(this);
+      departmentArr: []
     }
+    this.loadData = this.loadData.bind(this);
+    this.changeList = this.changeList.bind(this);
+    this.departmentList = this.departmentList.bind(this);
+    this.reset = this.reset.bind(this);
+  }
 
-    componentDidMount() {
-        this.loadData();
-        this.departmentList();
-    }
+  componentDidMount() {
+    this.loadData();
+    this.departmentList();
+  }
 
-    loadData(pageNo) {
+  loadData(pageNo) {
+    this.setState({
+      loading: true,
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderProject/selectProjectCheck",
+      data: {
+        pageNo: pageNo || 1,
+        pageSize: this.state.pagination.pageSize,
+        name: this.state.nameSearch || undefined, //客户名称
+        deps: this.state.departmenttSearch, //订单部门
+        orderNo: this.state.orderNoSearch || undefined, //订单编号
+        contractNo: this.state.contractNoSearch, //合同编号
+        taskId: this.state.taskNoSearch || undefined, //项目编号
+        taskStatus: this.state.taskStatuSearch, //项目状态
+        projectStatus: this.state.projectStatusSearch && this.state.projectStatusSearch.length > 0 ?
+          (typeof this.state.projectStatusSearch[0] === 'string' ? this.state.projectStatusSearch[1] : this.state.projectStatusSearch[0]) : undefined,  //项目状态
+        adminName: this.state.adminName, //项目受理人
+        approval: this.state.approvalSearch, //特批状态搜索
+        outsourceStatus:
+          this.state.outsourceStatusSearch >= 999
+            ? undefined
+            : this.state.outsourceStatusSearch, //外包状态搜索
+      },
+      success: function (data) {
+        let theArr = []
+        if (data.error.length === 0) {
+          for (let i = 0; i < data.data.list.length; i++) {
+            let thisdata = data.data.list[i];
+            thisdata.key = i;
+            theArr.push(thisdata)
+          }
+          this.state.pagination.current = data.data.pageNo
+          this.state.pagination.total = data.data.totalCount
+          if (data.data && data.data.list && !data.data.list.length) {
+            this.state.pagination.current = 0
+            this.state.pagination.total = 0
+          }
+          this.setState({
+            dataSource: theArr,
+            pagination: this.state.pagination,
+            pageNo: data.data.pageNo
+          })
+        } else {
+          message.warning(data.error[0].message)
+        }
+      }.bind(this),
+    }).always(
+      function () {
         this.setState({
-            loading: true,
+          loading: false,
         });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/orderProject/selectProjectCheck",
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                name: this.state.nameSearch || undefined, //客户名称
-                deps: this.state.departmenttSearch, //订单部门
-                orderNo: this.state.orderNoSearch || undefined, //订单编号
-                contractNo: this.state.contractNoSearch, //合同编号
-                taskId: this.state.taskNoSearch || undefined, //项目编号
-                taskStatus: this.state.taskStatuSearch, //项目状态
-                projectStatus: this.state.projectStatusSearch && this.state.projectStatusSearch.length > 0 ?
-                    (typeof this.state.projectStatusSearch[0] === 'string' ? this.state.projectStatusSearch[1] : this.state.projectStatusSearch[0]) : undefined,  //项目状态
-                adminName: this.state.adminName, //项目受理人
-                approval: this.state.approvalSearch, //特批状态搜索
-                outsourceStatus:
-                    this.state.outsourceStatusSearch >= 999
-                        ? undefined
-                        : this.state.outsourceStatusSearch, //外包状态搜索
-            },
-            success: function (data) {
-                let theArr = []
-                if (data.error.length === 0) {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
-                        thisdata.key = i;
-                        theArr.push(thisdata)
-                    }
-                    this.state.pagination.current = data.data.pageNo
-                    this.state.pagination.total = data.data.totalCount
-                    if (data.data && data.data.list && !data.data.list.length) {
-                        this.state.pagination.current = 0
-                        this.state.pagination.total = 0
-                    }
-                    this.setState({
-                        dataSource: theArr,
-                        pagination: this.state.pagination,
-                        pageNo: data.data.pageNo
-                    })
-                } else {
-                    message.warning(data.error[0].message)
-                }
-            }.bind(this),
-        }).always(
-            function () {
-                this.setState({
-                    loading: false,
-                });
-            }.bind(this)
-        );
-    }
+      }.bind(this)
+    );
+  }
 
-    changeList(arr) {
-        const newArr = [];
-        this.state.columns.forEach(item => {
-            arr.forEach(val => {
-                if (val === item.title) {
-                    newArr.push(item);
-                }
-            });
-        });
-        this.setState({
-            changeList: newArr
-        });
-    }
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  }
 
-    //部门
-    departmentList() {
+  //部门
+  departmentList() {
+    this.setState({
+      loading: true,
+    })
+    $.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)
+          }
+          thedata = {}
+        } else {
+          thedata.map(function (item, index) {
+            theArr.push({
+              key: index,
+              name: item.name,
+              id: item.id,
+            })
+          })
+        }
         this.setState({
-            loading: true,
+          departmentArr: theArr,
         })
-        $.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)
-                    }
-                    thedata = {}
-                } else {
-                    thedata.map(function (item, index) {
-                        theArr.push({
-                            key: index,
-                            name: item.name,
-                            id: item.id,
-                        })
-                    })
-                }
-                this.setState({
-                    departmentArr: theArr,
-                })
-            }.bind(this),
-        }).always(
-            function () {
-                this.setState({
-                    loading: false,
-                })
-            }.bind(this)
-        )
-    }
-
-    reset() {
+      }.bind(this),
+    }).always(
+      function () {
         this.setState({
-            nameSearch: '',
-            orderNoSearch: '',
-            contractNoSearch: undefined,
-            taskNoSearch: '',
-            departmenttSearch: undefined,
-            projectStatusSearch: [], //项目状态
-            approvalSearch: undefined,
-            outsourceStatusSearch: [],
-        }, () => {
-            this.Cascaders.empty();
-            this.loadData();
+          loading: false,
         })
-    }
+      }.bind(this)
+    )
+  }
 
-    render() {
-        return (
-            <div className="user-content">
-                <div className="content-title" style={{ marginBottom: 10 }}>
-                    <span style={{ fontWeight: 900, fontSize: 16 }}>核对专利</span>
-                </div>
-                <div className="user-search">
-                    <Tabs
-                        defaultActiveKey="1"
-                        className="test"
-                    >
-                        <TabPane tab="搜索" key="1">
-                            <div className="user-search" style={{ marginLeft: 10 }}>
-                                <Input
-                                    placeholder="客户名称"
-                                    value={this.state.nameSearch}
-                                    onChange={(e) => {
-                                        this.setState({ nameSearch: e.target.value })
-                                    }}
-                                />
-                                <Input
-                                    placeholder="订单编号"
-                                    value={this.state.orderNoSearch}
-                                    onChange={(e) => {
-                                        this.setState({ orderNoSearch: e.target.value })
-                                    }}
-                                />
-                                <Input
-                                    placeholder="合同编号"
-                                    value={this.state.contractNoSearch}
-                                    onChange={(e) => {
-                                        this.setState({ contractNoSearch: e.target.value })
-                                    }}
-                                />
-                                <Input
-                                    placeholder="项目编号"
-                                    value={this.state.taskNoSearch}
-                                    onChange={(e) => {
-                                        this.setState({ taskNoSearch: e.target.value })
-                                    }}
-                                />
-                                <Cascaders
-                                    ref={node => this.Cascaders = node}
-                                    placeholder="选择部门"
-                                    id="id"
-                                    name="name"
-                                    children="list"
-                                    height={28}
-                                    onSel={(e) => {
-                                        this.setState({
-                                            departmenttSearch: JSON.stringify(e),
-                                        });
-                                    }}
-                                />
-                                {/* <Select
+  reset() {
+    this.setState({
+      nameSearch: '',
+      orderNoSearch: '',
+      contractNoSearch: undefined,
+      taskNoSearch: '',
+      departmenttSearch: undefined,
+      projectStatusSearch: [], //项目状态
+      approvalSearch: undefined,
+      outsourceStatusSearch: [],
+    }, () => {
+      this.Cascaders.empty();
+      this.loadData();
+    })
+  }
+
+  render() {
+    return (
+      <div className="user-content">
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>核对专利</span>
+        </div>
+        <div className="user-search">
+          <Tabs
+            defaultActiveKey="1"
+            className="test"
+          >
+            <TabPane tab="搜索" key="1">
+              <div className="user-search" style={{ marginLeft: 10 }}>
+                <Input
+                  placeholder="订单编号"
+                  value={this.state.orderNoSearch}
+                  onChange={(e) => {
+                    this.setState({ orderNoSearch: e.target.value })
+                  }}
+                />
+                <Input
+                  placeholder="合同编号"
+                  value={this.state.contractNoSearch}
+                  onChange={(e) => {
+                    this.setState({ contractNoSearch: e.target.value })
+                  }}
+                />
+                <Input
+                  placeholder="客户名称"
+                  value={this.state.nameSearch}
+                  onChange={(e) => {
+                    this.setState({ nameSearch: e.target.value })
+                  }}
+                />
+                <Input
+                  placeholder="项目编号"
+                  value={this.state.taskNoSearch}
+                  onChange={(e) => {
+                    this.setState({ taskNoSearch: e.target.value })
+                  }}
+                />
+                <Cascaders
+                  ref={node => this.Cascaders = node}
+                  placeholder="选择部门"
+                  id="id"
+                  name="name"
+                  children="list"
+                  height={28}
+                  onSel={(e) => {
+                    this.setState({
+                      departmenttSearch: JSON.stringify(e),
+                    });
+                  }}
+                />
+                {/* <Select
                                     placeholder="选择部门"
                                     style={{ width: 200, marginRight: '10px' }}
                                     value={this.state.departmenttSearch}
@@ -358,111 +358,111 @@ class BusinessManagement extends Component {
                                         )
                                     })}
                                 </Select> */}
-                                <Cascader
-                                    placeholder="项目状态"
-                                    style={{ width: 150, marginRight: '10px' }}
-                                    options={projectStatusCascader}
-                                    value={this.state.projectStatusSearch}
-                                    onChange={(e) => {
-                                        this.setState({
-                                            projectStatusSearch: e
-                                        })
-                                    }}
-                                />
-                                <Select
-                                    placeholder="特批状态"
-                                    style={{ width: 150, marginRight: '10px' }}
-                                    value={this.state.approvalSearch}
-                                    onChange={(e) => {
-                                        this.setState({ approvalSearch: e })
-                                    }}
-                                >
-                                    <Select.Option key={0}>非特批</Select.Option>
-                                    <Select.Option key={1}>特批</Select.Option>
-                                </Select>
-                                <Select
-                                    placeholder="外包状态"
-                                    style={{ width: 150, marginRight: '10px' }}
-                                    value={this.state.outsourceStatusSearch}
-                                    onChange={(e) => {
-                                        this.setState({ outsourceStatusSearch: e })
-                                    }}
-                                >
-                                    <Select.Option key={0}>外包待审核</Select.Option>
-                                    <Select.Option key={2}>外包审核驳回</Select.Option>
-                                    <Select.Option key={999}>全部</Select.Option>
-                                </Select>
-                                <Button type="primary" onClick={() => {
-                                    this.loadData();
-                                }}>
-                                    搜索
-                                </Button>
-                                <Button
-                                    onClick={(e) => {
-                                        this.reset(true)
-                                    }}
-                                >
-                                    重置
-                                </Button>
-                            </div>
-                        </TabPane>
-                        <TabPane tab="更改表格显示数据" key="2">
-                            <div style={{ marginLeft: 10 }}>
-                                <ChooseList
-                                    columns={this.state.columns}
-                                    changeFn={this.changeList}
-                                    changeList={this.state.changeList}
-                                    top={55}
-                                    margin={11}
-                                />
-                            </div>
-                        </TabPane>
-                    </Tabs>
-                </div>
-                <div className="patent-table">
-                    <Spin spinning={this.state.loading}>
-                        <Table
-                            size="middle"
-                            columns={
-                                this.state.changeList.length !== 0
-                                    ? this.state.changeList
-                                    : this.state.columns
-                            }
-                            dataSource={this.state.dataSource}
-                            pagination={this.state.pagination}
-                            onRowClick={(record) => {
-                                this.setState({
-                                    orderVisible: true,
-                                    orderNo: record.orderNo
-                                })
-                            }}
-                        />
-                    </Spin>
-                </div>
-                {this.state.visible ? <CheckInfor
-                    visible={this.state.visible}
-                    infor={this.state.infor}
-                    onCancel={() => {
-                        this.setState({
-                            visible: false,
-                            infor: {}
-                        })
-                        this.loadData(this.state.pageNo);
-                    }}
-                /> : null}
-                {this.state.orderVisible ? <OrderInfor
-                    visible={this.state.orderVisible}
-                    orderNo={this.state.orderNo}
-                    onCancel={() => {
-                        this.setState({
-                            orderVisible: false,
-                            orderNo: ''
-                        })
-                    }}
-                /> : null}
-            </div>
-        )
-    }
+                <Cascader
+                  placeholder="项目状态"
+                  style={{ width: 150, marginRight: '10px' }}
+                  options={projectStatusCascader}
+                  value={this.state.projectStatusSearch}
+                  onChange={(e) => {
+                    this.setState({
+                      projectStatusSearch: e
+                    })
+                  }}
+                />
+                <Select
+                  placeholder="特批状态"
+                  style={{ width: 150, marginRight: '10px' }}
+                  value={this.state.approvalSearch}
+                  onChange={(e) => {
+                    this.setState({ approvalSearch: e })
+                  }}
+                >
+                  <Select.Option key={0}>非特批</Select.Option>
+                  <Select.Option key={1}>特批</Select.Option>
+                </Select>
+                <Select
+                  placeholder="外包状态"
+                  style={{ width: 150, marginRight: '10px' }}
+                  value={this.state.outsourceStatusSearch}
+                  onChange={(e) => {
+                    this.setState({ outsourceStatusSearch: e })
+                  }}
+                >
+                  <Select.Option key={0}>外包待审核</Select.Option>
+                  <Select.Option key={2}>外包审核驳回</Select.Option>
+                  <Select.Option key={999}>全部</Select.Option>
+                </Select>
+                <Button type="primary" onClick={() => {
+                  this.loadData();
+                }}>
+                  搜索
+                </Button>
+                <Button
+                  onClick={(e) => {
+                    this.reset(true)
+                  }}
+                >
+                  重置
+                </Button>
+              </div>
+            </TabPane>
+            <TabPane tab="更改表格显示数据" key="2">
+              <div style={{ marginLeft: 10 }}>
+                <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+                />
+              </div>
+            </TabPane>
+          </Tabs>
+        </div>
+        <div className="patent-table">
+          <Spin spinning={this.state.loading}>
+            <Table
+              size="middle"
+              columns={
+                this.state.changeList.length !== 0
+                  ? this.state.changeList
+                  : this.state.columns
+              }
+              dataSource={this.state.dataSource}
+              pagination={this.state.pagination}
+              onRowClick={(record) => {
+                this.setState({
+                  orderVisible: true,
+                  orderNo: record.orderNo
+                })
+              }}
+            />
+          </Spin>
+        </div>
+        {this.state.visible ? <CheckInfor
+          visible={this.state.visible}
+          infor={this.state.infor}
+          onCancel={() => {
+            this.setState({
+              visible: false,
+              infor: {}
+            })
+            this.loadData(this.state.pageNo);
+          }}
+        /> : null}
+        {this.state.orderVisible ? <OrderInfor
+          visible={this.state.orderVisible}
+          orderNo={this.state.orderNo}
+          onCancel={() => {
+            this.setState({
+              orderVisible: false,
+              orderNo: ''
+            })
+          }}
+        /> : null}
+      </div>
+    )
+  }
 }
 
 export default BusinessManagement;

Dosya farkı çok büyük olduğundan ihmal edildi
+ 6554 - 6554
js/component/manageCenter/project/task/myTask.jsx


+ 20 - 20
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -1132,6 +1132,26 @@ const MyTaskCount = Form.create()(
             >
               <TabPane tab="搜索" key="1">
                 <Input
+                  placeholder="订单编号"
+                  style={{ width: "150px", marginRight: 10 }}
+                  value={this.state.orderNoSearch}
+                  onChange={(e) => {
+                    this.setState({
+                      orderNoSearch: e.target.value,
+                    });
+                  }}
+                />
+                <Input
+                  placeholder="合同编号"
+                  style={{ width: "150px", marginRight: 10 }}
+                  value={this.state.contractNoSearch}
+                  onChange={(e) => {
+                    this.setState({
+                      contractNoSearch: e.target.value,
+                    });
+                  }}
+                />
+                <Input
                   placeholder="客户名称"
                   style={{
                     width: "150px",
@@ -1152,26 +1172,6 @@ const MyTaskCount = Form.create()(
                     this.setState({ idSearch: e.target.value });
                   }}
                 />
-                <Input
-                  placeholder="订单编号"
-                  style={{ width: "150px", marginRight: 10 }}
-                  value={this.state.orderNoSearch}
-                  onChange={(e) => {
-                    this.setState({
-                      orderNoSearch: e.target.value,
-                    });
-                  }}
-                />
-                <Input
-                  placeholder="合同编号"
-                  style={{ width: "150px", marginRight: 10 }}
-                  value={this.state.contractNoSearch}
-                  onChange={(e) => {
-                    this.setState({
-                      contractNoSearch: e.target.value,
-                    });
-                  }}
-                />
                 <Select
                   placeholder="订单部门"
                   style={{ width: 200, marginRight: 10 }}

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

@@ -3237,13 +3237,6 @@ const MyTaskOutsource = React.createClass({
           <TabPane tab="搜索" key="2">
             <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
-                placeholder="客户名称"
-                value={this.state.nameSearch}
-                onChange={(e) => {
-                  this.setState({ nameSearch: e.target.value });
-                }}
-              />
-              <Input
                 placeholder="订单编号"
                 value={this.state.orderNoSearch}
                 onChange={(e) => {
@@ -3258,6 +3251,13 @@ const MyTaskOutsource = React.createClass({
                 }}
               />
               <Input
+                placeholder="客户名称"
+                value={this.state.nameSearch}
+                onChange={(e) => {
+                  this.setState({ nameSearch: e.target.value });
+                }}
+              />
+              <Input
                 placeholder="项目编号"
                 value={this.state.taskNoSearch}
                 onChange={(e) => {

+ 186 - 186
js/component/manageCenter/project/task/payApplyReject/filterColumn.js

@@ -4,129 +4,129 @@ import $ from "jquery/src/ajax";
 import Cascaders from "../../../../common/cascaders"
 
 class FilterColumn extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            departmentArr: [],
-        }
-        this.handleReset = this.handleReset.bind(this);
-        this.departmentList = this.departmentList.bind(this);
+  constructor(props) {
+    super(props);
+    this.state = {
+      departmentArr: [],
     }
+    this.handleReset = this.handleReset.bind(this);
+    this.departmentList = this.departmentList.bind(this);
+  }
 
-    componentDidMount() {
-        // this.departmentList();
-    }
+  componentDidMount() {
+    // this.departmentList();
+  }
 
-    handleReset() {
-        this.state.deps = undefined
-        this.Cascaders.empty();
-        this.props.form.resetFields();
-        this.props.onResetSearch && this.props.onResetSearch();
-    }
+  handleReset() {
+    this.state.deps = undefined
+    this.Cascaders.empty();
+    this.props.form.resetFields();
+    this.props.onResetSearch && this.props.onResetSearch();
+  }
 
-    handleSubmit(e) {
-        e.preventDefault();
-        this.props.form.validateFieldsAndScroll((err, values) => {
-            if (err) {
-                return;
-            }
-            this.props.onSearch(Object.assign(values, { deps: this.state.deps }));
-        })
-    }
+  handleSubmit(e) {
+    e.preventDefault();
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      if (err) {
+        return;
+      }
+      this.props.onSearch(Object.assign(values, { deps: this.state.deps }));
+    })
+  }
+
+  //部门
+  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)
+    );
+  }
 
-    //部门
-    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,
-                        });
-                    });
-                }
+  render() {
+    const { getFieldDecorator } = this.props.form;
+    return (
+      <div className="user-search">
+        <Form
+          layout="inline"
+          name="basic"
+          initialValues={{
+            remember: true,
+          }}
+          onSubmit={(e) => {
+            this.handleSubmit(e)
+          }}
+        >
+          <Form.Item
+            label="订单编号"
+          >
+            {getFieldDecorator('orderNo', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入订单编号" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="合同编号"
+          >
+            {getFieldDecorator('contractNo', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入合同编号" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="客户名称"
+          >
+            {getFieldDecorator('userName', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入客户名称" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="部门"
+          >
+            <Cascaders
+              ref={node => this.Cascaders = node}
+              placeholder="订单部门"
+              id="id"
+              name="name"
+              children="list"
+              height={32}
+              onSel={(e) => {
                 this.setState({
-                    departmentArr: theArr,
+                  deps: JSON.stringify(e),
                 });
-            }.bind(this),
-        }).always(
-            function () {
-            }.bind(this)
-        );
-    }
+              }}
+            />
 
-    render() {
-        const { getFieldDecorator } = this.props.form;
-        return (
-            <div className="user-search">
-                <Form
-                    layout="inline"
-                    name="basic"
-                    initialValues={{
-                        remember: true,
-                    }}
-                    onSubmit={(e) => {
-                        this.handleSubmit(e)
-                    }}
-                >
-                    <Form.Item
-                        label="合同编号"
-                    >
-                        {getFieldDecorator('contractNo', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入合同编号" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="订单编号"
-                    >
-                        {getFieldDecorator('orderNo', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入订单编号" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="客户名称"
-                    >
-                        {getFieldDecorator('userName', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入客户名称" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="部门"
-                    >
-                        <Cascaders
-                            ref={node => this.Cascaders = node}
-                            placeholder="订单部门"
-                            id="id"
-                            name="name"
-                            children="list"
-                            height={32}
-                            onSel={(e) => {
-                                this.setState({
-                                    deps: JSON.stringify(e),
-                                });
-                            }}
-                        />
-
-                        {/* {getFieldDecorator('depId', {
+            {/* {getFieldDecorator('depId', {
                             rules: [{ required: false, message: '' }],
                         })(
                             <Select placeholder="请选择部门" style={{
@@ -141,77 +141,77 @@ class FilterColumn extends Component {
                             </Select>
                         )} */}
 
-                    </Form.Item>
-                    <Form.Item
-                        label="发起人"
-                    >
-                        {getFieldDecorator('aname', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入发起人" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="财务名称"
-                    >
-                        {getFieldDecorator('financeName', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入财务名称" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="分类名称"
-                    >
-                        {getFieldDecorator('cname', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入分类名称" />
-                        )}
-                    </Form.Item>
-                    <Form.Item
-                        label="项目名称"
-                    >
-                        {getFieldDecorator('pname', {
-                            rules: [{ required: false, message: '' }],
-                        })(
-                            <Input style={{ width: '200px' }} placeholder="请输入项目名称" />
-                        )}
-                    </Form.Item>
-                    {/*<Form.Item*/}
-                    {/*    label="状态"*/}
-                    {/*>*/}
-                    {/*    {getFieldDecorator('status', {*/}
-                    {/*        rules: [{ required: false, message: '' }],*/}
-                    {/*    })(*/}
-                    {/*        <Select*/}
-                    {/*            placeholder="选择状态"*/}
-                    {/*            style={{*/}
-                    {/*                width: '200px',*/}
-                    {/*            }}*/}
-                    {/*        >*/}
-                    {/*            <Select.Option value={0}>审核</Select.Option>*/}
-                    {/*            <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>*/}
-                    {/*    )}*/}
-                    {/*</Form.Item>*/}
-                    <Form.Item>
-                        <Button type="primary" htmlType="submit" style={{ marginLeft: 10 }}>
-                            搜索
-                        </Button>
-                    </Form.Item>
-                    <Form.Item>
-                        <Button style={{ marginLeft: 10 }} onClick={this.handleReset}>
-                            重置
-                        </Button>
-                    </Form.Item>
-                </Form>
-            </div>
-        )
-    }
+          </Form.Item>
+          <Form.Item
+            label="发起人"
+          >
+            {getFieldDecorator('aname', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入发起人" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="财务名称"
+          >
+            {getFieldDecorator('financeName', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入财务名称" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="分类名称"
+          >
+            {getFieldDecorator('cname', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入分类名称" />
+            )}
+          </Form.Item>
+          <Form.Item
+            label="项目名称"
+          >
+            {getFieldDecorator('pname', {
+              rules: [{ required: false, message: '' }],
+            })(
+              <Input style={{ width: '200px' }} placeholder="请输入项目名称" />
+            )}
+          </Form.Item>
+          {/*<Form.Item*/}
+          {/*    label="状态"*/}
+          {/*>*/}
+          {/*    {getFieldDecorator('status', {*/}
+          {/*        rules: [{ required: false, message: '' }],*/}
+          {/*    })(*/}
+          {/*        <Select*/}
+          {/*            placeholder="选择状态"*/}
+          {/*            style={{*/}
+          {/*                width: '200px',*/}
+          {/*            }}*/}
+          {/*        >*/}
+          {/*            <Select.Option value={0}>审核</Select.Option>*/}
+          {/*            <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>*/}
+          {/*    )}*/}
+          {/*</Form.Item>*/}
+          <Form.Item>
+            <Button type="primary" htmlType="submit" style={{ marginLeft: 10 }}>
+              搜索
+            </Button>
+          </Form.Item>
+          <Form.Item>
+            <Button style={{ marginLeft: 10 }} onClick={this.handleReset}>
+              重置
+            </Button>
+          </Form.Item>
+        </Form>
+      </div>
+    )
+  }
 }
 
 const WrappedNormalLoginForm = Form.create()(FilterColumn);

+ 7 - 7
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -1148,18 +1148,18 @@ const Task = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search">
               <Input
-                placeholder="客户名称"
-                value={this.state.nameSearch}
-                style={{ marginLeft: 10 }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={(e) => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="客户名称"
+                value={this.state.nameSearch}
+                style={{ marginLeft: 10 }}
                 onChange={(e) => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               <Input

+ 20 - 20
js/component/manageCenter/project/task/taskCount.jsx

@@ -1284,6 +1284,26 @@ const IntentionCustomer = Form.create()(
             >
               <TabPane tab="搜索" key="1">
                 <Input
+                  placeholder="订单编号"
+                  style={{ width: "150px", marginRight: 10 }}
+                  value={this.state.orderNoSearch}
+                  onChange={(e) => {
+                    this.setState({
+                      orderNoSearch: e.target.value,
+                    });
+                  }}
+                />
+                <Input
+                  placeholder="合同编号"
+                  style={{ width: "150px", marginRight: 10 }}
+                  value={this.state.contractNoSearch}
+                  onChange={(e) => {
+                    this.setState({
+                      contractNoSearch: e.target.value,
+                    });
+                  }}
+                />
+                <Input
                   placeholder="客户名称"
                   style={{
                     width: "150px",
@@ -1305,26 +1325,6 @@ const IntentionCustomer = Form.create()(
                     this.setState({ idSearch: e.target.value });
                   }}
                 />
-                <Input
-                  placeholder="订单编号"
-                  style={{ width: "150px", marginRight: 10 }}
-                  value={this.state.orderNoSearch}
-                  onChange={(e) => {
-                    this.setState({
-                      orderNoSearch: e.target.value,
-                    });
-                  }}
-                />
-                <Input
-                  placeholder="合同编号"
-                  style={{ width: "150px", marginRight: 10 }}
-                  value={this.state.contractNoSearch}
-                  onChange={(e) => {
-                    this.setState({
-                      contractNoSearch: e.target.value,
-                    });
-                  }}
-                />
                 <Select
                   placeholder="订单部门"
                   style={{ width: 200, marginRight: 10 }}

+ 7 - 7
js/component/manageCenter/project/task/taskQuery.jsx

@@ -1313,18 +1313,18 @@ const Task = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search" style={{ marginLeft: 10 }}>
               <Input
-                placeholder="客户名称"
-                style={{ width: 150 }}
-                value={this.state.nameSearch}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
                 onChange={(e) => {
-                  this.setState({ nameSearch: e.target.value });
+                  this.setState({ orderNoSearch: e.target.value });
                 }}
               />
               <Input
-                placeholder="订单编号"
-                value={this.state.orderNoSearch}
+                placeholder="客户名称"
+                style={{ width: 150 }}
+                value={this.state.nameSearch}
                 onChange={(e) => {
-                  this.setState({ orderNoSearch: e.target.value });
+                  this.setState({ nameSearch: e.target.value });
                 }}
               />
               <Input

+ 5 - 2
js/component/tools.js

@@ -138,8 +138,11 @@ const obj = {
   //   }
   // },
   onReplace: function (val) {
-    let text = val.replace(/ /gm, ' ⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤ ⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤⁠⁡ ⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤ ⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤ ⁠⁡⁢⁣⁠⁡⁢⁣⁤⁠')
-    return text
+    // 空格变大,便于识别
+    if (val) {
+      let text = val.replace(/ /gm, ' ⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤ ⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤⁠⁡ ⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤ ⁠⁡⁢⁣⁤⁠⁡⁢⁣⁤ ⁠⁡⁢⁣⁠⁡⁢⁣⁤⁠')
+      return text
+    }
   },
   getPercentage: function (val) {
     return (Math.round(val * 10000)) / 100 + '%';

+ 1 - 1
package.json

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