Merge branch 'master' of http://36.137.93.232:3000/scz/erp_wdly

package.json

@@ -47,15 +47,15 @@
     "pinia": "2.0.22",
     "sortablejs": "^1.15.0",
     "typescript": "^5.0.4",
-    "vue": "3.2.45",
+    "vue": "3.4.31",
     "vue-cropper": "1.0.3",
     "vue-i18n": "^9.3.0-beta.17",
-    "vue-router": "4.1.4",
+    "vue-router": "4.4.0",
     "vue-super-flow": "^1.3.8"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "3.1.0",
-    "@vue/compiler-sfc": "3.2.45",
+    "@vue/compiler-sfc": "3.3.0",
     "sass": "1.56.1",
     "unplugin-auto-import": "0.11.4",
     "vite": "3.2.3",

src/components/jdStatus/index.vue

@@ -8,14 +8,13 @@
   </div>
 </template>
 <script setup>
-import { watch } from "@vue/runtime-core";
-import { ElMessage, ElMessageBox } from "element-plus";
+import { ElMessageBox } from "element-plus";
 
 const { proxy } = getCurrentInstance();
 const iframeSrc = ref("");
 const { modelValue, iframeUrl } = defineProps(["modelValue", "iframeUrl"]);
 
-const emit = defineEmits();
+const emit = defineEmits(['update:modelValue']);
 
 const propValue = ref(modelValue);
 
@@ -84,7 +83,7 @@ iframe {
   padding: 0 5px 5px;
   width: 500px;
   background: #fff;
-  box-shadow: 0px 2px 20px 1px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 20px 1px rgba(0, 0, 0, 0.1);
   z-index: 20;
   .notice-btn-box {
     text-align: right;

src/views/WDLY/purchaseManage/arrival/index.vue

@@ -32,7 +32,7 @@
         </template>
       </byTable>
     </div>
-    <el-dialog :title="modalType == 'add' ? '到货质检' : '质检详情'" v-model="dialogVisible" width="80%" v-loading="submitLoading" destroy-on-close>
+    <el-dialog :title="modalType == 'add' ? '到货质检' : '质检详情'" v-model="dialogVisible" width="80%" v-loading="submitLoading" destroy-on-close @closed="submitLoading = false">
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
         <template #products>
           <div style="width: 100%">
@@ -378,7 +378,6 @@ const submitForm = () => {
           type: "success",
         });
         dialogVisible.value = false;
-        submitLoading.value = false;
         getList();
       },
       (err) => {

src/views/process/processConfig/vueFlow.vue

@@ -1,4 +1,4 @@
-<template lang="">
+<template>
 	<div class="vueFlow">
 		<div id="container"></div>
 		<div id="stencil"></div>
@@ -67,15 +67,10 @@
 </template>
 <script lang="ts" setup>
 import {
-  defineComponent,
   ref,
   onMounted,
-  onUnmounted,
-  watch,
   reactive,
-  toRefs,
   computed,
-  nextTick,
   getCurrentInstance,
   onDeactivated,
   onActivated,
@@ -98,7 +93,6 @@ import handleBtn from "./handleBtn.vue";
 import branchBtn from "./branchBtn.vue";
 import { MiniMap } from "@antv/x6-plugin-minimap";
 import useTagsViewStore from "@/store/modules/tagsView";
-import { rectToBox } from "@vue-flow/core/dist/utils/graph";
 
 defineProps({
   title: {