333323

src/views/evaluation/components/score.vue

@@ -11,9 +11,8 @@
           <div v-show="tabsActive==='1'" style="height:100%;">
             <div style="height:calc(100% - 40px);overflow: auto;">
               <a-form-model ref="form" :model="formData" :rules="rules" class="from-table font-line-space">
-                <technology-evalucation v-if="totalFunding >= 50" v-model="formData"></technology-evalucation>
-                <economy v-if="totalFunding < 50" v-model="formData" />
-
+                <economy  v-model="formData" v-if="false"/>
+                <technology-evalucation v-if="totalFunding >= 50" v-model="formData"></technology-evalucation>                
                 <div v-else>
                   <a-row type="flex">
                     <a-col :span="4" class="bg-gray">
@@ -191,6 +190,10 @@ export default {
         remark: [{ required: true, message: '请填写评审意见', trigger: 'blur' },],
         supportState: { required: true, message: "请选择是否支持立项", trigger: "blur" },
         evaluationType: { required: true, message: "*", trigger: "blur" },
+        score18: { required: true, message: "*", trigger: "blur" },
+        score19: { required: true, message: "*", trigger: "blur" },
+        additionalScore: { required: true, message: "*", trigger: "blur" },
+        recommendFunding: { required: true, message: "*", trigger: "blur" },
       },
       projectInfo: {
         projName: '',
@@ -287,6 +290,10 @@ export default {
             if (this.projectInfo.fileList[i].fileExplain.indexOf("项目申报简要信息首页") == -1 && this.projectInfo.fileList[i].fileExplain.indexOf("项目组成员签字") == -1)
               fileArr.push(this.projectInfo.fileList[i])
           }
+          this.formData.projName = data.projName
+          this.formData.appUnitName = data.appUnitName
+          this.formData.appPersonName = data.appPersonName
+          this.formData.applyFunding = data.govFunding
           this.projectInfo.fileList = fileArr
           this.isProjectInfoLoad = true
           this.loading = false

src/views/query/project/Index.vue

@@ -21,7 +21,6 @@
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <div class="submit-btn">
       <a-button type="primary" @click="exportData" icon="download">Excel</a-button>
-      <!-- <a-button type="primary" @click="scoreClick" icon="download">评分</a-button> -->
     </div>
     <a-table :dataSource="tableData" :columns="columns" :scroll="{ x: 'max-content' }" rowKey="id" :pagination="false" :loading="loading">
       <template slot="projName" slot-scope="record">
@@ -40,9 +39,6 @@
     <a-modal v-model="visibleView" v-if="visibleView" title="项目详情" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
       <project-view v-model="id" @close="closeWindow"></project-view>
     </a-modal>
-    <a-modal v-model="visibleScore" v-if="visibleScore" title="评分" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
-      <score-edit />
-    </a-modal>
   </div>
 </template>
 
@@ -51,11 +47,10 @@ import { getType } from '@/views/utils/auth'
 import moment from 'moment'
 import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
 import projectView from '@/views/report/project/components/projectView'
-import scoreEdit from '@/views/evaluation/components/economy'
 export default {
   name: 'queryProject',
   components: {
-    projectView, scoreEdit
+    projectView
   },
   data () {
     return {
@@ -79,7 +74,6 @@ export default {
       loading: false,
       // 弹窗标志
       visibleView: false,
-      visibleScore: false,
       id: null,
       loadState: false
     }
@@ -87,9 +81,6 @@ export default {
   created () {
   },
   methods: {
-    scoreClick () {
-      this.visibleScore = true
-    },
     search () {
       this.pagination.pageIndex = 1
       this.getListByPage()