From e93f2d9d42325abe7fc29ef8de6eacad2e58c57a Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 23 Dec 2021 16:56:50 +0800
Subject: [PATCH] 25845

---
 .../AppPartyHistoryClass.vue                  | 39 +++++-----
 .../components/seriesAdd.vue                  | 78 ++++++++++---------
 .../components/seriesManage.vue               |  2 +-
 3 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue b/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue
index 694bc882..85d5df02 100644
--- a/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue
+++ b/packages/3.0.0/AppPartyHistoryClass/AppPartyHistoryClass.vue
@@ -10,9 +10,16 @@
             <el-button type="primary" icon="iconfont iconAdd" @click="handleAdd">添加</el-button>
           </template>
           <template slot="right">
-            <el-input placeholder="课程主题" v-model="search.title" size="small" suffix-icon="iconfont iconSearch"></el-input>
-            <el-button type="primary" icon="iconfont iconSearch" size="small" @click="page.current=1,getList()">查询</el-button>
-            <el-button icon="el-icon-refresh-right" size="small" @click="page.current=1,search={},getList()">重置</el-button>
+            <el-input
+              v-model="search.title"
+              class="search-input"
+              size="small"
+              @keyup.enter.native="search.title = 1, search.title, getList()"
+              placeholder="请输入课程主题"
+              clearable
+              @clear="search.current = 1, search.title = '', getList()"
+              suffix-icon="iconfont iconSearch">
+            </el-input>
           </template>
         </ai-search-bar>
         <ai-table
@@ -24,25 +31,19 @@
           :size.sync="page.size"
           style="margin-top: 10px;"
           @getList="getList">
-          <el-table-column slot="options" label="操作" align="center">
-            <div slot-scope="{row}">
-              <el-button type="text" icon="iconfont iconChange" :title="row.status==0?'发布':'取消发布'"
-                         @click="handleChange(row)"/>
-              <el-button type="text" icon="iconfont iconAdd" title="添加"
-                         @click="handleAddSeries(row)"/>
-              <el-button type="text" icon="iconfont iconShow" title="详情"
-                         @click="handleDetail(row)"/>
-              <el-button type="text" icon="iconfont iconEdit" title="编辑"
-                         @click="handleEdit(row)"/>
-              <el-button type="text" icon="iconfont iconDelete" title="删除"
-                         @click="handleDelete(row)"/>
+          <el-table-column slot="options" label="操作" align="center" width="230px" fixed="right">
+            <div slot-scope="{row}" class="table-options">
+              <el-button type="text" :title="row.status == 0 ? '发布' : '取消发布'" @click="handleChange(row)">{{ row.status == 0 ? '发布' : '取消发布' }}</el-button>
+              <el-button type="text" title="添加" @click="handleAddSeries(row)">添加</el-button>
+              <el-button type="text" title="详情" @click="handleDetail(row)">详情</el-button>
+              <el-button type="text" title="编辑" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="text" title="删除" @click="handleDelete(row)">删除</el-button>
             </div>
           </el-table-column>
         </ai-table>
       </template>
     </ai-list>
-    <component :is="comp" v-else :row="row" :instance="instance" :dict="dict" :permissions="permissions" @back="back"
-               :isEdit="isEdit" :organizationId="organizationId" :organizationName="organizationName"></component>
+    <component :is="comp" v-else :row="row" :instance="instance" :dict="dict" :permissions="permissions" @back="back" :isEdit="isEdit"></component>
   </section>
 </template>
 
