htui-yllkbz 1.3.14 → 1.3.17

package/src/packages/HtOrgInfo/index.ts

@@ -0,0 +1,14 @@
+/*
+ * @Descripttion:选择部门
+ * @version:
+ * @Author: hutao
+ * @Date: 2021-11-15 15:00:57
+ * @LastEditors: hutao
+ * @LastEditTime: 2022-04-12 17:59:54
+ */
+import HtOrgInfo from "./index.vue";
+(HtOrgInfo as any).install = function (Vue: any) {
+
+  Vue.component("HtOrgInfo", HtOrgInfo);
+};
+export default HtOrgInfo;

package/src/packages/HtOrgInfo/index.vue

@@ -0,0 +1,77 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2021-07-14 16:40:33
+ * @LastEditors: hutao
+ * @LastEditTime: 2022-04-12 18:00:15
+-->
+<template>
+  <div :style="wapperStyle"
+       v-if="orgId">
+    <el-tag type="success"
+            size="medium"
+            v-if="type==='tag'"
+            :style="comStyle">
+      {{getOrgNameFunc(orgId)}}
+    </el-tag>
+    <span v-else
+          :style="comStyle">
+      {{getOrgNameFunc(orgId)}}
+    </span>
+  </div>
+</template>
+<script lang='ts'>
+import { Component, Vue, Prop } from "vue-property-decorator";
+interface State {
+  /** 数据状态 */
+  loading: boolean;
+}
+@Component({
+  name: "HtOrgInfo",
+})
+export default class Index extends Vue {
+  /** 是否用tag标签展示  tag表示是 */
+  @Prop() type!: string;
+  /**  机构id */
+  @Prop() orgId!: string;
+  /**  节点样式 */
+  @Prop() comStyle!: string;
+  /**  外层样式 */
+  @Prop() wapperStyle!: string;
+
+  /** 数据 */
+  state: State = {
+    loading: false,
+  };
+  /** 生命周期 */
+  /** 方法 */
+  /** 监听 */
+  /** 计算属性 */
+  /**  查询所属部门 */
+  getOrgNameFunc(id: string | undefined) {
+    //   console.log("id", id);
+    let commonDatas: any = window.localStorage.getItem("commonDatas");
+    let getOrganizaList: any[] = [];
+    if (commonDatas) {
+      commonDatas = JSON.parse(commonDatas);
+      getOrganizaList = commonDatas.organizationUnit;
+    }
+    if (id) {
+      return this.getOrgName(id, getOrganizaList);
+    } else {
+      return "";
+    }
+  }
+  getOrgName(id: string, list: any[]) {
+    const arr = list.filter((item) => id === item.id);
+
+    if (arr.length) {
+      return arr[0].displayName;
+    } else {
+      return "--";
+    }
+  }
+}
+</script>
+<style lang='scss' scoped></style>

package/src/packages/HtSelectBaseData/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 15:47:47
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-12 17:45:27
+ * @LastEditTime: 2022-04-13 13:47:43
 -->
 
 <template>
@@ -15,12 +15,11 @@
                  :disabled="disabled"
                  style="width:100%"
                  placeholder="请选择"></el-select>
-      <div v-else
-           :disabled="disabled"
-           is="common-datas-info"
-           com-style="background:#fff"
-           :config-json="configJson"
-           @change="getCommonData"></div>
+      <HtBaseData v-else
+                  :disabled="disabled"
+                  com-style="background:#fff"
+                  :config-json="configJson"
+                  @change="getCommonData"></HtBaseData>
 
     </template>
     <div v-else>
