Browse Source

增加项目情况种类

HW 4 years ago
parent
commit
a02db29912

+ 5 - 4
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -519,11 +519,12 @@ class projectOverview extends Component{
                                 <span>
                                     {
                                         this.state.status === 0 ? '未开始':
-                                            this.state.status === 1 ? '已开始':
+                                            this.state.status === 1 ? '进行中':
                                                 this.state.status === 2 ? '已暂停':
-                                                    this.state.status === 3 ? '已完成':
-                                                        this.state.status === 4 ? '已驳回':
-                                                            this.state.status === 5 ? '已退单': ''
+                                                    this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                                        this.state.status === 4 ? '已完成':
+                                                            this.state.status === 5 ? '项目已完成 已退单':
+                                                                this.state.status === 6 ? '项目未完成 已退单': ''
                                     }
                                 </span>
                                 <Button

+ 5 - 4
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js

@@ -519,11 +519,12 @@ class projectOverview extends Component{
                                 <span>
                                     {
                                         this.state.status === 0 ? '未开始':
-                                            this.state.status === 1 ? '已开始':
+                                            this.state.status === 1 ? '进行中':
                                                 this.state.status === 2 ? '已暂停':
-                                                    this.state.status === 3 ? '已完成':
-                                                        this.state.status === 4 ? '已驳回':
-                                                            this.state.status === 5 ? '已退单': ''
+                                                    this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                                        this.state.status === 4 ? '已完成':
+                                                            this.state.status === 5 ? '项目已完成 已退单':
+                                                                this.state.status === 6 ? '项目未完成 已退单': ''
                                     }
                                 </span>
                                 <Button

+ 224 - 46
js/component/manageCenter/project/summary/highTech.jsx

@@ -10,7 +10,8 @@ import {
     highTechColumns,
     doubleSoft,
     softWriting,
-    patent
+    patent,
+    currency,
 } from './highTechConfig';
 
 const {TabPane} = Tabs;
@@ -23,7 +24,9 @@ class HighTech extends Component{
         this.state={
             loading:false,
             changeList:[],
-            columns: highTechColumns,
+            columns: currency,
+            status: 0,
+            page: 1,
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -43,16 +46,24 @@ class HighTech extends Component{
             searchContractNo: '',
             searchEnterpriseName: '',
             declarationBatch: '',
+            projectAmount: '',
             depId:'',
-            projectType: 0,
+            thchDepId:'',
+            projectType: '',
+            projectStatus: '',
 
             departmentArr: [],
-        }
-        this.loadData = this.loadData.bind(this);
+
+            contactsOption: [],
+            contactsOptionData: [],
+        };
+
         this.resetAll = this.resetAll.bind(this);
         this.changeList = this.changeList.bind(this);
         this.departmentList = this.departmentList.bind(this);
         this.exportPending = this.exportPending.bind(this);
+        this.loadData = this.loadData.bind(this);
+        this.selectSuperId = this.selectSuperId.bind(this);
     }
 
     changeList(arr) {
@@ -69,22 +80,29 @@ class HighTech extends Component{
         });
     }
 
-    loadData(pageNo) {
-        this.state.data = [];
+    loadData(pageNo='') {
         this.setState({
-            page: pageNo,
             loading: true
         });
         $.ajax({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/newOrder/orderNewList",
+            url: globalConfig.context + "/api/admin/statistis/selectTaskList",
             data: {
                 pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                starTime: this.state.releaseDate[0], //开始时间
-                endTime: this.state.releaseDate[1], //结束时间
+                pageSize: this.state.pagination.pageSize || 10,
+                startDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[0]: undefined, //开始时间
+                endDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[1]: undefined, //结束时间
+                depId: this.state.depId || undefined,//部门ID
+                thchDepId: this.state.thchDepId || undefined,//责任部门ID
+                projectStatus: this.state.projectStatus || undefined,//项目类别
+                projectType: this.state.projectType || undefined,//项目分类
+                orderNo: this.state.searchOrderNo || undefined,//订单编号
+                contractNo: this.state.searchContractNo || undefined,//合同编号
+                userName: this.state.searchEnterpriseName || undefined,//用户名称
+                declarationBatch: this.state.declarationBatch || undefined,//申报批次
+                projectAmount: this.state.projectAmount || undefined,//项目金额
             },
             success: function(data) {
                 ShowModal(this);
@@ -99,17 +117,18 @@ class HighTech extends Component{
                         thisdata.key=i;
                         theArr.push(thisdata);
                     }
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                    if (data.data && data.data.list && !data.data.list.length) {
+                        this.state.pagination.current = 0;
+                        this.state.pagination.total = 0;
+                    }
+                    this.setState({
+                        pagination: this.state.pagination,
+                        page: pageNo,
+                        dataSource: theArr,
+                    });
                 }
-                this.state.pagination.current = data.data.pageNo;
-                this.state.pagination.total = data.data.totalCount;
-                if (data.data && data.data.list && !data.data.list.length) {
-                    this.state.pagination.current = 0;
-                    this.state.pagination.total = 0;
-                }
-                this.setState({
-                    dataSource: theArr,
-                    pagination: this.state.pagination
-                });
             }.bind(this)
         }).always(
             function() {
@@ -127,7 +146,13 @@ class HighTech extends Component{
             searchContractNo: '',
             searchEnterpriseName: '',
             declarationBatch: '',
+            projectAmount: '',
+            projectType: '',
             depId:'',
+            thchDepId:'',
+            projectStatus:'',
+            columns: currency,
+            status: 0,
         },()=>{
             this.loadData();
         })
@@ -164,20 +189,92 @@ class HighTech extends Component{
         })
     }
 
+    //项目类别
+    selectSuperId() {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/ProjectSize/getAllCname",
+            data: {
+                flag: 0
+            },
+            success: function(data) {
+                let theArr = [];
+                let thedata = data.data;
+                if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                }
+                for (let i = 0; i < data.data.length; i++) {
+                    let theData = data.data[i];
+                    theArr.push(
+                        <Select.Option value={theData.id} key={theData.cname}>
+                            {theData.cname}
+                        </Select.Option>
+                    );
+                }
+                this.setState({
+                    contactsOption: theArr,
+                    contactsOptionData: data.data,
+                });
+            }.bind(this)
+        }).always(
+
+        );
+    }
+
     exportPending() {
-        window.open(globalConfig.context + "/api/admin/patent/exportPending")
+        let url = `/api/admin/statistis/exporTaskList?status=${this.state.status}`;
+        let dep = this.state.departmentArr.filter((e)=> e.id === this.state.depId);//订单部门名称
+        let thchDep = this.state.departmentArr.filter((e)=> e.id === this.state.thchDepId); //责任部门名称
+        if(dep.length > 0){url = url+`&depName=${dep[0].name}`;}
+        if(thchDep.length > 0){url = url+`&thchDepName=${thchDep[0].name}`;}
+
+        let data ={
+            startDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[0]: undefined, //开始时间
+            endDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[1]: undefined, //结束时间
+            depId: this.state.depId || undefined,//部门ID
+            thchDepId: this.state.thchDepId || undefined,//责任部门ID
+            projectStatus: this.state.projectStatus || undefined,//项目类别
+            projectType: this.state.projectType || undefined,//项目分类
+            orderNo: this.state.searchOrderNo || undefined,//订单编号
+            contractNo: this.state.searchContractNo || undefined,//合同编号
+            userName: this.state.searchEnterpriseName || undefined,//用户名称
+            declarationBatch: this.state.declarationBatch || undefined,//申报批次
+            projectAmount: this.state.projectAmount || undefined,//项目金额
+        }
+
+        for(let key in data){
+            if(data[key]){
+                url = url+`&${key}=${data[key]}`;
+            }
+        }
+        window.open(globalConfig.context +url);
     }
 
     componentWillMount() {
         this.loadData();
         this.departmentList();
+        this.selectSuperId();
     }
 
     render() {
         return (
             <div className="user-content">
                 <div className="content-title">
-                    <span>项目汇总表</span>
+                    <span>
+                        项目汇总表
+                        (
+                        {
+                            this.state.status === 1 ? '高新' :
+                                this.state.status === 2 ? '双软' :
+                                    this.state.status === 3 ? '软著' :
+                                        this.state.status === 4 ? '专利' : '通用'
+                        }
+                        )
+                    </span>
                 </div>
                 <Tabs defaultActiveKey="1" className="test">
                     <TabPane tab="搜索" key="1">
@@ -186,6 +283,73 @@ class HighTech extends Component{
                             marginLeft:'10px',
                             marginRight:'10px'
                         }}>
+                            <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目类别 :</span>
+                                <Select
+                                    value={this.state.projectStatus}
+                                    placeholder="请选择项目类别"
+                                    notFoundContent="未获取到上级品类列表"
+                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
+                                    onChange={(e) => {
+                                        let infor = this.state.contactsOptionData.filter((v)=>v.id === e);
+                                        this.setState({
+                                            projectStatus: e,
+                                        },()=>{
+                                            if((infor[0].cname === '科技项目' || infor[0].cname === '高新') && typeof this.state.projectType !== 'number'){
+                                                this.setState({
+                                                    columns: highTechColumns,
+                                                    changeList: [],
+                                                    status: 1,
+                                                },()=>{
+                                                    this.loadData();
+                                                })
+                                            }else if (typeof this.state.projectType !== 'number'){
+                                                this.setState({
+                                                    columns: currency,
+                                                    changeList: [],
+                                                    status: 0,
+                                                },()=>{
+                                                    this.loadData();
+                                                })
+                                            }else{
+                                                this.loadData();
+                                            }
+                                        })
+                                    }}
+                                >
+                                    {this.state.contactsOption}
+                                </Select>
+                            </span>
+                            <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目分类 :</span>
+                                <Select
+                                    value={this.state.projectType}
+                                    placeholder="请选择项目分类"
+                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
+                                    onChange={(e) => {
+                                        this.setState({
+                                            columns:
+                                                e === 0 ? currency :
+                                                    e === 1 ? patent :
+                                                        e === 2 ? softWriting :
+                                                            e === 3 ? currency :
+                                                                e === 4 ? doubleSoft:[],
+                                            changeList: [],
+                                            projectType: e,
+                                            status: e === 4 ? 2 : e === 2 ? 3 : e === 1 ? 4 : 0,
+                                        },()=>{
+                                            this.loadData();
+                                        })
+                                    }}
+                                >
+                                    {/*0正常 1专利 2软著 3审计 4双软*/}
+                                    <Option value={0}>通用</Option>
+                                    <Option value={1}>专利</Option>
+                                    <Option value={2}>软著</Option>
+                                    <Option value={3}>审计</Option>
+                                    <Option value={4}>双软</Option>
+                                </Select>
+                            </span>
                             <Input
                                 placeholder="订单编号"
                                 style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}
