From 08805ba136a70c4b57ffd9a07f443f4dbaa3409b Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 8 Aug 2024 23:35:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=A0=BC=E5=BC=8F=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/quality/incomeReport/index.vue  | 30 ++++++++-------
 src/views/quality/produceReport/index.vue | 17 ++++++--
 src/views/quality/productReport/index.vue | 47 ++++++++++++-----------
 3 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index 62742dd..a26455a 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -210,8 +210,8 @@
 					</el-row>
 					<el-row>
 						<el-col :span="8">
-							<el-form-item label="抽检数量" prop="sampleQuality">
-								<el-input v-model="form.sampleQuality" disabled />
+							<el-form-item label="检验依据" prop="standardNo">
+								<el-input v-model="form.standardNo" disabled />
 							</el-form-item>
 						</el-col>
 						
@@ -238,7 +238,7 @@
 								<el-table-column label="序号" align="center" type="index" width="50"/>
 								<el-table-column label="检验项目" align="center" prop="projectRuleName" />
 								<el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/>
-								<el-table-column label="抽检数" align="center" prop="sampleNum" width="60"/>
+								<el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/>
 								<el-table-column label="实测结果" align="center" prop="actualValue" width="180"/>
 								<el-table-column label="判定" align="center" prop="status" width="70">
 								    <template slot-scope="scope">
@@ -265,14 +265,13 @@
 					<el-row>
 						<el-col>
 							<el-form-item label="综合检验结论" label-width="100px">
-								<el-checkbox-group v-model="form.checkedValues">
-									<el-col offset="6" span="6">
-									<el-checkbox label="Y">合格</el-checkbox>
+								 <el-col :span="6">
+									<span v-if="this.checkResult=='Y'">√合格</span>
+									<span label="N" v-else>×不合格</span>
 								</el-col>
-								<el-col offset="3" span="6">
-									<el-checkbox label="N">不合格</el-checkbox>
+								<el-col :span="8">
+									备注:判定合格打“√”，不合格打“×”
 								</el-col>
