From 77023c6a193b24bf672fcefeb996cf04a029e410 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 15 Dec 2023 17:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F-=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/prepare/index.vue               |  7 ++++++-
 src/views/quality/qcIncome/index.vue          | 11 +++++++---
 .../quality/qcIncome/selectLLWorkOrder.vue    |  1 +
 src/views/quality/qcProduce/index.vue         | 11 +++++++---
 .../quality/qcProduce/selectWorkOrder.vue     |  7 ++++---
 src/views/quality/qcWarehousing/index.vue     | 21 ++++++++++++++-----
 .../quality/qcWarehousing/selectWorkOrder.vue |  5 +++--
 7 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index dced4b2a..9338540d 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -252,7 +252,7 @@
             <el-table-column
               prop="materialName"
               label="物料描述"
-              width="320">
+              width="240">
             </el-table-column>
             <el-table-column
               prop="unit"
@@ -274,7 +274,12 @@
             </el-table-column>
             <el-table-column
               prop="routeCode"
+			  width="80"
               label="实发数量">
+            </el-table-column>
+			<el-table-column
+              prop="recoil"
+              label="反冲物料">
             </el-table-column>
           </el-table>
 
diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index ab77a977..d7fa5e59 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -253,17 +253,22 @@
 					</el-col>
 				</el-row>	
 				<el-row>
-					<el-col :span="8">	
+					<el-col :span="6">	
 						<el-form-item label="收货数量" prop="quality">
 							<el-input type="number" v-model="form.quality" placeholder="请输入收货数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">	
+					<el-col :span="6">	
+						<el-form-item label="抽样数量" prop="sampleQuality">
+							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">	
 						<el-form-item label="不合格数量" prop="noOkQuality">
 							<el-input type="number" v-model="form.noOkQuality" placeholder="请输入不合格数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="单位" prop="unit" >
 							<el-select v-model="form.unit" placeholder="请选择单位" style="width: 100%;">
 								<el-option
diff --git a/src/views/quality/qcIncome/selectLLWorkOrder.vue b/src/views/quality/qcIncome/selectLLWorkOrder.vue
index 70ca1fe4..cf113828 100644
--- a/src/views/quality/qcIncome/selectLLWorkOrder.vue
+++ b/src/views/quality/qcIncome/selectLLWorkOrder.vue
@@ -27,6 +27,7 @@
           <el-table-column width="50" align="center" type="selection"/>
           <el-table-column label="id"  align="left"  prop="recordId" width="100" v-if="false"/>
           <el-table-column label="入库单号"  align="left"  prop="orderNo" width="180"/>
+          <el-table-column label="质检状态"  align="left"  prop="qualityStatus" width="100"/>
           <el-table-column label="批次号"  align="left" prop="incomeBatchNo" width="120"/>
           <el-table-column label="产品编码"  align="left" prop="materialCode" width="180" />
           <el-table-column label="产品名称"  align="left" prop="materialName" width="180"/>
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 500a5f1a..511c8b9f 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -319,17 +319,22 @@
 					</el-col>
 				</el-row>
 				<el-row>
-					<el-col :span="8">
+					<el-col :span="6">	
+						<el-form-item label="抽样数量" prop="sampleQuality">
+							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
 						<el-form-item label="A类不良数量" prop="aNoOkquality">
 							<el-input type="number" v-model="form.aNoOkquality" placeholder="请输入不良数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="B类不良数量" prop="bNoOkquality">
 							<el-input type="number" v-model="form.bNoOkquality" placeholder="请输入不良数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
                         <el-form-item label="C类不良数量" prop="cNoOkquality">
 							<el-input type="number" v-model="form.cNoOkquality" placeholder="请输入不良数量" />
 						</el-form-item>
diff --git a/src/views/quality/qcProduce/selectWorkOrder.vue b/src/views/quality/qcProduce/selectWorkOrder.vue
index a2270c67..7d7fee16 100644
--- a/src/views/quality/qcProduce/selectWorkOrder.vue
+++ b/src/views/quality/qcProduce/selectWorkOrder.vue
@@ -25,12 +25,13 @@
         </el-form>
         <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
           <el-table-column width="50" align="center" type="selection"/>
