htui-yllkbz 1.3.89 → 1.3.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.3.89",
+  "version": "1.3.92",
   "port": "8082",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",

package/src/App.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2023-01-15 16:24:16
+ * @LastEditTime: 2023-02-08 10:50:00
 -->
 <template>
   <div id="app">
@@ -13,8 +13,20 @@
     <ul>
       <li>8888<HtMore></HtMore></li>
     </ul>
-    <HtSelectPosition v-model="state.value"></HtSelectPosition>
-    <HtSelectPosition :readonly="true" v-model="state.value"></HtSelectPosition>
+    <!-- <HtSelectPosition v-model="state.value"></HtSelectPosition>
+    <HtSelectPosition :readonly="true" v-model="state.value"></HtSelectPosition> -->
+    <!-- <HtSelectCategory :multiple="true" v-model="state.value"></HtSelectCategory>
+    <HtSelectCategory :readonly="true" v-model="state.value"></HtSelectCategory> -->
+    <HtSelectBaseData
+      :onlyParent="true"
+      v-model="state.value"
+      dataTypeId="MeasureUnit"
+    ></HtSelectBaseData>
+    <HtSelectBaseData
+      :parentId="state.value"
+      v-model="state.timeValue"
+      dataTypeId="MeasureUnit"
+    ></HtSelectBaseData>
     <router-view></router-view>
   </div>
 </template>
@@ -27,6 +39,7 @@ import HtSelectUser from '@/packages/HtSelectUser';
 import HtShowBaseType from '@/packages/HtShowBaseType';
 import HtSelectTimeSlot from '@/packages/HtSelectTimeSlot';
 import HtSelectPosition from '@/packages/HtSelectPosition';
+import HtSelectCategory from '@/packages/HtSelectCategory';
 import HtMore from '@/packages/HtMore';
 import HtSelectUnit from '@/packages/HtSelectUnit';
 import { mgr } from '@/plugins/oidc-client';
@@ -40,6 +53,7 @@ import { mgr } from '@/plugins/oidc-client';
     HtMore,
     HtSelectUnit,
     HtSelectPosition,
+    HtSelectCategory,
   },
 })
 export default class App extends Vue {

package/src/packages/HtBaseData/index.vue

@@ -567,7 +567,10 @@ export default class CommonDatas extends Vue {
   /** 是否禁用 */
   @Prop() disabled?: string;
   @Prop({ default: true }) appendToBody?: boolean;
-
+  /** 是否过滤指定层级内容 */
+  @Prop({ default: undefined }) parentId?: string;
+  /** 是否只选择父级 */
+  @Prop({ default: false }) onlyParent?: boolean;
   /** 人员 */
   /** 数据 */
   state: State = {
@@ -819,15 +822,20 @@ export default class CommonDatas extends Vue {
   }
   /** 基础数据递归处理 */
   recursion(data: Array<BaseDataDto>) {
-    return data.reduce((prv: BaseDataDto[], cur) => {
-      if (cur.children && cur.children.length > 0) {
-        this.recursion(cur.children);
-      } else {
-        cur.children = undefined;
-      }
-      prv.push(cur);
-      return prv;
-    }, []);
+    if (this.onlyParent) {
+      data.forEach((item) => (item.children = undefined));
+      return data;
+    } else {
+      return data.reduce((prv: BaseDataDto[], cur) => {
+        if (cur.children && cur.children.length > 0) {
+          this.recursion(cur.children);
+        } else {
+          cur.children = undefined;
+        }
+        prv.push(cur);
+        return prv;
+      }, []);
+    }
   }
   /** 计算属性 */
   /** 根据基础数据分类获取详细数据 */
@@ -845,12 +853,23 @@ export default class CommonDatas extends Vue {
               val.organizationUnits?.includes(this.org as string)
           )
         );
+        if (this.parentId) {
+          body[item.id || ''] = body[item.id || ''].filter(
+            (item) => item.id === this.parentId
+          );
+        }
       } else {
         body[item.id || ''] = this.recursion(
           baseItems.filter((val) => val.category == item.code)
         );
+        if (this.parentId) {
+          body[item.id || ''] = body[item.id || ''].filter(
+            (item) => item.id === this.parentId
+          );
+        }
       }
     });
+
     return body;
   }
   /** 获取响应列表 */

package/src/packages/HtSelectBaseData/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 15:47:47
  * @LastEditors: hutao
- * @LastEditTime: 2022-12-13 17:26:57
+ * @LastEditTime: 2023-02-08 09:46:57
 -->
 
 <template>
@@ -23,6 +23,8 @@
         ref="htBaseData"
         :size="size"
         :appendToBody="appendToBody"
+        :only-parent="onlyParent"
+        :parent-id="parentId"
         :placeholder="placeholder"
         :hide-code="hideCode"
         :disabled="disabled"