-								</el-checkbox-group>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -330,6 +329,7 @@ export default {
 			//打印
 			formRef: 'form',
 			validateRules: [],
+			checkResult: 'Y',
 			printData: {
 				printable: 'printFrom',
 				ignore: ['no-print'],
@@ -424,9 +424,12 @@ export default {
 		getList() {
 			this.loading = true;
 
-			if(this.queryParams.checkTimeArray.length>0){
+			if(this.queryParams.checkTimeArray != null &&this.queryParams.checkTimeArray.length>0){
 				this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
+			}else{
+				this.queryParams.checkTimeStart = null;
+				this.queryParams.checkTimeEnd = null;
 			}
 
 			listIncome(this.queryParams).then(response => {
@@ -505,9 +508,10 @@ export default {
 			getIncome(recordId).then(response => {
 				this.form = response.data;
 
-				let checkedValues0 =[];
-				checkedValues0.push(response.data.checkResult)
-				this.form.checkedValues = checkedValues0;
+				//let checkedValues0 =[];
+				//checkedValues0.push(response.data.checkResult)
+				//this.form.checkedValues = checkedValues0;
+				this.checkResult = response.data.checkResult;
 
 				this.form.printable = 'printFrom'; //打印时需要
 				this.form.ignore = ['no-print'];//打印时需要
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index bc4b74e..c0bd8ab 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -521,9 +521,20 @@
 					<el-descriptions title="" border :column="1" :labelStyle="{width: '123px'}" :contentStyle="{width:'85%'}">
 						<el-descriptions-item label="批量或致命性质量异常"></el-descriptions-item>
 					</el-descriptions>
-					<el-descriptions title="" border :column="1" :labelStyle="{width:'100%'}" :contentStyle="{width:'0%'}">
-						<el-descriptions-item label="备注:无异常的打√，有异常的描述异常及数量比例，有数据的需要填写数据"></el-descriptions-item>
-					</el-descriptions>
+					<div style="display: flex;justify-content: space-between;">
+						<div style="width: 50%;">
+							<el-descriptions title="" border :span="2" :column="1" :labelStyle="{width:'50%'}" :contentStyle="{width:'0%'}">
+								<el-descriptions-item label="备注:无异常的打√，有异常的描述异常及数量比例，有数据的需要填写数据">
+								</el-descriptions-item>
+							</el-descriptions>
+						</div>
+						<div style="width: 50%;">
+							<el-descriptions title="" border :column="1" :labelStyle="{width:'5%'}" :contentStyle="{width:'50%'}">
+								<el-descriptions-item label="说明">{{form.bz}}
+								</el-descriptions-item>
+							</el-descriptions>
+						</div>
+					</div>
 					<br/>
 					<!-- 底部 -->
 					<el-row class="my-print-foot">
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index 302fa51..d0976b4 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -100,7 +100,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -113,7 +113,7 @@
 		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
-					<el-button 
+					<el-button
 						    class="print-btn"
 							size="mini"
 							type="primary"
@@ -134,13 +134,13 @@
 						</el-col>
 					</el-row>
 					<el-row>
-						<el-col :span="8" class="center-text">
+						<el-col class="center-text">
 							<h2>成品检验报告</h2>
 						</el-col>
 					</el-row>
 					<el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
 						<el-descriptions-item label="产品名称" class="my-description-item1">{{form.materialName}}</el-descriptions-item>
-						<el-descriptions-item label="生产数量" class="my-description-item2">{{form.quality}}</el-descriptions-item>
+						<el-descriptions-item label="生产数量(单位/箱)" class="my-description-item2">{{form.quality}}</el-descriptions-item>
 						<el-descriptions-item label="检验编码" class="my-description-item3">{{form.checkNo}}</el-descriptions-item>
 
 						<el-descriptions-item label="产品编码" class="my-description-item1">{{form.materialCode}}</el-descriptions-item>
@@ -152,16 +152,16 @@
 						<el-descriptions-item label="检验日期" class="my-description-item3">{{form.checkTime}}</el-descriptions-item>
 					</el-descriptions>
 					<el-row class="border-row">
-						<el-col :span="24">	
+						<el-col :span="24">
 							包装检验项目
-						</el-col>	
-						<el-col :span="24">	
+						</el-col>
+						<el-col :span="24">
 							<!-- 检验项目明细 -->
 							<el-table v-loading="loading" :data="checkProjectList" border :span-method="objectSpanMethod" >
 									<el-table-column label="序号" align="center" type="index" width="50"/>
 									<el-table-column label="检验项目" align="center" prop="projectRuleName" width="100"/>
 									<el-table-column label="标准要求" align="center" prop="checkStandard"/>
-									<el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/>
+									<el-table-column label="抽检数(PC)" align="center" prop="samplePlan" width="60"/>
 									<!--<el-table-column label="单位" align="center" prop="unitCode" width="50"/>-->
 									<el-table-column label="实测结果及判定" align="center">
 										<el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
@@ -177,8 +177,8 @@
 									<el-table-column label="附件" align="center" prop="files" width="120">
 										<template slot-scope="scope">
 											<el-image v-for="(item,index) in scope.row.files" :key="index"
-											:src="item.fileAddress" 
-											style="width: 100px; height: 100px" 
+											:src="item.fileAddress"
+											style="width: 100px; height: 100px"
 											:fit="fit" />
 										</template>
 									</el-table-column>
@@ -187,16 +187,16 @@
 						</el-col>
 					</el-row>
 					<el-row class="border-row">
-						<el-col :span="24">	
+						<el-col :span="24">
 							内容物分析项目
-						</el-col>	
-						<el-col :span="24">	
+						</el-col>
+						<el-col :span="24">
 							<!-- 检验项目明细 -->
 							<el-table v-loading="loading" :data="checkProjectList0" border>
 								<el-table-column label="序号" align="center" type="index" width="50"/>
 								<el-table-column label="检验项目" align="center" prop="projectRuleName" width="100"/>
 								<el-table-column label="标准要求" align="center" prop="checkStandard"/>
-								<el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/>
+								<el-table-column label="抽检数(PC)" align="center" prop="samplePlan" width="60"/>
 								<el-table-column label="实测结果及判定" align="center">
 									<el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
 									<el-table-column label="判定" align="center" prop="status" width="110"/>
@@ -211,7 +211,7 @@
 								<span label="N" v-else>×不合格</span>
 							</el-col>
 							<el-col :span="8">
-								判定合格打“√”，不合格打“×”
+								备注:判定合格打“√”，不合格打“×”
 							</el-col>
 						</el-descriptions-item>
 					</el-descriptions>
@@ -226,7 +226,7 @@
 					<el-row>
 						<el-col :span="10">
 							<el-form-item label="品检主管：" label-width="100px">
-								
+
 							</el-form-item>
 						</el-col>
 						<el-col :span="10">
@@ -237,13 +237,13 @@
 					</el-row>
 				</el-form>
 			</div>
-			
+
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="cancel">确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
-		
+
 	</div>
 </template>
 
@@ -385,9 +385,12 @@ export default {
 		getList() {
 			this.loading = true;
 
-			if(this.queryParams.checkTimeArray.length>0){
+			if(this.queryParams.checkTimeArray != null &&this.queryParams.checkTimeArray.length>0){
 				this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
+			}else{
+				this.queryParams.checkTimeStart = null;
+				this.queryParams.checkTimeEnd = null;
 			}
 
 			listProduct(this.queryParams).then(response => {
@@ -505,7 +508,7 @@ export default {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");
 			}).catch(() => {});
-			
+
 		},
 		/** 导出按钮操作 */
 		handleExport() {
@@ -616,7 +619,7 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
-.center-text {  
+.center-text {
   text-align: center;
 }
 .report-logo {
@@ -638,4 +641,4 @@ export default {
   text-align:center;
 }
 
-</style>
\ No newline at end of file
+</style>