htui-yllkbz 1.3.87 → 1.3.88

package/src/packages/HtSelectUnit/index.vue

@@ -0,0 +1,189 @@
+<!--
+ * @Descripttion:部门选择 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2021-12-30 14:29:14
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-01-15 15:37:55
+-->
+<template>
+  <span v-if="readonly">
+    {{ getName }}
+  </span>
+  <el-cascader
+    v-else
+    :size="size"
+    popper-class="ht-cascader-poper"
+    :placeholder="placeholder || `请选择`"
+    :disabled="!!disabled"
+    class="component-item"
+    style="width:100%"
+    :filterable="true"
+    :clearable="clearable"
+    :collapse-tags="collapseTags"
+    :show-all-levels="showAllLevels"
+    :props="{
+      label: 'name',
+      expandTrigger: 'click',
+      emitPath: false,
+      checkStrictly: checkStrictly,
+      multiple: multiple,
+    }"
+    ref="htSelectUnit"
+    v-model="state.value"
+    :options="options"
+    @change="handleChange"
+  >
+  </el-cascader>
+</template>
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import { _axios } from 'vue-kst-auth';
+interface State {
+  /** 数据状态 */
+  loading: boolean;
+  value: any;
+  /** 所有单位 */
+  allUnitList: any[];
+  /** 所有分类 */
+  unitCategory: any[];
+}
+@Component({
+  name: 'HtSelectUnit',
+})
+export default class HtSelectUser extends Vue {
+  @Prop() value!: string;
+  @Prop() org!: string;
+  @Prop() size!: string;
+  /** 是否禁用 */
+  @Prop() disabled?: boolean;
+  @Prop() heightAuto?: boolean;
+  @Prop() placeholder?: string;
+  /** 是否可以清除 */
+  @Prop() clearable?: boolean;
+  @Prop({ default: true }) show?: boolean;
+  @Prop({ default: false }) multiple?: boolean;
+  @Prop({ default: true }) showAllLevels?: boolean;
+  @Prop({ default: false }) checkStrictly?: boolean;
+  /* 是否只读 */
+  @Prop({ default: false }) readonly?: boolean;
+  @Prop({ default: false }) panel?: boolean;
+  @Prop({ default: false }) collapseTags?: boolean;
+  @Prop({ default: true }) appendToBody?: boolean;
+  /* 单位分类id */
+  @Prop() categoyId?: string;
+  /** 是否只选择分类列表 */
+  @Prop({ default: false }) onlyCategoy?: string;
+  /** 数据 */
+  state: State = {
+    loading: false,
+    value: undefined,
+    allUnitList: [],
+    unitCategory: [],
+  };
+  /** 生命周期 */
+  created() {
+    const unitCategory = window.sessionStorage.getItem('unitCategory');
+    const allUnitList = window.sessionStorage.getItem('allUnitList');
+    if (unitCategory) {
+      this.state.unitCategory = JSON.parse(unitCategory);
+    } else {
+      this.getCategoy();
+    }
+    if (allUnitList) {
+      this.state.allUnitList = JSON.parse(allUnitList);
+    }
+  }
+  /** 获取单位分类列表 */
+  getCategoy() {
+    _axios
+      .get(
+        '/Unit/api/unit/unit-category/get-list?MaxResultCount=999&SkipCount=0'
+      )
+      .then((res) => {
+        const data = res.data.items || [];
+        window.sessionStorage.setItem('unitCategory', JSON.stringify(data));
+        this.state.unitCategory = data;
+        this.getAllUnit();
+      });
+  }
+  /** 获取单位列表 */
+  getAllUnit() {
+    _axios
+      .get('/Unit/api/unit/unit/get-list?MaxResultCount=999&SkipCount=0')
+      .then((res) => {
+        const data = res.data.items || [];
+        window.sessionStorage.setItem('allUnitList', JSON.stringify(data));
+        this.state.allUnitList = data;
+      });
+  }
+  /** 方法 */
+  /**部门选择回调 */
+  handleChange(e?: string | string[]) {
+    const allData = [...this.state.allUnitList, ...this.state.unitCategory];
+    if (!e || !e.length) {
+      this.$emit('input', e);
+      this.$emit('change', e);
+    } else {
+      let seletId: any = {};
+      if (Array.isArray(e)) {
+        e.forEach((item) => {
+          seletId = { ...seletId, [item]: true };
+        });
+      } else {
+        seletId = { [e]: true };
+      }
+      const data = allData.filter((item) => seletId[item.id]);
+      this.$emit('input', e, data);
+      this.$emit('change', e, data);
+    }
+  }
+  @Watch('value', { immediate: true })
+  setValue(val: any) {
+    this.state.value = val;
+  }
+  get options() {
+    const { unitCategory, allUnitList } = this.state;
+    function getCurrentUnit(id: string) {
+      const dataUnit: any[] = [];
+      allUnitList.forEach((item) => {
+        if (item.unitCategoryId === id) {
+          dataUnit.push({
+            value: item.id,
+            name: `${item.name}${item.code ? `(${item.code})` : ''}`,
+            code: item.code,
+            label: item.name,
+          });
+        }
+      });
+      return dataUnit.length ? dataUnit : undefined;
+    }
+    let data: any[] = [];
+    if (this.categoyId) {
+      data = getCurrentUnit(this.categoyId) || [];
+    } else {
+      unitCategory.forEach((item) => {
+        data.push({
+          value: item.id,
+          name: `${item.name}${item.code ? `(${item.code})` : ''}`,
+          label: item.name,
+          code: item.code,
+          children: this.onlyCategoy ? undefined : getCurrentUnit(item.id),
+        });
+      });
+    }
+    return data;
+  }
+  /** 计算属性 */
+  get getName() {
+    const allData: any[] = [
+      ...this.state.allUnitList,
+      ...this.state.unitCategory,
+    ];
+
+    const data: any = allData.find((item) => item.id === this.value);
+    return data ? `${data.name}${data.code ? `(${data.code})` : ''}` : '';
+  }
+}
+</script>
+<style lang="scss" scoped></style>

