From 62b4b7af6fb8dea23cf14b0709156871a3c144af Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 23 六月 2026 14:41:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_大罗素马铃薯new' into dev_新疆_大罗素马铃薯new
---
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 319 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 267 insertions(+), 52 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 7e373bf..01840ff 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -2,7 +2,7 @@
<div>
<el-dialog
v-model="dialogFormVisible"
- :title="operationType === 'add' ? '鏂板鍘熸潗鏂欐楠�' : '缂栬緫鍘熸潗鏂欐楠�'"
+ :title="operationType === 'add' ? '鏂板鍘熸潗鏂欐楠�' : operationType === 'view' ? '鏌ョ湅鍘熸潗鏂欐楠�' : '缂栬緫鍘熸潗鏂欐楠�'"
width="70%"
@close="closeDia"
>
@@ -14,7 +14,7 @@
v-model="form.supplier"
placeholder="璇烽�夋嫨"
clearable
- :disabled="supplierQuantityDisabled"
+ :disabled="isViewMode || supplierQuantityDisabled"
>
<el-option
v-for="item in supplierList"
@@ -35,7 +35,7 @@
@change="getModels"
:data="productOptions"
:render-after-expand="false"
- :disabled="operationType === 'edit'"
+ :disabled="isViewMode || operationType === 'edit'"
style="width: 100%"
/>
</el-form-item>
@@ -44,7 +44,7 @@
<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="isViewMode || operationType === 'edit'"
filterable readonly @change="handleChangeModel">
<el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
</el-select>
@@ -58,6 +58,7 @@
clearable
@change="handleTestStandardChange"
style="width: 100%"
+ :disabled="isViewMode"
>
<el-option
v-for="item in testStandardOptions"
@@ -78,29 +79,74 @@
<el-col :span="12">
<el-form-item label="鏁伴噺锛�" prop="quantity">
<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�"
- clearable :precision="2" :disabled="supplierQuantityDisabled"/>
+ clearable :precision="2" :disabled="isViewMode || supplierQuantityDisabled"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="鍚堟牸鏁伴噺锛�" prop="qualifiedQuantity">
+ <el-input-number :step="0.01" :min="0" :max="form.quantity || undefined" style="width: 100%"
+ v-model="form.qualifiedQuantity" placeholder="璇疯緭鍏�" :precision="2"
+ @change="onQualifiedChange" :disabled="isViewMode"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="涓嶅悎鏍兼暟閲忥細" prop="unqualifiedQuantity">
+ <el-input-number :step="0.01" :min="0" :max="form.quantity || undefined" style="width: 100%"
+ v-model="form.unqualifiedQuantity" placeholder="璇疯緭鍏�" :precision="2"
+ @change="onUnqualifiedChange" :disabled="isViewMode"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="鍏ュ簱姣斾緥(%)锛�" prop="stockInRatio">
+ <el-input-number :step="0.01" :min="0" :max="100" style="width: 100%" v-model="form.stockInRatio" placeholder="璇疯緭鍏ュ叆搴撴瘮渚�" clearable :precision="2" :disabled="isViewMode" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="妫�楠岃鍒�" prop="inspectRule">
+ <el-radio-group v-model="form.inspectRule" :disabled="isViewMode">
+ <el-radio :label="0">鍏ㄦ</el-radio>
+ <el-radio :label="1">鎶芥</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6" v-if="form.inspectRule === 1">
+ <el-form-item label="鎶芥姣斾緥(%)" prop="sampleRatio">
+ <el-input-number v-model="form.sampleRatio" :min="0.01" :max="100" :precision="2" placeholder="璇疯緭鍏ユ娊妫�姣斾緥" style="width: 100%" @change="calcSampleQuantity" :disabled="isViewMode" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6" v-if="form.inspectRule === 1">
+ <el-form-item label="鎶芥鏁伴噺" prop="sampleQuantity">
+ <el-input-number v-model="form.sampleQuantity" :min="0" :precision="2" style="width: 100%" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�娴嬪崟浣嶏細" prop="checkCompany">
- <el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable :disabled="isViewMode"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
- <el-select v-model="form.checkResult">
- <el-option label="鍚堟牸" value="鍚堟牸"/>
- <el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�"/>
- </el-select>
+ <el-radio-group v-model="form.checkResult" :disabled="isViewMode || autoJudgeResult === '涓嶅悎鏍�'">
+ <el-radio label="鍚堟牸">鍚堟牸</el-radio>
+ <el-radio label="涓嶅悎鏍�">涓嶅悎鏍�</el-radio>
+ <el-radio label="閮ㄥ垎鍚堟牸">閮ㄥ垎鍚堟牸</el-radio>
+ </el-radio-group>
</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 style="width: 100%">
+ <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable style="width: 100%" :disabled="isViewMode">
<el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
</el-select>
</el-form-item>
@@ -115,6 +161,7 @@
format="YYYY-MM-DD"
clearable
style="width: 100%"
+ :disabled="isViewMode"
/>
</el-form-item>
</el-col>
@@ -128,16 +175,67 @@
:column="tableColumn"
:tableData="tableData"
:tableLoading="tableLoading"
+ :isShowPagination="false"
height="400"
>
- <template #slot="{ row }">
- <el-input v-model="row.testValue" clearable/>
+ <template #judgeTypeSlot="{ row }">
+ <el-tag v-if="row.judgeType === '鈮�'" type="success">鈮�</el-tag>
+ <el-tag v-else-if="row.judgeType === '鈮�'" type="warning">鈮�</el-tag>
+ <el-tag v-else-if="row.judgeType === '鑼冨洿'" type="info">鑼冨洿</el-tag>
+ <el-tag v-else>鏂囧瓧</el-tag>
+ </template>
+ <template #isRequiredSlot="{ row }">
+ <el-tag v-if="row.isRequired === 1" type="danger">鏄�</el-tag>
+ <el-tag v-else type="info">鍚�</el-tag>
+ </template>
+ <template #testValueSlot="{ row }">
+ <el-input v-model="row.testValue" clearable :disabled="isViewMode" @input="handleTestValueChange(row)" />
+ </template>
+ <template #isQualifiedSlot="{ row }">
+ <template v-if="row.judgeType !== '鏂囧瓧鎻忚堪'">
+ <el-tag v-if="row.isQualified === 1" type="success">鍚堟牸</el-tag>
+ <el-tag v-else-if="row.isQualified === 0" type="danger">涓嶅悎鏍�</el-tag>
+ <span v-else>-</span>
+ </template>
+ <template v-else>
+ <el-select v-model="row.isQualified" placeholder="璇烽�夋嫨" size="small" :disabled="isViewMode" @change="handleTextResultChange">
+ <el-option :value="1" label="鍚堟牸" />
+ <el-option :value="0" label="涓嶅悎鏍�" />
+ </el-select>
+ </template>
</template>
</PIMTable>
+
+ <div v-if="!isViewMode" style="margin-top: 16px;">
+ <el-form label-width="120px">
+ <el-form-item label="鑷姩鍒ゆ柇缁撴灉">
+ <template v-if="autoJudgeResult">
+ <el-tag v-if="autoJudgeResult === '鍚堟牸'" type="success" size="large">鍚堟牸</el-tag>
+ <el-tag v-else-if="autoJudgeResult === '閮ㄥ垎鍚堟牸'" type="warning" size="large">閮ㄥ垎鍚堟牸</el-tag>
+ <el-tag v-else type="danger" size="large">涓嶅悎鏍�</el-tag>
+ <span v-if="autoJudgeResult === '涓嶅悎鏍�'" style="margin-left: 10px; color: #909399;">
+ 锛堝繀瑕佸垽鏂弬鏁版湁涓嶅悎鏍奸」锛屼笉鍙墜鍔ㄤ慨鏀癸級
+ </span>
+ <span v-if="autoJudgeResult === '閮ㄥ垎鍚堟牸'" style="margin-left: 10px; color: #909399;">
+ 锛堝繀瑕佸垽鏂弬鏁板潎鍚堟牸锛岄潪蹇呰鍙傛暟鏈変笉鍚堟牸椤癸紝鍙墜鍔ㄩ�夋嫨鏈�缁堢粨鏋滐級
+ </span>
+ </template>
+ <template v-else>
+ <el-tag type="info" size="large">闇�鎵嬪姩鍒ゆ柇</el-tag>
+ <span style="margin-left: 10px; color: #909399;">
+ 锛堟墍鏈夊弬鏁板潎涓烘枃瀛楁弿杩扮被鍨嬶紝璇锋墜鍔ㄩ�夋嫨锛�
+ </span>
+ </template>
+ </el-form-item>
+ </el-form>
+ </div>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭</el-button>
- <el-button @click="closeDia">鍙栨秷</el-button>
+ <template v-if="!isViewMode">
+ <el-button type="primary" @click="submitForm">纭</el-button>
+ <el-button @click="closeDia">鍙栨秷</el-button>
+ </template>
+ <el-button v-else @click="closeDia">鍏抽棴</el-button>
</div>
</template>
</el-dialog>
@@ -169,49 +267,60 @@
model: "",
testStandardId: "",
unit: "",
- quantity: "",
+ quantity: undefined,
+ stockInRatio: 100.00,
checkCompany: "",
checkResult: "",
+ inspectRule: 0,
+ sampleRatio: undefined,
+ sampleQuantity: undefined,
},
rules: {
- checkTime: [{required: true, message: "璇疯緭鍏�", trigger: "blur"},],
+ checkTime: [{required: false, message: "璇疯緭鍏�", trigger: "blur"},],
supplier: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
checkName: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
productId: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
productModelId: [{required: true, message: "璇烽�夋嫨浜у搧鍨嬪彿", trigger: "change"}],
testStandardId: [{required: false, message: "璇烽�夋嫨鎸囨爣", trigger: "change"}],
unit: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
- quantity: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
+ quantity: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
+ qualifiedQuantity: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
+ unqualifiedQuantity: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
+ stockInRatio: [
+ {
+ validator: (rule, value, callback) => {
+ if (value !== null && value !== undefined && value !== '') {
+ if (value < 0 || value > 100) {
+ callback(new Error('鍏ュ簱姣斾緥鑼冨洿0~100'));
+ } else {
+ callback();
+ }
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }
+ ],
checkCompany: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
- checkResult: [{required: true, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change"}],
+ checkResult: [{required: false, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change"}],
},
});
const tableColumn = ref([
- {
- label: "鎸囨爣",
- prop: "parameterItem",
- },
- {
- label: "鍗曚綅",
- prop: "unit",
- },
- {
- label: "鏍囧噯鍊�",
- prop: "standardValue",
- },
- {
- label: "鍐呮帶鍊�",
- prop: "controlValue",
- },
- {
- label: "妫�楠屽��",
- prop: "testValue",
- dataType: 'slot',
- slot: 'slot',
- },
+ { label: "鎸囨爣", prop: "parameterItem" },
+ { label: "鍗曚綅", prop: "unit" },
+ { label: "鍘傚鏍囧噯鍊�", prop: "standardValue" },
+ { label: "涓嬮檺鍊�", prop: "minValue" },
+ { label: "涓婇檺鍊�", prop: "maxValue" },
+ { label: "鍐呮帶鍊�", prop: "controlValue" },
+ { label: "鍒ゆ柇绫诲瀷", prop: "judgeType", dataType: 'slot', slot: 'judgeTypeSlot' },
+ { label: "蹇呰鍒ゆ柇", prop: "isRequired", dataType: 'slot', slot: 'isRequiredSlot' },
+ { label: "妫�楠屽��", prop: "testValue", dataType: 'slot', slot: 'testValueSlot' },
+ { label: "鏄惁鍚堟牸", prop: "isQualified", dataType: 'slot', slot: 'isQualifiedSlot' },
]);
const tableData = ref([]);
const tableLoading = ref(false);
+const autoJudgeResult = ref(null);
const {form, rules} = toRefs(data);
const supplierList = ref([]);
@@ -220,6 +329,9 @@
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
const modelOptions = ref([]);
const userList = ref([]); // 妫�楠屽憳涓嬫媺鍒楄〃
+
+// 鏄惁涓烘煡鐪嬫ā寮�
+const isViewMode = computed(() => operationType.value === 'view');
// 缂栬緫鏃讹細productMainId 鎴� purchaseLedgerId 浠讳竴鏈夊�煎垯渚涘簲鍟嗐�佹暟閲忕疆鐏�
const supplierQuantityDisabled = computed(() => {
@@ -241,8 +353,8 @@
console.error("鍔犺浇妫�楠屽憳鍒楄〃澶辫触", e);
userList.value = [];
}
- // 鍏堥噸缃〃鍗曟暟鎹紙淇濇寔瀛楁瀹屾暣锛岄伩鍏嶅脊绐楅娆℃覆鏌撴椂瑙﹀彂蹇呭～绾㈡鈥滈棯涓�涓嬧�濓級
- form.value = {
+ // 鍏堥噸缃〃鍗曟暟鎹紙淇濇寔瀛楁瀹屾暣锛岄伩鍏嶅脊绐楅娆℃覆鏌撴椂瑙﹀彂蹇呭～绾㈡"闂竴涓�"锛�
+ form.value = {
checkTime: "",
supplier: "",
checkName: "",
@@ -252,15 +364,19 @@
model: "",
testStandardId: "",
unit: "",
- quantity: "",
+ quantity: undefined,
+ stockInRatio: 100.00,
checkCompany: "",
checkResult: "",
+ inspectRule: 0,
+ sampleRatio: undefined,
+ sampleQuantity: undefined,
}
testStandardOptions.value = [];
tableData.value = [];
// 鍏堢‘淇濅骇鍝佹爲宸插姞杞斤紝鍚﹀垯缂栬緫鏃朵骇鍝�/瑙勬牸鍨嬪彿鏃犳硶鍙嶆樉
await getProductOptions();
- if (operationType.value === 'edit') {
+ if (operationType.value === 'edit' || operationType.value === 'view') {
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
const savedTestStandardId = row.testStandardId;
form.value = {...row}
@@ -294,7 +410,7 @@
// 濡傛灉缂栬緫鏁版嵁涓湁 testStandardId锛屽垯璁剧疆骞跺姞杞藉搴旂殑鍙傛暟
if (savedTestStandardId) {
// 纭繚绫诲瀷鍖归厤锛坕tem.id 鍙兘鏄暟瀛楁垨瀛楃涓诧級
- const matchedOption = testStandardOptions.value.find(item =>
+ const matchedOption = testStandardOptions.value.find(item =>
item.id == savedTestStandardId || String(item.id) === String(savedTestStandardId)
);
if (matchedOption) {
@@ -319,6 +435,7 @@
getQualityInspectParamList(row.id);
}
}
+ autoJudgeResult.value = null;
// 鏈�鍚庡啀鎵撳紑寮圭獥锛屽苟娓呯悊鏍￠獙鎬侊紝閬垮厤蹇呭～鎻愮ず闂儊
dialogFormVisible.value = true;
nextTick(() => {
@@ -350,6 +467,16 @@
form.value.unit = modelOptions.value.find(item => item.id == value)?.unit || '';
}
+const calcSampleQuantity = () => {
+ const q = parseFloat(form.value.quantity) || 0;
+ const r = parseFloat(form.value.sampleRatio) || 0;
+ if (q > 0 && r > 0) {
+ form.value.sampleQuantity = Number((q * r / 100).toFixed(2));
+ } else {
+ form.value.sampleQuantity = undefined;
+ }
+};
+
const findNodeById = (nodes, productId) => {
for (let i = 0; i < nodes.length; i++) {
if (nodes[i].value === productId) {
@@ -380,16 +507,83 @@
});
}
+const handleTestValueChange = (row) => {
+ if (isViewMode.value) return;
+ if (!row.testValue || !row.judgeType || row.judgeType === '鏂囧瓧鎻忚堪') {
+ return;
+ }
+ const testVal = parseFloat(row.testValue);
+ if (isNaN(testVal)) return;
+
+ let qualified = false;
+ if (row.judgeType === '鈮�') {
+ const stdVal = parseFloat(row.standardValue);
+ if (isNaN(stdVal)) return;
+ qualified = testVal >= stdVal;
+ } else if (row.judgeType === '鈮�') {
+ const stdVal = parseFloat(row.standardValue);
+ if (isNaN(stdVal)) return;
+ qualified = testVal <= stdVal;
+ } else if (row.judgeType === '鑼冨洿') {
+ const minVal = parseFloat(row.minValue);
+ const maxVal = parseFloat(row.maxValue);
+ if (isNaN(minVal) || isNaN(maxVal)) return;
+ qualified = testVal >= minVal && testVal <= maxVal;
+ } else {
+ return;
+ }
+ row.isQualified = qualified ? 1 : 0;
+ performAutoJudgeAll();
+};
+
+const handleTextResultChange = () => {
+ performAutoJudgeAll()
+};
+
+const performAutoJudgeAll = () => {
+ if (!tableData.value.length) return;
+ const allTextDesc = tableData.value.every(item => item.judgeType === '鏂囧瓧鎻忚堪');
+ if (allTextDesc) {
+ autoJudgeResult.value = null;
+ return;
+ }
+ const requiredParams = tableData.value.filter(item => item.isRequired === 1);
+ if (requiredParams.length === 0) {
+ autoJudgeResult.value = null;
+ return;
+ }
+ const hasUnqualified = requiredParams.some(item => item.isQualified === 0);
+ const allJudged = requiredParams.every(item => item.isQualified === 1 || item.isQualified === 0);
+ if (!allJudged) {
+ autoJudgeResult.value = null;
+ return;
+ }
+ if (hasUnqualified) {
+ autoJudgeResult.value = '涓嶅悎鏍�';
+ form.value.checkResult = '涓嶅悎鏍�';
+ return;
+ }
+ const nonRequiredUnqualified = tableData.value.filter(item => item.isRequired !== 1 && item.isQualified === 0);
+ if (nonRequiredUnqualified.length > 0) {
+ autoJudgeResult.value = '閮ㄥ垎鍚堟牸';
+ form.value.checkResult = '閮ㄥ垎鍚堟牸';
+ } else {
+ autoJudgeResult.value = '鍚堟牸';
+ form.value.checkResult = '鍚堟牸';
+ }
+};
+
// 鎻愪氦浜у搧琛ㄥ崟
const submitForm = () => {
proxy.$refs.formRef.validate(valid => {
if (valid) {
+ performAutoJudgeAll();
form.value.inspectType = 0
- if (operationType.value === "add") {
- tableData.value.forEach((item) => {
- delete item.id
- })
- }
+ if (operationType.value === "add") {
+ tableData.value.forEach((item) => {
+ delete item.id
+ })
+ }
const data = {...form.value, qualityInspectParams: tableData.value}
if (operationType.value === "add") {
qualityInspectAdd(data).then(res => {
@@ -435,6 +629,10 @@
tableLoading.value = true;
getQualityTestStandardParamByTestStandardId(testStandardId).then(res => {
tableData.value = res.data || [];
+ tableData.value = tableData.value.map(item => ({
+ ...item,
+ id: null
+ }));
}).catch(error => {
console.error('鑾峰彇鏍囧噯鍙傛暟澶辫触:', error);
tableData.value = [];
@@ -448,12 +646,29 @@
tableData.value = res.data;
})
}
+// 鑷姩璁＄畻鍚堟牸鏁伴噺鍙樺寲鏃剁殑涓嶅悎鏍兼暟閲�
+const onQualifiedChange = (value) => {
+ const qty = parseFloat(form.value.quantity);
+ if (isNaN(qty) || qty <= 0) return;
+ const val = parseFloat(value) || 0;
+ form.value.unqualifiedQuantity = Math.max(0, qty - val);
+};
+
+// 鑷姩璁＄畻涓嶅悎鏍兼暟閲忓彉鍖栨椂鐨勫悎鏍兼暟閲�
+const onUnqualifiedChange = (value) => {
+ const qty = parseFloat(form.value.quantity);
+ if (isNaN(qty) || qty <= 0) return;
+ const val = parseFloat(value) || 0;
+ form.value.qualifiedQuantity = Math.max(0, qty - val);
+};
+
// 鍏抽棴寮规
const closeDia = () => {
proxy.resetForm("formRef");
tableData.value = [];
testStandardOptions.value = [];
form.value.testStandardId = '';
+ autoJudgeResult.value = null;
dialogFormVisible.value = false;
emit('close')
};
@@ -464,4 +679,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3