From 1f0c2ed89bcc1e4cbddb136d4d94a0cd23d62884 Mon Sep 17 00:00:00 2001
From: ZN <zhang_12370@163.com>
Date: 星期一, 16 三月 2026 14:44:28 +0800
Subject: [PATCH] Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG
---
src/views/qualityManagement/rawMaterial/index.vue | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterial/index.vue b/src/views/qualityManagement/rawMaterial/index.vue
index c123b95..279c80a 100644
--- a/src/views/qualityManagement/rawMaterial/index.vue
+++ b/src/views/qualityManagement/rawMaterial/index.vue
@@ -67,9 +67,6 @@
import InspectionFormDia from "@/views/qualityManagement/rawMaterial/components/inspectionFormDia.vue";
import FormDia from "@/views/qualityManagement/rawMaterial/components/formDia.vue";
import {ElMessageBox} from "element-plus";
-import {
- downloadQualityInspect,
-} from "@/api/qualityManagement/rawMaterialInspection.js";
import FilesDia from "@/views/qualityManagement/rawMaterial/components/filesDia.vue";
import dayjs from "dayjs";
import {userListNoPage} from "@/api/system/user.js";
@@ -77,7 +74,7 @@
import {
deleteRawMaterial,
findRawMaterialListPage,
- submitRawMaterial, updateCheckUserName,
+ submitRawMaterial, updateCheckUserName,downloadRawMaterial
} from "@/api/qualityManagement/rawMaterial.js";
const data = reactive({
@@ -111,6 +108,10 @@
prop: "model",
},
{
+ label: "鏁伴噺(鍚�)",
+ prop: "quantity",
+ },
+ {
label: "鎵规鍙�",
prop: "batchNo",
width: 120
@@ -125,18 +126,18 @@
prop: "checkResult",
dataType: "tag",
formatType: (params) => {
- if (params === 1) {
+ if (params === 0) {
return "danger";
- } else if (params === 0) {
+ } else if (params === 1) {
return "success";
} else {
return null;
}
},
formatData: (params) => {
- if (params === 1) {
+ if (params === 0) {
return "涓嶅悎鏍�";
- } else if (params === 0) {
+ } else if (params === 1) {
return "鍚堟牸";
}
},
@@ -191,10 +192,6 @@
disabled: (row) => {
// 宸叉彁浜ゅ垯绂佺敤
if (row.inspectState == 1) return true;
- // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳芥彁浜�
- if (row.checkUserName) {
- return row.checkUserName !== userStore.nickName;
- }
return false;
}
},
@@ -323,7 +320,7 @@
type: "warning",
})
.then(() => {
- proxy.download("/quality/qualityInspect/export", {inspectType: 0}, "鍘熸潗鏂欐楠�.xlsx");
+ proxy.download("/quality/rawMaterial/export", {}, "鍘熸枡妫�.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
@@ -367,7 +364,7 @@
}
const downLoadFile = (row) => {
- downloadQualityInspect({id: row.id}).then((blobData) => {
+ downloadRawMaterial({id: row.id}).then((blobData) => {
const blob = new Blob([blobData], {
type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
})
@@ -375,7 +372,7 @@
const link = document.createElement('a')
link.href = downloadUrl
- link.download = '鍘熸潗鏂欐楠屾姤鍛�.docx'
+ link.download = '鍘熸枡妫�楠屾姤鍛�.docx'
document.body.appendChild(link)
link.click()
--
Gitblit v1.9.3