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/components/formDia.vue | 22 +++++++++++++++-------
src/api/qualityManagement/rawMaterial.js | 9 +++++++++
src/views/qualityManagement/rawMaterial/index.vue | 27 ++++++++++++---------------
3 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/src/api/qualityManagement/rawMaterial.js b/src/api/qualityManagement/rawMaterial.js
index f411b4d..f8f30de 100644
--- a/src/api/qualityManagement/rawMaterial.js
+++ b/src/api/qualityManagement/rawMaterial.js
@@ -60,3 +60,12 @@
data: query,
})
}
+
+export function downloadRawMaterial(data) {
+ return request({
+ url: '/quality/rawMaterial/down',
+ method: 'post',
+ data: data,
+ responseType: "blob",
+ })
+}
diff --git a/src/views/qualityManagement/rawMaterial/components/formDia.vue b/src/views/qualityManagement/rawMaterial/components/formDia.vue
index c8ed6c6..9e47f37 100644
--- a/src/views/qualityManagement/rawMaterial/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterial/components/formDia.vue
@@ -34,6 +34,11 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鎵瑰彿锛�" prop="batchNo">
+ <el-input style="width: 100%" v-model="form.batchNo" placeholder="璇疯緭鍏�" clearable/>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
@@ -42,8 +47,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎵瑰彿锛�" prop="batchNo">
- <el-input style="width: 100%" v-model="form.batchNo" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="鏁伴噺(鍚�)锛�" prop="quantity">
+ <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�"
+ clearable :precision="2" controls-position="right"/>
</el-form-item>
</el-col>
</el-row>
@@ -60,8 +66,8 @@
<el-col :span="12">
<el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
<el-select v-model="form.checkResult">
- <el-option label="鍚堟牸" :value="0"/>
- <el-option label="涓嶅悎鏍�" :value="1"/>
+ <el-option label="鍚堟牸" :value="1"/>
+ <el-option label="涓嶅悎鏍�" :value="0"/>
</el-select>
</el-form-item>
</el-col>
@@ -141,9 +147,10 @@
productName: "",
productId: "",
productModelId: "",
+ quantity: undefined,
model: "",
batchNo: "",
- checkType: "",
+ checkType: undefined,
checkResult: "",
unit: "",
checkUserName: "",
@@ -153,8 +160,9 @@
checkUserName: [{required: false, message: "璇烽�夋嫨妫�楠屽憳", trigger: "blur"}],
productId: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
productModelId: [{required: true, message: "璇烽�夋嫨浜у搧鍨嬪彿", trigger: "change"}],
- batchNo: [{required: false, message: "璇疯緭鍏ユ壒娆�", trigger: "blur"}],
- checkType: [{required: false, message: "璇烽�夋嫨妫�楠岀被鍨�", trigger: "blur"}],
+ quantity: [{required: true, message: "璇疯緭鍏ユ暟閲�", trigger: "blur"}],
+ batchNo: [{required: true, message: "璇疯緭鍏ユ壒娆�", trigger: "blur"}],
+ checkType: [{required: true, message: "璇烽�夋嫨妫�楠岀被鍨�", trigger: "change"}],
checkResult: [{required: true, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change"}],
},
});
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