..

2025-08-29 08:59:48 +08:00
parent 48cc8a448c
commit a408793a33
62 changed files with 15910 additions and 14042 deletions
@@ -1,73 +1,8 @@
-#nprogress {
-    pointer-events: none
-}
-
-#nprogress .bar {
-    background: #29d;
-    position: fixed;
-    z-index: 1031;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 2px
-}
-
-#nprogress .peg {
-    display: block;
-    position: absolute;
-    right: 0;
-    width: 100px;
-    height: 100%;
-    box-shadow: 0 0 10px #29d, 0 0 5px #29d;
-    opacity: 1;
-    -webkit-transform: rotate(3deg) translate(0, -4px);
-    -ms-transform: rotate(3deg) translate(0, -4px);
-    transform: rotate(3deg) translate(0, -4px)
-}
-
-#nprogress .spinner {
-    display: block;
-    position: fixed;
-    z-index: 1031;
-    top: 15px;
-    right: 15px
-}
-
-#nprogress .spinner-icon {
-    width: 18px;
-    height: 18px;
-    box-sizing: border-box;
-    border: 2px solid transparent;
-    border-top-color: #29d;
-    border-left-color: #29d;
-    border-radius: 50%;
-    -webkit-animation: nprogress-spinner 400ms linear infinite;
-    animation: nprogress-spinner 400ms linear infinite
-}
-
-.nprogress-custom-parent {
-    overflow: hidden;
-    position: relative
-}
-
-.nprogress-custom-parent #nprogress .bar, .nprogress-custom-parent #nprogress .spinner {
-    position: absolute
-}
-
-@-webkit-keyframes nprogress-spinner {
-    0% {
-        -webkit-transform: rotate(0deg)
-    }
-    100% {
-        -webkit-transform: rotate(360deg)
-    }
-}
-
-@keyframes nprogress-spinner {
-    0% {
-        transform: rotate(0deg)
-    }
-    100% {
-        transform: rotate(360deg)
-    }
-}
+/**
+ * Minified by jsDelivr using clean-css v5.3.3.
+ * Original file: /npm/nprogress@0.2.0/nprogress.css
+ *
+ * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files
+ */
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;-webkit-transform:rotate(3deg) translate(0,-4px);-ms-transform:rotate(3deg) translate(0,-4px);transform:rotate(3deg) translate(0,-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:solid 2px transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(360deg)}}@keyframes nprogress-spinner{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}
+/*# sourceMappingURL=/sm/4400c1e6b434bc414f3870cc8d155b3335f1f32d1a07381e06cc8a8bd869de73.map */
@@ -21,10 +21,11 @@
        <!-- import ElementUI -->
        <script src="${base!}/assets/platform/plugins/element-ui/lib/index.js"></script>
        <script src="${base!}/assets/platform/plugins/element-ui/lib/i18n/${lang,escape}.js"></script>
-        <link rel="stylesheet" href="https://cdn.staticfile.net/element-ui/2.15.14/theme-chalk/index.css" />
        <link rel="stylesheet" href="${base!}/assets/platform/plugins/element-ui/lib/theme-chalk/index.css" />
+        <link rel="stylesheet" href="${base!}/assets/platform/plugins/element-ui/lib/theme-chalk/index_custom.css" />
        <link rel="stylesheet" href="${base!}/assets/platform/plugins/element-ui/lib/theme-chalk/override.css" />

+        <!-- import common css -->
        <link rel="stylesheet" href="${base!}/assets/platform/css/common.css" />

        <!-- import Jquery -->
@@ -32,7 +33,7 @@
        <!-- pjax是异步加载html片段的工具,模拟前端路由机制 -->
        <script src="${base!}/assets/platform/plugins/pjax/jquery.pjax.js"></script>
        <!--nprogress 配合pjax使用-->
-        <link rel="stylesheet" href="https://cdn.staticfile.net/nprogress/0.2.0/nprogress.css" />
+        <link ref="stylesheet" href="${base!}/assets/platform/plugins/nprogress/nprogress.css"/>
        <script src="${base!}/assets/platform/plugins/nprogress/nprogress.js"></script>

        <!-- 农历插件 -->
