Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/assign/components/projectAssignDetail.vue

@@ -19,14 +19,14 @@
         <a-button icon="reload" style="margin-left: 10px" @click="reset" class="bt-normal">重置</a-button>
       </a-form-item>
       <a-form-item>
-        <a-tag :color="'#2db7f5'">{{ '技术专家' }}</a-tag>&nbsp;<a-tag :color="'#f50'">{{ '财务专家' }}</a-tag>
+        <a-tag :color="'#2db7f5'">{{ '技术专家' }}</a-tag>&nbsp;<a-tag :color="'#87d068'">{{ '财务专家' }}</a-tag>
       </a-form-item>
     </a-form>
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <a-table :dataSource="tableData" :columns="columns" rowKey="id" :pagination="false" :loading="loading">
       <template slot="personName" slot-scope="record">
         <a-tag :color="'#2db7f5'" v-if="record.expertType==1">{{record.personName}}</a-tag>
-        <a-tag :color="'#f50'" v-if="record.expertType==2">{{record.personName}}</a-tag>
+        <a-tag :color="'#87d068'" v-if="record.expertType==2">{{record.personName}}</a-tag>
       </template>
       <template slot="spec" slot-scope="record">
         <span v-for="data in record.specList" :key="data.id" :color="'green'">{{data.specName+' '}}</span>

src/views/audit/project/final.vue

@@ -31,13 +31,14 @@
         <btn-group :data="tabDate" :itemCount="itemCount" v-model="activekey" @change="callback" />
       </div>
       <div style="display: inline-block;width:50%;text-align: right;">
-        <a-tag :color="'#2db7f5'">{{ '技术专家' }}</a-tag>&nbsp;<a-tag :color="'#f50'">{{ '财务专家' }}</a-tag>
+        <a-tag :color="'#2db7f5'">{{ '技术专家' }}</a-tag>&nbsp;<a-tag :color="'#87d068'">{{ '财务专家' }}</a-tag>
+        <a-button type="primary" @click="batchAudit" style="margin-right: 8px;" v-if="isBatchButten">批量审核</a-button>
         <a-button type="primary" @click="exportData" icon="download">Excel</a-button>
       </div>
     </div>
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <span style="margin:6px;display: block;color:red;">评分为 总分/平均分，最终得分=技术专家平均分X80% + 财务专家X20%</span>
-    <a-table :dataSource="tableData" :columns="columns" rowKey="id" :scroll="{ x: 'max-content' }" :pagination="false" :loading="loading">
+    <a-table :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :dataSource="tableData" :columns="columns" rowKey="id" :scroll="{ x: 'max-content' }" :pagination="false" :loading="loading">
       <template slot="projName" slot-scope="record">
         <a @click="recordClick(record, 'view')">{{record.projName}}</a>
       </template>
@@ -55,7 +56,7 @@
         <a-table :dataSource="record.assignList" :columns="innerColumns" rowKey="id" :pagination="false">
           <template slot="personName" slot-scope="obj">
             <a-tag :color="'#2db7f5'" v-if="obj.expertType==1">{{obj.personName}}</a-tag>
-            <a-tag :color="'#f50'" v-if="obj.expertType==2">{{obj.personName}}</a-tag>
+            <a-tag :color="'#87d068'" v-if="obj.expertType==2">{{obj.personName}}</a-tag>
           </template>
           <template slot="evaluationType" slot-scope="obj">
             <a-tag :color="'#87d068'" v-if="obj.evaluationType==1">A类(通过)</a-tag>
@@ -84,6 +85,9 @@
     <a-modal v-model="visibleEvaluationView" title="专家评分" width="90%" :dialog-style="{ top: '8%' }" :footer="null" destroyOnClose>
       <score-view v-model="assignId" @close="() => this.visibleEvaluationView = false" />
     </a-modal>
+    <a-modal v-model="visibleBatch" v-if="visibleBatch" title="批量审核" :footer="null" width="700px" :dialog-style="{ top: '15%' }" destroyOnClose :maskClosable="false">
+      <batch-audit :idList="selectedRowKeys" @close="closeWindow" />
+    </a-modal>
   </div>
 </template>
 
@@ -94,6 +98,7 @@ import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/
 import projectAssignDetail from '@/views/assign/components/projectAssignDetail'
 import paraSelect from '@/views/components/common/paraSelect'
 import audit from '@/views/audit/project/audit'
+import batchAudit from '@/views/audit/project/batchAudit'
 import projectView from '@/views/report/project/components/projectView'
 import unitTreeSelect from '@/views/components/common/unitTreeSelect'
 import taskFileInfo from '@/views/report/task/components/taskFileInfo'
