cloud-web-corejs 1.0.28 → 1.0.30

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

@@ -4,7 +4,7 @@
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看') : $t1('新增') }} {{ $t1('用户') }}
+          {{ dataId ? $t1('查看用户') : $t1('新增用户') }}
         </div>
         <div class="fr">
           <el-button type="primary" plain class="button-sty" icon="el-icon-unlock" @click="unlock" v-if="user.locked"
@@ -55,8 +55,21 @@
                   </el-form-item>
                 </td>
               </tr>
+              <tr v-if="userInfo.flag==6 || userInfo.flag==7">
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1('用户组') }}
+                </th>
+                <td colspan="3">
+                  <el-form-item prop="groupCode" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-select v-model="user.groupCode">
+                      <el-option v-for="(item,index) in userGroups" :key="index" :value="item.groupCode"
+                                 :label="item.groupName"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </td>
+              </tr>
               <tr>
-
                 <th>
                   <em class="f-red" v-if="!dataId">*</em>
                   {{ $t1('密码') }}
@@ -109,15 +122,18 @@
         </baseTabPane>
       </baseTabs>
     </el-form>
+    <groudDialog v-if="showGroupDialog" :visiable.sync="showGroupDialog"
+                 @confirm="confirmGroupDialog" multi="false"/>
   </div>
 </template>
 
 <script>
 import xeUtils from "xe-utils";
+import groudDialog from "@base/views/user/groups/dialog.vue";
 
 export default {
   name: 'UserEdit',
-  components: {},
+  components: {groudDialog},
   props: ['_dataId', 'userType', 'flag'],
   data() {
     var validatePass = (rule, value, callback) => {
@@ -155,7 +171,8 @@ export default {
         userType: null,
         countryName: null,
         countryCode: null,
-        flag: 8
+        flag: 8,
+        groupCode: null
       },
       vxeOption: {},
       companyInfoOption: {},
@@ -202,7 +219,10 @@ export default {
         saveConfirm: () => {
         }
       },
-      showCountryDialog: false
+      showCountryDialog: false,
+      userInfo: {},
+      userGroups: [],
+      showGroupDialog: false
     };
   },
   computed: {
@@ -218,6 +238,8 @@ export default {
     // this.getEainsGroupDTO();
     // await this.initOutUserRoleCode();
     // await this.initDistributorRole();
+    this.getUserInfo()
+    this.getUserGroups()
     this.getData();
     this.getConpanyInfo()
   },
@@ -359,7 +381,6 @@ export default {
         });
       }
     },
