소스 검색

完善项目详情

HW 4 년 전
부모
커밋
0364593e30

+ 8 - 7
js/component/manageCenter/project/task/myTask.jsx

@@ -1605,7 +1605,7 @@ const Task = React.createClass({
             outsourcePrice: thisdata.outsourcePrice, //外包价格
             declarationBatch: thisdata.declarationBatch,
             orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
-            bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新
+            bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
             specialComment: thisdata.specialComment,
             urgentDay: thisdata.urgentDay, //有无材料
             ifMaterial: thisdata.ifMaterial, //加急情况
@@ -3748,7 +3748,7 @@ const Task = React.createClass({
                       {/*  </Radio.Group>*/}
                       {/*</FormItem>*/}
                     </div>
-                    {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新*/}
+                    {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                     {this.state.bpType === 2 ? <div className="clearfix">
                       <FormItem
                           className="half-item"
@@ -4153,9 +4153,9 @@ const Task = React.createClass({
                     </div>
                     <div className="clearfix">
                       <h3 className="sub-title">项目申报进度</h3>
-                        {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新*/}
+                        {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                         {
-                            this.state.bpType === 1 ?
+                            this.state.bpType === 1 || this.state.bpType === 6 ?
                                 <div>
                                     <FormItem
                                         className="half-item"
@@ -4175,6 +4175,7 @@ const Task = React.createClass({
                                     <FormItem/>
                                     <PatentSchedule
                                         taskId={this.state.id}
+                                        bpType={this.state.bpType}
                                         acceptCount={this.state.acceptCount}
                                         authorizeCount={this.state.authorizeCount}
                                         rejectCount={this.state.rejectCount}
@@ -4183,7 +4184,7 @@ const Task = React.createClass({
                                     />
                                 </div> :
                       <div>
-                          {/*高新显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新*/}
+                          {/*高新显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                           {this.state.bpType === 5 ?  <FormItem
                               className="half-item"
                               {...formItemLayout}
@@ -4440,7 +4441,7 @@ const Task = React.createClass({
                           </FormItem>
                         </div>}
                     </div>
-                    {this.state.bpType !== 1 ? <div className="clearfix">
+                    {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                       <FormItem
                         labelCol={{ span: 3 }}
                         wrapperCol={{ span: 16 }}
@@ -4460,7 +4461,7 @@ const Task = React.createClass({
                         />
                       </FormItem>
                     </div> : null}
-                    {this.state.bpType !== 1 ? <div className="clearfix">
+                    {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                       <FormItem
                         labelCol={{ span: 3 }}
                         wrapperCol={{ span: 16 }}

+ 196 - 87
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -27,6 +27,7 @@ import {
   getProjectStatus
 } from "@/tools.js";
 import {ChooseList} from "../../order/orderNew/chooseList";
+import PatentSchedule from './patentSchedule';
 
 const { TabPane } = Tabs
 const MyTaskCount = Form.create()(
@@ -560,6 +561,18 @@ const MyTaskCount = Form.create()(
               outsourceName: thisdata.outsourceName, //外包公司名称
               outsourcePrice: thisdata.outsourcePrice, //外包价格
               declarationBatch: thisdata.declarationBatch,
+              bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+              specialComment: thisdata.specialComment,
+              urgentDay: thisdata.urgentDay, //有无材料
+              ifMaterial: thisdata.ifMaterial, //加急情况
+              spotCheckStatus: thisdata.spotCheckStatus,
+              setUpStatus: thisdata.setUpStatus,
+              setUpTime: thisdata.setUpTime,
+              highTechStatus: thisdata.highTechStatus,
+              acceptCount:thisdata.acceptCount,       //受理数
+              authorizeCount:thisdata.authorizeCount, //授权数
+              rejectCount:thisdata.rejectCount,       //驳回数
+              commodityQuantity:thisdata.commodityQuantity, //派单项目数
             });
           }
         }.bind(this)
@@ -811,6 +824,15 @@ const MyTaskCount = Form.create()(
       this.state.cid = [];
       this.state.contractNoSearch = "";
       this.state.outsourceSearch = [];
+      this.setState({
+        urgentDay: '', //有无材料
+        ifMaterial: '', //加急情况
+        specialComment: '', //特别说明
+        spotCheckStatus: '',
+        setUpStatus: '',
+        setUpTime: '',
+        highTechStatus: '',
+      })
       this.loadData(this.state.page);
     },
     resets() {
@@ -1296,6 +1318,15 @@ const MyTaskCount = Form.create()(
                         {utils.getSatisfaction(this.state.formRetrieve)}
                       </span>
                     </FormItem>
+                    {
+                      <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label="(满意度)备注"
+                      >
+                        <span>{this.state.retrieveContent}</span>
+                      </FormItem>
+                    }
                     {/*<FormItem*/}
                     {/*  className="half-item"*/}
                     {/*  {...formItemLayout}*/}
@@ -1304,16 +1335,47 @@ const MyTaskCount = Form.create()(
                     {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
                     {/*</FormItem>*/}
                   </div>
-                  <div className="clearfix">
-                    {
-                      <FormItem
+                  {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                  {this.state.bpType === 2 ? <div className="clearfix">
+                    <FormItem
                         className="half-item"
                         {...formItemLayout}
-                        label="(满意度)备注"
-                      >
-                        <span>{this.state.retrieveContent}</span>
-                      </FormItem>
-                    }
+                        label="加急天数"
+                    >
+                      {
+                        this.state.urgentDay === 1 ? '是' :
+                            this.state.urgentDay === 0 ? '否' : ''
+                      }
+                    </FormItem>
+                    <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="有无材料"
+                    >
+                      {
+                        this.state.ifMaterial === 1 ? '是':
+                            this.state.ifMaterial === 0 ? '否': ''
+                      }
+                    </FormItem>
+                  </div> : null}
+                  <div className="clearfix">
+                    <div style={{
+                      paddingLeft: '8%',
+                    }}>
+                      <div style={{color:'#000',fontWeight:500}}>
+                        特别说明
+                        <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
+                      </div>
+                      <div style={{
+                        display:'flex',
+                      }}>
+                        <span style={{paddingRight:'10px',whiteSpace:"nowrap"}}>备注:</span>
+                        <span style={{
+                          flex: 1,
+                          wordBreak: 'break-all',
+                        }}>{this.state.specialComment}</span>
+                      </div>
+                    </div>
                     {/*<FormItem*/}
                     {/*  className="half-item"*/}
                     {/*  {...formItemLayout}*/}
@@ -1502,73 +1564,103 @@ const MyTaskCount = Form.create()(
                   </div>
                   <div className="clearfix">
                     <h3 className="sub-title">项目申报进度</h3>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="申报批次"
-                    >
-                      <span>{this.state.declarationBatch}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="启动时间"
-                    >
-                      <span>{this.state.startDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="完成时间"
-                    >
-                      <span>{this.state.endDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="受理时间"
-                    >
-                      <span>{this.state.acceptDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="评审时间"
-                    >
-                      <span>{this.state.reviewDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="公示时间"
-                    >
-                      <span>{this.state.publicityDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="发证时间"
-                    >
-                      <span>{this.state.licenceDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="立项金额(万元)"
-                    >
-                      <span>{this.state.setUpAmount}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="是否到款"
-                    >
-                      <span>
-                        {this.state.arrivalMoney ? "已到企业" : "未到企业"}
-                      </span>
-                    </FormItem>
+                    {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                    {
+                      this.state.bpType === 1 || this.state.bpType === 6 ?
+                          <div>
+                            <FormItem
+                                labelCol={{ span: 3 }}
+                                wrapperCol={{ span: 16 }}
+                                label="是否高新企业"
+                            >
+                                <span>
+                                  {
+                                    this.state.highTechStatus === 1 ? '是':
+                                        this.state.highTechStatus === 0 ? '否' : ''
+                                  }
+                                </span>
+                            </FormItem>
+                            <FormItem/>
+                            <PatentSchedule
+                                readOnly
+                                bpType={this.state.bpType}
+                                taskId={this.state.id}
+                                acceptCount={this.state.acceptCount}
+                                authorizeCount={this.state.authorizeCount}
+                                rejectCount={this.state.rejectCount}
+                                commodityQuantity={this.state.commodityQuantity}
+                                refresh={()=>{this.xiangqing(this.state.id)}}
+                            />
+                          </div> :
+                          <div>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="申报批次"
+                            >
+                              <span>{this.state.declarationBatch}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="启动时间"
+                            >
+                              <span>{this.state.startDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="完成时间"
+                            >
+                              <span>{this.state.endDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="受理时间"
+                            >
+                              <span>{this.state.acceptDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="评审时间"
+                            >
+                              <span>{this.state.reviewDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="公示时间"
+                            >
+                              <span>{this.state.publicityDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="发证时间"
+                            >
+                              <span>{this.state.licenceDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="立项金额(万元)"
+                            >
+                              <span>{this.state.setUpAmount}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="是否到款"
+                            >
+                              <span>
+                                {this.state.arrivalMoney ? "已到企业" : "未到企业"}
+                              </span>
+                            </FormItem>
+                          </div>}
                   </div>
-                  <div className="clearfix">
+                  {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                     <FormItem
                       labelCol={{ span: 3 }}
                       wrapperCol={{ span: 18 }}
@@ -1584,7 +1676,7 @@ const MyTaskCount = Form.create()(
                             previewVisible: true,
                           });
                         }}
-                      ></Upload>
+                      />
                       <Modal
                         maskClosable={false}
                         footer={null}
@@ -1600,16 +1692,16 @@ const MyTaskCount = Form.create()(
                         />
                       </Modal>
                     </FormItem>
-                  </div>
-                  <div className="clearfix">
+                  </div> : null}
+                  {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                     <FormItem
                       labelCol={{ span: 3 }}
                       wrapperCol={{ span: 16 }}
-                      label="备注"
+                      label="项目说明"
                     >
                       <span>{this.state.taskComment}</span>
                     </FormItem>
-                  </div>
+                  </div> : null}
                   <div>
                     <h3 className="sub-title">项目业务</h3>
                     {this.state.processStatus == 0 ? (
@@ -1805,20 +1897,37 @@ const MyTaskCount = Form.create()(
               >
                 <span>{utils.getSatisfaction(this.state.formRetrieve)}</span>
               </FormItem>
-              {/*<FormItem className="half-item" {...formItemLayout} label="退单">*/}
-              {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
-              {/*</FormItem>*/}
-            </div>
-            <div className="clearfix">
               {
                 <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="(满意度)备注"
+                    className="half-item"
+                    {...formItemLayout}
+                    label="(满意度)备注"
                 >
                   <span>{this.state.retrieveContent}</span>
                 </FormItem>
               }
+              {/*<FormItem className="half-item" {...formItemLayout} label="退单">*/}
+              {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
+              {/*</FormItem>*/}
+            </div>
+            <div className="clearfix">
+              <div style={{
+                paddingLeft: '8%',
+              }}>
+                <div style={{color:'#000',fontWeight:500}}>
+                  特别说明
+                  <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
+                </div>
+                <div style={{
+                  display:'flex',
+                }}>
+                  <span style={{paddingRight:'10px',whiteSpace:"nowrap"}}>备注:</span>
+                  <span style={{
+                    flex: 1,
+                    wordBreak: 'break-all',
+                  }}>{this.state.specialComment}</span>
+                </div>
+              </div>
               {
                 // <FormItem
                 //   className="half-item"

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

@@ -1048,7 +1048,7 @@ const MyTaskOutsource = React.createClass({
             outsourcePrice: thisdata.outsourcePrice, //外包价格
             declarationBatch: thisdata.declarationBatch,
             orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
-            bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新
+            bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
             specialComment: thisdata.specialComment,
             urgentDay: thisdata.urgentDay, //有无材料
             ifMaterial: thisdata.ifMaterial, //加急情况
@@ -3497,7 +3497,7 @@ const MyTaskOutsource = React.createClass({
                       {/*  </Radio.Group>*/}
                       {/*</FormItem>*/}
                     </div>
-                    {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新*/}
+                    {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                     {this.state.bpType === 2 ? <div className="clearfix">
                       <FormItem
                           className="half-item"
@@ -3869,9 +3869,9 @@ const MyTaskOutsource = React.createClass({
                     </div>
                     <div className="clearfix">
                       <h3 className="sub-title">项目申报进度</h3>
-                      {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新*/}
+                      {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                       {
-                        this.state.bpType === 1 ?
+                        this.state.bpType === 1 || this.state.bpType === 6 ?
                             <div>
                               <FormItem
                                   className="half-item"
@@ -3890,6 +3890,7 @@ const MyTaskOutsource = React.createClass({
                               </FormItem>
                               <FormItem/>
                               <PatentSchedule
+                                  bpType={this.state.bpType}
                                   taskId={this.state.id}
                                   acceptCount={this.state.acceptCount}
                                   authorizeCount={this.state.authorizeCount}
@@ -3898,7 +3899,7 @@ const MyTaskOutsource = React.createClass({
                               />
                             </div> :
                             <div>
-                              {/*高新显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新*/}
+                              {/*高新显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                               {this.state.bpType === 5 ?  <FormItem
                                   className="half-item"
                                   {...formItemLayout}
@@ -4155,7 +4156,7 @@ const MyTaskOutsource = React.createClass({
                               </FormItem>
                          </div>}
                     </div>
-                    {this.state.bpType !== 1 ? <div className="clearfix">
+                    {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                       <FormItem
                         labelCol={{ span: 3 }}
                         wrapperCol={{ span: 16 }}
@@ -4176,7 +4177,7 @@ const MyTaskOutsource = React.createClass({
                         />
                       </FormItem>
                     </div> : null}
-                    {this.state.bpType !== 1 ? <div className="clearfix">
+                    {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                       <FormItem
                         labelCol={{ span: 3 }}
                         wrapperCol={{ span: 16 }}

+ 33 - 27
js/component/manageCenter/project/task/patentSchedule.jsx

@@ -20,7 +20,7 @@ class PatentSchedule extends Component{
                     }
                 },
                 {
-                    title: '专利号',
+                    title: props.bpType === 6 ? '商标号' : '专利号',
                     dataIndex: 'patentNo',
                     key: 'patentNo',
                     render: (text, record,index) => {
@@ -36,7 +36,7 @@ class PatentSchedule extends Component{
                     }
                 },
                 {
-                    title: '专利名称',
+                    title: props.bpType === 6 ? '商标名称' : '专利名称',
                     dataIndex: 'patentName',
                     key: 'patentName',
                     render: (text, record,index) => {
@@ -72,28 +72,6 @@ class PatentSchedule extends Component{
                     }
                 },
                 {
-                    title: '授权时间',
-                    dataIndex: 'authorizeTimes',
-                    key: 'authorizeTimes',
-                    render: (text, record,index) => {
-                        return !record.isChange ? text : <DatePicker
-                            size={'small'}
-                            style={{
-                                marginTop: '4px',
-                                width: '100px'
-                            }}
-                            value={
-                                text ? moment(text) : null
-                            }
-                            showTime
-                            format="YYYY-MM-DD"
-                            onChange={(data, dataString) => {
-                                this.changeEvidence(dataString,index,'authorizeTimes')
-                            }}
-                        />
-                    }
-                },
-                {
                     title: '下证时间',
                     dataIndex: 'licenceTimes',
                     key: 'licenceTimes',
@@ -247,7 +225,7 @@ class PatentSchedule extends Component{
         delete data.key;
         data.taskId = this.props.taskId;
         data.alreadyNumber = 1;
-        data.type = 1;//0软著 1专利
+        data.type = this.props.bpType === 1 ? 1 : this.props.bpType === 6 ? 2 : '';//0软著 1专利 2商标
         $.ajax({
             method: 'post',
             dataType: 'json',
@@ -335,7 +313,7 @@ class PatentSchedule extends Component{
         delete data.key;
         data.taskId = this.props.taskId;
         data.alreadyNumber = 1;
-        data.type = 1;//0软著 1专利
+        data.type = this.props.bpType === 1 ? 1 : this.props.bpType === 6 ? 2 : '';//0软著 1专利 2商标
         for(let i in data){
             if(!data[i]){
                 delete data[i]
@@ -436,6 +414,33 @@ class PatentSchedule extends Component{
 
     componentDidMount() {
         this.loaduserss();
+        if(this.props.bpType === 1){
+            this.state.columns.splice(-2,0,{
+                title: '授权时间',
+                dataIndex: 'authorizeTimes',
+                key: 'authorizeTimes',
+                render: (text, record,index) => {
+                    return !record.isChange ? text : <DatePicker
+                        size={'small'}
+                        style={{
+                            marginTop: '4px',
+                            width: '100px'
+                        }}
+                        value={
+                            text ? moment(text) : null
+                        }
+                        showTime
+                        format="YYYY-MM-DD"
+                        onChange={(data, dataString) => {
+                            this.changeEvidence(dataString,index,'authorizeTimes')
+                        }}
+                    />
+                }
+            });
+            this.setState({
+                columns:this.state.columns
+            })
+        }
     }
 
     render() {
@@ -472,7 +477,8 @@ class PatentSchedule extends Component{
                                 })
                             }}
                         >
-                            增加专利信息
+                            {/* bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                            {this.props.bpType === 1 ? '增加专利信息' : this.props.bpType === 6 ? '增加商标信息' : ''}
                         </Button> : null}
                         <Button
                             type="primary"

+ 203 - 102
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -35,6 +35,7 @@ import '@/manageCenter/financialManage/distribute/shouKuan.less'
 import OrderRiZi from '@/orderRiZi.jsx'
 import moment from "moment";
 import $ from "jquery";
+import PatentSchedule from '../../patentSchedule';
 
 const FormItem = Form.Item
 const { Option } = Select
@@ -298,6 +299,18 @@ class projectOverview extends Component{
                         outsourceName: thisdata.outsourceName, //外包公司
                         outsourcePrice: thisdata.outsourcePrice, //外包价格
                         declarationBatch: thisdata.declarationBatch,
+                        bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+                        specialComment: thisdata.specialComment,
+                        urgentDay: thisdata.urgentDay, //有无材料
+                        ifMaterial: thisdata.ifMaterial, //加急情况
+                        spotCheckStatus: thisdata.spotCheckStatus,
+                        setUpStatus: thisdata.setUpStatus,
+                        setUpTime: thisdata.setUpTime,
+                        highTechStatus: thisdata.highTechStatus,
+                        acceptCount:thisdata.acceptCount,       //受理数
+                        authorizeCount:thisdata.authorizeCount, //授权数
+                        rejectCount:thisdata.rejectCount,       //驳回数
+                        commodityQuantity:thisdata.commodityQuantity, //派单项目数
                     })
                     this.loadData(thisdata.orderNo);
                     this.xiangqings(thisdata.orderNo);
@@ -616,6 +629,29 @@ class projectOverview extends Component{
                             {/*    <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
                             {/*</FormItem>*/}
                         </div>
+                        {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                        {this.state.bpType === 2 ? <div className="clearfix">
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="加急天数"
+                            >
+                                {
+                                    this.state.urgentDay === 1 ? '是' :
+                                        this.state.urgentDay === 0 ? '否' : ''
+                                }
+                            </FormItem>
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="有无材料"
+                            >
+                                {
+                                    this.state.ifMaterial === 1 ? '是':
+                                        this.state.ifMaterial === 0 ? '否': ''
+                                }
+                            </FormItem>
+                        </div> : null}
                         <div className="clearfix">
                             <div style={{
                                 paddingLeft: '8%',
@@ -624,7 +660,15 @@ class projectOverview extends Component{
                                     特别说明
                                     <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
                                 </div>
-                                <div>{this.state.specialExplain}</div>
+                                <div style={{
+                                    display:'flex',
+                                }}>
+                                    <span style={{paddingRight:'10px',whiteSpace:"nowrap"}}>备注:</span>
+                                    <span style={{
+                                        flex: 1,
+                                        wordBreak: 'break-all',
+                                    }}>{this.state.specialComment}</span>
+                                </div>
                             </div>
                             {
                                 // <FormItem
@@ -843,107 +887,164 @@ class projectOverview extends Component{
                             </FormItem>
                         </div>
                         <div className="clearfix">
-                            <h3 className="sub-title">项目申报进度</h3>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="申报批次"
-                            >
-                                <span>{this.state.declarationBatch}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="启动时间"
-                            >
-                                <span>{this.state.startDate}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="完成时间"
-                            >
-                                <span>{this.state.endDate}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="受理时间"
-                            >
-                                <span>{this.state.acceptDate}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="评审时间"
-                            >
-                                <span>{this.state.reviewDate}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="公示时间"
-                            >
-                                <span>{this.state.publicityDate}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="发证时间"
-                            >
-                                <span>{this.state.licenceDate}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="立项金额(万元)"
-                            >
-                                <span>{this.state.setUpAmount}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="是否到款"
-                            >
-                      <span>
-                        {this.state.arrivalMoney ? '已到企业' : '未到企业'}
-                      </span>
-                            </FormItem>
-                        </div>
-                        <div className="clearfix">
-                            <FormItem
-                                labelCol={{ span: 3 }}
-                                wrapperCol={{ span: 18 }}
-                                label="附件"
-                            >
-                                <Upload
-                                    className="demandDetailShow-upload"
-                                    listType="picture-card"
-                                    fileList={this.state.attachmentUrl}
-                                    onPreview={(file) => {
-                                        this.setState({
-                                            previewImage: file.url || file.thumbUrl,
-                                            previewVisible: true,
-                                        })
-                                    }}
-                                ></Upload>
-                                <Modal
-                                    maskClosable={false}
-                                    footer={null}
-                                    visible={this.state.previewVisible}
-                                    onCancel={() => {
-                                        this.setState({ previewVisible: false })
-                                    }}
-                                >
-                                    <img
-                                        alt=""
-                                        style={{ width: '100%' }}
-                                        src={this.state.previewImage || ''}
-                                    />
-                                </Modal>
-                            </FormItem>
+                            <h3 className="sub-title">项目申报进度</h3>{/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                            {
+                                this.state.bpType === 1 || this.state.bpType === 6 ?
+                                    <div>
+                                        <FormItem
+                                            labelCol={{ span: 3 }}
+                                            wrapperCol={{ span: 16 }}
+                                            label="是否高新企业"
+                                        >
+                                            <span>
+                                              {
+                                                  this.state.highTechStatus === 1 ? '是':
+                                                      this.state.highTechStatus === 0 ? '否' : ''
+                                              }
+                                            </span>
+                                        </FormItem>
+                                        <FormItem/>
+                                        <PatentSchedule
+                                            readOnly
+                                            bpType={this.state.bpType}
+                                            taskId={this.state.id}
+                                            acceptCount={this.state.acceptCount}
+                                            authorizeCount={this.state.authorizeCount}
+                                            rejectCount={this.state.rejectCount}
+                                            commodityQuantity={this.state.commodityQuantity}
+                                        />
+                                    </div> :
+                                    <div>
+                                        {/*高新显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                                        {this.state.bpType === 5 ? <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="是否抽查">
+                                            {
+                                                this.state.spotCheckStatus === 0 ? '否':
+                                                    this.state.spotCheckStatus === 1 ? '是,未通过':
+                                                        this.state.spotCheckStatus === 2 ? '是,通过': ''
+                                            }
+                                        </FormItem> : null}
+                                        <FormItem/>
+                                        {this.state.bpType === 5 ? <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="是否立项"
+                                        >
+                                            {
+                                                this.state.setUpStatus === 1 ? '是' :
+                                                    this.state.setUpStatus === 0 ? '否' : ''
+                                            }
+                                        </FormItem> : null}
+                                        {this.state.bpType === 5 ? <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label={this.state.setUpStatus === 1 ? "立项时间" : ''}
+                                        >
+                                            {this.state.setUpStatus === 1 ?this.state.setUpTime : null }
+                                        </FormItem> : null}
+                                        <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="申报批次"
+                                        >
+                                            <span>{this.state.declarationBatch}</span>
+                                        </FormItem>
+                                        <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="启动时间"
+                                        >
+                                            <span>{this.state.startDate}</span>
+                                        </FormItem>
+                                        <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="完成时间"
+                                        >
+                                            <span>{this.state.endDate}</span>
+                                        </FormItem>
+                                        <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="受理时间"
+                                        >
+                                            <span>{this.state.acceptDate}</span>
+                                        </FormItem>
+                                        <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="评审时间"
+                                        >
+                                            <span>{this.state.reviewDate}</span>
+                                        </FormItem>
+                                        <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="公示时间"
+                                        >
+                                            <span>{this.state.publicityDate}</span>
+                                        </FormItem>
+                                        <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="发证时间"
+                                        >
+                                            <span>{this.state.licenceDate}</span>
+                                        </FormItem>
+                                        <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="立项金额(万元)"
+                                        >
+                                            <span>{this.state.setUpAmount}</span>
+                                        </FormItem>
+                                        <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="是否到款"
+                                        >
+                                          <span>
+                                            {this.state.arrivalMoney ? '已到企业' : '未到企业'}
+                                          </span>
+                                        </FormItem>
+                                        <div className="clearfix">
+                                            <FormItem
+                                                labelCol={{ span: 3 }}
+                                                wrapperCol={{ span: 18 }}
+                                                label="附件"
+                                            >
+                                                <Upload
+                                                    className="demandDetailShow-upload"
+                                                    listType="picture-card"
+                                                    fileList={this.state.attachmentUrl}
+                                                    onPreview={(file) => {
+                                                        this.setState({
+                                                            previewImage: file.url || file.thumbUrl,
+                                                            previewVisible: true,
+                                                        })
+                                                    }}
+                                                />
+                                                <Modal
+                                                    maskClosable={false}
+                                                    footer={null}
+                                                    visible={this.state.previewVisible}
+                                                    onCancel={() => {
+                                                        this.setState({ previewVisible: false })
+                                                    }}
+                                                >
+                                                    <img
+                                                        alt=""
+                                                        style={{ width: '100%' }}
+                                                        src={this.state.previewImage || ''}
+                                                    />
+                                                </Modal>
+                                            </FormItem>
+                                        </div>
+                            </div>}
                         </div>
-                        <div className="clearfix">
+                        {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                             <FormItem
                                 labelCol={{ span: 3 }}
                                 wrapperCol={{ span: 16 }}
@@ -951,7 +1052,7 @@ class projectOverview extends Component{
                             >
                                 <span>{this.state.taskComment}</span>
                             </FormItem>
-                        </div>
+                        </div> : null}
                         <div>
                             <h3 className="sub-title">项目业务</h3>
                             {/* {this.state.processStatus == 0 ? (

+ 1 - 1
js/component/manageCenter/project/task/payApplyReject/index.jsx

@@ -417,4 +417,4 @@ class PayApplyReject extends Component{
     }
 }
 
-export default PayApplyReject
+export default PayApplyReject

+ 191 - 72
js/component/manageCenter/project/task/taskCount.jsx

@@ -17,6 +17,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import ResolutionDetail from "@/resolutionDetail";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "../../order/orderNew/chooseList";
+import PatentSchedule from './patentSchedule';
 
 const {TabPane} = Tabs
 
@@ -557,6 +558,18 @@ const IntentionCustomer = Form.create()(
               splitSuper: thisdata.splitSuper,
               splitId: thisdata.splitId,
               declarationBatch: thisdata.declarationBatch,
+              bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+              specialComment: thisdata.specialComment,
+              urgentDay: thisdata.urgentDay, //有无材料
+              ifMaterial: thisdata.ifMaterial, //加急情况
+              spotCheckStatus: thisdata.spotCheckStatus,
+              setUpStatus: thisdata.setUpStatus,
+              setUpTime: thisdata.setUpTime,
+              highTechStatus: thisdata.highTechStatus,
+              acceptCount:thisdata.acceptCount,       //受理数
+              authorizeCount:thisdata.authorizeCount, //授权数
+              rejectCount:thisdata.rejectCount,       //驳回数
+              commodityQuantity:thisdata.commodityQuantity, //派单项目数
             });
           }
         }.bind(this)
@@ -813,6 +826,15 @@ const IntentionCustomer = Form.create()(
       this.state.cid = [];
       this.state.contractNoSearch = "";
       this.state.outsourceSearch = [];
+      this.setState({
+        urgentDay: '', //有无材料
+        ifMaterial: '', //加急情况
+        specialComment: '', //特别说明
+        spotCheckStatus: '',
+        setUpStatus: '',
+        setUpTime: '',
+        highTechStatus: '',
+      })
       this.loadData();
     },
     resets() {
@@ -1338,6 +1360,29 @@ const IntentionCustomer = Form.create()(
                     {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
                     {/*</FormItem>*/}
                   </div>
+                  {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                  {this.state.bpType === 2 ? <div className="clearfix">
+                    <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="加急天数"
+                    >
+                      {
+                        this.state.urgentDay === 1 ? '是' :
+                            this.state.urgentDay === 0 ? '否' : ''
+                      }
+                    </FormItem>
+                    <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="有无材料"
+                    >
+                      {
+                        this.state.ifMaterial === 1 ? '是':
+                            this.state.ifMaterial === 0 ? '否': ''
+                      }
+                    </FormItem>
+                  </div> : null}
                   <div className="clearfix">
                     <div style={{
                       paddingLeft: '8%',
@@ -1346,7 +1391,15 @@ const IntentionCustomer = Form.create()(
                         特别说明
                         <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
                       </div>
-                      <div>{this.state.specialExplain}</div>
+                      <div style={{
+                        display:'flex',
+                      }}>
+                        <span style={{paddingRight:'10px',whiteSpace:"nowrap"}}>备注:</span>
+                        <span style={{
+                          flex: 1,
+                          wordBreak: 'break-all',
+                        }}>{this.state.specialComment}</span>
+                      </div>
                     </div>
                     {
                       // <FormItem
@@ -1592,73 +1645,131 @@ const IntentionCustomer = Form.create()(
                   </div>
                   <div className="clearfix">
                     <h3 className="sub-title">项目申报进度</h3>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="申报批次"
-                    >
-                      <span>{this.state.declarationBatch}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="启动时间"
-                    >
-                      <span>{this.state.startDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="完成时间"
-                    >
-                      <span>{this.state.endDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="受理时间"
-                    >
-                      <span>{this.state.acceptDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="评审时间"
-                    >
-                      <span>{this.state.reviewDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="公示时间"
-                    >
-                      <span>{this.state.publicityDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="发证时间"
-                    >
-                      <span>{this.state.licenceDate}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="立项金额(万元)"
-                    >
-                      <span>{this.state.setUpAmount}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="是否到款"
-                    >
-                      <span>
-                        {this.state.arrivalMoney ? "已到企业" : "未到企业"}
-                      </span>
-                    </FormItem>
+                    {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                    {
+                      this.state.bpType === 1 || this.state.bpType === 6 ?
+                          <div>
+                            <FormItem
+                                labelCol={{ span: 3 }}
+                                wrapperCol={{ span: 16 }}
+                                label="是否高新企业"
+                            >
+                                <span>
+                                  {
+                                    this.state.highTechStatus === 1 ? '是':
+                                        this.state.highTechStatus === 0 ? '否' : ''
+                                  }
+                                </span>
+                            </FormItem>
+                            <FormItem/>
+                            <PatentSchedule
+                                readOnly
+                                bpType={this.state.bpType}
+                                taskId={this.state.id}
+                                acceptCount={this.state.acceptCount}
+                                authorizeCount={this.state.authorizeCount}
+                                rejectCount={this.state.rejectCount}
+                                commodityQuantity={this.state.commodityQuantity}
+                            />
+                          </div> :
+                          <div>
+                            {/*高新显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                            {this.state.bpType === 5 ? <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="是否抽查">
+                              {
+                                this.state.spotCheckStatus === 0 ? '否':
+                                    this.state.spotCheckStatus === 1 ? '是,未通过':
+                                        this.state.spotCheckStatus === 2 ? '是,通过': ''
+                              }
+                            </FormItem> : null}
+                            <FormItem/>
+                            {this.state.bpType === 5 ? <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="是否立项"
+                            >
+                              {
+                                this.state.setUpStatus === 1 ? '是' :
+                                    this.state.setUpStatus === 0 ? '否' : ''
+                              }
+                            </FormItem> : null}
+                            {this.state.bpType === 5 ? <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label={this.state.setUpStatus === 1 ? "立项时间" : ''}
+                            >
+                              {this.state.setUpStatus === 1 ?this.state.setUpTime : null }
+                            </FormItem> : null}
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="申报批次"
+                            >
+                              <span>{this.state.declarationBatch}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="启动时间"
+                            >
+                              <span>{this.state.startDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="完成时间"
+                            >
+                              <span>{this.state.endDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="受理时间"
+                            >
+                              <span>{this.state.acceptDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="评审时间"
+                            >
+                              <span>{this.state.reviewDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="公示时间"
+                            >
+                              <span>{this.state.publicityDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="发证时间"
+                            >
+                              <span>{this.state.licenceDate}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="立项金额(万元)"
+                            >
+                              <span>{this.state.setUpAmount}</span>
+                            </FormItem>
+                            <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="是否到款"
+                            >
+                              <span>
+                                {this.state.arrivalMoney ? "已到企业" : "未到企业"}
+                              </span>
+                            </FormItem>
+                          </div>}
                   </div>
-                  <div className="clearfix">
+                  {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                     <FormItem
                       labelCol={{ span: 3 }}
                       wrapperCol={{ span: 18 }}
@@ -1674,7 +1785,7 @@ const IntentionCustomer = Form.create()(
                             previewVisible: true,
                           });
                         }}
-                      ></Upload>
+                      />
                       <Modal
                         maskClosable={false}
                         footer={null}
@@ -1690,8 +1801,8 @@ const IntentionCustomer = Form.create()(
                         />
                       </Modal>
                     </FormItem>
-                  </div>
-                  <div className="clearfix">
+                  </div> : null}
+                  {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                     <FormItem
                       labelCol={{ span: 3 }}
                       wrapperCol={{ span: 16 }}
@@ -1699,7 +1810,7 @@ const IntentionCustomer = Form.create()(
                     >
                       <span>{this.state.taskComment}</span>
                     </FormItem>
-                  </div>
+                  </div> : null}
                   <div>
                     <h3 className="sub-title">项目业务</h3>
                     {this.state.processStatus == 0 ? (
@@ -1916,7 +2027,15 @@ const IntentionCustomer = Form.create()(
                   特别说明
                   <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
                 </div>
-                <div>{this.state.specialExplain}</div>
+                <div style={{
+                  display:'flex',
+                }}>
+                  <span style={{paddingRight:'10px',whiteSpace:"nowrap"}}>备注:</span>
+                  <span style={{
+                    flex: 1,
+                    wordBreak: 'break-all',
+                  }}>{this.state.specialComment}</span>
+                </div>
               </div>
               {
                 // <FormItem

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

@@ -470,7 +470,7 @@ const Task = React.createClass({
             outsourceName: thisdata.outsourceName, //外包公司名称
             outsourcePrice: thisdata.outsourcePrice, //外包价格
             declarationBatch: thisdata.declarationBatch,
-            bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新
+            bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
             specialComment: thisdata.specialComment,
             urgentDay: thisdata.urgentDay, //有无材料
             ifMaterial: thisdata.ifMaterial, //加急情况
@@ -1273,7 +1273,7 @@ const Task = React.createClass({
                       {/*  </span>*/}
                       {/*</FormItem>*/}
                     </div>
-                    {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新*/}
+                    {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                     {this.state.bpType === 2 ? <div className="clearfix">
                       <FormItem
                           className="half-item"
@@ -1556,9 +1556,9 @@ const Task = React.createClass({
                     </div>
                     <div className="clearfix">
                       <h3 className="sub-title">项目申报进度</h3>
-                      {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新*/}
+                      {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                       {
-                        this.state.bpType === 1 ?
+                        this.state.bpType === 1 || this.state.bpType === 6 ?
                             <div>
                               <FormItem
                                   labelCol={{ span: 3 }}
@@ -1575,6 +1575,7 @@ const Task = React.createClass({
                               <FormItem/>
                               <PatentSchedule
                                   readOnly
+                                  bpType={this.state.bpType}
                                   taskId={this.state.id}
                                   acceptCount={this.state.acceptCount}
                                   authorizeCount={this.state.authorizeCount}
@@ -1584,7 +1585,7 @@ const Task = React.createClass({
                               />
                             </div> :
                             <div>
-                              {/*高新显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新*/}
+                              {/*高新显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                               {this.state.bpType === 5 ? <FormItem
                                   className="half-item"
                                   {...formItemLayout}
@@ -1680,7 +1681,7 @@ const Task = React.createClass({
                               </FormItem>
                        </div>}
                     </div>
-                    {this.state.bpType !== 1 ? <div className="clearfix">
+                    {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                       <FormItem
                         labelCol={{ span: 3 }}
                         wrapperCol={{ span: 18 }}
@@ -1716,7 +1717,7 @@ const Task = React.createClass({
                         </Modal> : null}
                       </FormItem>
                     </div> : null}
-                    {this.state.bpType !== 1 ? <div className="clearfix">
+                    {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                       <FormItem
                         labelCol={{ span: 3 }}
                         wrapperCol={{ span: 16 }}

+ 11 - 2
js/component/manageCenter/set/business/businessProject.jsx

@@ -373,6 +373,8 @@ const BusinessProject=Form.create()(React.createClass({
                     return "双软"
                 }else if(record.type == 5) {
                     return "高新"
+                }else if(record.type == 6) {
+                    return "商标"
                 }
               },
             },
@@ -601,6 +603,8 @@ const BusinessProject=Form.create()(React.createClass({
                         str = "双软"
                     }else if(thisdata.type == 5) {
                         str = "高新"
+                    }else if(thisdata.type == 6) {
+                        str = "商标"
                     }
                     theArr.push({
                          editId: thisdata.id,//每一条记录的ID
@@ -631,7 +635,7 @@ const BusinessProject=Form.create()(React.createClass({
 						 cditCompanyLogoUrl: thisdata.maxLogo ? splitUrl(thisdata.maxLogo, ',', globalConfig.avatarHost + '/upload') : [],
                     });
 				};
-                //0 正常 1专利 2软著 3审计 4双软 5高新
+                //0 正常 1专利 2软著 3审计 4双软 5高新 6商标
 				let str = ""
 					if(thisdata.type == 0) {
 						str = "通用"
@@ -645,6 +649,8 @@ const BusinessProject=Form.create()(React.createClass({
                         str = "双软"
                     }else if(thisdata.type == 5) {
                         str = "高新"
+                    }else if(thisdata.type == 6) {
+                        str = "商标"
                     }
                 this.setState({
                   editId: thisdata.id, //每一条记录的ID
@@ -2164,7 +2170,7 @@ const BusinessProject=Form.create()(React.createClass({
                               wrapperCol={{ span: 12 }}
                               label="项目分类"
                             >
-                              {/*  0 正常 1专利 2软著 3审计 4双软 5高新*/}
+                              {/*  0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                               <Select
                                 placeholder="项目分类"
                                 value={this.state.typeStr}
@@ -2183,6 +2189,8 @@ const BusinessProject=Form.create()(React.createClass({
                                       str = "双软";
                                   } else if (e == 5) {
                                       str = "高新";
+                                  } else if (e == 6) {
+                                      str = "商标";
                                   }
                                   this.setState({
                                     typeStatus: e,
@@ -2196,6 +2204,7 @@ const BusinessProject=Form.create()(React.createClass({
                                 <Select.Option key={3}>审计</Select.Option>
                                 <Select.Option key={4}>双软</Select.Option>
                                 <Select.Option key={5}>高新</Select.Option>
+                                <Select.Option key={6}>商标</Select.Option>
                               </Select>
                             </FormItem>
                             <FormItem

+ 21 - 24
js/component/manageCenter/set/userManagementS/addjurisdiction.jsx

@@ -24,7 +24,7 @@ const Addjurisdiction = Form.create()(React.createClass({
 			}
 		}
     	let api=this.props.userDetaile?'/api/admin/updateById':'/api/admin/addSupPermission';
-        this.props.form.validateFields((err, values) => { 
+        this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.setState({
                     loading: true
@@ -59,7 +59,7 @@ const Addjurisdiction = Form.create()(React.createClass({
         });
     },
     //主管初始加载(自动补全)
-	supervisor(e){ 
+	supervisor(e){
 		$.ajax({
             method: "post",
             dataType: "json",
@@ -68,23 +68,23 @@ const Addjurisdiction = Form.create()(React.createClass({
             data:{
             	name:e
             },
-            success: function (data) {                	  
+            success: function (data) {
 				       let thedata=data.data;
 				    if (!thedata) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
-                    };	
-                    thedata = {}; 
-              }; 
+                    };
+                    thedata = {};
+              };
 					this.setState({
-						customerArr:thedata,	
+						customerArr:thedata,
                     });
 				}.bind(this),
 			}).always(function () {
             this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
 	},
 	//上级主管输入框失去焦点是判断客户是否存在
 	selectAuto(value,options){
@@ -100,7 +100,7 @@ const Addjurisdiction = Form.create()(React.createClass({
                 if (item.name == e.toString()) {
                     theType=item.id
                 }
-           });     
+           });
    	    }
 		this.setState({
 			theTypes:theType
@@ -109,8 +109,8 @@ const Addjurisdiction = Form.create()(React.createClass({
 	//值改变时请求客户名称
 	httpChange(e){
 		if(e.length>=1){
-			this.supervisor(e); 
-		}	
+			this.supervisor(e);
+		}
 		this.setState({
 			auto:e
 		})
@@ -127,13 +127,13 @@ const Addjurisdiction = Form.create()(React.createClass({
               id: record.id
             },
             success: function (data) {
-                let thisData = data.data;                
+                let thisData = data.data;
                 if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
                     };
                     thisData = {};
-                }; 
+                };
                 this.setState({
                   ids: thisData.id,
                   name: thisData.name, //接口名称
@@ -146,13 +146,13 @@ const Addjurisdiction = Form.create()(React.createClass({
                   autNo: thisData.autNo,
                   auto: thisData.superId,
                   showOrder: thisData.showOrder,
-                });                  
+                });
             }.bind(this),
        }).always(function () {
-            this.setState({ 
+            this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
        }
     },
     handleOk(e) {
@@ -176,7 +176,7 @@ const Addjurisdiction = Form.create()(React.createClass({
 			this.state.urlType=undefined;
    		}else{
     		this.loaduser(nextProps.datauser)
-    	   }     
+    	   }
       },
     render() {
         const theData = this.state.datauser||{};
@@ -185,7 +185,7 @@ const Addjurisdiction = Form.create()(React.createClass({
         const formItemLayout = {
             labelCol: { span: 8 },
             wrapperCol: { span: 14 },
-        }; 
+        };
         const dataSources=this.state.customerArr || [];
         const options = dataSources.map((group,index) =>
 				      <Option key={index} value={group.name}>{group.name}</Option>
@@ -268,11 +268,8 @@ const Addjurisdiction = Form.create()(React.createClass({
                       )}
                     </FormItem>
                   </div>
-                  <div
+                    {this.props.userDetaile ? <div
                     className="clearfix"
-                    style={{
-                      display: this.props.userDetaile ? "block" : "none",
-                    }}
                   >
                     <FormItem
                       className="half-middle"
@@ -341,7 +338,7 @@ const Addjurisdiction = Form.create()(React.createClass({
                     >
                       <span>{this.state.updateTime}</span>
                     </FormItem>
-                  </div>
+                  </div> : null}
                   <FormItem className="half-middle">
                     <Button
                       className="set-submit"
@@ -367,4 +364,4 @@ const Addjurisdiction = Form.create()(React.createClass({
     }
 }));
 
-export default Addjurisdiction;
+export default Addjurisdiction;