【开发】五种会议的上传会议纪要

src/views/projectManagement/CommitteeMeeting.vue

@@ -117,7 +117,8 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-          <a @click="uploadFile(record)" v-has:[authorCode.upload]="'committeeMeeting:upload'">上传文件</a>
+          <a @click="uploadFile(record,'1')" v-has:[authorCode.uploadCouncil]="'committeeMeeting:upload'">会议纪要</a>
+          <a @click="uploadFile(record,'2')" v-has:[authorCode.upload]="'committeeMeeting:upload'">上传文件</a>
             <!--          <a @click="applyMsg">报名信息</a>-->
           <a @click="handleEdit(record)" v-has:[authorCode.edit]="'committeeMeeting:edit'">编辑</a>
           <a @click="handleDelete(record.id)" v-has:[authorCode.delete]="'committeeMeeting:delete'">删除</a>
@@ -245,6 +246,7 @@ export default {
         },
       ],
       newColumns: [],
+
       // 权限编码
       authorCode: {},
       // 分标委的权限编码
@@ -255,7 +257,8 @@ export default {
         batchDel: 'committeeMeeting:batchDel',
         upload: 'committeeMeeting:upload',
         edit: 'committeeMeeting:edit',
-        delete: 'committeeMeeting:delete'
+        delete: 'committeeMeeting:delete',
+        uploadCouncil:'committeeMeeting:uploadCouncil'
       },
       // 标协会议的权限编码
       standardsMeetingAuthorCode: {
@@ -265,7 +268,8 @@ export default {
         batchDel: 'standardsMeeting:batchDel',
         upload: 'standardsMeeting:upload',
         edit: 'standardsMeeting:edit',
-        delete: 'standardsMeeting:delete'
+        delete: 'standardsMeeting:delete',
+        uploadCouncil:'standardsMeeting:uploadCouncil'
       }
     }
   },
@@ -281,7 +285,9 @@ export default {
     if (this.meetingType === '2') {
       this.authorCode = Object.assign({}, this.standardsMeetingAuthorCode)
     }
-    this.loadData(1)
+    if(this.disableMixinCreated){
+      this.loadData(1)
+    }
     // 不是分标委会议去掉提醒字段
     if (this.meetingType !== '5') {
       this.newColumns = [...this.columns]
@@ -402,8 +408,8 @@ export default {
     /*
     * 上传文件
     * */
-    uploadFile(record) {
-      this.$refs.modalForm.edit(record)
+    uploadFile(record,type) {
+      this.$refs.modalForm.edit(record,type)
     },
     /*
     * 报名信息