From e8ad5d296ab8707604fa87569cc3b92d74fb8c50 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 30 Aug 2024 09:57:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/checkType/index.vue        |  2 +-
 src/views/quality/checkTypeProject/index.vue |  1 +
 src/views/quality/incomeReport/index.vue     | 35 ++++++-------
 src/views/quality/inventoryReport/index.vue  | 52 ++++++++++----------
 src/views/quality/llAnalysisReport/index.vue | 44 ++++++++---------
 src/views/quality/qcProjectType/index.vue    | 13 +++--
 6 files changed, 77 insertions(+), 70 deletions(-)

diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue
index ddcd1e4f..415a6468 100644
--- a/src/views/quality/checkType/index.vue
+++ b/src/views/quality/checkType/index.vue
@@ -94,7 +94,7 @@
 						type="text"
 						icon="el-icon-connection"
 						@click="handleBind(scope.row)"
-					>绑定</el-button>
+					>分配检检员</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue
index 6d87934b..d564fbcb 100644
--- a/src/views/quality/checkTypeProject/index.vue
+++ b/src/views/quality/checkTypeProject/index.vue
@@ -206,6 +206,7 @@
           <el-form-item label="下差值" prop="downDiff">
             <el-input v-model="form.downDiff" placeholder="请输入下差值" />
           </el-form-item>
+
           <el-form-item label="单位" prop="unit">
             <el-select v-model="form.unit" placeholder="请选择单位" >
               <el-option
diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index a26455aa..ba44fd24 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -111,7 +111,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -124,7 +124,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"
@@ -185,14 +185,14 @@
 								<el-input v-model="form.supplierName" disabled/>
 							</el-form-item>
 						</el-col>
-						<el-col :span="8">	
+						<el-col :span="8">
 							<el-form-item label="供应编码" prop="supplierCode">
 								<el-input v-model="form.supplierCode" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
-						<el-col :span="8">	
+						<el-col :span="8">
 							<el-form-item label="来料数量" prop="quality">
 								<el-input type="number" v-model="form.quality" disabled/>
 							</el-form-item>
@@ -214,7 +214,7 @@
 								<el-input v-model="form.standardNo" disabled />
 							</el-form-item>
 						</el-col>
-						
+
 						 <el-col :span="8">
 							<el-form-item label="报检日期" prop="createTime">
 								<el-input v-model="form.createTime" disabled>
@@ -229,33 +229,34 @@
 								</el-input>
 							</el-form-item>
 						</el-col>
-					</el-row>	
+					</el-row>
 					<el-row>
-						<el-col :span="24">	
+						<el-col :span="24">
 							<!-- 检验项目明细 -->
 							<el-table v-loading="loading" :data="checkProjectList" >
 								<el-table-column type="selection" width="50" align="center" />
 								<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="samplePlan" width="60"/>
-								<el-table-column label="实测结果" align="center" prop="actualValue" width="180"/>
+								<el-table-column label="标准要求" align="center" prop="checkStandard" width="400"/>
+								<!--<el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/>-->
+								<el-table-column label="实测结果" align="center" prop="actualValue" width="130"/>
 								<el-table-column label="判定" align="center" prop="status" width="70">
 								    <template slot-scope="scope">
 										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
 									</template>
 								</el-table-column>
+								<!--
 								<el-table-column label="不良类型" align="center" prop="defectCode" width="80">
 									<template slot-scope="scope">
 										<span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span>
 									</template>
 								</el-table-column>
-								<el-table-column label="不良数量" align="center" prop="defectQuality" width="80"/>
+								<el-table-column label="不良数量" align="center" prop="defectQuality" width="80"/>-->
 								<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>
@@ -294,13 +295,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>
 
