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

src/views/peAssign/components/projectSelectIntoGroup.vue

@@ -10,6 +10,13 @@
       <a-form-item>
         <knowledge-select ref="knowledgeSelectRef" v-model="searchForm.knowledgeId"></knowledge-select>
       </a-form-item>
+      <a-form-item>
+        <a-select default-value="" placeholder="项目类别" v-model="searchForm.projClass" style="width: 160px">
+          <a-select-option value="">--请选择项目类别--</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>
         <a-input v-model="searchForm.certId" placeholder="申报人证件号" :maxLength="100" style="width: 160px" />
       </a-form-item>
@@ -26,6 +33,9 @@
     </a-form>
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <a-table :dataSource="tableData" size="small" :columns="columns" rowKey="projId" :pagination="false" :loading="loading" :row-selection="{ selectedRowKeys: projectSelectedRowKeys, onChange: onProjectpSelectChange }">
+      <template slot="projClassInfo" slot-scope="record">
+        {{ record.projClass == 1 ? "一般项目" : "重点项目" }}
+      </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} 条`" />
   </div>
@@ -58,6 +68,7 @@ export default {
       columns: [
         // { title: "项目名称", scopedSlots: { customRender: 'projName' } },
         { title: "项目名称", dataIndex: 'projName', align: 'left', width: 200, ellipsis: true },
+        { title: "项目类别", scopedSlots: { customRender: 'projClassInfo' }, align: 'center', width: 80 },
         //{ title: '项目编号', dataIndex: 'projNo', align: 'center', width: 160 },
         { title: '申请编号', dataIndex: 'appNo', align: 'center', width: 160 },
         { title: '学科', dataIndex: 'knowledgeName', align: 'center', width: 100 },
@@ -65,7 +76,7 @@ export default {
         { title: '证件号', dataIndex: 'certId', align: 'center', width: 150 },
         { title: '申报人', dataIndex: 'appPersonName', align: 'center', width: 80 }
       ],
-      searchForm: { groupId: null, appPersonName: null, reportYear: null, knowledgeCode: null, knowledgeId: null, knowledgeParentId: null, projName: null, appNo: null, projType: getType(), appUnitName: null },
+      searchForm: { groupId: null, appPersonName: null, reportYear: null, knowledgeCode: null, knowledgeId: null, knowledgeParentId: null, projName: null, appNo: null, projType: getType(), appUnitName: null, projClass: "" },
       pagination: {
         pageIndex: 1,
         pageSize: this.$defaultPageSize,