提交测试 文案修改

1

src/constant/guide.js

@@ -14,7 +14,7 @@ export const guideList = {
   teamPayType:{
     name:'收费类型',
     desc:'收费类型用于区分乐团运营模式，不同类型的乐团可设置不同的课程定价',
-    path:'/sysBasics/branchSetting',
+    path:'/baseRulesClassSetting',
     permission:'/globalConfig/chargesList'
   },
   cooperationOrgan:{

src/layout/components/AppMain.vue

@@ -16,15 +16,15 @@
         <router-view v-if="!needKeep" :key="key" /> -->
       </div>
     </transition>
-    <el-dialog :visible.sync="guideVisible" title="您需要完成以下设置" width="800px" :modal="false">
+    <el-dialog :visible.sync="guideVisible" title="您需要完成以下设置" width="800px" :modal="false" v-if="guideList.length>0">
       <div class="guideWrap">
-        <div class="guideItem">
+        <div class="guideItem" v-for="guide in guideList" :key="guide.name">
           <p>
-            <span class="guideTitle">分部</span>
-            <el-button type='text' @click="gotoSet('/sysBasics/branchSetting')">立即设置 >></el-button>
-            <span>您暂无此设置权限,请联系机构管理员</span>
+            <span class="guideTitle">{{guide.name}}</span>
+            <el-button type='text' @click="gotoSet(guide.path)" v-if="permission(guide.permission)">立即设置 >></el-button>
+            <span v-else>您暂无此设置权限,请联系机构管理员</span>
           </p>
-          <p>分部用于区分本机构下各校区，各分部员工只可查询和操作本分部数据</p>
+          <p>{{guide.desc}}</p>
         </div>
 
       </div>
@@ -36,7 +36,7 @@
 <script>
 import notKeepAliveList from "@/router/notKeepAliveList";
 import { permission } from "@/utils/directivePage";
-import guide from '@/constant'
+import {guideList} from '@/constant/guide'
 export default {
   name: "AppMain",
   data() {
@@ -60,10 +60,14 @@ export default {
     },
   },
   mounted() {
-
+    console.log(guideList,'111')
     this.$bus.$on('showguide',(obj)=>{
-      // console.log(obj)
-       console.log("bus", this.$bus);
+       this.guideList = []
+      obj.forEach(element => {
+        if(guideList[element]){
+          this.guideList.push(guideList[element])
+        }
+      });
     this.guideVisible = true;
     })
   },
@@ -72,7 +76,7 @@ export default {
   },
   methods: {
     show(){
-      this.$bus.$emit ('showguide',[])
+      this.$bus.$emit('showguide',['organ','teamPayType'])
     },
     onResize(e) {
       console.log(e);
@@ -81,11 +85,14 @@ export default {
       this.isShow = !this.isShow;
     },
     openIns() {
-      console.log("点击", this.$refs.portal);
       this.$refs.instructions.showInstructions();
     },
     gotoSet(path){
-      this.$router.push({path,})
+      this.$router.push({path})
+      this.guideVisible = false;
+    },
+    permission(str){
+      return permission(str)
     }
   },
 };

src/views/courseRulersManager/components/serverMinitor.vue

@@ -103,7 +103,7 @@
             学员单月请假次数达到
             <el-input
               v-model="form['194']"
-              placeholder="请输入请假次数"
+              placeholder="请输入次数"
 
             >
               <template slot="append"> 次 </template> </el-input
@@ -138,6 +138,8 @@ import {
   getSysTenantConfig,
   setSysTenantConfig,
 } from "@/views/courseRulersManager/api";
+import { sysConfigList, sysConfigUpdate } from "@/api/generalSettings"; // 平台的修改和查
+
 export default {
   props: ["isPlatform"],
   data() {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -731,17 +731,39 @@ export default {
       }
       this.getStudentStatus();
       this.$emit("getName", this.topFrom?.name);
-      getEmployeeOrgan().then((res) => {
-        if (res.code == 200) {
-          this.sectionList = res.data;
-        }
-      });
-      // 2.获取收费类型选项卡
-      getType({ rows: 1000 }).then((res) => {
-        if (res.code == 200) {
-          this.typeList = res.data.rows;
+
+      // getEmployeeOrgan().then((res) => {
+      //   if (res.code == 200) {
+      //     this.sectionList = res.data;
+      //   }
+      // });
+      // // 2.获取收费类型选项卡
+      // getType({ rows: 1000 }).then((res) => {
+      //   if (res.code == 200) {
+      //     this.typeList = res.data.rows;
+      //   }
+      // });
+      Promise.all([getType({ rows: 1000 }), getEmployeeOrgan()]).then(
+        (values) => {
+          if (values[0].code == 200) {
+            this.typeList = values[0].data.rows;
+            // this.typeList = [];
+          }
+          if (values[1].code == 200) {
+            this.sectionList = values[1].data;
+            // this.sectionList = [];
+          }
+          let arr = [];
+          if (this.sectionList.length <= 0) {
+            arr.push("organ");
+          }
+          if (this.typeList.length <= 0) {
+            arr.push("teamPayType");
+          }
+           this.$bus.$emit('showguide',arr)
         }
-      });
+      );
+      // console.log('到这里来',getEmployeeOrgan())
       // 缓存设置时的状态
     },
     changeSection(val) {