会议类别

src/views/oa/ConferenceApplyList.vue

@@ -170,7 +170,7 @@
             title:'会议议题',
             align:"center",
             dataIndex: 'conferenceTitle',
-            width:180,
+            // width:180,
           },
           {
             title:'会议类别',
@@ -249,7 +249,7 @@
             dataIndex: 'action',
             align:"center",
             fixed:'right',
-            width: 140,
+            width: 180,
             scopedSlots: { customRender: 'action' }
           }
         ],

src/views/oa/modules/ConferenceApplyModal.vue

@@ -259,7 +259,7 @@
         this.userNames = this.model.attendPerson;
         this.orgCode = this.model.attendDept;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'conferenceTitle','postedPerson','postedDept','postedDate','conferenceDate','startTime','endTime','conferenceAddress','attendPerson','attendDept','otherPerson','conferenceContent','file'))
+          this.form.setFieldsValue(pick(this.model,'conferenceTitle','postedPerson','postedDept','postedDate','conferenceDate','startTime','endTime','conferenceAddress','attendPerson','attendDept','otherPerson','conferenceContent','file','conferenceType'))
         })
       },
       close () {

src/views/oa/modules/ConferenceMinutesModal.vue

@@ -155,7 +155,7 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'minutesId','conferenceTitle','uploadPerson','uploadDept','uploadDate','remark','file'))
+          this.form.setFieldsValue(pick(this.model,'minutesId','conferenceTitle','uploadPerson','uploadDept','uploadDate','remark','file','conferenceType'))
         })
       },
       close () {