cz 1 年之前
父节点
当前提交
7fa97652d6

+ 38 - 34
src/components/PDF/paymentPDF.vue

@@ -416,43 +416,47 @@ const props = defineProps({
 });
 onMounted(() => {
   if (props.rowData && props.rowData.id) {
-    proxy.post("/pay/detail", { id: props.rowData.id }).then((res) => {
-      printDetails.value = res;
-      if (printDetails.value.createUser) {
-        let data = userList.value.filter(
-          (item) => item.value == printDetails.value.createUser
-        );
-        if (data && data.length > 0) {
-          printDetails.value.deptId = data[0].deptId;
+    proxy
+      .post("/ehsdPurchase/payDetail", { id: props.rowData.id })
+      .then((res) => {
+        printDetails.value = res;
+        if (printDetails.value.createUser) {
+          let data = userList.value.filter(
+            (item) => item.value == printDetails.value.createUser
+          );
+          if (data && data.length > 0) {
+            printDetails.value.deptId = data[0].deptId;
+          }
         }
-      }
-      proxy
-        .post("/fileInfo/getList", { businessIdList: [props.rowData.id] })
-        .then((resFile) => {
-          let electronicInvoiceText = "";
-          if (
-            resFile[props.rowData.id] &&
-            resFile[props.rowData.id].length > 0
-          ) {
-            for (let i = 0; i < resFile[props.rowData.id].length; i++) {
-              if (i === 0) {
-                electronicInvoiceText = resFile[props.rowData.id][0].fileName;
-              } else {
-                electronicInvoiceText =
-                  electronicInvoiceText +
-                  ", " +
-                  resFile[props.rowData.id][i].fileName;
+        proxy
+          .post("/fileInfo/getList", { businessIdList: [props.rowData.id] })
+          .then((resFile) => {
+            let electronicInvoiceText = "";
+            if (
+              resFile[props.rowData.id] &&
+              resFile[props.rowData.id].length > 0
+            ) {
+              for (let i = 0; i < resFile[props.rowData.id].length; i++) {
+                if (i === 0) {
+                  electronicInvoiceText = resFile[props.rowData.id][0].fileName;
+                } else {
+                  electronicInvoiceText =
+                    electronicInvoiceText +
+                    ", " +
+                    resFile[props.rowData.id][i].fileName;
+                }
               }
             }
-          }
-          printDetails.value.electronicInvoiceText = electronicInvoiceText;
-        });
-      // if (res.flowExampleId) {
-      //   proxy.post("/flowExample/getApprovalRecord", { id: res.flowExampleId }).then((record) => {
-      //     printDetails.value.recordList = record.recordList;
-      //   });
-      // }
-    });
+            printDetails.value.electronicInvoiceText = electronicInvoiceText;
+          });
+        if (res.flowExampleId) {
+          proxy
+            .post("/flowExample/getApprovalRecord", { id: res.flowExampleId })
+            .then((record) => {
+              printDetails.value.recordList = record.recordList;
+            });
+        }
+      });
   }
 });
 </script>

+ 3 - 3
src/components/headerBar/header-bar.vue

@@ -89,11 +89,11 @@
                     :key="i.name"
                     v-show="i.type == 1 && i.status == '0'"
                   >
-                    <i
+                    <!-- <i
                       :class="'iconfont icon-' + i.icon"
                       style="position: relative; top: -1px"
-                    ></i
-                    >{{ i.menuName }}
+                    ></i> -->
+                    {{ i.menuName }}
                   </li>
                 </ul>
                 <!-- <div class="first-order">

+ 11 - 7
src/layout/components/AppMain.vue

@@ -2,9 +2,14 @@
   <section class="app-main">
     <router-view v-slot="{ Component, route }">
       <transition name="fade-transform" mode="out-in">
-        <keep-alive :include="tagsViewStore.cachedViews">
-          
-          <component v-if="!route.meta.link" :is="Component" :key="route.fullPath"/>
+        <!-- 原本是包含  :include="tagsViewStore.cachedViews" -->
+        <!-- 2023-8-9改为只有首页和待办理页面不要缓存 -->
+        <keep-alive :exclude="['Index', 'Backlog']">
+          <component
+            v-if="!route.meta.link"
+            :is="Component"
+            :key="route.fullPath"
+          />
         </keep-alive>
       </transition>
     </router-view>
@@ -13,11 +18,10 @@
 </template>
 
 <script setup>
-import iframeToggle from "./IframeToggle/index"
-import useTagsViewStore from '@/store/modules/tagsView'
-
-const tagsViewStore = useTagsViewStore()
+import iframeToggle from "./IframeToggle/index";
+import useTagsViewStore from "@/store/modules/tagsView";
 
+const tagsViewStore = useTagsViewStore();
 </script>
 
 <style lang="scss" scoped>

+ 1 - 1
src/views/process/dealWith/backlog.vue

@@ -51,7 +51,7 @@
   </div>
 </template>
     
-  <script setup >
+<script setup  name="Backlog">
 /* eslint-disable vue/no-unused-components */
 import { ElMessage, ElMessageBox } from "element-plus";
 import byTable from "@/components/byTable/index";