feat: 职工慰问 整改

src/main/resources/db/script/20261009/职工慰问_四级审核菜单权限.sql

@@ -22,14 +22,14 @@ SET name = '校工会办公室主任审批', initialPinyinName = 'x', note = '
     permission = 'h5.condolence.secondApproval'
 WHERE id = '87a2dcfac0da4ec4870b65693807a4d1';
 
--- 三级：分工会主席审批，节点 ecdaef3b-edf4-4143-9a96-887dd5921711。
+-- 三级：校工会主席审批，节点 ecdaef3b-edf4-4143-9a96-887dd5921711。
 UPDATE zhgh_cqgmy.sys_menu
-SET name = '分工会主席审批', initialPinyinName = 'f', note = '分工会主席审批',
+SET name = '校工会主席审批', initialPinyinName = 'x', note = '校工会主席审批',
     permission = 'condolence.thirdApproval'
 WHERE id = '0917928006574b2a99f7ef3e8804d873';
 
 UPDATE zhgh_cqgmy.sys_menu
-SET name = '分工会主席审批', initialPinyinName = 'f', note = '分工会主席审批',
+SET name = '校工会主席审批', initialPinyinName = 'x', note = '校工会主席审批',
     permission = 'h5.condolence.thirdApproval'
 WHERE id = 'c269f94a5c8a4a4a8c8de0bb8f8f9f9a';
 
@@ -85,18 +85,18 @@ VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '87a2dcfac0da4ec4870b65693807a4d1');
 INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
 VALUES ('494ac71eb8b44d0e99e19b7fde6bd469', '87a2dcfac0da4ec4870b65693807a4d1');
 
--- 三级：分工会主席审批，节点 ecdaef3b-edf4-4143-9a96-887dd5921711。
+-- 三级：校工会主席审批，节点 ecdaef3b-edf4-4143-9a96-887dd5921711。
 DELETE FROM zhgh_cqgmy.sys_role_menu WHERE menuId = '0917928006574b2a99f7ef3e8804d873';
 INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
 VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '0917928006574b2a99f7ef3e8804d873');
 INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
-SELECT id, '0917928006574b2a99f7ef3e8804d873' FROM zhgh_cqgmy.sys_role WHERE code = 'BRANCH_UNION_CHAIRMAN' AND disabled = false AND delFlag = false;
+VALUES ('6aece46b946e4fb9ac4cb15c0cd8c3e6', '0917928006574b2a99f7ef3e8804d873');
 
 DELETE FROM zhgh_cqgmy.sys_role_menu WHERE menuId = 'c269f94a5c8a4a4a8c8de0bb8f8f9f9a';
 INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
 VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', 'c269f94a5c8a4a4a8c8de0bb8f8f9f9a');
 INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
-SELECT id, 'c269f94a5c8a4a4a8c8de0bb8f8f9f9a' FROM zhgh_cqgmy.sys_role WHERE code = 'BRANCH_UNION_CHAIRMAN' AND disabled = false AND delFlag = false;
+VALUES ('6aece46b946e4fb9ac4cb15c0cd8c3e6', 'c269f94a5c8a4a4a8c8de0bb8f8f9f9a');
 
 DELETE FROM zhgh_cqgmy.sys_role_menu WHERE menuId = '3561e97f44d14b47ae07f63ff8312a90';
 INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
@@ -116,6 +116,8 @@ VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '3b49290f7db44130b9f6394a8212321f');
 INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
 VALUES ('494ac71eb8b44d0e99e19b7fde6bd469', '3b49290f7db44130b9f6394a8212321f');
 INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
+VALUES ('6aece46b946e4fb9ac4cb15c0cd8c3e6', '3b49290f7db44130b9f6394a8212321f');
+INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
 VALUES ('b3854469e6f44901b22bb791cb538431', '3b49290f7db44130b9f6394a8212321f');
 INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
 SELECT id, '3b49290f7db44130b9f6394a8212321f' FROM zhgh_cqgmy.sys_role WHERE code = 'BRANCH_UNION_CHAIRMAN' AND disabled = false AND delFlag = false;
@@ -125,6 +127,8 @@ VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '024811fd168e44948e6ab84911fc26bb');
 INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
 VALUES ('494ac71eb8b44d0e99e19b7fde6bd469', '024811fd168e44948e6ab84911fc26bb');
 INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
