0305

src/views/business/carrier/index.vue

@@ -287,47 +287,47 @@ const handleUnAbandoned = (row) => {
     .catch(() => {})
 }
 
-// /** 批量下载二维码 */
-// function handleBatchDownloadQrCode() {
-//   console.log(selections.value)
-//   for (var i = 0; i < selections.value.length; i++) {
-//     console.log(webHost + selections.value[i].qcCode)
+/** 批量下载二维码 */
+function handleBatchDownloadQrCode() {
+  console.log(selections.value)
+  for (var i = 0; i < selections.value.length; i++) {
+    console.log(webHost + selections.value[i].qcCode)
 
-//     var link = document.createElement('a')
-//     link.href = webHost + selections.value[i].qcCode
-//     link.download = selections.value[i].code // 可以根据需要设置下载的文件名
-//     link.target = '_blank' // 可以根据需要选择是否在新窗口中下载
-//     link.click()
-//   }
-//   // download({}).then((res) => {
-//   //   if (res.code === 200) {
-//   //     proxy.$modal.msgSuccess('操作成功！')
-//   //   }
-//   // })
-// }
-async function handleBatchDownloadQrCode() {
-  console.log(selections.value);
+    var link = document.createElement('a')
+    link.href = webHost + selections.value[i].qcCode
+    link.download = selections.value[i].code // 可以根据需要设置下载的文件名
+    link.target = '_blank' // 可以根据需要选择是否在新窗口中下载
+    link.click()
+  }
+  // download({}).then((res) => {
+  //   if (res.code === 200) {
+  //     proxy.$modal.msgSuccess('操作成功！')
+  //   }
+  // })
+}
+// async function handleBatchDownloadQrCode() {
+//   console.log(selections.value);
   
-  const zip = new JSZip();
-  const zipFilename = '二维码.zip';
+//   const zip = new JSZip();
+//   const zipFilename = '二维码.zip';
 
-  for (var i = 0; i < selections.value.length; i++) {
-    console.log(webHost + selections.value[i].qcCode);
+//   for (var i = 0; i < selections.value.length; i++) {
+//     console.log(webHost + selections.value[i].qcCode);
 
-    // 下载二维码图片数据
-    const qrCodeResponse = await fetch(webHost + selections.value[i].qcCode);
-    const qrCodeBlob = await qrCodeResponse.blob();
+//     // 下载二维码图片数据
+//     const qrCodeResponse = await fetch(webHost + selections.value[i].qcCode);
+//     const qrCodeBlob = await qrCodeResponse.blob();
 
-    // 将二维码图片添加到 ZIP 文件中
-    zip.file(selections.value[i].code + '.png', qrCodeBlob);
-  }
+//     // 将二维码图片添加到 ZIP 文件中
+//     zip.file(selections.value[i].code + '.png', qrCodeBlob);
+//   }
   
-  // 生成 ZIP 文件并提供下载
-  zip.generateAsync({ type: 'blob' }).then((content) => {
-    // 使用 FileSaver.js 将 ZIP 文件保存到本地
-    saveAs(content, zipFilename);
-  });
-}
+//   // 生成 ZIP 文件并提供下载
+//   zip.generateAsync({ type: 'blob' }).then((content) => {
+//     // 使用 FileSaver.js 将 ZIP 文件保存到本地
+//     saveAs(content, zipFilename);
+//   });
+// }
 onMounted(() => {
   getCategories()
 })

src/views/business/daywork/form.vue

@@ -499,6 +499,11 @@ const handleSave = () => {
           proxy.$modal.msgError("尾序不能选择该状态");
         }
       }
+      //判断这个item是否能选择工序已完成
+      if(detailInfo.value.processFinish && form.value.status == 3) {
+        flag = false;
+          proxy.$modal.msgError("该道序状态已有工序已完成");
+      }
       // if (form.value.status <= 1) {
       //   if (form.value.qualifiedNum > 0) {
       //     flag = false;

src/views/business/daywork/index.vue

@@ -376,17 +376,18 @@ function handleDeptChange() {
 }
 //修改
 function handleUpdateDayworkItem(row) {
+  //同工序下状态是否有工序已完成
+  let processFinish = false
   //除了编辑此条以外的同工序合格数
   let totalQuailifiedNum = 0;
   for (let i = 0; i < dayworkItemList.value.length; i++) {
-    if (
-      row.processId == dayworkItemList.value[i].processId &&
-      (dayworkItemList.value[i].status == 2 ||
-        dayworkItemList.value[i].status == 3) &&
-      row.id != dayworkItemList.value[i].id
-    ) {
+    if (row.processId == dayworkItemList.value[i].processId &&(dayworkItemList.value[i].status == 2 ||dayworkItemList.value[i].status == 3) 
+    &&row.id != dayworkItemList.value[i].id) {
       totalQuailifiedNum += dayworkItemList.value[i].qualifiedNum;
     }
+    if(row.processId == dayworkItemList.value[i].processId && dayworkItemList.value[i].status == 3&&row.id != dayworkItemList.value[i].id) {
+      processFinish = true 
+    }
   }
   let maxQuailifiedNum = Math.floor(
     currentDaywork.value.productionQuantity * 1.03 - totalQuailifiedNum
@@ -407,6 +408,8 @@ function handleUpdateDayworkItem(row) {
   }
   //修改向form表单传一个状态值
   row.editStatus = true;
+  //如果为true，则同工序已有工序已完成
+  row.processFinish = processFinish;
   proxy.$refs.dayworkItemRef.open(row);
 }
 //查看