@@ -53,7 +54,7 @@
 
   export default {
     name: "AppPartyHistoryClass",
-    label: "党史课堂",
+    label: "党员学习",
     components: {partyClassAdd, seriesManage},
     props: {
       instance: Function,
@@ -162,6 +163,8 @@
           this.comp = "";
           this.showList = true;
           this.isEdit = false;
+
+          this.getList()
         },
         handleAdd() {
           this.comp = "partyClassAdd";
diff --git a/packages/3.0.0/AppPartyHistoryClass/components/seriesAdd.vue b/packages/3.0.0/AppPartyHistoryClass/components/seriesAdd.vue
index cde95f0c..53673b5c 100644
--- a/packages/3.0.0/AppPartyHistoryClass/components/seriesAdd.vue
+++ b/packages/3.0.0/AppPartyHistoryClass/components/seriesAdd.vue
@@ -4,44 +4,48 @@
       <ai-title slot="title" :title="detailTitle" isShowBottomBorder isShowBack @onBackClick="$emit('back')">
       </ai-title>
       <template #content>
-        <div class="detail-content" v-if="isEdit">
-          <el-form :model="form" label-width="120px" ref="ruleForm" :rules="rules">
-            <el-form-item label="单集名称" prop="title">
-              <el-input size="small" v-model="form.title" clearable placeholder="请输入..." maxlength="100"
-                        show-word-limit/>
-            </el-form-item>
-            <el-form-item label="单集顺序" prop="num">
-              <el-row type="flex" justify="space-between">
-                <div style="width: 540px">
-                  <el-input size="small" v-model="form.num" clearable placeholder="请输入..." maxlength="100"
-                            show-word-limit/>
-                </div>
-                <span>已更新至{{episodeNum}}集</span>
-              </el-row>
-            </el-form-item>
-            <el-form-item label="视频" prop="videoUrl">
-              <el-input size="small" v-model="form.videoUrl" clearable placeholder="请输入..." maxlength="300"
-                        show-word-limit/>
-            </el-form-item>
-          </el-form>
-        </div>
+        <ai-card title="基本信息" class="detail-content" v-if="isEdit">
+          <template #content>
+            <el-form :model="form" label-width="120px" ref="ruleForm" :rules="rules">
+              <el-form-item label="单集名称" prop="title">
+                <el-input size="small" v-model="form.title" clearable placeholder="请输入..." maxlength="100"
+                          show-word-limit/>
+              </el-form-item>
+              <el-form-item label="单集顺序" prop="num">
+                <el-row type="flex" justify="space-between">
+                  <div style="width: 540px">
+                    <el-input size="small" v-model="form.num" clearable placeholder="请输入..." maxlength="100"
+                              show-word-limit/>
+                  </div>
+                  <span>已更新至{{episodeNum}}集</span>
+                </el-row>
+              </el-form-item>
+              <el-form-item label="视频" prop="videoUrl">
+                <el-input size="small" v-model="form.videoUrl" clearable placeholder="请输入..." maxlength="300"
+                          show-word-limit/>
+              </el-form-item>
+            </el-form>
+          </template>
+        </ai-card>
         <!--详情-->
-        <div class="village_detail" v-else>
-          <div class="village_title">
-            <h3>{{ form.title }}</h3>
-            <p style="font-size: 14px;color: #999;">{{ form.createDate|timeVal }} {{ form.organizationName }}</p>
-          </div>
-          <div class="village_file" v-if="form.files && form.files.length">
-            <span>附件</span>
-            <div>
-              <p v-for="(item,i) in form.files" :key="i" class="fileSty" @click="downLoad(item.accessUrl)">
-                {{ item.fileName }}{{ item.postfix }}
-              </p>
+        <ai-card title="基本信息" v-else>
+          <template #content>
+            <div class="village_title">
+              <h3>{{ form.title }}</h3>
+              <p style="font-size: 14px;color: #999;">{{ form.createDate|timeVal }} {{ form.organizationName }}</p>
             </div>
-          </div>
-          <img class="cover" :src="form.thumbUrl[0].url" v-if="form.thumbUrl && form.thumbUrl.length">
-          <div class="village_cont" v-html="form.content"/>
-        </div>
+            <div class="village_file" v-if="form.files && form.files.length">
+              <span>附件</span>
+              <div>
+                <p v-for="(item,i) in form.files" :key="i" class="fileSty" @click="downLoad(item.accessUrl)">
+                  {{ item.fileName }}{{ item.postfix }}
+                </p>
+              </div>
+            </div>
+            <img class="cover" :src="form.thumbUrl[0].url" v-if="form.thumbUrl && form.thumbUrl.length">
+            <div class="village_cont" v-html="form.content"/>
+          </template>
+        </ai-card>
       </template>
       <template #footer>
         <template v-if="isEdit">
@@ -57,7 +61,9 @@
 </template>
 
 <script>
+import Template from '../../../wechat/AppAskForm/components/Template.vue';
   export default {
+  components: { Template },
     name: "seriesAdd",
     props: {
       instance: Function,
diff --git a/packages/3.0.0/AppPartyHistoryClass/components/seriesManage.vue b/packages/3.0.0/AppPartyHistoryClass/components/seriesManage.vue
index 94cfdd7c..43476ce8 100644
--- a/packages/3.0.0/AppPartyHistoryClass/components/seriesManage.vue
+++ b/packages/3.0.0/AppPartyHistoryClass/components/seriesManage.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="AppFoundingHundred">
-    <ai-list isTabs v-if="showList">
+    <ai-list v-if="showList">
       <template #title>
         <ai-title title="剧集管理" isShowBottomBorder :isShowBack="true" @onBackClick="$emit('back')"></ai-title>
       </template>