Merge pull request 'master' (#541) from master into prod

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

src/components/DetailComponent/SummaryDetail.vue

@@ -83,37 +83,37 @@
         <el-col :span="24">
           <baseTitle title="预期知识产权"></baseTitle>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="发明专利(项)" prop="inventionPatent">
             <span>{{ localFormData.inventionPatent }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="实用性新型专利(项)" prop="newPatent">
             <span>{{ localFormData.newPatent }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="软件著作权(项)" prop="softwareCopyright">
             <span>{{ localFormData.softwareCopyright }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="著作权(项)" prop="copyright">
             <span>{{ localFormData.copyright }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="其他(项)" prop="other">
             <span>{{ localFormData.other }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="经济预算(元)" prop="economicEstimate">
             <span>{{ toThousands(localFormData.economicEstimate) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount"
                         v-if="localFormData.isSpecialFund">
             <span>{{ toThousands(localFormData.specialFundAmount) }}</span>

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

@@ -79,8 +79,8 @@ const tableConfig = reactive({
       prop: 'companyName',
       label: '征集公司',
       align: 'center',
-      currentRender: ({row, index}) => (
-          <div style={{width: '300px', textOverflow: 'ellipsis'}}>{row.companyName}</div>)
+      // currentRender: ({row, index}) => (
+          // <div style={{width: '300px', textOverflow: 'ellipsis',textAlign:'center'}}>{row.companyName}</div>)
     },
     {
       prop: 'approveName',