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 | 73 +++++++++---------------------------
1 files changed, 19 insertions(+), 54 deletions(-)
diff --git a/src/views/qualityManagement/nonconformingManagement/index.vue b/src/views/qualityManagement/nonconformingManagement/index.vue
index 8d635d1..ba6c7a1 100644
--- a/src/views/qualityManagement/nonconformingManagement/index.vue
+++ b/src/views/qualityManagement/nonconformingManagement/index.vue
@@ -4,19 +4,19 @@
<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: 200px" @change="handleQuery">
+ <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: 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
@@ -69,7 +69,7 @@
const data = reactive({
searchForm: {
- inspectType: "",
+ checkType: "",
inspectState: "",
productName: "",
entryDate: undefined, // 褰曞叆鏃ユ湡
@@ -80,49 +80,31 @@
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) {
+ if (params === 0) {
return "鍏ュ巶妫�";
- } else if (params == 1) {
+ } else if (params === 1) {
return "杞﹂棿妫�";
} else {
return '鍑哄巶妫�';
}
},
formatType: (params) => {
- if (params == '涓嶅悎鏍�') {
+ if (params === '涓嶅悎鏍�') {
return "info";
} else if (params == '鍚堟牸') {
return "success";
@@ -147,11 +129,11 @@
label: "鍗曚綅",
prop: "unit",
},
- {
- label: "鏁伴噺",
- prop: "quantity",
- width: 100
- },
+ // {
+ // label: "鏁伴噺",
+ // prop: "quantity",
+ // width: 100
+ // },
{
label: "涓嶅悎鏍肩幇璞�",
prop: "defectivePhenomena",
@@ -171,23 +153,6 @@
label: "澶勭悊鏃ユ湡",
prop: "dealTime",
width: 120
- },
- {
- dataType: "action",
- label: "鎿嶄綔",
- align: "center",
- fixed: "right",
- width: 100,
- operation: [
- {
- name: "澶勭悊",
- type: "text",
- clickFun: (row) => {
- openInspectionForm("edit", row);
- },
- disabled: (row) => row.inspectState === 1,
- },
- ],
},
]);
const tableData = ref([]);
--
Gitblit v1.9.3