From 8f0c9fa6e686dfa6c733d892744cf7c4cb7bf668 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 25 Oct 2023 16:42:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/material/index.vue  |  6 ++---
 src/views/quality/qcProduce/index.vue | 39 ++++++++++++++++++++-------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/views/quality/material/index.vue b/src/views/quality/material/index.vue
index 9f29016..649ddec 100644
--- a/src/views/quality/material/index.vue
+++ b/src/views/quality/material/index.vue
@@ -67,7 +67,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -98,7 +98,7 @@
 
 <script>
 import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/quality/material";
-import UserBind from "./UserBind.vue";
+import UserBind from "./userbind.vue";
 
 export default {
 	name: "Material",
@@ -222,7 +222,7 @@ export default {
 			this.title = "修改人员物料绑定";
 			this.optType = "edit";
 			// getMaterial(userCode).then(response => {
-				
+
 			// });
 		},
 		/** 提交按钮 */
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index ba67263..d928bd6 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -220,7 +220,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -238,7 +238,7 @@
 							<el-input v-model="form.checkNo" placeholder="请输入检验任务编号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">	
+					<el-col :span="8">
 						<el-form-item label="批次号" prop="batchNo">
 							<el-input v-model="form.batchNo" placeholder="请输入批次号" />
 						</el-form-item>
@@ -263,14 +263,26 @@
 							<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
 						</el-form-item>
 					</el-col>
-				</el-row>	
+				</el-row>
 				<el-row>
-					<el-col :span="12">	
+					<el-col :span="8">
+						<el-form-item label="检验类型" prop="typeCode" >
+							<el-select v-model="form.typeCode" placeholder="请选择检验类型" style="width: 100%;">
+								<el-option
+									v-for="dict in checkTypes"
+									:key="dict.value"
+									:label="dict.label"
+									:value="dict.value"
+								></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
 						<el-form-item label="收货数量" prop="quality">
 							<el-input type="number" v-model="form.quality" placeholder="请输入收货数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="12">
+					<el-col :span="8">
 						<el-form-item label="单位" prop="unit" >
 							<el-select v-model="form.unit" placeholder="请选择单位" style="width: 100%;">
 								<el-option
@@ -291,7 +303,7 @@
 							</el-input>
 						</el-form-item>
 					</el-col>
-				   <el-col :span="8">	
+				   <el-col :span="8">
 						<el-form-item label="车间编码" prop="carCode">
 							<el-input v-model="form.carCode" placeholder="请输入所属车间编码" disabled/>
 						</el-form-item>
@@ -306,7 +318,7 @@
 							</el-date-picker>
 						</el-form-item>
 					</el-col>
-				</el-row>	
+				</el-row>
 				<el-row>
 					<el-col :span="8">
 						<el-form-item label="检测人姓名" prop="checkManName">
@@ -320,12 +332,12 @@
 							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">	
+					<el-col :span="8">
 						<el-form-item label="检测地点" prop="checkLoc">
 							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
 						</el-form-item>
 					</el-col>
-				</el-row>	
+				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -417,6 +429,9 @@ export default {
 			},
 			// 表单参数
 			form: {},
+
+            checkTypes:[],
+
 			// 表单校验
 			rules: {
 				batchNo: [
@@ -452,9 +467,13 @@ export default {
 	created() {
 		this.getDate();
 		this.getList();
+		this.getCheckTypes();
 	},
 	methods: {
+        /****/
+		getList() {
 
+		},
         /**获取默认查询时间段**/
 		getDate() {
 			let start = this.Fungetdate (0)
@@ -629,7 +648,7 @@ export default {
            this.form.carCode = obj.code;
 		   this.form.carName = obj.name;
 		},
-		
+
 		/**人员选择弹出框**/
 		handleSelectUser() {
 		  this.$refs.itemSelectUser.showFlag = true;