htui-yllkbz 1.3.16 → 1.3.17

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 18:12:54
+ * @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,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-12 18:12:02
+ * @LastEditTime: 2022-04-13 13:45:57
 -->
 <template>
   <span v-if="readonly">
@@ -13,18 +13,18 @@
                     :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;
@@ -33,6 +33,7 @@ interface State {
   name: "HtSelectOrg",
   components: {
     HtShowBaseData,
+    HtBaseData,
   },
 })
 export default class HtSelectOrg extends Vue {
@@ -55,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,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-12 18:12:09
+ * @LastEditTime: 2022-04-13 13:27:23
 -->
 <template>
 
@@ -13,18 +13,18 @@
                     :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;
@@ -33,6 +33,7 @@ interface State {
   name: "HtSelectUser",
   components: {
     HtShowBaseData,
+    HtBaseData,
   },
 })
 export default class HtSelectUser extends Vue {
@@ -55,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 18:11:24
+ * @LastEditTime: 2022-04-13 13:26:54
 -->
 <template>
   <div v-loading="state.loading"
@@ -400,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) {