Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/components/Editor/index.vue

@@ -4,7 +4,7 @@
     <quill-editor
       class="ql-editor"
       v-model="forms[keyWord]"
-      :ref="alias"
+      :ref="myAlias"
       :options="editorOption"
       @change="onEditorChange($event)"
     ></quill-editor>
@@ -131,9 +131,8 @@ const toolbarOptions = [
   [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
   [{ font: [] }], // 字体种类
   [{ align: [] }], // 对齐方式
-  ["clean"], // 清除文本格式
-  ["image"], // 链接、图片、视频 , "video"
-   ["link", "image", "video"] // 链接、图片、视频
+  ["clean"], // 清除文本格式 // 链接、图片、视频 , "video"
+  ["link", "image", "video"], // 链接、图片、视频
 ];
 // 标题
 const titleConfig = {
@@ -171,16 +170,16 @@ export default {
   // props: ["form",'key'],
   props: {
     keyWord: {
-      type:String,
-       default:'content'
+      type: String,
+      default: "content",
     },
     form: {
       type: Object,
     },
     alias: {
       type: String,
-      default: 'myQuillEditor'
-    }
+      default: "myQuillEditor",
+    },
   },
   name: "editor",
   components: { quillEditor },
@@ -218,14 +217,13 @@ export default {
                   this.quill.format("image", false);
                 }
               },
-              video: function (value) {
+              video:(value)=> {
                 if (value) {
-                  that.dialogFormVisible = true;
-                  let editor = that.$refs[this.alias].quill;
+                  this.dialogFormVisible = true;
+                  let editor = this.$refs[this.myAlias].quill;
                   // 光标所在位置
-                   console.log(editor, editor.getSelection())
-                  that.editorIndex = editor.getSelection()?.index||0;
-
+                  console.log(editor, editor.getSelection(), this.myAlias);
+                  this.editorIndex = editor.getSelection()?.index || 0;
                 } else {
                   this.quill.format("image", false);
                 }
@@ -236,13 +234,11 @@ export default {
       },
     };
   },
-  created(){
-    that = this;
+  created() {
+
   },
   mounted() {
-
-    console.log(this.form);
-
+    // console.log(this.form);\
   },
   methods: {
     onEditorChange({ quill, html, text }) {
@@ -254,6 +250,7 @@ export default {
           let dialogForm = this.dialogForm;
           // 获取富文本组件实例
           let quill = this.editor;
+          console.log(quill, this.keyWord);
           // 插入图片，res为服务器返回的图片链接地址
           const params = {
             poster: dialogForm.poster,
@@ -261,7 +258,7 @@ export default {
           };
           quill.insertEmbed(this.editorIndex, "video", params);
           // 调整光标到最后
-          console.log(this.editorIndex)
+          console.log(this.editorIndex);
           quill.setSelection(this.editorIndex + 1, { preload: false });
 
           this.dialogFormVisible = false;
@@ -384,18 +381,21 @@ export default {
   },
   computed: {
     editor() {
-      return this.$refs[this.alias].quill;
+      return this.$refs[this.myAlias].quill;
     },
     forms() {
       return this.form;
     },
+    myAlias() {
+      return this.alias;
+    },
   },
 };
 </script>
 
 <style lang='scss' scoped>
 /deep/.ql-editor {
-  min-height: 300px;
+  min-height: 250px;
   padding: 0;
 }
 

src/layout/components/AppMain.vue

@@ -16,33 +16,103 @@
         <router-view v-if="!needKeep" :key="key" /> -->
       </div>
     </transition>
-    <el-dialog :visible.sync="guideVisible" title="您需要完成以下设置" width="800px" :modal="false" v-if="guideList.length>0" append-to-body>
+    <el-dialog
+      :visible.sync="guideVisible"
+      title="您需要完成以下设置"
+      width="800px"
+      :modal="false"
+      v-if="guideList.length > 0"
+      append-to-body
+    >
       <div class="guideWrap">
         <div class="guideItem" v-for="guide in guideList" :key="guide.name">
           <p>
-            <span class="guideTitle">{{guide.name}}</span>
-            <el-button type='text' @click="gotoSet(guide)" v-if="permission(guide.permission)">立即设置 >></el-button>
+            <span class="guideTitle">{{ guide.name }}</span>
+            <el-button
+              type="text"
+              @click="gotoSet(guide)"
+              v-if="permission(guide.permission)"
+              >立即设置 >></el-button
+            >
             <span v-else>您暂无此设置权限,请联系机构管理员</span>
           </p>
-          <p>{{guide.desc}}</p>
+          <p>{{ guide.desc }}</p>
         </div>
-
       </div>
     </el-dialog>
-    <!-- <el-button @click="show">点击触发引导</el-button> -->
+    <div class="optionBtn" v-if="!outOptionvisible&&isShowBtn" @click="openOptionMual">
+      操作手册
+    </div>
+    <el-drawer
+      title="操作手册"
+      :visible.sync="outOptionvisible"
+      size="400px"
+      :append-to-body="true"
+    >
+      <div class="drawerWrap">
+        <el-form :inline="true" :model="form">
+          <el-form-item>
+            <el-input
+              style="width: 265px !important"
+              v-model="form.search"
+              placeholder="请输入菜单名"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="getMUal()" type="danger">搜索</el-button>
+          </el-form-item>
+          <br />
+          <el-form-item v-for="(item, index) in optionList" :key="index">
+            <el-button type="text" @click="openDetail(item)">
+              {{ item.name }}</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-drawer>
+    <el-drawer
+      :title="activeRow.name"
+      :append-to-body="true"
+      v-if="activeRow"
+      :visible.sync="innerDrawer"
+      size="400px"
+      custom-class="innerDrawer"
+    >
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="操作流程" name="first">
+          <div v-html="activeRow.opFlow" class="optionWrap"></div>
+        </el-tab-pane>
+        <el-tab-pane label="功能规则" name="second">
+          <div v-html="activeRow.funRule" class="optionWrap"></div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-drawer>
   </section>
 </template>
 
 <script>
 import notKeepAliveList from "@/router/notKeepAliveList";
 import { permission } from "@/utils/directivePage";
-import {guideList} from '@/constant/guide'
+import { guideList } from "@/constant/guide";
+import {
+  getSysManualList,
+  getSysManualMenuIds,
+} from "@/views/operationManual/api";
 export default {
   name: "AppMain",
   data() {
     return {
-      guideVisible:false,
-      guideList:[]
+      guideVisible: false,
+      guideList: [],
+      outOptionvisible: false,
+      optionList: [],
+      form: {},
+      activeRow: null,
+      innerDrawer: false,
+      activeName: "first",
+      allIdList:[],
+      isShow:false
     };
   },
   computed: {
@@ -58,59 +128,124 @@ export default {
     keep() {
       return this.$route.meta.noCache * 1; // 0是缓存 1是不缓存
     },
+    isShowBtn(){
+      return this.allIdList.indexOf(this.$route.meta.id+'') != -1
+    }
   },
-  mounted() {
-    this.$bus.$on('showguide',(obj)=>{
-       this.guideList = []
-      obj.forEach(element => {
-        if(guideList[element]){
-          this.guideList.push(guideList[element])
+ async mounted() {
+    this.$bus.$on("showguide", (obj) => {
+      this.guideList = [];
+      obj.forEach((element) => {
+        if (guideList[element]) {
+          this.guideList.push(guideList[element]);
         }
       });
-    this.guideVisible = true;
-    })
+      this.guideVisible = true;
+    });
+    try {
+      const res = await getSysManualMenuIds()
+      this.allIdList = res.data.split(',')
+    }catch(e){}
   },
-   beforeDestroy () {
-    this.$bus.$off('showguide', ()=>{})
+  beforeDestroy() {
+    this.$bus.$off("showguide", () => {});
   },
   methods: {
-    show(){
-      this.$bus.$emit('showguide',['organ','teamPayType'])
-    },
-    onResize(e) {
-      console.log(e);
-    },
     showInstructions() {
       this.isShow = !this.isShow;
     },
-    openIns() {
-      this.$refs.instructions.showInstructions();
-    },
-    gotoSet(guide){
-      console.log()
-      this.$router.push({path:guide.path})
+    // openIns() {
+    //   this.$refs.instructions.showInstructions();
+    // },
+    gotoSet(guide) {
+      console.log();
+      this.$router.push({ path: guide.path });
       this.guideVisible = false;
     },
-    permission(str){
-      return permission(str)
-    }
+    permission(str) {
+      return permission(str);
+    },
+    async openOptionMual() {
+      // this.outOptionvisible = true;
+      await this.getMUal();
+      this.outOptionvisible = true;
+    },
+    async getMUal() {
+      let menuId = this.$route.meta.id;
+      try {
+        const res = await getSysManualList({
+          menuId,
+          page: 1,
+          rows: 9999,
+          search: this.form.search,
+        });
+        this.optionList = res.data.rows;
+
+        console.log(this.$route);
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    openDetail(row) {
+      this.activeRow = row;
+      this.innerDrawer = true;
+    },
+    handleClick(val) {
+      this.activeName = val.name;
+    },
+  },
+  watch: {
+    innerDrawer(val) {
+      if (!val) {
+        this.activeName = "first";
+      }
+    },
   },
 };
 </script>
 <style lang="scss" scoped>
+.innerDrawer {
+  .optionWrap {
+    width: 400px;
+    padding: 10px;
+    /deep/img {
+      width: 100%;
+    }
+    /deep/ p {
+      margin-bottom: 10px;
+    }
+    /deep/.ql-video {
+      width: 100%;
+    }
+  }
+}
+
+.optionBtn {
+  width: 35px;
+  background-color: var(--color-primary);
+  color: #fff;
+  position: fixed;
+  right: 0;
+  top: 180px;
+  padding: 10px;
+  border-radius: 8px;
+  cursor: pointer;
+  z-index: 3999;
+}
+.drawerWrap {
+  padding: 20px;
+}
 .guideWrap {
   .guideItem {
-  margin-bottom: 30px;
-   .guideTitle {
-    width: 160px;
-    text-align: left;
-    font-weight: bold;
-    display: inline-block;
+    margin-bottom: 30px;
+    .guideTitle {
+      width: 160px;
+      text-align: left;
+      font-weight: bold;
+      display: inline-block;
+    }
   }
 }
-}
-
-
 </style>
 <style scoped>
 .app-main {

src/layout/components/Navbar.vue

@@ -52,7 +52,7 @@
           <i class="icon_admin_oa operationSize"></i>
         </div>
       </el-popover>
-      <el-popover
+      <!-- <el-popover
         v-if="isShowIns"
         placement="bottom"
         trigger="hover"
@@ -67,7 +67,7 @@
         >
           <i class="icon_admin_book operationSize"></i>
         </div>
-      </el-popover>
+      </el-popover> -->
 
       <el-popover
         placement="bottom"
@@ -260,9 +260,9 @@
       </div>
     </el-dialog>
 
-    <portal-target name="AppMain" ref="target">
+    <!-- <portal-target name="AppMain" ref="target">
       <instructions ref="instructions" @checkShow="checkShow" />
-    </portal-target>
+    </portal-target> -->
   </div>
 </template>
 
@@ -275,7 +275,7 @@ import { mapGetters } from "vuex";
 import { resetPassword } from "@/api/buildTeam";
 import AppLink from "./Sidebar/Link";
 import { getBelongTopMenuPath } from "@/utils/permission";
-import instructions from "./instructions";
+// import instructions from "./instructions";
 import { validOaUrl } from '@/utils/validate'
 import { tenantInfoQueryPage } from '@/views/organManager/api'
 import Cookies from 'js-cookie'
@@ -310,7 +310,7 @@ export default {
 
   components: {
     AppLink,
-    instructions,
+    // instructions,
     // Breadcrumb,
     // Hamburger
   },
@@ -446,7 +446,7 @@ export default {
       }
     },
     openIns() {
-      this.$refs.instructions.showInstructions();
+      // this.$refs.instructions.showInstructions();
     },
     checkShow(val) {
       this.isShowIns = val;

src/store/modules/permission.js

@@ -328,7 +328,7 @@ function setDetailRoute(accessedRoutes) {
             title: '乐团详情',
             belongTopMenu: "/business",
             activeMenu: '/teamList',
-            id: 'xx4'
+            id: '3953'
           }
         },
         {
@@ -487,7 +487,7 @@ function setDetailRoute(accessedRoutes) {
             title: '学员详情',
             belongTopMenu: "/business",
             activeMenu: '/studentManager/studentList',
-            id: 'xx11'
+            id: '4083'
           }
         },
         {
@@ -500,7 +500,7 @@ function setDetailRoute(accessedRoutes) {
             title: '老师详情',
             belongTopMenu: "/business",
             activeMenu: '/teacherManager/teacherList',
-            id: 'xx12'
+            id: '4118'
           }
         },
         {
@@ -513,7 +513,7 @@ function setDetailRoute(accessedRoutes) {
             title: '老师修改',
             belongTopMenu: "/business",
             activeMenu: '/teacherManager/teacherList',
-            id: 'xx13'
+            id: '4174'
           }
         },
         {
@@ -526,7 +526,7 @@ function setDetailRoute(accessedRoutes) {
             title: '问答详情',
             belongTopMenu: "/business",
             activeMenu: '/otherManager/reaplceMusicPlayer',
-            id: 'xx4'
+            id: '4293'
           }
         },
         {
@@ -556,7 +556,7 @@ function setDetailRoute(accessedRoutes) {
             title: '服务指标(详情)',
             belongTopMenu: "/operateManager",
             activeMenu: '/serverIndexManager/serverIndexList',
-            id: 'xx15'
+            id: '3513'
           }
         },
         {
@@ -569,7 +569,7 @@ function setDetailRoute(accessedRoutes) {
             title: '新建活动方案',
             belongTopMenu: "/operateManager",
             activeMenu: '/vipActiveManager/vipActiveList',
-            id: 'xx16'
+            id: '3558'
           }
         },
         {
@@ -582,7 +582,7 @@ function setDetailRoute(accessedRoutes) {
             title: '活动资格管理',
             belongTopMenu: "/operateManager",
             activeMenu: '/vipActiveManager/vipActiveList',
-            id: 'xx16'
+            id: '4610'
           }
         },
         // activeSenior
@@ -596,7 +596,7 @@ function setDetailRoute(accessedRoutes) {
             title: '添加分部活动',
             belongTopMenu: "/operateManager",
             activeMenu: '/branchActiveManager/branchActive',
-            id: 'xx17'
+            id: '3527'
           }
         },
         {
@@ -609,7 +609,7 @@ function setDetailRoute(accessedRoutes) {
             title: '修改分部活动',
             belongTopMenu: "/operateManager",
             activeMenu: '/branchActiveManager/branchActive',
-            id: 'xx18'
+            id: '3528'
           }
         },
         {
@@ -622,7 +622,7 @@ function setDetailRoute(accessedRoutes) {
             title: '添加问卷',
             belongTopMenu: "/operateManager",
             activeMenu: '/operateManager/setQuestions',
-            id: 'xx19'
+            id: '4286'
           }
         },
         {
@@ -635,7 +635,7 @@ function setDetailRoute(accessedRoutes) {
             title: '2021会员活动',
             belongTopMenu: "/operateManager",
             activeMenu: '/activeMarketing',
-            id: 'xx19'
+            id: '4550'
           }
         },
         {
@@ -648,7 +648,7 @@ function setDetailRoute(accessedRoutes) {
             title: '2021十一活动详情',
             belongTopMenu: "/operateManager",
             activeMenu: '/activeMarketing',
-            id: 'xx19'
+            id: '4551'
           }
         },
         {
@@ -661,7 +661,7 @@ function setDetailRoute(accessedRoutes) {
             title: '2021双十一活动',
             belongTopMenu: "/operateManager",
             activeMenu: '/activeMarketing',
-            id: 'xx19'
+            id: '4594'
           }
         },
         {
@@ -674,7 +674,7 @@ function setDetailRoute(accessedRoutes) {
             title: '2021双十一活动详情',
             belongTopMenu: "/operateManager",
             activeMenu: '/activeMarketing',
-            id: 'xx19'
+            id: '4595'
           }
         },
         {
@@ -687,7 +687,7 @@ function setDetailRoute(accessedRoutes) {
             title: '新增优惠券',
             belongTopMenu: "/operateManager",
             activeMenu: '/couponManager',
-            id: 'xx19'
+            id: '4553'
           }
         },
         {
@@ -729,22 +729,22 @@ function setDetailRoute(accessedRoutes) {
           title: '经营报表详情',
           belongTopMenu: "/financialManager",
           activeMenu: '/businessStatement',
-          id: 'xx20'
+          id: '4217'
         }
       }, ])
     }
     if (route.path == '/contentManager') {
       route.children = route.children.concat([{
-          name: '经营报表详情',
+          name: '帮助中心分类',
           path: 'helpCategory',
           component: () => import('@/views/helpCenter/helpCategory'),
           hidden: true,
           meta: {
             noCache: '1',
-            title: '经营报表详情',
+            title: '帮助中心分类',
             belongTopMenu: "/contentManager",
             activeMenu: '/contentManager/helpContent',
-            id: 'xx21'
+            id: '3596'
           }
         },
         {
@@ -773,7 +773,7 @@ function setDetailRoute(accessedRoutes) {
             title: '进货清单',
             belongTopMenu: "/shopManager",
             activeMenu: '/shopList',
-            id: 'xx23'
+            id: '3618'
           }
         },
         {
@@ -786,7 +786,7 @@ function setDetailRoute(accessedRoutes) {
             title: '添加修改商品',
             belongTopMenu: "/shopManager",
             activeMenu: '/shopList',
-            id: 'xx24'
+            id: '3617'
           }
         },
       ])
@@ -802,7 +802,7 @@ function setDetailRoute(accessedRoutes) {
             title: '创建&修改汇付账号',
             belongTopMenu: "/systemManager",
             activeMenu: '/sysBasics/adapayManager',
-            id: 'xx25'
+            id: '3748'
           }
         },
         {
@@ -815,7 +815,7 @@ function setDetailRoute(accessedRoutes) {
             title: '添加&查看时间充值活动',
             belongTopMenu: "/systemManager",
             activeMenu: '/sysBasics/entryActivities',
-            id: 'xx26'
+            id: '3773'
           }
         },
         {
@@ -828,7 +828,7 @@ function setDetailRoute(accessedRoutes) {
             title: '添加&修改系统权限',
             belongTopMenu: "/systemManager",
             activeMenu: '/parameter/adminManager',
-            id: 'xx27'
+            id: '3993'
           }
         },
         // /parameter/adminManager adminOperation
@@ -845,7 +845,7 @@ function setDetailRoute(accessedRoutes) {
           title: '添加&修改',
           belongTopMenu: "/platformManager",
           activeMenu: '/serviceManager/serviceList',
-          id: 'xx28'
+          id: '4631'
         }
       }])
     }
@@ -863,7 +863,7 @@ function setDetailRoute(accessedRoutes) {
           title: '添加&修改',
           belongTopMenu: "/federationManager",
           activeMenu: '/organManager/organList',
-          id: 'xx29'
+          id: '4652'
         }
       }])
     }

src/views/contentManager/contentOperation.vue

@@ -422,8 +422,6 @@ export default {
                 if (value) {
                   that.dialogFormVisible = true;
                   let editor = that.$refs.myQuillEditor.quill;
-                  // 光标所在位置
-                  console.log(editor.getSelection())
                   that.editorIndex = editor.getSelection().index;
                 } else {
                   this.quill.format("image", false);

src/views/operationManual/api.js

@@ -5,3 +5,25 @@ export const getSysManualList = data => request2({
     params: data,
     method: 'get',
 })
+export const addSysManual = data => request2({
+  url: '/api-web/sysManual/add',
+  data,
+  method: 'POST',
+})
+export const resetSysManual = data => request2({
+  url: '/api-web/sysManual/update',
+  data,
+  method: 'POST',
+})
+
+export const deteltSysManual = data => request2({
+  url: '/api-web/sysManual/remove',
+  data,
+  method: 'POST',
+})
+export const getSysManualMenuIds = data => request2({
+  url: '/api-web/sysManual/listMenuIds',
+  params:data,
+  method: 'GET',
+})
+

src/views/operationManual/index.vue

@@ -31,9 +31,12 @@
           <el-button native-type="reset" type="danger">重置</el-button>
         </el-form-item>
       </save-form>
-      <el-button type="primary" style="margin-bottom: 20px" @click="addManual"
-        >添加</el-button
-      >
+      <auth auths="sysManual/add">
+        <el-button type="primary" style="margin-bottom: 20px" @click="addManual"
+          >添加</el-button
+        >
+      </auth>
+
       <div class="tableWrap">
         <el-table
           style="width: 100%"
@@ -42,8 +45,8 @@
         >
           <el-table-column
             align="center"
-            prop="funRule"
-            label="菜单"
+            prop="menuName"
+            label="菜单名"
           ></el-table-column>
           <el-table-column
             align="center"
@@ -63,12 +66,16 @@
           <el-table-column align="center" prop="studentId" label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text" @click="resetManual(scope.row)"
-                  >修改</el-button
-                >
-                <el-button type="text" @click="deteleManual(scope.row)"
-                  >删除</el-button
-                >
+                <auth auths="sysManual/update">
+                  <el-button type="text" @click="resetManual(scope.row)"
+                    >修改</el-button
+                  >
+                </auth>
+                <auth auths="sysManual/remove">
+                  <el-button type="text" @click="deteleManual(scope.row)"
+                    >删除</el-button
+                  >
+                </auth>
               </div>
             </template>
           </el-table-column>
@@ -98,9 +105,7 @@
       />
       <span slot="footer" class="dialog-footer">
         <el-button @click="operationVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitOperation"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitOperation">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -112,7 +117,12 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getSilder } from "@/api/silder";
-import { getSysManualList } from "./api";
+import {
+  getSysManualList,
+  addSysManual,
+  resetSysManual,
+  deteltSysManual,
+} from "./api";
 import setForm from "./modals/manualSet";
 export default {
   components: { pagination, setForm },
@@ -172,7 +182,6 @@ export default {
           page: this.rules.page,
           rows: this.rules.limit,
         });
-        console.log(res);
         this.tableList = res.data.rows;
         this.rules.total = res.data.total;
       } catch (e) {
@@ -183,7 +192,12 @@ export default {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet() {},
+    onReSet() {
+      this.$nextTick(()=>{
+           this.search()
+      })
+
+    },
     setTableData(result) {
       let list = [];
       for (let i in result) {
@@ -227,8 +241,26 @@ export default {
     changeCategor(e) {
       this.$refs.myCascader.dropDownVisible = false;
     },
-    resetManual(row) {},
-    deteleManual(row) {},
+    resetManual(row) {
+      this.form = { ...row };
+      this.operationStatus = "reset";
+      this.operationVisible = true;
+    },
+    deteleManual(row) {
+      this.$confirm(`您确定删除${row.name}`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(async()=>{
+        try{
+          const res = await deteltSysManual({id:row.id})
+          this.$message.success('删除成功')
+          this.getList()
+        }catch(e){
+          console.log(e)
+        }
+      })
+    },
     addManual() {
       this.operationStatus = "create";
       this.form = {
@@ -236,12 +268,34 @@ export default {
         menuId: "",
         name: "",
         opFlow: "",
-      }
+      };
       this.operationVisible = true;
     },
-    submitOperation(){
-      console.log(this.form)
-    }
+    async submitOperation() {
+      try {
+        let { menuId, ...result } = this.form;
+        if (this.operationStatus == "create") {
+          const res = await addSysManual({
+            ...result,
+            menuId: menuId[menuId.length - 1],
+          });
+          this.$message.success("添加成功");
+          this.operationVisible = false;
+          this.getList();
+        } else {
+          const res = await resetSysManual({
+            ...result,
+            menuId: Array.isArray(menuId) ? menuId[menuId.length - 1] : menuId,
+          });
+          this.$message.success("修改成功");
+          this.operationVisible = false;
+          this.getList();
+        }
+      } catch (e) {
+        console.log(e);
+      }
+      console.log(this.form);
+    },
   },
 };
 </script>

src/views/operationManual/modals/manualSet.vue

@@ -6,19 +6,20 @@
         prop="menuId"
         :rules="[{ required: true, message: '请选择菜单' }]"
       >
-        <el-cascader
-          ref="myCascader"
-          class="myCascader"
-          popper-class="myCascader"
-          @change="changeCategor"
-          :show-all-levels="false"
-          clearable
-          v-model="form.menuId"
-          style="width: 100%"
-          :options="silderList"
-          :props="optionProps"
-          placeholder="请选择菜单"
-        ></el-cascader>
+          <el-cascader
+            ref="myCascader"
+            class="myCascader"
+            popper-class="myCascader"
+            @change="changeCategor"
+            :show-all-levels="false"
+            clearable
+            v-model="form.menuId"
+            style="width: 400px"
+            :options="silderList"
+            :props="optionProps"
+            placeholder="请选择菜单"
+          ></el-cascader>
+
       </el-form-item>
       <el-form-item
         label="手册名称"
@@ -30,7 +31,7 @@
           },
         ]"
       >
-        <el-input v-model="form.name" placeholder="请输入手册名称"> </el-input>
+        <el-input  style="width: 400px" v-model="form.name" placeholder="请输入手册名称"> </el-input>
       </el-form-item>
 
       <el-form-item
@@ -43,7 +44,7 @@
           },
         ]"
       >
-        <Editor :form="form" alias="Editor1" :keyWord="'opFlow'" />
+        <Editor :form="form" alias="Editor1" ref="opFlow" :keyWord="'opFlow'" class="Editor" />
       </el-form-item>
       <el-form-item
         label="功能规则"
@@ -55,7 +56,13 @@
           },
         ]"
       >
-        <Editor :form="form" alias="Editor2" :keyWord="'funRule'" />
+        <Editor1
+        class="Editor"
+          :form="form"
+          alias="Editor2"
+          ref="funRule"
+          :keyWord="'funRule'"
+        />
       </el-form-item>
     </el-form>
     <!--      funRule: "",
@@ -65,10 +72,12 @@
   </div>
 </template>
 <script>
-import Editor from "@/components/Editor";
+const Editor = () => import("@/components/Editor");
+const Editor1 = () => import("@/components/Editor");
 export default {
   components: {
     Editor,
+    Editor1,
   },
   props: ["silderList", "form"],
   data() {
@@ -91,4 +100,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.Editor {
+  position: relative;
+  top:-15px
+}
 </style>

src/views/resetTeaming/components/payInfoDetail.vue

@@ -269,9 +269,7 @@ export default {
         ],
         leBaoList: [
           {
-            num: 0,
-            actualAmount: "",
-            originalAmount: "",
+
           },
         ],
         activeList: [{}],