From 8ef070c84a703c4a8b838bf9320d68d00a7d6dca Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 28 五月 2026 11:15:32 +0800
Subject: [PATCH] 设备巡检去掉高度限制
---
src/views/qualityManagement/processInspection/index.vue | 507 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 482 insertions(+), 25 deletions(-)
diff --git a/src/views/qualityManagement/processInspection/index.vue b/src/views/qualityManagement/processInspection/index.vue
index c8a0ddd..e8c890c 100644
--- a/src/views/qualityManagement/processInspection/index.vue
+++ b/src/views/qualityManagement/processInspection/index.vue
@@ -11,6 +11,9 @@
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
>
@@ -37,28 +40,149 @@
<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-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="妫�娴嬬粨鏋滐細" required>
+ <el-radio-group v-model="quickCheckForm.checkResult">
+ <el-radio value="鍚堟牸">鍚堟牸</el-radio>
+ <el-radio value="涓嶅悎鏍�">涓嶅悎鏍�</el-radio>
+ </el-radio-group>
+ </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-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>
+ </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>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="妫�娴嬪崟浣嶏細">
+ <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"
+ >
+ <template #slot="{ row }">
+ <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 @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>
</div>
</template>
<script setup>
import { Search } from "@element-plus/icons-vue";
-import {onMounted, ref} from "vue";
+import {onMounted, ref, reactive, toRefs, getCurrentInstance, nextTick} from "vue";
import InspectionFormDia from "@/views/qualityManagement/processInspection/components/inspectionFormDia.vue";
import FormDia from "@/views/qualityManagement/processInspection/components/formDia.vue";
import {ElMessageBox} from "element-plus";
-import {qualityInspectDel, qualityInspectListPage} from "@/api/qualityManagement/rawMaterialInspection.js";
+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/processInspection/components/filesDia.vue";
+import dayjs from "dayjs";
+import {userListNoPage} from "@/api/system/user.js";
+import useUserStore from "@/store/modules/user";
const data = reactive({
searchForm: {
process: "",
+ 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
},
{
@@ -106,26 +230,39 @@
}
},
},
+ {
+ label: "鎻愪氦鐘舵��",
+ prop: "inspectState",
+ formatData: (params) => {
+ if (params) {
+ return "宸叉彁浜�";
+ } else {
+ return "鏈彁浜�";
+ }
+ },
+ },
{
dataType: "action",
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 190,
+ width: 280,
operation: [
{
- name: "缂栬緫",
+ name: "妫�楠�",
type: "text",
clickFun: (row) => {
- openForm("edit", row);
+ openQuickCheck(row);
},
- },
- {
- name: "鏂板妫�楠岃褰�",
- type: "text",
- clickFun: (row) => {
- openInspectionForm("edit", row);
- },
+ disabled: (row) => {
+ // 宸叉彁浜ゅ垯绂佺敤
+ if (row.inspectState == 1) return true;
+ // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳界紪杈�
+ if (row.checkName) {
+ return row.checkName !== userStore.nickName;
+ }
+ return false;
+ }
},
{
name: "闄勪欢",
@@ -134,12 +271,91 @@
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 userList = ref([]);
+const currentRow = ref(null)
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
+const dialogFormVisible = ref(false);
+const form = ref({
+ checkName: ""
+});
+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 page = reactive({
current: 1,
size: 100,
@@ -149,7 +365,16 @@
const filesDia = ref()
const inspectionFormDia = ref()
const { proxy } = getCurrentInstance()
-
+const userStore = useUserStore()
+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 = () => {
@@ -163,7 +388,9 @@
};
const getList = () => {
tableLoading.value = true;
- qualityInspectListPage({...page, ...searchForm.value, inspectType: 1}).then(res => {
+ const params = { ...searchForm.value, ...page };
+ params.entryDate = undefined
+ qualityInspectListPage({...params, inspectType: 1}).then(res => {
tableLoading.value = false;
tableData.value = res.data.records
page.total = res.data.total;
@@ -194,6 +421,42 @@
filesDia.value?.openDialog(type, row)
})
};
+// 鎻愪环
+const submit = async (id) => {
+ const res = await submitQualityInspect({id: id})
+ if (res.code === 200) {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ 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 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 handleDelete = () => {
@@ -219,20 +482,214 @@
proxy.$modal.msg("宸插彇娑�");
});
};
+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()
+
+ document.body.removeChild(link)
+ window.URL.revokeObjectURL(downloadUrl)
+ })
+};
// 瀵煎嚭
const handleOut = () => {
- ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
- .then(() => {
- proxy.download("/quality/qualityInspect/export", {inspectType: 1}, "杩囩▼妫�楠�.xlsx");
- })
- .catch(() => {
- proxy.$modal.msg("宸插彇娑�");
- });
+ // 鍒ゆ柇鏄惁鏈夐�変腑鏁版嵁
+ const hasSelected = selectedRows.value.length > 0;
+
+ const confirmMsg = hasSelected
+ ? "閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�"
+ : "灏嗗鍑哄叏閮ㄦ暟鎹紝鏄惁纭瀵煎嚭锛�";
+
+ ElMessageBox.confirm(confirmMsg, "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ // 鏋勫缓瀵煎嚭鍙傛暟
+ const exportData = {
+ inspectType: 1,
+ process: searchForm.value.process || "",
+ entryDateStart: searchForm.value.entryDateStart || "",
+ entryDateEnd: searchForm.value.entryDateEnd || "",
+ };
+
+ // 濡傛灉鏈夐�変腑鏁版嵁锛屾坊鍔爄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("宸插彇娑�");
+ });
};
+
+// 鎵撳紑妫�楠岀粨鏋滈�夋嫨瀵硅瘽妗�
+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: 1,
+ 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) {
+ 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 = [];
+ 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: 1,
+ 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();
});
--
Gitblit v1.9.3