@@ -102,10 +107,11 @@ import scoreView from '@/views/evaluation/components/scoreView'
 export default {
   name: "projectFinal",
   components: {
-    projectView, paraSelect, audit, unitTreeSelect, projectAssignDetail, taskFileInfo, scoreView
+    projectView, paraSelect, audit, unitTreeSelect, projectAssignDetail, taskFileInfo, scoreView, batchAudit
   },
   data () {
     return {
+      selectedRowKeys: [],
       // 选项卡
       panes: { count1: 0, count2: 0, count3: 0, count4: 0, count5: 0, },
       form: this.$form.createForm(this, { name: 'advanced_search' }),
@@ -184,6 +190,8 @@ export default {
       visibleAudit: false,
       visibleView: false,
       visibleEvaluationView: false,
+      visibleBatch: false,
+      isBatchButten: true,
       isButten: false,
       description: '',
       id: null,
@@ -197,6 +205,17 @@ export default {
     this.getYear()
   },
   methods: {
+    onSelectChange (selectedRowKeys) {
+      this.selectedRowKeys = selectedRowKeys;
+    },
+    batchAudit () {
+      if (!!this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        this.visibleBatch = true
+      }
+      else
+        this.$message.error('请选择项目！')
+
+    },
     search () {
       this.pagination.pageIndex = 1
       this.getListByPage();
@@ -273,12 +292,19 @@ export default {
     closeWindow (value) {
       if (value === 'audit') {
         this.getListByPage()
+        this.id = null
+        this.objectId = null
+        this.selectedRowKeys = []
+        this.visibleView = false
         this.visibleAudit = false
+        this.visibleBatch = false
       } else if (value === 'error') {
         this.id = null
         this.objectId = null
-        this.visibleAudit = false
+        this.selectedRowKeys = []
         this.visibleView = false
+        this.visibleAudit = false
+        this.visibleBatch = false
       }
     },
     recordClick (record, type) {
@@ -301,6 +327,10 @@ export default {
       }
     },
     callback (key) {
+      if (key == '1') {
+        this.isBatchButten = true
+      } else
+        this.isBatchButten = false
       this.searchForm.auditResult = key;
       this.getListByPage()
     },

src/views/evaluation/components/economyInfo.vue

@@ -76,13 +76,9 @@
       <tr>
         <td colspan="4" class="bg-title" style="text-align: right;">评审结果</td>
         <td colspan="4">
-          <a-form-model-item prop="evaluationType">
-            <a-radio-group v-model="value.evaluationType" disabled>
-              <a-radio :value="1">A类(通过)</a-radio>
-              <a-radio :value="2">B类(建议修改)</a-radio>
-              <a-radio :value="3">C类(不通过)</a-radio>
-            </a-radio-group>
-          </a-form-model-item>
+          <a-tag :color="'#87d068'" v-if="value.evaluationType==1">A类(通过)</a-tag>
+          <a-tag :color="'#2db7f5'" v-if="value.evaluationType==2">B类(建议修改)</a-tag>
+          <a-tag :color="'#f50'" v-if="value.evaluationType==3">C类(不通过)</a-tag>
         </td>
       </tr>
     </table>

src/views/evaluation/components/scoreView.vue

@@ -2,17 +2,51 @@
   <div style="height:70vh;overflow:auto" class="app-content from-table font-line-space">
     <a-spin :spinning="loading" style="width: 100%;height: 100%;">
       <economy-info v-model="formData" v-if="formData.expertType == 2" />
+      <div v-else>
+        <technology-info v-if="formData.applyFunding >= 50" v-model="formData" />
+        <div v-else>
+          <a-row type="flex">
+            <a-col :span="4" class="bg-gray">
+              <div class="special-middle">
+                <div>意见与建议</div>
+              </div>
+            </a-col>
+            <a-col :span="20">
+              <div class="special-middle">
+                <div v-html="toTextarea(formData.remark)"></div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row type="flex">
+            <a-col :span="4" class="bg-gray">
+              <div class="special-middle">
+                <div>评审结果</div>
+              </div>
+            </a-col>
+            <a-col :span="20">
+              <div class="special-middle">
+                <div>
+                  <a-tag :color="'#87d068'" v-if="formData.evaluationType==1">A类(通过)</a-tag>
+                  <a-tag :color="'#2db7f5'" v-if="formData.evaluationType==2">B类(建议修改)</a-tag>
+                  <a-tag :color="'#f50'" v-if="formData.evaluationType==3">C类(不通过)</a-tag>
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
+      </div>
     </a-spin>
   </div>
 </template>
 
 <script>
 import economyInfo from '@/views/evaluation/components/economyInfo'
+import technologyInfo from '@/views/evaluation/components/technologyInfo'
 import { toTextarea } from '@/views/utils/common'
 export default {
   name: "scoreView",
   components: {
-    economyInfo
+    economyInfo, technologyInfo
   },
   props: {
     value: {