From c7996bd83f1396e4f4fd70e082aefa126f5fbfea Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 9 Apr 2024 10:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=96=99=E5=A2=9E=E5=8A=A0=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/qcIncome/index.vue | 43 ++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index 162ddb9..9fee865 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -17,6 +17,16 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
+			<el-form-item label="来料类别" prop="orderType">
+				<el-select v-model="queryParams.orderType" placeholder="请选择来料类别" clearable style="width: 100%;">
+					<el-option
+						v-for="dict in dict.type.order_type_ll"
+						:key="dict.value"
+						:label="dict.label"
+						:value="dict.value"
+					></el-option>
+				</el-select>
+			</el-form-item>
 			<el-form-item label="物料号" prop="materialCode">
 				<el-input
 					v-model="queryParams.materialCode"
@@ -150,6 +160,11 @@
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="供应商编码" align="center" prop="supplierCode" width="120"/>
 			<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
+			<el-table-column label="来料类别" align="center" prop="orderType" width="100">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.order_type_ll" :value="scope.row.orderType" />
+				</template>
+			</el-table-column>
 			<el-table-column label="来料时间" align="center" prop="incomeTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -217,12 +232,12 @@
 		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 				<el-row>
-				   <el-col :span="8">
+				   <el-col :span="6">
 						<el-form-item label="检验任务编号" prop="checkNo">
 							<el-input v-model="form.checkNo" placeholder="请输入检验任务编号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="检验类型" prop="checkType" >
 							<el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
 								<el-option
@@ -234,7 +249,19 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-                    <el-col :span="8">
+					<el-col :span="6">
+						<el-form-item label="来料类型" prop="orderType" >
+							<el-select v-model="form.orderType" placeholder="请选择检验类型" style="width: 100%;">
+								<el-option
+									v-for="dict in dict.type.order_type_ll"
+									:key="dict.value"
+									:label="dict.label"
+									:value="dict.value"
+								></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+                    <el-col :span="6">
 						<el-form-item label="订单号" prop="orderNo">
 							<el-input v-model="form.orderNo" placeholder="请输入订单号">
 									<el-button slot="append" @click="handleSelectWorkOrder" icon="el-icon-search"></el-button>
@@ -373,7 +400,7 @@ import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
 export default {
 	name: "Income",
 	components: { ItemSelectWorkOrder,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
-	dicts: ["unit","check_status","check_result"],
+	dicts: ["unit","check_status","check_result","order_type_ll"],
 	data() {
 		return {
 			// 遮罩层
@@ -457,11 +484,9 @@ export default {
 				checkManName: [
 					{ required: true, message: "检测人不能为空", trigger: "blur" }
 				],
-				/**
-				checkLoc: [
-					{ required: true, message: "检测地点不能为空", trigger: "blur" }
-				],
-				**/
+				orderType: [
+					{ required: true, message: "来料类型不能为空", trigger: "blur" }
+				]
 			}
 		};
 	},