@@ -45,6 +44,7 @@
 <script lang='ts'>
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import HtShowBaseData from "@/packages/HtShowBaseData";
+import HtBaseData from "@/packages/HtBaseData";
 interface State {
   /** 数据状态 */
   loading: boolean;
@@ -54,6 +54,7 @@ interface State {
   name: "HtSelectBaseData",
   components: {
     HtShowBaseData,
+    HtBaseData,
   },
 })
 export default class HtSelectBaseData extends Vue {
@@ -83,11 +84,26 @@ export default class HtSelectBaseData extends Vue {
   /** 方法 */
 
   /** 基础数据返回 */
-  getCommonData(res: CustomEvent) {
-    const data = res.detail[0];
-    const id = data[this.dataTypeId][0]["id"];
-    this.$emit("input", id);
-    this.$emit("change", id, data[this.dataTypeId][0]);
+  getCommonData(res: any) {
+    // const data = res.detail[0];
+    //const id = data[this.dataTypeId][0]["id"];
+    const dep = res[this.dataTypeId];
+    let data = undefined;
+    if (dep.length) {
+      if (this.multiple) {
+        const arr: string[] = [];
+        dep.forEach((item: any) => {
+          arr.push(item.id);
+        });
+        data = arr;
+      } else {
+        data = dep[0].id;
+      }
+    }
+    this.$emit("input", data);
+    this.$emit("change", data);
+    // this.$emit("input", id);
+    // this.$emit("change", id, data[this.dataTypeId][0]);
   }
   /** 监听 */
   @Watch("value")

package/src/packages/HtSelectOrg/index.vue

@@ -4,33 +4,37 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-03-08 14:53:19
+ * @LastEditTime: 2022-04-13 13:45:57
 -->
 <template>
   <span v-if="readonly">
 
-    <div is='common-datas-info-id'
-         v-if="value"
-         :department-id="JSON.stringify([value])"></div>
+    <HtShowBaseData v-if="value"
+                    :department-id="JSON.stringify([value])"></HtShowBaseData>
     <span v-else> </span>
   </span>
-  <div v-else
-       :disabled="disabled"
-       is="common-datas-info"
-       com-style="background:#fff"
-       :config-json="configJson"
-       com-class='ht-item-common'
-       @change="searchCommonData"></div>
+  <HtBaseData v-else
+              :disabled="disabled"
+              com-style="background:#fff"
+              :config-json="configJson"
+              com-class='ht-item-common'
+              @change="searchCommonData"></HtBaseData>
 
 </template>
 <script lang='ts'>
 import { Component, Prop, Vue } from "vue-property-decorator";
+import HtShowBaseData from "@/packages/HtShowBaseData";
+import HtBaseData from "@/packages/HtBaseData";
 interface State {
   /** 数据状态 */
   loading: boolean;
 }
 @Component({
   name: "HtSelectOrg",
+  components: {
+    HtShowBaseData,
+    HtBaseData,
+  },
 })
 export default class HtSelectOrg extends Vue {
   @Prop() value!: string;
@@ -52,11 +56,20 @@ export default class HtSelectOrg extends Vue {
   /** 生命周期 */
   /** 方法 */
   /**部门选择回调 */
-  searchCommonData(res: { [key: string]: any; detail: any }) {
-    const dep = res.detail[0]["departmentId"];
+  searchCommonData(res: any) {
+    const dep = res["departmentId"];
+
     let data = undefined;
     if (dep.length) {
-      data = dep[0].id;
+      if (this.multiple) {
+        const arr: string[] = [];
+        dep.forEach((item: any) => {
+          arr.push(item.id);
+        });
+        data = arr;
+      } else {
+        data = dep[0].id;
+      }
     }
     this.$emit("input", data);
     this.$emit("change", data);

package/src/packages/HtSelectUser/index.vue

@@ -4,34 +4,37 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-03-08 14:55:09
+ * @LastEditTime: 2022-04-13 13:27:23
 -->
 <template>
 
   <span v-if="readonly">
-    <div is='common-datas-info-id'
-         v-if="value"
-         :user-id="JSON.stringify([value])"></div>
+    <HtShowBaseData v-if="value"
+                    :user-id="JSON.stringify([value])"></HtShowBaseData>
     <span v-else> </span>
   </span>
-
-  <div v-else
-       :disabled="disabled"
-       is="common-datas-info"
-       com-style="background:#fff"
-       :config-json="configJson"
-       com-class='ht-item-common'
-       @change="searchCommonData"></div>
+  <HtBaseData v-else
+              :disabled="disabled"
+              com-style="background:#fff"
+              :config-json="configJson"
+              com-class='ht-item-common'
+              @change="searchCommonData"></HtBaseData>
 
 </template>
 <script lang='ts'>
 import { Component, Prop, Vue } from "vue-property-decorator";
+import HtShowBaseData from "@/packages/HtShowBaseData";
+import HtBaseData from "@/packages/HtBaseData";
 interface State {
   /** 数据状态 */
   loading: boolean;
 }
 @Component({
   name: "HtSelectUser",
+  components: {
+    HtShowBaseData,
+    HtBaseData,
+  },
 })
 export default class HtSelectUser extends Vue {
   @Prop() value!: string;
@@ -53,11 +56,20 @@ export default class HtSelectUser extends Vue {
   /** 生命周期 */
   /** 方法 */
   /**部门选择回调 */
-  searchCommonData(res: { [key: string]: any; detail: any }) {
-    const dep = res.detail[0]["departmentId"];
+  searchCommonData(res: any) {
+    const dep = res["departmentUser"];
+
     let data = undefined;
     if (dep.length) {
-      data = dep[0].id;
+      if (this.multiple) {
+        const arr: string[] = [];
+        dep.forEach((item: any) => {
+          arr.push(item.id);
+        });
+        data = arr;
+      } else {
+        data = dep[0].id;
+      }
     }
     this.$emit("input", data);
     this.$emit("change", data);

package/src/packages/HtTable/index.vue

@@ -5,7 +5,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-12 17:47:36
+ * @LastEditTime: 2022-04-13 13:26:54
 -->
 <template>
   <div v-loading="state.loading"
@@ -105,10 +105,9 @@
                     :rowIndex="rowIndex">
                 <!-- 处理部门 -->
                 <template v-if="item.type==='org'">
-
-                  <common-org-info v-if="getPropByPath(row,item.key)"
-                                   :org-id="getPropByPath(row,item.key)"
-                                   type="tag"></common-org-info>
+                  <HtOrgInfo v-if="getPropByPath(row,item.key)"
+                             :org-id="getPropByPath(row,item.key)"
+                             type="tag"></HtOrgInfo>
                   <span v-else>--</span>
                 </template>
                 <!-- 处理基础数据 -->
@@ -276,7 +275,8 @@ import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import { Column, PageInfoType } from "@/packages/type";
 import PageInfo from "@/packages/PageInfo/index.vue";
 import HtUploadFiles from "@/packages/HtUploadFiles/index.vue";
-
+import HtShowBaseData from "@/packages/HtShowBaseData";
+import HtOrgInfo from "@/packages/HtOrgInfo";
 interface State {
   pageInfo: PageInfoType;
   loading: boolean;
@@ -302,6 +302,8 @@ interface State {
   components: {
     PageInfo,
     HtUploadFiles,
+    HtShowBaseData,
+    HtOrgInfo,
   },
 })
 export default class HtTable extends Vue {
@@ -398,7 +400,7 @@ export default class HtTable extends Vue {
         this.creatInitColumnKey(this.columns || []);
       }
     }
-    console.log("this.columns", this.columns);
+    // console.log("this.columns", this.columns);
   }
   resetColumn() {
     if (this.configShow) {

package/src/packages/index.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-21 10:08:41
  * @LastEditors: hutao
- * @LastEditTime: 2022-03-08 14:57:05
+ * @LastEditTime: 2022-04-12 18:02:13
  */
 
 // 导入组件
@@ -22,10 +22,12 @@ import HtUploadFiles from './HtUploadFiles/index'
 import HtSelectBaseData from './HtSelectBaseData/index'
 import HtSelectOrg from './HtSelectOrg/index'
 import HtSelectUser from './HtSelectUser/index'
+import HtShowBaseData from './HtShowBaseData/index'
+import HtOrgInfo from './HtOrgInfo/index'
 
 
 // 存储组件列表
-const components = [HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser]
+const components = [HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 const install = function (Vue: any) {
   // 判断是否安装
@@ -42,6 +44,6 @@ export default {
   install,
   // 以下是具体的组件列表
   HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles,
-  HtSelectBaseData, HtSelectOrg, HtSelectUser
+  HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo
 }