Browse Source

完善项目汇总

HW 4 years ago
parent
commit
454802ec55

+ 1 - 1
js/component/manageCenter/project/summary/highTech.jsx

@@ -505,7 +505,7 @@ class HighTech extends Component{
                         <Table
                             bordered
                             size="middle"
-                            scroll={{ x: 2000, y: 0 }}
+                            scroll={{ x: this.state.status === 4 || this.state.status === 3 ? 2400 : 2000, y: 0 }}
                             columns={
                                 this.state.changeList.length > 0
                                     ? this.state.changeList

+ 58 - 6
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -1,3 +1,5 @@
+import { Tooltip } from 'antd';
+import React from 'react';
 // 高新
 const highTechColumns =[
     {
@@ -118,7 +120,17 @@ const highTechColumns =[
     {
         title: "特别说明",
         dataIndex: "specialComment",
-        key: "specialComment"
+        key: "specialComment",
+        render: (v) => (
+            <Tooltip placement="topRight" title={v}>
+                <div style={{
+                    maxWidth: '120px',
+                    overflow: "hidden",
+                    textOverflow: "ellipsis",
+                    whiteSpace: "nowrap",
+                }}>{v}</div>
+            </Tooltip>
+        )
     },
 ];
 
@@ -211,7 +223,17 @@ const doubleSoft = [
     {
         title: "特别说明",
         dataIndex: "specialComment",
-        key: "specialComment"
+        key: "specialComment",
+        render: (v) => (
+            <Tooltip placement="topRight" title={v}>
+                <div style={{
+                    maxWidth: '120px',
+                    overflow: "hidden",
+                    textOverflow: "ellipsis",
+                    whiteSpace: "nowrap",
+                }}>{v}</div>
+            </Tooltip>
+        )
     },
 ];
 
@@ -343,7 +365,17 @@ const softWriting = [
     {
         title: "特别说明",
         dataIndex: "specialComment",
-        key: "specialComment"
+        key: "specialComment",
+        render: (v) => (
+            <Tooltip placement="topRight" title={v}>
+                <div style={{
+                    maxWidth: '120px',
+                    overflow: "hidden",
+                    textOverflow: "ellipsis",
+                    whiteSpace: "nowrap",
+                }}>{v}</div>
+            </Tooltip>
+        )
     },
 ];
 
@@ -487,8 +519,18 @@ const patent =[
     {
         title: "特别说明",
         dataIndex: "specialComment",
-        key: "specialComment"
-    },
+        key: "specialComment",
+        render: (v) => (
+            <Tooltip placement="topRight" title={v}>
+                <div style={{
+                    maxWidth: '120px',
+                    overflow: "hidden",
+                    textOverflow: "ellipsis",
+                    whiteSpace: "nowrap",
+                }}>{v}</div>
+            </Tooltip>
+        )
+    }
 ];
 
 // 通用表
@@ -575,7 +617,17 @@ const currency = [
     {
         title: "特别说明",
         dataIndex: "specialComment",
-        key: "specialComment"
+        key: "specialComment",
+        render: (v) => (
+            <Tooltip placement="topRight" title={v}>
+                <div style={{
+                    maxWidth: '120px',
+                    overflow: "hidden",
+                    textOverflow: "ellipsis",
+                    whiteSpace: "nowrap",
+                }}>{v}</div>
+            </Tooltip>
+        )
     },
 ];
 

+ 2 - 2
js/component/manageCenter/project/summary/projecCount.jsx

@@ -337,7 +337,7 @@ class ProjecCount extends Component{
             <div className="user-content">
                 <div className="content-title">
                     <span>
-                        数据统计
+                        项目统计
                         (
                             {
                                 this.state.status === 2 ? '专利' :
@@ -570,7 +570,7 @@ class ProjecCount extends Component{
                         <Table
                             bordered
                             size="middle"
-                            scroll={{ x: 2000, y: 0 }}
+                            scroll={{ x: 1200, y: 0 }}
                             columns={
                                 this.state.changeList.length > 0
                                     ? this.state.changeList

+ 0 - 1
js/component/manageCenter/project/task/myTask.jsx

@@ -56,7 +56,6 @@ const FormItem = Form.Item
 const { TabPane } = Tabs
 const { TextArea } = Input
 const { Option } = Select
-const { MonthPicker, RangePicker } = DatePicker
 const PicturesWall = React.createClass({
   getInitialState() {
     return {

+ 1 - 0
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -3896,6 +3896,7 @@ const MyTaskOutsource = React.createClass({
                                   authorizeCount={this.state.authorizeCount}
                                   rejectCount={this.state.rejectCount}
                                   commodityQuantity={this.state.commodityQuantity}
+                                  refresh={()=>{this.xiangqing(this.state.id)}}
                               />
                             </div> :
                             <div>

+ 1 - 1
js/component/manageCenter/project/task/patentSchedule.jsx

@@ -315,7 +315,7 @@ class PatentSchedule extends Component{
         data.alreadyNumber = 1;
         data.type = this.props.bpType === 1 ? 1 : this.props.bpType === 6 ? 2 : '';//0软著 1专利 2商标
         for(let i in data){
-            if(!data[i]){
+            if(typeof data[i] === 'object'){
                 delete data[i]
             }
         }