-
     confirmInsertCompany(rows, callback) {
       if (rows.length > 0) {
         const tableData = this.user.userCompanyInfoDTOs;
@@ -414,7 +435,6 @@ export default {
     addCurrentCompany(callback) {
       this.confirmInsertCompany([this.companyInfo], callback);
     },
-
     initDistributorRole() {
       if (this.outUserCodes && this.outUserCodes.length == 1) {
         return this.$http({
@@ -487,6 +507,29 @@ export default {
         this.user.countryName = row.countryName;
         this.user.countryCode = row.countryCode;
       }
+    },
+    getUserInfo() {
+      return this.$http({
+        url: USER_PREFIX + '/user/currentUser',
+        method: 'post',
+        success: res => {
+          let userInfo = res.objx;
+          this.userInfo = userInfo;
+          if (!this.isEdit) {
+            this.user.groupCode = userInfo.groupCode;
+          }
+        }
+      });
+    },
+    getUserGroups() {
+      return this.$http({
+        url: USER_PREFIX + '/groups/listPage',
+        method: 'post',
+        data: {},
+        success: res => {
+          this.userGroups = res.objx?.records || [];
+        }
+      });
     }
   }
 };

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

@@ -19,18 +19,15 @@
               <tableForm :formData.sync="formData" :advancedFormData.sync="advancedFormData"
                          @searchEvent="searchEvent" @resetEvent="resetEvent">
                 <template #buttonLeft>
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">新增
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">{{ $t1('新增') }}
                   </vxe-button>
-                  <base-table-export :option="{ title: '账户导出', targetRef: 'table-m1'}" :parent-target="_self"/>
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-download" @click="importExcel">导入
-                  </vxe-button>
-                  <base-input-export :option="exportOption" :parent-target="_self"/>
+                  <base-table-export :option="{ title: $t1('账户导出'), targetRef: 'table-m1'}" :parent-target="_self"/>
                 </template>
                 <template #buttonRight>
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{$t1('重置')}}
+                              plain>{{ $t1('重置') }}
                   </vxe-button>
-                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
+                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">{{ $t1('搜索') }}
                   </vxe-button>
                 </template>
               </tableForm>
@@ -44,11 +41,10 @@
 
 <script>
 import editView from './form_edit.vue';
-// import {treeScollx} from '@base/utils/global.js';
 import tableForm from "@base/components/table/tableForm";
 
 export default {
-  name: 'user:list',
+  name: 'user:form_list',
   props: {
     userType: {
       type: Number
@@ -63,39 +59,13 @@ export default {
 
   },
   activated() {
-    // this.initTableList();
+
   },
   async mounted() {
-    // treeScollx({target: this, type: 'default'});
-    // await this.initOutUserRoleCode();
-    // this.getRoleList();
     this.initTableList();
   },
   data() {
     return {
-      exportOption: {
-        prefix: USER_PREFIX,
-        tableRef: 'table-m1',
-        title: '用户',
-        codes: ["USEREXCEL", "USERPDF", "USERPRINT", "USERHIPRINT", "USERJDPRINT", "USERPDDPRINT", "USERVIPPRINT"],
-        onBeforePrint: (done, {etCode, etType}) => {
-          /*etType: 2 菜鸟打印,3 网页打印,6 京东打印*/
-          done();
-        },
-        onAfterPrint: ({etCode, etType}, close) => {
-          /*etType: 2 菜鸟打印,3 网页打印,6 京东打印*/
-          /*close();//关闭弹框*/
-        }
-      },
-      printOption: {
-        prefix: USER_PREFIX,
-        tableRef: 'table-m1',
-        param: {
-          type: 'print',
-          code: 'USERPRINT',
-          param: 'tableDefault'
-        }
-      },
       showEdit: false,
       activeName: 'second',
       showUpload: true,
@@ -109,16 +79,8 @@ export default {
       vxeOption: {
         className: 'list-table'
       },
-      defaultProps: {
-        label: 'name', //这里是树结构中需显示的数据（即接口返回的需展示在页面上的参数）
-        children: [],
-        isLeaf: 'leaf'
-      },
       showAdvancedSearch: false,
-      advancedFormData: {},
-      roleList: [],
-      distributorCode: 'distributor',
-      outUserCodes: []
+      advancedFormData: {}
     };
   },
   methods: {
@@ -147,16 +109,6 @@ export default {
             ...this.advancedFormData,
             flag: 8
           };
-          /*let outUserCodes = this.outUserCodes;
-          if (this.userType == 1) {
-            //企业用户
-            formData.neRoleCodes = [...outUserCodes];
-          } else if (this.userType == 2) {
-            //外部用户
-            if (!formData.roleCodes || !formData.roleCodes.length) {
-              formData.roleCodes = [...outUserCodes];
-            }
-          }*/
           return formData;
         },
         columns: [
@@ -177,6 +129,11 @@ export default {
             title: '姓名',
             width: 150
           },
+          {
+            field: 'groupName',
+            title: '用户组',
+            width: 150
+          },
           {
             field: 'enabled',
             title: this.$t1('是否启用'),
@@ -184,9 +141,9 @@ export default {
             slots: {
               default: ({row}) => {
                 if (row.enabled) {
-                  return [<div class="txt-status">{ this.$t1('启用') }</div>];
+                  return [<div class="txt-status">{this.$t1('启用')}</div>];
                 } else {
-                  return [<div class="txt-status s-3">{ this.$t1('禁用') }</div>];
+                  return [<div class="txt-status s-3">{this.$t1('禁用')}</div>];
                 }
               }
             }
@@ -226,7 +183,7 @@ export default {
                       this.openEditDialog(row.id);
                     }}
                   >
-                    <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
                                 popper-class="tooltip-skin">
                       <i class="el-icon-edit"/>
                     </el-tooltip>
@@ -245,7 +202,18 @@ export default {
               {label: this.$t1('启用'), value: true},
               {label: this.$t1('禁用'), value: false}
             ]
-          }
+          },
+          {
+            title: this.$t1('用户组'),
+            field: "groupCode",
+            type: "select",
+            common: true,
+            itemOption: [],
+            multiple: false,
+            syncHandle: () => {
+              return this.getUserGroups()
+            }
+          },
         ],
         config: {
           pagerConfig: {
@@ -257,91 +225,25 @@ export default {
         this.vxeOption = opts;
       });
     },
-    importExcel() {
-      let that = this;
-      that.$excelImport({
-        prefix: USER_PREFIX,
-        excel: USER_PREFIX + '/excelTemplate/user/user.xlsx',
-        multi: true,
-        saveUrl: USER_PREFIX + '/user/batchImport',
-        callback: () => {
-          that.searchEvent();
-        }
-      });
-    },
-    getRoleList2() {
+    getUserGroups() {
       return new Promise((resolve, reject) => {
         this.$http({
-          url: USER_PREFIX + '/role/list',
+          url: USER_PREFIX + '/groups/listPage',
           method: 'post',
+          data: {},
           success: res => {
-            let rows = res.objx || [];
-            let outUserCodes = this.outUserCodes;
-            if (this.userType == 1) {
-              //企业用户
-              rows = rows.filter(row => !outUserCodes.includes(row.code));
-            } else if (this.userType == 2) {
-              //外部用户
-              rows = rows.filter(row => outUserCodes.includes(row.code));
-            }
+            let rows = res.objx?.records || [];
             let result = rows.map(row => {
               return {
-                value: row.code,
-                label: row.name
-              }
-            });
-            resolve(result);
-          }
-        });
-      });
-    },
-    getDict() {
-      return new Promise((resolve, reject) => {
-        this.$getBaseDicts({
-          code: "orderType",
-          success: ({dicts, dictMap}) => {
-            let result = dicts.map(row => {
-              return {
-                value: row.sn,
-                label: row.value
+                value: row.groupCode,
+                label: row.groupName
               }
             });
             resolve(result);
           }
         });
-      });
+      })
 
-    },
-    getRoleList() {
-      return this.$http({
-        url: USER_PREFIX + '/role/list',
-        method: 'post',
-        success: res => {
-          let rows = res.objx || [];
-          let outUserCodes = this.outUserCodes;
-          if (this.userType == 1) {
-            //企业用户
-            rows = rows.filter(row => !outUserCodes.includes(row.code));
-          } else if (this.userType == 2) {
-            //外部用户
-            rows = rows.filter(row => outUserCodes.includes(row.code));
-          }
-          this.roleList = rows;
-          return rows;
-        }
-      });
-    },
-    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;
-        }
-      });
     }
   }
 };

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="个人设置"
+    :title="$t1('个人设置')"
     :append-to-body="true"
     :modal-append-to-body="falseValue"
     :close-on-click-modal="falseValue"