package/src/packages/HtTable/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2023-01-09 11:01:05
+ * @LastEditTime: 2023-01-18 12:21:25
 -->
 <template>
   <div v-loading="state.loading" style="background:#fff">
@@ -13,7 +13,12 @@
         ref="comTable"
         :height="height"
         :max-height="maxHeight"
+        :sum-text="sumText"
+        :show-summary="showSummary"
+        :summary-method="summaryMethod"
         :border="border"
+        :default-expand-all="defaultExpandAll"
+        :expand-row-keys="expandRowKeys"
         :stripe="stripe !== undefined ? stripe : true"
         :size="size || 'small'"
         :fit="fit"
@@ -262,6 +267,20 @@
                   >
                   <el-tag type="danger" :size="'small'" v-else>否</el-tag>
                 </template>
+                <!-- 处理新资产的单位 -->
+                <template v-else-if="item.type === 'unit'">
+                  <HtSelectUnit
+                    :readonly="true"
+                    :value="getPropByPath(row, item.key)"
+                  ></HtSelectUnit>
+                </template>
+                <!-- 处理新资产的单位 -->
+                <template v-else-if="item.type === 'position'">
+                  <HtSelectPosition
+                    :readonly="true"
+                    :value="getPropByPath(row, item.key)"
+                  ></HtSelectPosition>
+                </template>
                 <!-- 处理图片显示 -->
                 <template v-else-if="item.type === 'img'">
                   <span v-if="getPropByPath(row, item.key)">
@@ -416,6 +435,7 @@ import PageInfo from '@/packages/PageInfo/index.vue';
 import HtUploadFiles from '@/packages/HtUploadFiles/index.vue';
 import HtShowBaseData from '@/packages/HtShowBaseData';
 import HtOrgInfo from '@/packages/HtOrgInfo';
