@utogether/udp-core 1.0.1-beta.9 → 1.0.2

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

@@ -1,133 +1,127 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-11-17 16:42:14
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:50:29
- * @Description: file content
--->
-<template>
-  <div class="config">
-    <el-drawer
-      :model-value="show"
-      :before-close="handleClose"
-      direction="rtl"
-      :title="$t('message.title.employeeInfo')"
-      destroy-on-close
-      size="66%"
-    >
-      <ut-form
-        ref="suFormRef"
-        :record="data"
-        :loading="loading"
-        :items="items"
-        :data-status="dataStatus"
-      />
-      <el-divider />
-      <el-row type="flex" justify="end" style="padding-right: 22px">
-        <ut-button content="cancel" icon="ri-close-fill" @tap="handleClose" />
-        <ut-button content="confirm" icon="ri-save-3-fill" status="u-cyan" @tap="onSubmit" />
-      </el-row>
-    </el-drawer>
-  </div>
-</template>
-<script setup lang="ts">
-import { onMounted, ref } from 'vue';
-import { useRender } from '@utogether/utils';
-import { getServiceApi } from '../../../api';
-
-interface IProps {
-  show?: boolean;
-  record: IRecord;
-  dataStatus?: string;
-}
-
-const props = withDefaults(defineProps<IProps>(), {
-  show: true,
-  record: (): IRecord => {
-    return {};
-  },
-  dataStatus: 'detail'
-});
-
-const renderHook = useRender();
-const data = ref<IRecord>({});
-const suFormRef = ref(null);
-
-const loading = ref(false);
-
-const mapField = { userName: 'userName', userId: 'id' };
-const disabledProps = { disabled: props.dataStatus !== 'add' };
-
-const items = [
-  {
-    field: 'employeeCode',
-    required: true,
-    span: 8,
-    itemRender: renderHook.renderInput({ props: disabledProps })
-  },
-  { field: 'employeeName', required: true, span: 8, itemRender: renderHook.renderInput() },
-  { field: 'gender', span: 8, itemRender: renderHook.renderDict('SU.GENDER') },
-  {
-    field: 'deptName',
-    required: true,
-    span: 8,
-    itemRender: renderHook.renderLov({ code: 'SU.DEPARTMENT', field: 'deptName' }, onChange)
-  },
-  { field: 'email', span: 8, itemRender: renderHook.renderInput() },
-  { field: 'identity', span: 8, itemRender: renderHook.renderInput() },
-
-  { field: 'employeeDate', span: 8, itemRender: renderHook.renderDate() },
-  { field: 'solarDay', span: 8, itemRender: renderHook.renderDate() },
-  { field: 'phone', span: 8, itemRender: renderHook.renderInput() },
-  { field: 'mobile', span: 8, itemRender: renderHook.renderInput() },
-  {
-    field: 'attribute5',
-    title: 'message.releateUser',
-    span: 8,
-    itemRender: renderHook.renderSysUser({ mapField })
-  }
-];
-// function onSelectChange(e, item, record, field) {
-//   if (field === 'attribute5') {
-//     data.value.userName = item.userName;
-//     data.value.userId = item.id;
-//     data.value.attribute5 = item.name;
-//   }
-// }
-
-function onChange(e) {
-  e.row.deptName = e.item?.deptName || e.row.deptName;
-  e.row.deptCode = e.item?.deptCode || e.row.deptCode;
-  e.row.departmentId = e.item?.id || e.row.departmentId;
-}
-
-const emit = defineEmits<{
-  (e: 'onClose'): void;
-}>();
-
-const onSubmit = () => {
-  suFormRef.value.validateForm(async valid => {
-    if (!valid) {
-      const { dataStatus } = props;
-      loading.value = true;
-      console.log(data);
-      if (dataStatus === 'add') {
-        await getServiceApi().post('/uums/employee', data.value);
-      } else {
-        await getServiceApi().put('/uums/employee', data.value);
-      }
-      loading.value = false;
-      handleClose();
-    }
-  });
-};
-
-// 抽屉关闭
-function handleClose() {
-  emit('onClose');
-}
-
-onMounted(() => {
-  data.value = props.record;
-});
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:42:14
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-04-08 15:50:29
+ * @Description: file content
+-->
+<template>
+  <div class="config">
+    <el-drawer
+      :model-value="show"
+      :before-close="handleClose"
+      direction="rtl"
+      :title="$t('message.title.employeeInfo')"
+      destroy-on-close
+      size="66%"
+    >
+      <ut-form ref="suFormRef" :record="data" :loading="loading" :items="items" :data-status="dataStatus" />
+      <el-divider />
+      <el-row type="flex" justify="end" style="padding-right: 22px">
+        <ut-button content="cancel" icon="ri-close-fill" @tap="handleClose" />
+        <ut-button content="confirm" icon="ri-save-3-fill" status="u-cyan" @tap="onSubmit" />
+      </el-row>
+    </el-drawer>
+  </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+import { useRender } from '@utogether/utils';
+import { getServiceApi } from '../../../api';
+
+interface IProps {
+  show?: boolean;
+  record: IRecord;
+  dataStatus?: string;
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  show: true,
+  record: (): IRecord => {
+    return {};
+  },
+  dataStatus: 'detail'
+});
+
+const renderHook = useRender();
+const data = ref<IRecord>({});
+const suFormRef = ref(null);
+
+const loading = ref(false);
+
+const mapField = { userName: 'userName', userId: 'id' };
+const disabledProps = { disabled: props.dataStatus !== 'add' };
+
+const items = [
+  {
+    field: 'employeeCode',
+    required: true,
+    span: 8,
+    itemRender: renderHook.renderInput({ props: disabledProps })
+  },
+  { field: 'employeeName', required: true, span: 8, itemRender: renderHook.renderInput() },
+  { field: 'gender', span: 8, itemRender: renderHook.renderDict('SU.GENDER') },
+  {
+    field: 'deptName',
+    required: true,
+    span: 8,
+    itemRender: renderHook.renderLov({ code: 'SU.DEPARTMENT', field: 'deptName' }, onChange)
+  },
+  { field: 'email', span: 8, itemRender: renderHook.renderInput() },
+  { field: 'identity', span: 8, itemRender: renderHook.renderInput() },
+
+  { field: 'employeeDate', span: 8, itemRender: renderHook.renderDate() },
+  { field: 'solarDay', span: 8, itemRender: renderHook.renderDate() },
+  { field: 'phone', span: 8, itemRender: renderHook.renderInput() },
+  { field: 'mobile', span: 8, itemRender: renderHook.renderInput() },
+  {
+    field: 'attribute5',
+    title: 'message.releateUser',
+    span: 8,
+    itemRender: renderHook.renderSysUser({ mapField })
+  }
+];
+// function onSelectChange(e, item, record, field) {
+//   if (field === 'attribute5') {
+//     data.value.userName = item.userName;
+//     data.value.userId = item.id;
+//     data.value.attribute5 = item.name;
+//   }
+// }
+
+function onChange(e) {
+  e.row.deptName = e.item?.deptName || e.row.deptName;
+  e.row.deptCode = e.item?.deptCode || e.row.deptCode;
+  e.row.departmentId = e.item?.id || e.row.departmentId;
+}
+
+const emit = defineEmits<{
+  (e: 'onClose'): void;
+}>();
+
+const onSubmit = () => {
+  suFormRef.value.validateForm(async valid => {
+    if (!valid) {
+      const { dataStatus } = props;
+      loading.value = true;
+      console.log(data);
+      if (dataStatus === 'add') {
+        await getServiceApi().post('/uums/employee', data.value);
+      } else {
+        await getServiceApi().put('/uums/employee', data.value);
+      }
+      loading.value = false;
+      handleClose();
+    }
+  });
+};
+
+// 抽屉关闭
+function handleClose() {
+  emit('onClose');
+}
+
+onMounted(() => {
+  data.value = props.record;
+});
+</script>

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

