222

src/api/index.js

@@ -588,9 +588,6 @@ export default {
         getAuditListByPage (params) {
             return fetch(`/v1/science-admin/com_project_audit/getAuditListByPage`, params)
         },
-        getFinalAuditListByPage (params) {
-            return fetch(`/v1/science-admin/com_project_audit/getFinalAuditListByPage`, params)
-        },
         projectBatchAudit (params) {
             return fetch(`/v1/science-admin/com-project/batchAudit`, params, 'post', 'json')
         },
@@ -615,9 +612,6 @@ export default {
         getConclusionAuditCount (params) {
             return fetch(`/v1/science-admin/com_project_audit/getConclusionAuditCount`, params)
         },
-        getFinalCount (params) {
-            return fetch(`/v1/science-admin/com_project_audit/getFinalCount`, params)
-        },
     },
     statistic: {
         getStatisticListByPage (params) {

src/router/index.js

@@ -138,8 +138,8 @@ export const routes = [
       { path: '/peAssign', name: '项目组分配1', component: () => import('@/views/peAssign/projAssign.vue'), meta: { title: '项目分配', icon: '', noCache: true } },
       { path: '/assign', name: '项目组分配2', component: () => import('@/views/assign/assignProjectGroup.vue'), meta: { title: '项目分配', icon: '', noCache: true } },
       { path: '/project/assign', name: '项目分配', component: () => import('@/views/assign/assignProject.vue'), meta: { title: '项目分配', icon: '', noCache: true } },
-      { path: '/expert/evaluation', name: '项目评分', component: () => import('@/views/evaluation/index.vue'), meta: { title: '项目评分', icon: '', noCache: true } },
-      { path: '/expert/evaluation1', name: '项目评审', component: () => import('@/views/evaluation/evaluation.vue'), meta: { title: '项目评审', icon: '', noCache: true } },
+      { path: '/expert/evaluation', name: '项目评分', component: () => import('@/views/evaluation/project/index.vue'), meta: { title: '项目评分', icon: '', noCache: true } },
+      { path: '/expert/evaluation1', name: '项目评审', component: () => import('@/views/evaluation/project/evaluation.vue'), meta: { title: '项目评审', icon: '', noCache: true } },
       { path: '/audit/conclusion', name: '项目结题审核', component: () => import('@/views/audit/conclusion/index.vue'), meta: { title: '项目结题审核', icon: '', noCache: true } },
     ]
   },
@@ -232,7 +232,7 @@ export const routes = [
       { path: '/statistic/project', name: '项目申报查询', component: () => import('@/views/statistic/project/Index.vue'), meta: { title: '项目申报查询', icon: '', noCache: true } },
       { path: '/statistic/task', name: '合同书上报查询', component: () => import('@/views/statistic/task/Index.vue'), meta: { title: '合同书上报查询', icon: '', noCache: true } },
       { path: '/statistic/check', name: '中期考核上报查询', component: () => import('@/views/statistic/check/Index.vue'), meta: { title: '中期考核上报查询', icon: '', noCache: true } },
-      { path: '/expert/evaluationQuery', name: '评分项目查询', component: () => import('@/views/evaluation/query.vue'), meta: { title: '评分项目查询', icon: '', noCache: true } },
+      { path: '/expert/evaluationQuery', name: '评分项目查询', component: () => import('@/views/evaluation/project/query.vue'), meta: { title: '评分项目查询', icon: '', noCache: true } },
     ]
   },
   {

src/views/assign/components/projectAssignDetail.vue

@@ -63,7 +63,7 @@
 <script>
 import moment from 'moment'
 import { getType } from '@/views/utils/auth'
-import scoreView from '@/views/evaluation/components/scoreView'
+import scoreView from '@/views/evaluation/project/components/scoreView'
 import { isEmptyParams, getEvaluationType } from '@/views/utils/common'
 
 export default {

src/views/audit/project/final.vue

@@ -106,7 +106,7 @@ 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 scoreView from '@/views/evaluation/components/scoreView'
+import scoreView from '@/views/evaluation/project/components/scoreView'
 
 const EditableCell = {
   template: `
@@ -160,6 +160,8 @@ export default {
         scoreEnd: null,
         auditType: 1,
         auditResult: 1,
+        completed: 1,
+        auditMethod: 5,
         projName: null,
         projNo: null,
         appUnitName: null,
@@ -300,7 +302,7 @@ export default {
       this.loading = true;
       let pars = isEmptyParams(this.searchForm);
       let par = { ...pars, pageIndex: this.pagination.pageIndex, pageSize: this.pagination.pageSize, }
-      this.$api.audit.getFinalAuditListByPage(par).then(({ data = {} }) => {
+      this.$api.audit.getAuditListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data;
           this.tableData = dataList
@@ -330,8 +332,8 @@ export default {
       }).catch(() => { this.loading = false })
     },
     getCount () {
-      let pars = isEmptyParams({ auditType: 1, reportYear: this.searchForm.reportYear, systemType: getType() });
-      this.$api.audit.getFinalCount(pars).then(({ data = {} }) => {
+      let pars = isEmptyParams({ auditType: 1, completed: 1, auditMethod: 5, reportYear: this.searchForm.reportYear, systemType: getType() });
+      this.$api.audit.getCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data
           this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]
@@ -391,7 +393,7 @@ export default {
       this.loading = true;
       let pars = isEmptyParams(this.searchForm);
       let par = { ...pars, pageIndex: -1, pageSize: -1, }
-      this.$api.audit.getFinalAuditListByPage(par).then(({ data = {} }) => {
+      this.$api.audit.getAuditListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data
           dataList.forEach(e => {
@@ -482,7 +484,7 @@ export default {
 
 .editable-cell-icon-check {
   line-height: 28px;
-  color:turquoise;
+  color: turquoise;
 }
 
 .editable-cell:hover .editable-cell-icon {

src/views/audit/talent/Index.vue

@@ -56,7 +56,7 @@ export default {
   components: {
     talentView, audit, batchAudit
   },
-  data() {
+  data () {
     return {
       selectedRowKeys: [],
       // 选项卡
@@ -86,7 +86,7 @@ export default {
         { title: "身份证号", dataIndex: 'certId', align: 'center' },
         { title: '姓名', scopedSlots: { customRender: 'talentInfo' }, align: 'center' },
         { title: '性别', dataIndex: 'sex', align: 'center' },
-        { title: '专业', dataIndex: 'specName', align: 'center' },
+        { title: '专业', dataIndex: 'professionName', align: 'center' },
         { title: '职称', dataIndex: 'titleName', align: 'center' },
         { title: '审核状态', dataIndex: 'auditResultName', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 180, },
@@ -158,8 +158,8 @@ export default {
       }).catch(() => { this.loading = false })
     },
     getCount () {
-      let pars = isEmptyParams({ auditType: 6, reportYear: this.searchForm.reportYear });
-      this.$api.audit.getCount(pars).then(({ data = {} }) => {
+      let pars = isEmptyParams({ auditType: 6, reportYear: this.searchForm.reportYear, completed: 1 });
+      this.$api.audit.getTalentAuditCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data
           this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]
@@ -219,7 +219,7 @@ export default {
       this.getListByPage()
     },
     exportData () {
-      
+
     },
   }
 };

src/views/audit/talent/final.vue

@@ -65,6 +65,8 @@ export default {
       searchForm: {
         auditType: 6,
         auditResult: 1,
+        completed: 1,
+        auditMethod: 5,
         certId: null,
         personName: null,
         reportYear: null,
@@ -86,7 +88,7 @@ export default {
         { title: "身份证号", dataIndex: 'certId', align: 'center' },
         { title: '姓名', scopedSlots: { customRender: 'talentInfo' }, align: 'center' },
         { title: '性别', dataIndex: 'sex', align: 'center' },
-        { title: '专业', dataIndex: 'specName', align: 'center' },
+        { title: '专业', dataIndex: 'professionName', align: 'center' },
         { title: '职称', dataIndex: 'titleName', align: 'center' },
         { title: '审核状态', dataIndex: 'auditResultName', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 180, },
@@ -159,7 +161,7 @@ export default {
     },
     getCount () {
       let pars = isEmptyParams({ auditType: 6, reportYear: this.searchForm.reportYear });
-      this.$api.audit.getCount(pars).then(({ data = {} }) => {
+      this.$api.audit.getTalentAuditCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data
           this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]

src/views/evaluation/components/economyEdit.vue → src/views/evaluation/project/components/economyEdit.vue

@@ -170,7 +170,7 @@
 </template>
 
 <script>
-import { standardList } from '@/views/evaluation/components/config'
+import { standardList } from '@/views/evaluation/project/components/config'
 import { getEvaluationType } from "@/views/utils/common"
 export default {
   name: "economy",

src/views/evaluation/components/economyInfo.vue → src/views/evaluation/project/components/economyInfo.vue

@@ -88,7 +88,7 @@
 
 <script>
 import { toTextarea, getEvaluationType } from '@/views/utils/common'
-import { standardList } from '@/views/evaluation/components/config'
+import { standardList } from '@/views/evaluation/project/components/config'
 export default {
   name: "economy",
   components: {},

src/views/evaluation/components/projectView.vue → src/views/evaluation/project/components/projectView.vue

@@ -56,7 +56,7 @@ const projectKPI = {
 
 import { budgetList } from '@/views/report/project/config'
 import { getType } from '@/views/utils/auth'
-import projectInfo from '@/views/evaluation/components/projectInfo'
+import projectInfo from '@/views/evaluation/project/components/projectInfo'
 import projectInfoKey from "@/views/report/project/components/keyProject/projectInfo"
 export default {
   name: "projectView",

src/views/evaluation/components/score.vue → src/views/evaluation/project/components/score.vue

@@ -129,11 +129,11 @@ import { getType } from '@/views/utils/auth'
 import { isEmptyParams, getEvaluationType } from "@/views/utils/common"
 import { budgetList } from '@/views/report/project/config'
 import moment from 'moment'
-import projectView from '@/views/evaluation/components/projectView'
-import projectInfo from '@/views/evaluation/components/projectInfo'
-import technologyEvalucation from '@/views/evaluation/components/technologyEvalucation'
-import economyEdit from '@/views/evaluation/components/economyEdit'
-import scoreEdit from '@/views/evaluation/components/scoreEdit'
+import projectView from '@/views/evaluation/project/components/projectView'
+import projectInfo from '@/views/evaluation/project/components/projectInfo'
+import technologyEvalucation from '@/views/evaluation/project/components/technologyEvalucation'
+import economyEdit from '@/views/evaluation/project/components/economyEdit'
+import scoreEdit from '@/views/evaluation/project/components/scoreEdit'
 
 export default {
   name: "score",

src/views/evaluation/components/scoreView.vue → src/views/evaluation/project/components/scoreView.vue

@@ -41,9 +41,9 @@
 </template>
 
 <script>
-import economyInfo from '@/views/evaluation/components/economyInfo'
-import technologyInfo from '@/views/evaluation/components/technologyInfo'
-import scoreInfo from '@/views/evaluation/components/scoreInfo'
+import economyInfo from '@/views/evaluation/project/components/economyInfo'
+import technologyInfo from '@/views/evaluation/project/components/technologyInfo'
+import scoreInfo from '@/views/evaluation/project/components/scoreInfo'
 import { toTextarea, getEvaluationType } from '@/views/utils/common'
 export default {
   name: "scoreView",

src/views/evaluation/index.vue → src/views/evaluation/project/index.vue

@@ -65,10 +65,10 @@ import { getType } from '@/views/utils/auth'
 import moment from 'moment'
 import { isEmptyParams, filterExportExcelData, tableColumnsName, getEvaluationType } from '@/views/utils/common'
 import assignExpertView from '@/views/assign/components/assignExpertView'
-import evaluationEdit from '@/views/evaluation/components/evaluationEdit'
-import score from '@/views/evaluation/components/score'
-import scoreView from '@/views/evaluation/components/scoreView'
-import projectView from '@/views/evaluation/components/projectView'
+import evaluationEdit from '@/views/evaluation/project/components/evaluationEdit'
+import score from '@/views/evaluation/project/components/score'
+import scoreView from '@/views/evaluation/project/components/scoreView'
+import projectView from '@/views/evaluation/project/components/projectView'
 import pdfView from '@/views/components/common/pdfView'
 
 export default {

src/views/evaluation/query.vue → src/views/evaluation/project/query.vue

@@ -42,7 +42,7 @@ import { getType } from '@/views/utils/auth'
 import moment from 'moment'
 import { isEmptyParams, filterExportExcelData, tableColumnsName } from '@/views/utils/common'
 import assignExpertView from '@/views/assign/components/assignExpertView'
-import projectView from '@/views/evaluation/components/projectView'
+import projectView from '@/views/evaluation/project/components/projectView'
 import baseSelect from '@/views/components/common/baseSelect'
 
 export default {

src/views/evaluation/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.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>
+        <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>
+      </a-form-item>
+    </a-form>
+    <div style="width:100%">
+      <div style="display: inline-block;;width:50%">
+        <btn-group :data="tabDate" :itemCount="itemCount" v-model="activekey" @change="callback" />
+      </div>
+      <div style="display: inline-block;width:50%;text-align: right;">
+        <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 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">
+        <a @click="recordClick(record, 'view')">{{record.personName}}</a>
+      </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" v-if="record.auditResult == 1" @click="recordClick(record, 'audit')">审核</a-button>
+      </template>
+    </a-table>
+    <a-pagination v-if="pagination.total > 0" :total="pagination.total" show-size-changer show-quick-jumper v-model="pagination.pageIndex" :page-size="pagination.pageSize" :page-size-options="pagination.pageSizeOptions" @showSizeChange="showSizeChange" @change="change" :showTotal="() => `共 ${pagination.total} 条`" />
+    <a-modal v-model="visibleAudit" v-if="visibleAudit" title="审核" :footer="null" width="94%" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
+      <audit v-model="id" :objId="objectId" @close="closeWindow" @changeScroll="() => {this.$refs.s_modal.changeScroll()}"></audit>
+    </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>
+    <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>
+  </div>
+</template>
+
+<script>
+import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common"
+import talentView from "@/views/report/talent/components/talentView"
+import batchAudit from '@/views/audit/talent/batchAudit'
+import audit from '@/views/audit/talent/audit'
+
+export default {
+  name: "talentAudit",
+  components: {
+    talentView, audit, batchAudit
+  },
+  data () {
+    return {
+      selectedRowKeys: [],
+      // 选项卡
+      //panes: { count1: 0, count2: 0, count3: 0, count4: 0, count5: 0, },
+      form: this.$form.createForm(this, { name: 'advanced_search' }),
+      searchForm: {
+        auditType: 6,
+        auditResult: 1,
+        certId: null,
+        personName: null,
+        reportYear: null,
+        auditType: 6,
+      },
+      activekey: '1',
+      tabDate: [
+        { key: "1", tab: "待审核" },
+        { key: "10", tab: "已通过" },
+        { key: "30", tab: "返回修改" },
+        { key: "20", tab: "未通过" },
+        { key: "", tab: "所有" },
+      ],
+      itemCount: [0, 0, 0, 0, 0],
+      tableData: [],
+      columns: [
+        { title: '申报年度', dataIndex: 'reportYear', align: 'center' },
+        { title: '申报单位', dataIndex: 'appUnitName', align: 'center' },
+        { title: "身份证号", dataIndex: 'certId', align: 'center' },
+        { title: '姓名', scopedSlots: { customRender: 'talentInfo' }, align: 'center' },
+        { title: '性别', dataIndex: 'sex', align: 'center' },
+        { title: '专业', dataIndex: 'professionName', align: 'center' },
+        { title: '职称', dataIndex: 'titleName', align: 'center' },
+        { title: '审核状态', dataIndex: 'auditResultName', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 180, },
+      ],
+      pagination: {
+        pageIndex: 1,
+        pageSize: this.$defaultPageSize,
+        total: 0,
+        pageSizeOptions: this.$defaultPageSizeOptions,
+      },
+      loading: false,
+      // 弹窗标志
+      visibleAudit: false,
+      visibleView: false,
+      visibleBatch: false,
+      isBatchButten: true,
+      isButten: false,
+      description: '',
+      id: null,
+      objectId: null,
+    };
+  },
+  created () {
+    this.getYear()
+  },
+  methods: {
+    onSelectChange (selectedRowKeys) {
+      this.selectedRowKeys = selectedRowKeys;
+    },
+    search () {
+      this.id = null
+      this.objectId = null
+      this.selectedRowKeys = []
+      this.pagination.pageIndex = 1
+      this.getListByPage();
+    },
+    reset () {
+      this.id = null
+      this.objectId = null
+      this.selectedRowKeys = []
+      this.searchForm.certId = null
+      this.searchForm.personName = null
+      this.searchForm.knowledgeId = null
+      this.pagination.pageIndex = 1
+      this.getListByPage()
+    },
+    getYear () {
+      this.$api.batch.getCurrentYearTalentBatch({ type: 2 }).then(({ data = {} }) => {
+        if (data) {
+          this.isButten = data.disabled
+          this.description = data.description
+          this.searchForm.reportYear = data.year
+          this.getListByPage()
+        }
+      }).catch(() => { })
+    },
+    getListByPage () {
+      this.getCount()
+      this.loading = true;
+      let pars = isEmptyParams(this.searchForm);
+      let par = { ...pars, pageIndex: this.pagination.pageIndex, pageSize: this.pagination.pageSize, }
+      this.$api.audit.getAuditListByPage(par).then(({ data = {} }) => {
+        if (data) {
+          const { dataList = [], total = 0 } = data
+          this.pagination.total = total
+          this.tableData = dataList
+          this.loading = false
+        }
+      }).catch(() => { this.loading = false })
+    },
+    getCount () {
+      let pars = isEmptyParams({ auditType: 6, reportYear: this.searchForm.reportYear, completed: 1 });
+      this.$api.audit.getTalentAuditCount(pars).then(({ data = {} }) => {
+        if (data) {
+          this.panes = data
+          this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]
+        }
+      }).catch(() => { })
+    },
+    change () {
+      this.getListByPage();
+    },
+    showSizeChange (current, pageSize) {
+      this.pagination.pageSize = pageSize
+      this.getListByPage()
+    },
+    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.selectedRowKeys = []
+        this.visibleView = false
+        this.visibleAudit = false
+        this.visibleBatch = false
+      }
+    },
+    recordClick (record, type) {
+      if (type === 'view') {
+        this.id = record.auditObjectId
+        this.visibleView = true
+      } else if (type === 'audit') {
+        this.id = record.id
+        this.objectId = record.auditObjectId
+        this.visibleAudit = true
+      } else if (type === 'taskView') {
+        this.selectProjId = record.projId
+      }
+    },
+    batchAudit () {
+      if (!!this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        this.visibleBatch = true
+      }
+      else
+        this.$message.error('请选择项目！')
+    },
+    callback (key) {
+      if (key == '1') {
+        this.isBatchButten = true
+      } else
+        this.isBatchButten = false
+      this.searchForm.auditResult = key;
+      this.getListByPage()
+    },
+    exportData () {
+
+    },
+  }
+};
+</script>

src/views/login/login.vue

@@ -70,7 +70,7 @@ import { isEmptyParams } from "@/views/utils/common";
 import Verify from "@/views/components/verifition/Verify"
 import moment from 'moment'
 import { setToken } from '@/views/utils/auth'
-import score from '@/views/evaluation/components/score'
+import score from '@/views/evaluation/project/components/score'
 
 export default {
   components: { Verify, score },