@@ -18,13 +18,14 @@
           <div class="d-header clearfix">
             <div class="fl">
               <i class="el-icon-info"/>
-              {{ dataId ? $t1('查看') : $t1('新增') }} 用户
+              {{ dataId ? $t1('查看用户') : $t1('新增用户') }}
             </div>
             <div class="fr">
               <el-button type="primary" plain class="button-sty" @click="reloadContent" icon="el-icon-refresh-right">
                 {{ $t1('重置') }}
               </el-button>
-              <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{$t1('保存')}}</el-button>
+              <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
+              </el-button>
             </div>
           </div>
           <div class="d-cont" style="height: auto">
@@ -35,7 +36,7 @@
                 <tr>
                   <th>
                     <em class="f-red">*</em>
-                    登录名
+                    {{ $t1('登录名') }}
                   </th>
                   <td>
                     <el-form-item prop="loginAccount" :rules="[{ required: true, trigger: 'blur' }]">
@@ -63,14 +64,14 @@
                       </template>
                     </el-form-item>
                   </td>
-                  <th>手机</th>
+                  <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/>
                     </el-form-item>
                   </td>
-                  <th>密码</th>
+                  <th>{{ $t1('密码') }}</th>
                   <td>
                     <el-form-item prop="password" :rules="passRules">
                       <el-input
