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

package/src/views/user/common_attribute/itemEdit.vue

@@ -62,7 +62,7 @@
             </tr>
             <tr>
               <th>
-                {{ $t1('企业编码') }}
+                {{ $t1('组织编码') }}
               </th>
               <td colspan="5">
                 <el-form-item prop="exeCompanyCode" :rules="[{ required: false, trigger: 'blur' }]">
@@ -71,7 +71,7 @@
               </td>
               <td colspan="2"><span
                 class="f-red">{{
-                  $t1('注：多个企业用逗号隔开，未配置全企业可见，已配置只允许配置企业才可见当前属性值。')
+                  $t1('注：多个组织用逗号隔开，未配置全组织可见，已配置只允许配置组织才可见当前属性值。')
                 }}</span></td>
             </tr>
             <tr>

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

@@ -272,7 +272,7 @@ export default {
             width: 150
           },
           {
-            title: this.$t1('企业编码'),
+            title: this.$t1('组织编码'),
             field: 'exeCompanyCode',
             width: 250
           },

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

@@ -72,7 +72,7 @@
               </td>
               <th>
                 <em class="f-red" v-if="!commonScript.allCompany">*</em>
-                {{ $t1('执行企业编码') }}
+                {{ $t1('执行组织编码') }}
               </th>
               <td>
                 <el-form-item prop="exeCompanyCode" :rules="[{ required: !commonScript.allCompany, trigger: 'blur' }]">

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

@@ -174,7 +174,7 @@ export default {
             width: 150
           },
           {
-            title: this.$t1('执行企业编码'),
+            title: this.$t1('执行组织编码'),
             field: 'exeCompanyCode',
             width: 150
           },

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/form/vform/designer.vue

@@ -12,6 +12,7 @@
         @form-json-updated="handleFJU"
         @reflushTemplateList="reflushTemplateList"
         v-if="showDesinger"
+        :readonly="readonly"
       />
     </div><!--
     <el-tabs v-model="activeName" class="tab-boxCard tabCard-sty1" v-if="showDesinger">
@@ -32,7 +33,10 @@ import {formFieldMapping} from "../../../../views/user/form/vform/formFieldMappi
 
 export default {
   name: 'vform-designer:edit',
-  props: ['formCode'],
+  props: {
+    formCode: String,
+    readonly: Boolean
+  },
   components: {
     VFormDesigner
   },

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

@@ -44,7 +44,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="homeConfig.toDoSpan || 12" style="padding-left:6px;">
+      <el-col :span="homeConfig.toDoSpan || 16" style="padding-left:6px;">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
             <span style="float:left">
@@ -67,8 +67,10 @@
                       @custom="$vxeTableUtil.customHandle"></vxe-grid>
           </div>
         </el-card>
-      </el-col>
-      <el-col :span="4" style="padding-left:6px;" v-show="homeConfig.showFastTrack!==false">
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24" v-show="homeConfig.showFastTrack!==false">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
                   <span style="float:left">
@@ -731,14 +733,14 @@ body #app .index-home {
   }
 
   .fast-box {
-    height: 329px;
+        margin: 6px 4px 4px;
     overflow: hidden;
 
     .item {
-      width: 100%;
+      width: 118px;
       text-align: center;
       float: left;
-
+      margin-right: 14px;
       p {
         color: #2a6494;
         border: solid 1px #e2e2e2;
@@ -746,8 +748,8 @@ body #app .index-home {
         width: calc(100% - 4px);
         border-radius: 6px;
         position: relative;
-        height: 33px;
-        line-height: 32px;
+        height: 54px;
+        line-height: 54px;
         text-align: left;
         padding-left: 14px;
         font-size: 12px;
@@ -765,12 +767,13 @@ body #app .index-home {
         &:before {
           content: '';
           width: 4px;
-          height: 14px;
+          height: 24px;
           display: inline-block;
           background: #225279b8;
           position: absolute;
           left: -1px;
-          top: 9px;
+          top: 50%;
+          margin-top:-12px;
         }
 
         &:hover {
@@ -974,6 +977,7 @@ body #app .index-home {
         color: $baseColor
       }
     }
-  }
+  }
+  ::v-deep .el-card.is-always-shadow{box-shadow: 0 2px 2px 0 rgb(0 0 0 / 6%);}
 }
 </style>

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)
 }