cloud-web-corejs 1.0.54-dev.13 → 1.0.54-dev.131

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

@@ -0,0 +1,131 @@
+<template>
+  <div class="login-container" :class="backgroundClass" ref="login-container" v-show="showContent">
+    <div class="login-main" style="height: auto;">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="账号登录" name="first">
+          <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="box-form login" autocomplete="on"
+                   label-position="left">
+            <el-form-item prop="username" class="txt">
+              <span class="svg-container"><i class="el-icon-user"/></span>
+              <el-input ref="username" v-model="loginForm.username" placeholder="请输入用户名" name="" type="text"
+                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+            </el-form-item>
+            <el-tooltip :enterable="false" v-model="capsTooltip" content="Caps lock is On" placement="right" manual>
+              <el-form-item prop="password" class="txt">
+                <span class="svg-container"><i class="el-icon-lock"/></span>
+                <el-input
+                  :key="passwordType"
+                  ref="password"
+                  v-model="loginForm.password"
+                  :type="passwordType"
+                  placeholder="请输入密码"
+                  name=""
+                  tabindex="2"
+                  autocomplete="on"
+                  auto-complete="new-password"
+                  @keyup.native="checkCapslock"
+                  @blur="capsTooltip = false"
+                  @keyup.enter.native="handleLogin"
+                />
+                <span class="show-pwd" @click="showPwd"><svg-icon
+                  :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"/></span>
+              </el-form-item>
+            </el-tooltip>
+            <div class="">
+              <el-checkbox v-model="isRememberPassword">记住密码</el-checkbox>
+            </div>
+            <el-button :loading="loading" type="primary" @click.prevent.stop="handleLogin" class="btn">登录</el-button>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="手机验证码登录" name="second">
+          <el-form ref="loginForm" :model="loginForm2" :rules="loginRules" class="box-form login" autocomplete="on"
+                   label-position="left">
+            <el-form-item prop="username" class="txt" style="width:66%">
+              <span class="svg-container"><i class="el-icon-mobile-phone"/></span>
+              <el-input ref="mobile" v-model="loginForm2.username" placeholder="请输入手机号" name="" type="text"
+                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+            </el-form-item>
+            <el-button class="btn-send" type="success" :class="{'gray-btn':isCounting}" @click="sendCode">
+              {{ buttonText }}
+            </el-button>
+            <el-form-item prop="smsCode" class="txt">
+              <span class="svg-container"><i class="el-icon-message"/></span>
+              <el-input ref="smsCode" v-model="loginForm2.smsCode" placeholder="请输入验证码" name="" type="text"
+                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+            </el-form-item>
+            <el-button :loading="loading" type="primary" @click.prevent.stop="handleLogin" class="btn">登录</el-button>
+          </el-form>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div class="tc copyright">
+      <slot name="footer">
+        © 广州同望科技发展有限公司
+        <span style="margin-left:50px;">4000646100</span>
+      </slot>
+    </div>
+  </div>
+</template>
+
+<script>
+import mixin from "@base/views/user/login/indexMixin";
+
+export default {
+  name: 'Login',
+  mixins: [mixin]
+}
+</script>
+<style lang="scss" scoped>
+@import '@/resources/css/login.scss';
+
+.login-container.tc {
+  background: url(~@/resources/images/bg-login5.jpg) center center/cover no-repeat;
+}
+
+.login-container.chigo {
+  background: url(~@/resources/images/bg-login6.jpg) center center/cover no-repeat;
+}
+
+.login-container.pcp {
+  background: url(~@/resources/images/bg-login8.jpg) center center/cover no-repeat;
+}
+
+.el-select-dropdown {
+  right: 5px;
+  top: 25px;
+}
+
+::v-deep .login-main .el-tabs__header {
+  margin-bottom: 0;
+
+  .el-tabs__nav {
+    line-height: 65px;
+    margin: 0 25px;
+    width: calc(100% - 50px);
+
+    .el-tabs__item {
+      font-size: 18px;
+      width: 50%;
+      text-align: center;
+      margin-right: 0;
+      padding-right: 0 !important;
+      line-height: 65px;
+      height: 65px;
+    }
+  }
+}
+
+.btn-send {
+  position: absolute;
+  margin-top: -74px;
+  right: 35px;
+  height: 52px;
+  width: 27%;
+
+  &.gray-btn {
+    background: #dedede;
+    border-color: #dedede;
+    color: #8a8686;
+  }
+}
+</style>

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

@@ -87,7 +87,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
 .designer-dialog.indexUse #containt .detail-wrap .d-cont {
   height: calc(100vh - 82px)
 }

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/position/list.vue

@@ -33,11 +33,11 @@
                     <el-input v-model="formData.name" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item :title="$t1('岗位编码')+':'" field="code">
+                <!-- <vxe-form-item :title="$t1('岗位编码')+':'" field="code">
                   <template v-slot>
                     <el-input v-model="formData.code" size="small" clearable/>
                   </template>
-                </vxe-form-item>
+                </vxe-form-item> -->
               </vxe-form>
             </template>
           </vxe-grid>
@@ -96,11 +96,11 @@ export default {
             width: 150,
             fixed: 'left'
           },
-          {
+          /* {
             field: 'code',
             title: this.$t1('岗位编码'),
             width: 250
-          },
+          }, */
           {title: this.$t1('所属组织'), field: 'companyName', width: 150},
           {
             field: 'enabled',

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/role/dialog.vue

@@ -12,7 +12,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:450px">
+    <div class="cont" style="height:65vh">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"

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

@@ -34,11 +34,11 @@
                     <el-input v-model="formData.name" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item :title="$t1('角色编码')+':'" field="code">
+                <!-- <vxe-form-item :title="$t1('角色编码')+':'" field="code">
                   <template v-slot>
                     <el-input v-model="formData.code" size="small" clearable/>
                   </template>
-                </vxe-form-item>
+                </vxe-form-item> -->
               </vxe-form>
             </template>
           </vxe-grid>
@@ -106,11 +106,11 @@ export default {
             sortable: true,
             fixed: 'left'
           },
-          {
+          /* {
             title: this.$t1('角色编码'),
             field: 'code',
             width: 150
-          },
+          }, */
           {
             title: this.$t1('角色描述'),
             field: 'description',

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

@@ -12,7 +12,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:450px">
+    <div class="cont" style="height:65vh">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"

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

@@ -12,7 +12,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:450px">
+    <div class="cont" style="height:65vh">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"

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]