From 21e379a778415d5aa4d3c32e23c4348c30646f51 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 27 三月 2026 15:23:10 +0800
Subject: [PATCH] 成品检
---
src/views/qualityManagement/processInspection/components/detailDialog.vue | 8
src/api/qualityManagement/rawMaterialInspection.js | 16 +
src/views/qualityManagement/finalInspection/components/ratioDialog.vue | 180 +++++++++++++
src/views/qualityManagement/finalInspection/index.vue | 570 +++++++++++++++----------------------------
src/views/qualityManagement/processInspection/index.vue | 5
5 files changed, 403 insertions(+), 376 deletions(-)
diff --git a/src/api/qualityManagement/rawMaterialInspection.js b/src/api/qualityManagement/rawMaterialInspection.js
index 550b60d..8adb0ac 100644
--- a/src/api/qualityManagement/rawMaterialInspection.js
+++ b/src/api/qualityManagement/rawMaterialInspection.js
@@ -71,3 +71,19 @@
params: query,
})
}
+// 鏌ヨ鎴愬搧妫�妫�鍒楄〃
+export function qualityInspectFinishedListPage(query) {
+ return request({
+ url: '/quality/qualityInspect/finishedPage',
+ method: 'get',
+ params: query,
+ })
+}
+// 鎴愬搧妫�-鏌ョ湅鏍囧噯鎶曞叆浜у嚭姣斾緥
+export function qualityInspectFinishedRatio(query) {
+ return request({
+ url: '/quality/qualityInspect/finishedRatio',
+ method: 'get',
+ params: query,
+ })
+}
diff --git a/src/views/qualityManagement/finalInspection/components/ratioDialog.vue b/src/views/qualityManagement/finalInspection/components/ratioDialog.vue
new file mode 100644
index 0000000..23e23a0
--- /dev/null
+++ b/src/views/qualityManagement/finalInspection/components/ratioDialog.vue
@@ -0,0 +1,180 @@
+<template>
+ <div>
+ <el-dialog v-model="dialogVisible"
+ title="鏍囧噯鎶曞叆浜у嚭姣斾緥"
+ width="1000px"
+ @close="closeDialog">
+ <!-- <el-card class="detail-card">
+ <template #header>
+ <div class="card-header">
+ <span>鐢熶骇璁㈠崟淇℃伅</span>
+ </div>
+ </template>
+ <div class="detail-info">
+ <div class="info-row">
+ <div class="info-item">
+ <span class="info-label">鐢熶骇璁㈠崟鍙凤細</span>
+ <span class="info-value">{{ orderInfo.npsNo }}</span>
+ </div>
+ <div class="info-item">
+ <span class="info-label">浜у搧鍚嶇О锛�</span>
+ <span class="info-value">{{ orderInfo.productName }}</span>
+ </div>
+ <div class="info-item">
+ <span class="info-label">瑙勬牸锛�</span>
+ <span class="info-value">{{ orderInfo.model }}</span>
+ </div>
+ <div class="info-item">
+ <span class="info-label">浜у搧绫诲瀷锛�</span>
+ <span class="info-value">{{ orderInfo.strength }}</span>
+ </div>
+ </div>
+ </div>
+ </el-card> -->
+ <el-card class="detail-card"
+ style="margin-top: 20px;">
+ <template #header>
+ <div class="card-header">
+ <span>鎶曞叆浜у嚭姣斾緥鏄庣粏</span>
+ </div>
+ </template>
+ <el-table :data="ratioData"
+ style="width: 100%">
+ <el-table-column prop="materialCode"
+ label="浜у搧缂栫爜"
+ width="120" />
+ <el-table-column prop="productName"
+ label="浜у搧鍚嶇О"
+ width="150" />
+ <el-table-column prop="model"
+ label="瑙勬牸"
+ width="100" />
+ <!-- <el-table-column prop="unit"
+ label="鍗曚綅"
+ width="80" /> -->
+ <el-table-column prop="actualInputQuantity"
+ label="瀹為檯鎶曞叆閲�"
+ width="120">
+ <template #default="scope">
+ <span style="color: #409eff;">{{ scope.row.actualInputQuantity }}</span> {{ scope.row.unit }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="actualOutputQuantity"
+ label="瀹為檯浜у嚭閲�"
+ width="120">
+ <template #default="scope">
+ <span style="color: #409eff;">{{ scope.row.actualOutputQuantity }}</span> {{ scope.row.unit }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="standardInputOutputRatio"
+ label="鏍囧噯鎶曞叆浜у嚭姣斾緥"
+ width="150">
+ <template #default="scope">
+ <span style="color: #f68f00;">{{ scope.row.standardInputOutputRatio }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="deviationRate"
+ label="鍋忓樊鐜�"
+ width="120">
+ <template #default="scope">
+ <span :style="{ color: scope.row.deviationRate >= 0 ? '#67c23a' : '#f56c6c' }">
+ {{ scope.row.deviationRate >= 0 ? '+' : '' }}{{ scope.row.deviationRate.toFixed(2) }}%
+ </span>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button @click="closeDialog">鍏抽棴</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script setup>
+ import { ref } from "vue";
+ import { qualityInspectFinishedRatio } from "@/api/qualityManagement/rawMaterialInspection.js";
+
+ const emit = defineEmits(["close"]);
+ const dialogVisible = ref(false);
+ const ratioData = ref([]);
+ const orderInfo = ref({});
+ const loading = ref(false);
+
+ const openDialog = row => {
+ dialogVisible.value = true;
+ orderInfo.value = row;
+ getRatioDetails(row);
+ };
+
+ const getRatioDetails = row => {
+ loading.value = true;
+ // 鏋勫缓璇锋眰鍙傛暟
+ const params = {
+ productOrderId: row.productOrderId,
+ };
+
+ qualityInspectFinishedRatio(params)
+ .then(res => {
+ ratioData.value = res.data || [];
+ loading.value = false;
+ })
+ .catch(err => {
+ loading.value = false;
+ console.error("鑾峰彇鏍囧噯鎶曞叆浜у嚭姣斾緥澶辫触:", err);
+ });
+ };
+
+ const closeDialog = () => {
+ dialogVisible.value = false;
+ emit("close");
+ };
+
+ defineExpose({
+ openDialog,
+ });
+</script>
+
+<style scoped>
+ .detail-card {
+ margin-bottom: 20px;
+ }
+
+ .card-header {
+ font-size: 16px;
+ font-weight: bold;
+ color: #333;
+ }
+
+ .detail-info {
+ padding: 10px 0;
+ }
+
+ .info-row {
+ display: flex;
+ flex-wrap: wrap;
+ margin-bottom: 10px;
+ }
+
+ .info-item {
+ width: 25%;
+ margin-bottom: 10px;
+ }
+
+ .info-label {
+ display: inline-block;
+ width: 120px;
+ font-weight: bold;
+ color: #666;
+ }
+
+ .info-value {
+ color: #333;
+ }
+
+ .dialog-footer {
+ text-align: center;
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index db44222..bc91722 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -2,396 +2,220 @@
<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
- >
- </div>
- <div>
- <el-button type="primary" @click="openForm('add')">鏂板</el-button>
- <el-button @click="handleOut">瀵煎嚭</el-button>
- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+ <span class="search_title">鐢熶骇宸ュ崟鍙凤細</span>
+ <el-input v-model="searchForm.npsNo"
+ style="width: 200px"
+ placeholder="璇疯緭鍏ョ敓浜у伐鍗曞彿鎼滅储"
+ @change="handleQuery"
+ clearable
+ :prefix-icon="Search" />
+ <span style="margin-left: 20px"
+ class="search_title">浜у搧缂栫爜锛�</span>
+ <el-input v-model="searchForm.materialCode"
+ style="width: 240px"
+ placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮佹悳绱�"
+ @change="handleQuery"
+ clearable
+ :prefix-icon="Search" />
+ <span style="margin-left: 20px"
+ class="search_title">浜у搧鍚嶇О锛�</span>
+ <el-input v-model="searchForm.productName"
+ style="width: 240px"
+ placeholder="璇疯緭鍏ヤ骇鍝佸悕绉版悳绱�"
+ @change="handleQuery"
+ clearable
+ :prefix-icon="Search" />
+ <el-button type="primary"
+ @click="handleQuery"
+ style="margin-left: 10px">鎼滅储</el-button>
+ <el-button type="info"
+ @click="handleReset"
+ style="margin-left: 10px">閲嶇疆</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"
+ :tableLoading="tableLoading"
+ @pagination="pagination"
+ :total="page.total">
+ <template #needQuantity="{ row }">
+ <span style="font-weight: bold;color: #f68f00;">{{ row.needQuantity }}</span><span style="margin-left: 5px;color: #909399;">鏂�</span>
+ </template>
+ <template #quantity="{ row }">
+ <span style="font-weight: bold;color: #409eff;">{{ row.quantity }}</span><span style="margin-left: 5px;color: #909399;">鏂�</span>
+ </template>
+ <template #qualifiedQuantity="{ row }">
+ <span style="font-weight: bold;color: #67c23a;">{{ row.qualifiedQuantity }}</span><span style="margin-left: 5px;color: #909399;">鏂�</span>
+ </template>
+ <template #unqualifiedQuantity="{ row }">
+ <span style="font-weight: bold;color: #f56c6c;">{{ row.unqualifiedQuantity }}</span><span style="margin-left: 5px;color: #909399;">鏂�</span>
+ </template>
+ </PIMTable>
</div>
- <InspectionFormDia ref="inspectionFormDia" @close="handleQuery"></InspectionFormDia>
- <FormDia ref="formDia" @close="handleQuery"></FormDia>
- <files-dia ref="filesDia" @close="handleQuery"></files-dia>
- <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>
+ <RatioDialog ref="ratioDialog"
+ @close="handleQuery"></RatioDialog>
</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,
- qualityInspectListPage, qualityInspectUpdate,
- submitQualityInspect
-} from "@/api/qualityManagement/rawMaterialInspection.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, nextTick } from "vue";
+ import RatioDialog from "@/views/qualityManagement/finalInspection/components/ratioDialog.vue";
+ import { qualityInspectFinishedListPage } from "@/api/qualityManagement/rawMaterialInspection.js";
+ import dayjs from "dayjs";
-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: {
+ npsNo: "",
+ materialCode: "",
+ productName: "",
},
- },
- {
- 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) => {
- openForm("edit", row);
- },
- disabled: (row) => {
- // 宸叉彁浜ゅ垯绂佺敤
- if (row.inspectState == 1) return true;
- // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳界紪杈�
- if (row.checkName) {
- return row.checkName !== userStore.nickName;
- }
- return false;
- }
+ });
+ const { searchForm } = toRefs(data);
+ const tableColumn = ref([
+ {
+ label: "鐢熶骇宸ュ崟鍙�",
+ prop: "npsNo",
+ width: 140,
+ },
+ {
+ label: "浜у搧缂栫爜",
+ prop: "materialCode",
+ width: 120,
+ },
+ {
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
+ },
+ {
+ label: "瑙勬牸鍨嬪彿",
+ prop: "model",
+ },
+ {
+ label: "浜у搧绫诲瀷",
+ prop: "strength",
+ },
+ {
+ label: "鎵�闇�鏁伴噺",
+ prop: "needQuantity",
+ dataType: "slot",
+ slot: "needQuantity",
+ },
+ {
+ label: "浜у嚭鏁伴噺",
+ prop: "quantity",
+ dataType: "slot",
+ slot: "quantity",
+ },
+ {
+ label: "鍚堟牸鏁伴噺",
+ prop: "qualifiedQuantity",
+ dataType: "slot",
+ slot: "qualifiedQuantity",
+ },
+ {
+ label: "涓嶅悎鏍兼暟閲�",
+ prop: "unqualifiedQuantity",
+ dataType: "slot",
+ slot: "unqualifiedQuantity",
+ },
+ {
+ label: "鐘舵��",
+ prop: "status",
+ dataType: "tag",
+ formatType: params => {
+ const typeMap = {
+ 1: "primary",
+ 2: "warning",
+ 3: "success",
+ 4: "danger",
+ };
+ return typeMap[params] || "default";
},
- {
- name: "闄勪欢",
- type: "text",
- clickFun: (row) => {
- openFilesFormDia(row);
- },
+ formatData: val => {
+ const labelMap = {
+ 1: "寰呭紑濮�",
+ 2: "杩涜涓�",
+ 3: "宸插畬鎴�",
+ 4: "宸插彇娑�",
+ };
+ return labelMap[val] || val;
},
- {
- 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);
+ },
+ {
+ dataType: "action",
+ label: "鎿嶄綔",
+ align: "center",
+ fixed: "right",
+ width: 180,
+ operation: [
+ {
+ name: "鏌ョ湅鏍囧噯鎶曞叆浜у嚭姣斾緥",
+ type: "text",
+ clickFun: row => {
+ openFilesFormDia(row);
+ },
+ },
+ ],
+ },
+ ]);
+ const tableData = ref([]);
+ const tableLoading = ref(false);
+ const page = reactive({
+ current: 1,
+ size: 100,
+ total: 0,
+ });
+ const ratioDialog = ref();
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ const handleReset = () => {
+ searchForm.value = {
+ npsNo: "",
+ materialCode: "",
+ productName: "",
+ };
+ handleQuery();
+ };
-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 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) => {
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- 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;
+ qualityInspectFinishedListPage({ ...params })
+ .then(res => {
+ tableLoading.value = false;
+ tableData.value = res.data.records;
+ page.total = res.data.total;
})
- .catch(() => {
- proxy.$modal.msg("宸插彇娑�");
+ .catch(err => {
+ tableLoading.value = false;
});
-};
-// 瀵煎嚭
-const handleOut = () => {
- ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
- .then(() => {
- proxy.download("/quality/qualityInspect/export", {inspectType: 2}, "鍑哄巶妫�楠�.xlsx");
- })
- .catch(() => {
- proxy.$modal.msg("宸插彇娑�");
- });
-};
+ };
-// 鎻愪环
-const submit = async (id) => {
- const res = await submitQualityInspect({id: id})
- if (res.code === 200) {
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- getList();
- }
-}
+ // 鎵撳紑鏍囧噯鎶曞叆浜у嚭姣斾緥寮规
+ const openFilesFormDia = row => {
+ nextTick(() => {
+ ratioDialog.value?.openDialog(row);
+ });
+ };
-// 鍏抽棴寮规
-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 open = async (row) => {
- let userLists = await userListNoPage();
- userList.value = userLists.data;
- 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 link = document.createElement('a')
- link.href = downloadUrl
- link.download = '鍘熸潗鏂欐楠屾姤鍛�.docx'
- document.body.appendChild(link)
- link.click()
-
- document.body.removeChild(link)
- window.URL.revokeObjectURL(downloadUrl)
- })
-};
-onMounted(() => {
- getList();
-});
+ onMounted(() => {
+ getList();
+ });
</script>
<style scoped></style>
diff --git a/src/views/qualityManagement/processInspection/components/detailDialog.vue b/src/views/qualityManagement/processInspection/components/detailDialog.vue
index b987127..8f4f159 100644
--- a/src/views/qualityManagement/processInspection/components/detailDialog.vue
+++ b/src/views/qualityManagement/processInspection/components/detailDialog.vue
@@ -73,6 +73,12 @@
<span class="info-value"><span style="font-weight: bold;color: #b43434;">{{ detailData.unqualifiedQuantity }}</span> 鏂�</span>
</div>
</div>
+ <div class="info-row">
+ <div class="info-item">
+ <span class="info-label">鎶ュ伐鍗曞彿锛�</span>
+ <span class="info-value">{{ detailData.productNo }}</span>
+ </div>
+ </div>
</div>
</el-card>
<el-card v-for="group in groupedInspectionData"
@@ -81,7 +87,7 @@
style="margin-top: 20px;">
<template #header>
<div class="card-header">
- <span v-if="groupedInspectionData.length > 1">妫�楠屾寚鏍囩粍 - {{ group.sourceSort }}</span>
+ <span v-if="groupedInspectionData.length > 1">妫�楠寊hi缁� - {{ group.sourceSort }}</span>
<span v-else>妫�楠屾寚鏍�</span>
</div>
</template>
diff --git a/src/views/qualityManagement/processInspection/index.vue b/src/views/qualityManagement/processInspection/index.vue
index 6414dcd..f963a78 100644
--- a/src/views/qualityManagement/processInspection/index.vue
+++ b/src/views/qualityManagement/processInspection/index.vue
@@ -229,7 +229,8 @@
},
{
label: "鎶ュ伐鍗曞彿",
- prop: "productionProductRouteItemId",
+ prop: "productNo",
+ width: "130",
},
{
label: "浜у嚭鏁伴噺",
@@ -255,7 +256,7 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 100,
+ width: 120,
operation: [
{
name: "璇︽儏",
--
Gitblit v1.9.3