@@ -0,0 +1,74 @@
+const basicForm = {
+    template: /*language=HTML*/ `
+        <el-dialog :visible.sync="visible" :title="formData.id ? '编辑' : '新增'">
+            <el-form :model="formData" :rules="rules" ref="formRef" label-width="80px">
+                <el-form-item label="课程标题" prop="title">
+                    <el-input v-model="formData.title" placeholder="请输入课程标题"></el-input>
+                </el-form-item>
+                <el-form-item label="课程描述" prop="description">
+                    <el-input type="textarea" v-model="formData.description" placeholder="请输入课程描述"
+                              :rows="4"></el-input>
+                </el-form-item>
+                <el-form-item label="封面地址">
+                    <file-upload
+                            :value.sync="formData.cover"
+                            :upload_number="1"
+                            upload_mode="image"
+                            upload_result_category="interval"
+                            upload_result_type="url"
+                    ></file-upload>
+                </el-form-item>
+                <el-form-item label="课程分类" prop="category">
+                    <el-select v-model="formData.category" placeholder="请选择分类" style="width: 100%;">
+                        <el-option label="前端开发" value="前端开发"></el-option>
+                        <el-option label="后端开发" value="后端开发"></el-option>
+                        <el-option label="移动开发" value="移动开发"></el-option>
+                        <el-option label="数据库" value="数据库"></el-option>
+                        <el-option label="运维部署" value="运维部署"></el-option>
+                        <el-option label="人工智能" value="人工智能"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="是否启用">
+                    <el-switch v-model="formData.disabled" :active-value="false" :inactive-value="true"></el-switch>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="visible = false">取消</el-button>
+                <el-button type="primary" @click="onSave">确定</el-button>
+            </div>
+        </el-dialog>
+    `,
+    data() {
+        return {
+            visible: false,
+            formData: {},
+            rules: {
+                title: [{required: true, message: '请输入课程标题', trigger: 'blur'}],
+                description: [{required: true, message: '请输入课程描述', trigger: 'blur'}],
+                category: [{required: true, message: '请选择课程分类', trigger: 'change'}]
+            }
+        }
+    },
+    methods: {
+        onOpen(row = null) {
+            this.visible = true
+            this.formData = {...row}
+        },
+        onSave() {
+            this.$refs.formRef.validate(valid => {
+                if (valid) {
+                    this.$axios.post('/platform/edu/courses/' + (this.formData.id ? 'update' : 'insert'), this.formData).then(res => {
+                        if (res.code === 0) {
+                            this.visible = false
+                            this.$message.success(res.msg)
+                            this.$emit('refresh', null)
+                        }
+                    })
+                }
+            })
+        }
+
+    }
+
+
+}
@@ -0,0 +1,424 @@
+const contentForm = {
+    template: /*language=HTML*/ `
+        <el-dialog :visible.sync="visible" width="70%" title="章节视频管理" top="50px" class="edu_content_dialog">
+            <div v-if="selectedCourse">
+                <div class="section-header">
+                    <div>
+                        <h2 style="margin: 0; color: #303133;">{{ selectedCourse.title }} - 内容管理</h2>
+                        <p style="margin: 5px 0 0; color: #909399;">管理课程章节和视频</p>
+                    </div>
+                    <div>
+                        <el-button type="primary" icon="el-icon-plus" size="small" @click="onOpenChapter()">
+                            添加章节
+                        </el-button>
+                    </div>
+                </div>
+
+                <div style="padding: 0 20px 20px;">
+                    <div class="stats-card">
+                        <!--                        <el-row :gutter="20">-->
+                        <!--                            <el-col :span="8">-->
+                        <!--                                <h3 style="margin: 0;">{{ currentChapters.length }}</h3>-->
+                        <!--                                <p style="margin: 5px 0 0;">章节数量</p>-->
+                        <!--                            </el-col>-->
+                        <!--                            <el-col :span="8">-->
+                        <!--                                <h3 style="margin: 0;">{{ getTotalVideos() }}</h3>-->
+                        <!--                                <p style="margin: 5px 0 0;">视频数量</p>-->
+                        <!--                            </el-col>-->
+                        <!--                            <el-col :span="8">-->
+                        <!--                                <h3 style="margin: 0;">{{ formatDuration(getTotalDuration()) }}</h3>-->
+                        <!--                                <p style="margin: 5px 0 0;">总时长</p>-->
+                        <!--                            </el-col>-->
+                        <!--                        </el-row>-->
+                    </div>
+
+                    <div v-if="currentChapters.length === 0" style="text-align: center; padding: 50px; color: #909399;">
+                        <i class="el-icon-folder-opened"
+                           style="font-size: 64px; display: block; margin-bottom: 20px;"></i>
+                        <p>暂无章节，请添加章节开始管理内容</p>
+                    </div>
+
+                    <div v-for="chapter in currentChapters" :key="chapter.id" class="chapter-card">
+                        <div class="chapter-header">
+                            <div>
+                                <h3 style="margin: 0; color: #303133;">{{ chapter.title }}</h3>
+                                <p style="margin: 5px 0 0; color: #909399;">
+                                    {{ chapter?.videos.length || 0 }} 个视频
+                                </p>
+                            </div>
+                            <div>
+                                <el-button size="small" type="primary" @click="onOpenVideo(chapter.id)">
+                                    添加视频
+                                </el-button>
+                                <el-button size="small" @click="onOpenChapter(chapter)">
+                                    编辑章节
+                                </el-button>
+                                <el-button size="small" type="danger" @click="deleteChapter(chapter.id)">
+                                    删除章节
+                                </el-button>
+                            </div>
+                        </div>
+                        <div class="chapter-content">
+                            <div v-if="chapter?.videos.length === 0"
+                                 style="text-align: center; color: #909399; padding: 30px;">
+                                <i class="el-icon-video-camera"
+                                   style="font-size: 32px; display: block; margin-bottom: 10px;"></i>
+                                <p>暂无视频，点击"添加视频"开始添加内容</p>
+                            </div>
+                            <div v-for="video in chapter?.videos" :key="video.id" class="video-item">
+                                <div style="display: flex; justify-content: space-between; align-items: center;">
+                                    <div style="flex: 1;">
+                                        <h4 style="margin: 0 0 5px; color: #303133;">{{ video.title }}</h4>
+                                        <p style="margin: 0; color: #909399; font-size: 14px;">
+                                            <i class="el-icon-time"></i> {{ formatDuration(video.duration) }}
+                                            <span style="margin-left: 15px;">
+                                                            <i class="el-icon-link"></i> {{ video.url }}
+                                                        </span>
+                                        </p>
+                                    </div>
+                                    <div>
+                                        <el-button size="mini" @click="playVideo(video)">播放</el-button>
+                                        <el-button size="mini" @click="onOpenVideo(video.chapterId,video)">编辑
+                                        </el-button>
+                                        <el-button size="mini" type="danger" @click="deleteVideo(video.id)">删除
+                                        </el-button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div v-else style="text-align: center; padding: 100px; color: #909399;">
+                <i class="el-icon-warning" style="font-size: 64px; display: block; margin-bottom: 20px;"></i>
+                <p>请先选择一个课程进行内容管理</p>
+            </div>
+
+            <!-- 章节弹窗 -->
+            <el-dialog :title="chapterForm.id ? '编辑章节' : '添加章节'" :visible.sync="chapterDialogVisible"
+                       append-to-body
+                       width="500px">
+                <el-form :model="chapterForm" :rules="chapterRules" ref="chapterFormRef" label-width="80px">
+                    <el-form-item label="章节标题" prop="title">
+                        <el-input v-model="chapterForm.title" placeholder="请输入章节标题"></el-input>
+                    </el-form-item>
+                    <el-form-item label="排序码" prop="sortCode">
+                        <el-input-number v-model="chapterForm.sortCode" :min="1" style="width: 100%;"></el-input-number>
+                    </el-form-item>
+                </el-form>
+                <div slot="footer">
+                    <el-button @click="chapterDialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="saveChapter">确定</el-button>
+                </div>
+            </el-dialog>
+
+            <!-- 视频弹窗 -->
+            <el-dialog :title="videoForm.id ? '编辑视频' : '添加视频'" :visible.sync="videoDialogVisible" width="600px"
+                       append-to-body>
+                <el-form :model="videoForm" :rules="videoRules" ref="videoFormRef" label-width="80px">
+                    <el-form-item label="视频标题" prop="title">
+                        <el-input v-model="videoForm.title" placeholder="请输入视频标题"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="视频地址" prop="url">
+                        <!--                        <el-input v-model="videoForm.url" placeholder="请输入视频地址"></el-input>-->
+                        <file-upload
+                                :value.sync="videoForm.url"
+                                :upload_number="1"
+                                upload_mode="file"
+                                upload_result_category="interval"
+                                upload_result_type="url"
+                                accept="video/*"
+                        ></file-upload>
+                    </el-form-item>
+                    <!--                    <el-form-item label="视频时长" prop="duration">-->
+                    <!--                        <el-input-number v-model="videoForm.duration" :min="1" placeholder="秒"-->
+                    <!--                                         style="width: 100%;"></el-input-number>-->
+                    <!--                        <div class="duration-display">{{ formatDuration(videoForm.duration || 0) }}</div>-->
+                    <!--                    </el-form-item>-->
+                    <el-form-item label="排序码" prop="sortCode">
+                        <el-input-number v-model="videoForm.sortCode" :min="1" style="width: 100%;"></el-input-number>
+                    </el-form-item>
+                </el-form>
+                <div slot="footer">
+                    <el-button @click="videoDialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="saveVideo">确定</el-button>
+                </div>
+            </el-dialog>
+
+            <!-- 弹窗：视频播放器 -->
+            <el-dialog title="视频播放" :visible.sync="videoPlayDialogVisible" @close="handleVideoPlayDialogClose" append-to-body>
+                <div style="text-align: center;">
+                    <video
+                            ref="videoPlayer"
+                            class="video-player"
+                            :src="currentVideoSrc"
+                            controls
+                            autoplay
+                            style="width:100%;max-width: 100%; height: auto;"
+                    >
+                        您的浏览器不支持视频标签。
+                    </video>
+                </div>
+            </el-dialog>
+
+
+        </el-dialog>
+    `,
+    data() {
+        return {
+            visible: false,
+            selectedCourse: null,
+
+            // 弹窗显示状态
+            chapterDialogVisible: false,
+            videoDialogVisible: false,
+
+            // 表单数据
+            chapterForm: {},
+            videoForm: {},
+
+            // 表单验证规则
+            chapterRules: {
+                title: [{required: true, message: '请输入章节标题', trigger: 'blur'}],
+                sortCode: [{required: true, message: '请输入排序码', trigger: 'blur'}]
+            },
+            videoRules: {
+                title: [{required: true, message: '请输入视频标题', trigger: 'blur'}],
+                url: [{required: true, message: '请输入视频地址', trigger: 'blur'}],
+                duration: [{required: true, message: '请输入视频时长', trigger: 'blur'}],
+                sortCode: [{required: true, message: '请输入排序码', trigger: 'blur'}]
+            },
+
+            // 数据
+            chapters: [],
+            videos: [],
+
+            // 视频播放
+            videoPlayDialogVisible: false,
+            currentVideoSrc: null
+        }
+    },
+    computed: {
+        currentChapters() {
+            if (!this.selectedCourse) return [];
+            return this.chapters.filter(chapter => chapter.courseId === this.selectedCourse.id)
+                .sort((a, b) => a.sortCode - b.sortCode);
+        }
+    },
+    methods: {
+        onOpen(selectedCourse) {
+            this.visible = true
+            this.selectedCourse = selectedCourse
+            this.listChapter()
+        },
+
+        // 查询章节
+        listChapter() {
+            this.$axios.post('/platform/edu/chapters/list', {courseId: this.selectedCourse.id}).then(res => {
+                if (res.code === 0) {
+                    this.chapters = res.data
+                }
+            })
+        },
+
+        // 新增/编辑章节
+        onOpenChapter(chapter = null) {
+            this.chapterForm = chapter ? {...chapter} : {
+                id: '',
+                courseId: this.selectedCourse.id,
+                title: '',
+                sortCode: this.currentChapters.length + 1
+            };
+            this.chapterDialogVisible = true;
+            this.$nextTick(() => {
+                this.$refs.chapterFormRef && this.$refs.chapterFormRef.clearValidate();
+            });
+        },
+
+        // 删除章节
+        deleteChapter(id) {
+            this.$confirm('此操作将永久删除该章节及其所有视频，是否继续？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.$message.success('删除成功');
+            });
+        },
+
+        // 保存章节
+        saveChapter() {
+            this.$refs.chapterFormRef.validate(valid => {
+                if (valid) {
+                    this.$axios.post('/platform/edu/chapters/' + (this.chapterForm.id ? 'update' : 'insert'), this.chapterForm).then(res => {
+                        if (res.code === 0) {
+                            this.chapterDialogVisible = false
+                            this.$message.success(res.msg)
+                            this.listChapter()
+                        }
+                    })
+                }
+            })
+        },
+
+        // 新增/编辑视频
+        onOpenVideo(chapterId, video = null) {
+            const chapter = this.chapters.find(chapter => chapter.id === chapterId)
+
+            this.videoForm = video ? {...video} : {
+                id: '',
+                chapterId: chapterId,
+                title: '',
+                url: '',
+                duration: 0,
+                sortCode: chapter ? chapter.videos.length + 1 : 1
+            };
+            this.videoDialogVisible = true;
+            this.$nextTick(() => {
+                this.$refs.videoFormRef && this.$refs.videoFormRef.clearValidate();
+            });
+        },
+
+        // 保存视频
+        saveVideo() {
+            this.$refs.videoFormRef.validate(valid => {
+                if (valid) {
+                    this.$axios.post('/platform/edu/video/' + (this.videoForm.id ? 'update' : 'insert'), this.videoForm).then(res => {
+                        if (res.code === 0) {
+                            this.videoDialogVisible = false
+                            this.$message.success(res.msg)
+                            this.listChapter()
+                        }
+                    })
+                }
+            });
+        },
+
+        // 删除视频
+        deleteVideo(id) {
+            this.$confirm('确定删除此视频吗？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.$axios.post('/platform/edu/video/delete', {id: id}).then(res => {
+                    if (res.code === 0) {
+                        this.$message.success(res.msg)
+                        this.listChapter()
+                    }
+                })
+            });
+        },
+
+        // 播放视频
+        playVideo(video) {
+            this.currentVideoSrc = video.url;
+            this.videoPlayDialogVisible = true;
+            // 确保 dialog 打开后视频能正确加载并播放（异步）
+            this.$nextTick(() => {
+                const videoEl = this.$refs.videoPlayer;
+                videoEl.load(); // 重新加载视频源
+                videoEl.play().catch(err => {
+                    console.warn('自动播放失败，需用户点击播放按钮:', err);
+                });
+            });
+        },
+
+        // 关闭视频播放对话框
+        handleVideoPlayDialogClose(){
+            const videoEl = this.$refs.videoPlayer;
+            if (videoEl) {
+                videoEl.pause();
+                videoEl.currentTime = 0;
+            }
+            // 清空 src 避免音频仍在播放（某些浏览器）
+            this.currentVideoSrc = '';
+        },
+
+        formatDuration(seconds) {
+            if (!seconds) return '0分0秒';
+            const hours = Math.floor(seconds / 3600);
+            const minutes = Math.floor((seconds % 3600) / 60);
+            const remainingSeconds = seconds % 60;
+
+            if (hours > 0) {
+                return hours + '小时' + minutes + '分' + remainingSeconds + '秒'
+            } else {
+                return minutes + '分' + remainingSeconds + '秒'
+            }
+        }
+
+    },
+    style: /*language=CSS*/ `
+
+        .edu_content_dialog .el-dialog__body {
+            height: calc(100vh - 155px);
+            overflow-y: auto;
+        }
+
+        .section-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 20px;
+            padding: 20px 20px 0;
+        }
+
+        .video-item {
+            background: #f8f9fa;
+            border: 1px solid #e9ecef;
+            border-radius: 8px;
+            padding: 15px;
+            margin-bottom: 10px;
+            transition: all 0.3s;
+        }
+
+        .video-item:hover {
+            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+            transform: translateY(-2px);
+        }
+
+        .chapter-card {
+            border: 1px solid #e4e7ed;
+            border-radius: 8px;
+            margin-bottom: 20px;
+            overflow: hidden;
+        }
+
+        .chapter-header {
+            background: #f5f7fa;
+            padding: 15px 20px;
+            border-bottom: 1px solid #e4e7ed;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+
+        .chapter-content {
+            padding: 20px;
+        }
+
+        .stats-card {
+            color: white;
+            padding: 20px;
+            border-radius: 8px;
+            text-align: center;
+            margin-bottom: 20px;
+        }
+
+        .course-cover {
+            width: 100px;
+            height: 60px;
+            object-fit: cover;
+            border-radius: 4px;
+        }
+
+        .duration-display {
+            color: #909399;
+            font-size: 12px;
+        }
+    `
+
+
+}
@@ -0,0 +1,102 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <el-card shadow="never">
+        <table-tool>
+            <el-button type="primary" size="small" icon="el-icon-plus" @click="$refs.basicFormRef.onOpen()">新增</el-button>
+        </table-tool>
+        <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+            <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+            <el-table-column prop="title" label="课程标题" min-width="150">
+                <template slot-scope="scope">
+                    <div style="display: flex; align-items: center;">
+                        <img v-if="scope.row.cover" :src="scope.row.cover" class="course-cover"
+                             style="margin-right: 10px;">
+                        <div v-else
+                             style="width: 100px; height: 60px; background: #f0f0f0; border-radius: 4px; margin-right: 10px; display: flex; align-items: center; justify-content: center; color: #999;">
+                            无封面
+                        </div>
+                        <strong>{{ scope.row.title }}</strong>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column prop="description" label="描述" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="category" label="分类" width="120">
+                <template slot-scope="scope">
+                    <el-tag size="small">{{ scope.row.category }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="disabled" label="状态" width="100" align="center">
+                <template slot-scope="scope">
+                    <el-tag :type="scope.row.disabled ? 'danger' : 'success'" size="small">
+                        {{ scope.row.disabled ? '已禁用' : '启用中' }}
+                    </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" width="300" align="center" fixed="right">
+                <template slot-scope="scope">
+                    <el-button size="mini" @click="manageCourse(scope.row)" type="primary">
+                        管理内容
+                    </el-button>
+                    <el-button size="mini" @click="$refs.basicFormRef.onOpen(scope.row)" type="primary">
+                        编辑
+                    </el-button>
+                    <el-button size="mini" @click="onDelete(scope.row.id)" type="danger">
+                        删除
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!--#include("/layouts/pagination.html"){}#-->
+    </el-card>
+
+    <basic-form ref="basicFormRef" @refresh="pageData"></basic-form>
+    <content-form ref="contentFormRef"></content-form>
+</div>
+
+<script>
+
+    <!--#include('basicForm.js'){}#-->
+    <!--#include('contentForm.js'){}#-->
+
+    new Vue({
+        el: '#app',
+        store,
+        mixins: [initTableMixins],
+        components: {
+            'basic-form': basicForm,
+            'content-form': contentForm
+        },
+        data() {
+            return {}
+        },
+        methods: {
+            manageCourse(row) {
+                this.$refs.contentFormRef.onOpen(row)
+            },
+            onDelete(id) {
+                this.$confirm('此操作将永久删除该课程及其所有章节和视频，是否继续？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    this.$axios.post('/platform/edu/courses/delete', {id}).then(res => {
+                        this.$message.success('删除成功')
+                        this.pageData()
+                    })
+                }).catch(() => {
+
+                })
+            }
+        },
+        created() {
+            this.pageData()
+        }
+    });
+</script>
+
+<!--#
+}
+#-->
@@ -0,0 +1,183 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker
+                            placeholder="选择年"
+                            style="width: 100%"
+                            type="year"
+                            v-model="pageForm.year"
+                            value-format="yyyy"
+                    ></el-date-picker>
+                </search-item>
+                <search-item label="会议名称">
+                    <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称"
+                              v-model="pageForm.searchKeyword">
+                    </el-input>
+                </search-item>
+                <search-item label="所属工会：">
+                    <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
+                               style="width: 100%">
+                        <el-option v-for="item in unionList" :key="item.id" :label="item.name"
+                                   :value="item.id"></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool label="会议列表">
+                <el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
+                    <el-radio-button :label="true">已审核</el-radio-button>
+                    <el-radio-button :label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+
+            <el-table :data="tableData" @sort-change="pageOrder">
+                <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
+                                 width="80px"></el-table-column>
+                <el-table-column label="会议名称" prop="meetingName"></el-table-column>
+                <el-table-column label="会议时间" prop="meetingTime"></el-table-column>
+                <el-table-column label="届" prop="j"></el-table-column>
+                <el-table-column label="次" prop="c"></el-table-column>
+                <el-table-column label="申请人" prop="createUserName"></el-table-column>
+                <el-table-column label="所属工会" prop="unionName"></el-table-column>
+                <el-table-column label="会议类型" prop="meetingType"></el-table-column>
+                <el-table-column label="会议时间" prop="meetingTime"></el-table-column>
+                <el-table-column label="当前节点" prop="curTaskName"></el-table-column>
+                <el-table-column label="流程状态" prop="instanceState">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" header-align="center" label="操作" prop="userOnline" width="300">
+                    <template slot-scope="{row}">
+                        <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">审核
+                        </el-button>
+                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+
+        </el-card>
+
+        <template #edit>
+            <grassroots-congress-meeting-info ref="grassrootsCongressMeetingInfoRef">
+                <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        {{formData.taskName}}
+                    </div>
+                    <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
+                             class="flow-task-form">
+                        <el-form-item label="审批意见" prop="tf_opinion"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
+                        </el-form-item>
+                    </el-form>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>
+                        <el-button @click="handleTaskAction(20)" size="small" type="danger">不同意</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
+                    </el-row>
+                </div>
+            </grassroots-congress-meeting-info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../info.js"){}#-->
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        components: {
+            "grassroots-congress-meeting-info": GRASSROOTS_CONGRESS_MEETING_INFO
+        },
+        data() {
+            return {
+                unionList: [],
+                pageForm: {
+                    year: this.$moment().format("YYYY"),
+                    approval: false
+                },
+                showApprovalForm: false,
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.grassrootsCongressMeetingInfoRef.onOpen(row)
+                })
+            },
+            openAudit(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.grassrootsCongressMeetingInfoRef.onOpen(row)
+                })
+            },
+
+            handleTaskAction(val) {
+                this.$refs.formRef.validate(valid => {
+                    if (!valid) return
+                    this.$confirm("您确定要提交吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    }).then(() => {
+                        this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.guava.index()
+                                this.$message.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    })
+                })
+            },
+
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            }
+        },
+        async created() {
+            this.unionList = await this.$businessTool.listUnion()
+            this.pageData()
+        }
+    })
+
+</script>
+
+
+<!--#
+}
+#-->
@@ -0,0 +1,117 @@
+const GRASSROOTS_CONGRESS_MEETING_INFO = {
+    template: /*language=HTML*/ `
+        <div>
+            <div class="process-title">
+                申请信息
+                <el-link type="primary" @click="openChart">点击查看流程图</el-link>
+            </div>
+            <el-descriptions :column="2" border class="margin-top" style="margin: 10px" title="">
+                <el-descriptions-item label="会议名称" span="2">
+                    <span class="item-center">  {{ viewData.meetingName }}</span>
+                </el-descriptions-item>
+                <el-descriptions-item label="类型">
+                    {{viewData.fullName}}
+                </el-descriptions-item>
+                <el-descriptions-item label="申请人">
+                    {{viewData.createUserName}}
+                </el-descriptions-item>
+                <el-descriptions-item label="申请时间">
+                    {{viewData.createTime}}
+                </el-descriptions-item>
+                <el-descriptions-item label="申请单位">
+                    {{viewData.unitName}}
+                </el-descriptions-item>
+                <el-descriptions-item label="申请工会">
+                    {{viewData.unitName}}
+                </el-descriptions-item>
+                <el-descriptions-item></el-descriptions-item>
+                <el-descriptions-item label="会议议程" span="2">
+                    <div v-html="viewData.meetingTopic"></div>
+                </el-descriptions-item>
+                <el-descriptions-item label="备注" span="2">
+                    {{viewData.meetingRemark}}
+                </el-descriptions-item>
+                <el-descriptions-item label="请示附件" span="2">
+                    <file-preview :files="viewData.files" complete_result></file-preview>
+                </el-descriptions-item>
+            </el-descriptions>
+
+            <template v-for="task in doneTasks">
+                <div class="mt10">
+                    <div class="process-title">{{ task.displayName }}</div>
+                    <el-descriptions border class="flow-task-form" :column="3" :key="task.id"
+                                     v-if="task.ext.isFirstTaskNode">
+                        <el-descriptions-item label="申请用户">{{ task.ext.initiatorName
+                            }}({{task.ext.initiatorAccount}})
+                        </el-descriptions-item>
+                        <el-descriptions-item label="申请时间">{{ task.finishTime }}</el-descriptions-item>
+                        <el-descriptions-item label="办理结果">
+                            <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
+                                      :value="task.ext.submitType"></dict-tag>
+                        </el-descriptions-item>
+                    </el-descriptions>
+
+                    <el-descriptions border class="flow-task-form" :column="3" :key="task.id" v-else>
+                        <el-descriptions-item label="办理用户">{{ task.taskFormData.userName
+                            }}({{task.taskFormData.loginName}})
+                        </el-descriptions-item>
+                        <el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
+                        <el-descriptions-item label="办理结果">
+                            <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
+                                      :value="task.ext.submitType"></dict-tag>
+                        </el-descriptions-item>
+                        <el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
+                            task.taskFormData.opinion }}
+                        </el-descriptions-item>
+                    </el-descriptions>
+                </div>
+            </template>
+
+            <slot></slot>
+
+            <snaker-chart ref="snakerChartRef"></snaker-chart>
+        </div>
+    `,
+    store,
+    dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
+    data() {
+        return {
+            visible: false,
+            viewData: {},
+            doneTasks: [],
+            row: null
+        }
+    },
+    methods: {
+        // 打开
+        onOpen(row) {
+            this.row = row
+            this.visible = true
+            this.getInfo()
+            this.getDoneTasks()
+        },
+
+        // 获取申请信息
+        getInfo() {
+            this.$axios.post('/platform/grassrootsCongress/meeting/common/info', {id: this.row.id}).then((res) => {
+                if (res.code === 0) {
+                    this.viewData = res.data
+                }
+            })
+        },
+
+        // 获取已办任务审批记录
+        getDoneTasks() {
+            this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
+                if (res.code === 0) {
+                    this.doneTasks = res.data
+                }
+            })
+        },
+
+        // 查看流程图
+        openChart() {
+            this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
+        }
+    }
+}
@@ -0,0 +1,124 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker placeholder="选择年" style="width: 100%" type="year" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
+                </search-item>
+                <search-item label="会议名称">
+                    <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称" v-model="pageForm.searchKeyword"></el-input>
+                </search-item>
+            </search>
+        </el-card>
+
+        <el-card shadow="never">
+            <table-tool label="会议列表"></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder">
+                <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index" width="80px"></el-table-column>
+                <el-table-column label="会议名称" prop="meetingName"></el-table-column>
+                <el-table-column label="会议时间" prop="meetingTime"></el-table-column>
+                <el-table-column label="届" prop="j"></el-table-column>
+                <el-table-column label="次" prop="c"></el-table-column>
+                <el-table-column label="申请人" prop="createUserName"></el-table-column>
+                <el-table-column label="所属工会" prop="unionName"></el-table-column>
+                <el-table-column label="会议类型" prop="meetingType"></el-table-column>
+                <el-table-column label="会议时间" prop="meetingTime"></el-table-column>
+                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" header-align="center" label="操作" prop="userOnline" width="300">
+                    <template slot-scope="{row}">
+                        <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">
+                            编辑
+                        </el-button>
+                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
+                        </el-button>
+                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #public>
+            <info ref="infoRef"></info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../info.js"){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            info: GRASSROOTS_CONGRESS_MEETING_INFO
+        },
+        data() {
+            return {
+                pageForm: {
+                    year: this.$moment().format("YYYY")
+                },
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+
+            onEdit(row) {
+                window.location.href = '/platform/grassrootsCongress/meeting/write?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+            },
+
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
+
+            onDelete(id) {
+                this.$confirm("您确定要删除吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/grassrootsCongress/meeting/mine/delete", {id}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            }
+
+        },
+        async created() {
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
@@ -0,0 +1,83 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker placeholder="选择年" style="width: 100%" type="year" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
+                </search-item>
+                <search-item label="会议名称">
+                    <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称" v-model="pageForm.searchKeyword"></el-input>
+                </search-item>
+            </search>
+        </el-card>
+
+        <el-card shadow="never">
+            <table-tool label="会议列表"></table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder">
+                <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index" width="80px"></el-table-column>
+                <el-table-column label="会议名称" prop="meetingName"></el-table-column>
+                <el-table-column label="会议时间" prop="meetingTime"></el-table-column>
+                <el-table-column label="届" prop="j"></el-table-column>
+                <el-table-column label="次" prop="c"></el-table-column>
+                <el-table-column label="申请人" prop="createUserName"></el-table-column>
+                <el-table-column label="所属工会" prop="unionName"></el-table-column>
+                <el-table-column label="会议类型" prop="meetingType"></el-table-column>
+                <el-table-column label="会议时间" prop="meetingTime"></el-table-column>
+                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="100" fixed="right">
+                    <template slot-scope="{row}">
+                        <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+
+        <template #public>
+            <info ref="infoRef"></info>
+        </template>
+    </guava>
+</div>
+
+<script>
+    <!--#include("../info.js"){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        mixins: [initTableMixins],
+        components: {
+            info: GRASSROOTS_CONGRESS_MEETING_INFO
+        },
+        data() {
+            return {
+                pageForm: {
+                    year: this.$moment().format("YYYY")
+                },
+            }
+        },
+        methods: {
+            openView(row) {
+                this.$refs.guava.public(() => {
+                    this.$refs.infoRef.onOpen(row)
+                })
+            }
+        },
+        async created() {
+            this.pageData()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
@@ -0,0 +1,239 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<div id="app" v-cloak>
+    <guava>
+        <el-card shadow="never">
+            <snaker-start slot="header" label="双代会请示" define_key="JCSDH"></snaker-start>
+            <el-form :model="formData" :rules="formRules" label-width="120px" ref="formRef">
+                <el-row :gutter="40">
+                    <el-col :span="12">
+                        <el-form-item label="届数" prop="j">
+                            <dict-select @change="jChange" code="TEACHER_CONGRESS_J"
+                                         v-model="formData.j"></dict-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+
+                        <el-form-item label="次数" prop="c">
+                            <dict-select @change="cChange" code="TEACHER_CONGRESS_C"
+                                         v-model="formData.c"></dict-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="会议名称" prop="meetingName">
+                            <el-input
+                                    clearable
+                                    maxlength="100"
+                                    placeholder="请填写会议名称"
+                                    v-model="formData.meetingName">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="类型" prop="meetingType">
+                            <el-radio-group v-model="formData.meetingType">
+                                <el-radio-button label="换届会">换届会</el-radio-button>
+                                <el-radio-button label="届中会">届中会</el-radio-button>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="申请单位" prop="unitName">
+                            <el-input :clearable="false"
+                                      placeholder="申请单位"
+                                      readonly
+                                      v-model="formData.unitName">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="所在工会" prop="unionName">
+                            <el-input :clearable="false"
+                                      placeholder="所在工会"
+                                      readonly
+                                      v-model="formData.unionName">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="会议时间" prop="meetingTime">
+                            <el-date-picker
+                                    :clearable="false"
+                                    format="yyyy-MM-dd HH:mm"
+                                    placeholder="选择会议时间"
+                                    style="width: 100%"
+                                    type="datetime"
+                                    v-model="formData.meetingTime"
+                                    value-format="yyyy-MM-dd HH:mm">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="申请时间" prop="createTime">
+                            <el-input :clearable="false"
+                                      placeholder="申请时间"
+                                      readonly
+                                      v-model="formData.createTime">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="会议议程" prop="meetingTopic">
+                            <text-editor v-model="formData.meetingTopic"></text-editor>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="备注" prop="meetingRemark">
+                            <el-input :rows="4" maxlength="500" placeholder="请输入备注" type="textarea"
+                                      v-model="formData.meetingRemark"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="请示附件" prop="files">
+                            <file-upload
+                                    :value.sync="formData.files"
+                                    :upload_number="1"
+                                    upload_result_category="array"
+                                    complete_result
+                                    upload_mode="drag"
+                                    accept=".doc,.docx,.xls,.xlsx,.pdf"
+                            >
+                            </file-upload>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <el-row type="flex" justify="end" class="mt20">
+                <el-button type="primary" plain @click="onSave">保存</el-button>
+                <el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
+                <el-button type="primary" @click="submitAgain" v-else>提交1</el-button>
+            </el-row>
+        </el-card>
+    </guava>
+</div>
+
+<script>
+    new Vue({
+        el: "#app",
+        store,
+        data() {
+            return {
+                bizId: GetQueryString("bizId"),
+                taskId: GetQueryString("taskId"),
+                formRules: {
+                    meetingName: [{required: true, message: "请填写会议名称", trigger: ["blur", "change"]}],
+                    meetingTime: [{required: true, message: "请填写会议时间", trigger: ["blur", "change"]}],
+                    meetingTopic: [{required: true, message: "请填写会议议程", trigger: ["blur", "change"]}],
+                    files: [{required: true, message: "必填", trigger: ["change", "blur"]}],
+                    j: [{required: true, message: "请填写届数", trigger: ["blur", "change"]}],
+                    c: [{required: true, message: "请填写次数", trigger: ["blur", "change"]}]
+                },
+                formData: {
+                    j: "",
+                    c: "",
+                    files: [],
+                    meetingName: "",
+                    meetingType: "届中会"
+                }
+            }
+        },
+        methods: {
+            // 保存
+            onSave() {
+                this.$confirm("您确定保存吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post('/platform/grassrootsCongress/meeting/write/save', {data: JSON.stringify(this.formData)}).then(res => {
+                        if (res.code === 0) {
+                            this.$message.success("保存成功")
+                            window.location.href = '/platform/grassrootsCongress/meeting/mine'
+                        }
+                    })
+                })
+            },
+
+            // 提交
+            onSubmit() {
+                this.$refs.formRef.validate(valid => {
+                    if (!valid) return
+                    this.$confirm("您确定要提交吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    }).then(() => {
+                        this.$axios.post('/platform/grassrootsCongress/meeting/write/submit', {
+                            data: JSON.stringify(this.formData)
+                        }).then(res => {
+                            if (res.code === 0) {
+                                this.$message.success("提交成功")
+                                window.location.href = '/platform/grassrootsCongress/meeting/mine'
+                            }
+                        })
+                    })
+                })
+            },
+
+            // 提交
+            submitAgain() {
+                this.$refs.formRef.validate(valid => {
+                    if (!valid) return
+                    this.$confirm("您确定要提交吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    }).then(() => {
+                        this.$axios.post('/platform/grassrootsCongress/meeting/write/submitAgain', {
+                            data: JSON.stringify(this.formData),
+                            taskId: GetQueryString("taskId")
+                        }).then(res => {
+                            if (res.code === 0) {
+                                this.$message.success("提交成功")
+                                window.location.href = '/platform/grassrootsCongress/meeting/mine'
+                            }
+                        })
+                    })
+                })
+            },
+
+
+            jChange() {
+                const j = this.formData.j ? "第" + this.formData.j : ""
+                const c = this.formData.c ? "第" + this.formData.c : ""
+                this.formData.meetingName = "关于召开" + this.formData.unitName + j + c + "教职工代表大会、工会会员代表大会的请示"
+            },
+            cChange() {
+                const j = this.formData.j ? "第" + this.formData.j : ""
+                const c = this.formData.c ? "第" + this.formData.c : ""
+                this.formData.meetingName = "关于召开" + this.formData.unitName + j + c + "教职工代表大会、工会会员代表大会的请示"
+            },
+
+            // 初始化
+            init() {
+                if (this.bizId) {
+                    this.$axios.post("/platform/grassrootsCongress/meeting/write/info", {id: this.bizId}).then((res) => {
+                        if (res.code === 0) {
+                            this.formData = res.data
+                        }
+                    })
+                } else {
+                    this.$set(this.formData, "createTime", this.$moment(new Date()).format("YYYY-MM-DD"))
+                    this.$set(this.formData, "unionId", this.$store.state.user.union.id)
+                    this.$set(this.formData, "unionName", this.$store.state.user.union.name)
+                    this.$set(this.formData, "unitId", this.$store.state.user.unit.id)
+                    this.$set(this.formData, "unitName", this.$store.state.user.unit.name)
+                }
+            }
+        },
+        created() {
+            this.init()
+        }
+    })
+</script>
+
+<!--#
+}
+#-->
@@ -45,7 +45,13 @@ layout("/layouts/platform.html"){
                    show-overflow-tooltip
                    v-for="column in tableColumns"
                ></el-table-column>
-                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
                <el-table-column align="center" header-align="center" label="操作" prop="userOnline" width="300">
                    <template slot-scope="{row}">
                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
@@ -13,90 +13,97 @@ layout("/layouts/platform.html"){
        <el-card shadow="never">
            <search @search="doSearch">
                <search-item label="教代会">
-                    <el-select @change="meetingChange" clearable filterable placeholder="所属教代会" v-model="pageForm.sessionId">
-                        <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+                    <el-select @change="meetingChange" clearable filterable placeholder="所属教代会"
+                               v-model="pageForm.sessionId">
+                        <el-option :key="item.id" :label="item.fullName" :value="item.id"
+                                   v-for="item in sessionOptions"></el-option>
                    </el-select>
                </search-item>
                <search-item label="提案名称">
                    <el-input
-                        @keyup.enter.native="doSearch"
-                        clearable
-                        placeholder="请输入提案名称"
-                        v-model="pageForm.name"
-                        style="width: 100%"
+                            @keyup.enter.native="doSearch"
+                            clearable
+                            placeholder="请输入提案名称"
+                            v-model="pageForm.name"
+                            style="width: 100%"
                    ></el-input>
                </search-item>
                <search-item label="提案编码">
                    <el-input
-                        @keyup.enter.native="doSearch"
-                        clearable
-                        placeholder="请输入提案编码"
-                        v-model="pageForm.code"
-                        style="width: 100%"
+                            @keyup.enter.native="doSearch"
+                            clearable
+                            placeholder="请输入提案编码"
+                            v-model="pageForm.code"
+                            style="width: 100%"
                    ></el-input>
                </search-item>
                <search-item label="提案人姓名">
                    <el-input
-                        @keyup.enter.native="doSearch"
-                        clearable
-                        placeholder="请输入提案人姓名"
-                        v-model="pageForm.createUserName"
-                        style="width: 100%"
+                            @keyup.enter.native="doSearch"
+                            clearable
+                            placeholder="请输入提案人姓名"
+                            v-model="pageForm.createUserName"
+                            style="width: 100%"
                    ></el-input>
                </search-item>
                <search-item label="提案人工号">
                    <el-input
-                        @keyup.enter.native="doSearch"
-                        clearable
-                        placeholder="请输入提案人工号"
-                        v-model="pageForm.createUserLoginName"
-                        style="width: 100%"
+                            @keyup.enter.native="doSearch"
+                            clearable
+                            placeholder="请输入提案人工号"
+                            v-model="pageForm.createUserLoginName"
+                            style="width: 100%"
                    ></el-input>
                </search-item>
                <search-item label="代表团">
                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
-                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in delegationOptions"></el-option>
+                        <el-option :key="item.id" :label="item.name" :value="item.id"
+                                   v-for="item in delegationOptions"></el-option>
                    </el-select>
                </search-item>
                <search-item label="提案分工会">
-                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId" @change="pageForm.unitId=null;listUnit();">
-                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unionOptions"></el-option>
+                    <el-select clearable filterable placeholder="分工会" v-model="pageForm.unionId"
+                               @change="pageForm.unitId=null;listUnit();">
+                        <el-option :key="item.id" :label="item.name" :value="item.id"
+                                   v-for="item in unionOptions"></el-option>
                    </el-select>
                </search-item>
                <search-item label="提案单位">
                    <el-select clearable filterable placeholder="提案单位" v-model="pageForm.unitId">
-                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
+                        <el-option :key="item.id" :label="item.name" :value="item.id"
+                                   v-for="item in unitOptions"></el-option>
                    </el-select>
                </search-item>
                <search-item label="承办单位">
                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
-                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>
+                        <el-option :key="item.code" :label="item.name" :value="item.id"
+                                   v-for="item in underTakeOptions"></el-option>
                    </el-select>
                </search-item>
            </search>
        </el-card>
        <el-card shadow="never">
            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
-                <div style="width: 90px">提案类别</div>
-                <div style="flex: auto">
+                <div style="width: 90px;margin-right: 10px">提案类别</div>
+                <div style="flex: 1;display: flex;gap: 5px;">
                    <el-tag
-                        v-for="item in typeOptions"
-                        :key="item.code"
-                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
-                        @click="tagToggle('typeIds',item.id)"
+                            v-for="item in typeOptions"
+                            :key="item.code"
+                            :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                            @click="tagToggle('typeIds',item.id)"
                    >
                        {{ item.name }}
                    </el-tag>
                </div>
            </div>
            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
-                <div style="width: 90px">立案结果</div>
-                <div style="flex: auto">
+                <div style="width: 90px;margin-right: 10px">立案结果</div>
+                <div style="flex: 1;display: flex;gap: 5px;">
                    <el-tag
-                        v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
-                        :key="item.code"
-                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
-                        @click="tagToggle('caseFilingResults',item.code)"
+                            v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
+                            :key="item.code"
+                            :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                            @click="tagToggle('caseFilingResults',item.code)"
                    >
                        {{ item.label }}
                    </el-tag>
@@ -106,9 +113,12 @@ layout("/layouts/platform.html"){
        <el-card shadow="never">
            <table-tool>
                <el-button type="primary" size="small" @click="exportAllProposalAsZip">导出全部提案压缩包</el-button>
-                <el-button type="primary" size="small" @click="exportAllProposalFeedBackAsZip">导出全部提案反馈表压缩包</el-button>
+                <el-button type="primary" size="small" @click="exportAllProposalFeedBackAsZip">
+                    导出全部提案反馈表压缩包
+                </el-button>
                <el-button type="primary" size="small" @click="exportProposalSummaryAsExcel">导出汇总表</el-button>
-                <el-button type="primary" size="small" @click="exportProposalRegisterSummaryAsExcel">导出立案汇总表</el-button>
+                <el-button type="primary" size="small" @click="exportProposalRegisterSummaryAsExcel">导出立案汇总表
+                </el-button>
            </table-tool>
            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
@@ -120,7 +130,8 @@ layout("/layouts/platform.html"){
                <el-table-column label="代表团" prop="delegationName"></el-table-column>
                <el-table-column label="立案结果" prop="caseFilingResult">
                    <template scope="{row}">
-                        <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT" :value="row.caseFilingResult"></dict-tag>
+                        <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
+                                  :value="row.caseFilingResult"></dict-tag>
                    </template>
                </el-table-column>
                <el-table-column label="是否并案" prop="isConsolidation">
@@ -131,7 +142,8 @@ layout("/layouts/platform.html"){
                </el-table-column>
                <el-table-column label="主办单位" prop="masterUnderTakeName" show-overflow-tooltip></el-table-column>
                <el-table-column label="协办单位" prop="slaveUnderTakeNames" show-overflow-tooltip></el-table-column>
-                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="当前节点" prop="processInstanceNodeName"
+                                 show-overflow-tooltip></el-table-column>
                <el-table-column label="操作" fixed="right" width="200px">
                    <template scope="{row}">
                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
@@ -156,7 +168,7 @@ layout("/layouts/platform.html"){
        store,
        mixins: [initTableMixins],
        components: {
-            "proposal-info": PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
        },
        data() {
            return {
@@ -179,7 +191,7 @@ layout("/layouts/platform.html"){
        methods: {
            openView(row) {
                this.$refs.guava.view(() => {
-                    this.$refs.infoRef.onOpen(row.id)
+                    this.$refs.infoRef.onOpen(row)
                })
            },
            exportAllProposalAsZip() {
@@ -193,7 +205,7 @@ layout("/layouts/platform.html"){
                })
            },
            exportDocx(id) {
-                this.$downLoad("/platform/proposal/common/exportProposalAsDocx", { id })
+                this.$downLoad("/platform/proposal/common/exportProposalAsDocx", {id})
            },
            exportProposalSummaryAsExcel() {
                this.$downLoad("/platform/proposal/export/comprehensive/exportProposalSummaryAsExcel", {
@@ -228,7 +240,7 @@ layout("/layouts/platform.html"){
                this.listDelegation()
            },
            listDelegation() {
-                this.$axios.post("/platform/proposal/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
+                this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => {
                    if (res.code === 0) {
                        this.delegationOptions = res.data
                    }
@@ -72,28 +72,28 @@ layout("/layouts/platform.html"){
        </el-card>
        <el-card shadow="never">
            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
-                <div style="width: 90px">提案类别</div>
-                <div style="flex: auto">
+                <div style="width: 90px;margin-right: 10px">提案类别</div>
+                <div style="flex: 1;display: flex;gap: 5px;">
                    <el-tag
-                        v-for="item in typeOptions"
-                        :key="item.code"
-                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
-                        @click="tagToggle('typeIds',item.id)"
+                            v-for="item in typeOptions"
+                            :key="item.code"
+                            :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                            @click="tagToggle('typeIds',item.id)"
                    >
                        {{ item.name }}
                    </el-tag>
                </div>
            </div>
            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
-                <div style="width: 90px">征集状态</div>
-                <div style="flex: auto">
+                <div style="width: 90px;margin-right: 10px">立案结果</div>
+                <div style="flex: 1;display: flex;gap: 5px;">
                    <el-tag
-                        v-for="item in collectOptions"
-                        :key="item.code"
-                        :effect="pageForm.collectIds && pageForm.collectIds.includes(item.id) ? 'dark':'plain'"
-                        @click="tagToggle('collectIds',item.id)"
+                            v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
+                            :key="item.code"
+                            :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                            @click="tagToggle('caseFilingResults',item.code)"
                    >
-                        {{ item.name }}
+                        {{ item.label }}
                    </el-tag>
                </div>
            </div>
@@ -132,7 +132,7 @@ layout("/layouts/platform.html"){
        store,
        mixins: [initTableMixins],
        components: {
-            "proposal-info": PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
        },
        data() {
            return {
@@ -145,7 +145,7 @@ layout("/layouts/platform.html"){
                unitOptions: [],
                pageForm: {
                    typeIds: [],
-                    collectIds: [],
+                    caseFilingResults: [],
                    unionId: null,
                    unitId: null
                }
@@ -154,7 +154,7 @@ layout("/layouts/platform.html"){
        methods: {
            openView(row) {
                this.$refs.guava.view(() => {
-                    this.$refs.infoRef.onOpen(row.id)
+                    this.$refs.infoRef.onOpen(row)
                })
            },
            tagToggle(key, val) {
@@ -68,35 +68,35 @@ layout("/layouts/platform.html"){
                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
                    </el-select>
                </search-item>
-                <search-item label="承办单位">
-                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
-                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>
-                    </el-select>
-                </search-item>
+<!--                <search-item label="承办单位">-->
+<!--                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">-->
+<!--                        <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>-->
+<!--                    </el-select>-->
+<!--                </search-item>-->
            </search>
        </el-card>
        <el-card shadow="never">
            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
-                <div style="width: 90px">提案类别</div>
-                <div style="flex: auto">
+                <div style="width: 90px;margin-right: 10px">提案类别</div>
+                <div style="flex: 1;display: flex;gap: 5px;">
                    <el-tag
-                        v-for="item in typeOptions"
-                        :key="item.code"
-                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
-                        @click="tagToggle('typeIds',item.id)"
+                            v-for="item in typeOptions"
+                            :key="item.code"
+                            :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                            @click="tagToggle('typeIds',item.id)"
                    >
                        {{ item.name }}
                    </el-tag>
                </div>
            </div>
            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
-                <div style="width: 90px">立案结果</div>
-                <div style="flex: auto">
+                <div style="width: 90px;margin-right: 10px">立案结果</div>
+                <div style="flex: 1;display: flex;gap: 5px;">
                    <el-tag
-                        v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
-                        :key="item.code"
-                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
-                        @click="tagToggle('caseFilingResults',item.code)"
+                            v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
+                            :key="item.code"
+                            :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                            @click="tagToggle('caseFilingResults',item.code)"
                    >
                        {{ item.label }}
                    </el-tag>
@@ -123,9 +123,15 @@ layout("/layouts/platform.html"){
                        <el-tag size="mini" v-else type="danger">否</el-tag>
                    </template>
                </el-table-column>
-                <el-table-column label="主办单位" prop="masterUnderTakeName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="协办单位" prop="slaveUnderTakeNames" show-overflow-tooltip></el-table-column>
-                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="主办单位" prop="masterUnitName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="协办单位" prop="slaveUnitNames" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
                <el-table-column label="操作" fixed="right" width="200px">
                    <template scope="{row}">
                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
@@ -150,7 +156,7 @@ layout("/layouts/platform.html"){
        store,
        mixins: [initTableMixins],
        components: {
-            "proposal-info": PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
        },
        data() {
            return {
@@ -171,7 +177,7 @@ layout("/layouts/platform.html"){
        methods: {
            openView(row) {
                this.$refs.guava.view(() => {
-                    this.$refs.infoRef.onOpen(row.id)
+                    this.$refs.infoRef.onOpen(row)
                })
            },
            exportDocx(id) {
@@ -88,7 +88,7 @@ layout("/layouts/platform.html"){
        },
        components: {
            "proposal-table": PROPOSAL_TABLE,
-            "proposal-info": PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
        },
        methods: {
            openView(row) {
@@ -102,7 +102,7 @@ layout("/layouts/platform.html"){
            viewSingleProposal(row) {
                this.proposalInfoVisible = true
                this.$nextTick(() => {
-                    this.$refs.infoRef.onOpen(row.id)
+                    this.$refs.infoRef.onOpen(row)
                })
            },
            listSession() {
@@ -9,7 +9,7 @@ const PROPOSAL_TABLE = {
                <el-table-column label="提案类别" prop="typeName"></el-table-column>
                <el-table-column label="届次" prop="sessionName"></el-table-column>
                <el-table-column label="代表团" prop="delegationName"></el-table-column>
-                <el-table-column label="当前节点" prop="processInstanceNodeName"></el-table-column>
+                <el-table-column label="当前节点" prop="curTaskName"></el-table-column>
                <el-table-column label="操作" fixed="right" width="100px">
                    <template scope="{row}">
                        <el-button size="mini" type="primary" @click="$emit('view-single-proposal',row)">查看</el-button>
@@ -68,35 +68,35 @@ layout("/layouts/platform.html"){
                        <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
                    </el-select>
                </search-item>
-                <search-item label="承办单位">
-                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">
-                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>
-                    </el-select>
-                </search-item>
+<!--                <search-item label="承办单位">-->
+<!--                    <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">-->
+<!--                        <el-option :key="item.code" :label="item.name" :value="item.code" v-for="item in underTakeOptions"></el-option>-->
+<!--                    </el-select>-->
+<!--                </search-item>-->
            </search>
        </el-card>
        <el-card shadow="never">
            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
-                <div style="width: 90px">提案类别</div>
-                <div style="flex: auto">
+                <div style="width: 90px;margin-right: 10px">提案类别</div>
+                <div style="flex: 1;display: flex;gap: 5px;">
                    <el-tag
-                        v-for="item in typeOptions"
-                        :key="item.code"
-                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
-                        @click="tagToggle('typeIds',item.id)"
+                            v-for="item in typeOptions"
+                            :key="item.code"
+                            :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                            @click="tagToggle('typeIds',item.id)"
                    >
                        {{ item.name }}
                    </el-tag>
                </div>
            </div>
            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
-                <div style="width: 90px">立案结果</div>
-                <div style="flex: auto">
+                <div style="width: 90px;margin-right: 10px">立案结果</div>
+                <div style="flex: 1;display: flex;gap: 5px;">
                    <el-tag
-                        v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
-                        :key="item.code"
-                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
-                        @click="tagToggle('caseFilingResults',item.code)"
+                            v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
+                            :key="item.code"
+                            :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                            @click="tagToggle('caseFilingResults',item.code)"
                    >
                        {{ item.label }}
                    </el-tag>
@@ -123,7 +123,15 @@ layout("/layouts/platform.html"){
                        <el-tag size="mini" v-else type="danger">否</el-tag>
                    </template>
                </el-table-column>
-                <el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="主办单位" prop="masterUnitName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="协办单位" prop="slaveUnitNames" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
                <el-table-column label="操作" fixed="right" width="200px">
                    <template scope="{row}">
                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
@@ -148,7 +156,7 @@ layout("/layouts/platform.html"){
        store,
        mixins: [initTableMixins],
        components: {
-            "proposal-info": PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
        },
        data() {
            return {
@@ -169,7 +177,7 @@ layout("/layouts/platform.html"){
        methods: {
            openView(row) {
                this.$refs.guava.view(() => {
-                    this.$refs.infoRef.onOpen(row.id)
+                    this.$refs.infoRef.onOpen(row)
                })
            },
            exportDocx(id) {
@@ -44,7 +44,7 @@ layout("/layouts/platform.html"){
        el: "#app",
        mixins: [initTableMixins],
        components: {
-            "proposal-info": PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
        },
        data() {
            return {
@@ -77,26 +77,26 @@ layout("/layouts/platform.html"){
        </el-card>
        <el-card shadow="never">
            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
-                <div style="width: 90px">提案类别</div>
-                <div style="flex: auto">
+                <div style="width: 90px;margin-right: 10px">提案类别</div>
+                <div style="flex: 1;display: flex;gap: 5px;">
                    <el-tag
-                        v-for="item in typeOptions"
-                        :key="item.code"
-                        :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
-                        @click="tagToggle('typeIds',item.id)"
+                            v-for="item in typeOptions"
+                            :key="item.code"
+                            :effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
+                            @click="tagToggle('typeIds',item.id)"
                    >
                        {{ item.name }}
                    </el-tag>
                </div>
            </div>
            <div style="display: flex; align-items: center; min-height: 70px; border-bottom: 1px dashed rgb(230, 230, 230)">
-                <div style="width: 90px">立案结果</div>
-                <div style="flex: auto">
+                <div style="width: 90px;margin-right: 10px">立案结果</div>
+                <div style="flex: 1;display: flex;gap: 5px;">
                    <el-tag
-                        v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
-                        :key="item.code"
-                        :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
-                        @click="tagToggle('caseFilingResults',item.code)"
+                            v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
+                            :key="item.code"
+                            :effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
+                            @click="tagToggle('caseFilingResults',item.code)"
                    >
                        {{ item.label }}
                    </el-tag>
@@ -107,8 +107,8 @@ layout("/layouts/platform.html"){
            <table-tool>
                <el-button type="primary" size="small" @click="exportYearReport">导出提案报告</el-button>
            </table-tool>
-            <el-table :data="tableData" @sort-change="pageOrder" size="small" header-align="center" style="width: 100%" row-key="id">
-                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50px" type="index" :index="indexMethod"></el-table-column>
                <el-table-column label="提案编号" prop="code" width="200px"></el-table-column>
                <el-table-column label="提案名称" prop="name"></el-table-column>
                <el-table-column label="提案人" prop="createUserName"></el-table-column>
@@ -152,7 +152,7 @@ layout("/layouts/platform.html"){
        store,
        mixins: [initTableMixins],
        components: {
-            "proposal-info": PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
        },
        data() {
            return {
@@ -173,7 +173,7 @@ layout("/layouts/platform.html"){
        methods: {
            openView(row) {
                this.$refs.guava.view(() => {
-                    this.$refs.infoRef.onOpen(row.id)
+                    this.$refs.infoRef.onOpen(row)
                })
            },
            exportYearReport() {
@@ -171,7 +171,7 @@ layout("/layouts/platform.html"){
        store,
        mixins: [initTableMixins],
        components: {
-            "proposal-info": PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
        },
        data() {
            return {
@@ -193,12 +193,11 @@ layout("/layouts/platform.html"){
        methods: {
            openView(row) {
                this.$refs.guava.view(() => {
-                    this.$refs.infoRef.onOpen(row.id)
+                    this.$refs.infoRef.onOpen(row)
                })
            },
            onOpenEdit(row) {
-                this.$refs.guava.edit()
-                this.$nextTick(() => {
+                this.$refs.guava.edit(()=>{
                    this.formData = { ...row }
                })
            },
@@ -73,8 +73,8 @@ layout("/layouts/platform.html"){
        </el-card>
        <el-card shadow="never">
            <table-tool></table-tool>
-            <el-table :data="tableData" @sort-change="pageOrder" size="small" header-align="center" style="width: 100%" row-key="id">
-                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod"></el-table-column>
                <el-table-column label="提案编号" prop="code" width="200px"></el-table-column>
                <el-table-column label="提案名称" prop="name"></el-table-column>
                <el-table-column label="提案人" prop="createUserName"></el-table-column>
@@ -116,7 +116,7 @@ layout("/layouts/platform.html"){
        store,
        mixins: [initTableMixins],
        components: {
-            "proposal-info": PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
        },
        data() {
            return {
@@ -73,8 +73,8 @@ layout("/layouts/platform.html"){
        </el-card>
        <el-card shadow="never">
            <table-tool></table-tool>
-            <el-table :data="tableData" @sort-change="pageOrder" size="small" header-align="center" style="width: 100%" row-key="id">
-                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+            <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%" row-key="id">
+                <el-table-column label="序号" width="50px" type="index" :index="indexMethod"></el-table-column>
                <el-table-column label="提案编号" prop="code" width="200px"></el-table-column>
                <el-table-column label="提案名称" prop="name">
                    <template scope="{row}">
@@ -112,7 +112,7 @@ layout("/layouts/platform.html"){
        </template>
    </guava>

-    <el-dialog title="修改提案类别" :close-on-click-modal="false" width="40%" :visible.sync="typeDialog">
+    <el-dialog title="修改提案类型" :close-on-click-modal="false" width="40%" :visible.sync="typeDialog">
        <el-form :model="formData" ref="form" label-width="120px">
            <el-form-item prop="oldTypeName" label="原类型">
                <el-input disabled :value="formData.oldTypeName" type="text"></el-input>
@@ -138,7 +138,7 @@ layout("/layouts/platform.html"){
        store,
        mixins: [initTableMixins],
        components: {
-            "proposal-info": PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
        },
        data() {
            return {
@@ -162,8 +162,7 @@ layout("/layouts/platform.html"){
        methods: {
            onOpen(row) {
                this.$refs.guava.view(() => {
-                    this.$refs.infoRef.onOpen(row.id)
-                    this.showApprovalForm = false
+                    this.$refs.infoRef.onOpen(row)
                })
            },
            onOpenEdit(row) {
@@ -186,7 +186,8 @@ layout("/layouts/platform.html"){
                            ...this.formData,
                            submitType: val,
                            tf_hostUnitName: this.formData.tf_hostUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_hostUnitId)?.name : null,
-                            tf_helpUnitNames: this.formData.tf_helpUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name)
+                            tf_helpUnitNames: this.formData.tf_helpUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
+                            tf_helpUnitNameStr: this.formData.tf_helpUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
                        })
                    }).then((res) => {
                        if (res.code === 0) {
@@ -7,11 +7,14 @@ layout("/layouts/platform.html"){
        <el-card shadow="never">
            <search @search="doSearch">
                <search-item label="提案名称">
-                    <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>
+                    <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
+                              style="width: 100%"></el-input>
                </search-item>
                <search-item label="教代会">
-                    <el-select @change="meetingChange" clearable filterable placeholder="所属教代会" v-model="pageForm.sessionId">
-                        <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+                    <el-select @change="meetingChange" clearable filterable placeholder="所属教代会"
+                               v-model="pageForm.sessionId">
+                        <el-option :key="item.id" :label="item.fullName" :value="item.id"
+                                   v-for="item in sessionOptions"></el-option>
                    </el-select>
                </search-item>
            </search>
@@ -113,22 +116,25 @@ layout("/layouts/platform.html"){
            },

            handleTaskAction(val) {
-                this.$confirm("您确定要提交吗？", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(() => {
-                    this.$axios.post("/flow/common/executeTask", {
-                        data: JSON.stringify({
-                            ...this.formData,
-                            submitType: val
+                this.$refs.formRef.validate(valid => {
+                    if (!valid) return
+                    this.$confirm("您确定要提交吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    }).then(() => {
+                        this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.guava.index()
+                                this.$message.success(res.msg)
+                                this.doSearch()
+                            }
                        })
-                    }).then((res) => {
-                        if (res.code === 0) {
-                            this.$refs.guava.index()
-                            this.$message.success(res.msg)
-                            this.doSearch()
-                        }
                    })
                })
            },
@@ -146,10 +152,42 @@ layout("/layouts/platform.html"){
                        }
                    })
                })
+            },
+
+            // 教代会
+            async meetingChange(val) {
+                this.formData.delegationId = null
+                this.formData.committeeId = null
+                this.listDelegation()
+            },
+
+            // 代表团
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+
+            // 查询开启的教代会
+            listOpenSession() {
+                this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
            }
+
        },
        created() {
            this.pageData()
+            this.listOpenSession()
        }
    })
 </script>
@@ -91,7 +91,7 @@ layout("/layouts/platform.html"){
        methods: {
            openView(row) {
                this.$refs.guava.view(() => {
-                    this.$refs.infoRef.onOpen(row.id)
+                    this.$refs.infoRef.onOpen(row)
                })
            },
            openEdit(row) {
@@ -8,7 +8,8 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
                              clearable></el-input>
                </el-col>
                <el-col :span="6">
-                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
+                    <el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId"
+                               style="width: 100%">
                        <el-option :key="item.id" :label="item.name" :value="item.id"
                                   v-for="item in delegationOptions"></el-option>
                    </el-select>
@@ -27,10 +28,10 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
                    <el-radio-button :label="false">可邀请</el-radio-button>
                </el-radio-group>
            </table-tool>
-            <el-table :data="tableData" ref="tableRef" @sort-change="pageOrder" size="small" header-align="center"
+            <el-table :data="tableData" ref="tableRef" @sort-change="pageOrder" header-align="center"
                      style="width: 100%" :row-key="getRowKey">
                <el-table-column type="selection" reserve-selection v-if="!pageForm.isInvite"></el-table-column>
-                <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
+                <el-table-column label="序号" width="50px" type="index" :index="indexMethod"></el-table-column>
                <el-table-column label="工号" prop="loginName"></el-table-column>
                <el-table-column label="姓名" prop="userName"></el-table-column>
                <el-table-column label="性别" prop="sex"></el-table-column>
@@ -95,6 +96,7 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
                this.$message.warning("请先选择附议人后在点击邀请")
                return
            }
+
            const loginNames = selection.map((s) => s.loginName)
            const userName = selection.map((s) => s.userName)
            this.$confirm("您确定要邀请" + userName.join("、") + "代表附议吗？", "提示", {
@@ -117,18 +119,16 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
            })
        },
        pageData() {
-            this.$axios
-                .post(loc() + "/listSeconder", {
-                    ...this.pageForm,
-                    sessionId: this.record.sessionId,
-                    proposalId: this.record.id
-                })
-                .then((res) => {
-                    if (res.code === 0) {
-                        this.tableData = res.data.list
-                        this.pageForm.totalCount = res.data.totalCount
-                    }
-                })
+            this.$axios.post("/platform/proposal/mine/listSeconder", {
+                ...this.pageForm,
+                sessionId: this.record.sessionId,
+                proposalId: this.record.id
+            }).then((res) => {
+                if (res.code === 0) {
+                    this.tableData = res.data.list
+                    this.pageForm.totalCount = res.data.totalCount
+                }
+            })
        },

        //查询代表团
@@ -7,11 +7,14 @@ layout("/layouts/platform.html"){
        <el-card shadow="never">
            <search @search="doSearch">
                <search-item label="提案名称">
-                    <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable style="width: 100%"></el-input>
+                    <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
+                              style="width: 100%"></el-input>
                </search-item>
                <search-item label="教代会">
-                    <el-select @change="meetingChange" clearable filterable placeholder="所属教代会" v-model="pageForm.sessionId">
-                        <el-option :key="item.id" :label="item.fullName" :value="item.id" v-for="item in sessionOptions"></el-option>
+                    <el-select @change="meetingChange" clearable filterable placeholder="所属教代会"
+                               v-model="pageForm.sessionId">
+                        <el-option :key="item.id" :label="item.fullName" :value="item.id"
+                                   v-for="item in sessionOptions"></el-option>
                    </el-select>
                </search-item>
            </search>
@@ -29,8 +32,9 @@ layout("/layouts/platform.html"){
                <el-table-column label="提案编号" prop="code"></el-table-column>
                <el-table-column label="提案名称" prop="name" show-overflow-tooltip></el-table-column>
                <el-table-column label="提案类别" prop="typeName"></el-table-column>
-                <el-table-column label="届次" prop="sessionName"></el-table-column>
+                <el-table-column label="提案人" prop="createUserName"></el-table-column>
                <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="附议人" prop="taskActorName"></el-table-column>
                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                <el-table-column prop="instanceState" label="流程状态">
                    <template slot-scope="{row}">
@@ -90,7 +94,9 @@ layout("/layouts/platform.html"){
                pageForm: {
                    approval: false
                },
-                showApprovalForm: false
+                showApprovalForm: false,
+                sessionOptions: [],
+                delegationOptions: [],
            }
        },
        methods: {
@@ -112,22 +118,25 @@ layout("/layouts/platform.html"){
            },

            handleTaskAction(val) {
-                this.$confirm("您确定要提交吗？", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(() => {
-                    this.$axios.post("/flow/common/executeTask", {
-                        data: JSON.stringify({
-                            ...this.formData,
-                            submitType: val
+                this.$refs.formRef.validate(valid => {
+                    if (!valid) return
+                    this.$confirm("您确定要提交吗？", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    }).then(() => {
+                        this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.guava.index()
+                                this.$message.success(res.msg)
+                                this.doSearch()
+                            }
                        })
-                    }).then((res) => {
-                        if (res.code === 0) {
-                            this.$refs.guava.index()
-                            this.$message.success(res.msg)
-                            this.doSearch()
-                        }
                    })
                })
            },
@@ -145,10 +154,42 @@ layout("/layouts/platform.html"){
                        }
                    })
                })
+            },
+
+            // 教代会
+            async meetingChange(val) {
+                this.formData.delegationId = null
+                this.formData.committeeId = null
+                this.listDelegation()
+            },
+
+            // 代表团
+            listDelegation() {
+                this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => {
+                    if (res.code === 0) {
+                        this.delegationOptions = res.data
+                    }
+                })
+            },
+
+            // 查询开启的教代会
+            listOpenSession() {
+                this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = res.data
+                        if (this.sessionOptions) {
+                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.pageData()
+                            this.listDelegation()
+                        }
+                    }
+                })
            }
+
        },
        created() {
            this.pageData()
+            this.listOpenSession()
        }
    })
 </script>
@@ -54,11 +54,11 @@ layout("/layouts/platform.html"){
                <el-table-column label="提案编号" prop="code"></el-table-column>
                <el-table-column label="提案名称" prop="name" show-overflow-tooltip></el-table-column>
                <el-table-column label="提案类别" prop="typeName"></el-table-column>
-                <el-table-column label="届次" prop="sessionName"></el-table-column>
                <el-table-column label="代表团" prop="delegationName"></el-table-column>
-                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
-                <el-table-column prop="taskName" label="承办类型"></el-table-column>
-                <el-table-column prop="instanceState" label="流程状态">
+                <el-table-column label="当前节点" prop="curTaskName"></el-table-column>
+                <el-table-column label="承办单位" prop="taskUnitName"></el-table-column>
+                <el-table-column label="承办类型" prop="taskName"></el-table-column>
+                <el-table-column label="流程状态" prop="instanceState">
                    <template slot-scope="{row}">
                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
                                  size="small"></enum-tag>
@@ -85,7 +85,7 @@ layout("/layouts/platform.html"){
                    </div>
                    <el-form :model="formData" ref="formRef" label-width="120px" :rules="formRules" label-suffix="">
                        <el-form-item label="承办单位">
-                            <el-input :value="formData.underTakeName" disabled></el-input>
+                            <el-input :value="formData.taskUnitName" disabled></el-input>
                        </el-form-item>
                        <!--                        <el-form-item label="落实情况" prop="implementState" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
                        <!--                            <dict-select v-model="formData.implementState" code="PROPOSAL_REPLY_IMPLEMENT"></dict-select>-->
@@ -95,7 +95,8 @@ layout("/layouts/platform.html"){
                            <text-editor v-model="formData.tf_opinion"></text-editor>
                        </el-form-item>
                        <el-form-item label="校领导" prop="tf_nextNodeOperator"
-                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]"
+                                      v-if="supportCandidate && formData.taskIsMaster">
                            <el-select v-model="formData.tf_nextNodeOperator" placeholder="请选择校领导">
                                <el-option :key="item.id" :label="item.userName" :value="item.userId"
                                           v-for="item in candidates"></el-option>
@@ -146,15 +147,14 @@ layout("/layouts/platform.html"){
            openAudit(row) {
                this.loadCandidates(row.taskId)

-
                this.$refs.guava.edit(() => {
                    this.showApprovalForm = true
                    this.formData = {
                        processTaskId: row.taskId,
                        taskKey: row.taskKey,
                        taskName: row.taskName,
-                        hostUnitId: null,
-                        helpUnitIds: []
+                        taskUnitName: row.taskUnitName,
+                        taskIsMaster: row.taskIsMaster
                    }
                    this.$refs.proposalInfoRef.onOpen(row)
                })