+VALUES ('6aece46b946e4fb9ac4cb15c0cd8c3e6', '024811fd168e44948e6ab84911fc26bb');
+INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
 VALUES ('b3854469e6f44901b22bb791cb538431', '024811fd168e44948e6ab84911fc26bb');
 INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId)
 SELECT id, '024811fd168e44948e6ab84911fc26bb' FROM zhgh_cqgmy.sys_role WHERE code = 'BRANCH_UNION_CHAIRMAN' AND disabled = false AND delFlag = false;

src/main/resources/static/components/plugins/sysSignature/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="signature-wrap">
-        <canvas id="canvas"></canvas>
+        <canvas ref="canvas" @touchstart.stop @touchmove.stop></canvas>
         <div :class="isLikelyMobile() ? 'action-buttons' : 'action-buttons pc-action-buttons'">
             <button @click="clear" class="action-button-danger" type="button">清空</button>
             <button @click="undo" class="action-button-warning" type="button">撤销</button>
@@ -30,23 +30,23 @@
 // window.addEventListener("orientationchange", a)
 // a()
 
-let signature = null
 module.exports = {
     name: "sysSignature",
     data() {
         return {
-            content: null
+            content: null,
+            signature: null
         }
     },
     methods: {
         clear() {
-            signature.clear()
+            this.signature.clear()
         },
         undo() {
-            signature.undo()
+            this.signature.undo()
         },
         rotate() {
-            signature.getRotateCanvas(90)
+            this.signature.getRotateCanvas(90)
         },
         isLikelyMobile() {
           const isTouchDevice = 'ontouchstart' in window || navigator.maxTouchPoints > 0;
@@ -56,7 +56,7 @@ module.exports = {
           return hasMobileUA || (isTouchDevice && isSmallScreen);
         },
         save() {
-            if (signature.isEmpty()) {
+            if (this.signature.isEmpty()) {
                 // H5 页面使用统一的 Vant 提示；未加载 Vant 的独立签字页保留原生提示作为兼容兜底。
                 if (typeof this.$toast === "function") {
                     this.$toast({
@@ -71,11 +71,11 @@ module.exports = {
             }
             // const png = signature.getPNG()
             //旋转一下 横过来
-            const rotateCanvas = signature.getRotateCanvas(-90)
+            const rotateCanvas = this.signature.getRotateCanvas(-90)
             if (this.isLikelyMobile()) {
               this.$emit("save", rotateCanvas.toDataURL())
             } else {
-              this.$emit("save", signature.toDataURL())
+              this.$emit("save", this.signature.toDataURL())
             }
         }
     },
@@ -83,10 +83,10 @@ module.exports = {
         const innerWidth = window.innerWidth
         const innerHeight = window.innerHeight
 
-        const canvas = document.getElementById("canvas")
+        const canvas = this.$refs.canvas
         canvas.width = window.innerWidth
         canvas.height = window.innerHeight
-        signature = new SmoothSignature(canvas, {
+        this.signature = new SmoothSignature(canvas, {
             width: innerWidth - 30,
             height: innerHeight - 30,
             scale: 2,
@@ -95,6 +95,15 @@ module.exports = {
             color: "#000000"
             // bgColor: "#f6f6f6"
         })
+        canvas.addEventListener("touchstart", this.signature.onDrawStart, { passive: false })
+        canvas.addEventListener("touchmove", this.signature.onDrawMove, { passive: false })
+        document.addEventListener("touchend", this.signature.onDrawEnd, { passive: false })
+        document.addEventListener("touchcancel", this.signature.onDrawEnd, { passive: false })
+    },
+    beforeDestroy() {
+        if (this.signature) {
+            this.signature.removeListener()
+        }
     }
 }
 </script>

src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html

@@ -62,6 +62,13 @@ layout("/layouts/platform.html"){
                         <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
                         <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
                         <el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
+                        <el-dropdown v-if="row.createdBy === $store.state.user.id && row.instanceState == 20" trigger="click" @command="format => doExportApply(row, format)">
+                            <el-button size="mini" type="primary">导出</el-button>
+                            <el-dropdown-menu slot="dropdown">
+                                <el-dropdown-item command="pdf">导出 PDF</el-dropdown-item>
+                                <el-dropdown-item command="word">导出 Word</el-dropdown-item>
+                            </el-dropdown-menu>
+                        </el-dropdown>
                         <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
                             删除
                         </el-button>
@@ -102,6 +109,9 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
+            doExportApply(row, format) {
+                this.$downLoad('/platform/condolence/mine/doExportApply?id=' + row.id + '&print=' + (format === 'pdf'))
+            },
             onAdd() {
                 commonUtil.pjaxPush('/platform/condolence/apply')
             },