@@ -85,7 +86,7 @@
                       />
                     </el-form-item>
                   </td>
-                  <th>确认密码</th>
+                  <th>{{ $t1('确认密码') }}</th>
                   <td>
                     <el-form-item prop="rePassword" :rules="pass2Rules">
                       <el-input
@@ -105,7 +106,7 @@
                 <tr>
                   <th>
                     <em class="f-red">*</em>
-                    姓名
+                    {{ $t1('姓名') }}
                   </th>
                   <td>
                     <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -113,36 +114,36 @@
                                 clearable/>
                     </el-form-item>
                   </td>
-                  <th>性别</th>
+                  <th>{{ $t1('性别') }}</th>
                   <td>
                     <el-radio-group v-model="user.gender">
-                      <el-radio :label="1">男</el-radio>
-                      <el-radio :label="2">女</el-radio>
+                      <el-radio :label="1">{{ $t1('男') }}</el-radio>
+                      <el-radio :label="2">{{ $t1('女') }}</el-radio>
                     </el-radio-group>
                   </td>
-                  <th>出生日期</th>
+                  <th>{{ $t1('出生日期') }}</th>
                   <td>
                     <el-date-picker size="small" v-model="user.birth" type="date" placeholder="选择日期"
                                     value-format="yyyy-MM-dd" clearable/>
                   </td>
-                  <th>邮编</th>
+                  <th>{{ $t1('邮编') }}</th>
                   <td>
                     <el-input size="small" id="zipCode" v-model="user.zipCode" name="zipCode" maxlength="255"
                               clearable/>
                   </td>
                 </tr>
                 <tr>
-                  <th>地址</th>
+                  <th>{{ $t1('地址') }}</th>
                   <td colspan="3">
                     <el-input size="small" v-model="user.address" class="b" maxlength="255" clearable/>
                   </td>
-                  <th>设置</th>
+                  <th>{{ $t1('设置') }}</th>
                   <td colspan="3">
                     <el-checkbox label="是否启用" v-model="user.enabled"></el-checkbox>
                   </td>
                 </tr>
                 <tr>
-                  <th>头像</th>
+                  <th>{{ $t1('头像') }}</th>
                   <td colspan="7">
                     <baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="user.headPhotoUrl"
                                 dataType="medium"></baseUpload>
