Browse Source

11-11买买买

hujie123456 5 years ago
parent
commit
74f62892c7
34 changed files with 2319 additions and 1362 deletions
  1. 5 2
      js/component/manageCenter/financialManage/distribute/inSpecial.jsx
  2. 5 2
      js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx
  3. 5 1
      js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx
  4. 96 53
      js/component/manageCenter/financialManage/flowWater/departWater.jsx
  5. 4 2
      js/component/manageCenter/financialManage/flowWater/myWater.jsx
  6. 1 1
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  7. 245 144
      js/component/manageCenter/idea/policy/inquiry.jsx
  8. 122 66
      js/component/manageCenter/order/bonus/yxBonus.jsx
  9. 206 97
      js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx
  10. 488 296
      js/component/manageCenter/order/orderNew/approveds.jsx
  11. 15 2
      js/component/manageCenter/order/orderNew/billing.jsx
  12. 14 1
      js/component/manageCenter/order/orderNew/chargeback.jsx
  13. 5 1
      js/component/manageCenter/order/orderNew/contractCwzj.js
  14. 5 1
      js/component/manageCenter/order/orderNew/contractCwzy.js
  15. 5 1
      js/component/manageCenter/order/orderNew/contractJsjl.js
  16. 5 1
      js/component/manageCenter/order/orderNew/contractJsy.js
  17. 5 2
      js/component/manageCenter/order/orderNew/contractJszj.js
  18. 5 2
      js/component/manageCenter/order/orderNew/contractYxgly.js
  19. 5 1
      js/component/manageCenter/order/orderNew/contractYxy.js
  20. 5 1
      js/component/manageCenter/order/orderNew/examine.jsx
  21. 14 2
      js/component/manageCenter/order/orderNew/inquiry.jsx
  22. 5 1
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  23. 1 5
      js/component/manageCenter/order/orderNew/reject.jsx
  24. 5 1
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  25. 5 1
      js/component/manageCenter/project/project/projectAssignment.jsx
  26. 13 2
      js/component/manageCenter/project/project/projectQuery.jsx
  27. 12 2
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  28. 5 1
      js/component/manageCenter/project/task/myTask.jsx
  29. 5 1
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  30. 5 1
      js/component/manageCenter/project/task/taskAssignment.jsx
  31. 13 1
      js/component/manageCenter/project/task/taskCount.jsx
  32. 958 640
      js/component/manageCenter/project/task/taskQuery.jsx
  33. 26 24
      js/component/showModal.jsx
  34. 6 3
      js/component/tools.js

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

