*

dsk-operate-ui/src/api/enterpriseManagement/enterpriseManagement.js

@@ -7,6 +7,14 @@ export function addTenantPackage(param) {
     data: param
   })
 }
+//修改租户套餐
+export function saveTenantPackage(param) {
+  return request({
+    url: '/system/tenant/package/',
+    method: 'PUT',
+    data: param
+  })
+}
 //获取租户套餐
 export function detailTenantPackage(packageId) {
   return request({
@@ -14,6 +22,13 @@ export function detailTenantPackage(packageId) {
     method: 'get',
   })
 }
+//删除租户套餐
+export function deleteTenantPackage(packageId) {
+  return request({
+    url: '/system/tenant/package/'+packageId,
+    method: 'DELETE',
+  })
+}
 //租户套餐列表
 export function getTenantPackage(param) {
   return request({

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -106,8 +106,9 @@ export default {
     },
     getorther(id){
       changeTenants(id).then(res=>{
+        console.log(res)
         if(res.code == 200){
-          setToken(res.data.accessToken)
+          setToken(res.data.token)
           setTenantid(id)
           store.commit('SET_TOKEN', res.data.token)
           location.reload();

dsk-operate-ui/src/views/enterpriseManagement/programme.vue

@@ -93,7 +93,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleLook(scope.row)"
             v-hasPermi="['system:role:edit']"
           >查看</el-button>
         </template>
@@ -112,33 +112,33 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="方案名称" prop="packageName">
-          <el-input v-model="form.packageName" placeholder="请输入方案名称" />
+          <el-input :disabled="disabled" v-model="form.packageName" placeholder="请输入方案名称" />
         </el-form-item>
 
         <el-form-item label="状态" prop="status">
-          <el-radio v-model="form.status" label="0">正常</el-radio>
-          <el-radio v-model="form.status" label="1">停用</el-radio>
+          <el-radio :disabled="disabled" v-model="form.status" label="0">正常</el-radio>
+          <el-radio :disabled="disabled" v-model="form.status" label="1">停用</el-radio>
         </el-form-item>
         <el-form-item label="角色授权">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
+          <el-checkbox :disabled="disabled" v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
+          <el-checkbox :disabled="disabled" v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
+          <el-checkbox :disabled="disabled" v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
           <el-tree
             class="tree-border"
             :data="menuOptions"
             show-checkbox
             ref="menu"
             node-key="id"
-            :check-strictly="!form.menuIds"
+            :check-strictly="!form.menuCheckStrictly"
             empty-text="加载中，请稍候"
             :props="defaultProps"
           ></el-tree>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model="form.remark" maxlength="50" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input :disabled="disabled" v-model="form.remark" maxlength="50" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" v-if="!disabled">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -148,16 +148,17 @@
 
 <script>
   import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
-  import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+  import { treeselect as menuTreeselect, roleMenuTreeselect} from "@/api/system/menu";
 
 
-  import { addTenantPackage ,getTenantPackage,detailTenantPackage} from "@/api/enterpriseManagement/enterpriseManagement";
+  import { addTenantPackage ,getTenantPackage,detailTenantPackage,saveTenantPackage,deleteTenantPackage} from "@/api/enterpriseManagement/enterpriseManagement";
 
   export default {
     name: "programme",
     dicts: ['ent_pro_status'],
     data() {
       return {
+        disabled:false,
         // 遮罩层
         loading: true,
         // 选中数组
@@ -221,7 +222,8 @@
         form: {},
         defaultProps: {
           children: "children",
-          label: "label"
+          label: "label",
+          disabled:this.disabledFn
         },
         // 表单校验
         rules: {
@@ -238,6 +240,9 @@
       this.getList();
     },
     methods: {
+      disabledFn(){
+        return this.disabled
+      },
       /** 查询方案列表 */
       getList() {
         this.loading = true;
@@ -377,6 +382,7 @@
       },
       /** 新增按钮操作 */
       handleAdd() {
+        this.disabled = false
         this.reset();
         this.getMenuTreeselect();
         this.open = true;
@@ -384,26 +390,40 @@
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
+        this.disabled = false
         this.reset();
         const packageId = row.packageId
-        const roleMenu = this.getRoleMenuTreeselect(packageId);
+        // const roleMenu = this.getRoleMenuTreeselect(packageId);
+        this.getMenuTreeselect();
         detailTenantPackage(packageId).then(response => {
+          response.data.menuIds = response.data.menuIds.split(',')
           this.form = response.data;
           this.open = true;
-          console.log(res.data)
-          this.$nextTick(() => {
-            // roleMenu.then(res => {
-              let checkedKeys = res.data.menuIds
-              checkedKeys.forEach((v) => {
-                this.$nextTick(()=>{
-                  this.$refs.menu.setChecked(v, true ,false);
+              this.$nextTick(() => {
+                console.log(this.menuOptions)
+                let checkedKeys = response.data.menuIds
+                // menuOptions
+
+                checkedKeys.forEach((v) => {
+                    console.log(v)
+                  v = v.trim()
+                    let nodes = this.$refs.menu.getNode(v)
+                  // console.log(nodes)
+                  if(nodes.isLeaf == true){
+                    this.$refs.menu.setChecked(v,true,true);
+                  }else{
+                    this.$refs.menu.setChecked(v,true,false);
+                  }
                 })
               })
-            // });
-          });
           this.title = "修改方案";
         });
       },
+      //查看
+      handleLook(row){
+        this.handleUpdate(row)
+        this.disabled = true
+      },
       /** 选择角色权限范围触发 */
       dataScopeSelectChange(value) {
         if(value !== '2') {
@@ -434,15 +454,17 @@
       submitForm: function() {
         this.$refs["form"].validate(valid => {
           if (valid) {
+            this.form.menuIds = this.getMenuAllCheckedKeys();
+            console.log(this.form.menuIds )
+            // return false
             if (this.form.packageId != undefined) {
-              this.form.menuIds = this.getMenuAllCheckedKeys();
-              updateRole(this.form).then(response => {
+              saveTenantPackage(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
               });
             } else {
-              this.form.menuIds = this.getMenuAllCheckedKeys();
+              // this.form.menuIds = this.getMenuAllCheckedKeys();
               addTenantPackage(this.form).then(response => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
@@ -465,9 +487,9 @@
       },
       /** 删除按钮操作 */
       handleDelete(row) {
-        const roleIds = row.roleId || this.ids;
-        this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
-          return delRole(roleIds);
+        const packageIds = row.packageId || this.ids;
+        this.$modal.confirm('是否确认删除方案为数据项？').then(function() {
+          return deleteTenantPackage(packageIds);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");

dsk-operate-ui/vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://47.104.91.229:9099/prod-api`,
-        // target: `http://192.168.0.165:9098`,//施
-        target: `http://192.168.60.6:9098`,//谭
+        target: `http://192.168.0.165:9098`,//施
+        // target: `http://192.168.60.6:9098`,//谭
         // target: `http://139.9.157.49:9099`,//测试
         changeOrigin: true,
         pathRewrite: {