Merge remote-tracking branch 'origin/master'

src/api/program/ProgramProjectListInfoService.js

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

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

@@ -98,6 +98,26 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+
+
+            <el-col :span="12">
+              <el-form-item label="签字评估师1" prop="signatureEvaluatorFirst"
+                            :rules=" [
+                        {required: true, message:'签字评估师1不能为空', trigger:'blur'}
+                        ]" >
+                <UserSelect size="medium" :disabled="formReadOnly" :readonly="true" :limit='1' :value="inputForm.signatureEvaluatorFirst" @getValue='(value) => {inputForm.signatureEvaluatorFirst = value}'></UserSelect>
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="12">
+              <el-form-item label="签字评估师2" prop="signatureEvaluatorSecond"
+                            :rules=" [
+                        {required: true, message:'签字评估师2不能为空', trigger:'blur'}
+                        ]" >
+                <UserSelect size="medium" :disabled="formReadOnly" :readonly="true" :limit='1' :value="inputForm.signatureEvaluatorSecond" @getValue='(value) => {inputForm.signatureEvaluatorSecond = value}'></UserSelect>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="协议号" prop="protocolNum"
                             :rules="[
@@ -369,7 +389,8 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+
+            <!--<el-col :span="12">
               <el-form-item label="签字评估师1" prop="signatureEvaluatorFirst"
               >
                 <SelectUserTree
@@ -406,7 +427,7 @@
                   :accordion="true"
                   @getValue="(value) => {inputForm.signatureEvaluatorSecond=value}"/>
               </el-form-item>
-            </el-col>
+            </el-col>-->
           </el-row>
           <!--附件信息 - 评估报告-->
           <UpLoadComponent ref="uploadComponentReport"></UpLoadComponent>

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

@@ -152,6 +152,7 @@
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && commonJS.isEmpty(scope.row.reportNo) && scope.row.createBy === createName" type="text" size="small" @click="saveReportNo(scope.row.id)">生成报告号</el-button>
 
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)&&(scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3'||scope.row.status1 === '4')" type="text" size="small" @click="firstAuditPush(scope.row)">一级校审</el-button>
+              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)&&(scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3'||scope.row.status1 === '4')" type="text" size="small" @click="firstAuditPush(scope.row)">一级校审</el-button>
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status1 === '2' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)" type="text" size="small" @click="firstAuditReback(scope.row)">校审撤回</el-button>
 
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === createName&&scope.row.status1 === '5'&&(scope.row.status2 === '0'||scope.row.status2 === '1'||scope.row.status2 === '3'||scope.row.status2 === '4')" type="text" size="small" @click="secondAuditPush(scope.row)">二级校审</el-button>
@@ -912,7 +913,10 @@
       // 下载文档
       exportFile () {
         this.loading = true
-        this.programProjectListInfoService.exportFile().then((res) => {
+        this.programProjectListInfoService.exportFile({
+          'itemType': '1',
+          ...this.searchForm
+        }).then((res) => {
           // 将二进制流文件写入excel表，以下为重要步骤
           this.$utils.downloadExcel(res.data, '项目登记列表信息')
           this.loading = false

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

@@ -76,7 +76,7 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="改正情况（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="replyComments" title="改正情况（√/×）" :edit-render="{name: '$select', options: yesOrNo}">
               <template v-slot:edit="scope">
                 <vxe-select v-model="scope.row.replyComments" transfer>
                   <vxe-option
@@ -396,3 +396,12 @@
     text-align: left;
   }
 </style>
+
+<style>
+  .vxe-select--panel {
+    z-index: 9997 !important
+  }
+  .vxe-input--panel.type--date, .vxe-input--panel.type--month, .vxe-input--panel.type--week, .vxe-input--panel.type--year {
+    z-index: 9998 !important
+  }
+</style>