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

src/views/assign/components/assignDetail.vue

@@ -10,8 +10,11 @@
         </a-select>
         <!-- <a-input placeholder="项目分组" v-model="searchForm.groupId" :maxLength="100" style="width: 160px" /> -->
       </a-form-item>
-      <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.appPersonName" placeholder="项目负责人" :maxLength="20" style="width: 130px" />
       </a-form-item>
       <a-form-item>
         <a-input v-model="searchForm.appUnitName" placeholder="申报单位" :maxLength="100" style="width: 130px" />
@@ -95,6 +98,8 @@ export default {
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' }, ellipsis: true, width: 300, },
+        { title: "申报学科", dataIndex: 'knowledgeName', align: 'center', ellipsis: true, },
+        { title: "项目负责人", dataIndex: 'appPersonName', align: 'center' },
         { title: "项目分组", dataIndex: 'groupName', align: 'center' },
         { title: "项目类别", scopedSlots: { customRender: 'projClassInfo' }, align: 'center' },
         { title: '申报单位', dataIndex: 'appUnitName', align: 'center', ellipsis: true },
@@ -130,7 +135,6 @@ export default {
         if (data) {
           this.searchForm.assignYear = data.year
           this.getListByPage()
-          console.log(this.groupList)
         }
       }).catch(() => { })
     },
@@ -225,6 +229,8 @@ export default {
       this.loading = true
       let column = [
         { title: "项目名称", dataIndex: 'projName' },
+        { title: "申报学科", dataIndex: 'knowledgeName' },
+        { title: "项目负责人", dataIndex: 'appPersonName' },
         { title: "项目分组", dataIndex: 'groupName' },
         { title: "项目类别", dataIndex: 'projClassName' },
         { title: '申报单位', dataIndex: 'appUnitName' },