3333

src/api/index.js

@@ -703,7 +703,7 @@ export default {
             return fetch(`/v1/science-admin/com_project_audit/getCount`, params)
         },
         getTalentAuditCount (params) {
-            return fetch(`/v1/science-admin/com_project_audit/getCount`, params)
+            return fetch(`/v1/science-admin/com_project_audit/getTalentAuditCount`, params)
         },
         getConclusionAuditCount (params) {
             return fetch(`/v1/science-admin/com_project_audit/getConclusionAuditCount`, params)

src/store/modules/app.js

@@ -182,7 +182,7 @@ const actions = {
 const defaultTabsList = [
     { title: '个人设置', key: '1005', code: 'personInfo', keepAlive: 1, router: '/person/info', closable: true },
     { title: '项目创建', key: '1299', code: 'projectCreate', keepAlive: 1, router: '/project/create', closable: true },
-    { title: '首页', key: '0', code: 'home', keepAlive: 1, router: '/home', closable: false },
+    { title: '首页', key: '0', code: 'home', keepAlive: 0, router: '/home', closable: false },
     { title: '404', key: '404', code: '404', keepAlive: 1, router: '/404', closable: true },
     { title: '403', key: '403', code: '403', keepAlive: 1, router: '/403', closable: true }
 ]

src/views/audit/talent/Index.vue

 <template>
   <div class="app-content">
     <a-form :form="form" :model="searchForm" layout="inline" class="search_form">
+      <a-form-item>
+        <a-input placeholder="申报单位" v-model="searchForm.appUnitName" :maxLength="100" style="width: 150px" />
+      </a-form-item>
+      <a-form-item>
+        <a-input placeholder="申报人" v-model="searchForm.appPersonName" :maxLength="50" style="width: 150px" />
+      </a-form-item>
       <a-form-item>
         <a-input placeholder="身份证号" v-model="searchForm.certId" :maxLength="100" style="width: 180px" />
       </a-form-item>

src/views/audit/talent/final.vue

 <template>
   <div class="app-content">
     <a-form :form="form" :model="searchForm" layout="inline" class="search_form">
+      <a-form-item>
+        <a-input placeholder="申报单位" v-model="searchForm.appUnitName" :maxLength="100" style="width: 150px" />
+      </a-form-item>
+      <a-form-item>
+        <a-input placeholder="申报人" v-model="searchForm.appPersonName" :maxLength="50" style="width: 150px" />
+      </a-form-item>
       <a-form-item>
         <a-input placeholder="身份证号" v-model="searchForm.certId" :maxLength="100" style="width: 180px" />
       </a-form-item>
       <a-form-item>
         <a-input placeholder="姓名" v-model="searchForm.personName" :maxLength="100" style="width: 180px" />
       </a-form-item>
+      <a-form-item label="评分刷选">
+        <a-input-number v-model="searchForm.scoreStart" :min="0" :step="0.01" style="width: 60px" />
+        ~
+        <a-input-number v-model="searchForm.scoreEnd" :min="0" :step="0.01" style="width: 60px" />
+      </a-form-item>
       <a-form-item>
         <a-button type="primary" icon="search" @click="search">搜索</a-button>
         <a-button icon="reload" style="margin-left: 10px" @click="reset" class="bt-normal">重置</a-button>
@@ -22,6 +33,7 @@
       </div>
     </div>
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
+    <span style="margin:6px;display: block;color:red;">专家评分：总分/平均分</span>
     <span class="form-description" v-if="description"> ※ 审核时间：{{ description }}</span>
     <a-table :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :dataSource="tableData" :columns="columns" :scroll="{ x: 'max-content' }" rowKey="id" :pagination="false" :loading="loading">
       <template slot="talentInfo" slot-scope="record">
@@ -29,6 +41,7 @@
       </template>
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" @click="recordClick(record, 'view')">查看</a-button>
+        <a-button type="link" size="small" @click="recordClick(record, 'evaluation')">专家评分明细</a-button>
         <a-button type="link" size="small" v-if="record.auditResult == 1" @click="recordClick(record, 'audit')">审核</a-button>
       </template>
     </a-table>
@@ -42,6 +55,9 @@
     <a-modal v-model="visibleView" title="查看" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
       <talent-view v-model="id" @close="closeWindow" />
     </a-modal>
+    <a-modal v-model="assignInfoVisible" title="专家评分明细" width="85%" :dialog-style="{ top: '8%' }" :footer="null" destroyOnClose>
+      <talent-assign-detail v-model="objectId" @close="() =>  this.assignInfoVisible = false" />
+    </a-modal>
   </div>
 </template>
 
@@ -51,11 +67,12 @@ import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/
 import talentView from "@/views/report/talent/components/talentView"
 import batchAudit from '@/views/audit/talent/batchAudit'
 import audit from '@/views/audit/talent/audit'
+import talentAssignDetail from '@/views/assign/components/projectAssignDetail'
 
 export default {
-  name: "talentAudit",
+  name: "talentAuditFinal",
   components: {
-    talentView, audit, batchAudit
+    talentView, audit, batchAudit, talentAssignDetail
   },
   data () {
     return {
@@ -89,6 +106,7 @@ export default {
         { title: '专业', dataIndex: 'professionName', align: 'center' },
         { title: '职称', dataIndex: 'titleName', align: 'center' },
         { title: '审核状态', dataIndex: 'auditResultName', align: 'center' },
+        { title: '专家评分', dataIndex: 'gradeScore', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 180, },
       ],
       pagination: {
@@ -102,6 +120,7 @@ export default {
       visibleAudit: false,
       visibleView: false,
       visibleBatch: false,
+      assignInfoVisible: false,
       isBatchButten: true,
       isButten: false,
       description: '',
@@ -153,6 +172,13 @@ export default {
           const { dataList = [], total = 0 } = data
           this.pagination.total = total
           this.tableData = dataList
+          this.tableData.forEach(e => {
+            // 专家评分
+            if (!!e.totalScore && e.averageScore)
+              e.gradeScore = e.totalScore + '/' + e.averageScore
+            else
+              e.gradeScore = '0/0'
+          })
           this.loading = false
         }
       }).catch(() => { this.loading = false })
@@ -198,8 +224,9 @@ export default {
         this.id = record.id
         this.objectId = record.auditObjectId
         this.visibleAudit = true
-      } else if (type === 'taskView') {
-        this.selectProjId = record.projId
+      } else if (type === 'evaluation') {
+        this.objectId = record.auditObjectId
+        this.assignInfoVisible = true
       }
     },
     batchAudit () {

src/views/evaluation/talent/index.vue

@@ -21,8 +21,11 @@
       <template slot="talentInfo" slot-scope="record">
         <a @click="recordClick(record, 'tView')">{{record.personName}}</a>
       </template>
+      <template slot="expertEvaluation" slot-scope="record">
+        <a-tag :color="evaluationColor(record)">{{record.stateName}}</a-tag>
+      </template>
       <template slot="option" slot-scope="record">
-        <a-button type="link" size="small" v-if="!!record.auditState && record.auditState == 2" @click="recordClick(record,'view')">查看</a-button>
+        <a-button type="link" size="small" v-if="!!record.auditState && (record.auditState == 1||record.auditState == 2)" @click="recordClick(record,'view')">查看</a-button>
         <a-button type="link" size="small" v-if="isButten" @click="recordClick(record,'score')">评分</a-button>
       </template>
     </a-table>
@@ -70,7 +73,7 @@ export default {
         { title: '职称', dataIndex: 'titleName', align: 'center' },
         { title: '申报年度', dataIndex: 'assignYear', align: 'center' },
         { title: '评分', dataIndex: 'totalScore', align: 'center' },
-        { title: '评审状态', dataIndex: 'stateName', align: 'center' },
+        { title: '评审状态', scopedSlots: { customRender: 'expertEvaluation', colName: 'gradeScore' }, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },
       ],
       pagination: { pageIndex: 1, pageSize: 50, total: 0, pageSizeOptions: this.$defaultPageSizeOptions, },
@@ -167,20 +170,20 @@ export default {
     exportData () {
       this.$ToDoExcel(`人才评分列表`, tableColumnsName(this.columns), filterExportExcelData(this.columns, this.tableData))
     },
-    evaluationText (record) {
-      let text = ''
+    evaluationColor (record) {
+      let color = '#f50'
       switch (record.auditState) {
         case 0:
-          text = '未评审';
+          color = '#f50';
           break;
         case 1:
-          text = '已保存';
+          color = '#f50';
           break;
         case 2:
-          text = '已提交';
+          color = '#87d068';
           break;
       }
-      return text
+      return color
     },
     previewFile () {
       this.visibleStandard = true

src/views/home/index.vue

 <template>
   <div style="width: 100%;height: 100%;">
-    <dashboard-person v-if="isReport && !isUnit" />
-    <dashboard-expert v-if="isExpert && !isUnit" />
-    <dashboard-unit v-if="isUnit" />
-    <dashboard-gov v-if="isGov" />
-    <dashboard-top v-if="isTop" />
+    <dashboard-person v-if="isTalentSystem" />
+    <div v-else>
+      <dashboard-person v-if="isReport && !isUnit" />
+      <dashboard-expert v-if="isExpert && !isUnit" />
+      <dashboard-unit v-if="isUnit" />
+      <dashboard-gov v-if="isGov" />
+      <dashboard-top v-if="isTop" />
+    </div>
     <dashboard-admin v-if="isAdmin" />
     <a-modal v-model="visibleUnitEdit" v-if="visibleUnitEdit" title="请先完善单位信息！" width="70%" :dialog-style="{ top: '12%' }" :footer="null" destroyOnClose :maskClosable="false" :closable="false">
       <unit-info-edit @sub="unitSave" />
@@ -12,6 +15,7 @@
   </div>
 </template>
 <script>
+import { getToken, removeToken, getType } from '@/views/utils/auth'
 import { getUnitComplete, setUnitComplete } from '@/views/utils/auth'
 import dashboardPerson from '@/views/home/components/dashboardPerson'
 import dashboardExpert from '@/views/home/components/dashboardPerson'
@@ -32,9 +36,11 @@ export default {
       isExpert: false,
       isUnitComplete: getUnitComplete(),
       visibleUnitEdit: false,
+      isTalentSystem: false
     };
   },
   created () {
+    this.isTalentSystem = getType() == 2
     let user = JSON.parse(window.sessionStorage.getItem('user'))
     if (user && user.roles) {
       if (user.roles.indexOf("0") != -1) {
@@ -55,6 +61,15 @@ export default {
       }
     }
   },
+  computed: {
+    systemType: {
+      get () {
+        return this.$store.state.app.systemType
+      },
+      set () {
+      }
+    },
+  },
   methods: {
     unitSave () {
       setUnitComplete(true)
@@ -62,6 +77,19 @@ export default {
       this.visibleUnitEdit = false
     }
   },
+  watch: {
+    systemType: {
+      handler (value) {
+        console.log(value)
+        if (!!value) {
+          if (value == 2)
+            this.isTalentSystem = true
+          else
+            this.isTalentSystem = false
+        }
+      }
+    }
+  }
 };
 </script>
 <style scoped lang="less">

static/css/common.less

@@ -456,7 +456,7 @@
         top: 0px;
         right: 10px;
         text-align: right;
-        max-width: 350px;
+        max-width: 400px;
         line-height: 46px;
 
         .toolbar-items {