cloud-web-corejs 1.0.54-dev.10 → 1.0.54-dev.101

package/src/views/user/company_info/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="$t1('组织列表')"
+    :title="title || $t1('组织列表')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="falseValue"
@@ -8,6 +8,7 @@
     :modal="falseValue"
     custom-class="dialog-style list-dialog dialog-checkbox pd_0"
     width="1200px"
+    :before-close="handleBeforeClose"
     @close="dialogClose"
     v-el-drag-dialog
     v-el-dialog-center
@@ -64,7 +65,7 @@
     </div>
     <span slot="footer" class="dialog-footer">
 			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
-			<el-button type="primary" plain class="button-sty" @click="dialogClose">
+			<el-button type="primary" plain class="button-sty" @click="dialogCancel">
 				<i class="el-icon-close el-icon"></i>
 				{{ $t1('取 消') }}
 			</el-button>
@@ -81,38 +82,47 @@ import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
 
 export default {
   name: 'company_info_dialog',
-  props: ['visiable', 'multi', 'rows', 'param', 'firstEnabled'],
+  props: ['title', 'visiable', 'multi', 'rows', 'param', 'firstEnabled', 'allCompany'],
   mixins: [selectDialogMixins],
   created() {
+    if (this.$attrs.fieldKey) this.fieldKey = this.$attrs.fieldKey;
     this.initSetting();
   },
   mounted() {
     this.initTableM1();
   },
   data() {
-    var that = this;
     return {
       showDialog: true,
       falseValue: false,
       selectMulti: true,
       formData: {},
-      vxeOption: {}
+      vxeOption: {},
     };
   },
   methods: {
     initTableM1() {
       let that = this;
+      let path = USER_PREFIX + '/user_company_info/getCurrentList';
+      let treeNodeUrl = USER_PREFIX + '/user_company_info/getChildren';
+      if (this.allCompany) {
+        path = USER_PREFIX + '/company_info/getRoot';
+        treeNodeUrl = USER_PREFIX + '/company_info/getChildren';
+      }
       let tableOption = {
         vue: that,
         tableRef: 'table-m1',
         tableName: 'basic_ompany_info_dialog_list',
-        path: USER_PREFIX + '/user_company_info/getCurrentList',
-        treeNodeUrl: USER_PREFIX + '/user_company_info/getChildren',
+        path: path,
+        treeNodeUrl: treeNodeUrl,
         treeNodeParam: function (row) {
-          return {parentCompanyCode: row.companyCode};
+          return {enabled: true, parentCompanyCode: row.companyCode};
         },
         param: () => {
-          return this.formData;
+          return {
+            enabled: true,
+            ...this.formData
+          }
         },
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},

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

@@ -46,7 +46,7 @@
             </tr>
             <tr>
               <th>
-                {{ $t1('企业默认首页') }}
+                {{ $t1('组织默认首页') }}
               </th>
               <td colspan="3">
                 <el-form-item prop="defaultHomePage" :rules="[{ required: false, trigger: 'blur' }]">

package/src/views/user/extend_datasource/dialog.vue

@@ -119,6 +119,7 @@ export default {
         tableRef: 'table-m1',
         tableName: 'report_datasource_dialog-m1',
         path: USER_PREFIX + '/extend_datasource/listPage',
+        aes: true,
         param: () => {
           return {
             enabled: true,

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

@@ -168,6 +168,7 @@ export default {
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$http({
+          aes: true,
           url: USER_PREFIX + `/extend_datasource/get`,
           method: `post`,
           data: {
@@ -189,6 +190,7 @@ export default {
         if (valid) {
           this.$baseConfirm(this.$t1('您确定要测试数据库链接吗？')).then(() => {
             this.$http({
+              aes: true,
               url: USER_PREFIX + '/extend_datasource/dblinktest',
               method: `post`,
               data: this.dataSource,
@@ -211,6 +213,7 @@ export default {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = USER_PREFIX + (this.isEdit ? `/extend_datasource/update` : `/extend_datasource/save`);
             this.$http({
+              aes: true,
               url: url,
               method: `post`,
               data: this.dataSource,

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

@@ -72,7 +72,7 @@
 import editView from './edit.vue';
 
 export default {
-  name: 'report_datasource:list',
+  name: 'extend_datasource:list',
   components: {editView},
   data() {
     return {
@@ -106,6 +106,7 @@ export default {
         tableRef: 'table-m1',
         tableName: 'user_report_datasource_list-m1',
         path: USER_PREFIX + '/extend_datasource/listPage',
+        aes: true,
         param: () => {
           return this.formData;
         },

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

@@ -55,6 +55,30 @@
                   </el-radio-group>
                 </el-form-item>
               </td>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('文件操作，是否发系统通知') }}
+              </th>
+              <td>
+                <el-form-item prop="toNotify" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-radio-group v-model="fileStoreArea.toNotify">
+                    <el-radio :label="1">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="0">{{ $t1('否') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('文件下载，是否打水印') }}
+              </th>
+              <td>
+                <el-form-item prop="toDownWatermark" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-radio-group v-model="fileStoreArea.toDownWatermark">
+                    <el-radio :label="1">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="0">{{ $t1('否') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
             </tr>
             <tr>
               <th>{{ $t1('备注') }}</th>
@@ -94,7 +118,12 @@ export default {
       tabIndex: 0,
       isEdit: false,
       dataId: '',
-      fileStoreArea: {storeAreaType: 0, hasAuth: 0},
+      fileStoreArea: {
+        storeAreaType: 0,
+        hasAuth: 0,
+        toNotify: 0,
+        toDownWatermark: 0
+      },
     };
   },
   created() {

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

@@ -154,6 +154,34 @@ export default {
               }
             }
           },
+          {
+            field: 'toNotify',
+            title: this.$t1('文件操作，是否发系统通知'),
+            width: 220,
+            slots: {
+              default: ({row}) => {
+                if (row.toNotify == 1) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
+          {
+            field: 'toDownWatermark',
+            title: this.$t1('文件下载，是否打水印'),
+            width: 200,
+            slots: {
+              default: ({row}) => {
+                if (row.toDownWatermark == 1) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
           {
             title: this.$t1('备注'),
             field: 'note',

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/login/default.vue

@@ -59,8 +59,10 @@
       </el-tabs>
     </div>
     <div class="tc copyright">
-      © 广州同望科技发展有限公司
-      <span style="margin-left:50px;">4000646100</span>
+      <slot name="footer">
+        © 广州同望科技发展有限公司
+        <span style="margin-left:50px;">4000646100</span>
+      </slot>
     </div>
   </div>
 </template>

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]