@@ -19,10 +19,11 @@ import {
   getprovince,
   getStatus,
   getPeople,
-  splitUrl
+  splitUrl,
+  ShowModal
 } from "@/tools";
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
-
+import ShowModalDiv from "@/showModal.jsx";
 const FormItem = Form.Item;
 
 const inSpecial = React.createClass({
@@ -88,6 +89,7 @@ const inSpecial = React.createClass({
         approval: this.state.processStatus
       },
       success: function(data) {
+        ShowModal(this);
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -593,6 +595,7 @@ const inSpecial = React.createClass({
     var departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content" style={{ position: "relative" }}>
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>省内特批</span>
         </div>

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

@@ -19,10 +19,11 @@ import {
   getprovince,
   getStatus,
   getPeople,
-  splitUrl
+  splitUrl,
+  ShowModal
 } from "@/tools";
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
-
+import ShowModalDiv from "@/showModal.jsx";
 const FormItem = Form.Item;
 
 const invoiceApplyList = React.createClass({
@@ -85,6 +86,7 @@ const invoiceApplyList = React.createClass({
         type: 0
       },
       success: function(data) {
+        ShowModal(this);
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -584,6 +586,7 @@ const invoiceApplyList = React.createClass({
     var departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>省内开票审核</span>
         </div>

+ 5 - 1
js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx

@@ -20,8 +20,10 @@ import {
   getprovince,
   getStatus,
   getPeople,
-  splitUrl
+  splitUrl,
+  ShowModal
 } from "@/tools";
+import ShowModalDiv from "@/showModal.jsx";
 
 const FormItem = Form.Item;
 
@@ -87,6 +89,7 @@ const outInvoiceQuery = React.createClass({
         approval: this.state.processStatus
       },
       success: function(data) {
+        ShowModal(this);
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -548,6 +551,7 @@ const outInvoiceQuery = React.createClass({
     var departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>省外开票查询</span>
         </div>

+ 96 - 53
js/component/manageCenter/financialManage/flowWater/departWater.jsx

@@ -3,9 +3,9 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '../distribute/public.less';
 import {  Button, Input, Spin, Table,Select, Switch, message, DatePicker } from 'antd';
-import {getTransactionProject } from '@/tools';
+import { getTransactionProject, ShowModal } from "@/tools";
 import WaterDesc from './waterDetail';
-
+import ShowModalDiv from "@/showModal.jsx";
 const MyWater = React.createClass({
     departmentList() {
 		this.setState({
@@ -68,6 +68,7 @@ const MyWater = React.createClass({
                 orderNo:this.state.orderNo,
             },
             success: function (data) {
+                ShowModal(this);
                 let theArr = [];
                 if (!data.data || !data.data.list) {
                     if (data.error && data.error.length) {
@@ -245,59 +246,101 @@ const MyWater = React.createClass({
     render() { 
         const { RangePicker } = DatePicker;
         let departmentArr = this.state.departmentArr || [];
-        return ( <div className="user-content">
+        return (
+          <div className="user-content">
+            <ShowModalDiv ShowModal={this.state.showModal} />
             <div className="content-title">
-                <span>部门流水订单</span>
-                </div>
-                <div className="user-search">
-                    <Select placeholder="订单部门"
-                        style={{ width: 150 ,marginRight:10}}
-                        value={this.state.departmentId}
-                        onChange={(e) => { this.setState({ departmentId: e }) }}>
-                        {
-                            departmentArr.map(function (item) {
-                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
-                            })
-                        }
-                    </Select>
-                    <Input placeholder="订单编号"
-                        value={this.state.orderNo}
-                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
-                    <Input placeholder="收款方"
-                        value={this.state.payeeNameSearch}
-                        onChange={(e) => { this.setState({ payeeNameSearch: e.target.value }); }} /> 
-                    <Input placeholder="付款方"
-                        value={this.state.payerNameSearch}
-                        onChange={(e) => { this.setState({ payerNameSearch: e.target.value }); }} />  
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>
-                    <Button style={{float:"right"}} onClick={this.export}>导出excel</Button>
-                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                        <span>流水时间 :</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 }); }} />
-                    </div>
-                </div>
-                <div className="patent-table">
-                    <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
-                            dataSource={this.state.dataSource}
-							scroll={{ x: 1500, y: 0 }}
-                            rowSelection={false}
-                            pagination={this.state.pagination}
-                            onRowClick={this.tableRowClick}
-                             />
-                    </Spin>
-                </div>
-                <WaterDesc
-                    data={this.state.RowData}
-                    showDesc={this.state.showDesc}
-                    closeDesc={this.closeDesc.bind(this)}
+              <span>部门流水订单</span>
+            </div>
+            <div className="user-search">
+              <Select
+                placeholder="订单部门"
+                style={{ width: 150, marginRight: 10 }}
+                value={this.state.departmentId}
+                onChange={e => {
+                  this.setState({ departmentId: e });
+                }}
+              >
+                {departmentArr.map(function(item) {
+                  return (
+                    <Select.Option key={item.id}>{item.name}</Select.Option>
+                  );
+                })}
+              </Select>
+              <Input
+                placeholder="订单编号"
+                value={this.state.orderNo}
+                onChange={e => {
+                  this.setState({ orderNo: e.target.value });
+                }}
+              />
+              <Input
+                placeholder="收款方"
+                value={this.state.payeeNameSearch}
+                onChange={e => {
+                  this.setState({ payeeNameSearch: e.target.value });
+                }}
+              />
+              <Input
+                placeholder="付款方"
+                value={this.state.payerNameSearch}
+                onChange={e => {
+                  this.setState({ payerNameSearch: e.target.value });
+                }}
+              />
+              <Button type="primary" onClick={this.search}>
+                搜索
+              </Button>
+              <Button onClick={this.reset}>重置</Button>
+              <Button style={{ float: "right" }} onClick={this.export}>
+                导出excel
+              </Button>
+              <span>
+                更多搜索
+                <Switch
+                  defaultChecked={false}
+                  onChange={this.searchSwitch.bind(this)}
                 />
-        </div> )
+              </span>
+              <div
+                className="search-more"
+                style={this.state.searchMore ? { display: "none" } : {}}
+              >
+                <span>流水时间 :</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 });
+                  }}
+                />
+              </div>
+            </div>
+            <div className="patent-table">
+              <Spin spinning={this.state.loading}>
+                <Table
+                  columns={this.state.columns}
+                  dataSource={this.state.dataSource}
+                  scroll={{ x: 1500, y: 0 }}
+                  rowSelection={false}
+                  pagination={this.state.pagination}
+                  onRowClick={this.tableRowClick}
+                />
+              </Spin>
+            </div>
+            <WaterDesc
+              data={this.state.RowData}
+              showDesc={this.state.showDesc}
+              closeDesc={this.closeDesc.bind(this)}
+            />
+          </div>
+        );
     }
 })
  

+ 4 - 2
js/component/manageCenter/financialManage/flowWater/myWater.jsx

@@ -4,10 +4,10 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '../distribute/public.less';
 import {  Button, Input, Spin, Table, Switch,Select, message, DatePicker } from 'antd';
-import {getTransactionProject} from '@/tools';
+import { getTransactionProject, ShowModal } from "@/tools";
 import WaterDesc from './waterDetail';
 import { ChooseList } from "../../order/orderNew/chooseList";
-
+import ShowModalDiv from "@/showModal.jsx";
 const MyWater = React.createClass({
   departmentList() {
     this.setState({
@@ -72,6 +72,7 @@ const MyWater = React.createClass({
         departmentId: this.state.departmentId
       },
       success: function(data) {
+        ShowModal(this);
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -267,6 +268,7 @@ const MyWater = React.createClass({
     var departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>我的流水订单</span>
         </div>

+ 1 - 1
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -590,7 +590,7 @@ const OrderDetail = Form.create()(React.createClass({
                     wrapperCol={{ span: 18 }}
                     label="订单留言"
                   >
-                    <p style={{ width: 500, wordWrap: "break-word" }}>
+                    <p style={{ maxWidth: 500, wordWrap: "break-word" }}>
                       {this.state.orderRemarks}
                     </p>
                   </FormItem>

+ 245 - 144
js/component/manageCenter/idea/policy/inquiry.jsx

@@ -9,10 +9,17 @@ import moment from 'moment';
 import { citySelect,provinceList,areaSelect,provinceSelect,addressList} from '../../../NewDicProvinceList';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,AutoComplete,Tabs,Checkbox,Tree,Cascader} from 'antd';
 import {patternOrganization,conditionOrganization,intentionalService,messageType,designatedObjects,socialAttributeS,industry,socialAttribute,industryS,designatedObjectse,auditStatusL} from '../../../dataDic.js';
-import {beforeUpload, getBase64,getprovince,getauditStatus} from '../../../tools.js';
+import {
+  beforeUpload,
+  getBase64,
+  getprovince,
+  getauditStatus,
+  ShowModal
+} from "../../../tools.js";
 const TabPane = Tabs.TabPane;
 const TreeNodet = Tree.TreeNode;
 const CheckboxGroup = Checkbox.Group;
+import ShowModalDiv from "@/showModal.jsx";
 const Avatar = React.createClass({
     getInitialState() {
         return {
@@ -74,6 +81,7 @@ const Inquiry=React.createClass({
                 hot: this.state.searchHot, //是否放在首页                    
             },
             success: function (data) {
+                ShowModal(this);
                 let theArr = [];
                 if (!data.data || !data.data.list) {
                     if (data.error && data.error.length) {
@@ -420,149 +428,242 @@ const Inquiry=React.createClass({
             }
         };
         const hasSelected = this.state.selectedRowKeys.length > 0;
-        return(
-			 <div className="admin-content" >
-				 <div className="admin-content-search">
-				 	
-	                <Input placeholder="标题" style={{ width: 200 ,marginBottom:'10px',marginRight:'10px'}}
-	                    value={this.state.searchTitle}
-	                    onChange={(e) => { this.setState({ searchTitle: e.target.value }); }} />
-	                <Input placeholder="作者" style={{ width: 100 ,marginRight:'10px'}}
-	                    value={this.state.searchAuthor}
-	                    onChange={(e) => { this.setState({ searchAuthor: e.target.value }); }} />
-	                <Input placeholder="来源" style={{ width: 100 ,marginRight:'10px'}}
-	                    value={this.state.searchSource}
-	                    onChange={(e) => { this.setState({ searchSource: e.target.value }); }} />                                                   
-	                {this.props.newsType == 2 || this.props.newsType == 3 ? <Select placeholder="显示在首页"
-	                    style={{ width: 100,marginRight:'10px' }}
-	                    value={this.state.searchHot}
-	                    onChange={(e) => { this.setState({ searchHot: e }) }}>
-	                    <Select.Option value="0" >不显示</Select.Option>
-	                    <Select.Option value="1" >显示</Select.Option>
-	                </Select> : <span></span>}
-	                <span style={{marginRight:'10px'}}>发布时间</span>
-	                <DatePicker style={{ width: 110,marginRight:'10px' }}
-	                    format="YYYY-MM-DD"
-	                    placeholder="选择开始时间"
-	                    value={this.state.startDate ? moment(this.state.startDate, "YYYY-MM-DD") : undefined}
-	                    onChange={(t, str) => {
-	                        this.setState({ startDate: str });
-	                    }} />
-	                <span style={{marginRight:'10px'}}>到</span>
-	                <DatePicker style={{ width: 110 ,marginRight:'10px'}}
-	                    format="YYYY-MM-DD"
-	                    placeholder="选择结束时间"
-	                    value={this.state.endDate ? moment(this.state.endDate, "YYYY-MM-DD") : undefined}
-	                    onChange={(t, str) => {
-	                        this.setState({ endDate: str });
-	                    }} />
-	                <Button type="primary" onClick={() => { this.loadData(1,this.state.callnub) }} style={{marginRight:'10px'}}>搜索</Button>
-	                <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
-	                <Button type="ghost" onClick={this.clearCache}>清除缓存</Button>
-	            </div>
-				<div className="clearfix" style={{marginLeft:'20px'}}>
-				    <Tabs onChange={this.callback} type="card" activeKey={this.state.callnub} style={{paddingLeft:'15px',paddingRight:'15px',marginRight:'20px'}}>
-				         <TabPane tab="科技快讯" key="1" ></TabPane>
-						 <TabPane tab="交易问题" key="2"></TabPane>
-						 <TabPane tab="技淘动态" key="3"></TabPane>
-						 <TabPane tab="国家政策" key="4"></TabPane>
-						 <TabPane tab="地方政策" key="5"></TabPane>
-				    </Tabs>
-				</div>
-				<Spin spinning={this.state.loading}>
-                    <Table className="no-all-select" columns={this.state.columns}
-                        dataSource={this.state.tableData}
-                        pagination={this.state.pagination}
-                        rowSelection={rowSelection}
-                        onRowClick={this.tableRowClick} />
-                </Spin>
-                <Modal title="新闻详情" width={1000} className="news-modal"
-                    visible={this.state.visible}
-                    maskClosable={false}
-                    footer={null}
-                    afterClose={() => { this.state.RowData = {}; }}
-                    onCancel={() => { this.setState({ visible: false }) }} >
-                    <Spin spinning={this.state.loading}>
-                        <div className="clearfix">
-                            <div className="modal-box">
-                                <span className="modal-box-title">新闻标题 : </span>
-                                <div className="modal-box-detail">
-                                	<span>{this.state.RowData.title}</span>
-                                </div>
-                            </div>
-                            <div className="modal-box">
-                                <span className="modal-box-title">简介 : </span>
-                                <div className="modal-box-detail">
-                                    <span>{this.state.RowData.summary}</span>
-                                    
-                                </div>
-                            </div>
-                            <div className="modal-box">
-                                <span className="modal-box-title">来源:</span>
-                                <div className="modal-box-detail">
-                                	<span>{this.state.RowData.source}</span>
-                                    
-                                </div>
-                            </div>
-                            <div className="modal-box">
-                                <span className="modal-box-title">来源链接 : </span>
-                                <div className="modal-box-detail">
-                                	<span>{this.state.RowData.sourceUrl}</span>
-                                    
-                                </div>
-                            </div>
-                            <div className="modal-box" style={{ position: 'absolute', right: '0', width: '480px' }}>
-                                <span className="modal-box-title">标题图片</span>
-                                <div className="modal-box-detail clearfix" style={{ width: '360px' }}>
-                                    <Avatar sign={'news_title_picture'} visible={this.state.visible}
-                                        imageUrl={this.state.RowData.titleImg ? (globalConfig.avatarHost + "/upload" + this.state.RowData.titleImg) : null}
-                                        urlData={(url) => { this.state.RowData.titleImg = url }} />
-                                </div>
-                            </div>
-                        </div>
-                        <div className="clearfix">
-                            <div className="modal-box news-box">
-                                <span className="modal-box-title">作者 : </span>
-                                <div className="modal-box-detail">
-                                	<span>{this.state.RowData.author}</span>
-                                    
-                                </div>
-                            </div>
-                            <div className="modal-box news-box">
-                                <span className="modal-box-title">发布时间 : </span>
-                                <div className="modal-box-detail">
-                                	<span>{this.state.RowData.createTimeFormattedDate}</span>
-                                    
-                                </div>
-                            </div>   	                           
-                            {this.props.newsType == 2 || this.props.newsType == 3 ? <div className="modal-box news-box">
-                                <span className="modal-box-title">发布在首页</span>
-                                <div className="modal-box-detail">
-                                    <Radio.Group value={this.state.RowData.hot} onChange={(e) => {
-                                        this.state.RowData.hot = e.target.value;
-                                        this.setState({ RowData: this.state.RowData });
-                                    }} >
-                                        <Radio value={0}>否</Radio>
-                                        <Radio value={1}>是</Radio>
-                                    </Radio.Group>
-                                </div>
-                            </div> : <div></div>}
-                        </div>
-                        <div className="modal-box">
-                            <span className="modal-box-title">选择省份 : </span> 
-                            <span>{getprovince(this.state.RowData.provinceId)}</span>
-                            
-                        </div>
-                        <Editors textContent={this.state.RowData.content}
-                            uploadUrl={'/api/admin/news/upload'}
-                            uploadSign={'news_content_picture'}
-                            handleRichText={(value) => { this.state.RowData.content = value; }}
-                            visible={this.state.visible} readonly/>
-                        
-                    </Spin>
-                </Modal>
-			</div>
-		)
+        return (
+          <div className="admin-content">
+            <ShowModalDiv ShowModal={this.state.showModal} />
+            <div className="admin-content-search">
+              <Input
+                placeholder="标题"
+                style={{
+                  width: 200,
+                  marginBottom: "10px",
+                  marginRight: "10px"
+                }}
+                value={this.state.searchTitle}
+                onChange={e => {
+                  this.setState({ searchTitle: e.target.value });
+                }}
+              />
+              <Input
+                placeholder="作者"
+                style={{ width: 100, marginRight: "10px" }}
+                value={this.state.searchAuthor}
+                onChange={e => {
+                  this.setState({ searchAuthor: e.target.value });
+                }}
+              />
+              <Input
+                placeholder="来源"
+                style={{ width: 100, marginRight: "10px" }}
+                value={this.state.searchSource}
+                onChange={e => {
+                  this.setState({ searchSource: e.target.value });
+                }}
+              />
+              {this.props.newsType == 2 || this.props.newsType == 3 ? (
+                <Select
+                  placeholder="显示在首页"
+                  style={{ width: 100, marginRight: "10px" }}
+                  value={this.state.searchHot}
+                  onChange={e => {
+                    this.setState({ searchHot: e });
+                  }}
+                >
+                  <Select.Option value="0">不显示</Select.Option>
+                  <Select.Option value="1">显示</Select.Option>
+                </Select>
+              ) : (
+                <span></span>
+              )}
+              <span style={{ marginRight: "10px" }}>发布时间</span>
+              <DatePicker
+                style={{ width: 110, marginRight: "10px" }}
+                format="YYYY-MM-DD"
+                placeholder="选择开始时间"
+                value={
+                  this.state.startDate
+                    ? moment(this.state.startDate, "YYYY-MM-DD")
+                    : undefined
+                }
+                onChange={(t, str) => {
+                  this.setState({ startDate: str });
+                }}
+              />
+              <span style={{ marginRight: "10px" }}>到</span>
+              <DatePicker
+                style={{ width: 110, marginRight: "10px" }}
+                format="YYYY-MM-DD"
+                placeholder="选择结束时间"
+                value={
+                  this.state.endDate
+                    ? moment(this.state.endDate, "YYYY-MM-DD")
+                    : undefined
+                }
+                onChange={(t, str) => {
+                  this.setState({ endDate: str });
+                }}
+              />
+              <Button
+                type="primary"
+                onClick={() => {
+                  this.loadData(1, this.state.callnub);
+                }}
+                style={{ marginRight: "10px" }}
+              >
+                搜索
+              </Button>
+              <Button onClick={this.reset} style={{ marginRight: "10px" }}>
+                重置
+              </Button>
+              <Button type="ghost" onClick={this.clearCache}>
+                清除缓存
+              </Button>
+            </div>
+            <div className="clearfix" style={{ marginLeft: "20px" }}>
+              <Tabs
+                onChange={this.callback}
+                type="card"
+                activeKey={this.state.callnub}
+                style={{
+                  paddingLeft: "15px",
+                  paddingRight: "15px",
+                  marginRight: "20px"
+                }}
+              >
+                <TabPane tab="科技快讯" key="1"></TabPane>
+                <TabPane tab="交易问题" key="2"></TabPane>
+                <TabPane tab="技淘动态" key="3"></TabPane>
+                <TabPane tab="国家政策" key="4"></TabPane>
+                <TabPane tab="地方政策" key="5"></TabPane>
+              </Tabs>
+            </div>
+            <Spin spinning={this.state.loading}>
+              <Table
+                className="no-all-select"
+                columns={this.state.columns}
+                dataSource={this.state.tableData}
+                pagination={this.state.pagination}
+                rowSelection={rowSelection}
+                onRowClick={this.tableRowClick}
+              />
+            </Spin>
+            <Modal
+              title="新闻详情"
+              width={1000}
+              className="news-modal"
+              visible={this.state.visible}
+              maskClosable={false}
+              footer={null}
+              afterClose={() => {
+                this.state.RowData = {};
+              }}
+              onCancel={() => {
+                this.setState({ visible: false });
+              }}
+            >
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <div className="modal-box">
+                    <span className="modal-box-title">新闻标题 : </span>
+                    <div className="modal-box-detail">
+                      <span>{this.state.RowData.title}</span>
+                    </div>
+                  </div>
+                  <div className="modal-box">
+                    <span className="modal-box-title">简介 : </span>
+                    <div className="modal-box-detail">
+                      <span>{this.state.RowData.summary}</span>
+                    </div>
+                  </div>
+                  <div className="modal-box">
+                    <span className="modal-box-title">来源:</span>
+                    <div className="modal-box-detail">
+                      <span>{this.state.RowData.source}</span>
+                    </div>
+                  </div>
+                  <div className="modal-box">
+                    <span className="modal-box-title">来源链接 : </span>
+                    <div className="modal-box-detail">
+                      <span>{this.state.RowData.sourceUrl}</span>
+                    </div>
+                  </div>
+                  <div
+                    className="modal-box"
+                    style={{ position: "absolute", right: "0", width: "480px" }}
+                  >
+                    <span className="modal-box-title">标题图片</span>
+                    <div
+                      className="modal-box-detail clearfix"
+                      style={{ width: "360px" }}
+                    >
+                      <Avatar
+                        sign={"news_title_picture"}
+                        visible={this.state.visible}
+                        imageUrl={
+                          this.state.RowData.titleImg
+                            ? globalConfig.avatarHost +
+                              "/upload" +
+                              this.state.RowData.titleImg
+                            : null
+                        }
+                        urlData={url => {
+                          this.state.RowData.titleImg = url;
+                        }}
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div className="clearfix">
+                  <div className="modal-box news-box">
+                    <span className="modal-box-title">作者 : </span>
+                    <div className="modal-box-detail">
+                      <span>{this.state.RowData.author}</span>
+                    </div>
+                  </div>
+                  <div className="modal-box news-box">
+                    <span className="modal-box-title">发布时间 : </span>
+                    <div className="modal-box-detail">
+                      <span>{this.state.RowData.createTimeFormattedDate}</span>
+                    </div>
+                  </div>
+                  {this.props.newsType == 2 || this.props.newsType == 3 ? (
+                    <div className="modal-box news-box">
+                      <span className="modal-box-title">发布在首页</span>
+                      <div className="modal-box-detail">
+                        <Radio.Group
+                          value={this.state.RowData.hot}
+                          onChange={e => {
+                            this.state.RowData.hot = e.target.value;
+                            this.setState({ RowData: this.state.RowData });
+                          }}
+                        >
+                          <Radio value={0}>否</Radio>
+                          <Radio value={1}>是</Radio>
+                        </Radio.Group>
+                      </div>
+                    </div>
+                  ) : (
+                    <div></div>
+                  )}
+                </div>
+                <div className="modal-box">
+                  <span className="modal-box-title">选择省份 : </span>
+                  <span>{getprovince(this.state.RowData.provinceId)}</span>
+                </div>
+                <Editors
+                  textContent={this.state.RowData.content}
+                  uploadUrl={"/api/admin/news/upload"}
+                  uploadSign={"news_content_picture"}
+                  handleRichText={value => {
+                    this.state.RowData.content = value;
+                  }}
+                  visible={this.state.visible}
+                  readonly
+                />
+              </Spin>
+            </Modal>
+          </div>
+        );
 	}
 })
 

+ 122 - 66
js/component/manageCenter/order/bonus/yxBonus.jsx

@@ -4,9 +4,15 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '@/manageCenter/financialManage/distribute/public.less';
 import {  Button, Input, Spin, Table,Select, Switch, message, DatePicker } from 'antd';
-import {getNewOrderStatus,getProjectStatus,getJsyPaymentType,getBonusState} from '@/tools';
+import {
+  getNewOrderStatus,
+  getProjectStatus,
+  getJsyPaymentType,
+  getBonusState,
+  ShowModal
+} from "@/tools";
 import BonuseDetail from '@/manageCenter/financialManage/bonus/bonusDetail';
-
+import ShowModalDiv from "@/showModal.jsx";
 const YxBonus = React.createClass({
     departmentList() {
 		this.setState({
@@ -70,6 +76,7 @@ const YxBonus = React.createClass({
                 endTime1: this.state.createDate[1],
             },
             success: function (data) {
+                ShowModal(this);
                 let theArr = [];
                 if (!data.data || !data.data.list) {
                     if (data.error && data.error.length) {
@@ -267,72 +274,121 @@ const YxBonus = React.createClass({
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
         let departmentArr = this.state.departmentArr || [];
-        return ( <div className="user-content">
+        return (
+          <div className="user-content">
+            <ShowModalDiv ShowModal={this.state.showModal} />
             <div className="content-title">
-                <span>营销员奖金</span>
-                </div>
-                <div className="user-search">
-                    <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>
-                    <Input placeholder="订单编号"
-                        value={this.state.orderNoSearch}
-                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} /> 
-                    <Input placeholder="订单负责人"
-                        value={this.state.orderRefundSearch}
-                        onChange={(e) => { this.setState({ orderRefundSearch: e.target.value }); }} /> 
-                    <Select placeholder="发放状态"
-                        style={{ width: 150 ,marginRight:10}}
-                        value={this.state.grantStatus}
-                        onChange={(e) => { this.setState({ grantStatus: e }) }}>
-                        <Option value='0'>未发放</Option>
-                        <Option value="1">已发放</Option>
-                    </Select>
+              <span>营销员奖金</span>
+            </div>
+            <div className="user-search">
+              <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>
+              <Input
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
+                onChange={e => {
+                  this.setState({ orderNoSearch: e.target.value });
+                }}
+              />
+              <Input
+                placeholder="订单负责人"
+                value={this.state.orderRefundSearch}
+                onChange={e => {
+                  this.setState({ orderRefundSearch: e.target.value });
+                }}
+              />
+              <Select
+                placeholder="发放状态"
+                style={{ width: 150, marginRight: 10 }}
+                value={this.state.grantStatus}
+                onChange={e => {
+                  this.setState({ grantStatus: e });
+                }}
+              >
+                <Option value="0">未发放</Option>
+                <Option value="1">已发放</Option>
+              </Select>
 
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>
-                    <div style={{float:'right'}}>
-                       <Button onClick={this.exportExec}>导出excel</Button>
-                    </div>
-                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                        <span>签单时间 :</span>
-                        <RangePicker
-                            format="YYYY-MM"
-                            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 }); }} />
-                        <span>创建时间 :</span>
-                        <RangePicker
-                            format="YYYY-MM-DD"
-                            value={[this.state.createDate[0] ? moment(this.state.createDate[0]) : null,
-                            this.state.createDate[1] ? moment(this.state.createDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ createDate: dataString }); }} />        
-                    </div>
-                </div>
-                <div className="patent-table" id="table">
-                    <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
-                            dataSource={this.state.dataSource}
-                            rowSelection={false}
-                            pagination={this.state.pagination}
-                            onRowClick={this.tableRowClick}
-                             />
-                    </Spin>
-                </div>
-                <BonuseDetail 
-                    data={this.state.RowData}
-                    showDesc={this.state.showDesc}
-                    closeDesc={this.closeDesc.bind(this)}
-               />
-        </div> )
+              <Button type="primary" onClick={this.search}>
+                搜索
+              </Button>
+              <Button onClick={this.reset}>重置</Button>
+              <div style={{ float: "right" }}>
+                <Button onClick={this.exportExec}>导出excel</Button>
+              </div>
+              <span>
+                更多搜索
+                <Switch
+                  defaultChecked={false}
+                  onChange={this.searchSwitch.bind(this)}
+                />
+              </span>
+              <div
+                className="search-more"
+                style={this.state.searchMore ? { display: "none" } : {}}
+              >
+                <span>签单时间 :</span>
+                <RangePicker
+                  format="YYYY-MM"
+                  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 });
+                  }}
+                />
+                <span>创建时间 :</span>
+                <RangePicker
+                  format="YYYY-MM-DD"
+                  value={[
+                    this.state.createDate[0]
+                      ? moment(this.state.createDate[0])
+                      : null,
+                    this.state.createDate[1]
+                      ? moment(this.state.createDate[1])
+                      : null
+                  ]}
+                  onChange={(data, dataString) => {
+                    this.setState({ createDate: dataString });
+                  }}
+                />
+              </div>
+            </div>
+            <div className="patent-table" id="table">
+              <Spin spinning={this.state.loading}>
+                <Table
+                  columns={this.state.columns}
+                  dataSource={this.state.dataSource}
+                  rowSelection={false}
+                  pagination={this.state.pagination}
+                  onRowClick={this.tableRowClick}
+                />
+              </Spin>
+            </div>
+            <BonuseDetail
+              data={this.state.RowData}
+              showDesc={this.state.showDesc}
+              closeDesc={this.closeDesc.bind(this)}
+            />
+          </div>
+        );
     }
 })
  

+ 206 - 97
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx

@@ -7,8 +7,25 @@ import NewService from "./addService.jsx";
 import moment from 'moment';
 import '../../userMangagement.less';
 import {intentProgress,transactionProgress,contractProgress,projectProgress,orderType, orderStage, orderState,paymentState,specially,specialBatchState, projectState,orderChannel, approvedState, lock,paymentMethod,transactionChannel} from '../../../../dataDic.js';
-import {getIntentProgress,getTransactionProgress,getProjectState,getContractProgress,getProjectProgress,splitUrl,getOrderType,getOrderStage,getOrderState,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel} from '../../../../tools.js';
-
+import {
+  getIntentProgress,
+  getTransactionProgress,
+  getProjectState,
+  getContractProgress,
+  getProjectProgress,
+  splitUrl,
+  getOrderType,
+  getOrderStage,
+  getOrderState,
+  getPaymentState,
+  getOrderChannel,
+  getApprovedState,
+  getLock,
+  getPaymentMethod,
+  getTransactionChannel,
+  ShowModal
+} from "../../../../tools.js";
+import ShowModalDiv from "@/showModal.jsx";
 const MyService=Form.create()(React.createClass({
 	loadData(pageNo) {
         this.state.data = [];
@@ -36,6 +53,7 @@ const MyService=Form.create()(React.createClass({
 				formal:this.state.formalOrder?1:0,
             },
             success: function (data) {
+                ShowModal(this);
                 let theArr = [];
                 if (!data.data) {
                     if (data.error && data.error.length) {
@@ -414,102 +432,193 @@ const MyService=Form.create()(React.createClass({
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
         return (
-            <div className="user-content" >
-                <div className="content-title">
-                	<span style={{fontSize:'16px'}}>科技服务订单</span>	
-	                <div className="user-search">
-	                    <Input placeholder="客户名称" style={{width:'150px'}}
-	                        value={this.state.customerName}
-	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
-	                    <Input placeholder="订单编号" style={{width:'150px'}}
-	                        value={this.state.orderNo}
-	                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
-	                    <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 placeholder="特批筛选"
-                            style={{ width: 150 ,marginLeft:'10px'}}
-                            value={this.state.approval}
-                            onChange={(e) => { this.setState({ approval: e }) }}>
-                            {
-                                specially.map(function (item) {
-                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                })
-                            }
-                        </Select>
-                        <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索<Icon type="search" /></Button>
-	                    <Button onClick={this.reset}>重置 <Icon type="reload" /></Button>
-	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
-	                    <Button type="primary" className="addButton" onClick={this.addClick} >开单<Icon type="plus" /></Button>
-	                </div>
-	                <div className='clearfix' style={{marginTop:'5px'}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>   
-	                  		<Checkbox checked={this.state.intentOrder} onChange={(e)=>{this.setState({intentOrder:!this.state.intentOrder})}}>意向订单</Checkbox>
-	                  		<Checkbox checked={this.state.formalOrder} onChange={(e)=>{this.setState({formalOrder:!this.state.formalOrder})}}>正式订单</Checkbox>
-	                  		<Select placeholder="订单状态"
-	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
-	                            value={this.state.orderStatusSearch}
-	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
-	                            {
-                                    orderState.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                        <Select placeholder="结算状态"
-	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.settlementState}
-	                            onChange={(e) => { this.setState({ settlementState: e }) }}>
-	                            {
-                                    paymentState.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                        <Select placeholder="项目进度"
-	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.projectProgress}
-	                            onChange={(e) => { this.setState({ projectProgress: e }) }}>
-	                            {
-                                    projectState.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                        <Select placeholder="订单渠道"
-	                            style={{ width: 150 }}
-	                            value={this.state.orderChannelSearch}
-	                            onChange={(e) => { this.setState({ orderChannelSearch: e }) }}>
-	                            {
-                                    orderChannel.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                    </div>
-	                </div>
-	                <div className="patent-table">
-	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
-	                            dataSource={this.state.dataSource}
-	                            rowSelection={rowSelection}
-	                            pagination={this.state.pagination}
-	                            onRowClick={this.tableRowClick} />
-	                    </Spin>
-	                </div>
-	                <NewService
-	                	uid={this.state.uid}
-	                	signBillVisible={this.state.signBillVisible}
-	                    signBillState={this.state.signBillState}
-	                	operation={this.operation}
-	                	admissibleOrder={this.admissibleOrder}
-	                    userDetaile={this.state.userDetaile}
-	                    datauser={this.state.datauser}
-	                    showDesc={this.state.showDesc}
-	                    closeDesc={this.closeDesc} />
-	            </div >
+          <div className="user-content">
+            <ShowModalDiv ShowModal={this.state.showModal} />
+            <div className="content-title">
+              <span style={{ fontSize: "16px" }}>科技服务订单</span>
+              <div className="user-search">
+                <Input
+                  placeholder="客户名称"
+                  style={{ width: "150px" }}
+                  value={this.state.customerName}
+                  onChange={e => {
+                    this.setState({ customerName: e.target.value });
+                  }}
+                />
+                <Input
+                  placeholder="订单编号"
+                  style={{ width: "150px" }}
+                  value={this.state.orderNo}
+                  onChange={e => {
+                    this.setState({ orderNo: e.target.value });
+                  }}
+                />
+                <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
+                  placeholder="特批筛选"
+                  style={{ width: 150, marginLeft: "10px" }}
+                  value={this.state.approval}
+                  onChange={e => {
+                    this.setState({ approval: e });
+                  }}
+                >
+                  {specially.map(function(item) {
+                    return (
+                      <Select.Option key={item.value}>{item.key}</Select.Option>
+                    );
+                  })}
+                </Select>
+                <Button
+                  type="primary"
+                  onClick={this.search}
+                  style={{ marginLeft: "10px" }}
+                >
+                  搜索
+                  <Icon type="search" />
+                </Button>
+                <Button onClick={this.reset}>
+                  重置 <Icon type="reload" />
+                </Button>
+                <span style={{ marginLeft: "10px", marginRight: "20px" }}>
+                  更多搜索
+                  <Switch defaultChecked={false} onChange={this.searchSwitch} />
+                </span>
+                <Button
+                  type="primary"
+                  className="addButton"
+                  onClick={this.addClick}
+                >
+                  开单
+                  <Icon type="plus" />
+                </Button>
+              </div>
+              <div className="clearfix" style={{ marginTop: "5px" }}>
+                <div
+                  className="search-more"
+                  style={this.state.searchMore ? { display: "none" } : {}}
+                >
+                  <Checkbox
+                    checked={this.state.intentOrder}
+                    onChange={e => {
+                      this.setState({ intentOrder: !this.state.intentOrder });
+                    }}
+                  >
+                    意向订单
+                  </Checkbox>
+                  <Checkbox
+                    checked={this.state.formalOrder}
+                    onChange={e => {
+                      this.setState({ formalOrder: !this.state.formalOrder });
+                    }}
+                  >
+                    正式订单
+                  </Checkbox>
+                  <Select
+                    placeholder="订单状态"
+                    style={{
+                      width: 150,
+                      marginRight: "10px",
+                      marginBottom: "10px"
+                    }}
+                    value={this.state.orderStatusSearch}
+                    onChange={e => {
+                      this.setState({ orderStatusSearch: e });
+                    }}
+                  >
+                    {orderState.map(function(item) {
+                      return (
+                        <Select.Option key={item.value}>
+                          {item.key}
+                        </Select.Option>
+                      );
+                    })}
+                  </Select>
+                  <Select
+                    placeholder="结算状态"
+                    style={{ width: 150, marginRight: "10px" }}
+                    value={this.state.settlementState}
+                    onChange={e => {
+                      this.setState({ settlementState: e });
+                    }}
+                  >
+                    {paymentState.map(function(item) {
+                      return (
+                        <Select.Option key={item.value}>
+                          {item.key}
+                        </Select.Option>
+                      );
+                    })}
+                  </Select>
+                  <Select
+                    placeholder="项目进度"
+                    style={{ width: 150, marginRight: "10px" }}
+                    value={this.state.projectProgress}
+                    onChange={e => {
+                      this.setState({ projectProgress: e });
+                    }}
+                  >
+                    {projectState.map(function(item) {
+                      return (
+                        <Select.Option key={item.value}>
+                          {item.key}
+                        </Select.Option>
+                      );
+                    })}
+                  </Select>
+                  <Select
+                    placeholder="订单渠道"
+                    style={{ width: 150 }}
+                    value={this.state.orderChannelSearch}
+                    onChange={e => {
+                      this.setState({ orderChannelSearch: e });
+                    }}
+                  >
+                    {orderChannel.map(function(item) {
+                      return (
+                        <Select.Option key={item.value}>
+                          {item.key}
+                        </Select.Option>
+                      );
+                    })}
+                  </Select>
+                </div>
+              </div>
+              <div className="patent-table">
+                <Spin spinning={this.state.loading}>
+                  <Table
+                    columns={this.state.columns}
+                    dataSource={this.state.dataSource}
+                    rowSelection={rowSelection}
+                    pagination={this.state.pagination}
+                    onRowClick={this.tableRowClick}
+                  />
+                </Spin>
+              </div>
+              <NewService
+                uid={this.state.uid}
+                signBillVisible={this.state.signBillVisible}
+                signBillState={this.state.signBillState}
+                operation={this.operation}
+                admissibleOrder={this.admissibleOrder}
+                userDetaile={this.state.userDetaile}
+                datauser={this.state.datauser}
+                showDesc={this.state.showDesc}
+                closeDesc={this.closeDesc}
+              />
             </div>
+          </div>
         );
     }
 }));

+ 488 - 296
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -2,8 +2,18 @@ import React from 'react';
 import { Icon, Button, Input, Select, Spin, Table, message,DatePicker, Upload, Form ,Modal,Col} from 'antd';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
-import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique,getCuikuan} from '@/tools.js';
+import {
+  getLiquidationStatus,
+  getApprovedState,
+  getProcessStatus,
+  splitUrl,
+  getjiedian,
+  getboutique,
+  getCuikuan,
+  ShowModal
+} from "@/tools.js";
 import './customer.less';
+import ShowModalDiv from "@/showModal.jsx";
 //图片组件
 const PicturesWall = React.createClass({
 	getInitialState() {
@@ -91,6 +101,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				endTime: this.state.releaseDate[1],//结束时间
 			},
 			success: function(data) {
+				ShowModal(this);
 				let theArr = [];
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {
@@ -695,303 +706,484 @@ const IntentionCustomer = Form.create()(React.createClass({
 			},
 		};
 		let departmentArr = this.state.departmentArr || [];
-		return(
-			<div className="user-content">
-				<div className="content-title">                  
-                    <span>特批订单审核</span>
+		return (
+      <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
+        <div className="content-title">
+          <span>特批订单审核</span>
+        </div>
+        <div className="user-search">
+          <Input
+            placeholder="客户名称"
+            style={{ width: "150px", marginBottom: "10px" }}
+            value={this.state.customerName}
+            onChange={e => {
+              this.setState({ customerName: e.target.value });
+            }}
+          />
+          <Input
+            placeholder="订单编号"
+            style={{ width: "150px" }}
+            value={this.state.orderNo}
+            onChange={e => {
+              this.setState({ orderNo: e.target.value });
+            }}
+          />
+          <Select
+            placeholder="选择部门"
+            style={{ width: 150, marginRight: "10px" }}
+            value={this.state.departmenttSearch}
+            onChange={e => {
+              this.setState({ departmenttSearch: e });
+            }}
+          >
+            {departmentArr.map(function(item) {
+              return <Select.Option key={item.id}>{item.name}</Select.Option>;
+            })}
+          </Select>
+          <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" }}
+          >
+            搜索
+          </Button>
+          <Button onClick={this.reset}>重置</Button>
+          <div className="patent-table">
+            <Spin spinning={this.state.loading}>
+              <Table
+                columns={this.state.columns}
+                dataSource={this.state.dataSource}
+                rowSelection={rowSelection}
+                pagination={this.state.pagination}
+                onRowClick={this.tableRowClick}
+              />
+            </Spin>
+          </div>
+          <Modal
+            className="customeDetails"
+            footer=""
+            title="订单详情"
+            width="900px"
+            visible={this.state.visible}
+            onOk={this.visitOk}
+            onCancel={this.visitCancel}
+          >
+            <Form
+              layout="horizontal"
+              onSubmit={this.handleSubmit}
+              id="demand-form"
+              style={{ paddingBottom: "40px" }}
+            >
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="订单编号"
+                  >
+                    <span>{this.state.orderNo}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="合同编号"
+                  >
+                    <span>{this.state.contractNo}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="客户名称"
+                  >
+                    <span>{this.state.userName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="合同签订时间"
+                  >
+                    <span>{this.state.signDate}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="流程状态"
+                  >
+                    <span>{getProcessStatus(this.state.processStatus)}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="结算状态"
+                  >
+                    <span>
+                      {getLiquidationStatus(this.state.liquidationStatus)}
+                    </span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="企业联系人"
+                  >
+                    <span>{this.state.contacts}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="联系人电话"
+                  >
+                    <span>{this.state.contactMobile}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="企业法人"
+                  >
+                    <span>{this.state.legalPerson}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="法人电话"
+                  >
+                    <span>{this.state.legalPersonTel}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="签单金额(万元)"
+                  >
+                    <span>{this.state.totalAmount}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="首付金额(万元)"
+                  >
+                    <span>{this.state.firstAmount}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="特批立项"
+                  >
+                    <span>{getApprovedState(this.state.approval)}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="已收款项(万元)"
+                  >
+                    <span>{this.state.settlementAmount}</span>
+                  </FormItem>
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 16 }}
+                      label="订单留言"
+                    >
+                      <span>{this.state.orderRemarks}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 18 }}
+                      label={
+                        <span>
+                          <strong style={{ color: "#f00" }}>*</strong>合同扫描件
+                        </span>
+                      }
+                    >
+                      <PicturesWall
+                        fileList={this.getOrgCodeUrl}
+                        pictureUrl={this.state.orgCodeUrl}
+                      />
+                      <p>图片建议:要清晰。</p>
+                      <Button
+                        style={{
+                          float: "right",
+                          marginRight: "140px",
+                          marginTop: "20px"
+                        }}
+                        onClick={this.getOrderLog}
+                      >
+                        查看订单 日志
+                      </Button>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="订单负责人"
+                    >
+                      <span>{this.state.salesmanName}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="订单负责人电话"
+                    >
+                      <span>{this.state.salesmanMobile}</span>
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="财务负责人"
+                    >
+                      <span>{this.state.financeName}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="财务负责人电话"
+                    >
+                      <span>{this.state.financeMobile}</span>
+                    </FormItem>
+                  </div>
+                  <div>
+                    <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                      催款节点
+                    </span>
+                    {this.state.processStatus == 0 ? (
+                      <Button
+                        type="primary"
+                        onClick={this.addcontact}
+                        style={{
+                          float: "right",
+                          marginRight: "50px",
+                          marginBottom: "15px"
+                        }}
+                      >
+                        添加催款节点
+                      </Button>
+                    ) : (
+                      ""
+                    )}
+                  </div>
+                  <div className="clearfix">
+                    <Spin spinning={this.state.loading}>
+                      <Form layout="horizontal" id="demand-form">
+                        <Table
+                          pagination={false}
+                          columns={this.state.ContactsLists}
+                          dataSource={this.state.contactList}
+                        />
+                        <Col
+                          span={24}
+                          offset={9}
+                          style={{ marginTop: "15px" }}
+                        ></Col>
+                      </Form>
+                    </Spin>
+                  </div>
+                  <div>
+                    <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                      项目业务
+                    </span>
+                    {this.state.processStatus == 0 ? (
+                      <Button
+                        type="primary"
+                        onClick={this.addDetailed}
+                        style={{
+                          float: "right",
+                          marginRight: "50px",
+                          marginBottom: "15px"
+                        }}
+                      >
+                        添加项目明细
+                      </Button>
+                    ) : (
+                      ""
+                    )}
+                  </div>
+                  <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                      <Table
+                        columns={this.state.columnsX}
+                        dataSource={this.state.dataSourceX}
+                        pagination={this.state.paginations}
+                        onRowClick={this.tableRowClickX}
+                      />
+                    </Spin>
+                  </div>
+                  <div className="addSave" style={{ marginTop: "15px" }}>
+                    <Button
+                      className="cancel"
+                      type="primary"
+                      onClick={this.examOk}
+                      style={{ marginLeft: "200px" }}
+                      htmlType="submit"
+                    >
+                      通过
+                    </Button>
+                    <Button
+                      className="cancel"
+                      type="primary"
+                      onClick={this.examNo}
+                      style={{ marginLeft: "50px" }}
+                      htmlType="submit"
+                    >
+                      驳回
+                    </Button>
+                    <Button
+                      className="cancel"
+                      type="ghost"
+                      onClick={this.visitCancel}
+                      style={{ marginLeft: "50px" }}
+                    >
+                      取消
+                    </Button>
+                  </div>
+                </div>
+              </Spin>
+            </Form>
+          </Modal>
+          <Modal
+            maskClosable={false}
+            visible={this.state.addnextVisible}
+            onOk={this.nextCancel}
+            onCancel={this.nextCancel}
+            width="800px"
+            title={"项目任务详情"}
+            footer=""
+            className="admin-desc-content"
+          >
+            <Form layout="horizontal" id="demand-form">
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="项目名称"
+                  >
+                    <span>{this.state.commodityName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="项目数量"
+                  >
+                    <span>{this.state.commodityQuantity}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="金额(万元)"
+                  >
+                    <span>{this.state.commodityPrice}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="主要项目"
+                  >
+                    <span>{getboutique(this.state.main)}</span>
+                  </FormItem>
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 16 }}
+                      label="服务说明"
+                    >
+                      <span>{this.state.taskComment}</span>
+                    </FormItem>
+                  </div>
+                </div>
+              </Spin>
+            </Form>
+          </Modal>
+          <Modal
+            maskClosable={false}
+            visible={this.state.noVisible}
+            onOk={this.noCancel}
+            onCancel={this.noCancel}
+            width="400px"
+            title={"拒绝理由"}
+            footer=""
+            className="admin-desc-content"
+          >
+            <Form layout="horizontal" id="demand-form">
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <FormItem
+                    labelCol={{ span: 4 }}
+                    wrapperCol={{ span: 16 }}
+                    label="拒绝理由"
+                  >
+                    <Input
+                      type="textarea"
+                      placeholder="请输入拒绝理由"
+                      rows={4}
+                      value={this.state.reason}
+                      onChange={e => {
+                        this.setState({ reason: e.target.value });
+                      }}
+                    />
+                  </FormItem>
+                </div>
+                <div className="clearfix">
+                  <Button
+                    className="cancel"
+                    type="primary"
+                    onClick={this.examOks}
+                    style={{ marginLeft: "50px" }}
+                    htmlType="submit"
+                  >
+                    确定
+                  </Button>
+                  <Button
+                    className="cancel"
+                    type="ghost"
+                    onClick={this.noCancel}
+                    style={{ marginLeft: "50px" }}
+                  >
+                    取消
+                  </Button>
                 </div>
-               	<div className="user-search">                    
-                   <Input placeholder="客户名称" style={{width:'150px',marginBottom:'10px'}}
-	                        value={this.state.customerName}
-	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
-                    <Input placeholder="订单编号" style={{width:'150px'}}
-                        value={this.state.orderNo}
-                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
-                    <Select placeholder="选择部门"
-                        style={{ width: 150 ,marginRight:'10px'}}
-                        value={this.state.departmenttSearch}
-                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
-                        {
-                            departmentArr.map(function (item) {
-                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
-                            })
-                        }
-               		 </Select>
-                    <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'}}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button> 
-                   	<div className="patent-table">
-	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
-	                            dataSource={this.state.dataSource}    
-	                            rowSelection={rowSelection}
-	                            pagination={this.state.pagination} 
-	                            onRowClick={this.tableRowClick}
-	                           />
-	                    </Spin>
-               		 </div> 
-               		<Modal	
-				      className="customeDetails"
-				      footer=''
-			          title="订单详情"
-			          width='900px'
-			          visible={this.state.visible}
-			          onOk={this.visitOk}
-					  onCancel={this.visitCancel}							          							          
-			        >	
-				        <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
-				            <Spin spinning={this.state.loading}>
-				                <div className="clearfix">
-				                	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="订单编号" >
-			                            <span>{this.state.orderNo}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同编号" >  
-			                            <span>{this.state.contractNo}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="客户名称" >  
-			                            <span>{this.state.userName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同签订时间" >   
-			                            <span>{this.state.signDate}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="流程状态" >  
-			                            <span>{getProcessStatus(this.state.processStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="结算状态" >  
-			                            <span>{getLiquidationStatus(this.state.liquidationStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业联系人" >                             
-		                                <span>{this.state.contacts}</span>
-				                    </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="联系人电话" >                             
-		                                <span>{this.state.contactMobile}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业法人" >                             
-		                                <span>{this.state.legalPerson}</span>
-		                            </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="法人电话" >  
-			                             <span>{this.state.legalPersonTel}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单金额(万元)" >                             
-		                                 <span>{this.state.totalAmount}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="首付金额(万元)" >                             
-		                                <span>{this.state.firstAmount}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="特批立项" >  
-			                            <span>{getApprovedState(this.state.approval)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="已收款项(万元)" >  
-			                            <span>{this.state.settlementAmount}</span>
-		                    		</FormItem>
-				                    <div className='clearfix'>
-							        	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="订单留言" >
-							        	 <span>{this.state.orderRemarks}</span>
-								        </FormItem>
-							        </div>
-				                    <div className='clearfix'>
-							            <FormItem
-							                labelCol={{ span: 4 }}
-							                wrapperCol={{ span: 18 }}
-							                label={
-							                	<span>
-													<strong style={{ color: '#f00' }}>*</strong>合同扫描件
-												</span> 
-							                }
-							                >
-							            	
-							                <PicturesWall
-							                    fileList={this.getOrgCodeUrl}
-							                    pictureUrl={this.state.orgCodeUrl} />
-							                    <p>图片建议:要清晰。</p>
-											<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
-																										onClick={this.getOrderLog}
-																	>查看订单							日志</Button>	
-							            </FormItem>
-							        </div>
-							        <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >  
-				                            <span>{this.state.salesmanName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人电话" >  
-                            				<span>{this.state.salesmanMobile}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >  
-				                            <span>{this.state.financeName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人电话" >  
-                            				<span>{this.state.financeMobile}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div>
-								                	<span style={{marginLeft:'50px',fontSize:'20px'}}>催款节点</span>
-								                	{this.state.processStatus==0?<Button type='primary' onClick={this.addcontact} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加催款节点</Button>:""}
-								                </div>
-								                <div className="clearfix">
-								    			  <Spin spinning={this.state.loading}>
-								    			        <Form layout="horizontal" id="demand-form"  >
-													      	<Table 
-											            	 pagination={false}
-											            	 columns={this.state.ContactsLists} 
-											            	 dataSource={this.state.contactList}
-											            	 />
-									            	        <Col span={24} offset={9} style={{marginTop:'15px'}}>
-												                 
-												            </Col>
-										            	</Form> 
-												   </Spin> 
-												</div>
-									            <div>
-								                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
-								                	{this.state.processStatus==0?<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加项目明细</Button>:""}
-								                </div>
-								                <div className="patent-table">
-								                    <Spin spinning={this.state.loading}>
-								                        <Table columns={this.state.columnsX}
-								                            dataSource={this.state.dataSourceX}
-								                            pagination={this.state.paginations}
-								                            onRowClick={this.tableRowClickX} 
-								                            />
-								                    </Spin>
-									            </div>
-					                <div className='addSave' style={{marginTop:'15px'}}>
-					                   <Button className="cancel" type="primary" onClick={this.examOk} style={{marginLeft:"200px"}} htmlType="submit">通过</Button>
-					                   <Button className="cancel" type="primary" onClick={this.examNo} style={{marginLeft:"50px"}} htmlType="submit">驳回</Button>
-		                               <Button className="cancel" type="ghost" onClick={this.visitCancel} style={{marginLeft:"50px"}}>取消</Button>
-	                            	</div>
-				                </div>
-				            </Spin>
-				        </Form>
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='800px'
-                        title={'项目任务详情'}                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal"  id="demand-form">
-			                <Spin spinning={this.state.loading}>
-				                    <div className='clearfix'>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="项目名称" >
-				                    			<span>{this.state.commodityName}</span>
-				                    	</FormItem>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="项目数量" >
-				                    			<span>{this.state.commodityQuantity}</span>
-				                    	</FormItem>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="金额(万元)" >
-				                    			<span>{this.state.commodityPrice}</span>
-				                    	</FormItem>
-					                    <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="主要项目" >  
-				                            <span>{getboutique(this.state.main)}</span>
-			                    		</FormItem>
-					                    <div className='clearfix'>
-					                    	<FormItem 
-					                            labelCol={{ span: 4 }}
-									            wrapperCol={{ span: 16 }}
-					                            label="服务说明" >
-				                    			<span>{this.state.taskComment}</span>
-					                    	</FormItem>
-				                    	</div>
-				                    </div>	
-			                </Spin>
-			            </Form >
-			        </Modal>
-			         <Modal maskClosable={false} visible={this.state.noVisible}
-                        onOk={this.noCancel} onCancel={this.noCancel}
-                        width='400px'
-                        title={'拒绝理由'}                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal"  id="demand-form">
-			                <Spin spinning={this.state.loading}>
-				                    <div className='clearfix'>
-				                    	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="拒绝理由" >
-								                <Input type="textarea" placeholder="请输入拒绝理由" rows={4}  value={this.state.reason} 
-									    				onChange={(e)=>{this.setState({reason:e.target.value})}}/>	
-								        </FormItem>
-				                    </div>	
-				                     <div className='clearfix'>
-						                   <Button className="cancel" type="primary" onClick={this.examOks} style={{marginLeft:"50px"}} htmlType="submit">确定</Button>
-			                               <Button className="cancel" type="ghost" onClick={this.noCancel} style={{marginLeft:"50px"}}>取消</Button>
-	                            	</div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-					<Modal  visible={this.state.rizhivisible}
-							className="admin-desc-content"
-							width='800px'
-							maskClosable={false}
-							title='订单日志'
-							footer={null}
-							onCancel={this.closeOrderLog}>
-							<div className="patent-table">
-							    <Spin spinning={this.state.loading}>
-							        <Table columns={this.state.columnsrizhi}
-							            dataSource={this.state.dataSourcerizhi}
-										pagination={false}
-							            />
-							    </Spin>
-							</div>
-					</Modal>
-               	</div>  
+              </Spin>
+            </Form>
+          </Modal>
+          <Modal
+            visible={this.state.rizhivisible}
+            className="admin-desc-content"
+            width="800px"
+            maskClosable={false}
+            title="订单日志"
+            footer={null}
+            onCancel={this.closeOrderLog}
+          >
+            <div className="patent-table">
+              <Spin spinning={this.state.loading}>
+                <Table
+                  columns={this.state.columnsrizhi}
+                  dataSource={this.state.dataSourcerizhi}
+                  pagination={false}
+                />
+              </Spin>
             </div>
-			);
+          </Modal>
+        </div>
+      </div>
+    );
 	}
 }));
 export default IntentionCustomer;

+ 15 - 2
js/component/manageCenter/order/orderNew/billing.jsx

@@ -5,8 +5,19 @@ import NewService from "./addService.jsx";
 import moment from 'moment';
 import '../userMangagement.less';
 import {areaSelect} from '@/NewDicProvinceList';
-import {getApprovedState,getprovince,getProcessStatus,getLiquidationStatus,getNewOrderStatus,beforeUploadFile,getProvinceA,getInvoiceStatus,splitUrl} from '../../../tools.js';
-
+import {
+  getApprovedState,
+  getprovince,
+  getProcessStatus,
+  getLiquidationStatus,
+  getNewOrderStatus,
+  beforeUploadFile,
+  getProvinceA,
+  getInvoiceStatus,
+  splitUrl,
+  ShowModal
+} from "../../../tools.js";
+import ShowModalDiv from "@/showModal.jsx";
 const PicturesWall = React.createClass({
     getInitialState() {
         return {
@@ -86,6 +97,7 @@ const MyService=Form.create()(React.createClass({
 				endTime: this.state.releaseDate[1],
             },
             success: function (data) {
+				ShowModal(this);
                 let theArr = [];
                 if (!data.data) {
                     if (data.error && data.error.length) {
@@ -1005,6 +1017,7 @@ const MyService=Form.create()(React.createClass({
         const { RangePicker } = DatePicker;
         return (
             <div className="user-content" >
+				<ShowModalDiv ShowModal={this.state.showModal} />
                 <div className="content-title">
                 	<span style={{fontSize:'16px'}}>开单与签单</span>	
 	                <div className="user-search">

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

@@ -3,8 +3,19 @@ import { Button, Input, Spin, Table, message,DatePicker, Upload, Form ,Modal,Col
 import $ from 'jquery/src/ajax';
 import Picture from '@/manageCenter/publicComponent/picture';
 import moment from 'moment';
-import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getNewOrderStatus,getRefundStatus,getCuikuan} from '@/tools.js';
+import {
+  getLiquidationStatus,
+  getApprovedState,
+  getProcessStatus,
+  splitUrl,
+  getjiedian,
+  getNewOrderStatus,
+  getRefundStatus,
+  getCuikuan,
+  ShowModal
+} from "@/tools.js";
 import './customer.less';
+import ShowModalDiv from "@/showModal.jsx";
 
 
 const IntentionCustomer = Form.create()(React.createClass({
@@ -29,6 +40,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				endTime: this.state.releaseDate[1],//结束时间
 			},
 			success: function(data) {
+        ShowModal(this);
 				let theArr = [];
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {
@@ -601,6 +613,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		};
 		return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>退单管理</span>
         </div>

+ 5 - 1
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -8,13 +8,15 @@ import {
   getjiedian,
   getboutique,
   getCuikuan,
-  getProjectStatus
+  getProjectStatus,
+  ShowModal
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailCwzj.js";
 import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import { ChooseList } from "./chooseList.jsx";
+import ShowModalDiv from "@/showModal.jsx";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -40,6 +42,7 @@ const contractChange = Form.create()(
           depId: this.state.searchData.depIdSearch
         },
         success: function(data) {
+          ShowModal(this);
           let theArr = [];
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
@@ -998,6 +1001,7 @@ const contractChange = Form.create()(
       const { TabPane } = Tabs;
       return (
         <div className="user-content">
+          <ShowModalDiv ShowModal={this.state.showModal} />
           <div className="content-title">
             <span>合同变更审核订单</span>
           </div>

+ 5 - 1
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -8,13 +8,15 @@ import {
   getjiedian,
   getboutique,
   getCuikuan,
-  getProjectStatus
+  getProjectStatus,
+  ShowModal
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailCwzy.js";
 import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import { ChooseList } from "./chooseList.jsx";
+import ShowModalDiv from "@/showModal.jsx";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -40,6 +42,7 @@ const contractChange = Form.create()(
           depId: this.state.searchData.depIdSearch
         },
         success: function(data) {
+          ShowModal(this);
           let theArr = [];
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
@@ -1033,6 +1036,7 @@ const contractChange = Form.create()(
       const { TabPane } = Tabs;
       return (
         <div className="user-content" style={{ position: "relative" }}>
+          <ShowModalDiv ShowModal={this.state.showModal} />
           <div className="content-title">
             <span>合同变更审核订单</span>
           </div>

+ 5 - 1
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -8,12 +8,14 @@ import {
   getjiedian,
   getboutique,
   getCuikuan,
-  getProjectStatus
+  getProjectStatus,
+  ShowModal
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailJsjl.js";
 import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
+import ShowModalDiv from "@/showModal.jsx";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -39,6 +41,7 @@ const contractChange = Form.create()(
           depId: this.state.searchData.depIdSearch
         },
         success: function(data) {
+          ShowModal(this);
           let theArr = [];
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
@@ -980,6 +983,7 @@ const contractChange = Form.create()(
       const { TabPane } = Tabs;
       return (
         <div className="user-content">
+          <ShowModalDiv ShowModal={this.state.showModal} />
           <div className="content-title">
             <span>合同变更审核订单</span>
           </div>

+ 5 - 1
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -8,12 +8,14 @@ import {
   getjiedian,
   getboutique,
   getCuikuan,
-  getProjectStatus
+  getProjectStatus,
+  ShowModal
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailJsy.js";
 import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
+import ShowModalDiv from "@/showModal.jsx";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -39,6 +41,7 @@ const contractChange = Form.create()(
           depId: this.state.searchData.depIdSearch
         },
         success: function(data) {
+          ShowModal(this);
           let theArr = [];
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
@@ -937,6 +940,7 @@ const contractChange = Form.create()(
       const { TabPane } = Tabs;
       return (
         <div className="user-content">
+          <ShowModalDiv ShowModal={this.state.showModal} />
           <div className="content-title">
             <span>合同变更审核订单</span>
           </div>

+ 5 - 2
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -8,13 +8,14 @@ import {
   getjiedian,
   getboutique,
   getCuikuan,
-  getProjectStatus
+  getProjectStatus,
+  ShowModal
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailJszj.js";
 import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
-
+import ShowModalDiv from "@/showModal.jsx";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -39,6 +40,7 @@ const contractChange = Form.create()(
           depId: this.state.searchData.depIdSearch
         },
         success: function(data) {
+          ShowModal(this);
           let theArr = [];
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
@@ -980,6 +982,7 @@ const contractChange = Form.create()(
       const { TabPane } = Tabs;
       return (
         <div className="user-content">
+          <ShowModalDiv ShowModal={this.state.showModal} />
           <div className="content-title">
             <span>合同变更审核订单</span>
           </div>

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

@@ -8,13 +8,14 @@ import {
   getjiedian,
   getboutique,
   getCuikuan,
-  getProjectStatus
+  getProjectStatus,
+  ShowModal
 } from "@/tools.js";
 import "./customer.less";
 import { ChangeDetail } from "./changeComponent/changeDetailYxgly.js";
 import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
-
+import ShowModalDiv from "@/showModal.jsx";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -39,6 +40,7 @@ const contractChange = Form.create()(
           depId: this.state.searchData.depIdSearch
         },
         success: function(data) {
+          ShowModal(this);
           let theArr = [];
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
@@ -981,6 +983,7 @@ const contractChange = Form.create()(
       const { TabPane } = Tabs;
       return (
         <div className="user-content">
+          <ShowModalDiv ShowModal={this.state.showModal} />
           <div className="content-title">
             <span>合同变更审核订单</span>
           </div>

+ 5 - 1
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -9,7 +9,8 @@ import {
   getboutique,
   getCuikuan,
   getProjectStatus,
-  getContractChangeStatus
+  getContractChangeStatus,
+  ShowModal
 } from "@/tools.js";
 import "./customer.less";
 import { SearchInput } from "./changeComponent/searchInput.js";
@@ -18,6 +19,7 @@ import AddOrders from "./addorders.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import ChangeApply from "./changeComponent/changeApply";
 import { ChooseList } from "./chooseList.jsx";
+import ShowModalDiv from "@/showModal.jsx";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -43,6 +45,7 @@ const contractChange = Form.create()(
           depId: this.state.searchData.depIdSearch
         },
         success: function(data) {
+          ShowModal(this);
           let theArr = [];
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
@@ -1012,6 +1015,7 @@ const contractChange = Form.create()(
       const { TabPane } = Tabs;
       return (
         <div className="user-content" style={{ position: "relative" }}>
+          <ShowModalDiv ShowModal={this.state.showModal} />
           <div className="content-title">
             <span>合同变更审核订单</span>
           </div>

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

@@ -24,9 +24,11 @@ import {
   getboutique,
   getCuikuan,
   getProjectStatus,
-  moneyVerify
+  moneyVerify,
+  ShowModal
 } from "@/tools.js";
 import "./customer.less";
+import ShowModalDiv from "@/showModal.jsx";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -117,6 +119,7 @@ const IntentionCustomer = Form.create()(
           endTime: this.state.releaseDate[1] //结束时间
         },
         success: function(data) {
+          ShowModal(this);
           let theArr = [];
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
@@ -959,6 +962,7 @@ const IntentionCustomer = Form.create()(
       const { RangePicker } = DatePicker;
       return (
         <div className="user-content">
+          <ShowModalDiv ShowModal={this.state.showModal} />
           <div className="content-title">
             <span>订单审核</span>
           </div>

+ 14 - 2
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -2,9 +2,19 @@ import React from 'react';
 import { Button, Input, Spin, Table, message,DatePicker, Upload, Form ,Modal,Col} from 'antd';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
-import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique,getCuikuan,getProjectStatus} from '@/tools.js';
+import {
+  getLiquidationStatus,
+  getApprovedState,
+  getProcessStatus,
+  splitUrl,
+  getjiedian,
+  getboutique,
+  getCuikuan,
+  getProjectStatus,
+  ShowModal
+} from "@/tools.js";
 import './customer.less';
-
+import ShowModalDiv from "@/showModal.jsx";
 
 const IntentionCustomer = Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -29,6 +39,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				endTime: this.state.releaseDate[1],//结束时间
 			},
 			success: function(data) {
+        ShowModal(this);
 				let theArr = [];
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {
@@ -600,6 +611,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		};
 		return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>部门订单</span>
         </div>

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

@@ -25,9 +25,11 @@ import {
   getboutique,
   getCuikuan,
   getProjectStatus,
-  getRefundStatus
+  getRefundStatus,
+  ShowModal
 } from "@/tools.js";
 import "./customer.less";
+import ShowModalDiv from "@/showModal.jsx";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -121,6 +123,7 @@ const outsourcingList = Form.create()(
           refundStatus: this.state.refundStatusSearch //外包审核状态
         },
         success: function(data) {
+          ShowModal(this);
           let theArr = [];
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
@@ -944,6 +947,7 @@ const outsourcingList = Form.create()(
       const { RangePicker } = DatePicker;
       return (
         <div className="user-content">
+          <ShowModalDiv ShowModal={this.state.showModal} />
           <div className="content-title">
             <span>外包订单列表</span>
           </div>

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

@@ -99,11 +99,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				endTime: this.state.releaseDate[1],//结束时间
 			},
 			success: function(data) {
-        this.setState({
-          showModal: ShowModal()
-        });
-        console.log(ShowModal());
-        
+        ShowModal(this)
 				let theArr = [];
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {

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

@@ -9,8 +9,10 @@ import {
   getApprovedState,
   splitUrl,
   getProjectStatus,
-  getboutique
+  getboutique,
+  ShowModal
 } from "@/tools";
+import ShowModalDiv from "@/showModal.jsx";
 const FormItem = Form.Item;
 
 const OutsourceTaskAssignment = React.createClass({
@@ -38,6 +40,7 @@ const OutsourceTaskAssignment = React.createClass({
         outsource: 1
       },
       success: function(data) {
+        ShowModal(this);
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -492,6 +495,7 @@ const OutsourceTaskAssignment = React.createClass({
     let departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>外包任务派单</span>
         </div>

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

@@ -24,8 +24,10 @@ import {
   getLiquidationStatus,
   getApprovedState,
   splitUrl,
-  getboutique
+  getboutique,
+  ShowModal
 } from "@/tools";
+import ShowModalDiv from "@/showModal.jsx";
 
 const PaiDan = React.createClass({
   loadData(pageNo) {
@@ -52,6 +54,7 @@ const PaiDan = React.createClass({
         outsource: 0
       },
       success: function(data) {
+        ShowModal(this);
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -904,6 +907,7 @@ const PaiDan = React.createClass({
     let departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>项目派单管理</span>
         </div>

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

@@ -6,8 +6,17 @@ import '@/manageCenter/financialManage/distribute/public.less';
 import { Icon, Button,Form, Input, Select, Spin, Table, Switch, message, DatePicker, Modal,Upload ,Col} from 'antd';
 import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
 import Assign from '@/manageCenter/publicComponent/assign';
-import {getProcessStatus,getApproval,getLiquidationStatus,getApprovedState,splitUrl,getjiedian,getboutique} from '@/tools';
-
+import {
+  getProcessStatus,
+  getApproval,
+  getLiquidationStatus,
+  getApprovedState,
+  splitUrl,
+  getjiedian,
+  getboutique,
+  ShowModal
+} from "@/tools";
+import ShowModalDiv from "@/showModal.jsx";
 const PaiDan = React.createClass({
     loadData(pageNo) {
         this.state.data = [];
@@ -32,6 +41,7 @@ const PaiDan = React.createClass({
 				endTime: this.state.releaseDate[1],//结束时间
 			},
             success: function (data) {
+              ShowModal(this);
                 let theArr = [];
                 if (!data.data || !data.data.list) {
                     if (data.error && data.error.length) {
@@ -525,6 +535,7 @@ const PaiDan = React.createClass({
         const { RangePicker } = DatePicker;
         return (
           <div className="user-content">
+            <ShowModalDiv ShowModal={this.state.showModal} />
             <div className="content-title">
               <span>项目派单管理</span>
             </div>

+ 12 - 2
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -6,8 +6,16 @@ import {boutique} from '../../../dataDic.js';
 import '@/manageCenter/financialManage/distribute/public.less';
 import { Button,Form, Input, Select, Spin, Table, Switch, message, DatePicker, Modal,AutoComplete,Tabs} from 'antd';
 import Assign from '@/manageCenter/publicComponent/assign';
-import {getProcessStatus,getApproval,getLiquidationStatus,getApprovedState,splitUrl,getboutique} from '@/tools';
-
+import {
+  getProcessStatus,
+  getApproval,
+  getLiquidationStatus,
+  getApprovedState,
+  splitUrl,
+  getboutique,
+  ShowModal
+} from "@/tools";
+import ShowModalDiv from "@/showModal.jsx";
 const zxsglyOutSourcingPaiDan = React.createClass({
     loadData(pageNo) {
         this.state.data = [];
@@ -33,6 +41,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 				outsource: 1,
 			},
             success: function (data) {
+              ShowModal(this);
                 let theArr = [];
                 if (!data.data || !data.data.list) {
                     if (data.error && data.error.length) {
@@ -1000,6 +1009,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
         let departmentArr = this.state.departmentArr || [];
         return (
           <div className="user-content">
+            <ShowModalDiv ShowModal={this.state.showModal} />
             <div className="content-title">
               <span>外包项目派单</span>
             </div>

+ 5 - 1
js/component/manageCenter/project/task/myTask.jsx

@@ -27,9 +27,11 @@ import {
   getLiquidationStatus,
   getProjectStatus,
   splitUrl,
-  getboutique
+  getboutique,
+  ShowModal
 } from "@/tools";
 import { taskStatus, projectStatus } from "@/dataDic.js";
+import ShowModalDiv from "@/showModal.jsx";
 const FormItem = Form.Item;
 
 const Task = React.createClass({
@@ -56,6 +58,7 @@ const Task = React.createClass({
         adminName: this.state.adminName //任务受理人
       },
       success: function(data) {
+        ShowModal(this);
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -1084,6 +1087,7 @@ const Task = React.createClass({
     let departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>任务派单管理</span>
         </div>

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

@@ -31,9 +31,11 @@ import {
   splitUrl,
   getboutique,
   getprovince,
-  moneyVerify
+  moneyVerify,
+  ShowModal
 } from "@/tools";
 import { taskStatus, projectStatus } from "@/dataDic.js";
+import ShowModalDiv from "@/showModal.jsx";
 const FormItem = Form.Item;
 
 const MyTaskOutsource = React.createClass({
@@ -61,6 +63,7 @@ const MyTaskOutsource = React.createClass({
         outsource: 1
       },
       success: function(data) {
+        ShowModal(this);
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -1383,6 +1386,7 @@ const MyTaskOutsource = React.createClass({
     let departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>我的外包任务</span>
         </div>

+ 5 - 1
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -9,8 +9,10 @@ import {
   getApprovedState,
   splitUrl,
   getProjectStatus,
-  getboutique
+  getboutique,
+  ShowModal
 } from "@/tools";
+import ShowModalDiv from "@/showModal.jsx";
 const FormItem = Form.Item;
 
 const Task = React.createClass({
@@ -37,6 +39,7 @@ const Task = React.createClass({
         adminName: this.state.adminName //任务受理人
       },
       success: function(data) {
+        ShowModal(this);
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -491,6 +494,7 @@ const Task = React.createClass({
     let departmentArr = this.state.departmentArr || [];
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>任务派单</span>
         </div>

+ 13 - 1
js/component/manageCenter/project/task/taskCount.jsx

@@ -2,7 +2,17 @@ import React from 'react';
 import { Button, Input, Spin, Table, message,DatePicker, Upload, Form ,Modal} from 'antd';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
-import { getLiquidationStatus,getProcessStatus,splitUrl,getboutique,getTaskStatus,getApproval,getprovince} from '@/tools.js';
+import {
+  getLiquidationStatus,
+  getProcessStatus,
+  splitUrl,
+  getboutique,
+  getTaskStatus,
+  getApproval,
+  getprovince,
+  ShowModal
+} from "@/tools.js";
+import ShowModalDiv from "@/showModal.jsx";
 
 
 const IntentionCustomer = Form.create()(React.createClass({
@@ -27,6 +37,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				endTime: this.state.releaseDate[1],//结束时间
 			},
 			success: function(data) {
+        ShowModal(this);
 				let theArr = [];
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {
@@ -654,6 +665,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		const { RangePicker } = DatePicker;
 		return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span>工时数据统计</span>
         </div>

File diff suppressed because it is too large
+ 958 - 640
js/component/manageCenter/project/task/taskQuery.jsx


+ 26 - 24
js/component/showModal.jsx

@@ -5,7 +5,7 @@ import { Spin, Button, Tabs, Table, message, Modal } from "antd";
 const ShowModal = React.createClass({
   getInitialState() {
     return {
-      
+      newVisible: true
     };
   },
 
@@ -15,30 +15,32 @@ const ShowModal = React.createClass({
     });
   },
   render() {
-    return (
-        <Modal
-          style={{ position: "relative" }}
-          title="消息提醒"
-          visible={this.props.ShowModal}
-          width={1000}
-          closable={false}
-          footer={null}
+    return this.state.newVisible ? (
+      <Modal
+        style={{ position: "relative" }}
+        title="消息提醒"
+        visible={this.props.ShowModal}
+        closable={false}
+        footer={null}
+      >
+        <div style={{ textAlign: "center" }}>
+          您有新消息尚未查看,请及时查看信息!
+          <a href={"/admin/index.html#normal"}>点我查看信息</a>
+        </div>
+        <Button
+          onClick={this.handleOk}
+          type={"primary"}
+          style={{
+            position: "relative",
+            left: "50%",
+            transform: "translateX(-50%)",
+            bottom: -10
+          }}
         >
-          有消息
-          <Button
-            onClick={this.handleOk}
-            type={"primary"}
-            style={{
-              position: "relative",
-              left: "50%",
-              transform: "translateX(-50%)",
-              bottom: -10
-            }}
-          >
-            我已阅读以上信息
-          </Button>
-        </Modal>
-    );
+          我已阅读以上信息
+        </Button>
+      </Modal>
+    ) : null;
   }
 });
 

+ 6 - 3
js/component/tools.js

@@ -1907,8 +1907,8 @@ module.exports = {
     }
   },
   // 消息提醒函数接口
-  ShowModal() {
-    let flag = false
+  ShowModal(fn) {
+    let flag = true
     $.ajax({
       method: "get",
       dataType: "json",
@@ -1919,9 +1919,12 @@ module.exports = {
         if(data.data == 0 ) {
           console.log(data);
           let flag = true
+          fn.setState({
+            showModal: flag
+          });
         }
       }
     })
-    return flag
+    // return flag
   }
 };