Merge remote-tracking branch 'origin/master'

src/api/program/ProgramProjectListInfoService.js

@@ -8,11 +8,10 @@ export default class ProgramProjectListInfoService {
       params: params
     })
   }
-  exportFile (params) {
+  exportFile () {
     return request({
       url: '/program/projectList/exportFile',
       method: 'get',
-      params: params,
       responseType: 'blob'
     })
   }

src/views/modules/program/registered/ProjectList.vue

@@ -909,10 +909,7 @@
       // 下载文档
       exportFile () {
         this.loading = true
-        this.programProjectListInfoService.exportFile({
-          'itemType': '1',
-          ...this.searchForm
-        }).then((res) => {
+        this.programProjectListInfoService.exportFile().then((res) => {
           // 将二进制流文件写入excel表，以下为重要步骤
           this.$utils.downloadExcel(res.data, '项目登记列表信息')
           this.loading = false

src/views/modules/program/registered/ProjectThreeAuditForm.vue

@@ -104,14 +104,14 @@
                 <el-form-item label="执行人员保留意见" prop="retainOpinion"
                               :rules="[
                  ]">
-                  <el-input type="textarea" maxlength="500" v-model="inputForm.retainOpinion" placeholder="请填写执行人员保留意见"     ></el-input>
+                  <el-input type="textarea" :rows="5" maxlength="500" v-model="inputForm.retainOpinion" placeholder="请填写执行人员保留意见"     ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="审核人员审核未修改意见" prop="changeOpinion"
                               :rules="[
                  ]">
-                  <el-input type="textarea" maxlength="500" v-model="inputForm.changeOpinion" placeholder="请填写审核人员审核未修改意见"     ></el-input>
+                  <el-input type="textarea" :rows="5"  maxlength="500" v-model="inputForm.changeOpinion" placeholder="请填写审核人员审核未修改意见"     ></el-input>
                 </el-form-item>
               </el-col>
             </el-form>