付费规则更新

src/HManagement/accountManage/index.vue

@@ -2,7 +2,6 @@
   <div >
     <div class="container normal-panel normal-margin">
       <add style="margin-right:10px;" v-if="tool.checkAuth($route.name,'insert')" @onSuccess="onSuccess"></add>
-<!--      <el-button @click="query">获取</el-button>-->
     </div>
     <list v-if="tool.checkAuth($route.name,'read')" ref="list" @handleSelectionChange="handleSelectionChange">
       <template v-slot:detail="scope">
@@ -49,8 +48,6 @@ export default {
   data () {
     return {
       accounts:[],
-      moduleList:[],
-      list:[]
     }
   },
   methods:{
@@ -61,43 +58,6 @@ export default {
       console.log(arr)
       this.accounts = arr
     },
-    query(){
-      var module = []
-      module = sessionStorage.getItem('module_info')
-      module = JSON.parse(module)
-      console.log(module,'module')
-      module.forEach(item=>{
-        if (item.systemname === '通用'){
-          this.moduleList = item
-        }
-      })
-      console.log(this.moduleList,'moduleList')
-      this.moduleList.modules.forEach(item => {
-        if (item.systemmodulename === '用户管理') {
-          this.list = item
-        }
-      })
-      console.log(this.list,'list')
-      console.log(this.list.apps[0].isneedpay,'list111')
-      if (this.list.apps[0].isneedpay){
-        this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-          closeOnClickModal:false
-        }).then(() => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          });
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
-        });
-      }
-    }
   }
 }
 

src/HManagement/notice/list/list.vue

@@ -87,7 +87,7 @@ export default {
         }
       }).then(res => {
         console.log(res);
-        
+
         if (res.msg != '成功') return;
         this.listData();
       })
@@ -117,4 +117,4 @@ export default {
   width:40px;
   font-size:14px
 }
-</style>
+</style>

src/HManagement/siteManage/paymentRules/modules/accountRule.vue

@@ -195,11 +195,16 @@ export default {
     /*提交保存*/
     onSave(val,rowIndex){
       console.log(val,'保存')
+      if (val.usertype === '主账号'){
+        val.usertype = '21'
+      }else if (val.usertype === '子账号'){
+        val.usertype = '22'
+      }
       val = {
         "type": 1, //1：按账号付费，2：按主体付费
         "sys_site_paymentrulesid": val.sys_site_paymentrulesid,
         "sys_site_systempartitionid": val.sys_site_systempartitionid, //系统版本ID
-        "usertype": val.usertype === '主账号'?'21':'22', //用户类型，按账号付费时必填
+        "usertype": val.usertype, //用户类型，按账号付费时必填
         "paymentrules": val.paymentrules, //定价规则,按账号付费时必填
         "price": val.price //定价，按主体付费时必填
       }

src/SManagement/notice/index.vue

@@ -94,4 +94,4 @@ export default {
   right: 16px;
   bottom: 0;
 }
-</style>
+</style>

src/SManagement/user/team-manage/components/AddUser.vue

@@ -70,7 +70,7 @@ export default {
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' },
         ],
-      /*  phonenumber: [
+        phonenumber: [
           { required: true, message: '请输入手机号', trigger: 'blur' },
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
         ],
@@ -80,7 +80,7 @@ export default {
         ],
         roleids: [
           { required: true, message: '请选择你的权限', trigger: 'blur' }
-        ]*/
+        ]
       },
       checkList: []
     };
@@ -154,7 +154,8 @@ export default {
           this.tool.showMessage(res,() => {
             this.$refs.formInfo.resetFields()
             this.dialogVisible = false
-            this.$parent.getTeamData()
+            /*this.$parent.getTeamData()*/
+            this.$emit('addSuccess')
           })
         }
       })

src/SManagement/user/team-manage/index.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="container normal-panel normal-margin  flex-between">
       <el-button class="inline-24" type="primary" size="small"  @click="addUser">新建团队账号</el-button>
-      <addUser ref="addUser" :editTarget="editTarget"></addUser>
+      <addUser ref="addUser" :editTarget="editTarget" @addSuccess="addSuccess"></addUser>
     </div>
     <div class="container normal-panel">
       <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="queryData(param.content.pageNumber = 1)" @clear="queryData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-24 layout_search__panel" clearable>
