bug修改

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

@@ -113,6 +113,7 @@
                 ref="formRef"
                 :option="formOption"
                 v-model="currentProcess"
+                :key="avueKey"
                 style="padding: 10px; background-color: transparent"
               >
                 <template #tbomUrl>
@@ -227,21 +228,42 @@ const edgeClick = (event) => {
 // 自定义工序项目字段名称相关方法
 const customFieldNameValues = ref([]);
 const customFieldOptions = ref([]);
+function isJSON(str) {
+  if (typeof str !== "string") {
+    return false;
+  }
+
+  try {
+    JSON.parse(str);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+const avueKey = ref(false);
 const nodeClick = (event) => {
   if (usableStatus.value == false && !editStatus.value) return;
   if (!editStatus.value) {
     selectNode.value = event.node;
   } else {
+    currentProcess.value = {};
+    //让组件重新加载
+    avueKey.value = !avueKey.value;
     currentProcess.value = event.node;
 
     // 设置自定义字段名称的选项内容等
-
-    customFieldOptions.value = JSON.parse(event.node.customFieldName);
-    customFieldNameValues.value = customFieldOptions.value
-      .filter((item) => {
-        return item.isSelected;
-      })
-      .map((item) => item.value);
+    if (
+      event.node.customFieldName &&
+      isJSON(event.node.customFieldName) &&
+      JSON.parse(event.node.customFieldName).length > 0
+    ) {
+      customFieldOptions.value = JSON.parse(event.node.customFieldName);
+      customFieldNameValues.value = customFieldOptions.value
+        .filter((item) => {
+          return item.isSelected;
+        })
+        .map((item) => item.value);
+    }
   }
 };
 //当使用回退时清空选择的node

src/views/base/signature/components/opSignature.vue

@@ -448,13 +448,19 @@ const submit = async () => {
               break;
             case "2":
               const chartContainer1 = GJRef.value;
-              const canvas1 = await html2canvas(chartContainer1);
+              const canvas1 = await html2canvas(chartContainer1, {
+                logging: false, // 可选：关闭日志输出
+                backgroundColor: null, // 设置背景颜色为透明
+              });
               const img1 = canvas1.toDataURL("image/png");
               blob = base64ToBlob(img1);
               break;
             case "3":
               const chartContainer2 = JYRef.value;
-              const canvas2 = await html2canvas(chartContainer2);
+              const canvas2 = await html2canvas(chartContainer2, {
+                logging: false, // 可选：关闭日志输出
+                backgroundColor: null, // 设置背景颜色为透明
+              });
               const img2 = canvas2.toDataURL("image/png");
               blob = base64ToBlob(img2);
               break;
@@ -586,7 +592,10 @@ const handwritingUseHook = () => {
   //下载png
   const updownPng = async () => {
     const chartContainer = imgRef.value;
-    const canvas = await html2canvas(chartContainer);
+    const canvas = await html2canvas(chartContainer, {
+      logging: false, // 可选：关闭日志输出
+      backgroundColor: null, // 设置背景颜色为透明
+    });
     const img = canvas.toDataURL("image/png");
     const a = document.createElement("a");
     a.href = img;
@@ -636,7 +645,10 @@ const GJUseHook = () => {
   const GJRef = ref(null);
   const updownGJPng = async () => {
     const chartContainer = GJRef.value;
-    const canvas = await html2canvas(chartContainer);
+    const canvas = await html2canvas(chartContainer, {
+      logging: false, // 可选：关闭日志输出
+      backgroundColor: null, // 设置背景颜色为透明
+    });
     const img = canvas.toDataURL("image/png");
     const a = document.createElement("a");
     a.href = img;
@@ -651,7 +663,10 @@ const JYUseHook = () => {
   const JYRef = ref(null);
   const updownJYPng = async () => {
     const chartContainer = JYRef.value;
-    const canvas = await html2canvas(chartContainer);
+    const canvas = await html2canvas(chartContainer, {
+      logging: false, // 可选：关闭日志输出
+      backgroundColor: null, // 设置背景颜色为透明
+    });
     const img = canvas.toDataURL("image/png");
     const a = document.createElement("a");
     a.href = img;
@@ -712,7 +727,10 @@ const GZUseHook = () => {
   };
   const updownGZPng = async () => {
     const chartContainer = GZRef.value;
-    const canvas = await html2canvas(chartContainer);
+    const canvas = await html2canvas(chartContainer, {
+      logging: false, // 可选：关闭日志输出
+      backgroundColor: null, // 设置背景颜色为透明
+    });
     const img = canvas.toDataURL("image/png");
     const a = document.createElement("a");
     a.href = img;
@@ -916,12 +934,14 @@ watch(
   .GJBox {
     font-size: 20px;
     color: red;
+    background-color: transparent !important;
     display: inline;
     border: 2px solid red;
   }
   .JYBox {
     font-size: 20px;
     color: red;
+    background-color: transparent !important;
     display: inline;
     border: 2px solid red;
   }

src/views/base/signature/index.vue

@@ -41,6 +41,9 @@
         />
       </template>
       <template #menu="{ row, index, type }">
+        <a :href="downloadUrl(row.signatureFiles)"
+          ><el-button type="primary" text>下载</el-button>
+        </a>
         <el-button @click="toEdiet(row)" text type="primary">修改</el-button>
         <el-button @click="deleteRecord(row, index, done)" text type="primary"
           >删除</el-button
@@ -90,6 +93,9 @@ const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const { dicts } = useDictionaryStore();
 const url =
   "https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg";
+const downloadUrl = (url) => {
+  return import.meta.env.VITE_APP_UPLOAD_URL + url;
+};
 const toLook = (url) => {
   imgSrcList.value = [];
   imgSrcList.value.push(import.meta.env.VITE_APP_UPLOAD_URL + url);
@@ -221,6 +227,6 @@ const deleteRecord = (row, index, done) => {
 #imgeview {
   position: fixed;
   top: -2px;
-  z-index: 10;
+  z-index: 99999;
 }
 </style>

src/views/plan/workOrder/index.vue

@@ -331,11 +331,9 @@ const showProExcel = async (id) => {
   const { data, code } = await getProExcel(id);
   if (code == "200") {
     ExDataObj.value = data;
-
     workOderShow.value = true;
   } else {
     ExDataObj.value = {};
-
     workOderShow.value = false;
   }
 };