@@ -203,7 +367,7 @@ class HighTech extends Component{
                                 }}
                             />
                             <Input
-                                placeholder="企业名称"
+                                placeholder="用户名称"
                                 style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}
                                 value={this.state.searchEnterpriseName}
                                 onChange={e => {
@@ -211,7 +375,7 @@ class HighTech extends Component{
                                 }}
                             />
                             <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
-                                <span>负责部门:</span>
+                                <span>订单部门:</span>
                                 <Select
                                     placeholder="请选择部门"
                                     style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
@@ -227,8 +391,25 @@ class HighTech extends Component{
                                     }
                                 </Select>
                             </span>
+                            <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
+                                <span>负责部门:</span>
+                                <Select
+                                    placeholder="请选择部门"
+                                    style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
+                                    value={this.state.thchDepId}
+                                    onChange={e => {
+                                        this.setState({ thchDepId: e });
+                                    }}
+                                >
+                                    {
+                                        this.state.departmentArr.map(function (item) {
+                                            return <Select.Option key={item.id} value={item.id}>{item.name}</Select.Option>
+                                        })
+                                    }
+                                </Select>
+                            </span>
                             <span style={{display:"inline-block"}}>
-                                <span style={{marginRight:'10px',marginBottom:'10px'}}>时报批次 :</span>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>报批次 :</span>
                                 <Select
                                     value={this.state.declarationBatch}
                                     placeholder="请选择批次"
@@ -246,31 +427,26 @@ class HighTech extends Component{
                                 </Select>
                             </span>
                             <span style={{display:"inline-block"}}>
-                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目类别 :</span>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目金额 :</span>
                                 <Select
-                                    value={this.state.projectType}
-                                    placeholder="请选择项目类别"
+                                    value={this.state.projectAmount}
+                                    placeholder="请选择项目金额"
                                     style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
                                     onChange={(e) => {
                                         this.setState({
-                                            columns:
-                                                e === 0 ? highTechColumns :
-                                                    e === 1 ? doubleSoft :
-                                                        e === 2 ? softWriting :
-                                                            e === 3 ? patent:[],
-                                            changeList: [],
-                                        },()=>{
-                                            this.resetAll();
-                                        })
-                                        this.setState({
-                                            projectType: e,
+                                            projectAmount: e,
                                         });
                                     }}
                                 >
-                                    <Option value={0}>高新</Option>
-                                    <Option value={1}>双软</Option>
-                                    <Option value={2}>软著</Option>
-                                    <Option value={3}>专利</Option>
+                                    <Option value={1}>0~0.5万</Option>
+                                    <Option value={2}>0.5~1万</Option>
+                                    <Option value={3}>1~2万</Option>
+                                    <Option value={4}>2~5万</Option>
+                                    <Option value={5}>5~10万</Option>
+                                    <Option value={6}>10~30万</Option>
+                                    <Option value={7}>30~50万</Option>
+                                    <Option value={8}>50~80万</Option>
+                                    <Option value={9}>80万上</Option>
                                 </Select>
                             </span>
                             <span style={{display:"inline-block"}}>
@@ -290,7 +466,9 @@ class HighTech extends Component{
                                     }}
                                 />
                             </span>
-                            <Button type="primary" onClick={this.loadData} style={{marginRight:'10px',marginBottom:'10px'}}>搜索</Button>
+                            <Button type="primary" onClick={()=>{
+                                this.loadData();
+                            }} style={{marginRight:'10px',marginBottom:'10px'}}>搜索</Button>
                             <Button onClick={this.resetAll} style={{marginRight:'10px',marginBottom:'10px'}}>重置</Button>
                         </div>
                     </TabPane>

+ 299 - 179
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -1,34 +1,34 @@
-//高新
+// 高新
 const highTechColumns =[
     {
         title: "序号",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "key",
+        key: "key",
     },
     {
         title: "派单时间",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "distributionTime",
+        key: "distributionTime"
     },
     {
         title: "派单省份",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "province",
+        key: "province"
     },
     {
         title: "订单部门",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "depName",
+        key: "depName"
     },
     {
         title: "营销员",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "salesmanName",
+        key: "salesmanName"
     },
     {
         title: "合同编号",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "contractNo",
+        key: "contractNo"
     },
     {
         title: "订单编号",
@@ -37,102 +37,113 @@ const highTechColumns =[
     },
     {
         title: "签单客户",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "userName",
+        key: "userName"
     },
     {
         title: "项目类型",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "cname",
+        key: "cname"
     },
     {
         title: "项目名称",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "pname",
+        key: "pname"
     },
     {
         title: "负责部门",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "techDepName",
+        key: "techDepName"
     },
     {
         title: "咨询师/咨询经理",
-        dataIndex: "orderNo",
-        key: "orderNo"
-    },
-    {
-        title: "项目状态",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "techName",
+        key: "techName"
     },
     {
         title: "是否立项/时间",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "setUpStatus",
+        key: "setUpStatus"
     },
     {
         title: "是否抽查",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "spotCheckStatus",
+        key: "spotCheckStatus"
     },
     {
         title: "联系人电话",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "contactMobile",
+        key: "contactMobile"
     },
     {
         title: "法人电话",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "legalPersonTel",
+        key: "legalPersonTel"
     },
     {
         title: "证书编号",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "certificateNumber",
+        key: "certificateNumber"
     },
     {
         title: "申报批次",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "declarationBatch",
+        key: "declarationBatch"
     },
     {
-        title: "签单金额",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        title: "项目金额",
+        dataIndex: "commodityPrice",
+        key: "commodityPrice"
+    },
+    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+    {
+        title: "项目状态",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
+        render:(value)=>{
+            return (
+                value === 0 ? '未开始' :
+                    value === 1 ? '已开始' :
+                        value === 2 ? '已暂停' :
+                            value === 3 ? '已完成' :
+                                value === 4 ? '已驳回' :
+                                    value === 5 ? '已退单' : ''
+            )
+        }
     },
 ];
 
-//双软
+// 双软
 const doubleSoft = [
     {
         title: "序号",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "key",
+        key: "key",
     },
     {
         title: "派单时间",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "distributionTime",
+        key: "distributionTime"
     },
     {
         title: "派单省份",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "province",
+        key: "province"
     },
     {
         title: "订单部门",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "depName",
+        key: "depName"
     },
     {
         title: "营销员",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "salesmanName",
+        key: "salesmanName"
     },
     {
         title: "合同编号",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "contractNo",
+        key: "contractNo"
     },
     {
         title: "订单编号",
@@ -141,77 +152,88 @@ const doubleSoft = [
     },
     {
         title: "签单客户",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "userName",
+        key: "userName"
     },
     {
         title: "项目类型",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "cname",
+        key: "cname"
     },
     {
         title: "项目名称",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "pname",
+        key: "pname"
     },
     {
         title: "负责部门",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "techDepName",
+        key: "techDepName"
     },
     {
         title: "咨询师/咨询经理",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "techName",
+        key: "techName"
     },
     {
-        title: "项目状态",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        title: "下证/授权时间",
+        dataIndex: "licenceTime",
+        key: "licenceTime"
     },
     {
-        title: "下证时间",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        title: "项目金额",
+        dataIndex: "commodityPrice",
+        key: "commodityPrice"
     },
+    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
     {
-        title: "签单金额",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        title: "项目状态",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
+        render:(value)=>{
+            return (
+                value === 0 ? '未开始' :
+                    value === 1 ? '已开始' :
+                        value === 2 ? '已暂停' :
+                            value === 3 ? '已完成' :
+                                value === 4 ? '已驳回' :
+                                    value === 5 ? '已退单' : ''
+            )
+        }
     },
 ];
 
-//软著
+// 软著
 const softWriting = [
     {
         title: "序号",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "key",
+        key: "key",
     },
     {
         title: "派单时间",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "distributionTime",
+        key: "distributionTime"
     },
     {
         title: "派单省份",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "province",
+        key: "province"
     },
     {
         title: "订单部门",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "depName",
+        key: "depName"
     },
     {
         title: "营销员",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "salesmanName",
+        key: "salesmanName"
     },
     {
         title: "合同编号",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "contractNo",
+        key: "contractNo"
     },
     {
         title: "订单编号",
@@ -220,112 +242,118 @@ const softWriting = [
     },
     {
         title: "签单客户",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "userName",
+        key: "userName"
     },
     {
         title: "项目类型",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "cname",
+        key: "cname"
     },
     {
         title: "项目名称",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "pname",
+        key: "pname"
     },
     {
         title: "负责部门",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "techDepName",
+        key: "techDepName"
     },
     {
         title: "咨询师/咨询经理",
-        dataIndex: "orderNo",
-        key: "orderNo"
-    },
-    {
-        title: "项目状态",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "techName",
+        key: "techName"
     },
     {
         title: "项目数量/下证数",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "commodityQuantity",
+        key: "commodityQuantity"
     },
     {
         title: "有无材料",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "ifMaterial",
+        key: "ifMaterial"
     },
     {
         title: "加急天数",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "urgentDay",
+        key: "urgentDay"
     },
     {
-        title: "签单金额",
-        dataIndex: "orderNo",
-        key: "orderNo"
-    },
-    {
-        title: "下证时间",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        title: "下证/授权时间",
+        dataIndex: "licenceTime",
+        key: "licenceTime"
     },
     {
         title: "证书编号",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "certificateNumber",
+        key: "certificateNumber"
     },
     {
         title: "项目金额",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "commodityPrice",
+        key: "commodityPrice"
     },
     {
         title: "成本金额",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "costAmount",
+        key: "costAmount"
     },
     {
         title: "利润金额",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "profit",
+        key: "profit"
+    },
+    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+    {
+        title: "项目状态",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
+        render:(value)=>{
+            return (
+                value === 0 ? '未开始' :
+                    value === 1 ? '已开始' :
+                        value === 2 ? '已暂停' :
+                            value === 3 ? '已完成' :
+                                value === 4 ? '已驳回' :
+                                    value === 5 ? '已退单' : ''
+            )
+        }
     },
 ];
 
-//专利
+// 专利
 const patent =[
     {
         title: "序号",
-        dataIndex: "orderNo",
-        key: "orderNo",
+        dataIndex: "key",
+        key: "key",
     },
     {
         title: "派单时间",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "distributionTime",
+        key: "distributionTime"
     },
     {
         title: "派单省份",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "province",
+        key: "province"
     },
     {
         title: "订单部门",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "depName",
+        key: "depName"
     },
     {
         title: "营销员",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "salesmanName",
+        key: "salesmanName"
     },
     {
         title: "合同编号",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "contractNo",
+        key: "contractNo"
     },
     {
         title: "订单编号",
@@ -334,94 +362,186 @@ const patent =[
     },
     {
         title: "签单客户",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "userName",
+        key: "userName"
     },
     {
         title: "项目类型",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "cname",
+        key: "cname"
     },
     {
         title: "项目名称",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "pname",
+        key: "pname"
     },
     {
         title: "负责部门",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "techDepName",
+        key: "techDepName"
     },
     {
         title: "咨询师/咨询经理",
-        dataIndex: "orderNo",
-        key: "orderNo"
-    },
-    {
-        title: "项目状态",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "techName",
+        key: "techName"
     },
     {
         title: "项目数量/下证数",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "commodityQuantity",
+        key: "commodityQuantity"
     },
     {
         title: "是否高新",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "highTechstatus",
+        key: "highTechstatus",
     },
     {
         title: "驳回数",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "rejectCount",
+        key: "rejectCount"
     },
     {
         title: "专利号",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "patentNumber",
+        key: "patentNumber"
     },
     {
         title: "专利名称",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "patentName",
+        key: "patentName"
     },
     {
         title: "受理时间",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        dataIndex: "acceptTime",
+        key: "acceptTime"
     },
+    // {
+    //     title: "授权时间",
+    //     dataIndex: "orderNo",
+    //     key: "orderNo"
+    // },
     {
-        title: "授权时间",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        title: "下证/授权时间",
+        dataIndex: "licenceTime",
+        key: "licenceTime"
     },
     {
-        title: "下证时间",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        title: "项目金额",
+        dataIndex: "commodityPrice",
+        key: "commodityPrice"
     },
     {
-        title: "签单金额",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        title: "成本金额",
+        dataIndex: "costAmount",
+        key: "costAmount"
     },
     {
-        title: "成本",
-        dataIndex: "orderNo",
-        key: "orderNo"
+        title: "利润金额",
+        dataIndex: "profit",
+        key: "profit"
+    },
+    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+    {
+        title: "项目状态",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
+        render:(value)=>{
+            return (
+                value === 0 ? '未开始' :
+                    value === 1 ? '已开始' :
+                        value === 2 ? '已暂停' :
+                            value === 3 ? '已完成' :
+                                value === 4 ? '已驳回' :
+                                    value === 5 ? '已退单' : ''
+            )
+        }
+    },
+];
+
+// 通用表
+const currency = [
+    {
+        title: "序号",
+        dataIndex: "key",
+        key: "key",
+    },
+    {
+        title: "派单时间",
+        dataIndex: "distributionTime",
+        key: "distributionTime"
+    },
+    {
+        title: "派单省份",
+        dataIndex: "province",
+        key: "province"
+    },
+    {
+        title: "订单部门",
+        dataIndex: "depName",
+        key: "depName"
     },
     {
-        title: "利润",
+        title: "营销员",
+        dataIndex: "salesmanName",
+        key: "salesmanName"
+    },
+    {
+        title: "合同编号",
+        dataIndex: "contractNo",
+        key: "contractNo"
+    },
+    {
+        title: "订单编号",
         dataIndex: "orderNo",
         key: "orderNo"
     },
-]
+    {
+        title: "签单客户",
+        dataIndex: "userName",
+        key: "userName"
+    },
+    {
+        title: "项目类型",
+        dataIndex: "cname",
+        key: "cname"
+    },
+    {
+        title: "项目名称",
+        dataIndex: "pname",
+        key: "pname"
+    },
+    {
+        title: "负责部门",
+        dataIndex: "techDepName",
+        key: "techDepName"
+    },
+    {
+        title: "咨询师/咨询经理",
+        dataIndex: "techName",
+        key: "techName"
+    },
+    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+    {
+        title: "项目状态",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
+        render:(value)=>{
+            return (
+                    value === 0 ? '未开始' :
+                        value === 1 ? '已开始' :
+                            value === 2 ? '已暂停' :
+                                value === 3 ? '已完成' :
+                                    value === 4 ? '已驳回' :
+                                        value === 5 ? '已退单' : ''
+            )
+        }
+    },
+];
 
 export {
     highTechColumns,
     doubleSoft,
     softWriting,
     patent,
+    currency,
 }

+ 125 - 43
js/component/manageCenter/project/summary/projecCount.jsx

@@ -1,8 +1,10 @@
 import React,{ Component } from 'react';
 import {Button, DatePicker, Input, message, Select, Spin, Table, Tabs} from "antd";
 import {
-    ShowModal
+    ShowModal,
+    getNewDiccityArr
 } from "@/tools";
+import { citySelect } from '../../../NewDicProvinceList';
 import {ChooseList} from "../../order/orderNew/chooseList";
 import $ from "jquery/src/ajax";
 import moment from "moment";
@@ -12,8 +14,8 @@ import {
     utilityModel,
     softWriting,
     otherTrademarks,
+    currency,
 } from './projecCountConfig';
-import {cityArr} from '@/dataDic.js';
 
 const {TabPane} = Tabs;
 const { RangePicker } = DatePicker;
@@ -25,7 +27,7 @@ class ProjecCount extends Component{
         this.state={
             loading:false,
             changeList:[],
-            columns: highTechColumns,
+            columns: currency,
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -45,17 +47,22 @@ class ProjecCount extends Component{
             searchContractNo: '',
             searchEnterpriseName: '',
             declarationBatch: '',
-            projectType: 0,
+            projectType: '',
+            projectStatus: '',
             province: '',
             depId: '',
 
             departmentArr:[],
+
+            contactsOption: [],
+            contactsOptionData: [],
         }
         this.loadData = this.loadData.bind(this);
         this.resetAll = this.resetAll.bind(this);
         this.changeList = this.changeList.bind(this);
         this.departmentList = this.departmentList.bind(this);
         this.exportPending = this.exportPending.bind(this);
+        this.selectSuperId = this.selectSuperId.bind(this);
     }
 
     changeList(arr) {
@@ -86,8 +93,10 @@ class ProjecCount extends Component{
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                starTime: this.state.releaseDate[0], //开始时间
-                endTime: this.state.releaseDate[1], //结束时间
+                startDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[0]: undefined, //开始时间
+                endDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[1]: undefined, //结束时间
+                projectStatus: this.state.projectStatus || undefined,//项目类别
+                projectType: this.state.projectType || undefined,//项目分类
             },
             success: function(data) {
                 ShowModal(this);
@@ -163,6 +172,8 @@ class ProjecCount extends Component{
             declarationBatch: '',
             province: '',
             depId: '',
+            projectType: '',
+            projectStatus: '',
         },()=>{
             this.loadData();
         })
@@ -172,16 +183,53 @@ class ProjecCount extends Component{
         window.open(globalConfig.context + "/api/admin/patent/exportPending")
     }
 
+    //项目类别
+    selectSuperId() {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/ProjectSize/getAllCname",
+            data: {
+                flag: 0
+            },
+            success: function(data) {
+                let theArr = [];
+                let thedata = data.data;
+                if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                }
+                for (let i = 0; i < data.data.length; i++) {
+                    let theData = data.data[i];
+                    theArr.push(
+                        <Select.Option value={theData.id} key={theData.cname}>
+                            {theData.cname}
+                        </Select.Option>
+                    );
+                }
+                this.setState({
+                    contactsOption: theArr,
+                    contactsOptionData: data.data,
+                });
+            }.bind(this)
+        }).always(
+
+        );
+    }
+
     componentWillMount() {
         this.loadData();
         this.departmentList();
+        this.selectSuperId();
     }
 
     render() {
         return (
             <div className="user-content">
                 <div className="content-title">
-                    <span>项目统计</span>
+                    <span>数据统计</span>
                 </div>
                 <Tabs defaultActiveKey="1" className="test">
                     <TabPane tab="搜索" key="1">
@@ -190,6 +238,70 @@ class ProjecCount extends Component{
                             marginLeft:'10px',
                             marginRight:'10px'
                         }}>
+                            <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目类别 :</span>
+                                <Select
+                                    value={this.state.projectStatus}
+                                    placeholder="请选择项目类别"
+                                    notFoundContent="未获取到上级品类列表"
+                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
+                                    onChange={(e) => {
+                                        let infor = this.state.contactsOptionData.filter((v)=>v.id === e);
+                                        this.setState({
+                                            projectStatus: e,
+                                        },()=>{
+                                            if((infor[0].cname === '科技项目' || infor[0].cname === '高新') && typeof this.state.projectType !== 'number'){
+                                                this.setState({
+                                                    columns: highTechColumns,
+                                                    changeList: [],
+                                                },()=>{
+                                                    this.loadData();
+                                                })
+                                            }else if (typeof this.state.projectType !== 'number'){
+                                                this.setState({
+                                                    columns: currency,
+                                                    changeList: [],
+                                                },()=>{
+                                                    this.loadData();
+                                                })
+                                            }else{
+                                                this.loadData();
+                                            }
+                                        })
+                                    }}
+                                >
+                                    {this.state.contactsOption}
+                                </Select>
+                            </span>
+                            <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目分类 :</span>
+                                <Select
+                                    value={this.state.projectType}
+                                    placeholder="请选择项目分类"
+                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
+                                    onChange={(e) => {
+                                        this.setState({
+                                            columns:
+                                                e === 0 ? currency :
+                                                    e === 1 ? invention :
+                                                        e === 2 ? softWriting :
+                                                            e === 3 ? currency :
+                                                                e === 4 ? currency:[],
+                                            changeList: [],
+                                            projectType: e,
+                                        },()=>{
+                                            this.loadData();
+                                        })
+                                    }}
+                                >
+                                    {/*0正常 1专利 2软著 3审计 4双软*/}
+                                    <Option value={0}>通用</Option>
+                                    <Option value={1}>专利</Option>
+                                    <Option value={2}>软著</Option>
+                                    <Option value={3}>审计</Option>
+                                    <Option value={4}>双软</Option>
+                                </Select>
+                            </span>
                             <Input
                                 placeholder="订单编号"
                                 style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}
@@ -237,16 +349,16 @@ class ProjecCount extends Component{
                                 <Select
                                     placeholder="请选择省份"
                                     style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
-                                    value={this.state.province}
+                                    value={getNewDiccityArr(this.state.province)}
                                     onChange={e => {
                                         this.setState({ province: e });
                                     }}
                                 >
-                                  {cityArr.map(function(item) {
-                                      return (
-                                          <Select.Option key={item.value}>{item.key}</Select.Option>
-                                      );
-                                  })}
+                                    {citySelect().map(function(item) {
+                                        return (
+                                            <Select.Option key={item.value} value={item.value}>{item.label}</Select.Option>
+                                        );
+                                    })}
                                 </Select>
                             </span>
                             <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
@@ -267,36 +379,6 @@ class ProjecCount extends Component{
                                 </Select>
                             </span>
                             <span style={{display:"inline-block"}}>
-                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目类别 :</span>
-                                <Select
-                                    value={this.state.projectType}
-                                    placeholder="请选择项目类别"
-                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
-                                    onChange={(e) => {
-                                        this.setState({
-                                            columns:
-                                                e === 0 ? highTechColumns :
-                                                    e === 1 ? invention :
-                                                        e === 2 ? utilityModel :
-                                                            e === 3 ? softWriting:
-                                                                e === 4 ? otherTrademarks : [],
-                                            changeList: [],
-                                        },()=>{
-                                            this.resetAll();
-                                        })
-                                        this.setState({
-                                            projectType: e,
-                                        });
-                                    }}
-                                >
-                                    <Option value={0}>高新</Option>
-                                    <Option value={1}>发明专利</Option>
-                                    <Option value={2}>实用新型</Option>
-                                    <Option value={3}>软件著作权</Option>
-                                    <Option value={4}>其他商标</Option>
-                                </Select>
-                            </span>
-                            <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>派单时间 :</span>
                                 <RangePicker
                                     style={{marginRight:'10px',marginBottom:'10px'}}

+ 61 - 1
js/component/manageCenter/project/summary/projecCountConfig.jsx

@@ -57,7 +57,7 @@ const highTechColumns = [
     },
 ];
 
-//发明
+//发明专利
 const invention = [
     {
         title: "序号",
@@ -318,10 +318,70 @@ const otherTrademarks = [
     },
 ];
 
+//通用
+const currency = [
+    {
+        title: "序号",
+        dataIndex: "orderNo",
+        key: "orderNo",
+    },
+    {
+        title: "派单省份",
+        dataIndex: "orderNo",
+        key: "orderNo",
+    },
+    {
+        title: "负责部门",
+        dataIndex: "orderNo",
+        key: "orderNo",
+    },
+    {
+        title: "项目类别",
+        dataIndex: "orderNo",
+        key: "orderNo",
+    },
+    {
+        title: "库存数(个)",
+        dataIndex: "orderNo",
+        key: "orderNo",
+    },
+    {
+        title: "派单数(个)",
+        dataIndex: "orderNo",
+        key: "orderNo",
+    },
+    {
+        title: "完成数",
+        dataIndex: "orderNo",
+        key: "orderNo",
+    },
+    {
+        title: "公示/立项数",
+        dataIndex: "orderNo",
+        key: "orderNo",
+    },
+    {
+        title: "签单额(万元)",
+        dataIndex: "orderNo",
+        key: "orderNo",
+    },
+    {
+        title: "成本(万元)",
+        dataIndex: "orderNo",
+        key: "orderNo",
+    },
+    {
+        title: "利润(万元)",
+        dataIndex: "orderNo",
+        key: "orderNo",
+    },
+];
+
 export {
     highTechColumns,
     invention,
     utilityModel,
     softWriting,
     otherTrademarks,
+    currency,
 }

+ 58 - 56
js/component/manageCenter/project/task/myTask.jsx

@@ -3571,11 +3571,12 @@ const Task = React.createClass({
                         {/*0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单*/}
                         {
                           this.state.status === 0 ? '未开始':
-                              this.state.status === 1 ? '已开始':
+                              this.state.status === 1 ? '进行中':
                                   this.state.status === 2 ? '已暂停':
-                                      this.state.status === 3 ? '已完成':
-                                          this.state.status === 4 ? '已驳回':
-                                              this.state.status === 5 ? '已退单': ''
+                                      this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                          this.state.status === 4 ? '已完成':
+                                              this.state.status === 5 ? '项目已完成 已退单':
+                                                  this.state.status === 6 ? '项目未完成 已退单': ''
                         }
                         {
                           this.state.status !== 0 ? <Button
@@ -3986,28 +3987,28 @@ const Task = React.createClass({
                       >
                         <span>{this.state.taskName}</span>
                       </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="项目状态"
-                      >
-                        <Select
-                          placeholder="选择项目状态"
-                          style={{ width: '200px' }}
-                          value={this.state.taskStatus}
-                          onChange={(e) => {
-                            this.setState({ taskStatus: e })
-                          }}
-                        >
-                          {taskStatus.map(function (item) {
-                            return (
-                              <Select.Option key={item.value}>
-                                {item.key}
-                              </Select.Option>
-                            )
-                          })}
-                        </Select>
-                      </FormItem>
+                      {/*<FormItem*/}
+                      {/*  className="half-item"*/}
+                      {/*  {...formItemLayout}*/}
+                      {/*  label="项目状态"*/}
+                      {/*>*/}
+                      {/*  <Select*/}
+                      {/*    placeholder="选择项目状态"*/}
+                      {/*    style={{ width: '200px' }}*/}
+                      {/*    value={this.state.taskStatus}*/}
+                      {/*    onChange={(e) => {*/}
+                      {/*      this.setState({ taskStatus: e })*/}
+                      {/*    }}*/}
+                      {/*  >*/}
+                      {/*    {taskStatus.map(function (item) {*/}
+                      {/*      return (*/}
+                      {/*        <Select.Option key={item.value}>*/}
+                      {/*          {item.key}*/}
+                      {/*        </Select.Option>*/}
+                      {/*      )*/}
+                      {/*    })}*/}
+                      {/*  </Select>*/}
+                      {/*</FormItem>*/}
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
@@ -5202,11 +5203,12 @@ const Task = React.createClass({
                   {/*</Radio.Group>*/}
                   {
                     this.state.status === 0 ? '未开始':
-                        this.state.status === 1 ? '已开始':
+                        this.state.status === 1 ? '进行中':
                             this.state.status === 2 ? '已暂停':
-                                this.state.status === 3 ? '已完成':
-                                    this.state.status === 4 ? '已驳回':
-                                        this.state.status === 5 ? '已退单': ''
+                                this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                    this.state.status === 4 ? '已完成':
+                                        this.state.status === 5 ? '项目已完成 已退单':
+                                            this.state.status === 6 ? '项目未完成 已退单': ''
                   }
                   {
                     this.state.status !== 0 ? <Button
@@ -5567,28 +5569,28 @@ const Task = React.createClass({
                 >
                   <span>{this.state.taskName}</span>
                 </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目状态"
-                >
-                  <Select
-                    placeholder="选择项目状态"
-                    style={{ width: '200px' }}
-                    value={this.state.taskStatus}
-                    onChange={(e) => {
-                      this.setState({ taskStatus: e })
-                    }}
-                  >
-                    {taskStatus.map(function (item) {
-                      return (
-                        <Select.Option key={item.value}>
-                          {item.key}
-                        </Select.Option>
-                      )
-                    })}
-                  </Select>
-                </FormItem>
+                {/*<FormItem*/}
+                {/*  className="half-item"*/}
+                {/*  {...formItemLayout}*/}
+                {/*  label="项目状态"*/}
+                {/*>*/}
+                {/*  <Select*/}
+                {/*    placeholder="选择项目状态"*/}
+                {/*    style={{ width: '200px' }}*/}
+                {/*    value={this.state.taskStatus}*/}
+                {/*    onChange={(e) => {*/}
+                {/*      this.setState({ taskStatus: e })*/}
+                {/*    }}*/}
+                {/*  >*/}
+                {/*    {taskStatus.map(function (item) {*/}
+                {/*      return (*/}
+                {/*        <Select.Option key={item.value}>*/}
+                {/*          {item.key}*/}
+                {/*        </Select.Option>*/}
+                {/*      )*/}
+                {/*    })}*/}
+                {/*  </Select>*/}
+                {/*</FormItem>*/}
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
@@ -6461,7 +6463,6 @@ const Task = React.createClass({
               当前项目情况:
             </div>
             <div>
-              {/*0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单*/}
               <Radio.Group
                   style={{
                     dispaly:'flex',
@@ -6474,9 +6475,10 @@ const Task = React.createClass({
               >
                 <Radio value={1}>进行中</Radio>
                 <Radio value={2}>已暂停</Radio>
-                <Radio value={3}>已完成</Radio>
-                <Radio value={4}>已驳回</Radio>
-                <Radio value={5}>已退单</Radio>
+                <Radio value={3}>已驳回(专利、软著项目填写)</Radio>
+                <Radio value={4}>已完成</Radio>
+                <Radio value={5}>项目已完成 已退单</Radio>
+                <Radio value={6}>项目未完成 已退单</Radio>
               </Radio.Group>
               <div style={{
                 display:'flex',

+ 10 - 8
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -1222,11 +1222,12 @@ const MyTaskCount = Form.create()(
                       <span>
                         {
                           this.state.status === 0 ? '未开始':
-                              this.state.status === 1 ? '已开始':
+                              this.state.status === 1 ? '进行中':
                                   this.state.status === 2 ? '已暂停':
-                                      this.state.status === 3 ? '已完成':
-                                          this.state.status === 4 ? '已驳回':
-                                              this.state.status === 5 ? '已退单': ''
+                                      this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                          this.state.status === 4 ? '已完成':
+                                              this.state.status === 5 ? '项目已完成 已退单':
+                                                  this.state.status === 6 ? '项目未完成 已退单': ''
                         }
                       </span>
                       <Button
@@ -1734,11 +1735,12 @@ const MyTaskCount = Form.create()(
                 <span>
                   {
                     this.state.status === 0 ? '未开始':
-                        this.state.status === 1 ? '已开始':
+                        this.state.status === 1 ? '进行中':
                             this.state.status === 2 ? '已暂停':
-                                this.state.status === 3 ? '已完成':
-                                    this.state.status === 4 ? '已驳回':
-                                        this.state.status === 5 ? '已退单': ''
+                                this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                    this.state.status === 4 ? '已完成':
+                                        this.state.status === 5 ? '项目已完成 已退单':
+                                            this.state.status === 6 ? '项目未完成 已退单': ''
                   }
                 </span>
                 <Button

+ 58 - 56
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -3321,11 +3321,12 @@ const MyTaskOutsource = React.createClass({
                         {/*0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单*/}
                         {
                           this.state.status === 0 ? '未开始':
-                              this.state.status === 1 ? '已开始':
+                              this.state.status === 1 ? '进行中':
                                   this.state.status === 2 ? '已暂停':
-                                      this.state.status === 3 ? '已完成':
-                                          this.state.status === 4 ? '已驳回':
-                                              this.state.status === 5 ? '已退单': ''
+                                      this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                          this.state.status === 4 ? '已完成':
+                                              this.state.status === 5 ? '项目已完成 已退单':
+                                                  this.state.status === 6 ? '项目未完成 已退单': ''
                         }
                         {
                           this.state.status !== 0 ? <Button
@@ -3701,28 +3702,28 @@ const MyTaskOutsource = React.createClass({
                       >
                         <span>{this.state.taskName}</span>
                       </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="项目状态"
-                      >
-                        <Select
-                          placeholder="选择项目状态"
-                          style={{ width: "200px" }}
-                          value={this.state.taskStatus}
-                          onChange={(e) => {
-                            this.setState({ taskStatus: e });
-                          }}
-                        >
-                          {taskStatus.map(function (item) {
-                            return (
-                              <Select.Option key={item.value}>
-                                {item.key}
-                              </Select.Option>
-                            );
-                          })}
-                        </Select>
-                      </FormItem>
+                      {/*<FormItem*/}
+                      {/*  className="half-item"*/}
+                      {/*  {...formItemLayout}*/}
+                      {/*  label="项目状态"*/}
+                      {/*>*/}
+                      {/*  <Select*/}
+                      {/*    placeholder="选择项目状态"*/}
+                      {/*    style={{ width: "200px" }}*/}
+                      {/*    value={this.state.taskStatus}*/}
+                      {/*    onChange={(e) => {*/}
+                      {/*      this.setState({ taskStatus: e });*/}
+                      {/*    }}*/}
+                      {/*  >*/}
+                      {/*    {taskStatus.map(function (item) {*/}
+                      {/*      return (*/}
+                      {/*        <Select.Option key={item.value}>*/}
+                      {/*          {item.key}*/}
+                      {/*        </Select.Option>*/}
+                      {/*      );*/}
+                      {/*    })}*/}
+                      {/*  </Select>*/}
+                      {/*</FormItem>*/}
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
@@ -4750,11 +4751,12 @@ const MyTaskOutsource = React.createClass({
                   {/*</Radio.Group>*/}
                   {
                     this.state.status === 0 ? '未开始':
-                        this.state.status === 1 ? '已开始':
+                        this.state.status === 1 ? '进行中':
                             this.state.status === 2 ? '已暂停':
-                                this.state.status === 3 ? '已完成':
-                                    this.state.status === 4 ? '已驳回':
-                                        this.state.status === 5 ? '已退单': ''
+                                this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                    this.state.status === 4 ? '已完成':
+                                        this.state.status === 5 ? '项目已完成 已退单':
+                                            this.state.status === 6 ? '项目未完成 已退单': ''
                   }
                   {
                     this.state.status !== 0 ? <Button
@@ -5063,28 +5065,28 @@ const MyTaskOutsource = React.createClass({
                 >
                   <span>{this.state.taskName}</span>
                 </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目状态"
-                >
-                  <Select
-                    placeholder="选择项目状态"
-                    style={{ width: "200px" }}
-                    value={this.state.taskStatus}
-                    onChange={(e) => {
-                      this.setState({ taskStatus: e });
-                    }}
-                  >
-                    {taskStatus.map(function (item) {
-                      return (
-                        <Select.Option key={item.value}>
-                          {item.key}
-                        </Select.Option>
-                      );
-                    })}
-                  </Select>
-                </FormItem>
+                {/*<FormItem*/}
+                {/*  className="half-item"*/}
+                {/*  {...formItemLayout}*/}
+                {/*  label="项目状态"*/}
+                {/*>*/}
+                {/*  <Select*/}
+                {/*    placeholder="选择项目状态"*/}
+                {/*    style={{ width: "200px" }}*/}
+                {/*    value={this.state.taskStatus}*/}
+                {/*    onChange={(e) => {*/}
+                {/*      this.setState({ taskStatus: e });*/}
+                {/*    }}*/}
+                {/*  >*/}
+                {/*    {taskStatus.map(function (item) {*/}
+                {/*      return (*/}
+                {/*        <Select.Option key={item.value}>*/}
+                {/*          {item.key}*/}
+                {/*        </Select.Option>*/}
+                {/*      );*/}
+                {/*    })}*/}
+                {/*  </Select>*/}
+                {/*</FormItem>*/}
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
@@ -5445,7 +5447,6 @@ const MyTaskOutsource = React.createClass({
               当前项目情况:
             </div>
             <div>
-              {/*0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单*/}
               <Radio.Group
                   style={{
                     dispaly:'flex',
@@ -5458,9 +5459,10 @@ const MyTaskOutsource = React.createClass({
               >
                 <Radio value={1}>进行中</Radio>
                 <Radio value={2}>已暂停</Radio>
-                <Radio value={3}>已完成</Radio>
-                <Radio value={4}>已驳回</Radio>
-                <Radio value={5}>已退单</Radio>
+                <Radio value={3}>已驳回(专利、软著项目填写)</Radio>
+                <Radio value={4}>已完成</Radio>
+                <Radio value={5}>项目已完成 已退单</Radio>
+                <Radio value={6}>项目未完成 已退单</Radio>
               </Radio.Group>
               <div style={{
                 display:'flex',

+ 5 - 4
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -519,11 +519,12 @@ class projectOverview extends Component{
                                 <span>
                                     {
                                         this.state.status === 0 ? '未开始':
-                                            this.state.status === 1 ? '已开始':
+                                            this.state.status === 1 ? '进行中':
                                                 this.state.status === 2 ? '已暂停':
-                                                    this.state.status === 3 ? '已完成':
-                                                        this.state.status === 4 ? '已驳回':
-                                                            this.state.status === 5 ? '已退单': ''
+                                                    this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                                        this.state.status === 4 ? '已完成':
+                                                            this.state.status === 5 ? '项目已完成 已退单':
+                                                                this.state.status === 6 ? '项目未完成 已退单': ''
                                     }
                                 </span>
                                 <Button

+ 10 - 8
js/component/manageCenter/project/task/taskCount.jsx

@@ -1247,11 +1247,12 @@ const IntentionCustomer = Form.create()(
                       <span>
                         {
                           this.state.status === 0 ? '未开始':
-                              this.state.status === 1 ? '已开始':
+                              this.state.status === 1 ? '进行中':
                                   this.state.status === 2 ? '已暂停':
-                                      this.state.status === 3 ? '已完成':
-                                          this.state.status === 4 ? '已驳回':
-                                              this.state.status === 5 ? '已退单': ''
+                                      this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                          this.state.status === 4 ? '已完成':
+                                              this.state.status === 5 ? '项目已完成 已退单':
+                                                  this.state.status === 6 ? '项目未完成 已退单': ''
                         }
                       </span>
                       <Button
@@ -1813,11 +1814,12 @@ const IntentionCustomer = Form.create()(
                 <span>
                   {
                     this.state.status === 0 ? '未开始':
-                        this.state.status === 1 ? '已开始':
+                        this.state.status === 1 ? '进行中':
                             this.state.status === 2 ? '已暂停':
-                                this.state.status === 3 ? '已完成':
-                                    this.state.status === 4 ? '已驳回':
-                                        this.state.status === 5 ? '已退单': ''
+                                this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                    this.state.status === 4 ? '已完成':
+                                        this.state.status === 5 ? '项目已完成 已退单':
+                                            this.state.status === 6 ? '项目未完成 已退单': ''
                   }
                 </span>
                 <Button

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

@@ -1146,11 +1146,12 @@ const Task = React.createClass({
                         <span>
                           {
                             this.state.status === 0 ? '未开始':
-                                this.state.status === 1 ? '已开始':
+                                this.state.status === 1 ? '进行中':
                                     this.state.status === 2 ? '已暂停':
-                                        this.state.status === 3 ? '已完成':
-                                            this.state.status === 4 ? '已驳回':
-                                                this.state.status === 5 ? '已退单': ''
+                                        this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                            this.state.status === 4 ? '已完成':
+                                                this.state.status === 5 ? '项目已完成 已退单':
+                                                    this.state.status === 6 ? '项目未完成 已退单': ''
                           }
                         </span>
                         <Button
@@ -1772,11 +1773,12 @@ const Task = React.createClass({
                   <span>
                     {
                       this.state.status === 0 ? '未开始':
-                          this.state.status === 1 ? '已开始':
+                          this.state.status === 1 ? '进行中':
                               this.state.status === 2 ? '已暂停':
-                                  this.state.status === 3 ? '已完成':
-                                      this.state.status === 4 ? '已驳回':
-                                          this.state.status === 5 ? '已退单': ''
+                                  this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                      this.state.status === 4 ? '已完成':
+                                          this.state.status === 5 ? '项目已完成 已退单':
+                                              this.state.status === 6 ? '项目未完成 已退单': ''
                     }
                   </span>
                   <Button

+ 5 - 4
js/component/project.jsx

@@ -879,11 +879,12 @@ const project = React.createClass({
                       <span>
                         {
                           this.state.status === 0 ? '未开始':
-                              this.state.status === 1 ? '已开始':
+                              this.state.status === 1 ? '进行中':
                                   this.state.status === 2 ? '已暂停':
-                                      this.state.status === 3 ? '已完成':
-                                          this.state.status === 4 ? '已驳回':
-                                              this.state.status === 5 ? '已退单': ''
+                                      this.state.status === 3 ? '已驳回(专利、软著项目编写)':
+                                          this.state.status === 4 ? '已完成':
+                                              this.state.status === 5 ? '项目已完成 已退单':
+                                                  this.state.status === 6 ? '项目未完成 已退单': ''
                         }
                       </span>
                       <Button