From c1bf5ebfe65ee67c64da6e9e4e6f7c7dbb3e992e Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 17 三月 2026 14:28:26 +0800
Subject: [PATCH] fix: 新增不合格原料库存时，没有皮重、毛重、净重、过磅日期、车牌号、过磅员输入框（不会存在不合格入库，把按钮屏蔽掉）
---
src/views/qualityManagement/rawMaterial/index.vue | 74 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterial/index.vue b/src/views/qualityManagement/rawMaterial/index.vue
index c123b95..b838b90 100644
--- a/src/views/qualityManagement/rawMaterial/index.vue
+++ b/src/views/qualityManagement/rawMaterial/index.vue
@@ -2,15 +2,38 @@
<div class="app-container">
<div class="search_form">
<div>
- <!-- <span class="search_title">渚涘簲鍟嗭細</span>-->
- <!-- <el-input-->
- <!-- v-model="searchForm.supplier"-->
- <!-- style="width: 240px"-->
- <!-- placeholder="璇疯緭鍏ヤ緵搴斿晢鎼滅储"-->
- <!-- @change="handleQuery"-->
- <!-- clearable-->
- <!-- :prefix-icon="Search"-->
- <!-- />-->
+ <span class="search_title">鎵瑰彿锛�</span>
+ <el-input
+ v-model="searchForm.batchNo"
+ style="width: 200px"
+ placeholder="璇疯緭鍏�"
+ @change="handleQuery"
+ clearable
+ prefix-icon="Search"
+ />
+ <span class="search_title">妫�楠岀被鍨嬶細</span>
+ <el-select
+ v-model="searchForm.checkType"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="handleQuery"
+ clearable
+ >
+ <el-option label="鍏ュ巶妫�" :value="0" />
+ <el-option label="杞﹂棿妫�" :value="1" />
+ <el-option label="鍑哄巶妫�" :value="2" />
+ </el-select>
+ <span class="search_title">鎻愪氦鐘舵�侊細</span>
+ <el-select
+ v-model="searchForm.inspectState"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="handleQuery"
+ clearable
+ >
+ <el-option label="鏈彁浜�" :value="0" />
+ <el-option label="宸叉彁浜�" :value="1" />
+ </el-select>
<span style="margin-left: 10px" class="search_title">妫�娴嬫棩鏈燂細</span>
<el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
placeholder="璇烽�夋嫨" clearable @change="changeDaterange"/>
@@ -67,9 +90,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,12 +97,14 @@
import {
deleteRawMaterial,
findRawMaterialListPage,
- submitRawMaterial, updateCheckUserName,
+ submitRawMaterial, updateCheckUserName,downloadRawMaterial
} from "@/api/qualityManagement/rawMaterial.js";
const data = reactive({
searchForm: {
- supplier: "",
+ batchNo: "",
+ checkType: undefined,
+ inspectState: undefined,
entryDate: undefined, // 褰曞叆鏃ユ湡
entryDateStart: undefined,
entryDateEnd: undefined,
@@ -125,18 +147,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 +213,6 @@
disabled: (row) => {
// 宸叉彁浜ゅ垯绂佺敤
if (row.inspectState == 1) return true;
- // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳芥彁浜�
- if (row.checkUserName) {
- return row.checkUserName !== userStore.nickName;
- }
return false;
}
},
@@ -323,7 +341,7 @@
type: "warning",
})
.then(() => {
- proxy.download("/quality/qualityInspect/export", {inspectType: 0}, "鍘熸潗鏂欐楠�.xlsx");
+ proxy.download("/quality/rawMaterial/export", {}, "鍘熸枡妫�.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
@@ -367,7 +385,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 +393,7 @@
const link = document.createElement('a')
link.href = downloadUrl
- link.download = '鍘熸潗鏂欐楠屾姤鍛�.docx'
+ link.download = '鍘熸枡妫�楠屾姤鍛�.docx'
document.body.appendChild(link)
link.click()
@@ -389,4 +407,8 @@
});
</script>
-<style scoped></style>
+<style scoped>
+.search_title {
+ margin: 0 10px;
+}
+</style>
--
Gitblit v1.9.3