@utogether/udp-core 1.0.1-beta.3 → 1.0.1-beta.31

package/src/views/organization/company/CompanyPanel.vue

@@ -1,259 +1,259 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-11-19 21:14:41
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:48:36
- * @Description: 租户管理
--->
-
-<template>
-  <div class="page-content">
-    <!-- 工具栏 -->
-    <vxe-toolbar perfect class="">
-      <template #buttons>
-        <ut-button status="u-cyan" icon="ri-add-line" content="add" @tap="handleAdd()" />
-        <ut-button status="primary" icon="ri-edit-box-line" content="edit" @tap="handleEdit('update')" />
-        <ut-button status="danger" icon="ri-close-fill" content="delete" @tap="handleDelete()" />
-      </template>
-    </vxe-toolbar>
-    <el-row
-      v-if="data.dialogFormVisible"
-      type="flex"
-      justify="center"
-      align="middle"
-      class="w-departInfo-wrapper"
-    >
-      <el-card width="60%" shadow="always" class="box-card w-card-wrapper">
-        <div class="clearfix">
-          <span class="w-card-title" />
-        </div>
-        <el-row>
-          <vxe-form ref="xForm" :data="data.record" :rules="rules" label-width="80px">
-            <vxe-form-item
-              :title="$t('message.udp.unitName')"
-              field="unitName"
-              :item-render="{ name: '$input', props: { disabled: data.dataStatus === 'detail' } }"
-              :span="24"
-            />
-            <vxe-form-item
-              :title="$t('message.udp.unitCode')"
-              field="unitCode"
-              :item-render="{ name: '$input', props: { disabled: data.dataStatus !== 'add' } }"
-              :span="24"
-            />
-            <vxe-form-item
-              :title="$t('message.udp.unitNote')"
-              field="unitNote"
-              :item-render="{ name: '$input', props: { disabled: data.dataStatus === 'detail' } }"
-              :span="24"
-            />
-          </vxe-form>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <vxe-checkbox
-            v-if="data.dataStatus === 'add'"
-            v-model="data.isChecked"
-            style="padding-top: 5px; margin-right: 8px"
-            >{{ $t('message.udp.continueAdd') }}</vxe-checkbox
-          >
-          <vxe-button
-            v-if="data.dataStatus !== 'detail'"
-            status="primary"
-            :content="$t('message.btn.confirm')"
-            @click="handleComfirm"
-          />
-          <vxe-button
-            v-if="data.dataStatus !== 'detail'"
-            status="warning"
-            :content="$t('message.btn.cancel')"
-            @click="handleCancle"
-          />
-        </el-row>
-      </el-card>
-    </el-row>
-    <el-row v-else class="w-noclick-wrapper">
-      <!-- <span class="w-department-header">{{ $t('setting.deartment.organization') }}</span> -->
-      <div class="w-content-wrapper">
-        <ul>
-          <li class="w-department-line">
-            <div>● 点击新建，新建租户信息。</div>
-            <div style="margin: 0; text-indent: 2em">
-              已点击树结构上的租户名称，默认创建为当前租户的下属租户
-            </div>
-            <div style="margin: 0; text-indent: 2em">未点击树结构上的租户名称，则创建为一级租户</div>
-          </li>
-          <li class="w-department-line">● 点击树结构上的租户名称，点击修改按钮，修改租户信息。</li>
-          <li class="w-department-line">
-            <div>● 点击树结构上的租户名称，点击删除按钮，删除租户信息。</div>
-            <div style="text-indent: 2em">当租户下有单位存在时，不允许删除租户信息。</div>
-          </li>
-        </ul>
-      </div>
-    </el-row>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useI18n } from 'vue-i18n';
-import { reactive, watch, inject } from 'vue';
-import { VxeUI } from 'vxe-table';
-import { templateRef } from '@vueuse/core';
-import { clone } from 'xe-utils';
-import { successMessage, warnMessage } from '@utogether/utils';
-import { getServiceApi } from '../../../api';
-
-const data = reactive<IRecord>({
-  record: {},
-  dataList: [],
-  submitLoading: false,
-  dialogFormVisible: false,
-  isChecked: false,
-  dataStatus: ''
-});
-const { t } = useI18n();
-const rules = {
-  unitName: [
-    {
-      required: true,
-      message: `${t('message.required')}${t('message.udp.unitName')}`
-    }
-  ],
-  unitCode: [
-    {
-      required: true,
-      message: `${t('message.required')}${t('message.udp.unitCode')}`
-    }
-  ]
-};
-
-const active: IRecord = inject('active');
-const scrollPanelChange: IRecord = inject('scrollPanelChange');
-
-const serviceApi = getServiceApi();
-const url = '/uums/unit';
-
-watch(
-  () => active.value,
-  (newVal, oldVal) => {
-    data.record = active.value;
-    newVal?.id && oldVal?.id && newVal !== oldVal && handleEdit('detail');
-  }
-);
-
-// 新增子类型
-const handleAdd = () => {
-  data.dataStatus = 'add';
-  data.record = {};
-  data.record.parentId = active.value?.id;
-  data.isChecked = false;
-  data.dialogFormVisible = true;
-};
-// 编辑
-const handleEdit = dataStatus => {
-  data.dataStatus = dataStatus;
-  data.record = clone(active.value, true);
-  data.dialogFormVisible = true;
-};
-
-const xForm = templateRef<any>('xForm', null);
-const handleComfirm = () => {
-  xForm.value.validate(async valid => {
-    if (!valid) {
-      const { record, dataStatus } = data;
-      if (dataStatus === 'add') {
-        await serviceApi.post(url, record);
-      } else {
-        await serviceApi.put(url, record);
-      }
-      actionComplete();
-    }
-  });
-};
-
-const handleDelete = async () => {
-  const { record } = data;
-  if (record.children?.length) return warnMessage(t('message.deletePartment'));
-  const type = await VxeUI.modal.confirm(t('message.tip.del', { msg: 'aaaaa' }));
-  if (type === 'confirm') {
-    await serviceApi.delete(url, record);
-    actionComplete();
-  }
-};
-
-const actionComplete = () => {
-  scrollPanelChange.value = true;
-  successMessage(t('message.operateSuccess'));
-  handleClose();
-};
-
-const handleCancle = () => {
-  data.dialogFormVisible = false;
-  data.dataStatus = '';
-};
-
-const handleClose = () => {
-  data.dialogFormVisible = false;
-};
-</script>
-<style lang="scss" scoped>
-.page-content {
-  background-color: #fff;
-
-  .w-departInfo-wrapper {
-    width: 96%;
-    height: 75vh;
-
-    .w-card-wrapper {
-      width: 40%;
-
-      .el-card__header {
-        padding: 10px 20px;
-
-        .w-card-title {
-          position: relative;
-          top: 5px;
-        }
-      }
-    }
-
-    .el-form-item {
-      margin-bottom: 12px;
-    }
-  }
-
-  .w-noclick-wrapper {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-
-    .w-content-wrapper {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 75vh;
-
-      ul {
-        padding: 24px;
-        border: 1px solid #ccc;
-        border-radius: 10px;
-      }
-    }
-
-    .w-department-header {
-      padding-right: 20px;
-      font-size: 26px;
-      font-weight: bolder;
-      color: #69c;
-    }
-
-    .w-department-line {
-      font-size: 16px;
-      line-height: 35px;
-      color: #999;
-      list-style: none;
-    }
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-11-19 21:14:41
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-04-08 15:48:36
+ * @Description: 租户管理
+-->
+
+<template>
+  <div class="page-content">
+    <!-- 工具栏 -->
+    <vxe-toolbar perfect class="">
+      <template #buttons>
+        <ut-button status="u-cyan" icon="ri-add-line" content="add" @tap="handleAdd()" />
+        <ut-button status="primary" icon="ri-edit-box-line" content="edit" @tap="handleEdit('update')" />
+        <ut-button status="danger" icon="ri-close-fill" content="delete" @tap="handleDelete()" />
+      </template>
+    </vxe-toolbar>
+    <el-row
+      v-if="data.dialogFormVisible"
+      type="flex"
+      justify="center"
+      align="middle"
+      class="w-departInfo-wrapper"
+    >
+      <el-card width="60%" shadow="always" class="box-card w-card-wrapper">
+        <div class="clearfix">
+          <span class="w-card-title" />
+        </div>
+        <el-row>
+          <vxe-form ref="xForm" :data="data.record" :rules="rules" label-width="80px">
+            <vxe-form-item
+              :title="$t('message.udp.unitName')"
+              field="unitName"
+              :item-render="{ name: '$input', props: { disabled: data.dataStatus === 'detail' } }"
+              :span="24"
+            />
+            <vxe-form-item
+              :title="$t('message.udp.unitCode')"
+              field="unitCode"
+              :item-render="{ name: '$input', props: { disabled: data.dataStatus !== 'add' } }"
+              :span="24"
+            />
+            <vxe-form-item
+              :title="$t('message.udp.unitNote')"
+              field="unitNote"
+              :item-render="{ name: '$input', props: { disabled: data.dataStatus === 'detail' } }"
+              :span="24"
+            />
+          </vxe-form>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <vxe-checkbox
+            v-if="data.dataStatus === 'add'"
+            v-model="data.isChecked"
+            style="padding-top: 5px; margin-right: 8px"
+            >{{ $t('message.udp.continueAdd') }}</vxe-checkbox
+          >
+          <vxe-button
+            v-if="data.dataStatus !== 'detail'"
+            status="primary"
+            :content="$t('message.btn.confirm')"
+            @click="handleComfirm"
+          />
+          <vxe-button
+            v-if="data.dataStatus !== 'detail'"
+            status="warning"
+            :content="$t('message.btn.cancel')"
+            @click="handleCancle"
+          />
+        </el-row>
+      </el-card>
+    </el-row>
+    <el-row v-else class="w-noclick-wrapper">
+      <!-- <span class="w-department-header">{{ $t('setting.deartment.organization') }}</span> -->
+      <div class="w-content-wrapper">
+        <ul>
+          <li class="w-department-line">
+            <div>● 点击新建，新建租户信息。</div>
+            <div style="margin: 0; text-indent: 2em">
+              已点击树结构上的租户名称，默认创建为当前租户的下属租户
+            </div>
+            <div style="margin: 0; text-indent: 2em">未点击树结构上的租户名称，则创建为一级租户</div>
+          </li>
+          <li class="w-department-line">● 点击树结构上的租户名称，点击修改按钮，修改租户信息。</li>
+          <li class="w-department-line">
+            <div>● 点击树结构上的租户名称，点击删除按钮，删除租户信息。</div>
+            <div style="text-indent: 2em">当租户下有单位存在时，不允许删除租户信息。</div>
+          </li>
+        </ul>
+      </div>
+    </el-row>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n';
+import { reactive, watch, inject } from 'vue';
+import { VxeUI } from 'vxe-table';
+import { templateRef } from '@vueuse/core';
+import { clone } from 'xe-utils';
+import { successMessage, warnMessage } from '@utogether/utils';
+import { getServiceApi } from '../../../api';
+
+const data = reactive<IRecord>({
+  record: {},
+  dataList: [],
+  submitLoading: false,
+  dialogFormVisible: false,
+  isChecked: false,
+  dataStatus: ''
+});
+const { t } = useI18n();
+const rules = {
+  unitName: [
+    {
+      required: true,
+      message: `${t('message.required')}${t('message.udp.unitName')}`
+    }
+  ],
+  unitCode: [
+    {
+      required: true,
+      message: `${t('message.required')}${t('message.udp.unitCode')}`
+    }
+  ]
+};
+
+const active: IRecord = inject('active');
+const scrollPanelChange: IRecord = inject('scrollPanelChange');
+
+const serviceApi = getServiceApi();
+const url = '/uums/unit';
+
+watch(
+  () => active.value,
+  (newVal, oldVal) => {
+    data.record = active.value;
+    newVal?.id && oldVal?.id && newVal !== oldVal && handleEdit('detail');
+  }
+);
+
+// 新增子类型
+const handleAdd = () => {
+  data.dataStatus = 'add';
+  data.record = {};
+  data.record.parentId = active.value?.id;
+  data.isChecked = false;
+  data.dialogFormVisible = true;
+};
+// 编辑
+const handleEdit = dataStatus => {
+  data.dataStatus = dataStatus;
+  data.record = clone(active.value, true);
+  data.dialogFormVisible = true;
+};
+
+const xForm = templateRef<any>('xForm', null);
+const handleComfirm = () => {
+  xForm.value.validate(async valid => {
+    if (!valid) {
+      const { record, dataStatus } = data;
+      if (dataStatus === 'add') {
+        await serviceApi.post(url, record);
+      } else {
+        await serviceApi.put(url, record);
+      }
+      actionComplete();
+    }
+  });
+};
+
+const handleDelete = async () => {
+  const { record } = data;
+  if (record.children?.length) return warnMessage(t('message.deletePartment'));
+  const type = await VxeUI.modal.confirm(t('message.tip.del', { msg: 'aaaaa' }));
+  if (type === 'confirm') {
+    await serviceApi.delete(url, record);
+    actionComplete();
+  }
+};
+
+const actionComplete = () => {
+  scrollPanelChange.value = true;
+  successMessage(t('message.operateSuccess'));
+  handleClose();
+};
+
+const handleCancle = () => {
+  data.dialogFormVisible = false;
+  data.dataStatus = '';
+};
+
+const handleClose = () => {
+  data.dialogFormVisible = false;
+};
+</script>
+<style lang="scss" scoped>
+.page-content {
+  background-color: #fff;
+
+  .w-departInfo-wrapper {
+    width: 96%;
+    height: 75vh;
+
+    .w-card-wrapper {
+      width: 40%;
+
+      .el-card__header {
+        padding: 10px 20px;
+
+        .w-card-title {
+          position: relative;
+          top: 5px;
+        }
+      }
+    }
+
+    .el-form-item {
+      margin-bottom: 12px;
+    }
+  }
+
+  .w-noclick-wrapper {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+
+    .w-content-wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 75vh;
+
+      ul {
+        padding: 24px;
+        border: 1px solid #ccc;
+        border-radius: 10px;
+      }
+    }
+
+    .w-department-header {
+      padding-right: 20px;
+      font-size: 26px;
+      font-weight: bolder;
+      color: #69c;
+    }
+
+    .w-department-line {
+      font-size: 16px;
+      line-height: 35px;
+      color: #999;
+      list-style: none;
+    }
+  }
+}
+</style>

package/src/views/organization/department/DepartmentPanel.vue

@@ -62,18 +62,8 @@
             style="padding-top: 5px; margin-right: 8px"
             >{{ $t('message.udp.continueAdd') }}</vxe-checkbox
           >
-          <ut-button
-            v-if="data.dataStatus !== 'detail'"
-            status="primary"
-            content="confirm"
-            @tap="handleComfirm"
-          />
-          <ut-button
-            v-if="data.dataStatus !== 'detail'"
-            status="warning"
-            content="cancel"
-            @click="handleCancle"
-          />
+          <ut-button v-if="data.dataStatus !== 'detail'" status="primary" content="confirm" @tap="handleComfirm" />
+          <ut-button v-if="data.dataStatus !== 'detail'" status="warning" content="cancel" @click="handleCancle" />
         </el-row>
       </el-card>
     </el-row>
@@ -83,9 +73,7 @@
         <ul>
           <li class="w-department-line">
             <div>● 点击新建，新建部门信息。</div>
-            <div style="margin: 0; text-indent: 2em">
-              已点击树结构上的部门名称，默认创建为当前部门的下属部门
-            </div>
+            <div style="margin: 0; text-indent: 2em">已点击树结构上的部门名称，默认创建为当前部门的下属部门</div>
             <div style="margin: 0; text-indent: 2em">未点击树结构上的部门名称，则创建为一级部门</div>
           </li>
           <li class="w-department-line">● 点击树结构上的部门名称，点击修改按钮，修改部门信息。</li>
@@ -105,7 +93,7 @@ import { reactive, watch, inject } from 'vue';
 import { templateRef } from '@vueuse/core';
 import { clone } from 'xe-utils';
 import to from 'await-to-js';
-import { VXETable, VxeFormPropTypes } from 'vxe-table';
+import { VXETable } from 'vxe-table';
 import { successMessage, warnMessage } from '@utogether/utils';
 import { useSystemStoreHook } from '../../../store/modules/system';
 import { getServiceApi } from '../../../api';
@@ -123,7 +111,7 @@ const dataDict = useSystemStoreHook().getDataDict;
 const { t } = useI18n();
 const serviceApi = getServiceApi();
 
-const rules: VxeFormPropTypes.Rules = {
+const rules = {
   deptName: [
     {
       required: true,
@@ -180,9 +168,7 @@ const handleComfirm = () => {
       const { record, dataStatus } = data;
       data.loading = true;
       const [err] =
-        dataStatus === 'add'
-          ? await to(serviceApi.post(url, record))
-          : await to(serviceApi.put(url, record));
+        dataStatus === 'add' ? await to(serviceApi.post(url, record)) : await to(serviceApi.put(url, record));
       data.loading = false;
       if (!err) {
         actionComplete();

package/src/views/organization/inv-org/InvOrganization.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-29 11:32:07
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-25 13:44:34
+ * @LastEditTime: 2025-09-05 10:49:38
  * @Description: 库存组织
 -->
 <template>
@@ -29,20 +29,35 @@ const url = '/uums/cusOrganization';
 const xgrid = ref(null);
 const renderHook = useRender();
 
-const formItems = [{ field: 'organizationCode' }, { field: 'organizationName' }];
+const formItems = [
+  { field: 'organizationCode', title: 'message.udp.organizationCode' },
+  { field: 'organizationName', title: 'message.udp.organizationName' }
+];
 
 // 列字段
 const columns = [
   { type: 'checkbox', width: 40, align: 'center' },
-  { field: 'organizationCode', width: 120, required: true, editRender: renderHook.renderInput() },
-  { field: 'organizationName', minWidth: 120, required: true, editRender: renderHook.renderInput() },
-  { field: 'orgName', minWidth: 170, required: true, editRender: renderHook.renderBU() },
-  { field: 'orgCode', width: 110 },
+  {
+    field: 'organizationCode',
+    width: 120,
+    title: 'message.udp.organizationCode',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'organizationName',
+    minWidth: 120,
+    title: 'message.udp.organizationName',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  { field: 'orgName', minWidth: 170, title: 'message.udp.orgName', required: true, editRender: renderHook.renderBU() },
+  { field: 'orgCode', width: 110, title: 'message.udp.orgCode' },
   { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) }
 ];
 
 // 启用/禁用
-async function handleClick(row) {
+async function handleClick({ row }) {
   const [err] = await to(getServiceApi().put(url, [row]));
   !err && xgrid.value.refreshData();
 }

package/src/views/organization/org/Org.vue

@@ -24,14 +24,18 @@ const url = '/uums/org';
 const xgrid = ref(null);
 const renderHook = useRender();
 
-const formItems = [{ field: 'orgCode' }, { field: 'orgName' }, { field: 'orgAlias' }];
+const formItems = [
+  { field: 'orgCode', title: 'message.udp.orgCode' },
+  { field: 'orgName', title: 'message.udp.orgName' },
+  { field: 'orgAlias', title: 'message.udp.orgAlias' }
+];
 // 列字段
 const columns = [
   { type: 'checkbox', width: 50, align: 'center' },
-  { field: 'orgCode', required: true, editRender: { name: '$input' } },
-  { field: 'orgName', required: true, minWidth: 200, editRender: { name: '$input' } },
-  { field: 'orgAlias', editRender: { name: '$input' } },
-  { field: 'orgDesc', editRender: { name: '$input' } },
+  { field: 'orgCode', title: 'message.udp.orgCode', required: true, editRender: { name: '$input' } },
+  { field: 'orgName', title: 'message.udp.orgName', required: true, minWidth: 200, editRender: { name: '$input' } },
+  { field: 'orgAlias', title: 'message.udp.orgAlias', editRender: { name: '$input' } },
+  { field: 'orgDesc', title: 'message.udp.orgDesc', editRender: { name: '$input' } },
   { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) }
 ];