-          <el-table-column label="订单号"  align="left"  prop="orderNo" width="180"/>
-          <el-table-column label="工单号"  align="left"  prop="workorderCode" width="180"/>
+          <el-table-column label="订单号"  align="left"  prop="orderNo" width="120"/>
+          <el-table-column label="订单状态"  align="left"  prop="status" width="90"/>
+          <el-table-column label="工单号"  align="left"  prop="workorderCode" width="130"/>
           <el-table-column label="产品编码"  align="left" prop="materialCode" width="180" />
           <el-table-column label="产品名称"  align="left" prop="materialName" width="180"/>
           <el-table-column label="排产数量"  align="left" prop="quality" width="100" />
-          <el-table-column label="单位"  align="left" prop="unit" :show-overflow-tooltip="true" />
+          <el-table-column label="单位"  align="left" prop="unit" :show-overflow-tooltip="true" width="80"/>
           <el-table-column label="生产日期"  align="left" prop="incomeTime" :show-overflow-tooltip="true" >
           			<template slot-scope="scope">
                   <span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d}') }}</span>
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 16415f07..933c5735 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -280,9 +280,9 @@
 					</el-col>
 				</el-row>	
 				<el-row>
-                    <el-col :span="8">
+                    <el-col :span="6">
 						<el-form-item label="入库时间" prop="incomeTime">
-							<el-date-picker clearable
+							<el-date-picker clearable style="width: 100%;"
 								v-model="form.incomeTime"
 								type="datetime"
 								value-format="yyyy-MM-dd HH:mm:ss"
@@ -290,7 +290,17 @@
 							</el-date-picker>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">	
+						<el-form-item label="抽样数量" prop="sampleQuality">
+							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">	
+						<el-form-item label="不合格数量" prop="noOkQuality">
+							<el-input type="number" v-model="form.noOkQuality" placeholder="请输入不合格数量" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
 						<el-form-item label="单位" prop="unit" >
 							<el-select v-model="form.unit" placeholder="请选择单位" style="width: 100%;">
 								<el-option
@@ -302,6 +312,9 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
+
+				</el-row>
+				<el-row>
 					<el-col :span="8">
 						<el-form-item label="批次号" prop="incomeBatchNo">
 							<el-select v-model="form.incomeBatchNo" class="selectItem" placeholder="请选择批次" clearable>
@@ -313,8 +326,6 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-				</el-row>
-				<el-row>
 					<el-col :span="8">
 						<el-form-item label="仓库名称" prop="supplierName">
 							<el-input v-model="form.supplierName" placeholder="请选择仓库名称">
diff --git a/src/views/quality/qcWarehousing/selectWorkOrder.vue b/src/views/quality/qcWarehousing/selectWorkOrder.vue
index a2270c67..aa571a41 100644
--- a/src/views/quality/qcWarehousing/selectWorkOrder.vue
+++ b/src/views/quality/qcWarehousing/selectWorkOrder.vue
@@ -25,8 +25,9 @@
         </el-form>
         <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
           <el-table-column width="50" align="center" type="selection"/>
-          <el-table-column label="订单号"  align="left"  prop="orderNo" width="180"/>
-          <el-table-column label="工单号"  align="left"  prop="workorderCode" width="180"/>
+          <el-table-column label="订单号"  align="left"  prop="orderNo" width="120"/>
+          <el-table-column label="订单状态"  align="left"  prop="status" width="90"/>
+          <el-table-column label="工单号"  align="left"  prop="workorderCode" width="130"/>
           <el-table-column label="产品编码"  align="left" prop="materialCode" width="180" />
           <el-table-column label="产品名称"  align="left" prop="materialName" width="180"/>
           <el-table-column label="排产数量"  align="left" prop="quality" width="100" />