cloud-web-corejs 1.0.54-dev.9 → 1.0.54-dev.91

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>

package/src/views/user/user/form_info.vue

@@ -0,0 +1,210 @@
+<template>
+  <el-dialog
+    :title="$t1('个人设置')"
+    :append-to-body="true"
+    :modal-append-to-body="falseValue"
+    :close-on-click-modal="falseValue"
+    :visible.sync="showDialog"
+    :modal="falseValue"
+    custom-class="dialog-style list-dialog demo-sty_2"
+    width="500px"
+    @close="dialogClose"
+    v-el-drag-dialog
+    v-el-dialog-center
+  >
+    <div id="containt" style="height: 300px">
+      <div class="detail-wrap">
+        <el-form ref="editForm" :model="user">
+          <div class="d-header clearfix">
+            <div class="fl">
+              <i class="el-icon-info"/>
+              {{ 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>
+            </div>
+          </div>
+          <div class="d-cont" style="height: auto">
+            <div class="d-item" style="padding-right: 0">
+              <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
+              <table class="table-detail">
+                <tbody>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1('登录名') }}
+                  </th>
+                  <td colspan="3">
+                    {{ user.loginAccount }}
+                  </td>
+                </tr>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1('姓名') }}
+                  </th>
+                  <td colspan="3">
+                    <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
+                      <el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required=""
+                                clearable/>
+                    </el-form-item>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1('密码') }}</th>
+                  <td colspan="3">
+                    <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>
+                </tr>
+                <tr>
+                  <th>{{ $t1('确认密码') }}</th>
+                  <td colspan="3">
+                    <el-form-item prop="rePassword" :rules="pass2Rules">
+                      <el-input
+                        size="small"
+                        type="password"
+                        v-model="user.rePassword"
+                        show-password
+                        maxlength="255"
+                        autocomplete="off"
+                        auto-complete="new-password"
+                        lay-verify="confirmPass"
+                        clearable
+                      />
+                    </el-form-item>
+                  </td>
+                </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </el-form>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'userInfo',
+  components: {},
+  props: ['_dataId'],
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  data() {
+    var validatePass = (rule, value, callback) => {
+      const isPassRequired = !this.dataId;
+      if (isPassRequired && (value == '' || value == undefined)) {
+        callback(new Error(this.$t1('密码不能为空')));
+      } else {
+        callback();
+      }
+      this.$refs.editForm.validateField('rePassword');
+    };
+    var validatePass2 = (rule, value, callback) => {
+      const isPassRequired = !this.dataId;
+      const rePassword = value != undefined ? value : '';
+      const password = this.user.password != undefined ? this.user.password : '';
+
+      if (isPassRequired && rePassword == '') {
+        callback(new Error(this.$t1('确认密码不能为空')));
+      } else if (rePassword != password) {
+        callback(new Error(this.$t1('两次输入密码不一致!')));
+      } else {
+        callback();
+      }
+    };
+    return {
+      showDialog: true,
+      falseValue: false,
+      dataId: '',
+      hBtn: true,
+      user: {},
+      vxeOption: {},
+      companyInfoOption: {},
+      userRoleOption: {},
+      showContent: true,
+      passRules: [{validator: validatePass, trigger: 'blur', required: false}],
+      pass2Rules: [{validator: validatePass2, trigger: 'blur', required: false}]
+    };
+  },
+  methods: {
+    getData() {
+      let t = this._dataId;
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$commonHttp({
+          url: USER_PREFIX + `/user/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            var user = res.objx || {};
+            this.user = res.objx || {};
+            this.user.password = '';
+          }
+        });
+      } else {
+        this.isEdit = false;
+        this.user = {
+          enabled: true
+        };
+      }
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = USER_PREFIX + '/user/updateUserInfo';
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.user,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 500,
+                  onClose: t => {
+                    this.reloadContent();
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    },
+    dialogClose() {
+      this.$emit('update:visiable', false);
+    },
+    reloadContent() {
+      this.user = {};
+      this.getData();
+    }
+  }
+};
+</script>

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

@@ -222,6 +222,7 @@ export default {
     getUserGroups() {
       return new Promise((resolve, reject) => {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/groups/listPage',
           method: 'post',
           data: {},

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

@@ -217,7 +217,7 @@ export default {
           };
           let outUserCodes = this.outUserCodes;
           if (this.userType == 1) {
-            //企业用户
+            //组织用户
             formData.neRoleCodes = [...outUserCodes];
           } else if (this.userType == 2) {
             //外部用户
@@ -493,7 +493,7 @@ export default {
             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) {
               //外部用户
@@ -535,7 +535,7 @@ export default {
           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) {
             //外部用户

package/src/views/user/wf/wf_obj_config/list.vue

@@ -110,6 +110,9 @@
     <positionDialog v-if="showPositionDialog" :visiable.sync="showPositionDialog" @confirm="confirmPosition"/>
     <scriptDescriptionDialog path="static/readme/Wf.txt" v-if="showScriptDescriptionDialog"
                              :visiable.sync="showScriptDescriptionDialog"></scriptDescriptionDialog>
+    <wfBizDataSettingDialog v-if="showWfBizDataSettingDialog" :visiable.sync="showWfBizDataSettingDialog"
+                            @confirm="confirmWfBizDataSettingDialog"
+                            :objConfigItem="objConfigItem" :serviceId="currentRow.serviceId"></wfBizDataSettingDialog>
   </div>
 </template>
 <script>
@@ -123,6 +126,8 @@ import positionDialog from '../../../../views/user/position/dialog.vue';
 import wfParamEdit from '../../../../views/user/wf/wf_param/edit'
 import scriptDescriptionDialog from '@base/components/scriptDescription/dialog'
 import wfDiyAttributeEdit from '../../../../views/user/wf/wf_diy_attribute/edit'
+import wfBizDataSettingDialog from "./wfBizDataSettingDialog";
+
 
 export default {
   name: 'wf_obj_config:list',
@@ -133,7 +138,8 @@ export default {
     userDialog,
     positionDialog,
     scriptDescriptionDialog,
-    wfDiyAttributeEdit
+    wfDiyAttributeEdit,
+    wfBizDataSettingDialog
   },
   created() {
   },
@@ -180,7 +186,10 @@ export default {
       wfAssignFormTemplateCallback: null,
 
       showScriptDescriptionDialog: false,
-      showWfDiyAttributeEdit: false
+      showWfDiyAttributeEdit: false,
+
+      objConfigItem: null,
+      showWfBizDataSettingDialog: false
     };
   },
   watch: {
@@ -458,7 +467,7 @@ export default {
             width: 200
           },
           {
-            width: 150,
+            width: 100,
             fixed: 'right',
             sortable: false,
             title: '',
@@ -608,6 +617,13 @@ export default {
         this.showScriptDescriptionDialog = true;
       };
     },
+    openWfBizDataSettingDialog(row) {
+      this.objConfigItem = row;
+      this.showWfBizDataSettingDialog = true
+    },
+    confirmWfBizDataSettingDialog(rows) {
+
+    }
   }
 };
 </script>