@utogether/udp-core 1.0.4 → 2.0.0-beta.10

package/src/views/organization/staff/Staff.vue

@@ -1,58 +1,59 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-11-17 16:42:14
- * @LastEditors: wei.li
- * @LastEditTime: 2021-12-09 13:38:41
- * @Description: file content
--->
-<template>
-  <div class="u-content-panel">
-    <div class="u-left-panel">
-      <ScrollPane
-        :title="$t('department')"
-        url="/uums/department/treeDepartment"
-        :tree-otions="{ children: 'children', label: 'deptName' }"
-      />
-    </div>
-    <div class="content">
-      <StaffPanel />
-    </div>
-  </div>
-</template>
-<script lang="ts">
-export default { name: 'StaffPanel' };
-</script>
-<script lang="ts" setup>
-import { ref, provide } from 'vue';
-import ScrollPane from '../../../components/SuScrollTree/ScrollPanel.vue';
-import StaffPanel from './StaffPanel.vue';
-
-const scrollPanelChange: any = ref(false);
-const treeList: any = ref([]);
-const active: any = ref({});
-
-provide('scrollPanelChange', scrollPanelChange);
-provide('active', active);
-provide('treeList', treeList);
-</script>
-
-<style lang="scss" scoped>
-.u-content-panel {
-  box-sizing: border-box;
-  display: flex;
-  width: 100%;
-  height: 84vh;
-  padding: 2px;
-
-  .u-left-panel {
-    width: 250px;
-  }
-
-  .content {
-    flex: 1;
-    width: calc(100% - 250px);
-    height: 82vh;
-    margin-left: 10px;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:42:14
+ * @LastEditors: wei.li
+ * @LastEditTime: 2021-12-09 13:38:41
+ * @Description: file content
+-->
+<template>
+  <div class="u-content-panel">
+    <div class="u-left-panel">
+      <ScrollPane
+        :title="$t('department')"
+        :init-load-all="true"
+        :tree-otions="{ children: 'children', label: 'deptName' }"
+        url="/uums/department/treeDepartment"
+      />
+    </div>
+    <div class="content">
+      <StaffPanel />
+    </div>
+  </div>
+</template>
+<script lang="ts">
+export default { name: 'StaffPanel' };
+</script>
+<script lang="ts" setup>
+import { ref, provide } from 'vue';
+import ScrollPane from '../../../components/SuScrollTree/ScrollPanel.vue';
+import StaffPanel from './StaffPanel.vue';
+
+const scrollPanelChange: any = ref(false);
+const treeList: any = ref([]);
+const active: any = ref({});
+
+provide('scrollPanelChange', scrollPanelChange);
+provide('active', active);
+provide('treeList', treeList);
+</script>
+
+<style lang="scss" scoped>
+.u-content-panel {
+  box-sizing: border-box;
+  display: flex;
+  width: 100%;
+  height: 84vh;
+  padding: 2px;
+
+  .u-left-panel {
+    width: 250px;
+  }
+
+  .content {
+    flex: 1;
+    width: calc(100% - 250px);
+    height: 82vh;
+    margin-left: 10px;
+  }
+}
+</style>

package/src/views/organization/staff/StaffInfo.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:42:14
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:50:29
+ * @LastEditTime: 2026-01-21 18:27:50
  * @Description: file content
 -->
 <template>
@@ -75,7 +75,7 @@ const items = [
   { field: 'phone', span: 8, itemRender: renderHook.renderInput() },
   { field: 'mobile', span: 8, itemRender: renderHook.renderInput() },
   {
-    field: 'attribute5',
+    field: 'userName',
     title: 'message.releateUser',
     span: 8,
     itemRender: renderHook.renderSysUser({ mapField })
@@ -122,6 +122,7 @@ function handleClose() {
 }
 
 onMounted(() => {
+  console.log(props.record);
   data.value = props.record;
 });
 </script>

package/src/views/organization/staff/StaffPanel.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:42:14
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-12-08 08:27:39
+ * @LastEditTime: 2026-01-21 10:35:54
  * @Description: 员工管理
 -->
 
@@ -60,6 +60,7 @@ const buttons = [
   { code: 'sync', auth: 'wechat', status: 'success', icon: 'ri-refresh-line' },
   { code: 'sync', auth: 'dingding', status: 'success', icon: 'ri-refresh-line' },
   { code: 'sync', auth: 'OA', status: 'success', icon: 'ri-refresh-line' },
+  { code: 'bindUser', auth: 'bind', status: 'warning', icon: 'ri-bring-to-front' },
   { code: 'del', auth: '/' }
 ];
 
@@ -139,8 +140,19 @@ const handleSync = async () => {
   xgrid.value.refreshData();
 };
 
+const handleBind = async () => {
+  const selectRecords = xgrid.value.getSelectRecords();
+  if (!selectRecords.length) return;
+  xgrid.value.showLoading();
+  const [err] = await to(getServiceApi().post('/uums/employee/bindUser', selectRecords));
+  xgrid.value.hiddenLoading();
+  if (err) return;
+  xgrid.value.refreshData();
+};
+
 const onButtonClick = code => {
   code === 'sync' && handleSync();
+  code === 'bindUser' && handleBind();
 };
 
 const callback = {

package/src/views/system/layout/layout-home.vue

@@ -0,0 +1,238 @@
+<!--
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-12-23 11:00:51
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2026-01-06 18:50:23
+ * @FilePath: \udp-crm\packages\udp-crm\src\views\udev\layout\home-layout.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div>
+    <ut-grid
+      ref="xgrid"
+      :items="items"
+      :columns="columns"
+      :url="url"
+      :default-params="{ orgId: null }"
+      :check-method="onCheckMethod"
+      @editActivated="onEditActivated"
+    />
+    <!-- 角色分配 -->
+    <ut-modal-grid
+      v-if="showModal"
+      ref="ygrid"
+      :columns="subColumns"
+      mode="form"
+      url="/upfm/sysHomeRole"
+      :title="$t('message.title.layoutRole', { name: data.title })"
+      width="50%"
+      @buttonClick="onButtonClick"
+      @close="showModal = false"
+    />
+    <!-- 角色列表 -->
+    <ut-modal-grid
+      v-if="showRole"
+      ref="xmodal"
+      :items="subItems"
+      :columns="subColumns"
+      :show-footer="true"
+      :editable="false"
+      :title="$t('message.udp.roleList')"
+      url="/uums/role"
+      width="60%"
+      height="75%"
+      @close="showRole = false"
+      @confirm="onConfirm"
+    />
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { ref } from 'vue';
+import { useRender, successMessage, warnMessage } from '@utogether/utils';
+import { to } from 'await-to-js';
+import { clone } from 'xe-utils';
+import { VxeUI } from 'vxe-pc-ui';
+import { useI18n } from 'vue-i18n';
+import { getServiceApi } from '../../../api';
+
+defineOptions({ name: 'HomeLayout' });
+
+const renderHook = useRender();
+const { t } = useI18n();
+
+const xgrid = ref(null);
+const ygrid = ref(null);
+const xmodal = ref(null);
+
+const showModal = ref(false);
+const showRole = ref(false);
+
+const data = ref<IRecord>({});
+
+const url = '/upfm/sysHomeConfig';
+
+const items = [
+  { field: 'code', title: 'message.udp.componentCode' },
+  { field: 'title', title: 'message.udp.componentTitle' },
+  { field: 'enabled', itemRender: renderHook.renderDict({ code: 'SU.ENABLE' }) }
+];
+
+const subItems = [
+  { field: 'roleName', span: 9, title: 'message.udp.roleName' },
+  { field: 'roleCode', span: 9, title: 'message.udp.roleCode' }
+];
+
+const options = [
+  { label: 3, value: 3 },
+  { label: 4, value: 4 },
+  { label: 6, value: 6 },
+  { label: 8, value: 8 },
+  { label: 12, value: 12 },
+  { label: 24, value: 24 }
+];
+
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  { field: 'seqNo', required: true, width: 100, editRender: renderHook.renderNumber({ min: 10, step: 10 }) },
+  {
+    field: 'type',
+    title: 'message.udp.componentType',
+    width: 120,
+    editRender: renderHook.renderSelectLocal({
+      // disabled: true,
+      options: [
+        { label: '系统', value: 'system' },
+        { label: '自定义', value: 'custom' }
+      ],
+      defaultValue: 'custom'
+    })
+  },
+  {
+    field: 'code',
+    title: 'message.udp.componentCode',
+    width: 120,
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'title',
+    title: 'message.udp.componentTitle',
+    minWidth: 150,
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'span',
+    title: 'message.udp.componentSpan',
+    required: true,
+    width: 160,
+    editRender: renderHook.renderSelectLocal({ options })
+  },
+  {
+    field: 'height',
+    title: 'message.udp.componentHeight',
+    required: true,
+    editRender: renderHook.renderNumber({ min: 300 })
+  },
+  {
+    field: 'url',
+    title: 'message.udp.componentPath',
+    required: true,
+    minWidth: 150,
+    editRender: renderHook.renderInput()
+  },
+  { field: 'enabled', width: 90, formatter: ['formatDict', 'SU.ENABLE'] },
+  {
+    field: 'operate',
+    width: 140,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        if (!row.id) return;
+        const enabled = {
+          conent: row.enabled === '1' ? 'disabled' : 'enable',
+          status: row.enabled === '1' ? 'warning' : 'success',
+          icon: row.enabled === '1' ? 'ri-pause-circle-line' : 'ri-play-circle-line'
+        };
+        return [
+          <>
+            <ut-button content="role" auth="role" icon="ri-user-line" onTap={() => handleRole(row)} />
+            <ut-button content={enabled.conent} {...enabled} onTap={() => handleRowStatus(row)} />
+          </>
+        ];
+      }
+    }
+  }
+];
+
+const subColumns = [
+  { type: 'checkbox', width: 40 },
+  { field: 'roleName', title: 'message.udp.roleName' },
+  { field: 'roleCode', title: 'message.udp.roleCode' }
+];
+
+const handleRole = row => {
+  data.value = row;
+  showModal.value = true;
+};
+
+const handleAdd = () => {
+  showRole.value = true;
+};
+
+const handleRowStatus = async row => {
+  const message = row.enabled === '1' ? 'tip_disabledrecord' : 'tip_enabledrecord';
+  const type = await VxeUI.modal.confirm(t(`message.${message}`));
+  if (type === 'confirm') {
+    const body = clone(row, true);
+    body.enabled = body.enabled === '1' ? '0' : '1';
+    const [err] = await to(getServiceApi().put(url, [body]));
+    if (err) return;
+    successMessage();
+    xgrid.value.refreshData();
+  }
+};
+
+const handleDel = () => {
+  const selectRecords = ygrid.value.getSelectRecords();
+  if (!selectRecords.length) return;
+  ygrid.value.getInstance().commitProxy('delete');
+};
+
+const onConfirm = async records => {
+  if (records.length === 0) return warnMessage('message.tip.selectRole');
+  const body = records.map(m => {
+    const item = { configId: data.value.id, roleId: m.id };
+    return item;
+  });
+  xmodal.value.showLoading();
+  const [err] = await to(getServiceApi().post('/upfm/sysHomeRole', body));
+  if (!err) {
+    successMessage();
+    ygrid.value.refreshData();
+    showRole.value = false;
+  }
+};
+
+const onCheckMethod = row => {
+  return row.type !== 'system';
+};
+
+const onEditActivated = ({ row }) => {
+  const activeColumns = clone(columns, true);
+  if (row.type === 'system') {
+    let idx = activeColumns.findIndex(m => m.field === 'type');
+    activeColumns[idx].editRender.props.disabled = true;
+    idx = activeColumns.findIndex(m => m.field === 'url');
+    activeColumns[idx].editRender.props.disabled = true;
+  }
+  xgrid.value.getInstance().reloadColumn(activeColumns);
+};
+
+const onButtonClick = code => {
+  code === 'add' && handleAdd();
+  code === 'del' && handleDel();
+};
+</script>

package/src/views/system/menu/AuthorityPanel.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: wei.li
  * @Date: 2022-08-05 10:05:27
- * @LastEditors: wei.li
- * @LastEditTime: 2022-08-16 18:05:43
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-20 08:03:07
  * @Description: 菜单权限列表
 -->
 <template>
@@ -21,6 +21,7 @@
         url="/uums/menu"
         :default-params="{ parentId: record.id }"
         :default-value="{ parentId: record.id, menuType: 1 }"
+        :pager-config="{ layouts: [] }"
       />
     </el-drawer>
   </div>
@@ -65,7 +66,7 @@ const columns = [
   {
     field: 'permissionCode',
     required: true,
-    minWidth: 200,
+    minWidth: 180,
     editRender: renderHook.renderInput(),
     slots: {
       edit: ({ row }) => {
@@ -74,16 +75,16 @@ const columns = [
         };
         row.dispalyCode = row.permissionCode?.replace(`${prefixCode.value}.`, '');
         return [
-          <vxe-input
-            v-model={row.dispalyCode}
-            v-slots={slots}
-            className="ut-slot-input"
-            onInput={() => onInput(row)}
-          />
+          <vxe-input v-model={row.dispalyCode} v-slots={slots} className="ut-slot-input" onInput={() => onInput(row)} />
         ];
       }
     }
   },
+  {
+    field: 'remark',
+    title: 'message.udp.description',
+    editRender: renderHook.renderInput()
+  },
   {
     field: 'enabled',
     title: 'message.enabled',