+import HtSelectUnit from '@/packages/HtSelectUnit';
 import ElmentUI from 'element-ui';
 Vue.use(ElmentUI);
 interface State {
@@ -445,12 +465,21 @@ interface State {
     HtUploadFiles,
     HtShowBaseData,
     HtOrgInfo,
+    HtSelectUnit,
   },
 })
 export default class HtTable extends Vue {
   /** 默认的table头 */
   @Prop({ default: [] }) columns!: Column[];
   @Prop() data!: any[];
+  /** 是否在表尾显示合计行 */
+  @Prop({ default: false }) showSummary!: boolean;
+  /** 合计行第一列的文本 */
+  @Prop({ default: '合计' }) sumText!: string;
+  @Prop({ default: false }) defaultExpandAll!: boolean;
+  @Prop() expandRowKeys!: string[];
+  /** 自定义合并方法 */
+  @Prop() summaryMethod!: any;
   /**  序号对应的名称 */
   @Prop() keyName?: string;
   /** 合并单元格 */

package/src/packages/index.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-21 10:08:41
  * @LastEditors: hutao
- * @LastEditTime: 2023-01-09 16:45:52
+ * @LastEditTime: 2023-01-15 15:54:18
  */
 
 // 导入组件
@@ -30,12 +30,15 @@ import HtDrawer from './HtDrawer'
 import HtSelectCron from './HtSelectCron'
 import HtSelectTimeSlot from './HtSelectTimeSlot'
 import HtMore from './HtMore'
+import HtSelectUnit from './HtSelectUnit'
+import HtSelectPosition from './HtSelectPosition'
+
 
 
 
 
 // 存储组件列表
-const components = [HtMore, HtSelectTimeSlot, HtSelectCron, HtBaseData, HtDrawer, HtShowBaseType, HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
+const components = [HtSelectUnit, HtSelectPosition, HtMore, HtSelectTimeSlot, HtSelectCron, HtBaseData, HtDrawer, HtShowBaseType, HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 const install = function (Vue: any) {
   // 判断是否安装
@@ -51,7 +54,8 @@ export default {
   // 导出的对象必须具有 install，才能被 Vue.use() 方法安装
   install,
   // 以下是具体的组件列表
-  HtSelectTable, HtPagination, HtShowBaseType, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtMore,
+  HtSelectTable, HtSelectPosition, HtPagination, HtShowBaseType, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtMore,
+  HtSelectUnit,
   HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo, HtBaseData, HtDrawer, HtSelectCron, HtSelectTimeSlot
 }
 

package/src/packages/type.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-25 17:05:17
  * @LastEditors: hutao
- * @LastEditTime: 2023-01-03 14:20:13
+ * @LastEditTime: 2023-01-15 16:03:39
  */
 /** 初始的默认条数 */
 export const defalutPageSize = 10
@@ -70,8 +70,8 @@ export interface Column {
   spread?: boolean;
   /** 通过type展示相应的数据  用户id|部门id|时间格式化|是否布尔值|图片 |附件*/
   type?: 'userId' | 'org' | 'time' | 'common' | 'boolean' | 'img' | 'file';
-  /**    只有当type='common'时候有效  数据类型个ca common里面的一样但不包括时间 时间使用time  */
-  commonType?: 'userId' | 'departmentId' | 'baseDataId' | 'roleId' | 'baseDataName' | 'baseDataValue';
+  /**    只有当type='common'时候有效  数据类型个ca common里面的一样但不包括时间 时间使用time  unit是新资产的单位  position资产位置*/
+  commonType?: 'userId' | 'departmentId' | 'baseDataId' | 'roleId' | 'baseDataName' | 'baseDataValue' | 'unit' | 'position';
   /** 当type===common时候 设置是否隐藏基础数据的value */
   hideCode?: boolean;
   showOverflowTooltip?: boolean;