Browse Source

催款显示BUG修复

mentoswzq 5 years ago
parent
commit
6af04311f4

+ 4 - 0
js/component/dataDic.js

@@ -3439,6 +3439,10 @@ module.exports = {
         },
         {
           value: "2",
+          key: "项目立项"
+        },
+        {
+          value: "3",
           key: "项目完成"
         }
       ]

File diff suppressed because it is too large
+ 981 - 568
js/component/manageCenter/customer/NEW/crm/crm.jsx


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

@@ -6,8 +6,22 @@ import moment from 'moment';
 import TechAchievementDesc from '@/manageCenter/achievement/crmAchievement.jsx';
 import { citySelect, provinceList ,areaSelect} from '@/NewDicProvinceList';
 import { socialAttribute, industry, auditStatusL, lvl, currentMember ,slcRedit,dataGrade,cityArr,patentTypeList} from '@/dataDic.js';
-import { getSocialAttribute, beforeUploadFile,splitUrl ,getSlcRedit,getDataGrade,getAchievementCategory,getTechAuditStatus,getboutique,getPatentType,getcityArr,getPatentTypeva} from '@/tools.js';
+import {
+  getSocialAttribute,
+  beforeUploadFile,
+  splitUrl,
+  getSlcRedit,
+  getDataGrade,
+  getAchievementCategory,
+  getTechAuditStatus,
+  getboutique,
+  getPatentType,
+  getcityArr,
+  getPatentTypeva,
+  ShowModal
+} from "@/tools.js";
 import './customer.less';
