Bladeren bron

增加 更改表格显示数据

mentoswzq 4 jaren geleden
bovenliggende
commit
12b4ecd9d8
32 gewijzigde bestanden met toevoegingen van 1091 en 251 verwijderingen
  1. 3 8
      js/component/common/imgList/index.js
  2. 10 10
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx
  3. 14 3
      js/component/manageCenter/financialManage/bonus/yxBonus.jsx
  4. 30 1
      js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx
  5. 83 50
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  6. 31 2
      js/component/manageCenter/financialManage/distribute/outSpecial.jsx
  7. 104 71
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  8. 106 72
      js/component/manageCenter/financialManage/distribute/paiDan.jsx
  9. 31 2
      js/component/manageCenter/financialManage/flowWater/departWater.jsx
  10. 30 1
      js/component/manageCenter/order/bonus/yxBonus.jsx
  11. 31 2
      js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx
  12. 32 3
      js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx
  13. 30 1
      js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx
  14. 30 1
      js/component/manageCenter/order/orderManagement/publicOrder/publicOrder.jsx
  15. 5 5
      js/component/manageCenter/order/orderNew/addService.jsx
  16. 30 1
      js/component/manageCenter/order/orderNew/arrearsList.jsx
  17. 30 1
      js/component/manageCenter/order/orderNew/chargeback.jsx
  18. 30 1
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  19. 30 1
      js/component/manageCenter/order/orderNew/contractJszj.js
  20. 30 1
      js/component/manageCenter/order/orderNew/contractYxgly.js
  21. 32 1
      js/component/manageCenter/order/orderNew/costAuditList/index.js
  22. 30 1
      js/component/manageCenter/order/orderNew/examine.jsx
  23. 32 1
      js/component/manageCenter/order/orderNew/glCostAuditList/index.js
  24. 30 1
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  25. 30 1
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  26. 30 1
      js/component/manageCenter/order/orderNew/press.jsx
  27. 30 1
      js/component/manageCenter/order/orderNew/pressList.jsx
  28. 31 2
      js/component/manageCenter/order/orderNew/reject.jsx
  29. 26 1
      js/component/manageCenter/order/orderStatistics/orderStatistics.jsx
  30. 30 1
      js/component/manageCenter/project/project/projectAssignment.jsx
  31. 40 2
      js/component/manageCenter/project/project/projectQuery.jsx
  32. 30 1
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

+ 3 - 8
js/component/common/imgList/index.js

@@ -5,9 +5,6 @@ import Viewer from 'viewerjs';
 import 'viewerjs/dist/viewer.css';
 import PropTypes from 'prop-types';
 
