From e056438c3d42ce07d4fe375e32ad69298b147997 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Wed, 24 Jan 2024 16:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A=E9=A6=96?=
 =?UTF-8?q?=E6=A3=80=E3=80=81=E5=B7=A1=E6=A3=80=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../produceReport/ItemCheckProjects.vue        |  5 -----
 .../produceReport/ItemCheckProjectsXJ.vue      | 13 ++++++-------
 src/views/quality/produceReport/index.vue      | 18 +++++++++---------
 src/views/quality/qcProduce/index.vue          | 17 ++++++++++-------
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/src/views/quality/produceReport/ItemCheckProjects.vue b/src/views/quality/produceReport/ItemCheckProjects.vue
index 926c74e..58ecc3d 100644
--- a/src/views/quality/produceReport/ItemCheckProjects.vue
+++ b/src/views/quality/produceReport/ItemCheckProjects.vue
@@ -138,11 +138,6 @@
                     <el-input v-model="form.reason" placeholder="请选择检验原因" disabled/>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="生产类型" prop="productType" > 
-                    <el-input v-model="form.productType" placeholder="请输入生产类型" disabled/>
-                  </el-form-item>
-                </el-col>
               </el-row>
               <el-divider></el-divider>
               <el-row>
diff --git a/src/views/quality/produceReport/ItemCheckProjectsXJ.vue b/src/views/quality/produceReport/ItemCheckProjectsXJ.vue
index 894a34e..087aa23 100644
--- a/src/views/quality/produceReport/ItemCheckProjectsXJ.vue
+++ b/src/views/quality/produceReport/ItemCheckProjectsXJ.vue
@@ -84,14 +84,13 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="16">
-                  <el-form-item label="检验原因" prop="reason">
-                    <el-input v-model="form.reason" placeholder="请选择检验原因" disabled/>
-                  </el-form-item>
-                </el-col>
                 <el-col :span="8">
-                  <el-form-item label="生产类型" prop="productType" > 
-                    <el-input v-model="form.productType" placeholder="请输入生产类型" disabled/>
+                  <el-form-item label="生产类型" prop="productType" >
+                    <el-radio-group v-model="form.productType">
+                      <el-radio :label="'a'">正常</el-radio>
+                      <el-radio :label="'b'">返修</el-radio>
+                      <el-radio :label="'c'">试产</el-radio>
+                    </el-radio-group>
                   </el-form-item>
                 </el-col>
               </el-row>
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index a49ed42..fd23b2f 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -168,18 +168,18 @@
 						</el-col>
 					</el-row>
 					<!-- 导航栏 -->
-					<el-row class="my-print-nav">
+					<el-row class="my-print-nav" gutter="10">
 						<el-col :span="3">生成车间:{{form.supplierName}}</el-col>
 						<el-col :span="3">生成线体:{{form.lineName}}</el-col>
 						<el-col :span="3">检查日期:{{form.checkTimeStart}}</el-col>
 						<el-col :span="4">产品名称:{{form.materialName}}</el-col>
 						<el-col :span="6">批次号:{{form.incomeBatchNo}}</el-col>
-						<el-col :span="4">生产类型:
-							<el-checkbox-group  v-model="checkList">
-								<el-checkbox label="正常"></el-checkbox>
-								<el-checkbox label="返修"></el-checkbox>
-								<el-checkbox label="试产"></el-checkbox>
-							</el-checkbox-group>
+						<el-col :span="5">生产类型:
+							<el-radio-group v-model="form.productType">
+								<el-radio :label="'a'">正常</el-radio>
+								<el-radio :label="'b'">返修</el-radio>
+								<el-radio :label="'c'">试产</el-radio>
+							</el-radio-group>
 						</el-col>
 					</el-row>
 					<!-- 主数据 -->
@@ -362,8 +362,8 @@
 					<br/>
 					<!-- 底部 -->
 					<el-row class="my-print-foot">
-						<el-col :offset="1" :span="3">检查人:</el-col>
-						<el-col :offset="2" :span="3">品质主管:</el-col>
+						<el-col :offset="1" :span="3">检查人:{{form.checkManName}}</el-col>
+						<el-col :offset="2" :span="3">品质主管:{{form.confirmManName}}</el-col>
 
 					</el-row>
 					</el-form>
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 7311f91..ff87e96 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -382,11 +382,6 @@
 					</el-col>
 				</el-row>
 				<el-row>
-					<el-col :span="8">
-						<el-form-item label="生产类型" prop="productType" >
-							<el-input v-model="form.productType" placeholder="请输入生产类型"/>
-						</el-form-item>
-					</el-col>
 					<el-col :span="8">
 						<el-form-item label="确认人姓名" prop="confirmManName">
 							<el-input v-model="form.confirmManName" placeholder="请选择确认人姓名">
@@ -399,10 +394,18 @@
 							<el-input v-model="form.confirmManCode" placeholder="请输入确认人工号" disabled/>
 						</el-form-item>
 					</el-col>
-					
+					<el-col :span="8" v-if="form.checkType == 'checkTypeSCXJ'">
+						<el-form-item label="生产类型" prop="productType" >
+							<el-radio-group v-model="form.productType">
+								<el-radio :label="'a'">正常</el-radio>
+								<el-radio :label="'b'">返修</el-radio>
+								<el-radio :label="'c'">试产</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
 				</el-row>
 				<el-row>
-					<el-col :span="24">
+					<el-col :span="24" v-if="form.checkType == 'checkTypeSC'">
 						<el-form-item label="检验原因" prop="reason">
 							<el-input v-model="form.reason" placeholder="请选择检验原因"/>
 						</el-form-item>