*

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

@@ -182,6 +182,7 @@
                   :key="dict.packageId"
                   :label="dict.packageName"
                   :value="dict.packageId"
+                  :disabled="dict.disabled"
                 />
               </el-select>
             </el-form-item>
@@ -302,6 +303,13 @@
         selectTenant().then(res=>{
           if(res.code = 200){
             this.packageList = res.data
+            this.packageList.forEach(item=>{
+              if(item.status == '0'){
+                item.disabled = true
+              }else{
+                item.disabled = false
+              }
+            })
           }
         })
       },

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

@@ -216,6 +216,7 @@
     },
     created() {
       this.getList();
+      this.getMenuTreeselect();
     },
     methods: {
       disabledFn(){
@@ -309,7 +310,6 @@
       handleAdd() {
         this.disabled = false
         this.reset();
-        this.getMenuTreeselect();
         this.open = true;
         this.title = "添加方案";
       },
@@ -318,20 +318,18 @@
         this.disabled = false
         this.reset();
         const packageId = row.packageId
-        this.getMenuTreeselect();
         detailTenantPackage(packageId).then(response => {
           response.data.menuIds = response.data.menuIds.split(',')
           this.form = response.data;
           this.open = true;
               this.$nextTick(() => {
-                console.log(this.menuOptions)
                 let checkedKeys = response.data.menuIds
                 // menuOptions
 
                 checkedKeys.forEach((v) => {
                   v = v.trim()
-                    let nodes = this.$refs.menu.getNode(v)
-                  if(nodes.isLeaf == true){
+                  let nodes = this.$refs.menu.getNode(v)
+                  if(nodes.isLeaf && nodes.isLeaf == true){
                     this.$refs.menu.setChecked(v,true,true);
                   }else{
                     this.$refs.menu.setChecked(v,true,false);

dsk-operate-ui/src/views/system/dict/index.vue

@@ -169,7 +169,7 @@
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio
+            <el-radio :disabled="form.parentId==0"
               v-for="dict in dict.type.sys_normal_disable"
               :key="dict.value"
               :label="dict.value"
@@ -306,15 +306,23 @@ export default {
         if (valid) {
           if (this.form.dictId != undefined) {
             updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
+              if(response.code == 200){
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }else{
+                this.$modal.msgError(response.msg);
+              }
             });
           } else {
             addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
+              if(response.code == 200){
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }else{
+                this.$modal.msgError(response.msg);
+              }
             });
           }
         }

dsk-operate-ui/src/views/system/user/index.vue

@@ -149,12 +149,12 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="用户编号" align="center" :key=Math.random() prop="userId" v-if="columns[0].visible" />
           <!--<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />-->
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+          <el-table-column label="用户昵称" align="center" :key=Math.random() prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" :key=Math.random() prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" :key=Math.random() prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column label="状态" align="center" :key=Math.random() v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -164,7 +164,7 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column label="创建时间" align="center" :key=Math.random() prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -245,7 +245,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              <el-input v-model="form.phonenumber" :disabled="isUpdate" placeholder="请输入手机号码" maxlength="11" />
               <!--<el-input v-model="form.userName" placeholder="请输入手机号码" maxlength="11" />-->
             </el-form-item>
           </el-col>
@@ -495,7 +495,8 @@ export default {
             trigger: "blur"
           }
         ]
-      }
+      },
+      isUpdate:false,
     };
   },
   watch: {
@@ -606,6 +607,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.isUpdate = false
       this.reset();
       getUser().then(response => {
         this.postOptions = response.data.posts;
@@ -617,6 +619,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.isUpdate = true
       this.reset();
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {
@@ -686,10 +689,14 @@ export default {
     handleDelete(row) {
       const userIds = row.userId || this.ids;
       this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
+        delUser(userIds).then(res=>{
+          if(res.code == 200){
+            this.getList();
+            this.$modal.msgSuccess("删除成功");
+          }else{
+            this.$modal.msgError(res.msg);
+          }
+        });
       }).catch(() => {});
     },
     /** 导出按钮操作 */

dsk-operate-ui/src/views/system/user/profile/resetPwd.vue

@@ -18,6 +18,7 @@
 
 <script>
 import { updateUserPwd } from "@/api/system/user";
+import {Base64} from 'js-base64'
 
 export default {
   data() {
@@ -54,8 +55,12 @@ export default {
     submit() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
-            this.$modal.msgSuccess("修改成功");
+          updateUserPwd(Base64.encode(this.user.oldPassword), Base64.encode(this.user.newPassword)).then(response => {
+            if(response.code == 200){
+              this.$modal.msgSuccess("修改成功");
+            }else{
+              this.$modal.msgError(response.msg)
+            }
           });
         }
       });