-// const url1 = 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1601012352754&di=d33308119328f5ed987bd90031f98cfa&imgtype=0&src=http%3A%2F%2Fa2.att.hudong.com%2F27%2F81%2F01200000194677136358818023076.jpg';
-// const url2 = 'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1601001245&di=60b5e1a42beb791524b46d7e3677f1f4&src=http://a2.att.hudong.com/13/86/01300001285722131043860050752.jpg';
-
 const uploadButton = (
     <div>
         <Icon type="plus" />
@@ -110,19 +107,16 @@ class ImgList extends Component{
                                     (
                                         fileList.map((v,i)=>{
                                             v.index = i;
-                                            // v.url = i%2 ? url1 : url2;
                                             return v
                                         })
                                     ) : (
                                         this.state.seeMore?
                                             fileList.map((v,i)=>{
                                                 v.index = i;
-                                                // v.url = i%2 ? url1 : url2;
                                                 return v
                                             }) :
                                             fileList.map((v,i)=>{
                                                 v.index = i;
-                                                // v.url = i%2 ? url1 : url2;
                                                 return v
                                             }).slice(0,10)
                                     )
@@ -166,11 +160,12 @@ class ImgList extends Component{
                                         this.setState({
                                             percent:percentNum
                                         })
-                                        if(percentNum < 1) {
+                                        if(percentNum <= 1) {
                                             this.setState({
                                                 uploadLoading: true,
                                             })
-                                        }else{
+                                        }
+                                        if(percentNum >= 1){
                                             this.setState({
                                                 percent: 1,
                                             },()=>{

+ 10 - 10
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -168,16 +168,16 @@ const IntentionCustomer = Form.create()(
             dataIndex: "locationProvince",
             key: "locationProvince",
           },
-          {
-            title: "联系人",
-            dataIndex: "contacts",
-            key: "contacts",
-          },
-          {
-            title: "联系电话",
-            dataIndex: "contactMobile",
-            key: "contactMobile",
-          },
+          // {
+          //   title: "联系人",
+          //   dataIndex: "contacts",
+          //   key: "contacts",
+          // },
+          // {
+          //   title: "联系电话",
+          //   dataIndex: "contactMobile",
+          //   key: "contactMobile",
+          // },
           {
             title: "社会性质",
             dataIndex: "societyTag",

+ 14 - 3
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -495,6 +495,17 @@ const YxBonus = React.createClass({
               <Button onClick={this.exportExec} style={{ margin: 10 }}>导出excel</Button>
             </div>
           </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" id="table">
           <Spin spinning={this.state.loading}>
@@ -502,9 +513,9 @@ const YxBonus = React.createClass({
               size="small"
               bordered
               columns={
-                this.state.changeList == undefined
-                  ? this.state.columns
-                  : this.state.changeList
+                this.state.changeList
+                    ? this.state.changeList
+                    : this.state.columns
               }
               dataSource={this.state.dataSource}
               scroll={{ x: 1500, y: 0 }}

+ 30 - 1
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -27,6 +27,7 @@ import {
 const FormItem = Form.Item;
 const {TabPane}= Tabs
 import OrderDesc from "../orderDetail/orderDesc";
+import {ChooseList} from "../../order/orderNew/chooseList";
 const invoiceApplyListWai = React.createClass({
   departmentList() {
     this.setState({
@@ -574,6 +575,19 @@ const invoiceApplyListWai = React.createClass({
     this.state.departmenttList = [];
     this.loadData();
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
   render() {
     const formItemLayout = {
       labelCol: { span: 8 },
@@ -627,11 +641,26 @@ const invoiceApplyListWai = React.createClass({
           <Button onClick={this.reset}>重置</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 className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+              columns={
+                this.state.changeList
+                    ? this.state.changeList
+                    : this.state.columns
+              }
               scroll={{ x: 1500, y: 0 }}
               onRowClick={this.tableRowClick}
               dataSource={this.state.dataSource}

+ 83 - 50
js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx

@@ -29,6 +29,7 @@ import {
   getprovince
 } from "@/tools";
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "../../order/orderNew/chooseList";
 const FormItem = Form.Item;
 
 const outsourcingPaiDan = React.createClass({
@@ -852,6 +853,19 @@ const outsourcingPaiDan = React.createClass({
       searchMore: !this.state.searchMore,
     });
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
   render() {
     const { RangePicker } = DatePicker;
     const { TabPane } = Tabs;
@@ -876,59 +890,78 @@ const outsourcingPaiDan = React.createClass({
         <div className="content-title">
           <span>外省外包列表</span>
         </div>
-        <div className="user-search">
-          <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 });
-            }}
-          />
-          <Select
-            placeholder="流程状态"
-            onChange={(e) => {
-              this.setState({ processStatus: e });
-            }}
-            style={{ width: 160, marginRight: 5 }}
-            value={this.state.processStatus}
-          >
-            <Option value="2">未分配</Option>
-            <Option value="3">已分配</Option>
-          </Select>
-          <span style={{ marginRight: 10 }}>下单时间 :</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: 10 }}
-          >
-            搜索
-          </Button>
-          <Button onClick={this.reset}>重置</Button>
-        </div>
+        <Tabs defaultActiveKey="1" className="test">
+          <TabPane tab="搜索" key="1">
+            <div className="user-search">
+              <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 });
+                  }}
+              />
+              <Select
+                  placeholder="流程状态"
+                  onChange={(e) => {
+                    this.setState({ processStatus: e });
+                  }}
+                  style={{ width: 160, marginRight: 5 }}
+                  value={this.state.processStatus}
+              >
+                <Option value="2">未分配</Option>
+                <Option value="3">已分配</Option>
+              </Select>
+              <span style={{ marginRight: 10 }}>下单时间 :</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: 10 }}
+              >
+                搜索
+              </Button>
+              <Button onClick={this.reset}>重置</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 className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+                columns={
+                  this.state.changeList
+                      ? this.state.changeList
+                      : this.state.columns
+                }
               dataSource={this.state.dataSource}
               scroll={{ x: 1500, y: 0 }}
               size="small"

+ 31 - 2
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -16,6 +16,7 @@ import {
 const FormItem = Form.Item;
 
 import OrderDesc from "../orderDetail/orderDesc";
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const outSpecial = React.createClass({
   departmentList() {
@@ -572,6 +573,19 @@ const outSpecial = React.createClass({
       this.loadData(this.state.page);
     }
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
   render() {
     const formItemLayout = {
       labelCol: { span: 8 },
@@ -587,7 +601,18 @@ const outSpecial = React.createClass({
           defaultActiveKey="1"
           onChange={this.callback}
           className="test">
-          <TabPane tab="搜索" key="1">
+          <TabPane tab="更改表格显示数据" key="1">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+              />
+            </div>
+          </TabPane>
+          <TabPane tab="搜索" key="2">
         <div className="user-search">
           <Input
             placeholder="营销员名称"
@@ -628,7 +653,11 @@ const outSpecial = React.createClass({
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+              columns={
+                this.state.changeList
+                    ? this.state.changeList
+                    : this.state.columns
+              }
               scroll={{ x: 1500, y: 0 }}
               onRowClick={this.tableRowClick}
               dataSource={this.state.dataSource}

+ 104 - 71
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -30,6 +30,7 @@ import {
   getRefundStatus
 } from "@/tools";
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "../../order/orderNew/chooseList";
 const FormItem = Form.Item;
 
 const outsourcingPaiDan = React.createClass({
@@ -984,6 +985,19 @@ const outsourcingPaiDan = React.createClass({
       searchMore: !this.state.searchMore,
     });
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
   render() {
     const { RangePicker } = DatePicker;
     const { TabPane } = Tabs;
@@ -1009,80 +1023,99 @@ const outsourcingPaiDan = React.createClass({
         <div className="content-title">
           <span>外包派单</span>
         </div>
-        <div className="user-search">
-          <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 });
-            }}
-          />
-          <Select
-            placeholder="订单部门"
-            style={{ width: 150, marginRight: 10 }}
-            value={this.state.departmenttList}
-            onChange={(e) => {
-              this.setState({ departmenttList: e });
-            }}
-          >
-            {departmentArr.map(function (item) {
-              return <Select.Option key={item.id}>{item.name}</Select.Option>;
-            })}
-          </Select>
-          <Select
-            placeholder="流程状态"
-            onChange={(e) => {
-              this.setState({ processStatusSearch: e });
-            }}
-            style={{ width: 160, marginRight: 5 }}
-            value={this.state.processStatusSearch}
-          >
-            <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={[
-              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: 10 }}
-          >
-            搜索
-          </Button>
-          <Button onClick={this.reset}>重置</Button>
-        </div>
+        <Tabs defaultActiveKey="1" className="test">
+          <TabPane tab="搜索" key="1">
+            <div className="user-search">
+              <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 });
+                  }}
+              />
+              <Select
+                  placeholder="订单部门"
+                  style={{ width: 150, marginRight: 10 }}
+                  value={this.state.departmenttList}
+                  onChange={(e) => {
+                    this.setState({ departmenttList: e });
+                  }}
+              >
+                {departmentArr.map(function (item) {
+                  return <Select.Option key={item.id}>{item.name}</Select.Option>;
+                })}
+              </Select>
+              <Select
+                  placeholder="流程状态"
+                  onChange={(e) => {
+                    this.setState({ processStatusSearch: e });
+                  }}
+                  style={{ width: 160, marginRight: 5 }}
+                  value={this.state.processStatusSearch}
+              >
+                <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={[
+                    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: 10 }}
+              >
+                搜索
+              </Button>
+              <Button onClick={this.reset}>重置</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 className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+                columns={
+                  this.state.changeList
+                      ? this.state.changeList
+                      : this.state.columns
+                }
               dataSource={this.state.dataSource}
               scroll={{ x: 1500, y: 0 }}
               rowSelection={false}

+ 106 - 72
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -11,12 +11,14 @@ import {
   Table,
   message,
   DatePicker,
-  Modal
+  Modal, Tabs
 } from "antd";
 import OrderDesc from "@/manageCenter/financialManage/orderDetail/orderDesc";
 import Assign from "@/manageCenter/publicComponent/assign";
 import { getProcessStatus, getApproval } from "@/tools";
+import {ChooseList} from "../../order/orderNew/chooseList";
 const FormItem = Form.Item;
+const {TabPane} = Tabs;
 
 const PaiDan = React.createClass({
   departmentList() {
@@ -342,6 +344,19 @@ const PaiDan = React.createClass({
       searchMore: !this.state.searchMore
     });
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
   render() {
     var departmentArr = this.state.departmentArr || [];
     const { RangePicker } = DatePicker;
@@ -350,80 +365,99 @@ const PaiDan = React.createClass({
         <div className="content-title">
           <span>派单管理</span>
         </div>
-        <div className="user-search">
-          <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 });
-            }}
-          />
-          <Select
-            placeholder="订单部门"
-            style={{ width: 150, marginRight: 10 }}
-            value={this.state.departmenttList}
-            onChange={e => {
-              this.setState({ departmenttList: e });
-            }}
-          >
-            {departmentArr.map(function(item) {
-              return <Select.Option key={item.id}>{item.name}</Select.Option>;
-            })}
-          </Select>
-          <Select
-            placeholder="流程状态"
-            onChange={e => {
-              this.setState({ processStatusSearch: e });
-            }}
-            style={{ width: 160, marginRight: 5 }}
-            value={this.state.processStatusSearch}
-          >
-            <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={[
-              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: 10 }}
-          >
-            搜索
-          </Button>
-          <Button onClick={this.reset}>重置</Button>
-        </div>
+        <Tabs defaultActiveKey="1" className="test">
+          <TabPane tab="搜索" key="1">
+            <div className="user-search">
+              <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 });
+                  }}
+              />
+              <Select
+                  placeholder="订单部门"
+                  style={{ width: 150, marginRight: 10 }}
+                  value={this.state.departmenttList}
+                  onChange={e => {
+                    this.setState({ departmenttList: e });
+                  }}
+              >
+                {departmentArr.map(function(item) {
+                  return <Select.Option key={item.id}>{item.name}</Select.Option>;
+                })}
+              </Select>
+              <Select
+                  placeholder="流程状态"
+                  onChange={e => {
+                    this.setState({ processStatusSearch: e });
+                  }}
+                  style={{ width: 160, marginRight: 5 }}
+                  value={this.state.processStatusSearch}
+              >
+                <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={[
+                    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: 10 }}
+              >
+                搜索
+              </Button>
+              <Button onClick={this.reset}>重置</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 className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+                columns={
+                  this.state.changeList
+                      ? this.state.changeList
+                      : this.state.columns
+                }
               dataSource={this.state.dataSource}
               scroll={{ x: 1500, y: 0 }}
               rowSelection={false}

+ 31 - 2
js/component/manageCenter/financialManage/flowWater/departWater.jsx

@@ -6,6 +6,7 @@ import {  Button, Input, Spin, Table,Select, Switch, message, DatePicker,Tabs }
 import { getTransactionProject, ShowModal } from "@/tools";
 import WaterDesc from './waterDetail';
 import ShowModalDiv from "@/showModal.jsx";
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const {TabPane} = Tabs
 const MyWater = React.createClass({
@@ -248,6 +249,19 @@ const MyWater = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() { 
         const { RangePicker } = DatePicker;
         let departmentArr = this.state.departmentArr || [];
@@ -331,16 +345,31 @@ const MyWater = React.createClass({
               </div>
             </div>
             </TabPane>
-            <TabPane tab="导出" key="2">
+             <TabPane tab="导出" key="2">
               <Button style={{ float: "left",margin:10 }} onClick={this.export}>
                   导出excel
                 </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.columns}
+                    columns={
+                        this.state.changeList
+                            ? this.state.changeList
+                            : this.state.columns
+                    }
                   dataSource={this.state.dataSource}
                   scroll={{ x: 1500, y: 0 }}
                   rowSelection={false}

+ 30 - 1
js/component/manageCenter/order/bonus/yxBonus.jsx

@@ -13,6 +13,7 @@ import {
 } from "@/tools";
 import BonuseDetail from '@/manageCenter/financialManage/bonus/bonusDetail';
 import ShowModalDiv from "@/showModal.jsx";
+import {ChooseList} from "../orderNew/chooseList";
 
 const { TabPane } = Tabs
 const YxBonus = React.createClass({
@@ -263,6 +264,19 @@ const YxBonus = React.createClass({
       searchMore: !this.state.searchMore
     });
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
   render() {
     const rowSelection = {
       selectedRowKeys: this.state.selectedRowKeys,
@@ -381,11 +395,26 @@ const YxBonus = React.createClass({
               <Button onClick={this.exportExec} style={{ margin: 10 }}>导出excel</Button>
             </div>
           </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" id="table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+              columns={
+                this.state.changeList
+                    ? this.state.changeList
+                    : this.state.columns
+              }
               dataSource={this.state.dataSource}
               rowSelection={false}
               pagination={this.state.pagination}

+ 31 - 2
js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx

@@ -8,6 +8,7 @@ import moment from 'moment';
 import '../../userMangagement.less';
 import {intentProgress,transactionProgress,contractProgress,projectProgress,orderType, orderStage, orderState,paymentState, projectState,orderChannel, approvedState, lock,paymentMethod,transactionChannel,specially} from '../../../../dataDic.js';
 import {getProjectState,getOrderType,getOrderStage,getOrderState,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel} from '../../../../tools.js';
+import {ChooseList} from "../../orderNew/chooseList";
 
 
 const {TabPane} = Tabs
@@ -396,6 +397,19 @@ const ServiceManage=Form.create()(React.createClass({
     	})
         this.loadData();
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     reset() {
     	this.setState({
     		signBillVisible:false
@@ -445,7 +459,18 @@ const ServiceManage=Form.create()(React.createClass({
             defaultActiveKey="1"
             onChange={this.callback}
             className="test">
-             <TabPane tab="搜索" key="1">
+            <TabPane tab="更改表格显示数据" key="1">
+                <div style={{ marginLeft: 10 }}>
+                    <ChooseList
+                        columns={this.state.columns}
+                        changeFn={this.changeList}
+                        changeList={this.state.changeList}
+                        top={55}
+                        margin={11}
+                    />
+                </div>
+            </TabPane>
+             <TabPane tab="搜索" key="2">
 	                <div className="user-search">
 	                    <Input placeholder="客户名称" style={{width:'150px',marginLeft:10}}
 	                        value={this.state.customerName}
@@ -531,7 +556,11 @@ const ServiceManage=Form.create()(React.createClass({
                     </Tabs>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

+ 32 - 3
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx

@@ -26,6 +26,7 @@ import {
   ShowModal
 } from "../../../../tools.js";
 import ShowModalDiv from "@/showModal.jsx";
+import {ChooseList} from "../../orderNew/chooseList";
 const {TabPane} = Tabs
 const MyService=Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -410,6 +411,19 @@ const MyService=Form.create()(React.createClass({
 		this.state.intentOrder=true;
         this.loadData();       
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
     	const FormItem = Form.Item;
     	const formItemLayout = {
@@ -442,7 +456,18 @@ const MyService=Form.create()(React.createClass({
             defaultActiveKey="1"
             onChange={this.callback}
             className="test">
-             <TabPane tab="搜索" key="1">
+              <TabPane tab="更改表格显示数据" key="1">
+                  <div style={{ marginLeft: 10 }}>
+                      <ChooseList
+                          columns={this.state.columns}
+                          changeFn={this.changeList}
+                          changeList={this.state.changeList}
+                          top={55}
+                          margin={11}
+                      />
+                  </div>
+              </TabPane>
+             <TabPane tab="搜索" key="2">
               <div className="user-search">
                 <Input
                   placeholder="客户名称"
@@ -598,7 +623,7 @@ const MyService=Form.create()(React.createClass({
                 </div>
               </div>
               </TabPane>
-              <TabPane tab="开单" key="2">
+              <TabPane tab="开单" key="3">
               <Button
                   type="primary"
                   className="addButton"
@@ -613,7 +638,11 @@ const MyService=Form.create()(React.createClass({
               <div className="patent-table">
                 <Spin spinning={this.state.loading}>
                   <Table
-                    columns={this.state.columns}
+                      columns={
+                          this.state.changeList
+                              ? this.state.changeList
+                              : this.state.columns
+                      }
                     dataSource={this.state.dataSource}
                     rowSelection={rowSelection}
                     pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx

@@ -8,6 +8,7 @@ import moment from 'moment';
 import '../../userMangagement.less';
 import {orderState,paymentState,orderChannel} from '../../../../dataDic.js';
 import {getOrderState,getPaymentState,getOrderChannel,getProjectState,getApprovedState,getOrderType } from '../../../../tools.js';
+import {ChooseList} from "../../orderNew/chooseList";
 
 
 const {TabPane} = Tabs
@@ -326,6 +327,19 @@ const ApproveOrder=Form.create()(React.createClass({
 		this.state.paymentStateSearch  = undefined;
         this.loadData();       
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -404,10 +418,25 @@ const ApproveOrder=Form.create()(React.createClass({
 	                    </div>
 	                </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 className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                                }
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/order/orderManagement/publicOrder/publicOrder.jsx

@@ -8,6 +8,7 @@ import moment from 'moment';
 import '../../userMangagement.less';
 import {orderState,orderChannel,orderType} from '../../../../dataDic.js';
 import {getOrderState,getOrderChannel,getPaymentState,getOrderType} from '../../../../tools.js';
+import {ChooseList} from "../../orderNew/chooseList";
 
 const {TabPane} = Tabs
 const PublicOrder=Form.create()(React.createClass({
@@ -371,6 +372,19 @@ const PublicOrder=Form.create()(React.createClass({
 		this.state.orderTypeSearch=undefined;
         this.loadData();       
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -445,10 +459,25 @@ const PublicOrder=Form.create()(React.createClass({
 	                    </div>
 	                </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 className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

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

@@ -4892,7 +4892,7 @@ const NewService = Form.create()(
                                   {/*  }}*/}
                                   {/*/>*/}
                                   <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                                    {this.state.orgCodeUrl && this.state.visible && this.state.activeKey === '1'? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                                    {this.state.orgCodeUrl && this.state.visible && this.state.activeKey === '1'? <ImgList domId={'addService3'} fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
                                   </div>
                                   <Modal
                                     maskClosable={false}
@@ -4977,7 +4977,7 @@ const NewService = Form.create()(
                                   <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
                                     {
                                       this.state.visible && this.state.activeKey === '1' && this.state.replenishUrl?
-                                          <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/> :
+                                          <ImgList domId={'addService4'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> :
                                           <div/>
                                     }
                                   </div>
@@ -5747,7 +5747,7 @@ const NewService = Form.create()(
                               >
                                 {/* {!this.state.mark ? ( */}
                                 <PicturesWall
-                                  domId={'addService3'}
+                                  domId={'addService5'}
                                   fileList={this.getVoucherUrl}
                                   pictureUrl={this.state.voucherUrl}
                                   url="/api/admin/orderChange/uploadFile"
@@ -6785,7 +6785,7 @@ const NewService = Form.create()(
                     label="终止合同"
                   >
                     <Picture
-                      domId={'addService4'}
+                      domId={'addService6'}
                       fileList={(e) => {
                         this.setState({ contractUrl: e });
                       }}
@@ -6806,7 +6806,7 @@ const NewService = Form.create()(
                     label="退单申请表"
                   >
                     <Picture
-                      domId={'addService5'}
+                      domId={'addService7'}
                       fileList={(e) => {
                         this.setState({ applicationUrl: e });
                       }}

+ 30 - 1
js/component/manageCenter/order/orderNew/arrearsList.jsx

@@ -22,6 +22,7 @@ import {
   ShowModal,
 } from "@/tools.js";
 import "./customer.less";
+import {ChooseList} from "./chooseList";
 
 const ArrearsList = Form.create()(
   React.createClass({
@@ -308,6 +309,19 @@ const ArrearsList = Form.create()(
         }.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
+      });
+    },
     render() {
       const formItemLayout = {
         labelCol: { span: 8 },
@@ -439,11 +453,26 @@ const ArrearsList = Form.create()(
                   导出催款列表
                 </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.columns}
+                    columns={
+                      this.state.changeList
+                          ? this.state.changeList
+                          : this.state.columns
+                    }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   scroll={{ x: "max-content", y: 0 }}

+ 30 - 1
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -19,6 +19,7 @@ import './customer.less';
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "./chooseList";
 
 const IntentionCustomer = Form.create()(
   React.createClass({
@@ -942,6 +943,19 @@ const IntentionCustomer = Form.create()(
       });
       this.resets();
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     render() {
       const formItemLayout = {
         labelCol: { span: 8 },
@@ -1036,11 +1050,26 @@ const IntentionCustomer = Form.create()(
                 </Button>
                 <Button onClick={this.reset}>重置</Button>
               </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 className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
-                  columns={this.state.columns}
+                  columns={
+                    this.state.changeList
+                        ? this.state.changeList
+                        : this.state.columns
+                  }
                   dataSource={this.state.dataSource}
                   rowSelection={rowSelection}
                   pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -30,6 +30,7 @@ import {
 import './customer.less'
 import ResolutionDetail from '@/resolutionDetail'
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "./chooseList";
 
 const checkOutsourcing = Form.create()(
   React.createClass({
@@ -1123,6 +1124,19 @@ const checkOutsourcing = Form.create()(
         rotateDeg,
       })
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     render() {
       const formItemLayout = {
         labelCol: { span: 8 },
@@ -1209,11 +1223,26 @@ const checkOutsourcing = Form.create()(
                 <Button onClick={this.reset}>重置</Button>
               </div>
             </TabPane>
+            <TabPane tab="更改表格显示数据" key="ChooseList">
+              <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.columns}
+                columns={
+                  this.state.changeList
+                      ? this.state.changeList
+                      : this.state.columns
+                }
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
                 onRowClick={this.tableRowClick}

+ 30 - 1
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -18,6 +18,7 @@ import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
+import {ChooseList} from "./chooseList";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -1093,6 +1094,19 @@ const contractChange = Form.create()(
         }
       });
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     render() {
       const tabList = this.state.tabList || [];
       const formItemLayout = {
@@ -1117,13 +1131,28 @@ const contractChange = Form.create()(
                   <SearchInput search={this.search} />
                 </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 className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
                   size="small"
                   bordered
-                  columns={this.state.columns}
+                  columns={
+                    this.state.changeList
+                        ? this.state.changeList
+                        : this.state.columns
+                  }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}

+ 30 - 1
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -18,6 +18,7 @@ import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
+import {ChooseList} from "./chooseList";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -1100,6 +1101,19 @@ const contractChange = Form.create()(
         }
       });
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     render() {
       const tabList = this.state.tabList || [];
       const formItemLayout = {
@@ -1124,13 +1138,28 @@ const contractChange = Form.create()(
                   <SearchInput search={this.search} />
                 </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 className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
                   size="small"
                   bordered
-                  columns={this.state.columns}
+                  columns={
+                    this.state.changeList
+                        ? this.state.changeList
+                        : this.state.columns
+                  }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}

+ 32 - 1
js/component/manageCenter/order/orderNew/costAuditList/index.js

@@ -14,6 +14,7 @@ import './index.less';
 import "../customer.less";
 import CheckProject from "../../../components/checkProject";
 import PayRecord from "../../../components/checkProject/payRecord";
+import {ChooseList} from "../chooseList";
 
 const { TabPane } = Tabs;
 
@@ -220,6 +221,7 @@ class CostAuditList extends Component{
         }
         this.printAll = this.printAll.bind(this);
         this.exportExec = this.exportExec.bind(this);
+        this.changeList = this.changeList.bind(this);
     }
 
     componentDidMount() {
@@ -362,6 +364,20 @@ class CostAuditList extends Component{
         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">
@@ -405,11 +421,26 @@ class CostAuditList extends Component{
                           导出财务成本列表
                       </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.columns}
+                          columns={
+                              this.state.changeList
+                                  ? this.state.changeList
+                                  : this.state.columns
+                          }
                           dataSource={this.state.dataSource}
                           pagination={this.state.pagination}
                           onRowClick={(record)=>{

+ 30 - 1
js/component/manageCenter/order/orderNew/examine.jsx

@@ -35,6 +35,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import ResolutionDetail from "@/resolutionDetail";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "./chooseList";
 const confirm = Modal.confirm;
 const { Option } = Select;
 //图片组件
@@ -1313,6 +1314,19 @@ const IntentionCustomer = Form.create()(
         rotateDeg,
       });
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     render() {
       const formItemLayout = {
         labelCol: { span: 8 },
@@ -1415,11 +1429,26 @@ const IntentionCustomer = Form.create()(
                 <Button onClick={this.reset}>重置</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 className="patent-table">
             <Spin spinning={this.state.loading}>
               <Table
-                columns={this.state.columns}
+                columns={
+                  this.state.changeList
+                      ? this.state.changeList
+                      : this.state.columns
+                }
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
                 onRowClick={this.tableRowClick}

+ 32 - 1
js/component/manageCenter/order/orderNew/glCostAuditList/index.js

@@ -13,6 +13,7 @@ import OrderPaymentModal from './component/orderPaymentModal';
 import './index.less';
 import "../customer.less";
 import PayRecord from "../../../components/checkProject/payRecord";
+import {ChooseList} from "../chooseList";
 
 const { TabPane } = Tabs;
 
@@ -218,6 +219,7 @@ class CostAuditList extends Component{
             orderPaymentsId: 0,
         }
         this.exportExec = this.exportExec.bind(this);
+        this.changeList = this.changeList.bind(this);
     }
 
     componentDidMount() {
@@ -295,6 +297,20 @@ class CostAuditList extends Component{
         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">
@@ -330,11 +346,26 @@ class CostAuditList extends Component{
                           导出财务成本列表
                       </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.columns}
+                          columns={
+                              this.state.changeList
+                                  ? this.state.changeList
+                                  : this.state.columns
+                          }
                           dataSource={this.state.dataSource}
                           pagination={this.state.pagination}
                           onRowClick={(record)=>{

+ 30 - 1
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -36,6 +36,7 @@ import ResolutionDetail from "@/resolutionDetail";
 const confirm = Modal.confirm;
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "./chooseList";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -1450,6 +1451,19 @@ const outsourcingList = Form.create()(
         onCancel() {},
       });
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     render() {
       const formItemLayout = {
         labelCol: { span: 8 },
@@ -1542,11 +1556,26 @@ const outsourcingList = Form.create()(
                 </Button>
                 <Button onClick={this.reset}>重置</Button>
               </TabPane>
+              <TabPane tab="更改表格显示数据" key="ChooseList">
+                <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.columns}
+                    columns={
+                      this.state.changeList
+                          ? this.state.changeList
+                          : this.state.columns
+                    }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}

+ 30 - 1
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -38,6 +38,7 @@ import CheckProject from '../../components/checkProject'
 import { taskStatus, projectStatus, cuiJieDian } from '@/dataDic.js'
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "./chooseList";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -1318,6 +1319,19 @@ const outsourcingPro = Form.create()(
         rotateDeg,
       });
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
 
     render() {
       const formItemLayout = {
@@ -1421,11 +1435,26 @@ const outsourcingPro = Form.create()(
                 </Button>
                 <Button onClick={this.reset}>重置</Button>
               </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 className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
-                  columns={this.state.columns}
+                    columns={
+                      this.state.changeList
+                          ? this.state.changeList
+                          : this.state.columns
+                    }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}

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

@@ -4,6 +4,7 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import { getLiquidationStatus,getjiedian,getNewOrderStatus,getProjectStatus} from '@/tools.js';
 import './customer.less';
+import {ChooseList} from "./chooseList";
 
 
 const IntentionCustomer = Form.create()(React.createClass({
@@ -459,6 +460,19 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.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
+        });
+    },
 	render() {
 		const formItemLayout = {
 			labelCol: { span: 8 },
@@ -582,11 +596,26 @@ const IntentionCustomer = Form.create()(React.createClass({
                 导出催款列表
               </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.columns}
+                  columns={
+                      this.state.changeList
+                          ? this.state.changeList
+                          : this.state.columns
+                  }
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
                 onRowClick={this.tableRowClick}

+ 30 - 1
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -4,6 +4,7 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import { getLiquidationStatus,getjiedian,getNewOrderStatus,getProjectStatus} from '@/tools.js';
 import './customer.less';
+import {ChooseList} from "./chooseList";
 
 
 const IntentionCustomer = Form.create()(React.createClass({
@@ -462,6 +463,19 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.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
+		});
+	},
 	render() {
 		const formItemLayout = {
 			labelCol: { span: 8 },
@@ -578,12 +592,27 @@ const IntentionCustomer = Form.create()(React.createClass({
           </Button>
           <Button onClick={this.reset}>重置</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>
           <div className="patent-table">
             <Spin spinning={this.state.loading}>
               <Table
-                columns={this.state.columns}
+				  columns={
+					  this.state.changeList
+						  ? this.state.changeList
+						  : this.state.columns
+				  }
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
                 scroll={{ x: "max-content", y: 0 }}

+ 31 - 2
js/component/manageCenter/order/orderNew/reject.jsx

@@ -35,6 +35,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import { cuiJieDian } from "@/dataDic.js";
 import ResolutionDetail from "@/resolutionDetail";
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "./chooseList";
 //图片组件
 const PicturesWall = React.createClass({
 	getInitialState() {
@@ -1971,6 +1972,19 @@ const IntentionCustomer = Form.create()(
         commodityName: e,
       });
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     render() {
       const formItemLayout = {
         labelCol: { span: 8 },
@@ -2031,7 +2045,18 @@ const IntentionCustomer = Form.create()(
               onChange={this.callback}
               className="test"
             >
-              <TabPane tab="搜索" key="1">
+              <TabPane tab="更改表格显示数据" key="1">
+                <div style={{ marginLeft: 10 }}>
+                  <ChooseList
+                      columns={this.state.columns}
+                      changeFn={this.changeList}
+                      changeList={this.state.changeList}
+                      top={55}
+                      margin={11}
+                  />
+                </div>
+              </TabPane>
+              <TabPane tab="搜索" key="2">
                 <Input
                   placeholder="客户名称"
                   style={{
@@ -2081,7 +2106,11 @@ const IntentionCustomer = Form.create()(
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
-                  columns={this.state.columns}
+                  columns={
+                    this.state.changeList
+                        ? this.state.changeList
+                        : this.state.columns
+                  }
                   dataSource={this.state.dataSource}
                   rowSelection={rowSelection}
                   pagination={this.state.pagination}

+ 26 - 1
js/component/manageCenter/order/orderStatistics/orderStatistics.jsx

@@ -5,6 +5,7 @@ import $ from 'jquery/src/ajax';
 import './report.less';
 import { post,taskStatus,publishStatus } from '../../../dataDic.js';
 import moment from 'moment';
+import {ChooseList} from "../orderNew/chooseList";
 const TabPane = Tabs.TabPane;
 
 const DiurnalStatistics = React.createClass({
@@ -737,6 +738,19 @@ const DiurnalStatistics = React.createClass({
 			Nowtime:nowTime
 		})
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		const { RangePicker } = DatePicker;
 		let departmentArr = this.state.departmentArr || [];
@@ -785,6 +799,13 @@ const DiurnalStatistics = React.createClass({
 		                            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 }); }} />
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
                         </div>
                   	
 				</div>
@@ -797,7 +818,11 @@ const DiurnalStatistics = React.createClass({
 		                    <Spin spinning={this.state.loading}>
 								<Table 
 								    size="small"
-								    columns={this.state.columns}
+									columns={
+										this.state.changeList
+											? this.state.changeList
+											: this.state.columns
+									}
 		                            dataSource={this.state.dataSource}
 		                            bordered
 		                            onChange={this.tabChange}

+ 30 - 1
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -30,6 +30,7 @@ import {
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const {TabPane} = Tabs
 
@@ -994,6 +995,19 @@ const PaiDan = React.createClass({
       }.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
+    });
+  },
   render() {
     const rowSelection = {
       selectedRowKeys: this.state.selectedRowKeys,
@@ -1109,11 +1123,26 @@ const PaiDan = React.createClass({
               </div>
             </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 className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+                columns={
+                  this.state.changeList
+                      ? this.state.changeList
+                      : this.state.columns
+                }
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick.bind(this)}

+ 40 - 2
js/component/manageCenter/project/project/projectQuery.jsx

@@ -20,6 +20,7 @@ import {
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const {TabPane} = Tabs
 const PaiDan = React.createClass({
@@ -448,6 +449,15 @@ const PaiDan = React.createClass({
     this.state.distribution = undefined;
     this.loadData(this.state.page);
   },
+  resetAll() {
+    this.state.nameSearch = "";
+    this.state.customerName = "";
+    this.state.releaseDate = [];
+    this.state.orderNoSearch = "";
+    this.state.departmenttSearch = undefined;
+    this.state.distribution = undefined;
+    this.loadData();
+  },
   searchSwitch() {
     this.setState({
       searchMore: !this.state.searchMore
@@ -667,6 +677,19 @@ const PaiDan = React.createClass({
       rotateDeg
     });
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
   render() {
     const rowSelection = {
       selectedRowKeys: this.state.selectedRowKeys,
@@ -748,7 +771,7 @@ const PaiDan = React.createClass({
               <Button type="primary" onClick={this.search}>
                 搜索
               </Button>
-              <Button onClick={this.reset}>重置</Button>
+              <Button onClick={this.resetAll}>重置</Button>
               <span>
                 更多搜索
                 <Switch
@@ -777,11 +800,26 @@ const PaiDan = React.createClass({
               </div>
             </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 className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+                columns={
+                  this.state.changeList
+                      ? this.state.changeList
+                      : this.state.columns
+                }
               dataSource={this.state.dataSource}
               rowSelection={rowSelection}
               pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -33,6 +33,7 @@ import {
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
+import {ChooseList} from "../../order/orderNew/chooseList";
 const zxsglyOutSourcingPaiDan = React.createClass({
   loadData(pageNo) {
     this.state.data = [];
@@ -1188,6 +1189,19 @@ const zxsglyOutSourcingPaiDan = React.createClass({
       }.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
+    });
+  },
   render() {
     const { TabPane } = Tabs;
     const formItemLayout = {
@@ -1285,11 +1299,26 @@ const zxsglyOutSourcingPaiDan = React.createClass({
               </div>
             </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 className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+                columns={
+                  this.state.changeList
+                      ? this.state.changeList
+                      : this.state.columns
+                }
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick.bind(this)}