fix:代码提交,图标替换

zkqy-ui/src/api/bpmprocess/run/executeProcess.js

@@ -103,3 +103,14 @@ export function processNodeExecutionApproval(data) {
   })
 }
 
+// 审批撤回
+
+export function revokeApplication(data) {
+  return request({
+    url: '/system/runbpm/process/revokeApplication',
+    method: 'post',
+    data: data,
+    baseURL: process.env.VUE_APP_BASE_API4
+  })
+}
+

zkqy-ui/src/assets/images/comp.svg

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="202px" height="72px" viewBox="0 0 202 72" enable-background="new 0 0 202 72" xml:space="preserve">  <image id="image0" width="202" height="72" x="0" y="0"
+    href="data:image/png;base64,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
+MDAJM+HCAAAAAElFTkSuQmCC" />
+</svg>

zkqy-ui/src/layout/index.vue

@@ -80,6 +80,7 @@ import { mapState } from "vuex";
 import variables from "@/assets/styles/variables.scss";
 import meclogo1 from "@/assets/images/mec-logo1.svg";
 import mecLogoLogin from "@/assets/images/mec-logo-login.svg";
+import comp from "@/assets/images/comp.svg";
 export default {
   name: "Layout",
   components: {
@@ -156,6 +157,7 @@ export default {
         this.logo = process.env.VUE_APP_BASE_API + logo;
       } else {
         this.logo = mecLogoLogin;
+        // this.logo = comp;
       }
     },
   },

zkqy-ui/src/views/adminLogin.vue

@@ -355,7 +355,7 @@ export default {
   width: 194px;
   height: 64px;
   background: url(../assets/images/mec_logo_login.png);
-  // background: url(../assets/images/comp.png);
+  //background: url(../assets/images/comp.png);
   /* box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.25); */
   opacity: 1;
 }

zkqy-ui/src/views/bussiness/OAMange.vue

@@ -51,6 +51,10 @@
           </el-form-item>
         </el-form>
       </div>
+      <!-- <el-button type="primary" size="default" @click="printTest">
+        打印测试
+      </el-button> -->
+
       <div class="show-body">
         <!--    流程任务列表    -->
         <el-table
@@ -116,7 +120,10 @@
                     >
                   </el-dropdown-item> -->
                   <el-dropdown-item>
-                    <el-button @click="(scope) => {}" type="text" size="small"
+                    <el-button
+                      @click="toDetail(scope.row)"
+                      type="text"
+                      size="small"
                       >详情</el-button
                     >
                   </el-dropdown-item>
@@ -178,6 +185,7 @@
         </el-dialog>
       </div>
     </el-card>
+    <div id="print"></div>
   </div>
 </template>
 
@@ -194,6 +202,8 @@ import getNodeSequence from "@/utils/bpmn/getNodeSequence";
 import { getForm } from "@/api/dragform/form";
 import FormGroup from "@/components/FormGroup/index.vue";
 import Approve from "@/components/FormGroup/Approve.vue";
+import receiptDocuments from "@/utils/print/receiptDocuments";
+import qrCodeList from "@/utils/print/qrCodeList.js";
 
 export default {
   name: "processMange",
@@ -353,9 +363,17 @@ export default {
         this.$message.error("网络异常,请稍后再试");
       }
     },
-    toDetail() {
+    toDetail(row) {
+      console.log(row);
+      let { bepTaskPlanKey, benTaskNodeKey, benTaskProcessKey } = row;
+      window.sessionStorage.setItem("oaRow", JSON.stringify(row));
       this.$router.push({
         path: "/processMange/detail",
+        query: {
+          taskNodeKey: benTaskNodeKey,
+          taskProcessKey: benTaskProcessKey,
+          taskPlanKey: bepTaskPlanKey,
+        },
       });
     },
     // 获取列表数据
@@ -450,6 +468,11 @@ export default {
       };
       this.getList();
     },
+    // 打印测试
+    printTest() {
+      // receiptDocuments({}, "print");
+      qrCodeList({}, "print");
+    },
   },
 };
 </script>