@@ -183,7 +184,7 @@ export default {
     var validatePass = (rule, value, callback) => {
       const isPassRequired = !this.dataId;
       if (isPassRequired && (value == '' || value == undefined)) {
-        callback(new Error('密码不能为空'));
+        callback(new Error(this.$t1('密码不能为空')));
       } else {
         callback();
       }
@@ -195,9 +196,9 @@ export default {
       const password = this.user.password != undefined ? this.user.password : '';
 
       if (isPassRequired && rePassword == '') {
-        callback(new Error('确认密码不能为空'));
+        callback(new Error(this.$t1('确认密码不能为空')));
       } else if (rePassword != password) {
-        callback(new Error('两次输入密码不一致!'));
+        callback(new Error(this.$t1('两次输入密码不一致!')));
       } else {
         callback();
       }

package/src/views/user/user/infoEdit.vue

@@ -4,7 +4,7 @@
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看') : $t1('新增') }} 用户
+          {{ dataId ? $t1('查看用户') : $t1('新增用户') }}
         </div>
         <div class="fr">
           <el-button type="primary" plain class="button-sty" @click="reloadContent" icon="el-icon-refresh-right">
@@ -21,7 +21,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                登录名
+                {{ $t1('登录名') }}
               </th>
               <td>
                 <el-form-item prop="loginAccount" :rules="[{ required: true, trigger: 'blur' }]">
@@ -35,21 +35,21 @@
                   </template>
                 </el-form-item>
               </td>
-              <th>手机</th>
+              <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/>
                 </el-form-item>
               </td>
-              <th>密码</th>
+              <th>{{ $t1('密码') }}</th>
               <td>
                 <el-form-item prop="password" :rules="passRules">
                   <el-input size="small" type="password" v-model="user.password" show-password maxlength="255"
                             autocomplete="off" auto-complete="new-password" clearable/>
                 </el-form-item>
               </td>
-              <th>确认密码</th>
+              <th>{{ $t1('确认密码') }}</th>
               <td>
                 <el-form-item prop="rePassword" :rules="pass2Rules">
                   <el-input
@@ -69,7 +69,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                姓名
+                {{ $t1('姓名') }}
               </th>
               <td>
                 <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -77,35 +77,35 @@
                             clearable/>
                 </el-form-item>
               </td>
-              <th>性别</th>
+              <th>{{ $t1('性别') }}</th>
               <td>
                 <el-radio-group v-model="user.gender">
-                  <el-radio :label="1">男</el-radio>
-                  <el-radio :label="2">女</el-radio>
+                  <el-radio :label="1">{{ $t1('男') }}</el-radio>
+                  <el-radio :label="2">{{ $t1('女') }}</el-radio>
                 </el-radio-group>
               </td>
-              <th>出生日期</th>
+              <th>{{ $t1('出生日期') }}</th>
               <td>
                 <el-date-picker size="small" v-model="user.birth" type="date" placeholder="选择日期"
                                 value-format="yyyy-MM-dd" clearable/>
               </td>
-              <th>邮编</th>
+              <th>{{ $t1('邮编') }}</th>
               <td>
                 <el-input size="small" id="zipCode" v-model="user.zipCode" name="zipCode" maxlength="255" clearable/>
               </td>
             </tr>
             <tr>
-              <th>地址</th>
+              <th>{{ $t1('地址') }}</th>
               <td colspan="3">
                 <el-input size="small" v-model="user.address" class="b" maxlength="255" clearable/>
               </td>
-              <th>设置</th>
+              <th>{{ $t1('设置') }}</th>
               <td colspan="3">
-                <el-checkbox label="是否启用" v-model="user.enabled"></el-checkbox>
+                <el-checkbox :label="$t1('是否启用')" v-model="user.enabled"></el-checkbox>
               </td>
             </tr>
             <tr>
-              <th>头像</th>
+              <th>{{ $t1('头像') }}</th>
               <td colspan="7">
                 <baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="user.headPhotoUrl"
                             dataType="medium"></baseUpload>
@@ -143,7 +143,7 @@ export default {
     var validatePass = (rule, value, callback) => {
       const isPassRequired = !this.dataId;
       if (isPassRequired && (value == '' || value == undefined)) {
-        callback(new Error('密码不能为空'));
+        callback(new Error(this.$t1('密码不能为空')));
       } else {
         callback();
       }
@@ -155,9 +155,9 @@ export default {
       const password = this.user.password != undefined ? this.user.password : '';
 
       if (isPassRequired && rePassword == '') {
-        callback(new Error('确认密码不能为空'));
+        callback(new Error(this.$t1('确认密码不能为空')));
       } else if (rePassword != password) {
-        callback(new Error('两次输入密码不一致!'));
+        callback(new Error(this.$t1('两次输入密码不一致!')));
       } else {
         callback();
       }

package/src/views/user/user/infoIframeDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="个人设置"
+    :title="$t1('个人设置')"
     :append-to-body="true"
     :modal-append-to-body="false"
     :close-on-click-modal="false"