htui-yllkbz 1.3.35 → 1.3.38

package/package.json

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

package/src/packages/HtBaseData/index.vue

@@ -13,10 +13,11 @@
         :disabled="!!disabled"
         class="component-item"
         :class="comClass"
+        style="width:100%"
         :style="comStyle || ''"
         :filterable="!state.configJson['departmentId'].multiple"
         :clearable="state.configJson['departmentId'].clearable"
-        :placeholder="`请选择部门`"
+        :placeholder="placeholder || `请选择部门`"
         :collapse-tags="state.configJson['departmentId'].collapseTags"
         v-model="state.selectVal['departmentId']"
         :show-all-levels="state.configJson['departmentId'].showAllLevels"
@@ -39,8 +40,9 @@
         v-if="state.configJson['departmentId'].panel"
         class="component-item"
         :class="comClass"
+        style="width:100%"
         :style="comStyle || ''"
-        :placeholder="`请选择部门`"
+        :placeholder="placeholder || `请选择部门`"
         v-model="state.selectVal['departmentId']"
         :props="{
           label: 'name',
@@ -63,11 +65,12 @@
     <!-- 选择人员 -->
     <el-select
       v-model="state.selectVal['userId']"
-      placeholder="请选择人员"
+      :placeholder="placeholder || '请选择人员'"
       :filterable="!state.configJson['userId'].multiple"
       :disabled="!!disabled"
       :style="comStyle || ''"
       class="component-item"
+      style="width:100%"
       @click.native="selectClick($event)"
       v-if="state.configJson['userId'] && state.configJson['userId'].show"
       :multiple="state.configJson['userId'].multiple"
@@ -114,11 +117,12 @@
         v-if="!state.configJson['departmentUser'].panel"
         :disabled="!!disabled"
         class="component-item"
+        style="width:100%"
         :filterable="!state.configJson['departmentUser'].multiple"
         :class="comClass"
         :style="comStyle || ''"
         :clearable="state.configJson['departmentUser'].clearable"
-        :placeholder="`请选择部门下人员`"
+        :placeholder="placeholder || `请选择部门下人员`"
         :collapse-tags="state.configJson['departmentUser'].collapseTags"
         v-model="state.selectVal['departmentUser']"
         :show-all-levels="state.configJson['departmentUser'].showAllLevels"
@@ -145,7 +149,7 @@
               float: left;
               width: 14px;
               height: 14px;
-              background: #4ecc7a;
+              background: var(--primary);
               line-height: 34px;
               margin-top: 10px;
               border-radius: 10px;
@@ -174,7 +178,8 @@
         :style="panStyle"
         :filterable="!state.configJson['departmentUser'].multiple"
         class="component-item"
-        :placeholder="`请选择部门下人员`"
+        style="width:100%"
+        :placeholder="placeholder || `请选择部门下人员`"
         v-model="state.selectVal['departmentUser']"
         :props="{
           label: 'name',
@@ -198,7 +203,7 @@
               float: left;
               width: 14px;
               height: 14px;
-              background: #4ecc7a;
+              background: var(--primary);
               line-height: 34px;
               margin-top: 10px;
               border-radius: 10px;
@@ -233,9 +238,10 @@
           :disabled="!!disabled"
           :key="item.id"
           :style="comStyle || ''"
-          placeholder="请选择严重等级"
+          :placeholder="placeholder || '请选择严重等级'"
           :filterable="!state.configJson[item.code].multiple"
           class="component-item"
+          style="width:100%"
           @click.native="selectClick($event)"
           @change="setSelctItem(item.code)"
         >
@@ -268,7 +274,7 @@
           :key="item.id"
           :disabled="!!disabled"
           :style="comStyle || ''"
-          placeholder="请选择响应列表"
+          :placeholder="placeholder || '请选择响应列表'"
           :filterable="!state.configJson[item.code].multiple"
           class="component-item"
           @click.native="selectClick($event)"
@@ -303,11 +309,12 @@
         >
           <el-cascader
             v-if="!state.configJson[item.code].panel"
-            :placeholder="`请选择${item.name}`"
+            :placeholder="placeholder || `请选择${item.name}`"
             :disabled="!!disabled"
             class="component-item"
             :style="comStyle || ''"
             :key="item.id"
+            style="width:100%"
             :filterable="!state.configJson[item.code].multiple"
             :clearable="state.configJson[item.code].clearable"
             @click.native="selectClick($event)"
@@ -330,8 +337,9 @@
           <el-cascader-panel
             v-else
             @click.native="selectClick($event)"
-            :placeholder="`请选择${item.name}`"
+            :placeholder="placeholder || `请选择${item.name}`"
             class="component-item"
