diff --git a/src/assets/seal.gif b/src/assets/seal.gif new file mode 100644 index 0000000..db5805e Binary files /dev/null and b/src/assets/seal.gif differ diff --git a/src/assets/seal.png b/src/assets/seal.png deleted file mode 100644 index a34da65..0000000 Binary files a/src/assets/seal.png and /dev/null differ diff --git a/src/views/h5/index.vue b/src/views/h5/index.vue index 2170406..7d9a0fd 100644 --- a/src/views/h5/index.vue +++ b/src/views/h5/index.vue @@ -61,7 +61,7 @@
困难类型
-

{{ type.get(info.user.kunnanleixing) }}

+

{{ info.user.kunnanleixing }}

  • diff --git a/src/views/print/index.vue b/src/views/print/index.vue index 04eed80..0926c71 100644 --- a/src/views/print/index.vue +++ b/src/views/print/index.vue @@ -7,7 +7,7 @@
    -
    扫码核验
    +
    扫码核验
    @@ -15,7 +15,7 @@
    - 兹有{{ info.name }}(身份证号:{{ info.idcard }})经苏州州市总工会审核评定为{{ new Date().getFullYear() }}年度苏州市总工会{{ info.kunnanleixing }}家庭 。 + 兹有{{ info.name }}(身份证号:{{ info.idcard }})经苏州市总工会审核评定为{{ new Date().getFullYear() }}年度苏州市总工会{{ info.kunnanleixing }} @@ -27,7 +27,7 @@

    {{ $moment(new Date()).format('YYYY年M月DD日') }}

    - + @@ -294,13 +294,16 @@ export default { font-weight: 900; font-size: 2em; text-align: center; + text-shadow: 1px 1px #ddd; } @mixin h2 { font-weight: 500; font-size: 1.2em; text-align: center; + text-shadow: 1px 1px #ddd; } @mixin text { + text-shadow: 1px 1px #ddd; font-size: 1.1em; } & > div { @@ -319,17 +322,17 @@ export default { @include h1; transform: translate(-50%,0); left: 50%; - top: 23%; + top: 22.5%; } .text { @include text; word-spacing: 4px; letter-spacing: 1px; - top: 36%; + top: 35%; padding: 0 5em; text-indent: 2em; - line-height: 2.8; - word-break: keep-all; + line-height: 2.6; + word-break: break-all; & > span { text-decoration: underline; @@ -337,19 +340,23 @@ export default { } .stay { @include text; - line-height: 2; + line-height: 1.8; text-align: right; - padding-top: 2em; + padding-top: 1em; padding-right: 1em; + position: relative; + z-index: 1; } .seal { right: 14%; - width: 9vw; - min-width: 55px; + width: 7vw; + min-width: 50px; object-fit: cover; - filter: saturate(5); + filter: saturate(1); + transform: translate(-1em,-4em); + z-index: 0; position: absolute; } } diff --git a/src/views/record/index.vue b/src/views/record/index.vue index 08b27ea..cbd994c 100644 --- a/src/views/record/index.vue +++ b/src/views/record/index.vue @@ -225,7 +225,7 @@ }" :show-file-list="false" :action="action" - :on-sucess="importSuccess" + :on-success="importSuccess" :file-list="fileList"> @@ -297,7 +297,7 @@ import { show } from "@/api/system/customForm"; import * as XLSX from "xlsx"; import { saveAs } from "file-saver"; import { listdept } from "@/api/system/department" -import {getToken} from "@/utils/auth"; +import { getToken } from "@/utils/auth"; import add from "./component/add.vue"; import LxHeader from "@/components/LxHeader/index.vue"; @@ -337,8 +337,14 @@ export default { }; }, methods: { + importSuccess (response, file, fileList) { console.log(response) + this.$message({ + type: 'success', + message: `成功导入${response.total}条,失败${response.fail}条` + }) + this.$refs['xyTable'].getTableData(true) }, async toPrint (row,isChild = 0) {