From a563ea879ef5fb6897e76d2df661e465dce2ab9b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 15:02:27 +0800
Subject: [PATCH] Merge branch 'dev_新疆_大罗素马铃薯new' of http://114.132.189.42:9002/r/product-inventory-management into dev_新疆_大罗素马铃薯new
---
src/views/qualityManagement/finalInspection/index.vue | 63 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index 4a59fa4..88ba755 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -5,16 +5,15 @@
:model="searchForm"
class="demo-form-inline">
<el-row :gutter="20">
- <el-col :span="4">
+ <el-col :span="6">
<el-form-item label="浜у搧鍚嶇О"
prop="productName">
<el-input v-model="searchForm.productName"
- style="width: 240px"
placeholder="璇疯緭鍏ヤ骇鍝佸悕绉版悳绱�"
clearable />
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="妫�娴嬫棩鏈�"
prop="entryDate">
<el-date-picker v-model="searchForm.entryDate"
@@ -26,21 +25,12 @@
@change="changeDaterange" />
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="6">
<el-form-item label="閿�鍞崟鍙�"
prop="salesContractNo">
<el-input v-model="searchForm.salesContractNo"
style="width: 240px"
placeholder="璇疯緭鍏ラ攢鍞崟鍙锋悳绱�"
- clearable />
- </el-form-item>
- </el-col>
- <el-col :span="4">
- <el-form-item label="鐢熶骇宸ュ崟鍙�"
- prop="workOrderNo">
- <el-input v-model="searchForm.workOrderNo"
- style="width: 240px"
- placeholder="璇疯緭鍏ョ敓浜у伐鍗曞彿鎼滅储"
clearable />
</el-form-item>
</el-col>
@@ -55,16 +45,14 @@
</el-col>
</el-row>
</el-form>
- <div class="actions">
- <el-button type="primary"
- @click="openForm('add')">鏂板</el-button>
- <el-button @click="handleOut">瀵煎嚭</el-button>
- <el-button type="danger"
- plain
- @click="handleDelete">鍒犻櫎</el-button>
- </div>
</div>
<div class="table_list">
+ <div style="margin-bottom: 20px; text-align: right;">
+ <el-button type="primary" @click="openQuickCheck">蹇�熸楠�</el-button>
+ <el-button type="primary" @click="openForm('add')">鏂板</el-button>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+ <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+ </div>
<PIMTable rowKey="id"
:column="tableColumn"
:tableData="tableData"
@@ -81,6 +69,9 @@
@close="handleQuery"></FormDia>
<files-dia ref="filesDia"
@close="handleQuery"></files-dia>
+ <QuickCheckDia ref="quickCheckDia"
+ @close="handleQuery"
+ @success="getList"></QuickCheckDia>
<el-dialog v-model="dialogFormVisible"
title="缂栬緫妫�楠屽憳"
width="30%"
@@ -110,6 +101,8 @@
</div>
</template>
</el-dialog>
+
+
</div>
</template>
@@ -125,6 +118,7 @@
} from "vue";
import InspectionFormDia from "@/views/qualityManagement/finalInspection/components/inspectionFormDia.vue";
import FormDia from "@/views/qualityManagement/finalInspection/components/formDia.vue";
+ import QuickCheckDia from "@/views/qualityManagement/finalInspection/components/quickCheckDia.vue";
import { ElMessageBox } from "element-plus";
import {
downloadQualityInspect,
@@ -152,6 +146,7 @@
},
});
const { searchForm } = toRefs(data);
+
const tableColumn = ref([
{
label: "妫�娴嬫棩鏈�",
@@ -161,11 +156,6 @@
{
label: "閿�鍞崟鍙�",
prop: "salesContractNo",
- width: 120,
- },
- {
- label: "鐢熶骇宸ュ崟鍙�",
- prop: "workOrderNo",
width: 120,
},
{
@@ -335,6 +325,7 @@
const formDia = ref();
const filesDia = ref();
const inspectionFormDia = ref();
+ const quickCheckDia = ref();
const { proxy } = getCurrentInstance();
const userStore = useUserStore();
const userList = ref([]);
@@ -399,6 +390,26 @@
formDia.value?.openDialog(type, row);
});
};
+
+ // 鎵撳紑蹇�熸楠岀‘璁ゆ
+ const openQuickCheck = () => {
+ // 妫�鏌ユ槸鍚﹂�夋嫨浜嗘暟鎹�
+ if (!selectedRows.value || selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇峰厛閫夋嫨瑕佹楠岀殑鏁版嵁");
+ return;
+ }
+
+ // 杩囨护鍑烘湭鎻愪氦鐨勬暟鎹�
+ const unSubmittedRows = selectedRows.value.filter(item => item.inspectState !== 1);
+ if (unSubmittedRows.length === 0) {
+ proxy.$modal.msgWarning("閫変腑鐨勬暟鎹凡鍏ㄩ儴鎻愪氦锛屾棤闇�閲嶅妫�楠�");
+ return;
+ }
+
+ const ids = unSubmittedRows.map(item => item.id);
+ quickCheckDia.value?.openDialog(ids, unSubmittedRows);
+ };
+
// 鎵撳紑鏂板妫�楠屽脊妗�
const openInspectionForm = (type, row) => {
nextTick(() => {
--
Gitblit v1.9.3