Merge branch 'qingban' of http://139.155.176.112:8091/project-all/mes-admin-temp into qingban

src/hooks/useDnD.js

@@ -97,7 +97,6 @@ export default function useDragAndDrop() {
       position,
       data: { label: draggedLable.value },
     };
-    console.log(newNode, "22");
     /**
      * Align node position after drop, so it's centered to the mouse
      *

src/views/base/craftManagement/route/bindProcess.vue

@@ -472,16 +472,26 @@ const showList = computed(() => {
   });
   return array;
 });
+const errArray = ref([]);
+provide("errArray", errArray);
 // 保存中间的工序列表
 const saveFlow = async () => {
-  const { code } = await saveProcessInRoute({
+  const { code, msg } = await saveProcessInRoute({
     processRouteId: route.fullPath.split("/")[4],
     routeData: JSON.stringify({ ...flowData }),
   });
   if (code == "200") {
-    ElMessage.success("保存成功");
+    try {
+      if (JSON.parse(msg.replace("err:", ""))) {
+        errArray.value = JSON.parse(msg.replace("err:", ""));
+        ElMessage.error("请检查标记节点情况");
+      }
+    } catch (e) {
+      errArray.value = [];
+      ElMessage.success("保存成功");
+      loadProcessesFlow();
+    }
   }
-  loadProcessesFlow();
 };
 const cancer = () => {
   ElMessageBox.confirm("取消的话会清空本次操作记录，确定吗?", "回退", {

src/views/base/craftManagement/route/components/CustomNode/index.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { Position, Handle } from "@vue-flow/core";
 const props = defineProps(["data", "id"]);
+const errArray = inject("errArray");
 const currentProcess = inject("currentProcess");
 const selectNode = inject("selectNode");
 const selectStatus = ref(false);
@@ -14,6 +15,9 @@ const getBorderClass = computed(() => {
       str = "borderGreen";
     }
   }
+  if (errArray.value.includes(props.id)) {
+    str += " errBg";
+  }
   return str;
 });
 watch(
@@ -72,6 +76,9 @@ watch(
   </div>
 </template>
 <style lang="scss">
+.errBg {
+  background-color: rgba(255, 0, 0, 0.8);
+}
 .vue-flow__node-custom {
   padding: 0px !important;
   background-color: white !important;

src/views/base/craftManagement/route/components/processComponent.vue

@@ -85,7 +85,7 @@
       <div v-else>
         <div class="tipTitle">{{ tipTitle }}</div>
         <SetExcel />
-      </div>fder
+      </div>
     </div>
   </div>
 </template>