From ccb00a17b9119200b8c8d29a177bcc129dd4c982 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 19 三月 2026 17:43:13 +0800
Subject: [PATCH] Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG
---
src/views/qualityManagement/nonconformingManagement/index.vue | 124 ++++++++++++++++++-----------------------
1 files changed, 55 insertions(+), 69 deletions(-)
diff --git a/src/views/qualityManagement/nonconformingManagement/index.vue b/src/views/qualityManagement/nonconformingManagement/index.vue
index 319cfd5..ba6c7a1 100644
--- a/src/views/qualityManagement/nonconformingManagement/index.vue
+++ b/src/views/qualityManagement/nonconformingManagement/index.vue
@@ -4,30 +4,34 @@
<div style="display: flex;flex-direction: row;align-items: center;">
<div>
<span class="search_title">绫诲瀷锛�</span>
- <el-select v-model="searchForm.inspectType" clearable style="width: 240px" @change="handleQuery">
- <el-option label="鍘熸潗鏂欐楠�" :value="0" />
- <el-option label="杩囩▼妫�楠�" :value="1" />
- <el-option label="鍑哄巶妫�楠�" :value="2" />
+ <el-select v-model="searchForm.checkType" clearable style="width: 200px" @change="handleQuery">
+ <el-option label="鍏ュ巶妫�" :value="0" />
+ <el-option label="杞﹂棿妫�" :value="1" />
+ <el-option label="鍑哄巶妫�" :value="2" />
</el-select>
</div>
- <div style="margin-left: 10px">
+ <!-- <div style="margin-left: 10px">
<span class="search_title">鐘舵�侊細</span>
- <el-select v-model="searchForm.inspectState" clearable style="width: 240px" @change="handleQuery">
+ <el-select v-model="searchForm.inspectState" clearable style="width: 200px" @change="handleQuery">
<el-option label="寰呭鐞�" :value="0" />
<el-option label="宸插鐞�" :value="1" />
</el-select>
- </div>
+ </div> -->
<div style="margin-left: 10px">
<span class="search_title">浜у搧鍚嶇О锛�</span>
<el-input
v-model="searchForm.productName"
- style="width: 240px"
+ style="width: 200px"
placeholder="璇疯緭鍏ヤ骇鍝佸悕绉版悳绱�"
@change="handleQuery"
clearable
:prefix-icon="Search"
/>
</div>
+ <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"
+ style="width: 300px"
+ placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
@@ -61,60 +65,46 @@
import {ElMessageBox} from "element-plus";
import {qualityUnqualifiedDel, qualityUnqualifiedListPage} from "@/api/qualityManagement/nonconformingManagement.js";
import InspectionFormDia from "@/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue";
+import dayjs from "dayjs";
const data = reactive({
searchForm: {
- inspectType: "",
+ checkType: "",
inspectState: "",
productName: "",
+ entryDate: undefined, // 褰曞叆鏃ユ湡
+ entryDateStart: undefined,
+ entryDateEnd: undefined,
},
});
const { searchForm } = toRefs(data);
const tableColumn = ref([
- {
- label: "鐘舵��",
- prop: "inspectState",
- dataType: "tag",
- formatData: (params) => {
- if (params == 0) {
- return "寰呭鐞�";
- } else if (params == 1) {
- return "宸插鐞�";
- } else {
- return null;
- }
- },
- formatType: (params) => {
- if (params == '涓嶅悎鏍�') {
- return "danger";
- } else if (params == '鍚堟牸') {
- return "success";
- } else {
- return null;
- }
- },
- },
{
label: "妫�娴嬫棩鏈�",
prop: "checkTime",
width: 120
},
{
- label: "绫诲埆",
- prop: "inspectType",
+ label: "鎵瑰彿",
+ prop: "batchNo",
+ width: 120
+ },
+ {
+ label: "妫�娴嬬被鍨�",
+ prop: "checkType",
dataType: "tag",
width: 120,
formatData: (params) => {
- if (params == 0) {
- return "鍘熸潗鏂欐楠�";
- } else if (params == 1) {
- return "杩囩▼妫�楠�";
+ if (params === 0) {
+ return "鍏ュ巶妫�";
+ } else if (params === 1) {
+ return "杞﹂棿妫�";
} else {
- return '鍑哄巶妫�楠�';
+ return '鍑哄巶妫�';
}
},
formatType: (params) => {
- if (params == '涓嶅悎鏍�') {
+ if (params === '涓嶅悎鏍�') {
return "info";
} else if (params == '鍚堟牸') {
return "success";
@@ -139,11 +129,11 @@
label: "鍗曚綅",
prop: "unit",
},
- {
- label: "鏁伴噺",
- prop: "quantity",
- width: 100
- },
+ // {
+ // label: "鏁伴噺",
+ // prop: "quantity",
+ // width: 100
+ // },
{
label: "涓嶅悎鏍肩幇璞�",
prop: "defectivePhenomena",
@@ -164,29 +154,6 @@
prop: "dealTime",
width: 120
},
- {
- dataType: "action",
- label: "鎿嶄綔",
- align: "center",
- fixed: "right",
- width: 120,
- operation: [
- {
- name: "缂栬緫",
- type: "text",
- clickFun: (row) => {
- openForm("edit", row);
- },
- },
- {
- name: "澶勭悊",
- type: "text",
- clickFun: (row) => {
- openInspectionForm("edit", row);
- },
- },
- ],
- },
]);
const tableData = ref([]);
const selectedRows = ref([]);
@@ -200,6 +167,15 @@
const inspectionFormDia = ref()
const { proxy } = getCurrentInstance()
+const changeDaterange = (value) => {
+ searchForm.value.entryDateStart = undefined;
+ searchForm.value.entryDateEnd = undefined;
+ if (value) {
+ searchForm.value.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD");
+ searchForm.value.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD");
+ }
+ getList();
+};
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
@@ -213,7 +189,9 @@
};
const getList = () => {
tableLoading.value = true;
- qualityUnqualifiedListPage({...page, ...searchForm.value}).then(res => {
+ const params = { ...searchForm.value, ...page };
+ params.entryDate = undefined
+ qualityUnqualifiedListPage(params).then(res => {
tableLoading.value = false;
tableData.value = res.data.records
page.total = res.data.total;
@@ -228,12 +206,20 @@
// 鎵撳紑寮规
const openForm = (type, row) => {
+ if (type !== 'add' && row?.inspectState === 1) {
+ proxy.$modal.msgWarning("宸插鐞嗙殑鏁版嵁涓嶈兘鍐嶇紪杈�");
+ return;
+ }
nextTick(() => {
formDia.value?.openDialog(type, row)
})
};
// 鎵撳紑澶勭悊寮规
const openInspectionForm = (type, row) => {
+ if (row?.inspectState === 1) {
+ proxy.$modal.msgWarning("宸插鐞嗙殑鏁版嵁涓嶈兘鍐嶅鐞�");
+ return;
+ }
nextTick(() => {
inspectionFormDia.value?.openDialog(type, row)
})
--
Gitblit v1.9.3