From ccb00a17b9119200b8c8d29a177bcc129dd4c982 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 19 三月 2026 17:43:13 +0800
Subject: [PATCH] Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG
---
src/views/qualityManagement/nonconformingManagement/components/formDia.vue | 127 +++++++++++++++++++++++++++++------------
1 files changed, 89 insertions(+), 38 deletions(-)
diff --git a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
index d33ddad..e7340d7 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -9,17 +9,6 @@
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<el-row :gutter="30">
<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-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
<el-form-item label="浜у搧鍚嶇О锛�" prop="productId">
<el-tree-select
v-model="form.productId"
@@ -29,35 +18,65 @@
@change="getModels"
:data="productOptions"
:render-after-expand="false"
+ :disabled="operationType === 'edit'"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
- <el-select v-model="form.model" 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-select>
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <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-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍗曚綅锛�" prop="unit">
- <el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="form.unit" disabled/>
</el-form-item>
</el-col>
<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"/>
+ <el-form-item label="鎵瑰彿锛�" prop="batchNo">
+ <el-input style="width: 100%" v-model="form.batchNo" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="妫�楠岀被鍨嬶細" prop="checkType">
+ <el-select v-model="form.checkType">
+ <el-option label="鍏ュ巶妫�" :value="0"/>
+ <el-option label="杞﹂棿妫�" :value="1"/>
+ <el-option label="鍑哄巶妫�" :value="2"/>
+ </el-select>
+ </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="1"/>
+ <el-option label="涓嶅悎鏍�" :value="0"/>
+ </el-select>
+ </el-form-item>
+ </el-col> -->
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
- <el-input v-model="form.checkName" placeholder="璇疯緭鍏�" clearable/>
+ <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable filterable 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-col :span="12">
@@ -82,8 +101,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="澶勭悊缁撴灉锛�" prop="dealResult">
- <el-select v-model="form.dealResult" placeholder="璇烽�夋嫨" clearable>
- <el-option :label="item.label" :value="item.value" v-for="item in rejection_handling" :key="item.value" />
+ <el-select v-model="form.dealResult" placeholder="鎶ュ簾" disabled>
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ v-for="item in rejection_handling"
+ :key="item.value"
+ :disabled="String(item.label) !== '鎶ュ簾'"
+ />
</el-select>
</el-form-item>
</el-col>
@@ -91,7 +116,10 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="澶勭悊浜猴細" prop="dealName">
- <el-input v-model="form.dealName" placeholder="璇疯緭鍏�" clearable/>
+ <el-select v-model="form.dealName" placeholder="璇烽�夋嫨" clearable filterable 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-col :span="12">
@@ -120,61 +148,75 @@
</template>
<script setup>
-import {ref} from "vue";
+import {ref, reactive, toRefs, getCurrentInstance} from "vue";
import {modelList, productTreeList} from "@/api/basicData/product.js";
import {
getQualityUnqualifiedInfo,
qualityUnqualifiedAdd,
qualityUnqualifiedUpdate
} from "@/api/qualityManagement/nonconformingManagement.js";
+import {userListNoPage} from "@/api/system/user.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
const dialogFormVisible = ref(false);
const operationType = ref('')
const { rejection_handling } = proxy.useDict("rejection_handling")
+
+const getScrapDealResultValue = () => {
+ const list = rejection_handling?.value || rejection_handling || [];
+ const scrap = (list || []).find((it) => String(it?.label ?? "") === "鎶ュ簾");
+ return scrap?.value ?? "";
+};
const data = reactive({
form: {
checkTime: "",
- process: "",
checkName: "",
productName: "",
productId: "",
+ productModelId: "",
model: "",
unit: "",
- quantity: "",
- checkCompany: "",
+ batchNo: "",
+ checkType: undefined,
checkResult: "",
- inspectType: '',
defectivePhenomena: '',
dealResult: '',
+ dealName: "",
+ dealTime: "",
},
rules: {
- checkTime: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" },],
- process: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- checkName: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- model: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- checkCompany: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- checkResult: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+ checkTime: [{ required: true, message: "璇烽�夋嫨妫�娴嬫棩鏈�", trigger: "change" }],
+ checkUserName: [{ required: true, message: "璇烽�夋嫨妫�楠屽憳", trigger: "change" }],
+ productId: [{ required: true, message: "璇烽�夋嫨浜у搧鍚嶇О", trigger: "change" }],
+ productModelId: [{ required: true, message: "璇烽�夋嫨瑙勬牸鍨嬪彿", trigger: "change" }],
+ batchNo: [{ required: true, message: "璇疯緭鍏ユ壒鍙�", trigger: "blur" }],
+ checkType: [{ required: true, message: "璇烽�夋嫨妫�楠岀被鍨�", trigger: "change" }],
+ checkResult: [{ required: true, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change" }],
+ dealResult: [{ required: true, message: "澶勭悊缁撴灉榛樿涓烘姤搴�", trigger: "change" }],
+ dealTime: [{ required: true, message: "璇烽�夋嫨澶勭悊鏃ユ湡", trigger: "change" }],
},
});
const { form, rules } = toRefs(data);
+const userList = ref([]);
const productOptions = ref([]);
const modelOptions = ref([])
// 鎵撳紑寮规
const openDialog = (type, row) => {
operationType.value = type;
+ userListNoPage().then(res => {
+ userList.value = res.data || [];
+ })
dialogFormVisible.value = true;
form.value = {}
getProductOptions();
+ // 澶勭悊缁撴灉榛樿鈥滄姤搴熲�濓紝涓斾笉鍙�夋嫨鍏跺畠椤�
+ form.value.dealResult = getScrapDealResultValue();
if (operationType.value === 'edit') {
getQualityUnqualifiedInfo(row.id).then(res => {
const { inspectState, ...rest } = (res.data || {})
- form.value = { ...rest }
+ form.value = { ...rest, dealResult: getScrapDealResultValue() }
})
}
}
@@ -185,10 +227,19 @@
};
const getModels = (value) => {
form.value.productName = findNodeById(productOptions.value, value);
+ form.value.productModelId = undefined;
+ form.value.model = "";
+ form.value.unit = "";
+ modelOptions.value = [];
modelList({ id: value }).then((res) => {
modelOptions.value = res;
})
};
+
+const handleChangeModel = (value) => {
+ form.value.model = modelOptions.value.find(item => item.id == value)?.model || '';
+ form.value.unit = modelOptions.value.find(item => item.id == value)?.unit || '';
+};
const findNodeById = (nodes, productId) => {
for (let i = 0; i < nodes.length; i++) {
if (nodes[i].value === productId) {
--
Gitblit v1.9.3