Merge pull request 'fix : 修复页面细节' (#202) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/202

src/views/project-demand/summary/index.vue

@@ -49,7 +49,7 @@ const searchConfig = reactive([
   },
   {
     label: '起止时间',
-    prop: 'time',
+    prop: 'startTime',
     component: 'el-date-picker',
     props: {},
     colProps: {}
@@ -80,22 +80,22 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'companyINames',
+      prop: 'undertaker',
-      label: '所属公司',
+      label: '承办单位',
       align: 'center'
     },
     {
-      prop: 'collectType',
+      prop: 'projectType',
       label: '项目类型',
       align: 'center'
     },
     {
-      prop: 'productMainBody',
+      prop: 'rdSubject',
       label: '研发主体',
       align: 'center'
     },
     {
-      prop: 'projectEffect',
+      prop: 'projectImpact',
       label: '项目影响',
       align: 'center'
     },
@@ -105,24 +105,27 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'deadline',
+      prop: 'startTime',
       label: '起止时间',
       align: 'center'
     },
     {
-      prop: 'status',
+      prop: 'state',
-      label: '发布状态',
+      label: '状态',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => (<Tag dictType={'demand_collection'} value={row.state}/>)
     },
     {
       prop: 'oper',
       label: '操作',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         return (
           <div>
             <el-button type={'primary'} link onClick={()=>{}} >详情</el-button>
-            <el-button type={'primary'} link onClick={()=>{}} >上报</el-button>
+            <el-button type={'primary'} link onClick={()=>handleAdd()} >上报</el-button>
           </div>
         )
       }
@@ -131,7 +134,7 @@ const tableConfig = reactive({
   api: '/workflow/mosr/requirement/collect',
   params: {},
   btns: [
-    {name: '新增上报', key: 'add', type: 'primary', auth: ''},
+    // {name: '新增上报', key: 'add', type: 'primary', auth: ''},
     {name: '年度计划导出', key: '_export', type: 'primary', auth: ''},
     {name: '经费预算生成', key: 'preMonty', type: 'primary', auth: ''},
   ]