Browse Source

旧外包单重新发起后显示为新单页面
新增专利查看页面

mentoswzq 4 years ago
parent
commit
d749be560d

+ 10 - 4
js/component/common/imgList/index.js

@@ -153,11 +153,17 @@ class ImgList extends Component{
                                         }
                                         if(this.state.uploadsuccessNum === arr.length){
                                             this.setState({
-                                                uploadLoading: false,
+                                                percent: 1,
                                             },()=>{
-                                                this.setState({
-                                                    percent: 0,
-                                                })
+                                                setTimeout(()=>{
+                                                    this.setState({
+                                                        uploadLoading: false,
+                                                    },()=>{
+                                                        this.setState({
+                                                            percent: 0,
+                                                        })
+                                                    })
+                                                },1500)
                                             })
                                         }
                                     }else{

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

@@ -53,7 +53,7 @@ const PicturesWall = React.createClass({
         this.props.fileList(fileList);
     },
     componentWillReceiveProps(nextProps) {
-        this.state.fileList = nextProps.pictureUrl; 
+        this.state.fileList = nextProps.pictureUrl;
     },
     render() {
         const { previewVisible, previewImage, fileList } = this.state;
@@ -120,7 +120,7 @@ const PatentPayment = Form.create()(React.createClass({
 				});
 			}.bind(this));
 	},
-	
+
 	loadData(pageNo){
 		this.setState({
 			loading: true
@@ -314,11 +314,11 @@ const PatentPayment = Form.create()(React.createClass({
 		}
 		if(this.state.patentType === ''){
 		    message.warning('专利类型不能为空');
-		    return 
+		    return
 		}
 		if(this.state.email === ''){
 		    message.warning('电子邮箱不能为空');
-		    return 
+		    return
 		}
 		$.ajax({
 			method: "POST",
@@ -391,7 +391,7 @@ const PatentPayment = Form.create()(React.createClass({
 		}
 		if(this.state.patentType === ''){
 		    message.warning('专利类型不能为空');
-		    return 
+		    return
 		}
 		$.ajax({
 			method: "POST",
@@ -427,11 +427,11 @@ const PatentPayment = Form.create()(React.createClass({
 			}
 		}.bind(this));
 	},
-	
+
 	baocunxiugai(){
 		this.xiugai(this.state.RowData)
 	},
-	
+
 	avisitCancel(){
 		this.setState({
 			avisible:false
@@ -444,14 +444,14 @@ const PatentPayment = Form.create()(React.createClass({
 			patentType:undefined,
 			appDate:undefined,
 			authDate:undefined,
-			orgCodeUrl:'',
+			orgCodeUrl:[],
 			proposer:'',
 			province:undefined,
 			contactPhone:'',
 			email:''
 		})
 	},
-	
+
 	searchReset(){
 		this.setState({
 			statusSearch:undefined,
@@ -465,11 +465,11 @@ const PatentPayment = Form.create()(React.createClass({
 			this.loadData()
 		})
 	},
-	
+
 	search(){
 		this.loadData()
 	},
-	
+
 	onCal(){
 		this.setState({
 			visible:false
@@ -478,7 +478,7 @@ const PatentPayment = Form.create()(React.createClass({
 	getOrgCodeUrl(e) {
 	    this.setState({ orgCodeUrl: e });
 	},
-	
+
 	render(){
 		const theData = this.state.RowData || {};
 		const FormItem = Form.Item;
@@ -487,7 +487,7 @@ const PatentPayment = Form.create()(React.createClass({
 			wrapperCol: { span: 14 },
 		};
 		const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-			
+
 		return (
       <div className="user-content">
         <ShowModalDiv ShowModal={this.state.showModal} />
@@ -584,13 +584,13 @@ const PatentPayment = Form.create()(React.createClass({
                 }}
               />
             </span>
-            <Button
+			  {!this.props.isOnlyRead ? <Button
               type="primary"
               onClick={this.new}
               style={{ marginRight: "10px", float: "right" }}
             >
               新建
-            </Button>
+            </Button> : <div/>}
             {/*<Button onClick={this.reset}>导出</Button>*/}
           </div>
           {this.state.mark ? (
@@ -627,12 +627,12 @@ const PatentPayment = Form.create()(React.createClass({
               />
             </Spin>
           </div>
-          <Modal
+			{this.state.avisible ? <Modal
             maskClosable={false}
             visible={this.state.avisible}
             onCancel={this.avisitCancel}
             width="800px"
-            title="修改详情"
+            title={!this.props.isOnlyRead ? "修改详情" : "查看详情"}
             footer=""
             className="admin-desc-content"
           >
@@ -646,7 +646,7 @@ const PatentPayment = Form.create()(React.createClass({
                   </span>
                 }
               >
-                {
+                {!this.props.isOnlyRead ?
                   <Input
                     placeholder="请输入专利号"
                     value={this.state.patentNo}
@@ -654,7 +654,7 @@ const PatentPayment = Form.create()(React.createClass({
                       this.setState({ patentNo: e.target.value });
                     }}
                     style={{ width: "240px" }}
-                  />
+                  /> : <span>{this.state.patentNo}</span>
                 }
               </FormItem>
               <FormItem
@@ -666,7 +666,7 @@ const PatentPayment = Form.create()(React.createClass({
                   </span>
                 }
               >
-                {
+                {!this.props.isOnlyRead ?
                   <Input
                     placeholder="请输入专利名称"
                     value={this.state.patentName}
@@ -674,7 +674,7 @@ const PatentPayment = Form.create()(React.createClass({
                       this.setState({ patentName: e.target.value });
                     }}
                     style={{ width: "240px" }}
-                  />
+                  /> : <div>{this.state.patentName}</div>
                 }
               </FormItem>
               <FormItem
@@ -682,7 +682,7 @@ const PatentPayment = Form.create()(React.createClass({
                 {...formItemLayout}
                 label="专利类型"
               >
-                {
+                {!this.props.isOnlyRead ?
                   <Select
                     placeholder="请选择专利类型"
                     style={{ width: "240px" }}
@@ -698,7 +698,7 @@ const PatentPayment = Form.create()(React.createClass({
                         </Select.Option>
                       );
                     })}
-                  </Select>
+                  </Select> : <div>{getPatentType(this.state.patentType)}</div>
                 }
               </FormItem>
               <FormItem
@@ -706,22 +706,27 @@ const PatentPayment = Form.create()(React.createClass({
                 {...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 });
-                  }}
-                />
+				  {
+					  !this.props.isOnlyRead ?
+						  <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 });
+							  }}
+						  /> : <div>{this.state.appDate ? moment(this.state.appDate).format('YYYY-MM-DD') : ''}</div>
+				  }
               </FormItem>
               <FormItem
                 className="half-item"
                 {...formItemLayout}
                 label="授权日期"
               >
+				  {
+					  !this.props.isOnlyRead ?
                 <DatePicker
                   style={{ marginTop: "2px", width: "240px", height: "32px" }}
                   showTime
@@ -733,7 +738,7 @@ const PatentPayment = Form.create()(React.createClass({
                   onChange={(data, dataString) => {
                     this.setState({ authDate: dataString });
                   }}
-                />
+                /> : <div>{this.state.authDate ? moment(this.state.authDate).format('YYYY-MM-DD') : ''}</div> }
               </FormItem>
               <FormItem className="half-item" {...formItemLayout} label="费用">
                 <span>{theData.patentAmount}</span>
@@ -744,12 +749,16 @@ const PatentPayment = Form.create()(React.createClass({
                   wrapperCol={{ span: 18 }}
                   label="合同扫描件"
                 >
-                  <PicturesWall
+				 {!this.props.isOnlyRead ? <PicturesWall
 					domId={'patentPayment1'}
                     fileList={this.getOrgCodeUrl}
                     pictureUrl={this.state.orgCodeUrl}
-                  />
-                  <p>图片建议:要清晰。</p>
+                  /> :
+				  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+					<ImgList domId={'patentPayment3'} fileList={this.state.orgCodeUrl}/>
+				  </div>
+				 }
+					{!this.props.isOnlyRead ? <p>图片建议:要清晰。</p> : null}
                 </FormItem>
               </div>
               <FormItem
@@ -757,7 +766,8 @@ const PatentPayment = Form.create()(React.createClass({
                 {...formItemLayout}
                 label="申请人"
               >
-                {
+				{
+				 !this.props.isOnlyRead ?
                   <Input
                     placeholder="请输入申请人/公司"
                     value={this.state.proposer}
@@ -765,10 +775,12 @@ const PatentPayment = Form.create()(React.createClass({
                       this.setState({ proposer: e.target.value });
                     }}
                     style={{ width: "240px" }}
-                  />
+                  /> : <div>{this.state.proposer}</div>
                 }
               </FormItem>
               <FormItem className="half-item" {...formItemLayout} label="省份">
+				  {
+					  !this.props.isOnlyRead ?
                 <Select
                   placeholder="请选择省份"
                   style={{ width: "240px" }}
@@ -782,14 +794,15 @@ const PatentPayment = Form.create()(React.createClass({
                       <Select.Option key={item.value}>{item.key}</Select.Option>
                     );
                   })}
-                </Select>
+                </Select> : <div>{getcityArr(this.state.province)}</div> }
               </FormItem>
               <FormItem
                 className="half-item"
                 {...formItemLayout}
                 label="联系电话"
               >
-                {
+				  {
+					  !this.props.isOnlyRead ?
                   <Input
                     placeholder="请输入联系手机"
                     value={this.state.contactPhone}
@@ -797,7 +810,7 @@ const PatentPayment = Form.create()(React.createClass({
                       this.setState({ contactPhone: e.target.value });
                     }}
                     style={{ width: "240px" }}
-                  />
+                  /> : <div>{this.state.contactPhone}</div>
                 }
               </FormItem>
               <FormItem
@@ -809,7 +822,8 @@ const PatentPayment = Form.create()(React.createClass({
                   </span>
                 }
               >
-                {
+				  {
+					  !this.props.isOnlyRead ?
                   <Input
                     placeholder="请输入电子邮箱"
                     value={this.state.email}
@@ -817,7 +831,7 @@ const PatentPayment = Form.create()(React.createClass({
                       this.setState({ email: e.target.value });
                     }}
                     style={{ width: "240px" }}
-                  />
+                  /> : <div>{this.state.email}</div>
                 }
               </FormItem>
               <FormItem
@@ -828,7 +842,7 @@ const PatentPayment = Form.create()(React.createClass({
                 <span>{this.state.status ? "已提醒" : "待提醒"}</span>
               </FormItem>
             </div>
-            <div style={{ overflow: "hidden" }}>
+			  {!this.props.isOnlyRead ? <div style={{ overflow: "hidden" }}>
               <Button style={{ float: "right" }} onClick={this.avisitCancel}>
                 取消
               </Button>
@@ -839,8 +853,8 @@ const PatentPayment = Form.create()(React.createClass({
               >
                 保存
               </Button>
-            </div>
-          </Modal>
+            </div> : <div/>}
+          </Modal> : <div/>}
 
           <Modal
             maskClosable={false}

+ 15 - 1
js/component/manageCenter/customer/content.jsx

@@ -390,7 +390,7 @@ class Content extends Component {
 			    require.ensure([], () => {
 			        const PatentPayment = require('./NEW/crm/patentPayment').default;
 			        this.setState({
-			            component: <PatentPayment 
+			            component: <PatentPayment
 			                		intentionState={0}
 			                		ApiUrl={'/api/admin/customer/listPrivateOrganizationCustomer'}
 			                		detailApi={'/api/admin/customer/findOrganizationCustomerDetail'}
@@ -398,6 +398,20 @@ class Content extends Component {
 			        });
 			    });
 			    break;
+            //客户资料-仅读
+            case 'patentPaymentOnlyRead':
+                require.ensure([], () => {
+                    const PatentPayment = require('./NEW/crm/patentPayment').default;
+                    this.setState({
+                        component: <PatentPayment
+                            isOnlyRead={true}
+                            intentionState={0}
+                            ApiUrl={'/api/admin/customer/listPrivateOrganizationCustomer'}
+                            detailApi={'/api/admin/customer/findOrganizationCustomerDetail'}
+                        />
+                    });
+                });
+                break;
             /*签单客户*/ 
             //个人签单客户
             case 'personalSign':

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

@@ -2349,7 +2349,7 @@ const Task = React.createClass({
     }).done(
       function (data) {
         if (!data.error.length && data.data) {
-          if(data.data.unitNumber){
+          if(!isNaN(parseFloat(data.data.unitNumber))){
             this.setState({
               oldInfor: {
                 companyName:data.data.companyName,
@@ -2676,9 +2676,9 @@ const Task = React.createClass({
               (allTotalAmount * 10000 + thisData.totalAmount * 10000) / 10000
             companyNameArr.push(thisData.companyName);
             thisData.key = i;
+            type=thisData.patentType;
             thisData.patentType = thisData.type;
             theArr.push(thisData);
-            type=thisData.patentType;
             startType=thisData.startType;
             patentNameType= thisData.patentNameType
           }
@@ -2696,7 +2696,7 @@ const Task = React.createClass({
 
           if(type === 0 || type === 1){
             this.setState({
-              patentType: type === 0 ? 1 : 2,    //0其他 1专利申请 2专利买卖
+              patentType: type === 0 ? 0 : 1,    //0专利申请 1专利买卖
               patentNameType: patentNameType,                         //0实用新型 1发明专利 2外观专利 3 其他
             })
           }