diff --git a/src/pages/policyRegulation/meeting/components/editDrawer.vue b/src/pages/policyRegulation/meeting/components/editDrawer.vue
index 3027ae6ee..c2141b0c8 100644
--- a/src/pages/policyRegulation/meeting/components/editDrawer.vue
+++ b/src/pages/policyRegulation/meeting/components/editDrawer.vue
@@ -1,87 +1,101 @@
-
+
基础信息
-
+
-
+
调取课题
+ type="primary"
+ class="common-button-primary"
+ size="mini"
+ style="position:absolute;top: 10px;right: 0;"
+ @click="handleGetTopic"
+ >
+ 调取课题
+
-
+
+ v-model="form.meetingTime"
+ :config="{
+ attrName: '会议时间',
+ attrField: 'meetingTime'
+ }"
+ />
-
+
-
+
+ v-model="form.meetingMinutes"
+ :config="{
+ attrName: '会议纪要',
+ attrField: 'meetingMinutes'
+ }"
+ />
+ />
会议分类
@@ -89,13 +103,16 @@
1级会议分类
-
+
{{ opt.label }}
@@ -105,13 +122,16 @@
2级会议分类
-
+
{{ opt.label }}
@@ -121,65 +141,99 @@
-
-
- 会议议题
-
-
-
-
+
+
+ 会议议题
+
+
+
+
-
-
+
+
+ />
-
-
+
+
-
-
+
+
+ v-model="item.agendaContent"
+ :config="{
+ attrName: '议题主要内容',
+ attrField: `meetingTopicList.${index}.agendaContent`
+ }"
+ :rules="rules.agendaContent"
+ />
-
+
@@ -187,10 +241,10 @@
import CustomDatePick from '@/components/CustomFormComponents/DatePicker'
import CustomFile from '@/components/CustomFormComponents/File'
import CustomTextarea from '@/components/CustomFormComponents/Textarea'
-import TopicsTable from "./TopicsTable";
+import TopicsTable from './TopicsTable';
export default {
- name: "editDrawer",
+ name: 'EditDrawer',
components: {
CustomDatePick,
CustomFile,
@@ -213,52 +267,52 @@ export default {
type: Object
}
},
- data (){
+ data () {
const rules = {
meetingName: [
- {required: true, type: 'string', message: '会议名称不能为空', trigger: 'change'},
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ { required: true, type: 'string', message: '会议名称不能为空', trigger: 'change' },
+ { type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change' }
],
meetingOrganizer: [
- {required: true, type: 'string', message: '会议主办单位不能为空', trigger: 'change'},
- {type: 'string', max: 500, message: '会议主办单位不能超过500个字符', trigger: 'change'}
+ { required: true, type: 'string', message: '会议主办单位不能为空', trigger: 'change' },
+ { type: 'string', max: 500, message: '会议主办单位不能超过500个字符', trigger: 'change' }
],
meetingTime: [
- {required: true, message: '会议时间不能为空', trigger: 'change'}
+ { required: true, message: '会议时间不能为空', trigger: 'change' }
],
meetingAddress: [
- {required: true, type: 'string', message: '会议地点不能为空', trigger: 'change'},
- {type: 'string', max: 500, message: '会议地点不能超过500个字符', trigger: 'change'}
+ { required: true, type: 'string', message: '会议地点不能为空', trigger: 'change' },
+ { type: 'string', max: 500, message: '会议地点不能超过500个字符', trigger: 'change' }
],
participants: [
- {required: true, type: 'string', message: '参会人员不能为空', trigger: 'change'},
- {type: 'string', max: 500, message: '参会人员不能超过500个字符', trigger: 'change'}
+ { required: true, type: 'string', message: '参会人员不能为空', trigger: 'change' },
+ { type: 'string', max: 500, message: '参会人员不能超过500个字符', trigger: 'change' }
],
meetingContent: [
- {required: true, type: 'string', message: '会议主要内容不能为空', trigger: 'change'},
- {type: 'string', max: 500, message: '会议主要内容不能超过500个字符', trigger: 'change'}
+ { required: true, type: 'string', message: '会议主要内容不能为空', trigger: 'change' },
+ { type: 'string', max: 500, message: '会议主要内容不能超过500个字符', trigger: 'change' }
],
firstMeetingType: [
- {required: true, message: '1级会议分类不能为空', trigger: 'change'}
+ { required: true, message: '1级会议分类不能为空', trigger: 'change' }
],
secondMeetingType: [
- {required: true, message: '2级会议分类不能为空', trigger: 'change'}
+ { required: true, message: '2级会议分类不能为空', trigger: 'change' }
],
agendaName: [
- {required: true, type: 'string', message: '议题名称不能为空', trigger: 'change'},
- {type: 'string', max: 500, message: '议题名称不能超过500个字符', trigger: 'change'}
+ { required: true, type: 'string', message: '议题名称不能为空', trigger: 'change' },
+ { type: 'string', max: 500, message: '议题名称不能超过500个字符', trigger: 'change' }
],
reporter: [
- {required: true, type: 'string', message: '汇报人不能为空', trigger: 'change'},
- {type: 'string', max: 500, message: '汇报人不能超过500个字符', trigger: 'change'}
+ { required: true, type: 'string', message: '汇报人不能为空', trigger: 'change' },
+ { type: 'string', max: 500, message: '汇报人不能超过500个字符', trigger: 'change' }
],
reportingUnit: [
- {required: true, type: 'string', message: '汇报人单位不能为空', trigger: 'change'},
- {type: 'string', max: 500, message: '汇报人单位不能超过500个字符', trigger: 'change'}
+ { required: true, type: 'string', message: '汇报人单位不能为空', trigger: 'change' },
+ { type: 'string', max: 500, message: '汇报人单位不能超过500个字符', trigger: 'change' }
],
agendaContent: [
- {required: true, type: 'string', message: '议题主要内容不能为空', trigger: 'change'},
- {type: 'string', max: 500, message: '议题主要内容不能超过500个字符', trigger: 'change'}
+ { required: true, type: 'string', message: '议题主要内容不能为空', trigger: 'change' },
+ { type: 'string', max: 500, message: '议题主要内容不能超过500个字符', trigger: 'change' }
],
}
const form = {
@@ -288,7 +342,7 @@ export default {
reloadForm: true,
api: {
add: 'lawss/insideOutsideMeeting/addMeetingInfo',
- delete :'lawss/insideOutsideMeeting/deleteMeetingInfo',
+ delete: 'lawss/insideOutsideMeeting/deleteMeetingInfo',
update: 'lawss/insideOutsideMeeting/updateMeetingInfo'
}
}
@@ -311,10 +365,10 @@ export default {
reportingUnit: '',
agendaContent: ''
}
- this.form.meetingTopicList = [...this.form.meetingTopicList, meetingTopicItem]
+ this.form.meetingTopicList = [ ...this.form.meetingTopicList, meetingTopicItem ]
},
removeMeetingTopic (index) {
- let res = []
+ const res = []
this.form.meetingTopicList.forEach((item, i) => {
if (i !== index) {
res.push(item)
diff --git a/src/pages/policyRegulation/meeting/index.vue b/src/pages/policyRegulation/meeting/index.vue
index cd492d751..84b07fb5c 100644
--- a/src/pages/policyRegulation/meeting/index.vue
+++ b/src/pages/policyRegulation/meeting/index.vue
@@ -4,200 +4,236 @@
-
+
-
+
-
+ v-model="searchForm.meetingTimeBegin"
+ value-format="yyyy-MM-dd"
+ format="yyyy-MM-dd"
+ type="date"
+ clearable
+ :editable="true"
+ placeholder="选择开始时间"
+ />
-
+ v-model="searchForm.meetingTimeEnd"
+ value-format="yyyy-MM-dd"
+ format="yyyy-MM-dd"
+ type="date"
+ clearable
+ :editable="true"
+ placeholder="选择结束时间"
+ />
+ v-btn-permission="'520f8524252e76e751a883a0a8a8615c'"
+ type="primary"
+ size="mini"
+ class="common-button-primary"
+ @click="onSearch"
+ >
查询
清空
+ v-btn-permission="'6a9483964b7b49dd473ef9e6fd4a649e'"
+ size="mini"
+ class="common-button-default"
+ @click="onClear"
+ >
+ 清空
高级检索
+ v-btn-permission="'7f98cd8b424d6ad83b1770a6576993fc'"
+ size="mini"
+ type="primary"
+ class="common-button-primary"
+ @click="advancedSearch"
+ >
+ 高级检索
- 导出
+
+ 导出
- 导入
+
+ 导入
- 模板下载
+
+ 模板下载
- 新增
+
+ 新增
-
+ type="selection"
+ width="55"
+ align="center"
+ />
+ type="index"
+ width="55"
+ label="序号"
+ align="center"
+ >
{{ ($index + 1) + (searchForm.page - 1) * searchForm.pageSize }}
{{ row.meetingName }}
-
+ show-overflow-tooltip
+ prop="meetingOrganizer"
+ label="会议主办单位"
+ align="center"
+ sortable="custom"
+ />
-
+ show-overflow-tooltip
+ prop="meetingTime"
+ label="会议时间"
+ align="center"
+ sortable="custom"
+ />
-
+ show-overflow-tooltip
+ prop="meetingAddress"
+ label="会议地点"
+ align="center"
+ sortable="custom"
+ />
-
+ show-overflow-tooltip
+ prop="agendaNameStr"
+ label="议题名称"
+ align="center"
+ sortable="custom"
+ />
- 编辑
- 删除
+ 编辑
+ 删除
-
+
数据获取中...
-
+
-
+
-
+
-
+