cloud-web-corejs 1.0.69 → 1.0.70

package/src/views/user/groups/edit.vue

@@ -76,6 +76,7 @@ export default {
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$commonHttp({
+          aes:true,
           url: USER_PREFIX + `/groups/get`,
           method: `post`,
           data: {
@@ -95,6 +96,7 @@ export default {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = USER_PREFIX + (this.isEdit ? `/groups/update` : `/groups/save`);
             this.$http({
+              aes:true,
               url: url,
               method: `post`,
               data: this.groups,

package/src/views/user/groups/list.vue

@@ -86,6 +86,7 @@ export default {
         vue: this,
         tableRef: 'table-m1',
         tableName: 'user_groups_list-m1',
+        aes: true,
         path: USER_PREFIX + '/groups/listPage',
         param: () => {
           return this.formData;

package/src/views/user/home/dev.vue

@@ -0,0 +1,29 @@
+<template>
+  <div id="containt" class="index-home-sys">
+    <i class="iconfont icon-a-kaifa1"></i>
+    <span>{{$t1('开发管理平台')}}</span>
+  </div>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+
+};
+</script>
+<style scoped lang="scss">
+.index-home-sys{
+  background-color: #DEE9F2 !important;margin-top: 10px !important;height: calc(100vh - 52px);border-radius: 12px !important;text-align: center;line-height: calc(100vh - 60px);letter-spacing: 2px;
+  font-size: 48px;font-weight: 600;
+  i{vertical-align: middle;font-weight: 400;margin-right: 24px;color:#225076;font-size:48px;}
+  span{position: relative;
+    &:before{content: "";position: absolute;bottom:0;left:0;width: 223px;height: 16px;background: #96B4CD;z-index: -1;opacity: 0.8;}
+  }
+}
+</style>

package/src/views/user/home/index.vue

@@ -36,9 +36,7 @@ export default {
           let userInfo = res.objx;
           this.userInfo = userInfo;
           let flag = userInfo.flag;
-          if (flag !== 6 && flag !== 7 && flag !== 8) {
-            this.initHome();
-          }
+          this.initHome();
         }
       });
     },
@@ -59,6 +57,15 @@ export default {
       });
     },
     initHome() {
+      let url = null;
+      let userInfo = this.userInfo;
+      let flag = userInfo.flag;
+      if (flag == 6 || flag == 7 || flag == 8) {
+        let url = '/user/home/dev.vue'
+        this.homeContent = require('@base/views' + url).default;
+        this.showHomeContent = true;
+        return
+      }
       this.$http({
         url: USER_PREFIX + '/menu/currentList',
         data: {},
@@ -68,17 +75,20 @@ export default {
           let homeMenu = menus.find(menu => menu.type == 2 && menu.enabled);
           let menuUrl = homeMenu?.url;
 
+          let userInfo = this.userInfo;
+          let flag = userInfo.flag;
+
           let str1 = "@base/views";
           let str2 = "@/views";
-          let url = null;
-          if (menuUrl) {
+
+          if (menuUrl && flag !== 1) {
+            //超级管理员不使用角色首页
             url = menuUrl + '.vue';
           } else {
             let defaultHomePage = this.userInfo.defaultHomePage;
             url = defaultHomePage ? defaultHomePage : '@base/views/user/home/default.vue'
           }
           if (url.startsWith(str1)) {
-            let a = url.slice(str1.length);
             this.homeContent = require('@base/views' + url.slice(str1.length)).default;
           } else if (url.startsWith(str2)) {
             this.homeContent = require('@/views' + url.slice(str2.length)).default;

package/src/views/user/outLink/index.vue

@@ -8,6 +8,8 @@
 </template>
 
 <script>
+import {getToken} from "@base/utils/auth";
+
 export default {
   name: 'outLink',
   data() {
@@ -36,6 +38,21 @@ export default {
             this.type = 1;
           }
         });
+      }else if (url.indexOf('token=platform_token') >= 0) {
+        this.$http({
+          url: YX_PREFIX + `/fundPlatform/getToken`,
+          method: `post`,
+          data: {},
+          isLoading: true,
+          success: res => {
+            this.url = url.replace('token=platform_token', 'token=' + res.objx);
+            this.type = 1;
+          }
+        });
+      } else if (url.indexOf('token=true') >= 0) {
+        let token = getToken();
+        this.url = url.replace('token=true', ('token=' + token))
+        this.type = 1;
       } else {
         this.url = url;
         this.type = 1;

package/src/views/user/push_setting/list.vue

@@ -32,7 +32,7 @@
                     <el-input v-model="formData.dataType" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="推送企业编码:" field="pushCompanyCode">
+                <vxe-form-item title="推送组织编码:" field="pushCompanyCode">
                   <template v-slot>
                     <el-input v-model="formData.pushCompanyCode" size="small" clearable/>
                   </template>
@@ -142,7 +142,7 @@ export default {
             fixed: 'left'
           },
           {
-            title: '推送企业编码',
+            title: '推送组织编码',
             field: 'pushCompanyCode',
             width: 150
           },

package/src/views/user/user/edit.vue

@@ -698,7 +698,7 @@ export default {
       if (rows.length > 0) {
         let outUserCodes = this.outUserCodes;
         if (this.userType === 1) {
-          //企业用户
+          //组织用户
           rows = rows.filter(row => !outUserCodes.includes(row.code));
         } else if (this.userType === 2) {
           //外部用户
@@ -973,7 +973,7 @@ export default {
     initRoleDialogParam() {
       //初始化角色弹框的查询参数
       if (this.userType == 1) {
-        //企业用户
+        //组织用户
         this.roleDialogParam = {
           queryAll: true,
           neCodes: [...this.outUserCodes]

package/src/views/user/user/form_edit.vue

@@ -116,6 +116,17 @@
             </table>
           </template>
         </baseTabPane>
+        <baseTabPane :label="$t1('表单分类信息')">
+          <template #default>
+            <vxe-grid
+              ref="table-m1"
+              :data="menuKindAuthDTOs"
+              v-bind="vxeOption"
+              @resizable-change="$vxeTableUtil.onColumnWitchChange"
+              @custom="$vxeTableUtil.customHandle"
+            ></vxe-grid>
+          </template>
+        </baseTabPane>
       </baseTabs>
     </el-form>
     <groudDialog v-if="showGroupDialog" :visiable.sync="showGroupDialog"
@@ -126,6 +137,7 @@
 <script>
 import xeUtils from "xe-utils";
 import groudDialog from "@base/views/user/groups/dialog.vue";
+import {getBdEnv} from "@base/api/user";
 
 export default {
   name: 'UserEdit',
@@ -170,7 +182,6 @@ export default {
         flag: 8,
         groupCode: null
       },
-      vxeOption: {},
       companyInfoOption: {},
       userRoleOption: {},
       showRoleDialog: false,
@@ -218,7 +229,10 @@ export default {
       showCountryDialog: false,
       userInfo: {},
       userGroups: [],
-      showGroupDialog: false
+      showGroupDialog: false,
+      vxeOption: {},
+      menuKindAuthDTOs: [],
+      isDev: true
     };
   },
   computed: {
@@ -231,19 +245,19 @@ export default {
   },
   async mounted() {
 
-    // this.getEainsGroupDTO();
-    // await this.initOutUserRoleCode();
-    // await this.initDistributorRole();
     this.getUserInfo()
     this.getUserGroups()
     this.getData();
     this.getConpanyInfo()
+    await this.initBdEnv();
+    this.initTableM1();
   },
   methods: {
     getData() {
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$commonHttp({
+          aes: true,
           url: USER_PREFIX + `/user/get`,
           method: `post`,
           data: {
@@ -287,6 +301,7 @@ export default {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = USER_PREFIX + (this.isEdit ? '/user/update' : '/user/save');
             this.$http({
+              aes: true,
               url: url,
               method: `post`,
               data: this.user,
@@ -317,6 +332,7 @@ export default {
     getSaleOrgData() {
       if (this.dataId) {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/user/getUserSaleOrg',
           method: `post`,
           data: {id: this.dataId},
@@ -337,6 +353,7 @@ export default {
     getUserRoleData() {
       if (this.dataId) {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/user/getUserRole',
           method: `post`,
           data: {id: this.dataId},
@@ -360,6 +377,7 @@ export default {
     getCompanyInfoData(callback) {
       if (this.dataId) {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/user/getUserCompanyInfo',
           method: `post`,
           data: {id: this.dataId},
@@ -409,6 +427,7 @@ export default {
     },
     getConpanyInfo() {
       this.$http({
+        aes: true,
         url: USER_PREFIX + '/company_info/getCurrent',
         method: `post`,
         isLoading: true,
@@ -431,53 +450,11 @@ export default {
     addCurrentCompany(callback) {
       this.confirmInsertCompany([this.companyInfo], callback);
     },
-    initDistributorRole() {
-      if (this.outUserCodes && this.outUserCodes.length == 1) {
-        return this.$http({
-          url: USER_PREFIX + '/role/list',
-          method: 'post',
-          success: res => {
-            let roleList = res.objx || [];
-            let distributorCode = this.outUserCodes[0];
-            this.distributorRole = roleList.find(item => item.code == distributorCode);
-          }
-        });
-      }
-    },
-    async initOutUserRoleCode() {
-      //初始化外部用户编码
-      return this.$http({
-        url: USER_PREFIX + '/system_parameter/getByCode',
-        method: 'post',
-        data: {"code": "outUserRoleCode"},
-        success: res => {
-          let value = (!res.objx || !res.objx.value) ? "distributor" : res.objx.value;
-          let codes = value.split(',');
-          this.outUserCodes = codes;//外部用户编码
-          this.initRoleDialogParam();//初始化角色弹框的查询参数
-        }
-      });
-    },
-    initRoleDialogParam() {
-      //初始化角色弹框的查询参数
-      if (this.userType == 1) {
-        //企业用户
-        this.roleDialogParam = {
-          queryAll: true,
-          neCodes: [...this.outUserCodes]
-        };
-      } else if (this.userType == 2) {
-        //外部用户
-        this.roleDialogParam = {
-          queryAll: true,
-          eqCodes: [...this.outUserCodes]
-        };
-      }
-    },
     unlock() {
       this.$baseConfirm(this.$t1('您确定要解锁吗？')).then(() => {
         var url = USER_PREFIX + '/user/unlockLoginAccount';
         this.$http({
+          aes: true,
           url: url,
           method: `post`,
           data: {
@@ -506,6 +483,7 @@ export default {
     },
     getUserInfo() {
       return this.$http({
+        aes: true,
         url: USER_PREFIX + '/user/currentUser',
         method: 'post',
         success: res => {
@@ -519,6 +497,7 @@ export default {
     },
     getUserGroups() {
       return this.$http({
+        aes: true,
         url: USER_PREFIX + '/groups/listPage',
         method: 'post',
         data: {},
@@ -526,7 +505,96 @@ export default {
           this.userGroups = res.objx?.records || [];
         }
       });
-    }
+    },
+    initTableM1() {
+      const tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'edit-user-menuKind-m1',
+        columns: [
+          {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
+          {
+            title: this.$t1('表单分类名称'),
+            field: 'menuKindName',
+            width: 350,
+            fixed: 'left'
+          },
+          {
+            title: this.$t1('编辑'),
+            field: 'editAuth',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.editAuth) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
+          {
+            title: this.$t1('导出发布'),
+            field: 'exportAuth',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.exportAuth) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
+          ...(this.isDev ? [{
+            title: this.$t1('可选导出发布类型'),
+            field: 'selectTypeAuth',
+            width: 200,
+            slots: {
+              default: ({row}) => {
+                if (row.selectTypeAuth) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          }] : []),
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+      if (this.dataId) {
+        this.$http({
+          aes: true,
+          url: USER_PREFIX + `/menu_kind_auth/list`,
+          method: `post`,
+          data: {
+            userId: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.menuKindAuthDTOs = res.objx || [];
+          }
+        });
+      }
+    },
+    initBdEnv() {
+      return getBdEnv({
+        success: res => {
+          this.isDev = res.objx == "dev"
+        }
+      });
+    },
   }
 };
 </script>

package/src/views/user/user/form_list.vue

@@ -222,6 +222,7 @@ export default {
     getUserGroups() {
       return new Promise((resolve, reject) => {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/groups/listPage',
           method: 'post',
           data: {},

package/src/views/user/user/info.vue

@@ -7,12 +7,12 @@
     :visible.sync="showDialog"
     :modal="falseValue"
     custom-class="dialog-style list-dialog demo-sty_2"
-    width="1000px"
+    width="500px"
     @close="dialogClose"
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div id="containt">
+    <div id="containt" style="height: 300px">
       <div class="detail-wrap">
         <el-form ref="editForm" :model="user">
           <div class="d-header clearfix">
@@ -29,7 +29,7 @@
             </div>
           </div>
           <div class="d-cont" style="height: auto">
-            <div class="d-item">
+            <div class="d-item" style="padding-right: 0">
               <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
               <table class="table-detail">
                 <tbody>
@@ -38,41 +38,25 @@
                     <em class="f-red">*</em>
                     {{ $t1('登录名') }}
                   </th>
-                  <td>
-                    <el-form-item prop="loginAccount" :rules="[{ required: true, trigger: 'blur' }]">
-                      <template v-if="dataId">
-                        <el-input
-                          size="small"
-                          v-model="user.loginAccount"
-                          maxlength="255"
-                          autocomplete="off"
-                          lay-verify="required"
-                          required=""
-                          :readonly="true"
-                        />
-                      </template>
-                      <template v-else>
-                        <el-input
-                          size="small"
-                          v-model="user.loginAccount"
-                          maxlength="255"
-                          autocomplete="off"
-                          lay-verify="required"
-                          required=""
-                          clearable
-                        />
-                      </template>
-                    </el-form-item>
+                  <td colspan="3">
+                    {{ user.loginAccount }}
                   </td>
-                  <th>{{ $t1('手机') }}</th>
-                  <td>
-                    <el-form-item prop="mobile" :rules="[{ required: false, trigger: 'blur' }]">
-                      <el-input size="small" v-model="user.mobile" type="text" maxlength="255" autocomplete="off"
-                                lay-verify="required|phone" clearable/>
+                </tr>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1('姓名') }}
+                  </th>
+                  <td colspan="3">
+                    <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
+                      <el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required=""
+                                clearable/>
                     </el-form-item>
                   </td>
+                </tr>
+                <tr>
                   <th>{{ $t1('密码') }}</th>
-                  <td>
+                  <td colspan="3">
                     <el-form-item prop="password" :rules="passRules">
                       <el-input
                         size="small"
@@ -86,8 +70,10 @@
                       />
                     </el-form-item>
                   </td>
+                </tr>
+                <tr>
                   <th>{{ $t1('确认密码') }}</th>
-                  <td>
+                  <td colspan="3">
                     <el-form-item prop="rePassword" :rules="pass2Rules">
                       <el-input
                         size="small"
@@ -103,62 +89,6 @@
                     </el-form-item>
                   </td>
                 </tr>
-                <tr>
-                  <th>
-                    <em class="f-red">*</em>
-                    {{ $t1('姓名') }}
-                  </th>
-                  <td>
-                    <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
-                      <el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required=""
-                                clearable/>
-                    </el-form-item>
-                  </td>
-                  <th>{{ $t1('性别') }}</th>
-                  <td>
-                    <el-radio-group v-model="user.gender">
-                      <el-radio :label="1">{{ $t1('男') }}</el-radio>
-                      <el-radio :label="2">{{ $t1('女') }}</el-radio>
-                    </el-radio-group>
-                  </td>
-                  <th>{{ $t1('出生日期') }}</th>
-                  <td>
-                    <el-date-picker size="small" v-model="user.birth" type="date" placeholder="选择日期"
-                                    value-format="yyyy-MM-dd" clearable/>
-                  </td>
-                  <th>{{ $t1('邮编') }}</th>
-                  <td>
-                    <el-input size="small" id="zipCode" v-model="user.zipCode" name="zipCode" maxlength="255"
-                              clearable/>
-                  </td>
-                </tr>
-                <tr>
-                  <th>{{ $t1('地址') }}</th>
-                  <td colspan="3">
-                    <el-input size="small" v-model="user.address" class="b" maxlength="255" clearable/>
-                  </td>
-                  <th>{{ $t1('设置') }}</th>
-                  <td colspan="3">
-                    <el-checkbox label="是否启用" v-model="user.enabled"></el-checkbox>
-                  </td>
-                </tr>
-                <tr>
-                  <th>{{ $t1('头像') }}</th>
-                  <td colspan="7">
-                    <baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="user.headPhotoUrl"
-                                dataType="medium"></baseUpload>
-                  </td>
-                </tr>
-                <tr>
-                  <th>{{ $t1('创建人') }}</th>
-                  <td>{{ user.createBy }}</td>
-                  <th>{{ $t1('创建时间') }}</th>
-                  <td>{{ user.createDate }}</td>
-                  <th>{{ $t1('更新人') }}</th>
-                  <td>{{ user.modifyBy }}</td>
-                  <th>{{ $t1('更新时间') }}</th>
-                  <td>{{ user.modifyDate }}</td>
-                </tr>
                 </tbody>
               </table>
             </div>