Browse Source

完善项目汇总
项目汇总列表增加详情弹窗

HW 4 years ago
parent
commit
05443c6197

+ 2 - 1
js/component/manageCenter/components/checkProject/index.jsx

@@ -265,7 +265,8 @@ class CheckProject extends Component {
         },
       ],
     })
-    if(projectType === 0 || !projectType || this.props.startType === 0){       //0正常 1专利 2软著 3审计      this.props.startType 0外包 1供应商     外包时当普通单处理
+    //0正常 1专利 2软著 3审计      this.props.startType 0外包 1供应商     外包时当普通单处理   projectType大于3的都用通用表格
+    if(projectType === 0 || !projectType || this.props.startType === 0  || projectType > 3){
       this.setState({
         ContactsListsNew: [
           {

+ 96 - 38
js/component/manageCenter/project/summary/highTech.jsx

@@ -13,6 +13,7 @@ import {
     patent,
     currency,
 } from './highTechConfig';
+import ProjectDetails from './projectDetails';
 
 const {TabPane} = Tabs;
 const { RangePicker } = DatePicker;
@@ -46,6 +47,7 @@ class HighTech extends Component{
             searchContractNo: '',
             searchEnterpriseName: '',
             declarationBatch: '',
+            projectSituation: '',
             projectAmount: '',
             depId:'',
             thchDepId:'',
@@ -56,6 +58,8 @@ class HighTech extends Component{
 
             contactsOption: [],
             contactsOptionData: [],
+
+            visible: false,
         };
 
         this.resetAll = this.resetAll.bind(this);
@@ -100,8 +104,9 @@ class HighTech extends Component{
                 projectType: typeof this.state.projectType === 'number' ? this.state.projectType : undefined,//项目分类
                 orderNo: this.state.searchOrderNo || undefined,//订单编号
                 contractNo: this.state.searchContractNo || undefined,//合同编号
-                userName: this.state.searchEnterpriseName || undefined,//用户名称
+                userName: this.state.searchEnterpriseName || undefined,//企业名称
                 declarationBatch: this.state.declarationBatch || undefined,//申报批次
+                projectSituation: typeof this.state.projectSituation === 'number' ? this.state.projectSituation : undefined,//项目分类
                 projectAmount: this.state.projectAmount || undefined,//项目金额
                 status: this.state.status,
             },
@@ -147,6 +152,7 @@ class HighTech extends Component{
             searchContractNo: '',
             searchEnterpriseName: '',
             declarationBatch: '',
+            projectSituation: '',
             projectAmount: '',
             projectType: '',
             depId:'',
@@ -252,8 +258,9 @@ class HighTech extends Component{
             projectType: typeof this.state.projectType === 'number' ? this.state.projectType : undefined,//项目分类
             orderNo: this.state.searchOrderNo || undefined,//订单编号
             contractNo: this.state.searchContractNo || undefined,//合同编号
-            userName: this.state.searchEnterpriseName || undefined,//用户名称
+            userName: this.state.searchEnterpriseName || undefined,//企业名称
             declarationBatch: this.state.declarationBatch || undefined,//申报批次
+            projectSituation: typeof this.state.projectSituation === 'number' ? this.state.projectSituation : undefined,//项目情况
             projectAmount: this.state.projectAmount || undefined,//项目金额
         }
 
@@ -294,13 +301,37 @@ class HighTech extends Component{
                             marginLeft:'10px',
                             marginRight:'10px'
                         }}>
+                            <Input
+                                placeholder="订单编号"
+                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                value={this.state.searchOrderNo}
+                                onChange={e => {
+                                    this.setState({ searchOrderNo: e.target.value });
+                                }}
+                            />
+                            <Input
+                                placeholder="合同编号"
+                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                value={this.state.searchContractNo}
+                                onChange={e => {
+                                    this.setState({ searchContractNo: e.target.value });
+                                }}
+                            />
+                            <Input
+                                placeholder="企业名称"
+                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                value={this.state.searchEnterpriseName}
+                                onChange={e => {
+                                    this.setState({ searchEnterpriseName: e.target.value });
+                                }}
+                            />
                             <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>项目类别 :</span>
                                 <Select
-                                    value={this.state.projectStatus}
+                                    value={this.state.projectStatus || undefined}
                                     placeholder="请选择项目类别"
                                     notFoundContent="未获取到上级品类列表"
-                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
                                     onChange={(e) => {
                                         let infor = this.state.contactsOptionData.filter((v)=>v.id === e);
                                         this.setState({
@@ -334,9 +365,9 @@ class HighTech extends Component{
                             <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>项目分类 :</span>
                                 <Select
-                                    value={this.state.projectType}
+                                    value={this.state.projectType || undefined}
                                     placeholder="请选择项目分类"
-                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
                                     onChange={(e) => {
                                         this.setState({
                                             columns:
@@ -345,7 +376,8 @@ class HighTech extends Component{
                                                         e === 2 ? softWriting :
                                                             e === 3 ? currency :
                                                                 e === 4 ? doubleSoft :
-                                                                    e === 5 ? highTechColumns : [],
+                                                                    e === 5 ? highTechColumns :
+                                                                        e === 6 ? currency : [],
                                             changeList: [],
                                             projectType: e,
                                             status: e === 4 ? 2 : e === 2 ? 3 : e === 1 ? 4 : e === 5 ? 1 : 0,
@@ -361,38 +393,15 @@ class HighTech extends Component{
                                     <Option value={3}>审计</Option>
                                     <Option value={4}>双软</Option>
                                     <Option value={5}>高新</Option>
+                                    <Option value={6}>商标</Option>
                                 </Select>
                             </span>
-                            <Input
-                                placeholder="订单编号"
-                                style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}
-                                value={this.state.searchOrderNo}
-                                onChange={e => {
-                                    this.setState({ searchOrderNo: e.target.value });
-                                }}
-                            />
-                            <Input
-                                placeholder="合同编号"
-                                style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}
-                                value={this.state.searchContractNo}
-                                onChange={e => {
-                                    this.setState({ searchContractNo: e.target.value });
-                                }}
-                            />
-                            <Input
-                                placeholder="用户名称"
-                                style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}
-                                value={this.state.searchEnterpriseName}
-                                onChange={e => {
-                                    this.setState({ searchEnterpriseName: e.target.value });
-                                }}
-                            />
                             <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.depId}
+                                    value={this.state.depId || undefined}
                                     onChange={e => {
                                         this.setState({ depId: e });
                                     }}
@@ -409,7 +418,7 @@ class HighTech extends Component{
                                 <Select
                                     placeholder="请选择部门"
                                     style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
-                                    value={this.state.thchDepId}
+                                    value={this.state.thchDepId || undefined}
                                     onChange={e => {
                                         this.setState({ thchDepId: e });
                                     }}
@@ -424,9 +433,9 @@ class HighTech extends Component{
                             <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>申报批次 :</span>
                                 <Select
-                                    value={this.state.declarationBatch}
+                                    value={this.state.declarationBatch || undefined}
                                     placeholder="请选择批次"
-                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
                                     onChange={(e) => {
                                         this.setState({
                                             declarationBatch: e,
@@ -442,9 +451,9 @@ class HighTech extends Component{
                             <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>项目金额 :</span>
                                 <Select
-                                    value={this.state.projectAmount}
+                                    value={this.state.projectAmount || undefined}
                                     placeholder="请选择项目金额"
-                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
                                     onChange={(e) => {
                                         this.setState({
                                             projectAmount: e,
@@ -463,6 +472,28 @@ class HighTech extends Component{
                                 </Select>
                             </span>
                             <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目情况 :</span>
+                                <Select
+                                    value={this.state.projectSituation || undefined}
+                                    placeholder="请选择项目情况"
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    onChange={(e) => {
+                                        this.setState({
+                                            projectSituation: e,
+                                        });
+                                    }}
+                                >
+                                    {/*0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单*/}
+                                    <Option value={0}>未开始</Option>
+                                    <Option value={1}>已开始</Option>
+                                    <Option value={2}>已暂停</Option>
+                                    <Option value={3}>已驳回</Option>
+                                    <Option value={4}>已完成</Option>
+                                    <Option value={5}>未完成退单</Option>
+                                    <Option value={6}>已完成退单</Option>
+                                </Select>
+                            </span>
+                            <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>派单时间 :</span>
                                 <RangePicker
                                     style={{marginRight:'10px',marginBottom:'10px'}}
@@ -505,7 +536,10 @@ class HighTech extends Component{
                         <Table
                             bordered
                             size="middle"
-                            scroll={{ x: this.state.status === 4 || this.state.status === 3 ? 2400 : 2000, y: 0 }}
+                            scroll={{
+                                x: this.state.status === 4 || this.state.status === 3 ? 1800 : 1000,
+                                y: 0
+                            }}
                             columns={
                                 this.state.changeList.length > 0
                                     ? this.state.changeList
@@ -513,9 +547,33 @@ class HighTech extends Component{
                             }
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
+                            onRowClick={(record)=>{
+                                this.setState({
+                                    projectdetailsId: record.id,
+                                    projectdetailsOrderNo: record.orderNo,
+                                    pname: record.pname,
+                                    visible: true,
+                                })
+                            }}
                         />
                     </Spin>
                 </div>
+                {this.state.visible ? <ProjectDetails
+                    visible={this.state.visible}
+                    id={this.state.projectdetailsId}
+                    orderNo={this.state.projectdetailsOrderNo}
+                    taskName={this.state.pname}
+                    visitOk={()=>{
+                        this.setState({
+                            visible: false,
+                        });
+                    }}
+                    visitCancel={()=>{
+                        this.setState({
+                            visible: false,
+                        });
+                    }}
+                /> : null}
             </div>
         )
     }

+ 37 - 32
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -103,7 +103,7 @@ const highTechColumns =[
         dataIndex: "commodityPrice",
         key: "commodityPrice"
     },
-    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+    //0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单
     {
         title: "项目状态",
         dataIndex: "projectStatus",
@@ -112,9 +112,10 @@ const highTechColumns =[
                 value === 0 ? '未开始' :
                     value === 1 ? '已开始' :
                         value === 2 ? '已暂停' :
-                            value === 3 ? '已完成' :
-                                value === 4 ? '已驳回' :
-                                    value === 5 ? '已退单' : ''
+                            value === 3 ? '已驳回' :
+                                value === 4 ? '已完成' :
+                                    value === 5 ? '未完成退单' :
+                                        value === 6 ? '已完成退单' :''
         )
     },
     {
@@ -206,18 +207,19 @@ const doubleSoft = [
         dataIndex: "commodityPrice",
         key: "commodityPrice"
     },
-    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+    //0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单
     {
         title: "项目状态",
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-                value === 0 ? '未开始' :
-                    value === 1 ? '已开始' :
-                        value === 2 ? '已暂停' :
-                            value === 3 ? '已完成' :
-                                value === 4 ? '已驳回' :
-                                    value === 5 ? '已退单' : ''
+            value === 0 ? '未开始' :
+                value === 1 ? '已开始' :
+                    value === 2 ? '已暂停' :
+                        value === 3 ? '已驳回' :
+                            value === 4 ? '已完成' :
+                                value === 5 ? '未完成退单' :
+                                    value === 6 ? '已完成退单' :''
         )
     },
     {
@@ -348,18 +350,19 @@ const softWriting = [
         dataIndex: "profit",
         key: "profit"
     },
-    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+    //0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单
     {
         title: "项目状态",
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-                value === 0 ? '未开始' :
-                    value === 1 ? '已开始' :
-                        value === 2 ? '已暂停' :
-                            value === 3 ? '已完成' :
-                                value === 4 ? '已驳回' :
-                                    value === 5 ? '已退单' : ''
+            value === 0 ? '未开始' :
+                value === 1 ? '已开始' :
+                    value === 2 ? '已暂停' :
+                        value === 3 ? '已驳回' :
+                            value === 4 ? '已完成' :
+                                value === 5 ? '未完成退单' :
+                                    value === 6 ? '已完成退单' :''
         )
     },
     {
@@ -502,18 +505,19 @@ const patent =[
         dataIndex: "profit",
         key: "profit"
     },
-    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+    //0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单
     {
         title: "项目状态",
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-                value === 0 ? '未开始' :
-                    value === 1 ? '已开始' :
-                        value === 2 ? '已暂停' :
-                            value === 3 ? '已完成' :
-                                value === 4 ? '已驳回' :
-                                    value === 5 ? '已退单' : ''
+            value === 0 ? '未开始' :
+                value === 1 ? '已开始' :
+                    value === 2 ? '已暂停' :
+                        value === 3 ? '已驳回' :
+                            value === 4 ? '已完成' :
+                                value === 5 ? '未完成退单' :
+                                    value === 6 ? '已完成退单' :''
         )
     },
     {
@@ -595,18 +599,19 @@ const currency = [
         dataIndex: "techName",
         key: "techName"
     },
-    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+    //0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单
     {
         title: "项目状态",
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-                    value === 0 ? '未开始' :
-                        value === 1 ? '已开始' :
-                            value === 2 ? '已暂停' :
-                                value === 3 ? '已完成' :
-                                    value === 4 ? '已驳回' :
-                                        value === 5 ? '已退单' : ''
+            value === 0 ? '未开始' :
+                value === 1 ? '已开始' :
+                    value === 2 ? '已暂停' :
+                        value === 3 ? '已驳回' :
+                            value === 4 ? '已完成' :
+                                value === 5 ? '未完成退单' :
+                                    value === 6 ? '已完成退单' :''
         )
     },
     {

+ 25 - 67
js/component/manageCenter/project/summary/projecCount.jsx

@@ -355,13 +355,31 @@ class ProjecCount extends Component{
                             marginLeft:'10px',
                             marginRight:'10px'
                         }}>
+                            <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
+                                <span>项目名称:</span>
+                                <AutoComplete
+                                    className="certain-category-search"
+                                    dropdownClassName="certain-category-search-dropdown"
+                                    dropdownMatchSelectWidth={false}
+                                    dropdownStyle={{ width: 200 }}
+                                    style={{ width: 100,marginLeft:'10px' }}
+                                    dataSource={options}
+                                    placeholder="输入服务名称"
+                                    value={this.state.commodityName}
+                                    onChange={this.httpChangeCui}
+                                    filterOption={true}
+                                    onSelect={this.selectAuto}
+                                >
+                                    <Input/>
+                                </AutoComplete>
+                            </span>
                             <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>项目类别 :</span>
                                 <Select
-                                    value={this.state.projectStatus}
+                                    value={this.state.projectStatus || undefined}
                                     placeholder="请选择项目类别"
                                     notFoundContent="未获取到上级品类列表"
-                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
                                     onChange={(e) => {
                                         let infor = this.state.contactsOptionData.filter((v)=>v.id === e);
                                         this.setState({
@@ -395,9 +413,9 @@ class ProjecCount extends Component{
                             <span style={{display:"inline-block"}}>
                                 <span style={{marginRight:'10px',marginBottom:'10px'}}>项目分类 :</span>
                                 <Select
-                                    value={this.state.projectType}
+                                    value={this.state.projectType || undefined}
                                     placeholder="请选择项目分类"
-                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
                                     onChange={(e) => {
                                         this.setState({
                                             columns:
@@ -425,53 +443,11 @@ class ProjecCount extends Component{
                                     <Option value={6}>商标</Option>
                                 </Select>
                             </span>
-                            {/*<Input*/}
-                            {/*    placeholder="订单编号"*/}
-                            {/*    style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}*/}
-                            {/*    value={this.state.searchOrderNo}*/}
-                            {/*    onChange={e => {*/}
-                            {/*        this.setState({ searchOrderNo: e.target.value });*/}
-                            {/*    }}*/}
-                            {/*/>*/}
-                            {/*<Input*/}
-                            {/*    placeholder="合同编号"*/}
-                            {/*    style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}*/}
-                            {/*    value={this.state.searchContractNo}*/}
-                            {/*    onChange={e => {*/}
-                            {/*        this.setState({ searchContractNo: e.target.value });*/}
-                            {/*    }}*/}
-                            {/*/>*/}
-                            {/*<Input*/}
-                            {/*    placeholder="企业名称"*/}
-                            {/*    style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}*/}
-                            {/*    value={this.state.searchEnterpriseName}*/}
-                            {/*    onChange={e => {*/}
-                            {/*        this.setState({ searchEnterpriseName: e.target.value });*/}
-                            {/*    }}*/}
-                            {/*/>*/}
-                            {/*<span style={{display:"inline-block"}}>*/}
-                            {/*    <span style={{marginRight:'10px',marginBottom:'10px'}}>时报批次 :</span>*/}
-                            {/*    <Select*/}
-                            {/*        value={this.state.declarationBatch}*/}
-                            {/*        placeholder="请选择批次"*/}
-                            {/*        style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}*/}
-                            {/*        onChange={(e) => {*/}
-                            {/*            this.setState({*/}
-                            {/*                declarationBatch: e,*/}
-                            {/*            });*/}
-                            {/*        }}*/}
-                            {/*    >*/}
-                            {/*        <Option value={1}>第一批</Option>*/}
-                            {/*        <Option value={2}>第二批</Option>*/}
-                            {/*        <Option value={3}>第三批</Option>*/}
-                            {/*        <Option value={4}>第四批</Option>*/}
-                            {/*    </Select>*/}
-                            {/*</span>*/}
                             <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
                                 <span>派单省份:</span>
                                 <Select
                                     placeholder="请选择省份"
-                                    style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
+                                    style={{ width: 100,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
                                     value={getNewDiccityArr(this.state.province)}
                                     onChange={e => {
                                         this.setState({ province: e });
@@ -485,29 +461,11 @@ class ProjecCount extends Component{
                                 </Select>
                             </span>
                             <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
-                                <span>项目名称:</span>
-                                <AutoComplete
-                                    className="certain-category-search"
-                                    dropdownClassName="certain-category-search-dropdown"
-                                    dropdownMatchSelectWidth={false}
-                                    dropdownStyle={{ width: 200 }}
-                                    style={{ width: '200px',marginLeft:'10px' }}
-                                    dataSource={options}
-                                    placeholder="输入服务名称"
-                                    value={this.state.commodityName}
-                                    onChange={this.httpChangeCui}
-                                    filterOption={true}
-                                    onSelect={this.selectAuto}
-                                >
-                                    <Input/>
-                                </AutoComplete>
-                            </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.depId}
+                                    value={this.state.depId || undefined}
                                     onChange={e => {
                                         this.setState({ depId: e });
                                     }}
@@ -570,7 +528,7 @@ class ProjecCount extends Component{
                         <Table
                             bordered
                             size="middle"
-                            scroll={{ x: 1200, y: 0 }}
+                            scroll={{ x: 800, y: 0 }}
                             columns={
                                 this.state.changeList.length > 0
                                     ? this.state.changeList

+ 43 - 33
js/component/manageCenter/project/summary/projecCountConfig.jsx

@@ -21,24 +21,34 @@ const highTechColumns = [
         key: "projectStatus",
     },
     {
-        title: "库存数(个)",
-        dataIndex: "stockCount",
-        key: "stockCount",
-    },
-    {
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
     },
     {
+        title: "库存数(个)",
+        dataIndex: "stockCount",
+        key: "stockCount",
+    },
+    {
         title: "完成数",
         dataIndex: "completeCount",
         key: "completeCount",
     },
     {
-        title: "驳回数",
-        dataIndex: "rejectCount",
-        key: "rejectCount",
+        title: "立项数",
+        dataIndex: "setUpCount",
+        key: "setUpCount",
+    },
+    {
+        title: "抽查数",
+        dataIndex: "spotCheckCount",
+        key: "spotCheckCount",
+    },
+    {
+        title: "未通过数",
+        dataIndex: "failedCount",
+        key: "failedCount",
     },
     {
         title: "签单额(万元)",
@@ -85,16 +95,16 @@ const invention = [
         key: "projectStatus",
     },
     {
-        title: "库存数(个)",
-        dataIndex: "stockCount",
-        key: "stockCount",
-    },
-    {
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
     },
     {
+        title: "库存数(个)",
+        dataIndex: "stockCount",
+        key: "stockCount",
+    },
+    {
         title: "受理数(个)",
         dataIndex: "acceptCount",
         key: "acceptCount",
@@ -154,16 +164,16 @@ const utilityModel = [
         key: "projectStatus",
     },
     {
-        title: "库存数(个)",
-        dataIndex: "stockCount",
-        key: "stockCount",
-    },
-    {
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
     },
     {
+        title: "库存数(个)",
+        dataIndex: "stockCount",
+        key: "stockCount",
+    },
+    {
         title: "受理数(个)",
         dataIndex: "acceptCount",
         key: "acceptCount",
@@ -223,16 +233,16 @@ const softWriting = [
         key: "projectStatus",
     },
     {
-        title: "库存数(个)",
-        dataIndex: "stockCount",
-        key: "stockCount",
-    },
-    {
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
     },
     {
+        title: "库存数(个)",
+        dataIndex: "stockCount",
+        key: "stockCount",
+    },
+    {
         title: "下证数(个)",
         dataIndex: "certificatesCount",
         key: "certificatesCount",
@@ -277,16 +287,16 @@ const otherTrademarks = [
         key: "projectStatus",
     },
     {
-        title: "库存数(个)",
-        dataIndex: "stockCount",
-        key: "stockCount",
-    },
-    {
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
     },
     {
+        title: "库存数(个)",
+        dataIndex: "stockCount",
+        key: "stockCount",
+    },
+    {
         title: "申请数(个)",
         dataIndex: "applyCount",
         key: "applyCount",
@@ -341,16 +351,16 @@ const currency = [
         key: "projectStatus",
     },
     {
-        title: "库存数(个)",
-        dataIndex: "stockCount",
-        key: "stockCount",
-    },
-    {
         title: "派单数(个)",
         dataIndex: "distributeCount",
         key: "distributeCount",
     },
     {
+        title: "库存数(个)",
+        dataIndex: "stockCount",
+        key: "stockCount",
+    },
+    {
         title: "完成数",
         dataIndex: "completeCount",
         key: "completeCount",

File diff suppressed because it is too large
+ 1450 - 0
js/component/manageCenter/project/summary/projectDetails.jsx


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

@@ -665,7 +665,8 @@ const Task = React.createClass({
   },
   //用于判断 第三方信息表格显示
   projectTypeTabContent(projectType) {
-    if(projectType === 0 || !projectType || this.state.startType === 0){       //0正常 1专利 2软著 3审计      this.state.startType 0外包 1供应商     外包时当普通单处理
+    //0正常 1专利 2软著 3审计      this.state.startType 0外包 1供应商     外包时当普通单处理    projectType大于3的都用通用表格
+    if(projectType === 0 || !projectType || this.state.startType === 0 || projectType > 3){
       this.setState({
         ContactsListsNew: [
           {
@@ -6711,7 +6712,7 @@ const Task = React.createClass({
                   保存
                 </Button>
               </div>
-              <div style={{textAlign:'center'}}>注:请根据实际项目情况填写</div>
+              <div style={{textAlign:'center',color:'#f00'}}>注:请根据实际项目情况填写</div>
             </div>
           </div>
         </Modal> : null}

+ 3 - 2
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -2094,7 +2094,8 @@ const MyTaskOutsource = React.createClass({
   },
   //用于判断 第三方信息表格显示
   projectTypeTabContent(projectType) {
-    if(projectType === 0 || !projectType || this.state.startType === 0){       //0正常 1专利 2软著 3审计      this.state.startType 0外包 1供应商     外包时当普通单处理
+    //0正常 1专利 2软著 3审计      this.props.startType 0外包 1供应商     外包时当普通单处理   projectType大于3的都用通用表格
+    if(projectType === 0 || !projectType || this.props.startType === 0  || projectType > 3){
       this.setState({
         ContactsListsNew: [
           {
@@ -5691,7 +5692,7 @@ const MyTaskOutsource = React.createClass({
                   保存
                 </Button>
               </div>
-              <div style={{textAlign:'center'}}>注:请根据实际项目情况填写</div>
+              <div style={{textAlign:'center',color:'#f00'}}>注:请根据实际项目情况填写</div>
             </div>
           </div>
         </Modal> : null}

+ 3 - 0
js/component/manageCenter/set/business/businessProject.jsx

@@ -1305,6 +1305,9 @@ const BusinessProject=Form.create()(React.createClass({
                         <Select.Option value="1">专利</Select.Option>
                         <Select.Option value="2">软著</Select.Option>
                         <Select.Option value="3">审计</Select.Option>
+                        <Select.Option value="4">双软</Select.Option>
+                        <Select.Option value="5">高新</Select.Option>
+                        <Select.Option value="6">商标</Select.Option>
                       </Select>
                     </div>
                   </div>