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

src/views/assign/components/assignDetail.vue

@@ -5,22 +5,23 @@
         <a-input placeholder="项目名称" v-model="searchForm.projName" :maxLength="100" style="width: 160px" />
       </a-form-item>
       <a-form-item>
-        <a-input placeholder="项目编号" v-model="searchForm.projNo" :maxLength="100" style="width: 160px" />
+        <a-input placeholder="项目分组" v-model="searchForm.groupId" :maxLength="100" style="width: 160px" />
       </a-form-item>
       <a-form-item>
         <base-select v-model="searchForm.assignYear" :title="'年度'" :type="8" :isAll="true" :width="160" />
       </a-form-item>
       <a-form-item>
-        <a-input v-model="searchForm.personName" placeholder="姓名" :maxLength="100" style="width: 130px" />
+        <a-input v-model="searchForm.appUnitName" placeholder="申报单位" :maxLength="100" style="width: 130px" />
       </a-form-item>
       <a-form-item>
-        <a-input v-model="searchForm.certId" placeholder="证件号" :maxLength="100" style="width: 150px" />
+        <a-input v-model="searchForm.personName" placeholder="评审专家" :maxLength="100" style="width: 130px" />
       </a-form-item>
       <a-form-item>
-        <a-select v-model="searchForm.sex" style="width: 130px">
-          <a-select-option value="">--请选择性别--</a-select-option>
-          <a-select-option value="男">男</a-select-option>
-          <a-select-option value="女">女</a-select-option>
+        <a-select v-model="searchForm.auditState" style="width: 130px">
+          <a-select-option value="">--评审状态--</a-select-option>
+          <a-select-option value="0">未评审</a-select-option>
+          <a-select-option value="1">未提交</a-select-option>
+          <a-select-option value="2">已提交</a-select-option>
         </a-select>
       </a-form-item>
       <a-form-item>
@@ -79,19 +80,19 @@ export default {
   data () {
     return {
       form: this.$form.createForm(this, { name: 'assign_search' }),
-      searchForm: { projName: null, projNo: null, assignYear: null, personName: null, certId: null, sex: "", projType: getType() },
+      searchForm: { projName: null, groupId: null, assignYear: null, appUnitName: null, appPersonName: null, personName: null, auditState: "", projType: getType() },
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' }, ellipsis: true, width: 300, },
         { title: "项目分组", dataIndex: 'groupName', align: 'center' },
         { title: "项目类别", scopedSlots: { customRender: 'projClassInfo' }, align: 'center' },
-        { title: '申报单位', dataIndex: 'appUnitName', align: 'center' },
+        { title: '申报单位', dataIndex: 'appUnitName', align: 'center', ellipsis: true },
         // { title: '项目编号', dataIndex: 'projNo', align: 'center' },
         // { title: '性别', dataIndex: 'sex', align: 'center' },
         // { title: '证件号', dataIndex: 'certId', align: 'center' },
         { title: '专家姓名', dataIndex: 'personName', align: 'center' },
         { title: "专家类型", scopedSlots: { customRender: 'expertInfo' }, align: 'center' },
-        { title: '专家单位', dataIndex: 'unitName', align: 'center' },
+        { title: '专家单位', dataIndex: 'unitName', align: 'center', ellipsis: true },
         { title: '手机号', dataIndex: 'mobile', align: 'center' },
         // { title: '邮箱', dataIndex: 'email', align: 'center' },
         // { title: '职称', dataIndex: 'titleName', align: 'center' },
@@ -128,7 +129,13 @@ export default {
       this.$api.projectAssign.getListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data
-          this.tableData = dataList
+          this.tableData = dataList.map(item => {
+            return {
+              ...item,
+              expertTypeName: item.expertType === 1 ? "技术专家" : "财务专家",
+              projClassName: item.projClass === 1 ? "一般项目" : "重点项目",
+            }
+          })
           this.pagination.total = total
           this.loading = false
         }
@@ -202,22 +209,23 @@ export default {
     exportData () {
       this.loading = true
       let column = [
-        { title: "项目名称", scopedSlots: { customRender: 'projName' } },
-        { title: '项目编号', dataIndex: 'projNo', align: 'center' },
-        { title: '专家姓名', dataIndex: 'personName', align: 'center' },
-        { title: '证件号', dataIndex: 'certId', align: 'center' },
-        { title: '手机号', dataIndex: 'mobile', align: 'center' },
-        { title: '单位', dataIndex: 'unitName', align: 'center' },
-        { title: '评分', dataIndex: 'totalScore', align: 'center' },
-        { title: '评审意见', dataIndex: 'remark', align: 'center' },
-        { title: '评审状态', dataIndex: 'stateName', align: 'center' },
+        { title: "项目名称", dataIndex: 'projName' },
+        { title: "项目分组", dataIndex: 'groupName' },
+        { title: "项目类别", dataIndex: 'projClassName' },
+        { title: '申报单位', dataIndex: 'appUnitName' },
+        { title: '专家姓名', dataIndex: 'personName'},
+        { title: "专家类型", dataIndex: 'expertTypeName' },
+        { title: '专家单位', dataIndex: 'unitName' },
+        { title: '手机号', dataIndex: 'mobile' },
+        { title: '评分', dataIndex: 'totalScore' },
+        { title: '评审状态', dataIndex: 'stateName' },
       ]
       let pars = isEmptyParams(this.searchForm)
       let par = { ...pars, pageIndex: -1, pageSize: -1 }
       this.$api.projectAssign.getListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data
-          this.$ToDoExcel(`项目分配列表`, tableColumnsName(column), filterExportExcelData(column, dataList))
+          this.$ToDoExcel(`项目分配列表`, tableColumnsName(column), filterExportExcelData(column, this.tableData))
           dataList = []
         }
         this.loading = false