@@ -91,6 +93,10 @@ export default class HtSelectBaseData extends Vue {
   /** 展示时候是否隐藏value */
   @Prop() hideCode!: boolean;
   @Prop({ default: false }) clearable!: boolean;
+  /** 是否过滤指定层级内容 */
+  @Prop({ default: undefined }) parentId?: string;
+  /** 是否只选择父级 */
+  @Prop({ default: false }) onlyParent?: boolean;
   /** 是否多选 */
   @Prop({ default: false }) multiple!: boolean;
   @Prop({ default: false }) checkStrictly!: boolean;

package/src/packages/HtSelectCategory/index.ts

@@ -0,0 +1,14 @@
+/*
+ * @Descripttion:选择资产单位
+ * @version:
+ * @Author: hutao
+ * @Date: 2021-11-15 15:00:57
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-01-15 14:45:42
+ */
+import HtSelectCategory from "./index.vue";
+(HtSelectCategory as any).install = function (Vue: any) {
+
+  Vue.component("HtSelectCategory", HtSelectCategory);
+};
+export default HtSelectCategory;

package/src/packages/HtSelectCategory/index.vue

@@ -0,0 +1,180 @@
+<!--
+ * @Descripttion:位置选择 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2021-12-30 14:29:14
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-02-01 16:55:50
+-->
+<template>
+  <span v-if="readonly">
+    {{ state.positionName.toString() }}
+  </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: defalutName,
+      value: 'id',
+      expandTrigger: 'click',
+      emitPath: false,
+      checkStrictly: checkStrictly,
+      multiple: multiple,
+    }"
+    ref="HtSelectPosition"
+    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;
+  positionName: string[];
+  /** 所有位置 */
+  dataSource: any[];
+  /** 所有分类 */
+  unitCategory: any[];
+}
+@Component({
+  name: 'HtSelectCategory',
+})
+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;
+  @Prop({ default: 'name' }) defalutName?: string;
+  /** 父级id */
+  @Prop() parentId?: string;
+
+  /** 数据 */
+  state: State = {
+    loading: false,
+    value: undefined,
+    positionName: [],
+    dataSource: [],
+    unitCategory: [],
+  };
+  /** 生命周期 */
+  created() {
+    //
+    if (!this.readonly) {
+      this.getAllList();
+    }
+  }
+  /** 根据id获取单个 */
+  getSingle(val?: string | string[]) {
+    this.state.positionName = [];
+    if (val) {
+      let arr: string[] = [];
+      if (Array.isArray(val)) {
+        arr = val;
+      } else {
+        arr = val.split(',');
+      }
+      arr.forEach((item) => {
+        _axios
+          .get(`/asset_manage/api/asset-management/asset-categories/${item}`)
+          .then((res) => {
+            const data = res.data;
+            this.state.positionName.push(
+              `${data.displayName}${data.code ? `(${data.code})` : ''}`
+            );
+          });
+      });
+    } else {
+      this.state.positionName = [];
+    }
+  }
+
+  /** 获取单位列表 */
+  getAllList() {
+    _axios
+      .get(`/asset_manage/api/asset-management/asset-categories/list`, {
+        params: { Recursive: true, CurrentId: this.parentId },
+      })
+      .then((res) => {
+        const data = res.data.items || [];
+        this.state.dataSource = data;
+      });
+  }
+  /** 方法 */
+  /**选择回调 */
+  handleChange(e?: string | string[]) {
+    const allData = [...this.state.dataSource];
+    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;
+    if (this.readonly) {
+      this.getSingle(val);
+    } else {
+      // this.getAllList(this.org);
+    }
+  }
+
+  formatData(data: any[]) {
+    for (let i = 0; i < data.length; i++) {
+      const item = data[i];
+      item.name = `${item.displayName}${item.code ? `(${item.code})` : ''}`;
+      if (item.children.length < 1) {
+        item.children = undefined;
+      } else {
+        this.formatData(item.children);
+      }
+    }
+    return data;
+  }
+  get options() {
+    const { dataSource } = this.state;
+    const allData = this.formatData(dataSource);
+    return allData;
+  }
+}
+</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-18 12:21:25
+ * @LastEditTime: 2023-02-01 16:50:13
 -->
 <template>
   <div v-loading="state.loading" style="background:#fff">

package/src/packages/index.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-21 10:08:41
  * @LastEditors: hutao
- * @LastEditTime: 2023-01-15 15:54:18
+ * @LastEditTime: 2023-02-01 16:30:54
  */
 
 // 导入组件
@@ -32,13 +32,14 @@ import HtSelectTimeSlot from './HtSelectTimeSlot'
 import HtMore from './HtMore'
 import HtSelectUnit from './HtSelectUnit'
 import HtSelectPosition from './HtSelectPosition'
+import HtSelectCategory from './HtSelectCategory'
 
 
 
 
 
 // 存储组件列表
-const components = [HtSelectUnit, HtSelectPosition, HtMore, HtSelectTimeSlot, HtSelectCron, HtBaseData, HtDrawer, HtShowBaseType, HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
+const components = [HtSelectCategory, 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) {
   // 判断是否安装
@@ -55,7 +56,7 @@ export default {
   install,
   // 以下是具体的组件列表
   HtSelectTable, HtSelectPosition, HtPagination, HtShowBaseType, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtMore,
-  HtSelectUnit,
+  HtSelectUnit, HtSelectCategory,
   HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo, HtBaseData, HtDrawer, HtSelectCron, HtSelectTimeSlot
 }