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/processInspection/index.vue | 60 ++++++++++++------------------------------------------------
1 files changed, 12 insertions(+), 48 deletions(-)
diff --git a/src/views/qualityManagement/processInspection/index.vue b/src/views/qualityManagement/processInspection/index.vue
index 85e3811..9fe630a 100644
--- a/src/views/qualityManagement/processInspection/index.vue
+++ b/src/views/qualityManagement/processInspection/index.vue
@@ -2,13 +2,6 @@
<div class="app-container">
<div class="search_form mb20">
<div>
- <span class="search_title">宸ュ簭锛�</span>
- <el-input v-model="searchForm.process"
- style="width: 240px"
- placeholder="璇疯緭鍏ュ伐搴忔悳绱�"
- @change="handleQuery"
- clearable
- :prefix-icon="Search" />
<span style="margin-left: 10px"
class="search_title">妫�娴嬫棩鏈燂細</span>
<el-date-picker v-model="searchForm.entryDate"
@@ -18,14 +11,6 @@
placeholder="璇烽�夋嫨"
clearable
@change="changeDaterange" />
- <span style="margin-left: 10px"
- class="search_title">鐢熶骇宸ュ崟鍙凤細</span>
- <el-input v-model="searchForm.workOrderNo"
- style="width: 240px"
- placeholder="璇疯緭鍏ョ敓浜у伐鍗曞彿鎼滅储"
- @change="handleQuery"
- clearable
- :prefix-icon="Search" />
<el-button type="primary"
@click="handleQuery"
style="margin-left: 10px">鎼滅储</el-button>
@@ -54,6 +39,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%"
@@ -100,6 +88,7 @@
} from "vue";
import InspectionFormDia from "@/views/qualityManagement/processInspection/components/inspectionFormDia.vue";
import FormDia from "@/views/qualityManagement/processInspection/components/formDia.vue";
+ import QuickCheckDia from "@/views/qualityManagement/processInspection/components/quickCheckDia.vue";
import { ElMessageBox } from "element-plus";
import {
downloadQualityInspect,
@@ -107,7 +96,6 @@
qualityInspectListPage,
qualityInspectUpdate,
submitQualityInspect,
- batchQuickInspect,
} from "@/api/qualityManagement/rawMaterialInspection.js";
import FilesDia from "@/views/qualityManagement/processInspection/components/filesDia.vue";
import dayjs from "dayjs";
@@ -116,7 +104,6 @@
const data = reactive({
searchForm: {
- process: "",
entryDate: undefined, // 褰曞叆鏃ユ湡
workOrderNo: "",
entryDateStart: undefined,
@@ -135,13 +122,13 @@
width: 120,
},
{
- label: "宸ュ簭",
- prop: "process",
- width: 230,
- },
- {
label: "妫�楠屽憳",
prop: "checkName",
+ },
+ {
+ label: "閲囪喘鍚堝悓鍙�",
+ prop: "purchaseContractNo",
+ width: 150,
},
{
label: "浜у搧鍚嶇О",
@@ -311,6 +298,7 @@
const formDia = ref();
const filesDia = ref();
const inspectionFormDia = ref();
+ const quickCheckDia = ref();
const { proxy } = getCurrentInstance();
const userStore = useUserStore();
const changeDaterange = value => {
@@ -385,32 +373,8 @@
return;
}
- const totalCount = selectedRows.value.length;
- const submittedCount = totalCount - unSubmittedRows.length;
-
- let confirmMessage = `宸查�夋嫨 ${totalCount} 鏉℃楠屽崟`;
- if (submittedCount > 0) {
- confirmMessage += `锛堝叾涓� ${submittedCount} 鏉″凡鎻愪氦锛屽皢鑷姩璺宠繃锛塦;
- }
- confirmMessage += `\n\n纭鍚庡皢鑷姩锛歕n路 妫�楠岀粨鏋滆涓�"鍚堟牸"\n路 鍚堟牸鏁伴噺璁句负鎬绘暟\n路 涓嶅悎鏍兼暟閲忚涓� 0\n路 鎻愪氦骞跺叆搴揱;
-
- ElMessageBox.confirm(confirmMessage, "蹇�熸楠�", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- dangerouslyUseHTMLString: false,
- })
- .then(() => {
- // 璋冪敤鎵归噺蹇�熸楠屾帴鍙�
- const ids = unSubmittedRows.map(item => item.id);
- batchQuickInspect(ids).then(res => {
- proxy.$modal.msgSuccess(res.msg || "蹇�熸楠屽畬鎴�");
- getList();
- });
- })
- .catch(() => {
- proxy.$modal.msg("宸插彇娑�");
- });
+ const ids = unSubmittedRows.map(item => item.id);
+ quickCheckDia.value?.openDialog(ids, unSubmittedRows);
};
// 鎵撳紑鏂板妫�楠屽脊妗�
--
Gitblit v1.9.3