From 396867766893a5213001bd44f9ff2eafe179afcc Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期六, 14 三月 2026 15:31:55 +0800
Subject: [PATCH] 原料检测
---
src/views/qualityManagement/rawMaterial/components/formDia.vue | 97 ++++++++++++++----------
src/api/qualityManagement/rawMaterial.js | 25 ++++++
src/views/qualityManagement/rawMaterial/index.vue | 102 +++++++++++++------------
3 files changed, 135 insertions(+), 89 deletions(-)
diff --git a/src/api/qualityManagement/rawMaterial.js b/src/api/qualityManagement/rawMaterial.js
index 43da7fa..f411b4d 100644
--- a/src/api/qualityManagement/rawMaterial.js
+++ b/src/api/qualityManagement/rawMaterial.js
@@ -9,6 +9,14 @@
})
}
+// 鏌ヨ鍘熸璇︽儏
+export function findRawMaterialDetail(id) {
+ return request({
+ url: '/quality/rawMaterial/detail/' + id,
+ method: 'get',
+ })
+}
+
// 鏂板鍘熸
export function createRawMaterial(data) {
return request({
@@ -18,6 +26,23 @@
})
}
+// 鎻愪氦
+export function submitRawMaterial(id) {
+ return request({
+ url: '/quality/rawMaterial/submit/' + id,
+ method: 'patch',
+ })
+}
+
+// 淇敼妫�楠屼汉
+export function updateCheckUserName(data) {
+ return request({
+ url: '/quality/rawMaterial/updateCheckUserName',
+ method: 'patch',
+ data: data,
+ })
+}
+
// 淇敼鍘熸
export function updateRawMaterial(data) {
return request({
diff --git a/src/views/qualityManagement/rawMaterial/components/formDia.vue b/src/views/qualityManagement/rawMaterial/components/formDia.vue
index 868ef66..c8ed6c6 100644
--- a/src/views/qualityManagement/rawMaterial/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterial/components/formDia.vue
@@ -27,9 +27,10 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
- <el-select v-model="form.productModelId" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'edit'"
+ <el-select v-model="form.productModelId" placeholder="璇烽�夋嫨" clearable
+ :disabled="operationType === 'edit'"
filterable readonly @change="handleChangeModel">
- <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
+ <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -59,16 +60,16 @@
<el-col :span="12">
<el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
<el-select v-model="form.checkResult">
- <el-option label="鍚堟牸" :value="1"/>
- <el-option label="涓嶅悎鏍�" :value="0"/>
+ <el-option label="鍚堟牸" :value="0"/>
+ <el-option label="涓嶅悎鏍�" :value="1"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="妫�楠屽憳锛�" prop="checkName">
- <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable filterable style="width: 100%">
+ <el-form-item label="妫�楠屽憳锛�" prop="checkUserName">
+ <el-select v-model="form.checkUserName" placeholder="璇烽�夋嫨" clearable filterable style="width: 100%">
<el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
:value="item.nickName"/>
</el-select>
@@ -98,6 +99,7 @@
:column="tableColumn"
:tableData="tableData"
:tableLoading="tableLoading"
+ :is-show-pagination="false"
height="400"
>
<template #slot="{ row }">
@@ -112,7 +114,7 @@
</template>
</el-dialog>
- <item-select v-model="isShowItems" @confirm="handleItemSelect" />
+ <item-select v-model="isShowItems" @confirm="handleItemSelect"/>
</div>
</template>
@@ -122,7 +124,7 @@
import {qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
import {qualityInspectDetailByProductId} from "@/api/qualityManagement/metricMaintenance.js";
import {userListNoPage} from "@/api/system/user.js";
-import {createRawMaterial, updateRawMaterial} from "@/api/qualityManagement/rawMaterial.js";
+import {createRawMaterial, findRawMaterialDetail, updateRawMaterial} from "@/api/qualityManagement/rawMaterial.js";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
const {proxy} = getCurrentInstance()
@@ -136,34 +138,30 @@
form: {
checkTime: "",
supplier: "",
- checkName: "",
productName: "",
productId: "",
productModelId: "",
model: "",
batchNo: "",
- unit: "",
- quantity: "",
- checkCompany: "",
+ checkType: "",
checkResult: "",
+ unit: "",
+ checkUserName: "",
},
rules: {
checkTime: [{required: true, message: "璇疯緭鍏�", trigger: "blur"},],
- supplier: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
- checkName: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
+ checkUserName: [{required: false, message: "璇烽�夋嫨妫�楠屽憳", trigger: "blur"}],
productId: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
productModelId: [{required: true, message: "璇烽�夋嫨浜у搧鍨嬪彿", trigger: "change"}],
batchNo: [{required: false, message: "璇疯緭鍏ユ壒娆�", trigger: "blur"}],
- unit: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
- quantity: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
- checkCompany: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
+ checkType: [{required: false, message: "璇烽�夋嫨妫�楠岀被鍨�", trigger: "blur"}],
checkResult: [{required: true, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change"}],
},
});
const tableColumn = ref([
{
- label: "鎸囨爣",
- prop: "parameterItem",
+ label: "妫�娴嬮」鐩�",
+ prop: "name",
},
{
label: "鍗曚綅",
@@ -175,7 +173,7 @@
},
{
label: "鍐呮帶鍊�",
- prop: "controlValue",
+ prop: "internalControl",
},
{
label: "鍖栭獙鍊�",
@@ -183,6 +181,20 @@
dataType: 'slot',
slot: 'slot',
},
+ {
+ dataType: 'action',
+ label: '鎿嶄綔',
+ align: 'center',
+ fixed: 'right',
+ width: 140,
+ operation: [
+ {
+ name: '鍒犻櫎',
+ type: 'text',
+ clickFun: (row) => handleDelete(row.id),
+ }
+ ]
+ }
]);
const tableData = ref([]);
const tableLoading = ref(false);
@@ -191,7 +203,6 @@
const userList = ref([]);
const productOptions = ref([]);
const currentProductId = ref(0);
-const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
const modelOptions = ref([]);
// 鎵撳紑寮规
@@ -201,31 +212,29 @@
userList.value = res.data || [];
})
// 鍏堥噸缃〃鍗曟暟鎹紙淇濇寔瀛楁瀹屾暣锛岄伩鍏嶅脊绐楅娆℃覆鏌撴椂瑙﹀彂蹇呭～绾㈡鈥滈棯涓�涓嬧�濓級
- form.value = {
+ form.value = {
checkTime: "",
supplier: "",
- checkName: "",
productName: "",
productId: "",
productModelId: "",
model: "",
batchNo: "",
- unit: "",
- quantity: "",
- checkCompany: "",
+ checkType: "",
checkResult: "",
+ unit: "",
+ checkUserName: "",
}
- testStandardOptions.value = [];
tableData.value = [];
// 鍏堢‘淇濅骇鍝佹爲宸插姞杞斤紝鍚﹀垯缂栬緫鏃朵骇鍝�/瑙勬牸鍨嬪彿鏃犳硶鍙嶆樉
await getProductOptions();
if (operationType.value === 'edit') {
- form.value = {...row}
+ await fetchData(row.id);
currentProductId.value = row.productId || 0
// 鍏抽敭锛氱紪杈戞椂鍔犺浇瑙勬牸鍨嬪彿涓嬫媺閫夐」锛屾墠鑳藉弽鏄� productModelId
if (currentProductId.value) {
try {
- const res = await modelList({ id: currentProductId.value });
+ const res = await modelList({id: currentProductId.value});
modelOptions.value = res || [];
// 鍚屾鍥炲～ model / unit锛堟湁浜涙帴鍙ｈ繑鍥炵殑 row 閲屽彲鑳芥病甯﹀叏锛�
if (form.value.productModelId) {
@@ -261,7 +270,7 @@
modelOptions.value = [];
currentProductId.value = value
form.value.productName = findNodeById(productOptions.value, value);
- modelList({ id: value }).then((res) => {
+ modelList({id: value}).then((res) => {
modelOptions.value = res;
})
if (currentProductId.value) {
@@ -270,6 +279,8 @@
};
const handleItemSelect = (value) => {
+ // 杩囨护宸插瓨鍦ㄧ殑鎸囨爣
+ value = value.filter(item => !tableData.value.some(existingItem => existingItem.id === item.id));
tableData.value.push(...value)
}
@@ -312,13 +323,7 @@
const submitForm = () => {
proxy.$refs.formRef.validate(valid => {
if (valid) {
- form.value.inspectType = 0
- if (operationType.value === "add") {
- tableData.value.forEach((item) => {
- delete item.id
- })
- }
- const data = {...form.value, qualityInspectParams: tableData.value}
+ const data = {...form.value, qualityInspectItem: tableData.value}
if (operationType.value === "add") {
createRawMaterial(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
@@ -336,7 +341,6 @@
const getList = () => {
if (!currentProductId.value) {
- testStandardOptions.value = [];
tableData.value = [];
return;
}
@@ -358,10 +362,23 @@
const closeDia = () => {
proxy.resetForm("formRef");
tableData.value = [];
- testStandardOptions.value = [];
dialogFormVisible.value = false;
emit('close')
};
+
+const handleDelete = (id) => {
+ tableData.value = tableData.value.filter(item => item.id !== id);
+}
+
+const fetchData = (id) => {
+ tableLoading.value = true;
+ findRawMaterialDetail(id).then(res => {
+ form.value = res.data;
+ tableData.value = res.data.qualityInspectItem;
+ }).finally(() => {
+ tableLoading.value = false;
+ })
+}
defineExpose({
openDialog,
});
@@ -369,4 +386,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/qualityManagement/rawMaterial/index.vue b/src/views/qualityManagement/rawMaterial/index.vue
index 089272b..c123b95 100644
--- a/src/views/qualityManagement/rawMaterial/index.vue
+++ b/src/views/qualityManagement/rawMaterial/index.vue
@@ -2,15 +2,15 @@
<div class="app-container">
<div class="search_form">
<div>
- <span class="search_title">渚涘簲鍟嗭細</span>
- <el-input
- v-model="searchForm.supplier"
- style="width: 240px"
- placeholder="璇疯緭鍏ヤ緵搴斿晢鎼滅储"
- @change="handleQuery"
- clearable
- :prefix-icon="Search"
- />
+ <!-- <span class="search_title">渚涘簲鍟嗭細</span>-->
+ <!-- <el-input-->
+ <!-- v-model="searchForm.supplier"-->
+ <!-- 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"/>
@@ -44,8 +44,8 @@
<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-form-item label="妫�楠屽憳锛�" prop="checkUserName">
+ <el-select v-model="form.checkUserName" placeholder="璇烽�夋嫨" clearable>
<el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
:value="item.nickName"/>
</el-select>
@@ -63,21 +63,22 @@
</template>
<script setup>
-import {Search} from "@element-plus/icons-vue";
import {onMounted, ref, reactive, toRefs, getCurrentInstance, nextTick} from "vue";
import InspectionFormDia from "@/views/qualityManagement/rawMaterial/components/inspectionFormDia.vue";
import FormDia from "@/views/qualityManagement/rawMaterial/components/formDia.vue";
import {ElMessageBox} from "element-plus";
import {
downloadQualityInspect,
- qualityInspectUpdate,
- submitQualityInspect
} from "@/api/qualityManagement/rawMaterialInspection.js";
import FilesDia from "@/views/qualityManagement/rawMaterial/components/filesDia.vue";
import dayjs from "dayjs";
import {userListNoPage} from "@/api/system/user.js";
import useUserStore from "@/store/modules/user";
-import {deleteRawMaterial, findRawMaterialListPage} from "@/api/qualityManagement/rawMaterial.js";
+import {
+ deleteRawMaterial,
+ findRawMaterialListPage,
+ submitRawMaterial, updateCheckUserName,
+} from "@/api/qualityManagement/rawMaterial.js";
const data = reactive({
searchForm: {
@@ -87,7 +88,7 @@
entryDateEnd: undefined,
},
rules: {
- checkName: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
+ checkUserName: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
},
});
const {searchForm, rules} = toRefs(data);
@@ -99,7 +100,7 @@
},
{
label: "妫�楠屽憳",
- prop: "checkName",
+ prop: "checkUserName",
},
{
label: "浜у搧鍚嶇О",
@@ -110,12 +111,8 @@
prop: "model",
},
{
- label: "鍗曚綅",
- prop: "unit",
- },
- {
- label: "鏁伴噺",
- prop: "quantity",
+ label: "鎵规鍙�",
+ prop: "batchNo",
width: 120
},
{
@@ -134,6 +131,13 @@
return "success";
} else {
return null;
+ }
+ },
+ formatData: (params) => {
+ if (params === 1) {
+ return "涓嶅悎鏍�";
+ } else if (params === 0) {
+ return "鍚堟牸";
}
},
},
@@ -161,15 +165,15 @@
clickFun: (row) => {
openForm("edit", row);
},
- disabled: (row) => {
- // 宸叉彁浜ゅ垯绂佺敤
- if (row.inspectState == 1) return true;
- // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳界紪杈�
- if (row.checkName) {
- return row.checkName !== userStore.nickName;
- }
- return false;
- }
+ disabled: (row) => {
+ // 宸叉彁浜ゅ垯绂佺敤
+ if (row.inspectState == 1) return true;
+ // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳界紪杈�
+ if (row.checkUserName) {
+ return row.checkUserName !== userStore.nickName;
+ }
+ return false;
+ }
},
{
name: "闄勪欢",
@@ -184,29 +188,29 @@
clickFun: (row) => {
submit(row.id);
},
- disabled: (row) => {
- // 宸叉彁浜ゅ垯绂佺敤
- if (row.inspectState == 1) return true;
- // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳芥彁浜�
- if (row.checkName) {
- return row.checkName !== userStore.nickName;
- }
- return false;
- }
+ disabled: (row) => {
+ // 宸叉彁浜ゅ垯绂佺敤
+ if (row.inspectState == 1) return true;
+ // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳芥彁浜�
+ if (row.checkUserName) {
+ return row.checkUserName !== userStore.nickName;
+ }
+ return false;
+ }
},
{
name: "鍒嗛厤妫�楠屽憳",
type: "text",
clickFun: (row) => {
- if (!row.checkName) {
+ if (!row.checkUserName) {
open(row)
} else {
proxy.$modal.msgError("妫�楠屽憳宸插瓨鍦�");
}
},
- disabled: (row) => {
- return row.inspectState == 1 || row.checkName;
- }
+ disabled: (row) => {
+ return row.inspectState === 1 || row.checkUserName || row.checkUserName !== '';
+ }
},
{
name: "涓嬭浇",
@@ -224,7 +228,7 @@
const userList = ref([]);
const dialogFormVisible = ref(false);
const form = ref({
- checkName: ""
+ checkUserName: ""
});
const page = reactive({
current: 1,
@@ -328,7 +332,7 @@
// 鎻愪环
const submit = async (id) => {
- const res = await submitQualityInspect({id: id})
+ const res = await submitRawMaterial(id)
if (res.code === 200) {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
getList();
@@ -347,7 +351,7 @@
...form.value,
id: currentRow.value.id
}
- qualityInspectUpdate(data).then(res => {
+ updateCheckUserName(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
getList();
@@ -363,7 +367,7 @@
}
const downLoadFile = (row) => {
- downloadQualityInspect({ id: row.id }).then((blobData) => {
+ downloadQualityInspect({id: row.id}).then((blobData) => {
const blob = new Blob([blobData], {
type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
})
--
Gitblit v1.9.3