cloud-web-corejs 1.0.54-dev.12 → 1.0.54-dev.121

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

@@ -64,6 +64,25 @@ export default {
 
       delete queryParam.urlmobile;
       delete queryParam.url;
+
+      if (purl.indexOf('.html') >= 0) {
+        let eUrl = purl;
+        let pstr = Object.keys(queryParam).map(key => {
+          return key + "=" + queryParam[key]
+        }).join("&")
+
+        if (pstr) {
+          if (purl.indexOf('.html?') >= 0) {
+            eUrl = eUrl + '&' + pstr
+          } else {
+            eUrl = eUrl + '?' + pstr
+          }
+        }
+
+        location.href = eUrl;
+        return
+      }
+
       delete queryParam.dataId;
       delete queryParam.showWfContent;
       delete queryParam.access_token;
@@ -74,7 +93,6 @@ export default {
       let url = purl + '.vue';
       this.queryParam = queryParam;
       this.showWfContent = true;
-      await this.initI18n();
       // this.wfContent = require('@/views' + url).default;
       let t = "@base/views";
       let urlArr = [
@@ -82,25 +100,34 @@ export default {
         '/user/form/view/list.vue',
         '/user/form/view/edit.vue'
       ]
-      if (urlArr.includes(url)) {
-        this.wfContent = require('@base/views' + url).default;
-      } else if (url.startsWith(t)) {
-        let path = url.slice(t.length);
-        this.wfContent = require('@base/views' + path).default;
-      } else {
-        this.wfContent = require('@/views' + url).default;
-      }
-
+      this.initUserInfo(() => {
+        this.initI18n();
+        if (urlArr.includes(url)) {
+          this.wfContent = require('@base/views' + url).default;
+        } else if (url.startsWith(t)) {
+          let path = url.slice(t.length);
+          this.wfContent = require('@base/views' + path).default;
+        } else {
+          this.wfContent = require('@/views' + url).default;
+        }
+      })
+    },
+    initUserInfo(callback) {
+      this.$store
+        .dispatch('user/getInfo2')
+        .then(() => {
+          callback && callback();
+        });
     },
     getI18nLang() {
       let i18nLang = this.$route.query.i18nLang || "zh";
       return i18nLang;
     },
-    initI18n() {
+    async initI18n() {
       let lang = this.getI18nLang();
       this.$i18n.locale = lang // 设置给本地的i18n插件
       localStorage.setItem("i18n-lang", lang);
-      return indexUtil.initI18nMessage("business", lang, true);
+      await indexUtil.initI18nMessage("business", lang, true);
     },
     login() {
       let token = this.$route.query.access_token;

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/outLink/view.vue

@@ -55,6 +55,25 @@ export default {
 
       delete queryParam.urlmobile;
       delete queryParam.url;
+
+      if (purl.indexOf('.html') >= 0) {
+        let eUrl = purl;
+        let pstr = Object.keys(queryParam).map(key => {
+          return key + "=" + queryParam[key]
+        }).join("&")
+
+        if (pstr) {
+          if (purl.indexOf('.html?') >= 0) {
+            eUrl = eUrl + '&' + pstr
+          } else {
+            eUrl = eUrl + '?' + pstr
+          }
+        }
+
+        location.href = eUrl;
+        return
+      }
+
       delete queryParam.dataId;
       delete queryParam.showWfContent;
       delete queryParam.access_token;
@@ -72,27 +91,34 @@ export default {
         '/user/form/view/list.vue',
         '/user/form/view/edit.vue'
       ]
-      if (urlArr.includes(url)) {
-        this.wfContent = require('@base/views' + url).default;
-      } else if (url.startsWith(t)) {
-        let path = url.slice(t.length);
-        this.wfContent = require('@base/views' + path).default;
-      } else {
-        this.wfContent = require('@/views' + url).default;
-      }
-
-      this.initI18n();
-
+      this.initUserInfo(() => {
+        this.initI18n();
+        if (urlArr.includes(url)) {
+          this.wfContent = require('@base/views' + url).default;
+        } else if (url.startsWith(t)) {
+          let path = url.slice(t.length);
+          this.wfContent = require('@base/views' + path).default;
+        } else {
+          this.wfContent = require('@/views' + url).default;
+        }
+      })
+    },
+    initUserInfo(callback) {
+      this.$store
+        .dispatch('user/getInfo2')
+        .then(() => {
+          callback && callback();
+        });
     },
     getI18nLang() {
       let i18nLang = this.$route.query.i18nLang || "zh";
       return i18nLang;
     },
-    initI18n() {
+    async initI18n() {
       let lang = this.getI18nLang();
       this.$i18n.locale = lang // 设置给本地的i18n插件
       localStorage.setItem("i18n-lang", lang);
-      indexUtil.initI18nMessage("business", lang, true);
+      await indexUtil.initI18nMessage("business", lang, true);
     },
     login() {
       let token = this.$route.query.access_token;

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

@@ -7,7 +7,7 @@
           {{ dataId ? $t1('查看用户') : $t1('新增用户') }}
         </div>
         <div class="fr">
-          <!--          <temp-storage-button :option="tempStorageOption" v-if="!dataId"></temp-storage-button>-->
+          <temp-storage-button :option="tempStorageOption" v-if="!dataId"></temp-storage-button>
           <base-input-export :option="exportOption" :parent-target="_self" v-if="dataId"/>
           <el-button type="primary" plain class="button-sty" icon="el-icon-unlock" @click="unlock" v-if="user.locked"
                      v-hasPermi="'user:unlock'">{{ $t1('解锁') }}
@@ -136,14 +136,14 @@
                     <el-input size="small" v-model="user.email" maxlength="200" clearable/>
                   </el-form-item>
                 </td>
-                <th v-if="flag!=='2'">
+<!--                <th v-if="flag!=='2'">
                   GUID
                 </th>
                 <td v-if="flag!=='2'">
                   <el-form-item prop="guid" :rules="[{ required: false, trigger: 'blur' }]">
                     <el-input size="small" v-model="user.guid" maxlength="200" clearable/>
                   </el-form-item>
-                </td>
+                </td>-->
                 <th>{{ $t1('地址') }}</th>
                 <td colspan="3">
                   <el-input size="small" v-model="user.address" class="b" maxlength="255" clearable/>
@@ -215,7 +215,7 @@
                   </el-button>
                 </div>
                 <div class="title-form">
-                  <span v-if="flag==='2'">
+                  <span>
                     <el-form-item label="GUID" :prop="'userCompanyInfoDTOs.'+index1+'.guid'"
                                   :rules="[{ required: false, trigger: 'blur' }]">
                     <el-input size="small" v-model="item.guid" maxlength="200" clearable/>
@@ -297,7 +297,7 @@
 
 <script>
 import xeUtils from "xe-utils";
-/*import tempStorageButton from "@base/components/tempStorage/index.vue";*/
+import tempStorageButton from "@base/components/tempStorage/index.vue";
 
 
 export default {
@@ -307,8 +307,8 @@ export default {
     companyDialog: () => import('../../../views/user/company_info/dialog.vue'),
     saleOrgDialog: () => import('../../../views/user/sale_org/dialog.vue'),
     positionDialog: () => import('../../../views/user/position/dialog.vue'),
-    countryDialog: () => import('../../../views/user/country/dialog.vue')/*,
-    tempStorageButton*/
+    countryDialog: () => import('../../../views/user/country/dialog.vue'),
+    tempStorageButton
   },
   props: ['_dataId', 'userType', 'flag'],
   data() {
@@ -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>