@@ -105,6 +105,10 @@ export default {
     editTargetFun(data) {
       this.editTarget = data
       this.$refs.addUser.dialogVisible = true
+    },
+    addSuccess(){
+      this.queryData()
+      console.log('刷新数据')
     }
   },
   mounted() {

src/components/layout/modules/aside.vue

@@ -1,19 +1,33 @@
 <template>
-  <el-menu
-    style="height: calc(100vh - 100px)"
-    :default-active="activePath"
-    class="el-menu-vertical-demo"
-    @open="handleOpen"
-    @close="handleClose"
-    background-color="#F5F5F5"
-    text-color="#666"
-    active-text-color="#fff"
-    router>
-     <el-menu-item v-for="item in auth_data" :key="item.systemappid" :index="item.path">
-      <span slot="title">{{item.meta.title}}</span>
-    </el-menu-item>
-  </el-menu>
-  
+  <div>
+    <el-menu
+        style="height: calc(100vh - 100px)"
+        :default-active="activePath"
+        class="el-menu-vertical-demo"
+        @open="handleOpen"
+        @close="handleClose"
+        background-color="#F5F5F5"
+        text-color="#666"
+        active-text-color="#fff"
+        router>
+      <el-menu-item v-for="item in auth_data" :key="item.systemappid" :index="item.path" >
+        <span slot="title" @click="clickNow(item)">{{item.meta.title}}</span>
+      </el-menu-item>
+    </el-menu>
+<!--    <el-dialog
+        title="提示"
+        :visible.sync="dialogVisible"
+
+        width="70%"
+        >
+      <span>这是一段信息</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>-->
+  </div>
+
 </template>
 <script>
 export default {
@@ -21,6 +35,8 @@ export default {
     return {
       activePath:null,
       auth_data:'',
+      isneedpay:false,
+      dialogVisible:false
     }
   },
   computed: {
@@ -40,18 +56,31 @@ export default {
       if (this.activePath) {
         this.activePath = active_modules.apps[0].path
       } else {
-        this.activePath = this.$route.path
+        if (this.auth_data[0].isneedpay){
+          this.activePath = this.$route.path
+          this.$router.push({path:'/mask',meta:{title: '无权限333'},query:{show:true}})
+        }else {
+          this.activePath = this.$route.path
+        }
       }
+    },
+    clickNow(val){
+      this.isneedpay = val.isneedpay
     }
   },
-  
-  mounted () {    
+
+  mounted () {
     this.getAuthList()
   },
   watch:{
     $route(to,from){
       if (!to.meta.keeproute) {
-        this.activePath = this.$route.path
+        if (this.isneedpay){
+          this.activePath = this.$route.path
+          this.$router.push({path:'/mask',meta:{title: '无权限333'},query:{show:true}})
+        }else {
+          this.activePath = this.$route.path
+        }
       }
     }
   }
@@ -71,4 +100,4 @@ export default {
   border-radius: 4px;
   text-align: center;
 }
-</style>
+</style>

src/router/HManagement.js

@@ -404,7 +404,16 @@ const HManagement = [
       keeproute: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/clueManage/clue_rule/index.vue')
+  }, {
+    path: '/mask',
+    name: 'ordercluerule',
+    meta: {
+      title: '无权限',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/views/demo/index.vue')
   },
 
 ]
-export default HManagement
+export default HManagement

src/views/demo/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data() {
+    return {
+      show:false
+    }
+  },
+  methods:{
+    open() {
+     /* this.$confirm('当前模块未付费，是否付费使用？', '付费提醒', {
+        distinguishCancelAndClose: true,
+        confirmButtonText: '付费',
+        cancelButtonText: '提醒负责人付费'
+      })
+      .then(() => {
+        this.$message({
+          type: 'info',
+          message: '保存修改'
+        });
+      })
+      .catch(action => {
+        this.$message({
+          type: 'info',
+          message: action === 'cancel'
+              ? '放弃保存并离开页面'
+              : '停留在当前页面'
+        })
+      });*/
+    }
+  },
+  mounted() {
+    this.show = this.$route.query.show
+    if (this.show){
+      this.open()
+    }
+  },
+  watch:{
+    'show':function (val){
+
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>