From df76c64ca6a49dbff88ea972a68a02ce53ffdbe3 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 04 六月 2026 16:59:17 +0800
Subject: [PATCH] 指标绑定选择产品时，加上工序选择框（过程检、出厂检），支持多选。出厂检验及指标维护给出厂检增加工序字段
---
src/views/qualityManagement/finalInspection/index.vue | 1293 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 686 insertions(+), 607 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index f60ab1c..ea8e698 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -2,50 +2,73 @@
<div class="app-container">
<div class="search_form">
<div>
- <span class="search_title">浜у搧鍚嶇О锛�</span>
- <el-input
- v-model="searchForm.productName"
- 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" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
- placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
- <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
- >鎼滅储</el-button
- >
+ <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-input v-model="searchForm.productName"
+ 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"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ type="daterange"
+ placeholder="璇烽�夋嫨"
+ clearable
+ @change="changeDaterange" />
+ <el-button type="primary"
+ @click="handleQuery"
+ style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
- <el-button type="primary" @click="openForm('add')">鏂板</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>
+ <el-button type="danger"
+ plain
+ @click="handleDelete">鍒犻櫎</el-button>
</div>
</div>
<div class="table_list">
- <PIMTable
- rowKey="id"
- :column="tableColumn"
- :tableData="tableData"
- :page="page"
- :isSelection="true"
- @selection-change="handleSelectionChange"
- :tableLoading="tableLoading"
- @pagination="pagination"
- :total="page.total"
- ></PIMTable>
+ <PIMTable rowKey="id"
+ :column="tableColumn"
+ :tableData="tableData"
+ :page="page"
+ :isSelection="true"
+ @selection-change="handleSelectionChange"
+ :tableLoading="tableLoading"
+ @pagination="pagination"
+ :total="page.total"></PIMTable>
</div>
- <InspectionFormDia ref="inspectionFormDia" @close="handleQuery"></InspectionFormDia>
- <FormDia ref="formDia" @close="handleQuery"></FormDia>
- <files-dia ref="filesDia" @close="handleQuery"></files-dia>
+ <InspectionFormDia ref="inspectionFormDia"
+ @close="handleQuery"></InspectionFormDia>
+ <FormDia ref="formDia"
+ @close="handleQuery"></FormDia>
+ <files-dia ref="filesDia"
+ @close="handleQuery"></files-dia>
<!-- 妫�楠岀粨鏋滈�夋嫨瀵硅瘽妗� -->
- <el-dialog v-model="quickCheckVisible" title="妫�楠�" width="40%" @close="closeQuickCheck">
- <el-form :model="quickCheckForm" label-width="140px" label-position="top" ref="quickCheckRef">
+ <el-dialog v-model="quickCheckVisible"
+ title="妫�楠�"
+ width="40%"
+ @close="closeQuickCheck">
+ <el-form :model="quickCheckForm"
+ label-width="140px"
+ label-position="top"
+ ref="quickCheckRef">
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="妫�娴嬬粨鏋滐細" required>
+ <el-form-item label="妫�娴嬬粨鏋滐細"
+ required>
<el-radio-group v-model="quickCheckForm.checkResult">
<el-radio value="鍚堟牸">鍚堟牸</el-radio>
<el-radio value="涓嶅悎鏍�">涓嶅悎鏍�</el-radio>
@@ -53,42 +76,44 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="妫�楠屽憳锛�" required>
- <el-select v-model="quickCheckForm.checkName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
+ <el-form-item label="妫�楠屽憳锛�"
+ required>
+ <el-select v-model="quickCheckForm.checkName"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 100%">
+ <el-option v-for="item in userList"
+ :key="item.nickName"
+ :label="item.nickName"
+ :value="item.nickName" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="妫�娴嬫棩鏈燂細" required>
- <el-date-picker
- v-model="quickCheckForm.checkTime"
- type="date"
- placeholder="璇烽�夋嫨鏃ユ湡"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- clearable
- style="width: 100%"
- />
+ <el-form-item label="妫�娴嬫棩鏈燂細"
+ required>
+ <el-date-picker v-model="quickCheckForm.checkTime"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎸囨爣閫夋嫨锛�">
- <el-select
- v-model="quickCheckForm.testStandardId"
- placeholder="璇烽�夋嫨鎸囨爣"
- clearable
- @change="handleTestStandardChange"
- style="width: 100%"
- >
- <el-option
- v-for="item in testStandardOptions"
- :key="item.id"
- :label="item.standardName || item.standardNo"
- :value="item.id"
- />
+ <el-select v-model="quickCheckForm.testStandardId"
+ placeholder="璇烽�夋嫨鎸囨爣"
+ clearable
+ @change="handleTestStandardChange"
+ style="width: 100%">
+ <el-option v-for="item in testStandardOptions"
+ :key="item.id"
+ :label="item.standardName || item.standardNo"
+ :value="item.id" />
</el-select>
</el-form-item>
</el-col>
@@ -96,344 +121,380 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="妫�娴嬪崟浣嶏細">
- <el-input v-model="quickCheckForm.checkCompany" placeholder="璇疯緭鍏�" clearable style="width: 100%"/>
+ <el-input v-model="quickCheckForm.checkCompany"
+ placeholder="璇疯緭鍏�"
+ clearable
+ style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
<!-- 妫�楠屽�艰〃鏍� -->
- <el-form-item label="妫�楠屽�硷細" v-if="quickCheckTableData.length > 0">
- <PIMTable
- rowKey="id"
- :column="quickCheckTableColumn"
- :tableData="quickCheckTableData"
- :tableLoading="quickCheckTableLoading"
- height="200"
- >
+ <el-form-item label="妫�楠屽�硷細"
+ v-if="quickCheckTableData.length > 0">
+ <PIMTable rowKey="id"
+ :column="quickCheckTableColumn"
+ :tableData="quickCheckTableData"
+ :tableLoading="quickCheckTableLoading"
+ height="200">
<template #slot="{ row }">
- <el-input v-model="row.testValue" clearable placeholder="璇疯緭鍏ユ楠屽��"/>
+ <el-input v-model="row.testValue"
+ clearable
+ placeholder="璇疯緭鍏ユ楠屽��" />
</template>
</PIMTable>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" @click="handleQuickCheckConfirm">纭</el-button>
+ <el-button type="primary"
+ @click="handleQuickCheckConfirm">纭</el-button>
<el-button @click="closeQuickCheck">鍙栨秷</el-button>
</div>
</template>
</el-dialog>
- <el-dialog v-model="dialogFormVisible" title="缂栬緫妫�楠屽憳" width="30%"
- @close="closeDia">
- <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
- <el-form-item label="妫�楠屽憳锛�" prop="checkName">
- <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
- :value="item.nickName"/>
- </el-select>
- </el-form-item>
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭</el-button>
- <el-button @click="closeDia">鍙栨秷</el-button>
- </div>
- </template>
- </el-dialog>
+ <el-dialog v-model="dialogFormVisible"
+ title="缂栬緫妫�楠屽憳"
+ width="30%"
+ @close="closeDia">
+ <el-form :model="form"
+ label-width="140px"
+ label-position="top"
+ :rules="rules"
+ ref="formRef">
+ <el-form-item label="妫�楠屽憳锛�"
+ prop="checkName">
+ <el-select v-model="form.checkName"
+ placeholder="璇烽�夋嫨"
+ clearable>
+ <el-option v-for="item in userList"
+ :key="item.nickName"
+ :label="item.nickName"
+ :value="item.nickName" />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary"
+ @click="submitForm">纭</el-button>
+ <el-button @click="closeDia">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
</div>
</template>
<script setup>
-import { Search } from "@element-plus/icons-vue";
-import {onMounted, ref, reactive, toRefs, getCurrentInstance, nextTick} from "vue";
-import InspectionFormDia from "@/views/qualityManagement/finalInspection/components/inspectionFormDia.vue";
-import FormDia from "@/views/qualityManagement/finalInspection/components/formDia.vue";
-import {ElMessageBox} from "element-plus";
-import {
- downloadQualityInspect,
- qualityInspectDel,
- qualityInspectDetail,
- qualityInspectListPage, qualityInspectUpdate,
- submitQualityInspect,
- qualityInspectExportNew
-} from "@/api/qualityManagement/rawMaterialInspection.js";
-import {qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId} from "@/api/qualityManagement/metricMaintenance.js";
-import FilesDia from "@/views/qualityManagement/finalInspection/components/filesDia.vue";
-import dayjs from "dayjs";
-import {userListNoPage} from "@/api/system/user.js";
-import useUserStore from "@/store/modules/user";
+ import { Search } from "@element-plus/icons-vue";
+ import {
+ onMounted,
+ ref,
+ reactive,
+ toRefs,
+ getCurrentInstance,
+ nextTick,
+ } from "vue";
+ import InspectionFormDia from "@/views/qualityManagement/finalInspection/components/inspectionFormDia.vue";
+ import FormDia from "@/views/qualityManagement/finalInspection/components/formDia.vue";
+ import { ElMessageBox } from "element-plus";
+ import {
+ downloadQualityInspect,
+ qualityInspectDel,
+ qualityInspectDetail,
+ qualityInspectListPage,
+ qualityInspectUpdate,
+ submitQualityInspect,
+ qualityInspectExportNew,
+ } from "@/api/qualityManagement/rawMaterialInspection.js";
+ import {
+ qualityInspectDetailByProductId,
+ getQualityTestStandardParamByTestStandardId,
+ } from "@/api/qualityManagement/metricMaintenance.js";
+ import FilesDia from "@/views/qualityManagement/finalInspection/components/filesDia.vue";
+ import dayjs from "dayjs";
+ import { userListNoPage } from "@/api/system/user.js";
+ import useUserStore from "@/store/modules/user";
-const data = reactive({
- searchForm: {
- productName: "",
- entryDate: undefined, // 褰曞叆鏃ユ湡
- entryDateStart: undefined,
- entryDateEnd: undefined,
- },
- rules: {
- checkName: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
- },
-});
-const { searchForm } = toRefs(data);
-const tableColumn = ref([
- {
- label: "妫�娴嬫棩鏈�",
- prop: "checkTime",
- width: 120
- },
- {
- label: "鐢熶骇宸ュ崟鍙�",
- prop: "workOrderNo",
- width: 120
- },
- {
- label: "妫�楠屽憳",
- prop: "checkName",
- },
- {
- label: "浜у搧鍚嶇О",
- prop: "productName",
- },
- {
- label: "瑙勬牸鍨嬪彿",
- prop: "model",
- },
- {
- label: "鍗曚綅",
- prop: "unit",
- },
- {
- label: "鏁伴噺",
- prop: "quantity",
- width: 100
- },
- {
- label: "妫�娴嬪崟浣�",
- prop: "checkCompany",
- width: 120
- },
- {
- label: "妫�娴嬬粨鏋�",
- prop: "checkResult",
- dataType: "tag",
- formatType: (params) => {
- if (params == '涓嶅悎鏍�') {
- return "danger";
- } else if (params == '鍚堟牸') {
- return "success";
- } else {
- return null;
- }
+ const data = reactive({
+ searchForm: {
+ process: "",
+ productName: "",
+ entryDate: undefined, // 褰曞叆鏃ユ湡
+ entryDateStart: undefined,
+ entryDateEnd: undefined,
},
- },
- {
- label: "鎻愪氦鐘舵��",
- prop: "inspectState",
- formatData: (params) => {
- if (params) {
- return "宸叉彁浜�";
- } else {
- return "鏈彁浜�";
- }
- },
- },
- {
- dataType: "action",
- label: "鎿嶄綔",
- align: "center",
- fixed: "right",
- width: 280,
- operation: [
- {
- name: "妫�楠�",
- type: "text",
- clickFun: (row) => {
- openQuickCheck(row);
- },
- disabled: (row) => {
- // 宸叉彁浜ゅ垯绂佺敤
- if (row.inspectState == 1) return true;
- // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳界紪杈�
- if (row.checkName) {
- return row.checkName !== userStore.nickName;
- }
- return false;
- }
+ rules: {
+ checkName: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ },
+ });
+ const { searchForm } = toRefs(data);
+ const tableColumn = ref([
+ {
+ label: "妫�娴嬫棩鏈�",
+ prop: "checkTime",
+ width: 120,
+ },
+ {
+ label: "鐢熶骇宸ュ崟鍙�",
+ prop: "workOrderNo",
+ width: 120,
+ },
+ {
+ label: "宸ュ簭",
+ prop: "process",
+ width: 230,
+ },
+ {
+ label: "妫�楠屽憳",
+ prop: "checkName",
+ },
+ {
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
+ },
+ {
+ label: "瑙勬牸鍨嬪彿",
+ prop: "model",
+ },
+ {
+ label: "鍗曚綅",
+ prop: "unit",
+ },
+ {
+ label: "鏁伴噺",
+ prop: "quantity",
+ width: 100,
+ },
+ {
+ label: "妫�娴嬪崟浣�",
+ prop: "checkCompany",
+ width: 120,
+ },
+ {
+ label: "妫�娴嬬粨鏋�",
+ prop: "checkResult",
+ dataType: "tag",
+ formatType: params => {
+ if (params == "涓嶅悎鏍�") {
+ return "danger";
+ } else if (params == "鍚堟牸") {
+ return "success";
+ } else {
+ return null;
+ }
},
- {
- name: "闄勪欢",
- type: "text",
- clickFun: (row) => {
- openFilesFormDia(row);
- },
+ },
+ {
+ label: "鎻愪氦鐘舵��",
+ prop: "inspectState",
+ formatData: params => {
+ if (params) {
+ return "宸叉彁浜�";
+ } else {
+ return "鏈彁浜�";
+ }
},
- {
- name: "鎻愪氦",
- type: "text",
- clickFun: (row) => {
- submit(row.id);
- },
- disabled: (row) => {
- // 宸叉彁浜ゅ垯绂佺敤
- if (row.inspectState == 1) return true;
- // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳芥彁浜�
- if (row.checkName) {
- return row.checkName !== userStore.nickName;
- }
- return false;
- }
- },
- {
- name: "鍒嗛厤妫�楠屽憳",
- type: "text",
- clickFun: (row) => {
- if (!row.checkName) {
- open(row)
- } else {
- proxy.$modal.msgError("妫�楠屽憳宸插瓨鍦�");
- }
- },
- disabled: (row) => {
- return row.inspectState == 1 || row.checkName;
- }
- },
- {
- name: "涓嬭浇",
- type: "text",
- clickFun: (row) => {
- downLoadFile(row);
- },
- },
- ],
- },
-]);
-const tableData = ref([]);
-const selectedRows = ref([]);
-const tableLoading = ref(false);
-const currentRow = ref(null)
-const page = reactive({
- current: 1,
- size: 100,
- total: 0
-});
-const formDia = ref()
-const filesDia = ref()
-const inspectionFormDia = ref()
-const { proxy } = getCurrentInstance()
-const userStore = useUserStore()
-const userList = ref([]);
-const form = ref({
- checkName: ""
-});
-const dialogFormVisible = ref(false);
-const quickCheckVisible = ref(false);
-const quickCheckForm = ref({
- checkResult: "鍚堟牸",
- checkName: "",
- checkTime: "",
- testStandardId: "",
- checkCompany: ""
-});
-const quickCheckRef = ref(null);
-const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
-const quickCheckTableColumn = ref([
- {
- label: "鎸囨爣",
- prop: "parameterItem",
- },
- {
- label: "鍗曚綅",
- prop: "unit",
- },
- {
- label: "鏍囧噯鍊�",
- prop: "standardValue",
- },
- {
- label: "鍐呮帶鍊�",
- prop: "controlValue",
- },
- {
- label: "妫�楠屽��",
- prop: "testValue",
- dataType: 'slot',
- slot: 'slot',
- },
-]);
-const quickCheckTableData = ref([]);
-const quickCheckTableLoading = ref(false);
+ },
+ {
+ dataType: "action",
+ label: "鎿嶄綔",
+ align: "center",
+ fixed: "right",
+ width: 280,
+ operation: [
+ {
+ name: "妫�楠�",
+ type: "text",
+ clickFun: row => {
+ openQuickCheck(row);
+ },
+ disabled: row => {
+ // 宸叉彁浜ゅ垯绂佺敤
+ if (row.inspectState == 1) return true;
+ // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳界紪杈�
+ if (row.checkName) {
+ return row.checkName !== userStore.nickName;
+ }
+ return false;
+ },
+ },
+ {
+ name: "闄勪欢",
+ type: "text",
+ clickFun: row => {
+ openFilesFormDia(row);
+ },
+ },
+ {
+ name: "鎻愪氦",
+ type: "text",
+ clickFun: row => {
+ submit(row.id);
+ },
+ disabled: row => {
+ // 宸叉彁浜ゅ垯绂佺敤
+ if (row.inspectState == 1) return true;
+ // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳芥彁浜�
+ if (row.checkName) {
+ return row.checkName !== userStore.nickName;
+ }
+ return false;
+ },
+ },
+ {
+ name: "鍒嗛厤妫�楠屽憳",
+ type: "text",
+ clickFun: row => {
+ if (!row.checkName) {
+ open(row);
+ } else {
+ proxy.$modal.msgError("妫�楠屽憳宸插瓨鍦�");
+ }
+ },
+ disabled: row => {
+ return row.inspectState == 1 || row.checkName;
+ },
+ },
+ {
+ name: "涓嬭浇",
+ type: "text",
+ clickFun: row => {
+ downLoadFile(row);
+ },
+ },
+ ],
+ },
+ ]);
+ const tableData = ref([]);
+ const selectedRows = ref([]);
+ const tableLoading = ref(false);
+ const currentRow = ref(null);
+ const page = reactive({
+ current: 1,
+ size: 100,
+ total: 0,
+ });
+ const formDia = ref();
+ const filesDia = ref();
+ const inspectionFormDia = ref();
+ const { proxy } = getCurrentInstance();
+ const userStore = useUserStore();
+ const userList = ref([]);
+ const form = ref({
+ checkName: "",
+ });
+ const dialogFormVisible = ref(false);
+ const quickCheckVisible = ref(false);
+ const quickCheckForm = ref({
+ checkResult: "鍚堟牸",
+ checkName: "",
+ checkTime: "",
+ testStandardId: "",
+ checkCompany: "",
+ });
+ const quickCheckRef = ref(null);
+ const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
+ const quickCheckTableColumn = ref([
+ {
+ label: "鎸囨爣",
+ prop: "parameterItem",
+ },
+ {
+ label: "鍗曚綅",
+ prop: "unit",
+ },
+ {
+ label: "鏍囧噯鍊�",
+ prop: "standardValue",
+ },
+ {
+ label: "鍐呮帶鍊�",
+ prop: "controlValue",
+ },
+ {
+ label: "妫�楠屽��",
+ prop: "testValue",
+ dataType: "slot",
+ slot: "slot",
+ },
+ ]);
+ const quickCheckTableData = ref([]);
+ const quickCheckTableLoading = ref(false);
-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 = () => {
- page.current = 1;
- getList();
-};
-const pagination = (obj) => {
- page.current = obj.page;
- page.size = obj.limit;
- getList();
-};
-const getList = () => {
- tableLoading.value = true;
- const params = { ...searchForm.value, ...page };
- params.entryDate = undefined
- qualityInspectListPage({...params, inspectType: 2}).then(res => {
- tableLoading.value = false;
- tableData.value = res.data.records
- page.total = res.data.total;
- }).catch(err => {
- tableLoading.value = false;
- })
-};
-// 琛ㄦ牸閫夋嫨鏁版嵁
-const handleSelectionChange = (selection) => {
- selectedRows.value = selection;
-};
+ 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 = () => {
+ page.current = 1;
+ getList();
+ };
+ const pagination = obj => {
+ page.current = obj.page;
+ page.size = obj.limit;
+ getList();
+ };
+ const getList = () => {
+ tableLoading.value = true;
+ const params = { ...searchForm.value, ...page };
+ params.entryDate = undefined;
+ qualityInspectListPage({ ...params, inspectType: 2 })
+ .then(res => {
+ tableLoading.value = false;
+ tableData.value = res.data.records;
+ page.total = res.data.total;
+ })
+ .catch(err => {
+ tableLoading.value = false;
+ });
+ };
+ // 琛ㄦ牸閫夋嫨鏁版嵁
+ const handleSelectionChange = selection => {
+ selectedRows.value = selection;
+ };
-// 鎵撳紑寮规
-const openForm = (type, row) => {
- nextTick(() => {
- formDia.value?.openDialog(type, row)
- })
-};
-// 鎵撳紑鏂板妫�楠屽脊妗�
-const openInspectionForm = (type, row) => {
- nextTick(() => {
- inspectionFormDia.value?.openDialog(type, row)
- })
-};
-// 鎵撳紑闄勪欢寮规
-const openFilesFormDia = (type, row) => {
- nextTick(() => {
- filesDia.value?.openDialog(type, row)
- })
-};
+ // 鎵撳紑寮规
+ const openForm = (type, row) => {
+ nextTick(() => {
+ formDia.value?.openDialog(type, row);
+ });
+ };
+ // 鎵撳紑鏂板妫�楠屽脊妗�
+ const openInspectionForm = (type, row) => {
+ nextTick(() => {
+ inspectionFormDia.value?.openDialog(type, row);
+ });
+ };
+ // 鎵撳紑闄勪欢寮规
+ const openFilesFormDia = (type, row) => {
+ nextTick(() => {
+ filesDia.value?.openDialog(type, row);
+ });
+ };
-// 鍒犻櫎
-const handleDelete = () => {
- let ids = [];
- if (selectedRows.value.length > 0) {
- ids = selectedRows.value.map((item) => item.id);
- } else {
- proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
- return;
- }
- ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
+ // 鍒犻櫎
+ const handleDelete = () => {
+ let ids = [];
+ if (selectedRows.value.length > 0) {
+ ids = selectedRows.value.map(item => item.id);
+ } else {
+ proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
.then(() => {
- qualityInspectDel(ids).then((res) => {
+ qualityInspectDel(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
getList();
});
@@ -441,258 +502,276 @@
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
});
-};
-// 瀵煎嚭
-const handleOut = () => {
- // 鍒ゆ柇鏄惁鏈夐�変腑鏁版嵁
- const hasSelected = selectedRows.value.length > 0;
+ };
+ // 瀵煎嚭
+ const handleOut = () => {
+ // 鍒ゆ柇鏄惁鏈夐�変腑鏁版嵁
+ const hasSelected = selectedRows.value.length > 0;
- const confirmMsg = hasSelected
- ? "閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�"
- : "灏嗗鍑哄叏閮ㄦ暟鎹紝鏄惁纭瀵煎嚭锛�";
+ const confirmMsg = hasSelected
+ ? "閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�"
+ : "灏嗗鍑哄叏閮ㄦ暟鎹紝鏄惁纭瀵煎嚭锛�";
- ElMessageBox.confirm(confirmMsg, "瀵煎嚭", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
- .then(() => {
- // 鏋勫缓瀵煎嚭鍙傛暟
- const exportData = {
- inspectType: 2,
- productName: searchForm.value.productName || "",
- entryDateStart: searchForm.value.entryDateStart || "",
- entryDateEnd: searchForm.value.entryDateEnd || "",
- };
+ ElMessageBox.confirm(confirmMsg, "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ // 鏋勫缓瀵煎嚭鍙傛暟
+ const exportData = {
+ inspectType: 2,
+ process: searchForm.value.process || "",
+ productName: searchForm.value.productName || "",
+ entryDateStart: searchForm.value.entryDateStart || "",
+ entryDateEnd: searchForm.value.entryDateEnd || "",
+ };
- // 濡傛灉鏈夐�変腑鏁版嵁锛屾坊鍔爄ds
- if (hasSelected) {
- exportData.ids = selectedRows.value.map(item => item.id);
- }
+ // 濡傛灉鏈夐�変腑鏁版嵁锛屾坊鍔爄ds
+ if (hasSelected) {
+ exportData.ids = selectedRows.value.map(item => item.id);
+ }
- // 璋冪敤鏂板鍑烘帴鍙�
- qualityInspectExportNew(exportData).then((blobData) => {
- const blob = new Blob([blobData], {
- type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
- });
- const downloadUrl = window.URL.createObjectURL(blob);
- const link = document.createElement('a');
- link.href = downloadUrl;
- link.download = '鍑哄巶妫�楠�.xlsx';
- document.body.appendChild(link);
- link.click();
- document.body.removeChild(link);
- window.URL.revokeObjectURL(downloadUrl);
- }).catch((error) => {
- proxy.$modal.msgError("瀵煎嚭澶辫触");
- });
- })
- .catch(() => {
- proxy.$modal.msg("宸插彇娑�");
- });
-};
+ // 璋冪敤鏂板鍑烘帴鍙�
+ qualityInspectExportNew(exportData)
+ .then(blobData => {
+ const blob = new Blob([blobData], {
+ type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ });
+ const downloadUrl = window.URL.createObjectURL(blob);
+ const link = document.createElement("a");
+ link.href = downloadUrl;
+ link.download = "鍑哄巶妫�楠�.xlsx";
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ window.URL.revokeObjectURL(downloadUrl);
+ })
+ .catch(error => {
+ proxy.$modal.msgError("瀵煎嚭澶辫触");
+ });
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+ };
-// 鎻愪环
-const submit = async (id) => {
- const res = await submitQualityInspect({id: id})
- if (res.code === 200) {
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- getList();
- }
-}
+ // 鎻愪环
+ const submit = async id => {
+ const res = await submitQualityInspect({ id: id });
+ if (res.code === 200) {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ getList();
+ }
+ };
-// 鍏抽棴寮规
-const closeDia = () => {
- proxy.resetForm("formRef");
- dialogFormVisible.value = false;
-};
+ // 鍏抽棴寮规
+ const closeDia = () => {
+ proxy.resetForm("formRef");
+ dialogFormVisible.value = false;
+ };
-const submitForm = () => {
- if (currentRow.value) {
- const data = {
- ...form.value,
- id: currentRow.value.id
- }
- qualityInspectUpdate(data).then(res => {
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- closeDia();
- getList();
- })
- }
-};
+ const submitForm = () => {
+ if (currentRow.value) {
+ const data = {
+ ...form.value,
+ id: currentRow.value.id,
+ };
+ qualityInspectUpdate(data).then(res => {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ closeDia();
+ getList();
+ });
+ }
+ };
-const open = async (row) => {
- let userLists = await userListNoPage();
- // 绛涢�� roleIds 鍖呭惈 106 鐨勭敤鎴�
- userList.value = (userLists.data || []).filter(user => {
- const roleIds = user.roleIds || [];
- return roleIds.includes(106) || roleIds.includes('106');
- });
- currentRow.value = row
- dialogFormVisible.value = true
-}
+ const open = async row => {
+ let userLists = await userListNoPage();
+ // 绛涢�� roleIds 鍖呭惈 106 鐨勭敤鎴�
+ userList.value = (userLists.data || []).filter(user => {
+ const roleIds = user.roleIds || [];
+ return roleIds.includes(106) || roleIds.includes("106");
+ });
+ currentRow.value = row;
+ dialogFormVisible.value = true;
+ };
-const downLoadFile = (row) => {
- downloadQualityInspect({ id: row.id }).then((blobData) => {
- const blob = new Blob([blobData], {
- type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- })
- const downloadUrl = window.URL.createObjectURL(blob)
+ const downLoadFile = row => {
+ downloadQualityInspect({ id: row.id }).then(blobData => {
+ const blob = new Blob([blobData], {
+ type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+ });
+ const downloadUrl = window.URL.createObjectURL(blob);
- const link = document.createElement('a')
- link.href = downloadUrl
- link.download = '鍑哄巶妫�楠屾姤鍛�.docx'
- document.body.appendChild(link)
- link.click()
+ const link = document.createElement("a");
+ link.href = downloadUrl;
+ link.download = "鍑哄巶妫�楠屾姤鍛�.docx";
+ document.body.appendChild(link);
+ link.click();
- document.body.removeChild(link)
- window.URL.revokeObjectURL(downloadUrl)
- })
-};
+ document.body.removeChild(link);
+ window.URL.revokeObjectURL(downloadUrl);
+ });
+ };
-// 鎵撳紑妫�楠岀粨鏋滈�夋嫨瀵硅瘽妗�
-const openQuickCheck = async (row) => {
- // 鍏堣皟鐢ㄨ鎯呮帴鍙ｈ幏鍙栧畬鏁存暟鎹紙鍖呭惈鎸囨爣鍜屾楠屽�硷級
- let detailData = row;
- try {
- const detailRes = await qualityInspectDetail(row.id);
- if (detailRes.code === 200 && detailRes.data) {
- detailData = detailRes.data;
- }
- } catch (e) {
- console.error("鑾峰彇妫�楠岃鎯呭け璐�", e);
- }
- currentRow.value = detailData;
+ // 鎵撳紑妫�楠岀粨鏋滈�夋嫨瀵硅瘽妗�
+ const openQuickCheck = async row => {
+ // 鍏堣皟鐢ㄨ鎯呮帴鍙ｈ幏鍙栧畬鏁存暟鎹紙鍖呭惈鎸囨爣鍜屾楠屽�硷級
+ let detailData = row;
+ try {
+ const detailRes = await qualityInspectDetail(row.id);
+ if (detailRes.code === 200 && detailRes.data) {
+ detailData = detailRes.data;
+ }
+ } catch (e) {
+ console.error("鑾峰彇妫�楠岃鎯呭け璐�", e);
+ }
+ currentRow.value = detailData;
- // 鍔犺浇鐢ㄦ埛鍒楄〃锛岀瓫閫� roleIds 鍖呭惈 106 鐨勭敤鎴�
- try {
- const userLists = await userListNoPage();
- userList.value = (userLists.data || []).filter(user => {
- const roleIds = user.roleIds || [];
- return roleIds.includes(106) || roleIds.includes('106');
- });
- } catch (e) {
- console.error("鍔犺浇妫�楠屽憳鍒楄〃澶辫触", e);
- userList.value = [];
- }
- // 鍔犺浇鎸囨爣閫夐」锛堟牴鎹骇鍝両D锛�
- if (detailData.productId) {
- try {
- const params = {
- productId: detailData.productId,
- inspectType: 2
- };
- const res = await qualityInspectDetailByProductId(params);
- testStandardOptions.value = res.data || [];
- } catch (e) {
- console.error("鍔犺浇鎸囨爣閫夐」澶辫触", e);
- testStandardOptions.value = [];
- }
- } else {
- testStandardOptions.value = [];
- }
- // 璁剧疆榛樿鍊硷紙浼樺厛浣跨敤璇︽儏鏁版嵁锛屾楠屽憳榛樿涓哄綋鍓嶇櫥褰曠敤鎴凤級
- quickCheckForm.value = {
- checkResult: detailData.checkResult || "鍚堟牸",
- checkName: detailData.checkName || userStore.nickName || "",
- checkTime: detailData.checkTime || dayjs().format("YYYY-MM-DD"),
- testStandardId: detailData.testStandardId || "",
- checkCompany: detailData.checkCompany || ""
- };
- // 濡傛灉鏈夋楠屽弬鏁版暟鎹紝鍥炴樉鍒拌〃鏍�
- if (detailData.qualityInspectParams && detailData.qualityInspectParams.length > 0) {
- quickCheckTableData.value = detailData.qualityInspectParams;
- } else {
- quickCheckTableData.value = [];
- }
- quickCheckVisible.value = true;
-};
+ // 鍔犺浇鐢ㄦ埛鍒楄〃锛岀瓫閫� roleIds 鍖呭惈 106 鐨勭敤鎴�
+ try {
+ const userLists = await userListNoPage();
+ userList.value = (userLists.data || []).filter(user => {
+ const roleIds = user.roleIds || [];
+ return roleIds.includes(106) || roleIds.includes("106");
+ });
+ } catch (e) {
+ console.error("鍔犺浇妫�楠屽憳鍒楄〃澶辫触", e);
+ userList.value = [];
+ }
+ // 鍔犺浇鎸囨爣閫夐」锛堟牴鎹骇鍝両D锛�
+ if (detailData.productId) {
+ try {
+ const params = {
+ productId: detailData.productId,
+ inspectType: 2,
+ process: detailData.process || "",
+ };
+ const res = await qualityInspectDetailByProductId(params);
+ testStandardOptions.value = res.data || [];
+ } catch (e) {
+ console.error("鍔犺浇鎸囨爣閫夐」澶辫触", e);
+ testStandardOptions.value = [];
+ }
+ } else {
+ testStandardOptions.value = [];
+ }
+ // 璁剧疆榛樿鍊硷紙浼樺厛浣跨敤璇︽儏鏁版嵁锛屾楠屽憳榛樿涓哄綋鍓嶇櫥褰曠敤鎴凤級
+ quickCheckForm.value = {
+ checkResult: detailData.checkResult || "鍚堟牸",
+ checkName: detailData.checkName || userStore.nickName || "",
+ checkTime: detailData.checkTime || dayjs().format("YYYY-MM-DD"),
+ testStandardId: detailData.testStandardId || "",
+ checkCompany: detailData.checkCompany || "",
+ };
+ // 濡傛灉鏈夋楠屽弬鏁版暟鎹紝鍥炴樉鍒拌〃鏍�
+ if (
+ detailData.qualityInspectParams &&
+ detailData.qualityInspectParams.length > 0
+ ) {
+ quickCheckTableData.value = detailData.qualityInspectParams;
+ } else {
+ quickCheckTableData.value = [];
+ }
+ quickCheckVisible.value = true;
+ };
-// 鎸囨爣閫夋嫨鍙樺寲澶勭悊
-const handleTestStandardChange = (testStandardId) => {
- if (!testStandardId) {
+ // 鎸囨爣閫夋嫨鍙樺寲澶勭悊
+ const handleTestStandardChange = testStandardId => {
+ if (!testStandardId) {
+ quickCheckTableData.value = [];
+ return;
+ }
+ quickCheckTableLoading.value = true;
+ getQualityTestStandardParamByTestStandardId(testStandardId)
+ .then(res => {
+ quickCheckTableData.value = res.data || [];
+ })
+ .catch(error => {
+ console.error("鑾峰彇鏍囧噯鍙傛暟澶辫触:", error);
+ quickCheckTableData.value = [];
+ })
+ .finally(() => {
+ quickCheckTableLoading.value = false;
+ });
+ };
+
+ // 鍏抽棴妫�楠岀粨鏋滈�夋嫨瀵硅瘽妗�
+ const closeQuickCheck = () => {
+ quickCheckVisible.value = false;
+ quickCheckForm.value = {
+ checkResult: "鍚堟牸",
+ checkName: "",
+ checkTime: "",
+ testStandardId: "",
+ checkCompany: "",
+ };
quickCheckTableData.value = [];
- return;
- }
- quickCheckTableLoading.value = true;
- getQualityTestStandardParamByTestStandardId(testStandardId).then(res => {
- quickCheckTableData.value = res.data || [];
- }).catch(error => {
- console.error('鑾峰彇鏍囧噯鍙傛暟澶辫触:', error);
- quickCheckTableData.value = [];
- }).finally(() => {
- quickCheckTableLoading.value = false;
+ testStandardOptions.value = [];
+ };
+
+ // 纭妫�楠岀粨鏋�
+ const handleQuickCheckConfirm = () => {
+ if (!quickCheckForm.value.checkResult) {
+ proxy.$modal.msgWarning("璇烽�夋嫨妫�娴嬬粨鏋�");
+ return;
+ }
+ if (!quickCheckForm.value.checkName) {
+ proxy.$modal.msgWarning("璇烽�夋嫨妫�楠屽憳");
+ return;
+ }
+ if (!quickCheckForm.value.checkTime) {
+ proxy.$modal.msgWarning("璇烽�夋嫨妫�娴嬫棩鏈�");
+ return;
+ }
+
+ const checkNameToPass = quickCheckForm.value.checkName;
+ const checkResultToPass = quickCheckForm.value.checkResult;
+ const checkTimeToPass = quickCheckForm.value.checkTime;
+ const testStandardIdToPass = quickCheckForm.value.testStandardId;
+ const checkCompanyToPass = quickCheckForm.value.checkCompany;
+ const qualityInspectParamsToPass = [...quickCheckTableData.value];
+
+ if (quickCheckForm.value.checkResult === "鍚堟牸") {
+ // 鍚堟牸锛氱洿鎺ユ彁浜�
+ const data = {
+ id: currentRow.value.id,
+ checkResult: "鍚堟牸",
+ checkName: checkNameToPass,
+ checkTime: checkTimeToPass,
+ testStandardId: testStandardIdToPass,
+ checkCompany: checkCompanyToPass,
+ inspectType: 2,
+ qualityInspectParams: qualityInspectParamsToPass,
+ };
+ qualityInspectUpdate(data).then(res => {
+ proxy.$modal.msgSuccess("妫�楠屾垚鍔�");
+ closeQuickCheck();
+ getList();
+ });
+ } else {
+ // 涓嶅悎鏍硷細鎵撳紑璇︾粏濉啓椤甸潰
+ closeQuickCheck();
+ nextTick(() => {
+ currentRow.value.checkTime = checkTimeToPass;
+ currentRow.value.checkCompany = checkCompanyToPass;
+ currentRow.value.testStandardId = testStandardIdToPass;
+ formDia.value?.openDialog(
+ "edit",
+ currentRow.value,
+ checkResultToPass,
+ checkNameToPass,
+ testStandardIdToPass,
+ checkCompanyToPass,
+ qualityInspectParamsToPass
+ );
+ });
+ }
+ };
+
+ onMounted(() => {
+ getList();
});
-};
-
-// 鍏抽棴妫�楠岀粨鏋滈�夋嫨瀵硅瘽妗�
-const closeQuickCheck = () => {
- quickCheckVisible.value = false;
- quickCheckForm.value = {
- checkResult: "鍚堟牸",
- checkName: "",
- checkTime: "",
- testStandardId: "",
- checkCompany: ""
- };
- quickCheckTableData.value = [];
- testStandardOptions.value = [];
-};
-
-// 纭妫�楠岀粨鏋�
-const handleQuickCheckConfirm = () => {
- if (!quickCheckForm.value.checkResult) {
- proxy.$modal.msgWarning("璇烽�夋嫨妫�娴嬬粨鏋�");
- return;
- }
- if (!quickCheckForm.value.checkName) {
- proxy.$modal.msgWarning("璇烽�夋嫨妫�楠屽憳");
- return;
- }
- if (!quickCheckForm.value.checkTime) {
- proxy.$modal.msgWarning("璇烽�夋嫨妫�娴嬫棩鏈�");
- return;
- }
-
- const checkNameToPass = quickCheckForm.value.checkName;
- const checkResultToPass = quickCheckForm.value.checkResult;
- const checkTimeToPass = quickCheckForm.value.checkTime;
- const testStandardIdToPass = quickCheckForm.value.testStandardId;
- const checkCompanyToPass = quickCheckForm.value.checkCompany;
- const qualityInspectParamsToPass = [...quickCheckTableData.value];
-
- if (quickCheckForm.value.checkResult === "鍚堟牸") {
- // 鍚堟牸锛氱洿鎺ユ彁浜�
- const data = {
- id: currentRow.value.id,
- checkResult: "鍚堟牸",
- checkName: checkNameToPass,
- checkTime: checkTimeToPass,
- testStandardId: testStandardIdToPass,
- checkCompany: checkCompanyToPass,
- inspectType: 2,
- qualityInspectParams: qualityInspectParamsToPass
- };
- qualityInspectUpdate(data).then(res => {
- proxy.$modal.msgSuccess("妫�楠屾垚鍔�");
- closeQuickCheck();
- getList();
- });
- } else {
- // 涓嶅悎鏍硷細鎵撳紑璇︾粏濉啓椤甸潰
- closeQuickCheck();
- nextTick(() => {
- currentRow.value.checkTime = checkTimeToPass;
- currentRow.value.checkCompany = checkCompanyToPass;
- currentRow.value.testStandardId = testStandardIdToPass;
- formDia.value?.openDialog("edit", currentRow.value, checkResultToPass, checkNameToPass, testStandardIdToPass, checkCompanyToPass, qualityInspectParamsToPass);
- });
- }
-};
-
-onMounted(() => {
- getList();
-});
</script>
<style scoped></style>
--
Gitblit v1.9.3