@@ -1,145 +1,162 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-11-17 16:42:14
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-16 15:30:33
- * @Description: 员工管理
--->
-
-<template>
-  <div class="page-content">
-    <ut-grid
-      ref="xgrid"
-      :items="formItems"
-      :columns="columns"
-      :default-params="data.fetchExtParam"
-      :events="onEvents"
-      :auto-load="false"
-      :buttons="[{ code: 'del', auth: '/' }]"
-      :url="url"
-      mode="form"
-    />
-    <StaffInfo
-      v-if="data.showModelView"
-      :record="data.record"
-      :data-status="data.dataStatus"
-      @onClose="onClose"
-    />
-  </div>
-</template>
-
-<script setup lang="tsx">
-import { ref, reactive, watch, inject, nextTick } from 'vue';
-// import { useI18n } from 'vue-i18n';
-import { clone } from 'xe-utils';
-import { warnMessage } from '@utogether/utils';
-import StaffInfo from './StaffInfo.vue';
-import { getServiceApi } from '../../../api';
-
-const xgrid = ref(null);
-// const { t } = useI18n();
-const active: IRecord = inject('active');
-
-const data = reactive<IRecord>({
-  record: {},
-  showModelView: false,
-  fetchExtParam: {}
-});
-const url = '/uums/employee';
-
-watch(
-  () => active.value,
-  newVal => {
-    data.fetchExtParam = { departmentId: newVal?.id };
-    nextTick(() => {
-      xgrid.value.refreshData();
-    });
-  }
-);
-
-const formItems = [{ field: 'employeeCode' }, { field: 'employeeName' }];
-// 列字段
-const columns = [
-  { type: 'checkbox', width: 50, align: 'center' },
-  { field: 'employeeCode' },
-  { field: 'employeeName', width: 150 },
-  { field: 'gender', width: 100, formatter: ['formatDict', 'SU.GENDER'] },
-  { field: 'enabled', width: 100, formatter: ['formatDict', 'SU.ENABLE'] },
-  {
-    field: 'operate',
-    width: 150,
-    fixed: 'right',
-    slots: {
-      default: ({ row }) => {
-        const content = ['1', 'Y'].includes(row.enabled) ? 'disabled' : 'enable';
-        const icon = ['1', 'Y'].includes(row.enabled) ? 'ri-stop-circle-fill' : 'ri-play-circle-fill';
-        const status = ['1', 'Y'].includes(row.enabled) ? 'warning' : 'success';
-        return [
-          <>
-            <ut-button icon="ri-edit-box-line" content="edit" onTap={() => handleEdit(row)} />
-            <ut-button icon={icon} content={content} status={status} onTap={() => handleUpdate(row)} />
-          </>
-        ];
-      }
-    }
-  }
-];
-
-/**
- * @description:监听grid事件
- * @return {*}
- */
-const onEvents = {
-  toolbarButtonClick({ code }) {
-    code === 'add' && handleAdd();
-  }
-};
-
-// 新增
-const handleAdd = () => {
-  if (!active.value?.deptName) {
-    return warnMessage('请先选择部门');
-  }
-  data.dataStatus = 'add';
-  data.record = {};
-  data.record.departmentId = active.value?.id;
-  data.record.deptName = active.value.deptName;
-  data.record.enabled = '1';
-  data.showModelView = true;
-};
-// 编辑
-const handleEdit = (record: Object) => {
-  data.dataStatus = 'update';
-  data.record = record;
-  data.showModelView = true;
-};
-// 启用/禁用
-const handleUpdate = async (record: IRecord) => {
-  const body = clone(record, true);
-  xgrid.value.showLoading();
-  body.enabled = body.enabled === '1' ? '0' : '1';
-  await getServiceApi().put(url, body);
-  xgrid.value.hiddenLoading();
-  xgrid.value.refreshData();
-};
-
-// 删除
-// const handleDel = async () => {
-//   const type = await VXETable.modal.confirm(t('message.delRecord'));
-//   const records = xgrid.value.getInstance().getCheckboxRecords();
-//   if (type === 'confirm') {
-//     serviceApi.delete(url, records);
-//   }
-// };
-
-// 关闭弹框
-const onClose = () => {
-  data.showModelView = false;
-  xgrid.value.refreshData();
-};
-// 拷贝当前列表项的数据（字典类型）
-// const { clipboardRef } = useCopyToClipboard();
-// const cellDBLClickEvent: VxeTableEvents.CellDblclick = ({ row }) => {
-//   clipboardRef.value = unref(row).model;
-// };
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:42:14
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-11-27 18:59:49
+ * @Description: 员工管理
+-->
+
+<template>
+  <div class="page-content">
+    <ut-grid
+      ref="xgrid"
+      :items="formItems"
+      :columns="columns"
+      :default-params="data.fetchExtParam"
+      :events="onEvents"
+      :auto-load="false"
+      :buttons="buttons"
+      :url="url"
+      mode="form"
+      @buttonClick="onButtonClick"
+    />
+    <StaffInfo v-if="data.showModelView" :record="data.record" :data-status="data.dataStatus" @onClose="onClose" />
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { ref, reactive, watch, inject, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { clone } from 'xe-utils';
+import { warnMessage } from '@utogether/utils';
+import StaffInfo from './StaffInfo.vue';
+import { getServiceApi } from '../../../api';
+import { VxeUI } from 'vxe-pc-ui';
+
+const xgrid = ref(null);
+const { t } = useI18n();
+const active: IRecord = inject('active');
+
+const data = reactive<IRecord>({
+  record: {},
+  showModelView: false,
+  fetchExtParam: {}
+});
+const url = '/uums/employee';
+
+watch(
+  () => active.value,
+  newVal => {
+    data.fetchExtParam = { departmentId: newVal?.id };
+    nextTick(() => {
+      xgrid.value.refreshData();
+    });
+  }
+);
+
+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: 'del', auth: '/' }
+];
+
+const formItems = [{ field: 'employeeCode' }, { field: 'employeeName' }];
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  { field: 'employeeCode' },
+  { field: 'employeeName', width: 150 },
+  { field: 'gender', width: 100, formatter: ['formatDict', 'SU.GENDER'] },
+  { field: 'enabled', width: 100, formatter: ['formatDict', 'SU.ENABLE'] },
+  {
+    field: 'operate',
+    width: 150,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        const content = ['1', 'Y'].includes(row.enabled) ? 'disabled' : 'enable';
+        const icon = ['1', 'Y'].includes(row.enabled) ? 'ri-stop-circle-fill' : 'ri-play-circle-fill';
+        const status = ['1', 'Y'].includes(row.enabled) ? 'warning' : 'success';
+        return [
+          <>
+            <ut-button icon="ri-edit-box-line" content="edit" onTap={() => handleEdit(row)} />
+            <ut-button icon={icon} content={content} status={status} onTap={() => handleUpdate(row)} />
+          </>
+        ];
+      }
+    }
+  }
+];
+
+/**
+ * @description:监听grid事件
+ * @return {*}
+ */
+const onEvents = {
+  toolbarButtonClick({ code }) {
+    code === 'add' && handleAdd();
+  }
+};
+
+// 新增
+const handleAdd = () => {
+  if (!active.value?.deptName) {
+    return warnMessage('请先选择部门');
+  }
+  data.dataStatus = 'add';
+  data.record = {};
+  data.record.departmentId = active.value?.id;
+  data.record.deptName = active.value.deptName;
+  data.record.enabled = '1';
+  data.showModelView = true;
+};
+// 编辑
+const handleEdit = (record: Object) => {
+  data.dataStatus = 'update';
+  data.record = record;
+  data.showModelView = true;
+};
+// 启用/禁用
+const handleUpdate = async (record: IRecord) => {
+  const body = clone(record, true);
+  xgrid.value.showLoading();
+  body.enabled = body.enabled === '1' ? '0' : '1';
+  await getServiceApi().put(url, body);
+  xgrid.value.hiddenLoading();
+  xgrid.value.refreshData();
+};
+// 启用/禁用
+const handleSync = async () => {
+  const type = await VxeUI.modal.confirm(t('message.tip.confirmSync'));
+  if (type !== 'confirm') return;
+  xgrid.value.showLoading();
+  await getServiceApi().post('/uums/employee/syncEwEmp', {});
+  xgrid.value.hiddenLoading();
+  xgrid.value.refreshData();
+};
+
+const onButtonClick = code => {
+  code === 'sync' && handleSync();
+};
+
+// 删除
+// const handleDel = async () => {
+//   const type = await VXETable.modal.confirm(t('message.delRecord'));
+//   const records = xgrid.value.getInstance().getCheckboxRecords();
+//   if (type === 'confirm') {
+//     serviceApi.delete(url, records);
+//   }
+// };
+
+// 关闭弹框
+const onClose = () => {
+  data.showModelView = false;
+  xgrid.value.refreshData();
+};
+// 拷贝当前列表项的数据（字典类型）
+// const { clipboardRef } = useCopyToClipboard();
+// const cellDBLClickEvent: VxeTableEvents.CellDblclick = ({ row }) => {
+//   clipboardRef.value = unref(row).model;
+// };
+</script>

package/src/views/system/cron/cron-task.vue

@@ -88,18 +88,8 @@ const columns = [
         return [
           <>
             {app}
-            <ut-button
-              content="stopTask"
-              status="danger"
-              icon="ri-close-line"
-              onTap={() => handleStop(row)}
-            />
-            <ut-button
-              content="taskLog"
-              status="info"
-              icon="ri-file-line"
-              onTap={() => handleLog(row)}
-            />
+            <ut-button content="stopTask" status="danger" icon="ri-close-line" onTap={() => handleStop(row)} />
+            <ut-button content="taskLog" status="info" icon="ri-file-line" onTap={() => handleLog(row)} />
           </>
         ];
       }