会议纪要管理-增加会议类别字段

src/views/oa/ConferenceMinutesList.vue

@@ -169,6 +169,12 @@
             align:"center",
             dataIndex: 'conferenceTitle'
           },
+          {
+            title:'会议类别',
+            align:"center",
+            dataIndex: 'conferenceType',
+            // width:120,
+          },
           {
             title:'上传人',
             align:"center",

src/views/oa/modules/ConferenceApplyModal.vue

@@ -89,7 +89,7 @@
       <a-row>
         <a-col span="8">
           <a-form-item label="会议类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-select v-decorator="['conferenceType', validatorRules.conferenceType]" placeholder="请输入其他参会人">
+            <a-select v-decorator="['conferenceType', validatorRules.conferenceType]" placeholder="请选择会议类别">
                 <a-select-option value="部门会议">部门会议</a-select-option>
                 <a-select-option value="办公会议">办公会议</a-select-option>
                 <a-select-option value="党组会议">党组会议</a-select-option>

src/views/oa/modules/ConferenceMinutesModal.vue

@@ -46,6 +46,15 @@
             <j-date placeholder="请选择上传时间" v-decorator="[ 'uploadDate', validatorRules.uploadDate]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
           </a-form-item>
         </a-col>
+        <a-col span="8">
+          <a-form-item label="会议类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-select v-decorator="['conferenceType', validatorRules.conferenceType]" placeholder="请选择会议类别">
+                <a-select-option value="部门会议">部门会议</a-select-option>
+                <a-select-option value="办公会议">办公会议</a-select-option>
+                <a-select-option value="党组会议">党组会议</a-select-option>
+          </a-select>
+          </a-form-item>
+        </a-col>
         <a-col span="24">
           <a-form-item label="备注" :labelCol="labelCol1" :wrapperCol="wrapperCol1">
             <a-textarea v-decorator="['remark', validatorRules.remark]" rows="1" placeholder="请输入备注"/>
@@ -114,6 +123,9 @@
           uploadDate: {rules: [
             {required: true, message: '请输入上传时间!'},
           ]},
+          conferenceType:{rules: [
+            {required: true, message: '请选择会议类别!'},
+          ]},
           remark: {rules: [
           ]},
           file: {rules: [