@@ -598,7 +599,7 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
-.center-text {  
+.center-text {
 	text-align: center;
 }
 .report-logo {
@@ -606,4 +607,4 @@ export default {
 	margin-left: 15px;
     height: 38px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/quality/inventoryReport/index.vue b/src/views/quality/inventoryReport/index.vue
index c7129095..6bf2ed9a 100644
--- a/src/views/quality/inventoryReport/index.vue
+++ b/src/views/quality/inventoryReport/index.vue
@@ -110,7 +110,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -123,7 +123,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"
@@ -183,14 +183,14 @@
 								<el-input v-model="form.supplierName" disabled/>
 							</el-form-item>
 						</el-col>
-						<el-col :span="8">	
+						<el-col :span="8">
 							<el-form-item label="供应编码" prop="supplierCode">
 								<el-input v-model="form.supplierCode" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
-						<el-col :span="8">	
+						<el-col :span="8">
 							<el-form-item label="库存数量" prop="quality">
 								<el-input type="number" v-model="form.quality" disabled/>
 							</el-form-item>
@@ -212,7 +212,7 @@
 								<el-input v-model="form.sampleQuality" disabled />
 							</el-form-item>
 						</el-col>
-						
+
 						 <el-col :span="8">
 							<el-form-item label="报检日期" prop="createTime">
 								<el-input v-model="form.createTime" disabled>
@@ -227,34 +227,35 @@
 								</el-input>
 							</el-form-item>
 						</el-col>
-					</el-row>	
+					</el-row>
 					<el-row>
-						<el-col :span="24">	
+						<el-col :span="24">
 							<!-- 检验项目明细 -->
 							<el-table v-loading="loading" :data="checkProjectList" >
 								<el-table-column type="selection" width="50" align="center" />
 								<el-table-column label="序号" align="center" type="index" width="50"/>
 								<el-table-column label="检验项目" align="center" prop="ruleName" />
-								<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="unitCode" width="50"/>
-								<el-table-column label="实测结果" align="center" prop="actualValue" width="160"/>
+								<el-table-column label="标准要求" align="center" prop="checkStandard" width="350"/>
+								<!--<el-table-column label="抽检数" align="center" prop="sampleNum" width="60"/>
+								<el-table-column label="单位" align="center" prop="unitCode" width="50"/>-->
+								<el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
 								<el-table-column label="判定" align="center" prop="status" width="70">
 								    <template slot-scope="scope">
 										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
 									</template>
 								</el-table-column>
+								<!--
 								<el-table-column label="不良类型" align="center" prop="defectCode" width="80">
 									<template slot-scope="scope">
 										<span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span>
 									</template>
 								</el-table-column>
-								<el-table-column label="不良数量" align="center" prop="defectQuality" width="80"/>
+								<el-table-column label="不良数量" align="center" prop="defectQuality" width="80"/>-->
 								<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>
@@ -263,12 +264,13 @@
 					</el-row>
 					<el-row>
 						<el-col>
-							<el-form-item label="综合检验结论" prop="checkManName" label-width="100px">
-								<el-col offset="6" span="6">
-									<el-checkbox disabled>合格</el-checkbox>
+							<el-form-item label="综合检验结论" label-width="100px">
+								 <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 disabled>不合格</el-checkbox>
+								<el-col :span="8">
+									备注:判定合格打“√”，不合格打“×”
 								</el-col>
 							</el-form-item>
 						</el-col>
@@ -292,13 +294,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>
 
@@ -425,7 +427,7 @@ export default {
 				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');
 			}
-                                                                                         
+
 			listInventory(this.queryParams).then(response => {
 				this.incomeList = response.rows;
 				this.total = response.total;
@@ -468,7 +470,7 @@ export default {
 				updateTime: null,
 				factoryCode: null,
 				delFlag: null,
-				
+
 			};
 			this.resetForm("form");
 		},
@@ -586,7 +588,7 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
-.center-text {  
+.center-text {
 	text-align: center;
 }
 .report-logo {
@@ -594,4 +596,4 @@ export default {
 	margin-left: 15px;
     height: 38px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/quality/llAnalysisReport/index.vue b/src/views/quality/llAnalysisReport/index.vue
index cc669da7..4ffafa36 100644
--- a/src/views/quality/llAnalysisReport/index.vue
+++ b/src/views/quality/llAnalysisReport/index.vue
@@ -22,7 +22,7 @@
 				</el-select>
 			</el-form-item>
 			<el-form-item v-show="queryParams.ymdms=='yyyy'" label="检验时间">
-				<el-date-picker				
+				<el-date-picker
 				v-model="queryParams.incomeTimeStr"
 				style="width: 230px"
 				type="year"
@@ -38,8 +38,8 @@
 				<el-date-picker v-model="queryParams.incomeTimeStr" size="small" style="width: 230px" type="date" value-format="yyyy-MM-dd" placeholder="选择检验时间"
 				/>
 			</el-form-item>
-			
-			
+
+
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -103,7 +103,7 @@
 </template>
 
 <script>
-import { getIncomeTableList,getTableHzTitleTh,getTableHzDataSC,getTableHzNoOkData,getDictData} from "@/api/quality/qcTable";
+import { getIncomeTableList,getTableHzTitleTh,getTableHzDataSC,getTableHzNoOkDataSC,getDictData} from "@/api/quality/qcTable";
 import moment from 'moment';
 import * as echarts from "echarts";
 
@@ -139,7 +139,7 @@ export default {
 				checkType:'checkTypeLL',
 				ymdms: 'dd',
 				incomeTimeStr: moment().format('YYYY-MM-DD'),
-				
+
 			},
 			// 表单参数
 			form: {},
@@ -173,7 +173,7 @@ export default {
 				// },
 			],
 			tableThead:[
-				
+
 			],
 			tableTbody:[],
 			tableBlfx:[],
@@ -188,9 +188,9 @@ export default {
 			this.getTbody()
 			this.getBlfx()
 		// })
-		
+
 		// this.getEchartsThl()
-	
+
 
 	},
 	created() {
@@ -207,7 +207,7 @@ export default {
 			let res=await getTableHzTitleTh({checkType:'checkTypeLL'})
 			console.log('resTh',res)
 			this.tableThead=res.columns1
-			
+
 		},
 		async getTbody(){
 			this.loading=true
@@ -223,7 +223,7 @@ export default {
 			res.map((item,index)=>{
 				xData.push(item.timeCol),
 				yData.push(item.noOkRate)
-				
+
 			})
 			console.log('tableTbody',this.tableTbody)
 			this.loading=false
@@ -233,7 +233,7 @@ export default {
 			let xdata=[]
 			let ydata=[]
 			let peiData=[]
-			let res=await getTableHzNoOkData(this.queryParams)
+			let res=await getTableHzNoOkDataSC(this.queryParams)
 			console.log('res不良分析',res)
 			res.map((item,index)=>{
 				var pDat={}
@@ -296,7 +296,7 @@ export default {
 						rotate: _this.queryParams.ymdms=='mm'?50:0,
 						fontSize:11
 					},
-					
+
 					data: xData
 				},
 				yAxis: {
@@ -311,7 +311,7 @@ export default {
 					}
 				},
 				series: [
-					{   
+					{
 						name:'成品包装不良率%',
 						data: yData,
 						type: 'line',
@@ -339,7 +339,7 @@ export default {
 				]
 				};
 
-				optionl && myChartl.setOption(optionl);	
+				optionl && myChartl.setOption(optionl);
 		},
 		getEchartsTl(xdata,ydata){
 			var chartDoml = document.getElementById('echartTsl');
@@ -360,7 +360,7 @@ export default {
 						show:false,
 						inside:true,
 					},
-					
+
 					data: xdata
 				},
 				yAxis: {
@@ -370,7 +370,7 @@ export default {
 					},
 				},
 				series: [
-					{   
+					{
 						name:'成品包装不良率%',
 						data: ydata,
 						type: 'bar',
@@ -397,7 +397,7 @@ export default {
 				]
 				};
 
-				option2l && myChart2l.setOption(option2l);	
+				option2l && myChart2l.setOption(option2l);
 		},
 		getEchartsThl(peiData){
 			console.log('peiData',peiData)
@@ -445,7 +445,7 @@ export default {
 					}
 				]
 			}
-			option3l && myChart3l.setOption(option3l);	
+			option3l && myChart3l.setOption(option3l);
 		},
 		// 表单重置
 		reset() {
@@ -480,7 +480,7 @@ export default {
 			this.getThead()
 			this.getTbody()
 			this.getBlfx()
-			
+
 		},
 		/** 重置按钮操作 */
 		resetQuery() {
@@ -525,7 +525,7 @@ export default {
 			padding: 5px 0px;
 			font-weight: 600;
 		}
-	}	
+	}
 	.top-right-table{
 		display: flex;
 		justify-content: space-between;
@@ -549,7 +549,7 @@ export default {
 				font-weight: 600;
 			}
 		}
-		
+
 	}
 }
 .bottom-echart{
@@ -616,4 +616,4 @@ export default {
 
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/quality/qcProjectType/index.vue b/src/views/quality/qcProjectType/index.vue
index 54d32aae..36ccf32b 100644
--- a/src/views/quality/qcProjectType/index.vue
+++ b/src/views/quality/qcProjectType/index.vue
@@ -129,14 +129,17 @@
         <el-table-column label="检验方式" align="center" prop="checkMode" :show-overflow-tooltip="true" width="200"/>
         <el-table-column label="检验工具" align="center" prop="checkTool" />
         <el-table-column label="检验标准" align="center" prop="checkStandard" :show-overflow-tooltip="true" width="200"/>
-		<!--
+
         <el-table-column label="单位" align="center" prop="unitCode" >
           <template slot-scope="scope"><dict-tag :options="dict.type.unit" :value="scope.row.unitCode"/></template>
         </el-table-column>
+		<!--
         <el-table-column label="抽样方案" align="center" prop="samplePlan" :show-overflow-tooltip="true" width="200"/>
 		-->
         <el-table-column label="合格下限" align="center" prop="downDiff"  width="100"/>
 		<el-table-column label="合格上限" align="center" prop="upperDiff"  width="100"/>
+
+		</el-table-column>
         <el-table-column label="检测项分类" align="center" prop="itemType" width="100" :formatter="itemTypeFormat" />
         <!--<el-table-column label="合格判定比例" align="center" prop="judgeRate"  width="150"/>-->
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
@@ -243,7 +246,7 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
-					<!--
+
 					<el-row>
 						<el-col>
 							<el-form-item label="单位" prop="unitCode">
@@ -258,7 +261,7 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
-					-->
+
 				</template>
 				<!--
 				<el-row>
@@ -275,7 +278,7 @@
 						</el-form-item>
 					</el-col>
 				</el-row>-->
-			
+
 				<el-row>
 					<el-col>
 						<el-form-item label="检测项分类" prop="itemType">
@@ -577,7 +580,7 @@ export default {
       }else{
         this.$modal.msgError("此方案不允许修改");
       }
-      
+
     }
 	}
 };