+            style="width:100%"
             :key="item.id"
             :style="panStyle"
             v-model="state.selectVal[item.code]"
@@ -525,6 +533,7 @@ export default class CommonDatas extends Vue {
   @Prop() comClass?: string;
   /** 隐藏编码 */
   @Prop() hideCode?: boolean;
+  @Prop() placeholder?: string;
   /** 自定义style */
   @Prop() comStyle?: string;
   /** 自定义style */
@@ -906,7 +915,7 @@ export default class CommonDatas extends Vue {
 }
 </style>
 <style lang="scss">
-$primary-color: #4ecc7a;
+$primary-color: var(--primary);
 .component-item .el-input--suffix .el-input__inner {
   background: none;
   height: 32px !important;

package/src/packages/HtMd/index.vue

@@ -4,24 +4,26 @@
  * @Author: hutao
  * @Date: 2021-12-21 16:24:07
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-22 09:58:44
+ * @LastEditTime: 2022-07-18 14:59:56
 -->
 <template>
-  <mavon-editor v-model="state.content"
-                :subfield="subfield"
-                default_open="{}"
-                ref="md"
-                @save="save"
-                :placeholder="placeholder"
-                :editable="!disabled"
-                @imgAdd="addImg"
-                @change="change" />
+  <mavon-editor
+    v-model="state.content"
+    :subfield="subfield"
+    default_open="{}"
+    ref="md"
+    @save="save"
+    :placeholder="placeholder"
+    :editable="!disabled"
+    @imgAdd="addImg"
+    @change="change"
+  />
 </template>
-<script lang='ts'>
-import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import mavonEditor from "mavon-editor";
-import "mavon-editor/dist/css/index.css";
-import { _axios } from "vue-kst-auth";
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import mavonEditor from 'mavon-editor';
+import 'mavon-editor/dist/css/index.css';
+import { _axios } from 'vue-kst-auth';
 Vue.use(mavonEditor);
 interface State {
   /** 数据状态 */
@@ -43,7 +45,7 @@ export default class HtMd extends Vue {
   /** 数据 */
   state: State = {
     loading: false,
-    content: "",
+    content: '',
   };
   /** 生命周期 */
   created() {
@@ -53,17 +55,17 @@ export default class HtMd extends Vue {
   /**  添加图片 */
   addImg(e: number, f: File) {
     if (this.changImg) {
-      this.$emit("callBackImg", e, f);
+      this.$emit('callBackImg', e, f);
       return;
     }
     const formdata = new FormData();
-    formdata.append("file", f);
+    formdata.append('file', f);
     //将下面上传接口替换为你自己的服务器接口
     _axios({
-      url: "/files/api/filing/file/upload",
-      method: "post",
+      url: '/files/api/filing/file/upload',
+      method: 'post',
       data: formdata,
-      headers: { "Content-Type": "multipart/form-data" },
+      headers: { 'Content-Type': 'multipart/form-data' },
     }).then((res) => {
       if (res.status === 200) {
         (this.$refs.md as any).$img2Url(
@@ -72,28 +74,25 @@ export default class HtMd extends Vue {
         );
       }
     });
-
     //
   }
   /** 实时改变 */
   change(e: string, text: string) {
-    this.$emit("input", e);
-
-    this.$emit("change", e, text);
-
+    this.$emit('input', e);
+    this.$emit('change', e, text);
     //
   }
   /**  保存数据 */
   save(e: string, text: string) {
-    this.$emit("save", e, text);
+    this.$emit('save', e, text);
   }
 
   /** 监听 */
-  @Watch("value", { deep: true })
+  @Watch('value', { deep: true })
   onContent(val: string) {
     this.state.content = val;
   }
   /** 计算属性 */
 }
 </script>
-<style lang='scss' scoped></style>
+<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-07-10 14:38:04
+ * @LastEditTime: 2022-07-17 11:34:00
 -->
 
 <template>
@@ -20,6 +20,7 @@
       <HtBaseData
         v-else
         :org="org"
+        :placeholder="placeholder"
         :hide-code="hideCode"
         :disabled="disabled"
         com-style="background:#fff"
@@ -66,6 +67,7 @@ interface State {
 export default class HtSelectBaseData extends Vue {
   @Prop() value!: string;
   @Prop() org?: string;
+  @Prop() placeholder?: string;
   /** 是否禁用 */
   @Prop({ default: false }) disabled?: boolean;
   /* 是否只读 */

package/src/packages/HtSelectOrg/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-07-10 16:49:11
+ * @LastEditTime: 2022-07-17 11:32:50
 -->
 <template>
   <span v-if="readonly">
@@ -18,6 +18,7 @@
   <HtBaseData
     v-else
     :org="org"
+    :placeholder="placeholder"
     :disabled="disabled"
     com-style="background:#fff"
     :config-json="configJson"
@@ -44,6 +45,7 @@ export default class HtSelectOrg extends Vue {
   @Prop() value!: string;
   /** 是否禁用 */
   @Prop() disabled?: boolean;
+  @Prop() placeholder?: string;
   @Prop() org?: string;
   /** 是否可以清除 */
   @Prop() clearable?: boolean;

package/src/packages/HtSelectUser/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-07-10 15:57:06
+ * @LastEditTime: 2022-07-17 11:33:13
 -->
 <template>
   <span v-if="readonly">
@@ -18,6 +18,7 @@
   <HtBaseData
     v-else
     :org="org"
+    :placeholder="placeholder"
     :disabled="disabled"
     com-style="background:#fff"
     :config-json="configJson"
@@ -45,6 +46,7 @@ export default class HtSelectUser extends Vue {
   @Prop() org!: string;
   /** 是否禁用 */
   @Prop() disabled?: boolean;
+  @Prop() placeholder?: string;
   /** 是否可以清除 */
   @Prop() clearable?: boolean;
   @Prop({ default: true }) show?: boolean;

package/src/packages/common.ts

@@ -0,0 +1,70 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2022-07-18 15:01:02
+ * @LastEditors: hutao
+ * @LastEditTime: 2022-07-18 15:03:00
+ */
+import moment from "moment";
+
+/**    生成唯一Id
+ * @params e 生成的id位数 默认32
+ */
+export const randomString = (e = 32) => {
+  /** 生成格式17位的时间YYYY-MM-DD HH:mm:ss.SSS加(e-17)位的随机数 */
+  const t = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz23456789",
+    a = t.length;
+  const now = moment().format('YYYYMMDDHHmmssSSS')
+  let n = "";
+  if (e > 17) {
+    n = now
+
+    for (let i = 0; i < (e - 17); i++) {
+      n += t.charAt(Math.floor(Math.random() * a));
+    }
+  }
+  else if (e === 17) {
+    n = now
+  }
+  else {
+    for (let i = 0; i < e; i++) {
+      n += t.charAt(Math.floor(Math.random() * a));
+    }
+  }
+
+  return n;
+}
+/** 时间计算
+@params fromDate 开始时间
+@params toDate 结束时间
+ */
+export const dateLess = (fromDate: string, toDate: string) => {
+  if (fromDate && toDate) {
+    const date = new Date(fromDate);
+    const date2 = new Date(toDate);
+    const s1: number = date.getTime(),
+      s2 = date2.getTime();
+    const total: number = (s2 - s1) / 1000;
+    const day: number = parseInt((total / (24 * 60 * 60)).toString()); //计算整数天数
+    const afterDay: number = total - day * 24 * 60 * 60; //取得算出天数后剩余的秒数
+    const hour: number = parseInt((afterDay / (60 * 60)).toString()); //计算整数小时数
+    const afterHour = total - day * 24 * 60 * 60 - hour * 60 * 60; //取得算出小时数后剩余的秒数
+    const min: number = parseInt((afterHour / 60).toString()); //计算整数分
+    const afterMin: number =
+      parseInt((total - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60).toString()); //取得算出分后剩余的秒数
+    if (day === 0) {
+      if (hour === 0) {
+        return min + "分" + afterMin + "秒";
+      } else {
+        return hour + "小时" + min + "分" + afterMin + "秒";
+      }
+    } else {
+      return day + "天" + hour + "小时" + min + "分" + afterMin + "秒";
+    }
+  }
+  else {
+    return "-"
+  }
+
+}

package/src/packages/style.scss

@@ -11,3 +11,46 @@
     float: right;
   }
 }
+.component-item {
+  width: 100%;
+  + .component-item {
+    margin-top: 10px;
+  }
+}
+.item-origin {
+  border-radius: 50%;
+  border-width: 0px 7px;
+  margin-right: 6px;
+  border-style: solid;
+}
+$primary-color: var(--primary);
+.component-item .el-input--suffix .el-input__inner {
+  background: none;
+  height: 32px !important;
+}
+.component-item .is-disabled .el-input__inner {
+  background: #f5f5f5;
+}
+.ht-user-dot {
+  padding: 0;
+  margin: 0;
+  float: left;
+  width: 14px;
+  height: 14px;
+  background: $primary-color;
+  line-height: 34px;
+  margin-top: 10px;
+  border-radius: 10px;
+  margin-right: 4px;
+}
+.ht-user-name {
+  padding: 0;
+  margin: 0;
+  float: left;
+}
+.ht-user-dot-disabled {
+  background: #ccc;
+}
+.ht-user-disabled {
+  color: #ddd;
+}