Merge branch 'master' into stage

src/views/finance/fundManage/depExpenses/index.vue

@@ -222,7 +222,6 @@ const config = computed(() => {
             el: "button",
             click() {
               depModal.value = true;
-              runningWaterId = row.id;
               dtlData.value = row;
               departmentId.value = [];
             },
@@ -279,7 +278,7 @@ const submitDeptForm = async (departmentId) => {
     ElMessage.error("请选择部门");
     return;
   }
-  const params = {
+  let params = {
     deptId: departmentId[departmentId.length - 1],
     accountDeptRunningWaterId: dtlData.value.accountDeptRunningWaterId,
     id: dtlData.value.id,
@@ -401,7 +400,7 @@ const submitForm = async () => {
       return ElMessage("分拆总金额需等于交易金额");
     }
     submitLoading.value = true;
-    const params = {
+    let params = {
       id: formData.data.id,
       deptRunningWaterDetailList: formData.data.accountDeptRunningWaterDetailList,
       accountDeptRunningWaterId: formData.data.accountDeptRunningWaterId,

src/views/index.vue

@@ -96,7 +96,8 @@
 	</div>
 </template>
 
-<script setup name="Index">
+<script setup >
+// name="Index" 增加缓存
 import { createApp, onMounted, ref } from 'vue'
 import byTableDemo from '../components/byTable/demo'
 import html2canvas from 'html2canvas'

src/views/process/dealWith/index.vue

@@ -188,7 +188,7 @@ const config = computed(() => {
 											flowKey: row.flowKey,
 											id: row.id,
 											processType:nodeType == 1 ? 30 : 10,
-												businessId: row.businessId,
+											businessId:row.businessId,
 											version:row.version
 										},
 									});