+import ShowModalDiv from "@/showModal.jsx";
 const Option = AutoComplete.Option;
 //图片组件
 const PicturesWall = React.createClass({
@@ -127,6 +141,7 @@ const PatentPayment = Form.create()(React.createClass({
 				type:this.state.typeSearch,
 			},
 			success:function (data) {
+				ShowModal(this);
 				let theArr = [];
 				if(!data.data) {
 					if(data.error && data.error.length) {
@@ -471,341 +486,575 @@ const PatentPayment = Form.create()(React.createClass({
 		};
 		const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 			
-		return(
-			<div className="user-content" >
-			    <div className="content-title">
-			    	<span style={{fontSize:'16px'}}>客户专利提醒</span>	
-			        <div className="user-search">
-						<Select value={this.state.typeSearch} placeholder="请选择专利类型" onChange={(e)=>{
-							this.setState({
-								typeSearch:e
-							})
-						}} style={{width:"140px"}}>
-							<Option value={1}>实用新型</Option>
-							<Option value={2}>外观设计</Option>
-							<Option value={3}>发明</Option>
-						</Select>
-						<Input value={this.state.nameSearch} placeholder="请输入授权公司" onChange={(e)=>{
-							this.setState({
-								nameSearch:e.target.value
-							})
-						}} />
-						<Select value={this.state.departmentSearch} placeholder="请选择录入公司" onChange={(e)=>{
-							this.setState({
-								departmentSearch:e
-							})
-						}} style={{width:"140px"}}>
-							{this.state.departmentArr.map((e)=>{
-								return <Option value={e.id}>{e.name}</Option>
-							})}
-						</Select>
-						<Input value={this.state.anameSearch} placeholder="请输入录入人" onChange={(e)=>{
-							this.setState({
-								anameSearch:e.target.value
-							})
-						}} />
-						<Select value={this.state.statusSearch} placeholder="请选择状态" onChange={(e)=>{
-							this.setState({
-								statusSearch:e
-							})
-						}} style={{width:"140px"}}>
-							<Option value={0}>正常</Option>
-							<Option value={1}>提醒中</Option>
-						</Select>
-						<Input value={this.state.patentNoSearch} placeholder="请输入专利号" onChange={(e)=>{
-							this.setState({
-								patentNoSearch:e.target.value
-							})
-						}} />
-						<Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
-						<Button type="primary" onClick={this.searchReset} style={{marginLeft:'10px'}}>重置</Button>
-						<span>更多搜索
-							<Switch onChange={(mark)=>{
-								this.setState({mark:mark})
-							}}/>
-						</span>
-			            <Button type="primary" onClick={this.new} style={{marginRight:'10px',float:'right'}}>新建</Button>
-			            {/*<Button onClick={this.reset}>导出</Button>*/}
-			        </div>
-					{this.state.mark?<div className="user-search" style={{paddingTop:"10px"}}>
-						<span style={{fontSize:"14px"}}>
-							请选择申请时间:
-						</span>
-						<RangePicker value={[this.state.timesArr[0]?moment(this.state.timesArr[0]):null,
-												this.state.timesArr[1]?moment(this.state.timesArr[1]):null]} onChange={(e,f)=>{
-								this.setState({
-									timesArr:f,
-								})
-							}} style={{marginTop:"0",marginLeft:"10px"}}/>
-					</div>:''}
-			        
-			        <div className="patent-table">
-			            <Spin spinning={this.state.loading}>
-			                <Table columns={this.state.columns}
-			                    dataSource={this.state.dataSource}
-			                    pagination={this.state.pagination}
-								onRowClick={this.tableRowClick}
-								size="small"
-								bordered />
-			            </Spin>
-			        </div>
-					<Modal maskClosable={false} visible={this.state.avisible}
-						onCancel={this.avisitCancel}
-						width='800px'
-						title='修改详情'
-						footer=''
-						className="admin-desc-content">
-						<div className="clearfix">
-						<FormItem className="half-item"
-						    {...formItemLayout}
-						    label={
-						    	<span>
-						    		<strong style={{ color: '#f00' }}>*</strong>专利号
-						    	</span> 
-						    } >  
-						    {<Input placeholder="请输入专利号" value={this.state.patentNo}
-						        	onChange={(e)=>{this.setState({patentNo:e.target.value})}} style={{width:'240px'}} />}
-						</FormItem>
-						<FormItem className="half-item"
-						    {...formItemLayout}
-						    label={
-						    	<span>
-						    		<strong style={{ color: '#f00' }}>*</strong>专利名称
-						    	</span> 
-						    } >  
-						    {<Input placeholder="请输入专利名称" value={this.state.patentName}
-						        	onChange={(e)=>{this.setState({patentName:e.target.value})}} style={{width:'240px'}} />}
-						</FormItem>
-						<FormItem className="half-item"
-						    {...formItemLayout}
-						    label="专利类型" >  
-						    {<Select placeholder="请选择专利类型"
-						        style={{ width:'240px'}}
-						        value={getPatentType(this.state.patentType)}
-						        onChange={(e)=>{this.setState({patentType:e})}}>
-						            {
-						                patentTypeList.map(function (item) {
-						                    return <Select.Option key={item.value} >{item.key}</Select.Option>
-						                })
-						            }
-						    </Select>}
-						</FormItem>
-						<FormItem className="half-item"
-						    {...formItemLayout}
-						    label="申请日期" >  
-						    <DatePicker 
-						    	style={{marginTop:"2px",width: '240px',height:"32px" }}
-						        showTime
-						        format="YYYY-MM-DD" 
-						        onOk={(e)=>{}}
-						        value={this.state.appDate ? moment(this.state.appDate) : null}
-						        onChange={(data, dataString) => { this.setState({ appDate: dataString }); }} />
-						</FormItem>
-						<FormItem className="half-item"
-						    {...formItemLayout}
-						    label="授权日期" >  
-						    <DatePicker 
-						    	style={{marginTop:"2px",width: '240px',height:"32px" }}
-						        showTime
-						        format="YYYY-MM-DD"
-						        onOk={(e)=>{}}
-						        value={this.state.authDate ? moment(this.state.authDate) : null}
-						        onChange={(data, dataString) => { this.setState({ authDate: dataString }); }} />
-						</FormItem>
-						<FormItem className="half-item"
-						    {...formItemLayout}
-						    label="费用" >  
-						    <span>{theData.patentAmount}</span>
-						</FormItem>
-						<div className="clearfix">
-						<FormItem
-						    labelCol={{ span: 4 }}
-						    wrapperCol={{ span: 18 }}
-						    label="合同扫描件"
-						    >
-							
-						    <PicturesWall
-						        fileList={this.getOrgCodeUrl}
-						        pictureUrl={this.state.orgCodeUrl} />
-						        <p>图片建议:要清晰。</p>
-						</FormItem>
-						</div>
-						<FormItem className="half-item"
-						    {...formItemLayout}
-						    label="申请人" >  
-						    {<Input placeholder="请输入申请人/公司" value={this.state.proposer}
-						        	onChange={(e)=>{this.setState({proposer:e.target.value})}} style={{width:'240px'}} />}
-						</FormItem>
-						<FormItem className="half-item"
-						        {...formItemLayout}
-						        label="省份" >
-								<Select placeholder="请选择省份"
-								    style={{ width:'240px'}}
-								    value={getcityArr(this.state.province)}
-								    onChange={(e)=>{this.setState({province:e})}}>
-								        {
-								            cityArr.map(function (item) {
-								                 return <Select.Option key={item.value} >{item.key}</Select.Option>
-								            })
-								        }
-								</Select>							 
-						</FormItem>
-						<FormItem className="half-item"
-						    {...formItemLayout}
-						    label="联系电话" >  
-						    {<Input placeholder="请输入联系手机" value={this.state.contactPhone}
-						        	onChange={(e)=>{this.setState({contactPhone:e.target.value})}} style={{width:'240px'}} />}
-						</FormItem>
-						<FormItem className="half-item"
-						    {...formItemLayout}
-						    label={
-						    	<span>
-									<strong style={{ color: '#f00' }}>*</strong>电子邮箱
-								</span> 
-						    } >  
-						    {<Input placeholder="请输入电子邮箱" value={this.state.email}
-						        	onChange={(e)=>{this.setState({email:e.target.value})}} style={{width:'240px'}} />}
-						</FormItem>
-						<FormItem className="half-item"
-						    {...formItemLayout}
-						    label={'状态'} >  
-						    <span>{this.state.status?'已提醒':'待提醒'}</span>
-						</FormItem>
-						</div>
-						<div style={{overflow:'hidden'}}>
-							<Button style={{float:'right'}} onClick={this.avisitCancel}>取消</Button>
-							<Button type="primary" style={{float:'right',marginRight:'10px'}} onClick={this.baocunxiugai}>保存</Button>
-						</div>
-					</Modal>
-					
-						<Modal maskClosable={false} visible={this.state.visible}
-			            onOk={this.visitOk} onCancel={this.visitCancel}
-			            width='1000px'
-			            title='专利资料'
-			            footer=''
-			            className="admin-desc-content">
-						<div className="clearfix">
-							<FormItem className="half-item"
-							        {...formItemLayout}
-							        label={
-							        	<span>
-							        		<strong style={{ color: '#f00' }}>*</strong>专利号
-							        	</span> 
-							        } >                             
-							        {<Input placeholder="请输入专利号" value={this.state.patentNo}
-							            	onChange={(e)=>{this.setState({patentNo:e.target.value})}} style={{width:'240px'}} />}
-							</FormItem>
-							<FormItem className="half-item"
-							        {...formItemLayout}
-							        label={
-							        	<span>
-							        		<strong style={{ color: '#f00' }}>*</strong>专利名称
-							        	</span> 
-							        } >                             
-							        {<Input placeholder="请输入专利名称" value={this.state.patentName}
-							            	onChange={(e)=>{this.setState({patentName:e.target.value})}} style={{width:'240px'}} />}
-							</FormItem>
-							<FormItem className="half-item"
-							        {...formItemLayout}
-							        label="申请日期" >                             
-							        <DatePicker 
-							        	style={{marginTop:"2px",width: '240px',height:"32px" }}
-							            showTime
-							            format="YYYY-MM-DD"
-							            onOk={(e)=>{}}
-							            value={this.state.appDate ? moment(this.state.appDate) : null}
-							            onChange={(data, dataString) => { this.setState({ appDate: dataString }); }} />
-							</FormItem>
-							<FormItem className="half-item"
-							        {...formItemLayout}
-							        label={
-							        	<span>
-							        		<strong style={{ color: '#f00' }}>*</strong>专利类型
-							        	</span> 
-							        } >                             
-							        {<Select placeholder="请选择专利类型"
-									    style={{ width:'240px'}}
-									    value={this.state.patentType}
-									    onChange={(e)=>{this.setState({patentType:e})}}>
-									        {
-								                patentTypeList.map(function (item) {
-								                    return <Select.Option key={item.value} >{item.key}</Select.Option>
-								                })
-								            }
-									</Select>}
-							</FormItem>
-							<FormItem className="half-item"
-							        {...formItemLayout}
-							        label="授权日期" >                             
-							        <DatePicker 
-							        	style={{marginTop:"2px",width: '240px',height:"32px" }}
-							            showTime
-							            format="YYYY-MM-DD"
-							            onOk={(e)=>{}}
-							            value={this.state.authDate ? moment(this.state.authDate) : null}
-							            onChange={(data, dataString) => { this.setState({ authDate: dataString }); }} />
-							</FormItem>
-							<div className="clearfix">
-								<FormItem
-								    labelCol={{ span: 4 }}
-								    wrapperCol={{ span: 18 }}
-								    label='合同扫描件'
-								    >
-									
-								    <PicturesWall
-								        fileList={this.getOrgCodeUrl}
-								        pictureUrl={this.state.orgCodeUrl} />
-								        <p>图片建议:要清晰。</p>
-								</FormItem>
-							</div>
-							<div>
-								<span style={{marginLeft:'50px',fontSize:'20px'}}>申请人资料</span>
-							</div>
-							<FormItem className="half-item"
-							        {...formItemLayout}
-							        label="申请人/公司" >                             
-							        {<Input placeholder="请输入申请人/公司" value={this.state.proposer}
-							            	onChange={(e)=>{this.setState({proposer:e.target.value})}} style={{width:'240px'}} />}
-							</FormItem>
-							<FormItem className="half-item"
-							        {...formItemLayout}
-							        label="省份" >
-									<Select placeholder="请选择省份"
-									    style={{ width:'240px'}}
-									    value={this.state.province}
-									    onChange={(e)=>{this.setState({province:e})}}>
-									        {
-									            cityArr.map(function (item) {
-									                 return <Select.Option key={item.value} >{item.key}</Select.Option>
-									            })
-									        }
-									</Select>							 
-							</FormItem>
-							<FormItem className="half-item"
-							        {...formItemLayout}
-							        label="联系手机" >                             
-							        {<Input placeholder="请输入联系手机" value={this.state.contactPhone}
-							            	onChange={(e)=>{this.setState({contactPhone:e.target.value})}} style={{width:'240px'}} />}
-							</FormItem>
-							<FormItem className="half-item"
-							        {...formItemLayout}
-							        label={
-						    	<span>
-									<strong style={{ color: '#f00' }}>*</strong>电子邮箱
-								</span> 
-						    } >                             
-							        {<Input placeholder="请输入电子邮箱" value={this.state.email}
-							            	onChange={(e)=>{this.setState({email:e.target.value})}} style={{width:'240px'}} />}
-							</FormItem>
-						</div>
-						<div style={{overflow:'hidden'}}>
-							<Button style={{float:'right'}} onClick={this.onCal}>取消</Button>
-							<Button type="primary" style={{float:'right',marginRight:'10px'}} onClick={this.onSure}>保存</Button>
-						</div>
-						</Modal>
-			    </div >
-			</div>
-		)
+		return (
+      <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
+        <div className="content-title">
+          <span style={{ fontSize: "16px" }}>客户专利提醒</span>
+          <div className="user-search">
+            <Select
+              value={this.state.typeSearch}
+              placeholder="请选择专利类型"
+              onChange={e => {
+                this.setState({
+                  typeSearch: e
+                });
+              }}
+              style={{ width: "140px" }}
+            >
+              <Option value={1}>实用新型</Option>
+              <Option value={2}>外观设计</Option>
+              <Option value={3}>发明</Option>
+            </Select>
+            <Input
+              value={this.state.nameSearch}
+              placeholder="请输入授权公司"
+              onChange={e => {
+                this.setState({
+                  nameSearch: e.target.value
+                });
+              }}
+            />
+            <Select
+              value={this.state.departmentSearch}
+              placeholder="请选择录入公司"
+              onChange={e => {
+                this.setState({
+                  departmentSearch: e
+                });
+              }}
+              style={{ width: "140px" }}
+            >
+              {this.state.departmentArr.map(e => {
+                return <Option value={e.id}>{e.name}</Option>;
+              })}
+            </Select>
+            <Input
+              value={this.state.anameSearch}
+              placeholder="请输入录入人"
+              onChange={e => {
+                this.setState({
+                  anameSearch: e.target.value
+                });
+              }}
+            />
+            <Select
+              value={this.state.statusSearch}
+              placeholder="请选择状态"
+              onChange={e => {
+                this.setState({
+                  statusSearch: e
+                });
+              }}
+              style={{ width: "140px" }}
+            >
+              <Option value={0}>正常</Option>
+              <Option value={1}>提醒中</Option>
+            </Select>
+            <Input
+              value={this.state.patentNoSearch}
+              placeholder="请输入专利号"
+              onChange={e => {
+                this.setState({
+                  patentNoSearch: e.target.value
+                });
+              }}
+            />
+            <Button
+              type="primary"
+              onClick={this.search}
+              style={{ marginLeft: "10px" }}
+            >
+              搜索
+            </Button>
+            <Button
+              type="primary"
+              onClick={this.searchReset}
+              style={{ marginLeft: "10px" }}
+            >
+              重置
+            </Button>
+            <span>
+              更多搜索
+              <Switch
+                onChange={mark => {
+                  this.setState({ mark: mark });
+                }}
+              />
+            </span>
+            <Button
+              type="primary"
+              onClick={this.new}
+              style={{ marginRight: "10px", float: "right" }}
+            >
+              新建
+            </Button>
+            {/*<Button onClick={this.reset}>导出</Button>*/}
+          </div>
+          {this.state.mark ? (
+            <div className="user-search" style={{ paddingTop: "10px" }}>
+              <span style={{ fontSize: "14px" }}>请选择申请时间:</span>
+              <RangePicker
+                value={[
+                  this.state.timesArr[0]
+                    ? moment(this.state.timesArr[0])
+                    : null,
+                  this.state.timesArr[1] ? moment(this.state.timesArr[1]) : null
+                ]}
+                onChange={(e, f) => {
+                  this.setState({
+                    timesArr: f
+                  });
+                }}
+                style={{ marginTop: "0", marginLeft: "10px" }}
+              />
+            </div>
+          ) : (
+            ""
+          )}
+
+          <div className="patent-table">
+            <Spin spinning={this.state.loading}>
+              <Table
+                columns={this.state.columns}
+                dataSource={this.state.dataSource}
+                pagination={this.state.pagination}
+                onRowClick={this.tableRowClick}
+                size="small"
+                bordered
+              />
+            </Spin>
+          </div>
+          <Modal
+            maskClosable={false}
+            visible={this.state.avisible}
+            onCancel={this.avisitCancel}
+            width="800px"
+            title="修改详情"
+            footer=""
+            className="admin-desc-content"
+          >
+            <div className="clearfix">
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label={
+                  <span>
+                    <strong style={{ color: "#f00" }}>*</strong>专利号
+                  </span>
+                }
+              >
+                {
+                  <Input
+                    placeholder="请输入专利号"
+                    value={this.state.patentNo}
+                    onChange={e => {
+                      this.setState({ patentNo: e.target.value });
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                }
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label={
+                  <span>
+                    <strong style={{ color: "#f00" }}>*</strong>专利名称
+                  </span>
+                }
+              >
+                {
+                  <Input
+                    placeholder="请输入专利名称"
+                    value={this.state.patentName}
+                    onChange={e => {
+                      this.setState({ patentName: e.target.value });
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                }
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label="专利类型"
+              >
+                {
+                  <Select
+                    placeholder="请选择专利类型"
+                    style={{ width: "240px" }}
+                    value={getPatentType(this.state.patentType)}
+                    onChange={e => {
+                      this.setState({ patentType: e });
+                    }}
+                  >
+                    {patentTypeList.map(function(item) {
+                      return (
+                        <Select.Option key={item.value}>
+                          {item.key}
+                        </Select.Option>
+                      );
+                    })}
+                  </Select>
+                }
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label="申请日期"
+              >
+                <DatePicker
+                  style={{ marginTop: "2px", width: "240px", height: "32px" }}
+                  showTime
+                  format="YYYY-MM-DD"
+                  onOk={e => {}}
+                  value={this.state.appDate ? moment(this.state.appDate) : null}
+                  onChange={(data, dataString) => {
+                    this.setState({ appDate: dataString });
+                  }}
+                />
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label="授权日期"
+              >
+                <DatePicker
+                  style={{ marginTop: "2px", width: "240px", height: "32px" }}
+                  showTime
+                  format="YYYY-MM-DD"
+                  onOk={e => {}}
+                  value={
+                    this.state.authDate ? moment(this.state.authDate) : null
+                  }
+                  onChange={(data, dataString) => {
+                    this.setState({ authDate: dataString });
+                  }}
+                />
+              </FormItem>
+              <FormItem className="half-item" {...formItemLayout} label="费用">
+                <span>{theData.patentAmount}</span>
+              </FormItem>
+              <div className="clearfix">
+                <FormItem
+                  labelCol={{ span: 4 }}
+                  wrapperCol={{ span: 18 }}
+                  label="合同扫描件"
+                >
+                  <PicturesWall
+                    fileList={this.getOrgCodeUrl}
+                    pictureUrl={this.state.orgCodeUrl}
+                  />
+                  <p>图片建议:要清晰。</p>
+                </FormItem>
+              </div>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label="申请人"
+              >
+                {
+                  <Input
+                    placeholder="请输入申请人/公司"
+                    value={this.state.proposer}
+                    onChange={e => {
+                      this.setState({ proposer: e.target.value });
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                }
+              </FormItem>
+              <FormItem className="half-item" {...formItemLayout} label="省份">
+                <Select
+                  placeholder="请选择省份"
+                  style={{ width: "240px" }}
+                  value={getcityArr(this.state.province)}
+                  onChange={e => {
+                    this.setState({ province: e });
+                  }}
+                >
+                  {cityArr.map(function(item) {
+                    return (
+                      <Select.Option key={item.value}>{item.key}</Select.Option>
+                    );
+                  })}
+                </Select>
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label="联系电话"
+              >
+                {
+                  <Input
+                    placeholder="请输入联系手机"
+                    value={this.state.contactPhone}
+                    onChange={e => {
+                      this.setState({ contactPhone: e.target.value });
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                }
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label={
+                  <span>
+                    <strong style={{ color: "#f00" }}>*</strong>电子邮箱
+                  </span>
+                }
+              >
+                {
+                  <Input
+                    placeholder="请输入电子邮箱"
+                    value={this.state.email}
+                    onChange={e => {
+                      this.setState({ email: e.target.value });
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                }
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label={"状态"}
+              >
+                <span>{this.state.status ? "已提醒" : "待提醒"}</span>
+              </FormItem>
+            </div>
+            <div style={{ overflow: "hidden" }}>
+              <Button style={{ float: "right" }} onClick={this.avisitCancel}>
+                取消
+              </Button>
+              <Button
+                type="primary"
+                style={{ float: "right", marginRight: "10px" }}
+                onClick={this.baocunxiugai}
+              >
+                保存
+              </Button>
+            </div>
+          </Modal>
+
+          <Modal
+            maskClosable={false}
+            visible={this.state.visible}
+            onOk={this.visitOk}
+            onCancel={this.visitCancel}
+            width="1000px"
+            title="专利资料"
+            footer=""
+            className="admin-desc-content"
+          >
+            <div className="clearfix">
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label={
+                  <span>
+                    <strong style={{ color: "#f00" }}>*</strong>专利号
+                  </span>
+                }
+              >
+                {
+                  <Input
+                    placeholder="请输入专利号"
+                    value={this.state.patentNo}
+                    onChange={e => {
+                      this.setState({ patentNo: e.target.value });
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                }
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label={
+                  <span>
+                    <strong style={{ color: "#f00" }}>*</strong>专利名称
+                  </span>
+                }
+              >
+                {
+                  <Input
+                    placeholder="请输入专利名称"
+                    value={this.state.patentName}
+                    onChange={e => {
+                      this.setState({ patentName: e.target.value });
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                }
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label="申请日期"
+              >
+                <DatePicker
+                  style={{ marginTop: "2px", width: "240px", height: "32px" }}
+                  showTime
+                  format="YYYY-MM-DD"
+                  onOk={e => {}}
+                  value={this.state.appDate ? moment(this.state.appDate) : null}
+                  onChange={(data, dataString) => {
+                    this.setState({ appDate: dataString });
+                  }}
+                />
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label={
+                  <span>
+                    <strong style={{ color: "#f00" }}>*</strong>专利类型
+                  </span>
+                }
+              >
+                {
+                  <Select
+                    placeholder="请选择专利类型"
+                    style={{ width: "240px" }}
+                    value={this.state.patentType}
+                    onChange={e => {
+                      this.setState({ patentType: e });
+                    }}
+                  >
+                    {patentTypeList.map(function(item) {
+                      return (
+                        <Select.Option key={item.value}>
+                          {item.key}
+                        </Select.Option>
+                      );
+                    })}
+                  </Select>
+                }
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label="授权日期"
+              >
+                <DatePicker
+                  style={{ marginTop: "2px", width: "240px", height: "32px" }}
+                  showTime
+                  format="YYYY-MM-DD"
+                  onOk={e => {}}
+                  value={
+                    this.state.authDate ? moment(this.state.authDate) : null
+                  }
+                  onChange={(data, dataString) => {
+                    this.setState({ authDate: dataString });
+                  }}
+                />
+              </FormItem>
+              <div className="clearfix">
+                <FormItem
+                  labelCol={{ span: 4 }}
+                  wrapperCol={{ span: 18 }}
+                  label="合同扫描件"
+                >
+                  <PicturesWall
+                    fileList={this.getOrgCodeUrl}
+                    pictureUrl={this.state.orgCodeUrl}
+                  />
+                  <p>图片建议:要清晰。</p>
+                </FormItem>
+              </div>
+              <div>
+                <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                  申请人资料
+                </span>
+              </div>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label="申请人/公司"
+              >
+                {
+                  <Input
+                    placeholder="请输入申请人/公司"
+                    value={this.state.proposer}
+                    onChange={e => {
+                      this.setState({ proposer: e.target.value });
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                }
+              </FormItem>
+              <FormItem className="half-item" {...formItemLayout} label="省份">
+                <Select
+                  placeholder="请选择省份"
+                  style={{ width: "240px" }}
+                  value={this.state.province}
+                  onChange={e => {
+                    this.setState({ province: e });
+                  }}
+                >
+                  {cityArr.map(function(item) {
+                    return (
+                      <Select.Option key={item.value}>{item.key}</Select.Option>
+                    );
+                  })}
+                </Select>
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label="联系手机"
+              >
+                {
+                  <Input
+                    placeholder="请输入联系手机"
+                    value={this.state.contactPhone}
+                    onChange={e => {
+                      this.setState({ contactPhone: e.target.value });
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                }
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label={
+                  <span>
+                    <strong style={{ color: "#f00" }}>*</strong>电子邮箱
+                  </span>
+                }
+              >
+                {
+                  <Input
+                    placeholder="请输入电子邮箱"
+                    value={this.state.email}
+                    onChange={e => {
+                      this.setState({ email: e.target.value });
+                    }}
+                    style={{ width: "240px" }}
+                  />
+                }
+              </FormItem>
+            </div>
+            <div style={{ overflow: "hidden" }}>
+              <Button style={{ float: "right" }} onClick={this.onCal}>
+                取消
+              </Button>
+              <Button
+                type="primary"
+                style={{ float: "right", marginRight: "10px" }}
+                onClick={this.onSure}
+              >
+                保存
+              </Button>
+            </div>
+          </Modal>
+        </div>
+      </div>
+    );
 	}
 }))
 export default PatentPayment;

+ 170 - 97
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -6,9 +6,15 @@ import moment from 'moment';
 import { citySelect, provinceList } from '@/NewDicProvinceList';
 import AddIntention from './addIntention.jsx';
 import { socialAttribute, industry, auditStatusL, lvl, currentMember } from '@/dataDic.js';
-import { getSocialAttribute, beforeUploadFile ,getLevel} from '@/tools.js';
+import {
+  getSocialAttribute,
+  beforeUploadFile,
+  getLevel,
+  ShowModal
+} from "@/tools.js";
 import FollowDetail from './followDetail.jsx'
 import IntentionDetail from './intentionDetail/intentionDetail.jsx'
+import ShowModalDiv from "@/showModal.jsx";
 import './customer.less';
 const IntentionCustomer = Form.create()(React.createClass({
 	loadData(pageNo, apiUrl) {
@@ -35,6 +41,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				endDate: this.state.releaseDate[1],
 			},
 			success: function(data) {
+				ShowModal(this);
 				let theArr = [];
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {
@@ -521,44 +528,74 @@ const IntentionCustomer = Form.create()(React.createClass({
 				      <Select.Option key={group.id} value={group.name}>{group.name}</Select.Option>
 				     )
         const intentionState = this.props.intentionState ||'';
-		return(
-			<div className="user-content" >
-                <div className="content-title">                  
-                    <span>{!intentionState?'私有单位客户':'私有专家客户'}</span>
-                </div>
-                <div className="user-search">                    
-                    <Input placeholder="客户名称"
-                        value={this.state.nameSearch}
-                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
-                    <Select placeholder="省"
-                            style={{ width: 80 }}
-                            value={this.state.provinceSearch}
-                            onChange={(e) => {this.setState({ provinceSearch: e});}}>
-                            {this.state.Provinces}
-                    </Select> 
-                    <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
-    						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
-                    </span>
-                    <Select
-                    	style={{ width: 120 }}
-						value={this.state.level}
-						onChange={(e) => {
-							this.setState({ level: e });
-						}}
-						placeholder="请选择客户等级"
-					>
-						<Select.Option value="0">一般客户</Select.Option>
-						<Select.Option value="1">意向客户</Select.Option>
-						<Select.Option value="2">重点客户</Select.Option>
-					</Select>
-                    <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" style={{marginLeft:"10px"}} onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>                      
-                    {/*<Button onClick={() => { window.open(globalConfig.context + '/api/admin/customer/downloadTemplate?type=1') }}>下载批量导入模板</Button>
+		return (
+      <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
+        <div className="content-title">
+          <span>{!intentionState ? "私有单位客户" : "私有专家客户"}</span>
+        </div>
+        <div className="user-search">
+          <Input
+            placeholder="客户名称"
+            value={this.state.nameSearch}
+            onChange={e => {
+              this.setState({ nameSearch: e.target.value });
+            }}
+          />
+          <Select
+            placeholder="省"
+            style={{ width: 80 }}
+            value={this.state.provinceSearch}
+            onChange={e => {
+              this.setState({ provinceSearch: e });
+            }}
+          >
+            {this.state.Provinces}
+          </Select>
+          <span style={{ marginRight: "10px" }}>
+            <Cascader
+              options={citySelect()}
+              value={this.state.addressSearch}
+              placeholder="选择城市"
+              onChange={(e, pre) => {
+                this.setState({ addressSearch: e });
+              }}
+            />
+          </span>
+          <Select
+            style={{ width: 120 }}
+            value={this.state.level}
+            onChange={e => {
+              this.setState({ level: e });
+            }}
+            placeholder="请选择客户等级"
+          >
+            <Select.Option value="0">一般客户</Select.Option>
+            <Select.Option value="1">意向客户</Select.Option>
+            <Select.Option value="2">重点客户</Select.Option>
+          </Select>
+          <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"
+            style={{ marginLeft: "10px" }}
+            onClick={this.search}
+          >
+            搜索
+          </Button>
+          <Button onClick={this.reset}>重置</Button>
+          {/*<Button onClick={() => { window.open(globalConfig.context + '/api/admin/customer/downloadTemplate?type=1') }}>下载批量导入模板</Button>
                		<Upload 
                		    name="file"
                         action={globalConfig.context + "/api/admin/customer/uploadExcel"}                            
@@ -590,64 +627,100 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                        </Button>
 	                </Popconfirm>:''
 	                }*/}
-	                <AutoComplete
-				        className="certain-category-search"
-				        dropdownClassName="certain-category-search-dropdown"
-				        dropdownMatchSelectWidth={false}
-				        dropdownStyle={{ width: 120 }}
-				        style={{ width: '120px'}}
-				        dataSource={options}
-				        placeholder="输入转交人姓名"
-				        value={this.state.auto}
-				        onChange={this.httpChange}
-				        filterOption={true}
-				        onBlur={this.blurChange}
-				        onSelect={this.selectAuto}
-				        disabled={!hasSelected}
-				      >
-				        <Input />
-				      </AutoComplete>  
-					<Button type="primary" onClick={this.changeAssigner}  disabled={!hasSelected} >转交</Button>  
-                    <Button type="primary" className="addButton" onClick={this.addClick}>新增客户<Icon type="plus" /></Button> 
-					{/*<Button type="default" className="addButton" onClick={this.exportExec}>导出excel<Icon type="plus" /></Button>*/} 
-                    <div className='clearfix' style={{marginTop:'5px'}}>
-	                   <Button onClick={(e) =>{ e.stopPropagation(), this.rankO(0)}} type="primary" style={{marginRight:"10px"}} disabled={!hasSelected}>一般客户</Button>
-	                   <Button onClick={(e) =>{ e.stopPropagation(), this.rankO(1)}} type="primary" style={{marginRight:"10px"}} disabled={!hasSelected}>意向客户</Button>
-	                   <Button onClick={(e) =>{ e.stopPropagation(), this.rankO(2)}} type="primary" disabled={!hasSelected}>重点客户</Button>
-		            </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> 
-                <AddIntention
-                	api={this.state.detailApi}
-                    showDesc={this.state.showDesc}
-                    closeDesc={this.closeDesc} 
-                    />
-    			<FollowDetail 
-    			    categoryArr={this.state.categoryArr}
-    				followData={this.state.followData}
-    				visitModul={this.state.visitModul}
-    				closeDesc={this.closeDesc}
-    			/>
-    			<IntentionDetail 
-    				categoryArr={this.state.categoryArr}
-    				detailApi={this.props.detailApi}
-    				IntentionData={this.state.RowData}
-    				modalVisible={this.state.modalVisible}
-    				closeDesc={this.closeDesc}
-    				basicState={this.state.basicState}
-    				contactState={this.state.contactState}
-    			/>
-          </div >
-		);
+          <AutoComplete
+            className="certain-category-search"
+            dropdownClassName="certain-category-search-dropdown"
+            dropdownMatchSelectWidth={false}
+            dropdownStyle={{ width: 120 }}
+            style={{ width: "120px" }}
+            dataSource={options}
+            placeholder="输入转交人姓名"
+            value={this.state.auto}
+            onChange={this.httpChange}
+            filterOption={true}
+            onBlur={this.blurChange}
+            onSelect={this.selectAuto}
+            disabled={!hasSelected}
+          >
+            <Input />
+          </AutoComplete>
+          <Button
+            type="primary"
+            onClick={this.changeAssigner}
+            disabled={!hasSelected}
+          >
+            转交
+          </Button>
+          <Button type="primary" className="addButton" onClick={this.addClick}>
+            新增客户
+            <Icon type="plus" />
+          </Button>
+          {/*<Button type="default" className="addButton" onClick={this.exportExec}>导出excel<Icon type="plus" /></Button>*/}
+          <div className="clearfix" style={{ marginTop: "5px" }}>
+            <Button
+              onClick={e => {
+                e.stopPropagation(), this.rankO(0);
+              }}
+              type="primary"
+              style={{ marginRight: "10px" }}
+              disabled={!hasSelected}
+            >
+              一般客户
+            </Button>
+            <Button
+              onClick={e => {
+                e.stopPropagation(), this.rankO(1);
+              }}
+              type="primary"
+              style={{ marginRight: "10px" }}
+              disabled={!hasSelected}
+            >
+              意向客户
+            </Button>
+            <Button
+              onClick={e => {
+                e.stopPropagation(), this.rankO(2);
+              }}
+              type="primary"
+              disabled={!hasSelected}
+            >
+              重点客户
+            </Button>
+          </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>
+        <AddIntention
+          api={this.state.detailApi}
+          showDesc={this.state.showDesc}
+          closeDesc={this.closeDesc}
+        />
+        <FollowDetail
+          categoryArr={this.state.categoryArr}
+          followData={this.state.followData}
+          visitModul={this.state.visitModul}
+          closeDesc={this.closeDesc}
+        />
+        <IntentionDetail
+          categoryArr={this.state.categoryArr}
+          detailApi={this.props.detailApi}
+          IntentionData={this.state.RowData}
+          modalVisible={this.state.modalVisible}
+          closeDesc={this.closeDesc}
+          basicState={this.state.basicState}
+          contactState={this.state.contactState}
+        />
+      </div>
+    );
 	}
 }));
 export default IntentionCustomer;

+ 54 - 33
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -3,6 +3,8 @@ import { Button,Cascader,Input, Select, Spin, Table, message, Form } from 'antd'
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { citySelect, provinceList } from '@/NewDicProvinceList';
+import {ShowModal} from '../../../../tools.js'
+import ShowModalDiv from "@/showModal.jsx";
 
 const QueryCustomer = React.createClass({
 	loadData(pageNo, apiUrl) {
@@ -24,6 +26,7 @@ const QueryCustomer = React.createClass({
 				city: !(this.state.addressSearch).length ? '' : this.state.addressSearch[1],
 			},
 			success: function(data) {
+				ShowModal(this);
 				let theArr = [];
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {
@@ -199,39 +202,57 @@ const QueryCustomer = React.createClass({
 			},
 			
 		};
-		return(
-			<div className="user-content" >
-                <div className="content-title">                  
-                    <span>{!intentionState?'单位公共客户':'个人公共客户'}</span>
-                </div>
-                <div className="user-search">                    
-                    <Input placeholder="客户名称"
-                        value={this.state.nameSearch}
-                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
-                    <Select placeholder="省"
-                            style={{ width: 80 }}
-                            value={this.state.provinceSearch}
-                            onChange={(e) => {this.setState({ provinceSearch: e});}}>
-                            {this.state.Provinces}
-                    </Select> 
-                    <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
-    						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
-                    </span>
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button> 
-                </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} 
-                           />
-                    </Spin>
-                </div> 
-            </div>    
-		)
+		return (
+      <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
+        <div className="content-title">
+          <span>{!intentionState ? "单位公共客户" : "个人公共客户"}</span>
+        </div>
+        <div className="user-search">
+          <Input
+            placeholder="客户名称"
+            value={this.state.nameSearch}
+            onChange={e => {
+              this.setState({ nameSearch: e.target.value });
+            }}
+          />
+          <Select
+            placeholder="省"
+            style={{ width: 80 }}
+            value={this.state.provinceSearch}
+            onChange={e => {
+              this.setState({ provinceSearch: e });
+            }}
+          >
+            {this.state.Provinces}
+          </Select>
+          <span style={{ marginRight: "10px" }}>
+            <Cascader
+              options={citySelect()}
+              value={this.state.addressSearch}
+              placeholder="选择城市"
+              onChange={(e, pre) => {
+                this.setState({ addressSearch: e });
+              }}
+            />
+          </span>
+          <Button type="primary" onClick={this.search}>
+            搜索
+          </Button>
+          <Button onClick={this.reset}>重置</Button>
+        </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}
+            />
+          </Spin>
+        </div>
+      </div>
+    );
 	}
 })
 export default QueryCustomer;

+ 42 - 32
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -2,8 +2,9 @@ import React from 'react';
 import { Button,Cascader,Input, Select, Spin, Table, message, Form ,AutoComplete} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-
+import {ShowModal} from '../../../../tools.js'
 import { citySelect, provinceList } from '@/NewDicProvinceList';
+import ShowModalDiv from "@/showModal.jsx";
 import Detaile from './detail.jsx';
 
 const QueryCustomer = React.createClass({
@@ -28,6 +29,7 @@ const QueryCustomer = React.createClass({
 				aid: this.state.theTypes,
 			},
 			success: function(data) {
+				ShowModal(this);
 				let theArr = [];
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {
@@ -289,16 +291,21 @@ const QueryCustomer = React.createClass({
 				      <Select.Option key={group.id} value={group.name}>{group.name}</Select.Option>
 				     )
 		const hasSelected = this.state.selectedRowKeys.length > 0;
-		return(
-			<div className="user-content" >
-                <div className="content-title">                  
-                    <span>{!intentionState?'单位客户查询':'个人客户查询'}</span>
-                </div>
-                <div className="user-search">                    
-                    <Input placeholder="请输入精确客户全称"
-                        value={this.state.nameSearch}
-                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
-                   {/* <Select placeholder="选择部门"
+		return (
+      <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
+        <div className="content-title">
+          <span>{!intentionState ? "单位客户查询" : "个人客户查询"}</span>
+        </div>
+        <div className="user-search">
+          <Input
+            placeholder="请输入精确客户全称"
+            value={this.state.nameSearch}
+            onChange={e => {
+              this.setState({ nameSearch: e.target.value });
+            }}
+          />
+          {/* <Select placeholder="选择部门"
                             style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
                             value={this.state.departmenttSearch}
                             onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
@@ -308,7 +315,7 @@ const QueryCustomer = React.createClass({
                                 })
                             }
                     </Select>   */}
-                    {/* <AutoComplete
+          {/* <AutoComplete
 				        className="certain-category-search"
 				        dropdownClassName="certain-category-search-dropdown"
 				        dropdownMatchSelectWidth={false}
@@ -324,26 +331,29 @@ const QueryCustomer = React.createClass({
 				    >
 				        <Input />
 				    </AutoComplete>   */}
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button> 
-                </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} 
-                           />
-                    </Spin>
-                </div> 
-                <Detaile 
-                	visitModul={this.state.visitModul}
-                	data={this.state.data}
-                	detailApi={this.props.detailApi}
-                	closeDesc={this.closeDesc}
-                />
-            </div>    
-		)
+          <Button type="primary" onClick={this.search}>
+            搜索
+          </Button>
+          <Button onClick={this.reset}>重置</Button>
+        </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}
+            />
+          </Spin>
+        </div>
+        <Detaile
+          visitModul={this.state.visitModul}
+          data={this.state.data}
+          detailApi={this.props.detailApi}
+          closeDesc={this.closeDesc}
+        />
+      </div>
+    );
 	}
 })
 export default QueryCustomer;

+ 99 - 59
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -5,8 +5,9 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import { citySelect, provinceList } from '@/NewDicProvinceList';
 import { socialAttribute, industry, auditStatusL, lvl, currentMember } from '@/dataDic.js';
-import { getSocialAttribute, beforeUploadFile } from '@/tools.js';
+import { getSocialAttribute, beforeUploadFile, ShowModal } from "@/tools.js";
 import FollowDetail from './followDetail.jsx'
+import ShowModalDiv from "@/showModal.jsx";
 import IntentionDetail from './intentionDetail/intentionDetail.jsx'
 import './customer.less';
 
@@ -34,6 +35,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				endDate: this.state.releaseDate[1],
 			},
 			success: function(data) {
+				ShowModal(this);
 				let theArr = [];
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {
@@ -331,70 +333,108 @@ const IntentionCustomer = Form.create()(React.createClass({
 				      <Select.Option key={group.id} value={group.name}>{group.name}</Select.Option>
 				     )
         const intentionState = this.props.intentionState ||'';
-		return(
-			<div className="user-content" >
-                <div className="content-title">                  
-                    <span>{!intentionState?'我的单位签单客户':'我的个人签单客户'}</span>
-                </div>
-                <div className="user-search">                    
-                    <Input placeholder="客户名称"
-                        value={this.state.nameSearch}
-                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
-                    <Select placeholder="省"
-                            style={{ width: 80 }}
-                            value={this.state.provinceSearch}
-                            onChange={(e) => {this.setState({ provinceSearch: e});}}>
-                            {this.state.Provinces}
-                    </Select> 
-                    <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
-    						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
-                    </span>
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>                      
-	              {/* {adminData.isSuperAdmin?<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
+		return (
+      <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
+        <div className="content-title">
+          <span>
+            {!intentionState ? "我的单位签单客户" : "我的个人签单客户"}
+          </span>
+        </div>
+        <div className="user-search">
+          <Input
+            placeholder="客户名称"
+            value={this.state.nameSearch}
+            onChange={e => {
+              this.setState({ nameSearch: e.target.value });
+            }}
+          />
+          <Select
+            placeholder="省"
+            style={{ width: 80 }}
+            value={this.state.provinceSearch}
+            onChange={e => {
+              this.setState({ provinceSearch: e });
+            }}
+          >
+            {this.state.Provinces}
+          </Select>
+          <span style={{ marginRight: "10px" }}>
+            <Cascader
+              options={citySelect()}
+              value={this.state.addressSearch}
+              placeholder="选择城市"
+              onChange={(e, pre) => {
+                this.setState({ addressSearch: e });
+              }}
+            />
+          </span>
+          <Button type="primary" onClick={this.search}>
+            搜索
+          </Button>
+          <Button onClick={this.reset}>重置</Button>
+          {/* {adminData.isSuperAdmin?<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 							     <Button type="danger" style={{marginLeft:'10px'}}
 	                       			 disabled={!hasSelected} 
 	                       		 >删除<Icon type="minus" />
 	                        </Button>
 	                </Popconfirm>:''
 	                }*/}
-	                <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch checked={!this.state.searchMore} onChange={this.searchSwitch} /></span>
-                    <div className='clearfix' style={{marginTop:'5px'}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
-			                <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>                                               
-                <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> 
-    			<FollowDetail 
-    				followData={this.state.followData}
-    				visitModul={this.state.visitModul}
-    				closeDesc={this.closeDesc}
-    				loadData={this.loadData}
-    			/>
-    			<IntentionDetail 
-    				detailApi={this.props.detailApi}
-    				IntentionData={this.state.RowData}
-    				modalVisible={this.state.modalVisible}
-    				closeDesc={this.closeDesc}
-    				basicState={this.state.basicState}
-    				contactState={this.state.contactState}
-    			/>
-          </div >
-		);
+          <span style={{ marginLeft: "10px", marginRight: "20px" }}>
+            更多搜索
+            <Switch
+              checked={!this.state.searchMore}
+              onChange={this.searchSwitch}
+            />
+          </span>
+          <div className="clearfix" style={{ marginTop: "5px" }}>
+            <div
+              className="search-more"
+              style={this.state.searchMore ? { display: "none" } : {}}
+            >
+              <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>
+        <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>
+        <FollowDetail
+          followData={this.state.followData}
+          visitModul={this.state.visitModul}
+          closeDesc={this.closeDesc}
+          loadData={this.loadData}
+        />
+        <IntentionDetail
+          detailApi={this.props.detailApi}
+          IntentionData={this.state.RowData}
+          modalVisible={this.state.modalVisible}
+          closeDesc={this.closeDesc}
+          basicState={this.state.basicState}
+          contactState={this.state.contactState}
+        />
+      </div>
+    );
 	}
 }));
 export default IntentionCustomer;

+ 137 - 86
js/component/manageCenter/customer/individualCustomer/myReject.jsx

@@ -12,7 +12,27 @@ const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
 import CustomerDetail from './myClientDesc.jsx';
 import { socialAttribute, industry, auditStatusL, newFollow, lvl, currentMember, statuslist, customerStatus, intentionalService } from '../../../dataDic.js';
-import { getSocialAttribute, splitUrl,getAuditStatus, getCompanyIntention, getStatuslist, getContactType, getIndustryType, getfllowSituation, beforeUploadFile, getWhether, getcustomerStatue, getfllowSituationOn, getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '../../../tools.js';
+import {
+  getSocialAttribute,
+  splitUrl,
+  getAuditStatus,
+  getCompanyIntention,
+  getStatuslist,
+  getContactType,
+  getIndustryType,
+  getfllowSituation,
+  beforeUploadFile,
+  getWhether,
+  getcustomerStatue,
+  getfllowSituationOn,
+  getCertification,
+  getcustomerTyp,
+  getLvl,
+  getCurrentMember,
+  getprovince,
+  ShowModal
+} from "../../../tools.js";
+import ShowModalDiv from "@/showModal.jsx";
 const PublicCustomer = Form.create()(React.createClass({
 	loadData(pageNo) {
 		this.state.data = [];
@@ -31,6 +51,7 @@ const PublicCustomer = Form.create()(React.createClass({
 				adminName:this.state.adminName,//营销员名称
 			},
 			success: function(data) {
+				ShowModal(this);
 				let theArr = [];
 				let thisdata;
 				if(data.error.length || data.data.list == "") {
@@ -375,91 +396,121 @@ const PublicCustomer = Form.create()(React.createClass({
 			wrapperCol: { span: 14 },
 		};
 		const contacts = this.state.contacts || '';
-		return(
-			<div className="user-content" >
-                <div className="content-title">                  
-                    <span>我的被拒绝客户</span>
-                </div>
-                <div className="user-search">                    
-                    <Input placeholder="客户名称"
-                        value={this.state.nameSearch}
-                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
-                    <Input placeholder="营销员"
-                        value={this.state.adminName}
-                        onChange={(e) => { this.setState({ adminName: e.target.value }); }} /> 
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>                                         				
-				</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> 
-                <Modal	
-				      className="customeDetails"				      
-			          title="被拒绝客户详情"
-			          width='500px'
-			          visible={this.state.modal5Visible}
-			          onOk={this.detailsModal}
-			          onCancel={this.detailsModal}
-			          footer=''
-			        >				    
-					<Form horizontal onSubmit={this.submit} id="add-form">
-		                <Spin spinning={this.state.loading}>
-		                   <div className="clearfix">
-		                    	<FormItem 
-			                            {...formItemLayout}
-			                            label="客户姓名" >   
-			                           {getFieldDecorator('nickname', {
-			                                rules: [{ required: true, message: '此项为必填项!' }],
-			                                initialValue: this.state.nickname
-		                                })(
-		                                    <Input placeholder="客户姓名" onChange={(e)=>{this.setState({nickname:e.target.value})}}/>
-		                                )} 
-			                    </FormItem>
-		                    </div>
-		                    <div className="clearfix">
-		                    	<FormItem 
-			                            {...formItemLayout}
-			                            label="联系电话" >
-			                    		{getFieldDecorator('mobile', {
-			                                rules: [{ required: true, message: '此项为必填项!' }],
-			                                initialValue: this.state.mobile
-		                                })(
-		                                    <Input placeholder="联系电话" onChange={(e)=>{this.setState({mobile:e.target.value})}}/>
-		                                )} 
-			                    </FormItem>
-		                    </div>
-		                    
-		                    <div className="clearfix">
-		                    	<FormItem  
-		                         	{...formItemLayout}
-		                           	label="社会属性"
-		                         > 
-			                          <Select placeholder="客户社会属性" value={this.state.societyTag} 
-		                                onChange={(e)=>{this.setState({societyTag:e})}}> 
-		                                {
-		                                    socialAttribute.map(function (item) {
-		                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
-		                                    })
-		                                }
-		                              </Select>
-		                   		 </FormItem>
-		                    </div>
-		                    <FormItem wrapperCol={{ span: 18, offset: 6 }}>
-		                        <Button  type="primary" htmlType="submit">提交审核</Button>  
-		                        <Button  type="ghost" onClick={this.detailsModal} style={{'marginLeft':'40px'}}>取消</Button>
-		                    </FormItem> 
-						</Spin>
-		            </Form >                          
-				</Modal>
-          </div >
-		);
+		return (
+      <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
+        <div className="content-title">
+          <span>我的被拒绝客户</span>
+        </div>
+        <div className="user-search">
+          <Input
+            placeholder="客户名称"
+            value={this.state.nameSearch}
+            onChange={e => {
+              this.setState({ nameSearch: e.target.value });
+            }}
+          />
+          <Input
+            placeholder="营销员"
+            value={this.state.adminName}
+            onChange={e => {
+              this.setState({ adminName: e.target.value });
+            }}
+          />
+          <Button type="primary" onClick={this.search}>
+            搜索
+          </Button>
+          <Button onClick={this.reset}>重置</Button>
+        </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>
+        <Modal
+          className="customeDetails"
+          title="被拒绝客户详情"
+          width="500px"
+          visible={this.state.modal5Visible}
+          onOk={this.detailsModal}
+          onCancel={this.detailsModal}
+          footer=""
+        >
+          <Form horizontal onSubmit={this.submit} id="add-form">
+            <Spin spinning={this.state.loading}>
+              <div className="clearfix">
+                <FormItem {...formItemLayout} label="客户姓名">
+                  {getFieldDecorator("nickname", {
+                    rules: [{ required: true, message: "此项为必填项!" }],
+                    initialValue: this.state.nickname
+                  })(
+                    <Input
+                      placeholder="客户姓名"
+                      onChange={e => {
+                        this.setState({ nickname: e.target.value });
+                      }}
+                    />
+                  )}
+                </FormItem>
+              </div>
+              <div className="clearfix">
+                <FormItem {...formItemLayout} label="联系电话">
+                  {getFieldDecorator("mobile", {
+                    rules: [{ required: true, message: "此项为必填项!" }],
+                    initialValue: this.state.mobile
+                  })(
+                    <Input
+                      placeholder="联系电话"
+                      onChange={e => {
+                        this.setState({ mobile: e.target.value });
+                      }}
+                    />
+                  )}
+                </FormItem>
+              </div>
+
+              <div className="clearfix">
+                <FormItem {...formItemLayout} label="社会属性">
+                  <Select
+                    placeholder="客户社会属性"
+                    value={this.state.societyTag}
+                    onChange={e => {
+                      this.setState({ societyTag: e });
+                    }}
+                  >
+                    {socialAttribute.map(function(item) {
+                      return (
+                        <Select.Option key={item.value}>
+                          {item.key}
+                        </Select.Option>
+                      );
+                    })}
+                  </Select>
+                </FormItem>
+              </div>
+              <FormItem wrapperCol={{ span: 18, offset: 6 }}>
+                <Button type="primary" htmlType="submit">
+                  提交审核
+                </Button>
+                <Button
+                  type="ghost"
+                  onClick={this.detailsModal}
+                  style={{ marginLeft: "40px" }}
+                >
+                  取消
+                </Button>
+              </FormItem>
+            </Spin>
+          </Form>
+        </Modal>
+      </div>
+    );
 	}
 }));
 

+ 3 - 2
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -2002,7 +2002,8 @@ const approvedOutsourcing = React.createClass({
           message.success("通过成功!");
           this.loadData();
           this.setState({
-            checkVisible: false
+            checkVisible: false,
+            checkData: ""
           });
         }
       }.bind(this)
@@ -3295,11 +3296,11 @@ const approvedOutsourcing = React.createClass({
             }}
           >
             <TextArea
+              value={this.state.checkData}
               onChange={(e, recard) => {
                 this.setState({
                   checkData: e.target.value
                 });
-                console.log(e.target.value);
               }}
               placeholder="请填写审核内容"
             />

+ 2 - 1
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -33,6 +33,7 @@ import {
 } from "@/tools";
 import { ChooseList } from "../../order/orderNew/chooseList"
 import Project from "../../../../component/project"
+import { throws } from "assert";
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
 const { TextArea } = Input;
@@ -2203,11 +2204,11 @@ const ShouKuang = React.createClass({
             }}
           >
             <TextArea
+              value={this.state.checkData}
               onChange={(e, recard) => {
                 this.setState({
                   checkData: e.target.value
                 });
-                console.log(e.target.value);
               }}
               placeholder="请填写审核内容"
             />

+ 11 - 8
js/component/manageCenter/order/orderNew/addService.jsx

@@ -519,7 +519,7 @@ const NewService = Form.create()(
             }
           },
           {
-            title: "时间",
+            title: "首付时间(特批需选择时间)",
             dataIndex: "waitDay",
             key: "waitDay",
             render: (text, record) => {
@@ -600,7 +600,7 @@ const NewService = Form.create()(
               }
               return (
                 <Select
-                  placeholder="请选择时间"
+                  placeholder="请选择年限"
                   style={{ width: "150px" }}
                   disabled={this.state.yearFlag ? true : false}
                   onChange={e => {
@@ -785,7 +785,7 @@ const NewService = Form.create()(
           message.warning("特批存在首付催款节点未填写时间的情况,请删除后重新填写保存")
           return false
         }
-        if (!this.state.contactListNew[i].id) {
+        if (!this.state.contactListNew[i].id && this.props.userDetaile) {
           message.warning("请保存催款节点");
           return false;
         }
@@ -1419,7 +1419,7 @@ const NewService = Form.create()(
           visible: false,
           mark: false,
           cuiFlag: false,
-          addFlag: false
+          addFlag: false,
         },
         () => {
           this.setState({
@@ -2085,7 +2085,7 @@ const NewService = Form.create()(
         changeAmount: "0",
         applicant: undefined,
         depNameChange: undefined,
-        typeChange: 0
+        typeChange: 0,
       });
     },
 
@@ -2932,12 +2932,15 @@ const NewService = Form.create()(
                               </Form>
                             </Spin>
                           </div>
-                          <div>
+                          <div
+                            style={{
+                              display: cuiDataList.length ? "none" : "block"
+                            }}
+                          >
                             <span
                               style={{
                                 marginLeft: "50px",
-                                fontSize: "20px",
-                                display: cuiDataList.length ? "none" : "block"
+                                fontSize: "20px"
                               }}
                             >
                               新催款节点

+ 4 - 2
js/component/manageCenter/order/orderNew/examine.jsx

@@ -732,7 +732,8 @@ const IntentionCustomer = Form.create()(
     examOk() {
       if (this.state.flag) return;
       this.setState({
-        flag: true
+        flag: true,
+        loading: true
       });
       $.ajax({
         method: "post",
@@ -772,7 +773,8 @@ const IntentionCustomer = Form.create()(
     outsourcing() {
       if (this.state.flag) return;
       this.setState({
-        flag: true
+        flag: true,
+        loading: true
       });
       $.ajax({
         method: "post",

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

@@ -618,7 +618,6 @@ const IntentionCustomer = Form.create()(
                       type="primary"
                       onClick={e => {
                         this.contactSaveNew(record);
-                        this.setState({ addFlag: false });
                       }}
                     >
                       保存
@@ -1085,6 +1084,7 @@ const IntentionCustomer = Form.create()(
           });
           if (!data.error.length) {
             message.success("保存成功!");
+            this.setState({ addFlag: false });
             this.setState({
               cuiFlag: false
             });

+ 14 - 9
js/component/manageCenter/topTab.jsx

@@ -80,15 +80,16 @@ const MessageModal = React.createClass({
                     title: '内容',
                     dataIndex: 'content',
                     key: 'content',
-                }, {
-                    title: '公司',
-                    dataIndex: 'unitName',
-                    key: 'unitName',
-                }, {
-                    title: '业务员',
-                    dataIndex: 'principle',
-                    key: 'principle',
-                }
+                },
+                //  {
+                //     title: '公司',
+                //     dataIndex: 'unitName',
+                //     key: 'unitName',
+                // }, {
+                //     title: '业务员',
+                //     dataIndex: 'principle',
+                //     key: 'principle',
+                // }
             ],
             data: []
         };
@@ -228,11 +229,15 @@ const MessageModal = React.createClass({
                             <Tabs.TabPane tab="新信息" key="1">
                                 <Table columns={this.state.columns}
                                     dataSource={this.state.unreadData}
+                                    bordered
+                                    size="small"
                                     pagination={this.state.UnreadPagination} />
                             </Tabs.TabPane>
                             <Tabs.TabPane tab="已读信息" key="2">
                                 <Table columns={this.state.columns}
                                     dataSource={this.state.dataSource}
+                                    bordered
+                                    size="small"
                                     pagination={this.state.pagination} />
                             </Tabs.TabPane>
                         </Tabs>