From c05b81c7f50df80ab247a05f9f92af2d799e77cd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 10 四月 2026 15:59:04 +0800
Subject: [PATCH] feat:1.销售添加是否生产 2.生产订单添加备注
---
src/views/qualityManagement/nonconformingManagement/components/formDia.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
index 0c6562c..eee1753 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -11,9 +11,8 @@
<el-col :span="12">
<el-form-item label="绫诲埆锛�" prop="inspectType">
<el-select v-model="form.inspectType">
- <el-option label="鍘熸潗鏂欐楠�" :value="0" />
<el-option label="杩囩▼妫�楠�" :value="1" />
- <el-option label="鍑哄巶妫�楠�" :value="2" />
+ <el-option label="鎴愬搧妫�楠�" :value="2" />
</el-select>
</el-form-item>
</el-col>
@@ -41,8 +40,22 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鐢熶骇鎵瑰彿锛�">
+ <el-input
+ :model-value="productionBatchDisplay"
+ disabled
+ placeholder="鈥�"
+ />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="鏂欏彿锛�" prop="materialCode">
+ <el-input v-model="form.materialCode" placeholder="璇疯緭鍏�" disabled/>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="鍗曚綅锛�" prop="unit">
<el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable/>
@@ -53,8 +66,7 @@
<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2"/>
</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%">
@@ -75,8 +87,7 @@
/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
+
<el-col :span="12">
<el-form-item label="涓嶅悎鏍肩幇璞★細" prop="defectivePhenomena">
<el-input v-model="form.defectivePhenomena" placeholder="璇疯緭鍏�" clearable/>
@@ -89,8 +100,7 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
+
<el-col :span="12">
<el-form-item label="澶勭悊浜猴細" prop="dealName">
<el-select v-model="form.dealName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
@@ -124,7 +134,7 @@
</template>
<script setup>
-import {ref, reactive, toRefs} from "vue";
+import { ref, reactive, toRefs, computed, getCurrentInstance } from "vue";
import {modelList, productTreeList} from "@/api/basicData/product.js";
import {
getQualityUnqualifiedInfo,
@@ -149,6 +159,9 @@
productId: "",
model: "",
unit: "",
+ materialCode: "",
+ /** 鏉ヨ嚜涓氬姟鏁版嵁锛屼粎灞曠ず */
+ batchNo: "",
quantity: "",
checkCompany: "",
checkResult: "",
@@ -172,6 +185,16 @@
},
});
const { form, rules } = toRefs(data);
+
+const productionBatchDisplay = computed(() => {
+ const f = form.value || {};
+ const v = f.batchNo ?? f.productionBatchNo;
+ if (v === null || v === undefined || String(v).trim() === "") {
+ return "";
+ }
+ return String(v);
+});
+
const productOptions = ref([]);
const modelOptions = ref([]);
const userList = ref([]); // 妫�楠屽憳/澶勭悊浜轰笅鎷夊垪琛�
@@ -199,6 +222,8 @@
productId: '',
model: '',
unit: '',
+ materialCode: '',
+ batchNo: '',
quantity: '',
productName: '',
};
@@ -210,6 +235,8 @@
getQualityUnqualifiedInfo(row.id).then(res => {
const { inspectState, ...rest } = (res.data || {})
form.value = { ...rest }
+ form.value.batchNo =
+ rest.batchNo ?? rest.productionBatchNo ?? form.value.batchNo ?? ""
})
}
}
@@ -252,12 +279,21 @@
return newItem;
});
}
+
+const handleChangeModel = (value) => {
+ form.value.materialCode = modelOptions.value.find(item => item.id == value)?.materialCode || '';
+}
+
// 鎻愪氦浜у搧琛ㄥ崟
const submitForm = () => {
proxy.$refs.formRef.validate(valid => {
if (valid) {
// 鐘舵�佸瓧娈典笉鍦ㄨ〃鍗曞～鍐欙紝涔熶笉浼犵粰鍚庣
const { inspectState, ...payload } = (form.value || {})
+ const selectedModel = modelOptions.value.find(item =>
+ String(item.id) === String(payload.model)
+ );
+ payload.model = selectedModel ? selectedModel.model : '';
if (operationType.value === "add") {
qualityUnqualifiedAdd(payload).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
--
Gitblit v1.9.3