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

src/views/peAssign/components/groupDetail.vue

@@ -13,13 +13,16 @@
       </a-form-item>
     </a-form>
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
-    <div class="submit-btn">
+    <!-- <div class="submit-btn">
       <a-button icon="plus-circle" type="primary" v-if="btnAddVisiable" @click="onAddProject">添加项目</a-button>
-    </div>
+    </div> -->
     <a-table :dataSource="tableData" :columns="columns" rowKey="id" :pagination="false" :loading="loading">
       <template slot="projName" slot-scope="record">
         <a @click="recordClick(record)">{{record.projName}}</a>
       </template>
+      <template slot="projClassInfo" slot-scope="record">
+        {{ record.projClass == 1 ? "一般项目" : "重点项目" }}
+      </template>
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" @click="deleteGroupProject(record)">删除</a-button>    
       </template>
@@ -70,12 +73,14 @@ export default {
       loading: false,
       tableData: [],
       columns: [
-        // { title: "项目名称", scopedSlots: { customRender: 'projName' } },
-        { title: "项目名称", dataIndex: 'projName' },
-        { title: '项目编号', dataIndex: 'projNo', align: 'center' },
+        { dataIndex: 'appNo', title: '申请编号', ellipsis: true, width: 150 },
+        // { dataIndex: 'projName', title: '项目名称', ellipsis: true },
+        { title: "项目名称", scopedSlots: { customRender: 'projName' }, ellipsis: true },
+        { title: "项目类别", scopedSlots: { customRender: 'projClassInfo' }, align: 'center', width: 80 },
+        // { title: '项目编号', dataIndex: 'projNo', align: 'center' },
         { title: '学科名称', dataIndex: 'knowledgeName', align: 'center' },
-        { title: '申报人', dataIndex: 'personName', align: 'center' },
-        { title: '证件号', dataIndex: 'certId', align: 'center' },
+        { title: '申报人', dataIndex: 'personName', align: 'center', width: 80 },
+        { title: '证件号', dataIndex: 'certId', align: 'center', width: 150 },
         //{ title: "操作", scopedSlots: { customRender: 'option' } },
       ],
       pagination: {

src/views/peAssign/projKeyAssign.vue

@@ -62,11 +62,12 @@
     </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} 条`" />
 
-    <s-modal :title="projectGroupTitle" v-model="projDetailVisible" v-if="projDetailVisible" ref="childWindow" :loading="false">
+    <!-- <s-modal :title="projectGroupTitle" v-model="projDetailVisible" v-if="projDetailVisible" ref="childWindow" :loading="false">
       <div slot="content">
         <group-detail v-model="groupId" :btnAddVisiable="false" @close="closeProjDetail" />
       </div>
-    </s-modal>
+    </s-modal> -->
+
     <a-modal v-model="groupEditVisible" title="项目组编辑" width="60%" :dialog-style="{ top: '15%' }" :maskClosable="false" destroyOnClose>
       <template slot="footer">
         <a-button type="primary" @click="() => this.$refs.childEdit.submit()">提交</a-button>
@@ -87,9 +88,9 @@
       </template>
       <project-select-into-group v-model="groupId" @close="closeProjectIntoGroupWindow" ref="childEdit"></project-select-into-group>
     </a-modal>
-    <!-- <a-modal v-model="projDetailVisible" title="项目组明细" width="70%" :dialog-style="{ top: '15%' }" :footer="null" destroyOnClose>
+    <a-modal v-model="projDetailVisible" title="项目组明细" width="95%" :dialog-style="{ top: '8%' }" :footer="null" class="custom-modal" destroyOnClose>
       <group-detail v-model="groupId" @close="() =>  this.projDetailVisible = false" />
-    </a-modal> -->
+    </a-modal>
   </div>
 </template>
 
@@ -523,4 +524,8 @@ export default {
     cursor: pointer;
   }
 }
+
+/deep/ .ant-modal-content {
+  height: calc(100vh - 150px); /* 设置你想要的高度 */
+}
 </style>