From 114aecd86d1708fe3f63ecdc2ee62c7df0c802fb Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 5 Jan 2024 16:11:48 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/deviceOrder/index.vue         | 2 +-
 src/views/device/spotInspectionOrder/index.vue | 6 +++---
 src/views/device/upkeepOrder/index.vue         | 4 ++--
 src/views/system/datasource/authUser.vue       | 4 ++--
 src/views/wms/equipment/index.vue              | 6 ++++++
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index 8cdbc73..fc8f099 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -44,7 +44,7 @@
         />
       </el-form-item>
       <el-form-item label="工单状态" prop="orderStatus">
-        <el-select v-model="queryParams.planStatus" placeholder="请选择工单状态" clearable>
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
           <el-option
             v-for="dict in dict.type.device_order_status"
             :key="dict.value"
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index 4cdf526..724ecf9 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -44,7 +44,7 @@
 				/>
 			</el-form-item>
 			<el-form-item label="工单状态" prop="orderStatus">
-        <el-select v-model="queryParams.planStatus" placeholder="请选择工单状态" clearable>
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
           <el-option
             v-for="dict in dict.type.device_order_status"
             :key="dict.value"
@@ -318,6 +318,8 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column v-if="false" label="主键" align="center" prop="orderId" />
 			<el-table-column v-if="false" label="计划id" align="center" prop="planId" />
+      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column width="120" label="设备名称" align="center" prop="equipmentName" />
 			<el-table-column width="150" label="计划编码" align="center" prop="planCode" />
 			<el-table-column width="150" label="计划名称" align="center" prop="planName" />
 			<el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
@@ -359,8 +361,6 @@
 					<span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-			<el-table-column width="120" label="设备名称" align="center" prop="equipmentName" />
 			<el-table-column label="工单状态" align="center" prop="orderStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 971c046..b991c90 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -43,8 +43,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单状态" prop="planStatus">
-        <el-select v-model="queryParams.planStatus" placeholder="请选择工单状态" clearable>
+      <el-form-item label="工单状态" prop="orderStatus">
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
           <el-option
             v-for="dict in dict.type.device_order_status"
             :key="dict.value"
diff --git a/src/views/system/datasource/authUser.vue b/src/views/system/datasource/authUser.vue
index 053f607..c8beb2d 100644
--- a/src/views/system/datasource/authUser.vue
+++ b/src/views/system/datasource/authUser.vue
@@ -110,7 +110,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         datasourceId: undefined,
-        userName: undefined,
+        userName: null,
         phonenumber: undefined
       }
     };
@@ -180,4 +180,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 67fae2e..d9997b5 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -1306,6 +1306,7 @@ export default {
             label: response.rows[i].materialCode + response.rows[i].materialDesc,
           });
         }
+        console.log(this.auxiliaryEquipmentRightList)
         for (let i in response.selected) {
           this.rightList.push(response.selected[i].key);
           this.form.rightData = this.rightList;
@@ -1460,6 +1461,7 @@ export default {
 
       this.queryAuxiliaryEquipmentParams.equipmentCategory = '0';
       listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => {
+        console.log("listEquipment")
         this.auxiliaryEquipmentLeftList = [];
         for (let i in response.rows) {
           // 将返回的列表赋值于穿梭框左边列表
@@ -1468,9 +1470,11 @@ export default {
             label: response.rows[i].equipmentCode + response.rows[i].equipmentName + response.rows[i].remark,
           });
         }
+        console.log(this.auxiliaryEquipmentRightList)
       });
 
       getEquipment(equipmentId).then((response) => {
+        console.log("getEquipment")
         this.form = response.data;
         this.rightList = [];
         for (let i in response.data.selectedData) {
@@ -1478,12 +1482,14 @@ export default {
           this.rightList.push(response.data.selectedData[i].spareCode);
         }
         this.auxiliaryEquipmentRightList = [];
+        console.log(this.auxiliaryEquipmentRightList)
         for (let i in response.data.selectedEquipmentData) {
           // 将返回的辅助设备列表赋值于穿梭框右边列表
           this.auxiliaryEquipmentRightList.push(
             response.data.selectedEquipmentData[i].auxiliaryEquipmentCode
           );
         }
+        console.log(this.auxiliaryEquipmentRightList)
 
         if (response.data.imageFiles != null) {
           var newFiles = [];

From e31ab3b7cfdb7705c21effab4a1a407a6d580ee6 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Fri, 5 Jan 2024 18:08:31 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/firstReport/index.vue   |   2 +-
 src/views/quality/incomeReport/index.vue  | 130 ++++++++++++----------
 src/views/quality/produceReport/index.vue |  21 ++--
 3 files changed, 81 insertions(+), 72 deletions(-)

diff --git a/src/views/quality/firstReport/index.vue b/src/views/quality/firstReport/index.vue
index 2fb0c1c..68341b2 100644
--- a/src/views/quality/firstReport/index.vue
+++ b/src/views/quality/firstReport/index.vue
@@ -142,7 +142,7 @@
 					</el-row>
 					<el-row>
 						<el-col :offset="8" :span="8">
-							<h3 style="align-content: center;">（黑蚊香）首检确认表</h3>
+							<h2 style="align-content: center;">（黑蚊香）首检确认表</h2>
 						</el-col>
 					</el-row>
 					<el-row>
diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index f32b916..9d89cf9 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -134,124 +134,108 @@
 			</el-row>
 			<!-- 打印整个printFrom区域 -->
 			<div id="printFrom">
-				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+				<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 					<el-row>
-						<el-col :span="8">
-							<el-form-item label="OEM厂名" prop="supplierName">
-								<el-input v-model="form.supplierName" placeholder="请输入OEM厂名" disabled/>
-							</el-form-item>
+						<el-col :offset="8" :span="8" class="center-text">
+							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :offset="8" :span="8" class="center-text">
+							<h2>白坯检验报告</h2>
+						</el-col>
+					</el-row>
+					<el-row>
 						<el-col :span="8">
 							<el-form-item label="来料类别" prop="factoryCode">
-								<el-input v-model="form.factoryCode" placeholder="请输入来料类别" disabled/>
+								<el-input v-model="form.factoryCode" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="生产批号" prop="incomeBatchNo">
-								<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批号" disabled/>
+								<el-input v-model="form.incomeBatchNo" disabled/>
 							</el-form-item>
 						</el-col>
+						<el-col :span="8">
+							<el-form-item label="报告编号" prop="checkNo">
+								<el-input v-model="form.checkNo" disabled />
+							 </el-form-item>
+						 </el-col>
 					</el-row>
 					<el-row>
-						<el-col :span="8">
-							<el-form-item label="物料编码" prop="materialCode">
-								<el-input v-model="form.materialCode" placeholder="请选择物料编码" disabled />
-							</el-form-item>
-						</el-col>
 						<el-col :span="16">
 							<el-form-item label="物料名称" prop="materialName">
-								<el-input v-model="form.materialName" placeholder="请选择物料名称" disabled />
+								<el-input v-model="form.materialName" disabled />
 							 </el-form-item>
 						 </el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="8">	
-							<el-form-item label="供应商编码" prop="supplierCode">
-								<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/>
+						 <el-col :span="8">
+							<el-form-item label="物料编码" prop="materialCode">
+								<el-input v-model="form.materialCode" disabled />
 							</el-form-item>
 						</el-col>
+					</el-row>
+					<el-row>
 						<el-col :span="16">
 							<el-form-item label="供应单位" prop="supplierName">
-								<el-input v-model="form.supplierName" placeholder="请选择供应商名称" disabled/>
+								<el-input v-model="form.supplierName" disabled/>
+							</el-form-item>
+						</el-col>
+						<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-form-item label="来料数量" prop="quality">
-								<el-input type="number" v-model="form.quality" placeholder="请输入物料数量" disabled/>
+								<el-input type="number" v-model="form.quality" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="单位" prop="unit" >
-								<el-input v-model="form.unit" placeholder="请输入单位" disabled/>
+								<el-input v-model="form.unit" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="物料来源" prop="checkType" >
-								<el-input v-model="form.checkType" placeholder="物料来源" disabled/>
-								<!-- <el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
-									<el-option
-										v-for="dict in checkTypes"
-										:key="dict.id"
-										:label="dict.checkName"
-										:value="dict.id"
-									></el-option>
-								</el-select> -->
+								<el-input v-model="form.checkType" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
 						<el-col :span="8">
 							<el-form-item label="抽检数量" prop="sampleQuality">
-								<el-input v-model="form.sampleQuality" placeholder="请选择抽样数量" disabled />
+								<el-input v-model="form.sampleQuality" disabled />
 							</el-form-item>
 						</el-col>
-						<el-col :span="8">
-							<el-form-item label="报告编号" prop="checkNo">
-								<el-input v-model="form.checkNo" placeholder="请选择报告编号" disabled />
-							 </el-form-item>
-						 </el-col>
+						
 						 <el-col :span="8">
 							<el-form-item label="报检日期" prop="createTime">
-								<el-input v-model="form.createTime" placeholder="请输入报检日期" disabled>
+								<el-input v-model="form.createTime" disabled>
 									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
 								</el-input>
 							</el-form-item>
 						</el-col>
-					</el-row>
-					<el-row>
 						<el-col :span="8">
 							<el-form-item label="检验日期" prop="checkTime">
-								<el-input v-model="form.checkTime" placeholder="请输入检验日期" disabled>
+								<el-input v-model="form.checkTime" disabled>
 									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
 								</el-input>
 							</el-form-item>
 						</el-col>
-						<!-- <el-col :span="8">
-							<el-form-item label="检验编号" prop="checkNo">
-								<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
-							</el-form-item>
-						</el-col> -->
-						<el-col :span="8">
-							<el-form-item label="产品提报人" prop="checkManName">
-								<el-input v-model="form.checkManName" placeholder="请输入OEM产品提报人" disabled/>
-							</el-form-item>
-						</el-col>
 					</el-row>	
 					<el-row>
 						<el-col :span="24">	
 							<!-- 检验项目明细 -->
 							<el-table v-loading="loading" :data="checkProjectList" >
 								<el-table-column type="selection" width="55" align="center" />
-								<el-table-column label="序号" align="center" type="index" width="100"/>
+								<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="200"/>
-								<el-table-column label="上差值" align="center" prop="upperDiff" />
-								<el-table-column label="下差值" align="center" prop="downDiff" />
-								<el-table-column label="抽检数量" align="center" prop="sampleNum" />
+								<el-table-column label="抽检数" align="center" prop="sampleNum" />
 								<el-table-column label="单位" align="center" prop="unitCode" />
-								<el-table-column label="实测结果" align="center" prop="actualValue" width="200"/>
+								<el-table-column label="实测结果" align="center" prop="actualValue" width="300"/>
 								<el-table-column label="判定" align="center" prop="status" >
 								    <template slot-scope="scope">
 										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
@@ -259,7 +243,36 @@
 								</el-table-column>	
 							</el-table>
 						</el-col>
-					</el-row>	
+					</el-row>
+					<el-row>
+						<el-col>
+							<el-form-item label="综合检验结论" prop="checkManName">
+								<el-col offset="6" span="6">
+									<el-checkbox disabled>合格</el-checkbox>
+								</el-col>
+								<el-col offset="3" span="6">
+									<el-checkbox disabled>不合格</el-checkbox>
+								</el-col>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="8">
+							<el-form-item label="品管经理/主任：" label-width="120PX">
+								<el-input disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="品质主管：">
+								<el-input disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="品管员：" prop="checkManName">
+								<el-input v-model="form.checkManName" disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
 				</el-form>
 			</div>
 			
@@ -526,7 +539,7 @@ export default {
 			printJS({
 				printable: params.printable, // 'printFrom', // 标签元素id
 				type: params.type || 'html',
-				maxWidth: 1500, // 最大宽度
+				maxWidth: 1600, // 最大宽度
 				font_size: "",// 设置字体大小
 				header: "来料检验结果报告",//params.header, // '表单',
 				targetStyles: ['*'],
@@ -543,4 +556,7 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
+.center-text {  
+	text-align: center;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 1683027..b72f1fc 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -56,16 +56,6 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
-			<!-- <el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['quality:qcIncome:add']"
-				>新增</el-button>
-			</el-col> -->
 			<el-col :span="1.5">
 				<el-button
 					type="warning"
@@ -267,13 +257,13 @@
 			<div id="firstReportPrint">
 				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 					<el-row>
-						<el-col :offset="8" :span="8">
-							<h1 style="align-content: center;">中山榄菊日化实业有限公司</h1>
+						<el-col :offset="8" :span="8" class="center-text">
+							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
 					<el-row>
-						<el-col :offset="8" :span="8">
-							<h3 style="align-content: center;">（黑蚊香）首检确认表</h3>
+						<el-col :offset="8" :span="8" class="center-text">
+							<h2>（黑蚊香）首检确认表</h2>
 						</el-col>
 					</el-row>
 					<el-row>
@@ -659,4 +649,7 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
+.center-text {  
+  text-align: center;
+}
 </style>
\ No newline at end of file

From bccf33ea7db782abfa5fe76f2f3e2b44523b9408 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 5 Jan 2024 21:29:05 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/qcTable.js                    |  16 +
 src/views/quality/qcProduceAnalysis/index.vue | 360 ++++++++++++++++++
 2 files changed, 376 insertions(+)
 create mode 100644 src/views/quality/qcProduceAnalysis/index.vue

diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js
index 0d56b5e..3eb6652 100644
--- a/src/api/quality/qcTable.js
+++ b/src/api/quality/qcTable.js
@@ -49,3 +49,19 @@ export function getXJChartData(query) {
 		params: query
 	});
 }
+
+export function getQmsRateTable(query) {
+	return request({
+		url: '/quality/staticTable/getQmsRateTable',
+		method: 'get',
+		params: query
+	});
+}
+
+export function getCheckTypeList(typeCode) {
+	return request({
+		url: '/quality/staticTable/getCheckTypeList/' + typeCode,
+		method: 'get',
+		params: query
+	});
+}
\ No newline at end of file
diff --git a/src/views/quality/qcProduceAnalysis/index.vue b/src/views/quality/qcProduceAnalysis/index.vue
new file mode 100644
index 0000000..015fce6
--- /dev/null
+++ b/src/views/quality/qcProduceAnalysis/index.vue
@@ -0,0 +1,360 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" class="edit-el-form">
+			<el-form-item label="订单编码" prop="orderNo">
+				<el-input
+					v-model="queryParams.orderNo"
+					placeholder="请输入订单编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="批次编码" prop="incomeBatchNo">
+				<el-input
+					v-model="queryParams.incomeBatchNo"
+					placeholder="请选择批次编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="产品编号" prop="materialCode">
+				<el-input
+					v-model="queryParams.materialCode"
+					placeholder="请输入产品编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="生产车间" prop="supplierCode">
+				<el-select v-model="queryParams.supplierCode" clearable placeholder="请选择生产车间" filterable clearable>
+					<el-option
+						v-for="dict in workCenterList"
+						:key="dict.factoryCode"
+						:label="dict.factoryName"
+						:value="dict.factoryCode"
+					></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="检验类型" prop="typeCode">
+				<el-select v-model="queryParams.typeCode" clearable placeholder="请选择检验类型" @change="getCheckTypeList">
+					<el-option
+						v-for="dict in dict.type.check_type"
+						:key="dict.value"
+						:label="dict.label"
+						:value="dict.value"
+					></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="检验节点" prop="checkType">
+				<el-select v-model="queryParams.checkType" clearable placeholder="请选择检验节点">
+					<el-option
+						v-for="dict in checkTypeList"
+						:key="dict.checkType"
+						:label="dict.checkName"
+						:value="dict.checkType"
+					></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="生产时间" prop="incomeTimeArray">
+                <el-date-picker
+				v-model="queryParams.incomeTimeArray"
+				format="yyyy-MM-dd"
+				type="datetimerange"
+				range-separator="至"
+				start-placeholder="开始日期"
+				end-placeholder="结束日期">
+				</el-date-picker>
+			</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>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['mes:prepare:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="车间编码" align="center" prop="supplierCode" width="80">
+				 <template slot-scope="scope">
+					<el-button
+						type="text"
+						@click="handleDetail(scope.row)"
+					>{{scope.row.supplierCode}}</el-button>
+				</template>
+			</el-table-column>
+			<el-table-column prop="supplierName" label="车间名称" width="100" align="center"/>
+			<el-table-column prop="orderNo" label="订单编码" width="160" align="center"/>
+			<el-table-column prop="incomeBatchNo" label="批次" width="220" align="center"/>
+			<el-table-column prop="materialName" label="产品名称"align="center" width="180" :show-overflow-tooltip="true"/>
+			<el-table-column prop="materialCode" label="产品编码" width="130" align="center"
+			:formatter="productCodeFormate"/>
+			<el-table-column prop="quality" label="数量" width="80" align="center"/>
+			<el-table-column prop="unit" label="单位" width="80" align="center"/>
+			<el-table-column prop="sampleQuality" label="抽样数量" width="80" align="center"/>
+			<el-table-column prop="noOkNums" label="不良数量" width="80" align="center"/>
+			<el-table-column prop="noOkNumRate" label="不良率(%)" width="80" align="center"/>
+		</el-table>
+
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+	</div>
+</template>
+
+<script>
+import { getQmsRateTable,getWorkcenterList,getCheckTypeList} from "@/api/quality/qcTable";
+import moment from "moment/moment";
+export default {
+	name: "qcAnalysis",
+	dicts: ["check_type"],
+	data() {
+		return {
+			newWorkerLoading: false,
+			refreshNewWorkerTable:true,
+			// 选择领料单
+			selectPrepare:[],
+			// 打印
+			formRef: 'form',
+			validateRules: [],
+			printDialogVisible: false,
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 表格数据
+			tableList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				checkNo: null,
+				typeCode:null,
+				checkType:null,
+				orderNo: null,
+				productId: null,
+				materialCode: null,
+				prodType: null,
+				materialName: null,
+				productSpc: null,
+				wetDetailPlanId: null,
+				incomeTime: null,
+				incomeBatchNo:null,
+				incomeTimeArray: [],
+				ymArrayStart:null,
+				ymArrayEnd:null
+			},
+            workCenterList:[],
+            checkTypeList:[],
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {},
+			openReport : false,
+			titleReport : "工单报工详情"
+		};
+	},
+	created() {
+		this.getWorkCenterList();
+		this.getDate();
+		this.getList();
+	},
+	methods: {
+        /**获取默认查询时间段**/
+		getDate() {
+			let start = this.Fungetdate (0);
+			let end = this.Fungetdate (1);
+			this.queryParams.incomeTimeArray.push(start,end);
+		},
+		Fungetdate (num) {
+			var dd = new Date();
+			dd.setDate(dd.getDate() + num);
+			var y = dd.getFullYear();
+			var m = dd.getMonth() + 1;//获取当前月份的日期
+			var d = dd.getDate();
+			return y + "-" + m + "-" + d;
+		},	
+        /**获取车间数据**/
+		getWorkCenterList(){
+			getWorkcenterList(this.queryParams).then(response => {
+				this.workCenterList = response
+			})
+		},
+		getCheckTypeList(val){
+			getCheckTypeList(val).then(response => {
+				this.checkTypeList = response
+			})
+		},
+		indexMethod(index){
+			return index+1 ;
+		},
+		/** 查询备料单列表 */
+		getList() {
+			this.loading = true;
+
+			if(this.queryParams.incomeTimeArray.length>0){
+				this.queryParams.ymArrayStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD');
+				this.queryParams.ymArrayEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD');
+			}
+
+			getQmsRateTable(this.queryParams).then(response => {
+				this.tableList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.openReport = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				prepareId: null,
+				checkNo: null,
+				workorderName: null,
+				parentOrder: null,
+				orderId: null,
+				orderNo: null,
+				productId: null,
+				materialCode: null,
+				prodType: null,
+				materialName: null,
+				productSpc: null,
+				wetDetailPlanId: null,
+				incomeTime: null,
+				incomeBatchNo:null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+				factoryCode: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.getDate();
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.prepareId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+      this.selectPrepare = selection
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加备料单";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const prepareId = row.prepareId || this.ids
+			getPrepare(prepareId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改备料单";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.prepareId != null) {
+						updatePrepare(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addPrepare(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		//产品编码格式化
+		productCodeFormate(row, column, cellValue){
+			return cellValue.slice(7,18);  //返回值
+		},
+		/** 报工详情按钮操作 */
+		handleDetail(row) {
+			this.reset();
+			let sr = row;
+     
+			this.queryParams.orderNo = sr.orderNo;
+			getXJCheckTableDetail(this.queryParams).then(response => {
+				this.pOrderTableList = response;
+				this.openReport = true;
+				this.titleReport = "过程巡检详情";
+			});
+
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('mes/prepare/export', {
+				...this.queryParams
+			}, `prepare_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>
+<style>
+.my-print-head {
+  margin-top: 20px;
+  font-weight: bold;
+}
+.my-print-nav {
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+.my-print-table {
+
+}
+.my-print-foot {
+  margin-top: 20px;
+}
+</style>

From fd7edcd57984fa7e481028c2d8b39050ccd7319e Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 8 Jan 2024 10:51:46 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/incomeReport/index.vue  | 12 ++---
 src/views/quality/produceReport/index.vue |  6 +--
 src/views/quality/productReport/index.vue | 66 +++++++++++------------
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index 9d89cf9..792d838 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -120,7 +120,7 @@
 		/>
 
 		<!-- 打印来料检验对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
 					<el-button 
@@ -136,7 +136,7 @@
 			<div id="printFrom">
 				<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 					<el-row>
-						<el-col :offset="8" :span="8" class="center-text">
+						<el-col :offset="7" :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -246,7 +246,7 @@
 					</el-row>
 					<el-row>
 						<el-col>
-							<el-form-item label="综合检验结论" prop="checkManName">
+							<el-form-item label="综合检验结论" prop="checkManName" label-width="100px">
 								<el-col offset="6" span="6">
 									<el-checkbox disabled>合格</el-checkbox>
 								</el-col>
@@ -258,12 +258,12 @@
 					</el-row>
 					<el-row>
 						<el-col :span="8">
-							<el-form-item label="品管经理/主任：" label-width="120PX">
+							<el-form-item label="品管经理/主任：" label-width="120px">
 								<el-input disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="品质主管：">
+							<el-form-item label="品质主管：" label-width="100px">
 								<el-input disabled/>
 							</el-form-item>
 						</el-col>
@@ -541,7 +541,7 @@ export default {
 				type: params.type || 'html',
 				maxWidth: 1600, // 最大宽度
 				font_size: "",// 设置字体大小
-				header: "来料检验结果报告",//params.header, // '表单',
+				//header: "来料检验结果报告",//params.header, // '表单',
 				targetStyles: ['*'],
 				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
 				ignoreElements: params.ignore || [], // ['no-print']
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index b72f1fc..00245fb 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -241,7 +241,7 @@
 		</el-dialog>
 
 		<!-- 打印首检对话框 -->
-		<el-dialog :title="title" :visible.sync="firstReportOpen" width="1200px" append-to-body>
+		<el-dialog :title="title" :visible.sync="firstReportOpen" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
 					<el-button 
@@ -257,7 +257,7 @@
 			<div id="firstReportPrint">
 				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 					<el-row>
-						<el-col :offset="8" :span="8" class="center-text">
+						<el-col :offset="7" :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -630,7 +630,7 @@ export default {
 				type: params.type || 'html',
 				maxWidth: 1500, // 最大宽度
 				font_size: "",// 设置字体大小
-				header: "生产过程检验结果报告",//params.header, // '表单',
+				//header: "生产过程检验结果报告",//params.header, // '表单',
 				targetStyles: ['*'],
 				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
 				ignoreElements: params.ignore || [], // ['no-print']
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index bdea3a6..a2d6249 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -120,7 +120,7 @@
 		/>
 
 		<!-- 打印成品检验对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
 					<el-button 
@@ -136,85 +136,82 @@
 			<div id="printFrom">
 				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 					<el-row>
-						<el-col :span="8">
-							<el-form-item label="OEM厂名" prop="supplierName">
-								<el-input v-model="form.supplierName" placeholder="请输入OEM厂名" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="来料类别" prop="factoryCode">
-								<el-input v-model="form.factoryCode" placeholder="请输入检验任务编号" disabled/>
-							</el-form-item>
+						<el-col :offset="7" :span="10" class="center-text">
+							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
-						<el-col :span="8">
-							<el-form-item label="生产批号" prop="incomeBatchNo">
-								<el-input v-model="form.incomeBatchNo" placeholder="请输入生产批号" disabled/>
-							</el-form-item>
+					</el-row>
+					<el-row>
+						<el-col :offset="8" :span="8" class="center-text">
+							<h2>成品检验报告</h2>
 						</el-col>
 					</el-row>
 					<el-row>
 						<el-col :span="8">
 							   <el-form-item label="产品编码" prop="materialCode">
-								<el-input v-model="form.materialCode" placeholder="请选择物料编码" disabled />
+								<el-input v-model="form.materialCode" disabled />
 							</el-form-item>
 						</el-col>
 						<el-col :span="16">
 							<el-form-item label="产品名称" prop="materialName">
-								<el-input v-model="form.materialName" placeholder="请选择物料名称" disabled />
+								<el-input v-model="form.materialName" disabled />
 							 </el-form-item>
 						 </el-col>
 					</el-row>
+					<el-row>
+						<el-col :span="8">
+							<el-form-item label="来料类别" prop="factoryCode">
+								<el-input v-model="form.factoryCode" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="生产批号" prop="incomeBatchNo">
+								<el-input v-model="form.incomeBatchNo" disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
 					<el-row>
 						<el-col :span="8">	
 							<el-form-item label="仓库编码" prop="supplierCode">
-								<el-input v-model="form.supplierCode" placeholder="请输入仓库编码" disabled/>
+								<el-input v-model="form.supplierCode" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="16">
 							<el-form-item label="仓库名称" prop="supplierName">
-								<el-input v-model="form.supplierName" placeholder="请选择仓库名称" disabled/>
+								<el-input v-model="form.supplierName" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
 						<el-col :span="8">	
 							<el-form-item label="生产数量" prop="quality">
-								<el-input type="number" v-model="form.quality" placeholder="请输入物料数量" disabled/>
+								<el-input type="number" v-model="form.quality" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="单位" prop="unit" >
-								<el-input v-model="form.unit" placeholder="请输入单位" disabled/>
+								<el-input v-model="form.unit" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="物料来源" prop="checkType" >
-								<el-input v-model="form.checkType" placeholder="物料来源" disabled/>
-								<!-- <el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
-									<el-option
-										v-for="dict in checkTypes"
-										:key="dict.id"
-										:label="dict.checkName"
-										:value="dict.id"
-									></el-option>
-								</el-select> -->
+								<el-input v-model="form.checkType" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
 						<el-col :span="8">
 							<el-form-item label="抽样地点" prop="checkLoc">
-								<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
+								<el-input v-model="form.checkNo" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="检验依据" prop="checkNo">
-								<el-input v-model="form.checkManName" placeholder="请输入检验依据" disabled/>
+								<el-input v-model="form.checkManName" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="检验编号" prop="checkNo">
-								<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
+								<el-input v-model="form.checkNo" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -529,7 +526,7 @@ export default {
 				type: params.type || 'html',
 				maxWidth: 1500, // 最大宽度
 				font_size: "",// 设置字体大小
-				header: "成品入库检验结果报告",//params.header, // '表单',
+				//header: "成品入库检验结果报告",//params.header, // '表单',
 				targetStyles: ['*'],
 				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
 				ignoreElements: params.ignore || [], // ['no-print']
@@ -544,4 +541,7 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
+.center-text {  
+  text-align: center;
+}
 </style>
\ No newline at end of file

From 48f819d9cbf63aa43259eb2d155a0b7e84ab255d Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 8 Jan 2024 14:01:50 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E7=8E=87=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/qcTable.js                    | 12 +++--
 src/views/quality/qcProduceAnalysis/index.vue | 44 +++++++++----------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js
index 3eb6652..445b7e8 100644
--- a/src/api/quality/qcTable.js
+++ b/src/api/quality/qcTable.js
@@ -61,7 +61,13 @@ export function getQmsRateTable(query) {
 export function getCheckTypeList(typeCode) {
 	return request({
 		url: '/quality/staticTable/getCheckTypeList/' + typeCode,
-		method: 'get',
-		params: query
+		method: 'get'
 	});
-}
\ No newline at end of file
+}
+
+export function getSupplierList(typeCode) {
+	return request({
+		url: '/quality/staticTable/getSupplierList/' + typeCode,
+		method: 'get'
+	});
+}
diff --git a/src/views/quality/qcProduceAnalysis/index.vue b/src/views/quality/qcProduceAnalysis/index.vue
index 015fce6..bdfbfcb 100644
--- a/src/views/quality/qcProduceAnalysis/index.vue
+++ b/src/views/quality/qcProduceAnalysis/index.vue
@@ -25,16 +25,6 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="生产车间" prop="supplierCode">
-				<el-select v-model="queryParams.supplierCode" clearable placeholder="请选择生产车间" filterable clearable>
-					<el-option
-						v-for="dict in workCenterList"
-						:key="dict.factoryCode"
-						:label="dict.factoryName"
-						:value="dict.factoryCode"
-					></el-option>
-				</el-select>
-			</el-form-item>
 			<el-form-item label="检验类型" prop="typeCode">
 				<el-select v-model="queryParams.typeCode" clearable placeholder="请选择检验类型" @change="getCheckTypeList">
 					<el-option
@@ -45,6 +35,16 @@
 					></el-option>
 				</el-select>
 			</el-form-item>
+			<el-form-item label="统计单位" prop="supplierCode">
+				<el-select v-model="queryParams.supplierCode" clearable placeholder="请选择统计单位" filterable clearable>
+					<el-option
+						v-for="dict in workCenterList"
+						:key="dict.supplierCode"
+						:label="dict.supplierName"
+						:value="dict.supplierCode"
+					></el-option>
+				</el-select>
+			</el-form-item>
 			<el-form-item label="检验节点" prop="checkType">
 				<el-select v-model="queryParams.checkType" clearable placeholder="请选择检验节点">
 					<el-option
@@ -87,15 +87,8 @@
 
 		<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="车间编码" align="center" prop="supplierCode" width="80">
-				 <template slot-scope="scope">
-					<el-button
-						type="text"
-						@click="handleDetail(scope.row)"
-					>{{scope.row.supplierCode}}</el-button>
-				</template>
-			</el-table-column>
-			<el-table-column prop="supplierName" label="车间名称" width="100" align="center"/>
+			<el-table-column label="单位编码" align="center" prop="supplierCode" width="80"/>
+			<el-table-column prop="supplierName" label="单位名称" width="100" align="center"/>
 			<el-table-column prop="orderNo" label="订单编码" width="160" align="center"/>
 			<el-table-column prop="incomeBatchNo" label="批次" width="220" align="center"/>
 			<el-table-column prop="materialName" label="产品名称"align="center" width="180" :show-overflow-tooltip="true"/>
@@ -119,7 +112,7 @@
 </template>
 
 <script>
-import { getQmsRateTable,getWorkcenterList,getCheckTypeList} from "@/api/quality/qcTable";
+import { getQmsRateTable,getWorkcenterList,getCheckTypeList,getSupplierList} from "@/api/quality/qcTable";
 import moment from "moment/moment";
 export default {
 	name: "qcAnalysis",
@@ -209,9 +202,14 @@ export default {
 			})
 		},
 		getCheckTypeList(val){
+			//获取检验节点
 			getCheckTypeList(val).then(response => {
 				this.checkTypeList = response
-			})
+			});
+			//获取统计单位
+            getSupplierList(val).then(response => {
+				this.workCenterList = response
+			});
 		},
 		indexMethod(index){
 			return index+1 ;
@@ -335,9 +333,9 @@ export default {
 		},
 		/** 导出按钮操作 */
 		handleExport() {
-			this.download('mes/prepare/export', {
+			this.download('quality/staticTable/exportProduceAnalysis', {
 				...this.queryParams
-			}, `prepare_${new Date().getTime()}.xlsx`)
+			}, `noOkRate_${new Date().getTime()}.xlsx`)
 		}
 	}
 };

From b32cf2101dace3d8e26105780c0544eef6199c4d Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 8 Jan 2024 14:46:47 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8Alogo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/incomeReport/index.vue  |  10 ++-
 src/views/quality/produceReport/index.vue |  10 ++-
 src/views/quality/productReport/index.vue | 100 +++++++++++-----------
 3 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index 792d838..e7f118f 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -136,7 +136,10 @@
 			<div id="printFrom">
 				<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 					<el-row>
-						<el-col :offset="7" :span="10" class="center-text">
+						<el-col :span="7">
+							<img src="@/assets/logo/lanjv.png" class="report-logo"/>
+						</el-col>
+						<el-col :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -559,4 +562,9 @@ export default {
 .center-text {  
 	text-align: center;
 }
+.report-logo {
+	margin-top: 15px;
+	margin-left: 15px;
+    height: 38px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 00245fb..901adef 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -257,7 +257,10 @@
 			<div id="firstReportPrint">
 				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 					<el-row>
-						<el-col :offset="7" :span="10" class="center-text">
+						<el-col :span="7">
+							<img src="@/assets/logo/lanjv.png" class="report-logo"/>
+						</el-col>
+						<el-col :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -652,4 +655,9 @@ export default {
 .center-text {  
   text-align: center;
 }
+.report-logo {
+	margin-top: 15px;
+	margin-left: 15px;
+    height: 38px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index a2d6249..9cc7964 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -56,16 +56,6 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
-			<!-- <el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['quality:qcIncome:add']"
-				>新增</el-button>
-			</el-col> -->
 			<el-col :span="1.5">
 				<el-button
 					type="warning"
@@ -136,7 +126,10 @@
 			<div id="printFrom">
 				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 					<el-row>
-						<el-col :offset="7" :span="10" class="center-text">
+						<el-col :span="7">
+							<img src="@/assets/logo/lanjv.png" class="report-logo"/>
+						</el-col>
+						<el-col :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -146,38 +139,14 @@
 						</el-col>
 					</el-row>
 					<el-row>
-						<el-col :span="8">
-							   <el-form-item label="产品编码" prop="materialCode">
-								<el-input v-model="form.materialCode" disabled />
-							</el-form-item>
-						</el-col>
 						<el-col :span="16">
 							<el-form-item label="产品名称" prop="materialName">
 								<el-input v-model="form.materialName" disabled />
-							 </el-form-item>
-						 </el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="8">
-							<el-form-item label="来料类别" prop="factoryCode">
-								<el-input v-model="form.factoryCode" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="生产批号" prop="incomeBatchNo">
-								<el-input v-model="form.incomeBatchNo" disabled/>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="8">	
-							<el-form-item label="仓库编码" prop="supplierCode">
-								<el-input v-model="form.supplierCode" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="16">
-							<el-form-item label="仓库名称" prop="supplierName">
-								<el-input v-model="form.supplierName" disabled/>
+							<el-form-item label="产品编码" prop="materialCode">
+								<el-input v-model="form.materialCode" disabled />
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -193,25 +162,25 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="物料来源" prop="checkType" >
-								<el-input v-model="form.checkType" disabled/>
+							<el-form-item label="检验编号" prop="checkNo">
+								<el-input v-model="form.checkNo" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
 						<el-col :span="8">
-							<el-form-item label="抽样地点" prop="checkLoc">
-								<el-input v-model="form.checkNo" disabled/>
+							<el-form-item label="生产批号" prop="incomeBatchNo">
+								<el-input v-model="form.incomeBatchNo" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="检验依据" prop="checkNo">
-								<el-input v-model="form.checkManName" disabled/>
+							<el-form-item label="抽样地点" prop="checkLoc">
+								<el-input v-model="form.checkLoc" disabled/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="检验编号" prop="checkNo">
-								<el-input v-model="form.checkNo" disabled/>
+							<el-form-item label="检验依据" prop="standardNo">
+								<el-input v-model="form.standardNo" disabled/>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -244,8 +213,6 @@
 								<el-table-column label="序号" align="center" type="index" width="100"/>
 								<el-table-column label="检验项目" align="center" prop="ruleName" />
 								<el-table-column label="标准要求" align="center" prop="checkStandard" width="200"/>
-								<el-table-column label="上差值" align="center" prop="upperDiff" />
-								<el-table-column label="下差值" align="center" prop="downDiff" />
 								<el-table-column label="抽检数量" align="center" prop="sampleNum" />
 								<el-table-column label="单位" align="center" prop="unitCode" />
 								<el-table-column label="实测结果" align="center" prop="actualValue" width="200"/>
@@ -256,7 +223,38 @@
 								</el-table-column>	
 							</el-table>
 						</el-col>
-					</el-row>	
+					</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-col>
+								<el-col offset="3" span="6">
+									<el-checkbox disabled>不合格</el-checkbox>
+								</el-col>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col>
+							<el-form-item label="备注：" label-width="120px">
+								<el-input type="textarea" disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="16">
+							<el-form-item label="品检主管：" label-width="100px">
+								<el-input disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="16">
+							<el-form-item label="品管员：" >
+								<el-input  disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
 				</el-form>
 			</div>
 			
@@ -502,6 +500,7 @@ export default {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");
 			}).catch(() => {});
+			
 		},
 		/** 导出按钮操作 */
 		handleExport() {
@@ -544,4 +543,9 @@ export default {
 .center-text {  
   text-align: center;
 }
+.report-logo {
+	margin-top: 15px;
+	margin-left: 15px;
+    height: 38px;
+}
 </style>
\ No newline at end of file

From 9b7670b94196bba9c71602c1567750ec9f91e003 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 9 Jan 2024 09:09:56 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/produceReport/index.vue | 233 ++++++++++------------
 1 file changed, 106 insertions(+), 127 deletions(-)

diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 901adef..67f259a 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -97,11 +97,11 @@
 						icon="el-icon-edit"
 						@click="handleLook(scope.row)"
 						v-hasPermi="['quality:qcIncomeReport:edit']"
-					>查看</el-button>
+					>查看报告</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -110,11 +110,11 @@
 			@pagination="getList"
 		/>
 
-		<!-- 添加或修改来料检验对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+		<!-- 产品巡检报告 -->
+		<el-dialog :title="title" :visible.sync="open" width="1370px" append-to-body>
 			<el-row>
 				<el-col :span="20">
-					<el-button 
+					<el-button
 						    class="print-btn"
 							size="mini"
 							type="primary"
@@ -125,117 +125,75 @@
 			</el-row>
 			<!-- 打印整个printFrom区域 -->
 			<div id="printFrom">
-				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+				<el-form :ref="formRef" :model="form" :rules="validateRules">
+					<!-- 表头-工单信息 -->
 					<el-row>
-						<el-col :span="8">
-							<el-form-item label="OEM厂名" prop="supplierName">
-								<el-input v-model="form.supplierName" placeholder="请输入OEM厂名" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="来料类别" prop="factoryCode">
-								<el-input v-model="form.factoryCode" placeholder="请输入检验任务编号" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="来料批号" prop="incomeBatchNo">
-								<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批号" disabled/>
-							</el-form-item>
+						<el-col :offset="7" :span="10" class="center-text">
+							<span style="font-size: 20px;padding: 13px;">中山榄菊日化实业有限公司</span>
 						</el-col>
 					</el-row>
 					<el-row>
-						<el-col :span="8">
-							   <el-form-item label="物料编码" prop="materialCode">
-								<el-input v-model="form.materialCode" placeholder="请选择物料编码" disabled />
-							</el-form-item>
+						<el-col :offset="8" :span="8" class="center-text">
+							<span style="font-size: 18px;padding: 6px;">产品巡检记录表</span>
 						</el-col>
-						<el-col :span="16">
-							<el-form-item label="物料名称" prop="materialName">
-								<el-input v-model="form.materialName" placeholder="请选择物料名称" disabled />
-							 </el-form-item>
-						 </el-col>
 					</el-row>
-					<el-row>
-						<el-col :span="8">	
-							<el-form-item label="产线编码" prop="supplierCode">
-								<el-input v-model="form.supplierCode" placeholder="请输入产线编码" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="16">
-							<el-form-item label="产线名称" prop="supplierName">
-								<el-input v-model="form.supplierName" placeholder="请选择产线名称" disabled/>
-							</el-form-item>
+					<!-- 导航栏 -->
+					<el-row class="my-print-nav">
+						<el-col :span="4">生成车间:{{printData.workCenter}}</el-col>
+						<el-col :span="4">生成线体:{{printData.workCenter}}</el-col>
+						<el-col :span="4">检查日期:{{printData.productDate}}</el-col>
+						<el-col :span="4">产品名称:{{printData.printDate}}</el-col>
+						<el-col :span="4">批次号:{{printData.printDate}}</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>
 					</el-row>
-					<el-row>
-						<el-col :span="8">	
-							<el-form-item label="物料数量" prop="quality">
-								<el-input type="number" v-model="form.quality" placeholder="请输入物料数量" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="单位" prop="unit" >
-								<el-input v-model="form.unit" placeholder="请输入单位" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="物料来源" prop="checkType" >
-								<el-input v-model="form.checkType" placeholder="物料来源" disabled/>
-								<!-- <el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
-									<el-option
-										v-for="dict in checkTypes"
-										:key="dict.id"
-										:label="dict.checkName"
-										:value="dict.id"
-									></el-option>
-								</el-select> -->
-							</el-form-item>
-						</el-col>
+					<!-- 主数据 -->
+					<el-table
+						v-if="refreshNewWorkerTable"
+						v-loading="newWorkerLoading"
+						class="my-print-table"
+						:data="printData.workTable"
+						border
+						style="width: 100%">
+						<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
+						<el-table-column label="序号" type="index" align="center" :index="indexMethod"/>
+						<el-table-column label="项目名称" width="155" align="left" prop="ruleName" />
+						<el-table-column label="上午" align="center" >
+							<el-table-column prop="column080090" label="8:00-9:00" width="80" align="center"/>
+							<el-table-column prop="column090100" label="9:00-10:00" width="95" align="center"/>
+							<el-table-column prop="column100110" label="10:00-11:00" width="95" align="center"/>
+							<el-table-column prop="column110120" label="11:00-12:00" width="95" align="center"/>
+						</el-table-column>
+						<el-table-column label="下午" align="center" >
+							<el-table-column prop="column123133" label="13:30-14:30" width="95" align="center"/>
+							<el-table-column prop="column133143" label="14:30-15:30" width="95" align="center"/>
+							<el-table-column prop="column143153" label="15:30-16:30" width="95" align="center"/>
+							<el-table-column prop="column153163" label="16:30-17:30" width="95" align="center"/>
+						</el-table-column>
+						<el-table-column label="加班" align="center" >
+							<el-table-column prop="column163173" label="12:30-13:30" width="95" align="center"/>
+							<el-table-column prop="column180190" label="18:00-19:00" width="95" align="center"/>
+							<el-table-column prop="column190200" label="19:00-20:00" width="95" align="center"/>
+							<el-table-column prop="column200210" label="20:00-21:00" width="95" align="center"/>
+						</el-table-column>
+					</el-table>
+
+					<br/>
+					<!-- 底部 -->
+					<el-row class="my-print-foot">
+						<el-col :offset="1" :span="3">检查人:</el-col>
+						<el-col :offset="2" :span="3">品质主管:</el-col>
+
 					</el-row>
-					<el-row>
-						<el-col :span="8">
-							<el-form-item label="检验日期" prop="checkTime">
-								<el-input v-model="form.checkTime" placeholder="请输入检验日期" disabled>
-									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-								</el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="检验编号" prop="checkNo">
-								<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="产品提报人" prop="checkManName">
-								<el-input v-model="form.checkManName" placeholder="请输入OEM产品提报人" disabled/>
-							</el-form-item>
-						</el-col>
-					</el-row>	
-					<el-row>
-						<el-col :span="24">	
-							<!-- 检验项目明细 -->
-							<el-table v-loading="loading" :data="checkProjectList" >
-								<el-table-column type="selection" width="55" align="center" />
-								<el-table-column label="检验规则编号" align="center" type="index" width="100"/>
-								<el-table-column label="检验规则名称" align="center" prop="ruleName" />
-								<el-table-column label="标准值" align="center" prop="checkStandard" />
-								<el-table-column label="上差值" align="center" prop="upperDiff" />
-								<el-table-column label="下差值" align="center" prop="downDiff" />
-								<el-table-column label="单位" align="center" prop="unitCode" />
-								<el-table-column label="检验值" align="center" prop="actualValue" />
-								<el-table-column label="结果" align="center" prop="status" >
-								    <template slot-scope="scope">
-										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
-									</template>
-								</el-table-column>	
-							</el-table>
-						</el-col>
-					</el-row>	
-				</el-form>
+					</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>
@@ -244,7 +202,7 @@
 		<el-dialog :title="title" :visible.sync="firstReportOpen" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
-					<el-button 
+					<el-button
 						    class="print-btn"
 							size="mini"
 							type="primary"
@@ -296,14 +254,14 @@
 								</el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :span="16">	
+						<el-col :span="16">
 							<el-form-item label="首检原因" >
 								<el-input   disabled/>
 							</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="55" align="center" />
@@ -322,7 +280,7 @@
 								    <template slot-scope="scope">
 										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
 									</template>
-								</el-table-column>	
+								</el-table-column>
 							</el-table>
 						</el-col>
 					</el-row>
@@ -356,7 +314,7 @@
 					</el-row>
 				</el-form>
 			</div>
-			
+
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="handleDone">确 定</el-button>
 			</div>
@@ -388,7 +346,10 @@ export default {
 			total: 0,
 			//打印
 			formRef: 'form',
+			newWorkerLoading: false,
+			refreshNewWorkerTable:true,
 			validateRules: [],
+			checkList: [],
 			printData: {
 				printable: 'printFrom',
 				ignore: ['no-print'],
@@ -457,6 +418,10 @@ export default {
 		this.getCheckTypes();
 	},
 	methods: {
+		// 生成表头序号
+		indexMethod(index) {
+			return index + 1;
+		},
 		/****/
 		getCheckTypes() {
            	getCheckTypes('material').then(response => {
@@ -530,7 +495,7 @@ export default {
 				updateTime: null,
 				factoryCode: null,
 				delFlag: null,
-				
+
 			};
 			this.resetForm("form");
 		},
@@ -560,25 +525,35 @@ export default {
 		handleLook(row) {
 			this.reset();
 			const recordId = row.recordId || this.ids
-			this.queryParams.recordId = recordId;
-			getProduce(recordId).then(response => {
-				this.form = response.data;
-				if(this.form.checkType =='checkTypeSC') {
+
+			if(row.checkType =='checkTypeSC') {
+				getProduce(recordId).then(response => {
+					this.form = response.data;
 					//首检报告
 					this.form.printable = 'firstReportPrint'; //打印时需要
 					this.form.ignore = ['no-print'];//打印时需要
 					this.firstReportOpen = true;
 					this.title = "首检检验报告";
-				}else {
-					//巡检报告
-					this.form.printable = 'printForm'; //打印时需要
+				})
+				this.queryParams.recordId = recordId;
+				this.getCheckedProjectList();
+			}else {
+				//巡检报告
+				this.form.printable = 'printForm'; //打印时需要
+				this.form.ignore = ['no-print'];//打印时需要
+				this.open = true;
+				this.title = "巡检检验报告";
+				const orderNo = row.orderNo;
+				getProduceXJ(orderNo).then(response => {
+					this.form = response.data;
+					//首检报告
+					this.form.printable = 'firstReportPrint'; //打印时需要
 					this.form.ignore = ['no-print'];//打印时需要
-					this.open = true;
-					this.title = "巡检检验报告";
-				}
-				
-			});
-			this.getCheckedProjectList();
+					this.firstReportOpen = true;
+					this.title = "首检检验报告";
+				})
+			}
+
 		},
 		/** 提交按钮 */
 		submitForm() {
@@ -652,7 +627,7 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
-.center-text {  
+.center-text {
   text-align: center;
 }
 .report-logo {
@@ -660,4 +635,8 @@ export default {
 	margin-left: 15px;
     height: 38px;
 }
-</style>
\ No newline at end of file
+.my-print-nav {
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>

From 9adeb55c988a1bbc14e3ced726711745109babc4 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Tue, 9 Jan 2024 09:51:12 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=8A=BD=E6=A0=B7?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/firstReport.js           |  93 ----
 src/api/quality/qcSampleRule.js          |   8 +
 src/views/quality/firstReport/index.vue  | 516 -----------------------
 src/views/quality/qcSampleRule/index.vue |  94 +++--
 4 files changed, 57 insertions(+), 654 deletions(-)
 delete mode 100644 src/api/quality/firstReport.js
 delete mode 100644 src/views/quality/firstReport/index.vue

diff --git a/src/api/quality/firstReport.js b/src/api/quality/firstReport.js
deleted file mode 100644
index 03e3db1..0000000
--- a/src/api/quality/firstReport.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import request from '@/utils/request'
-
-// 查询来料报告列表
-export function listIncome(query) {
-	return request({
-		url: '/quality/qcFirstReport/list',
-		method: 'get',
-		params: query
-	});
-}
-
-// 查询来料报告详细
-export function getIncome(recordId) {
-	return request({
-		url: '/quality/qcFirstReport/' + recordId,
-		method: 'get'
-		});
-}
-
-// 新增来料报告
-export function addIncome(data) {
-	return request({
-		url: '/quality/qcFirstReport',
-		method: 'post',
-		data: data
-	});
-}
-
-// 修改来料报告
-export function updateIncome(data) {
-	return request({
-		url: '/quality/qcFirstReport',
-		method: 'put',
-		data: data
-	});
-}
-
-// 删除来料报告
-export function delIncome(recordId) {
-	return request({
-		url: '/quality/qcFirstReport/' + recordId,
-		method: 'delete'
-	});
-}
-
-// 查询BOM物料管理列表
-export function getQcListBom(query) {
-	return request({
-	  url: '/quality/qcFirstReport/getQcListBom',
-	  method: 'get',
-	  params: query
-	});
-  }
-
-// 查询供应商管理列表
-export function getQcListSupplier(query) {
-	return request({
-	  url: '/quality/qcFirstReport/getQcListSupplier',
-	  method: 'get',
-	  params: query
-	});
-  }
-
-// 查询人员列表
-export function getQcListUser(query) {
-	return request({
-	  url: '/quality/qcFirstReport/getQcListUser',
-	  method: 'get',
-	  params: query
-	});
-  }
-
-//状态修改
-export function changeIncomeStatus(recordId, status) {
-	const data = {
-		recordId,
-	    status
-	}
-	return request({
-	  url: '/quality/qcFirstReport/changeIncomeStatus',
-	  method: 'put',
-	  data: data
-	})
-  }
-
-// 查询检测项列表
-export function getCkeckProjectList(query) {
-	return request({
-	  url: '/quality/qcFirstReport/getCkeckProjectList',
-	  method: 'get',
-	  params: query
-	});
-  }
diff --git a/src/api/quality/qcSampleRule.js b/src/api/quality/qcSampleRule.js
index 89782bd..8c0c9f0 100644
--- a/src/api/quality/qcSampleRule.js
+++ b/src/api/quality/qcSampleRule.js
@@ -42,3 +42,11 @@ export function delQcSampleRule(id) {
 		method: 'delete'
 	});
 }
+
+// 根据大节点获取检验节点类型
+export function getCheckType(typeCode) {
+	return request({
+		url: '/quality/qcSampleRule/getCheckType/' + typeCode,
+		method: 'get',
+	})
+}
diff --git a/src/views/quality/firstReport/index.vue b/src/views/quality/firstReport/index.vue
deleted file mode 100644
index 68341b2..0000000
--- a/src/views/quality/firstReport/index.vue
+++ /dev/null
@@ -1,516 +0,0 @@
-<template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-		    <el-form-item label="任务编号" prop="checkNo">
-				<el-input
-					v-model="queryParams.checkNo"
-					placeholder="请输入检验任务编号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="物料名称" prop="materialName">
-				<el-input
-					v-model="queryParams.materialName"
-					placeholder="请输入物料名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="检验结果" prop="checkResult">
-				<el-select
-				v-model="queryParams.checkResult"
-				placeholder="检验结果"
-				clearable
-				>
-				<el-option
-					v-for="dict in dict.type.check_result"
-					:key="dict.value"
-					:label="dict.label"
-					:value="dict.value"
-				/>
-				</el-select>
-			</el-form-item>
-			<el-form-item label="检测地点" prop="checkLoc">
-				<el-input
-					v-model="queryParams.checkLoc"
-					placeholder="请输入检测地点"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="检验时间" prop="checkTimeArray">
-                <el-date-picker
-				v-model="queryParams.checkTimeArray"
-				format="yyyy-MM-dd HH:mm:ss"
-				type="datetimerange"
-				range-separator="至"
-				start-placeholder="开始日期"
-				end-placeholder="结束日期">
-				</el-date-picker>
-			</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>
-			</el-form-item>
-		</el-form>
-
-		<el-row :gutter="10" class="mb8">
-			<!-- <el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['quality:qcIncome:add']"
-				>新增</el-button>
-			</el-col> -->
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['quality:incomeReport:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
-
-		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
-			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
-			<el-table-column label="订单号" align="center" prop="orderNo" width="150"/>
-			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
-			<el-table-column label="收货数量" align="center" prop="quality" />
-			<el-table-column label="单位" align="center" prop="unit" />
-			<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
-			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="检验结果" align="center" prop="checkResult">
-			    <template slot-scope="scope">
-					<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult"/>
-				</template>
-            </el-table-column>
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleLook(scope.row)"
-						v-hasPermi="['quality:incomeReport:edit']"
-					>查看</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
-
-		<!-- 打印首检对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
-			<el-row>
-				<el-col :span="20">
-					<el-button 
-						    class="print-btn"
-							size="mini"
-							type="primary"
-							icon="el-icon-edit"
-							@click="handlePrint(form)"
-						>打印</el-button>
-				</el-col>
-			</el-row>
-			<!-- 打印整个printFrom区域 -->
-			<div id="printFrom">
-				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
-					<el-row>
-						<el-col :offset="8" :span="8">
-							<h1 style="align-content: center;">中山榄菊日化实业有限公司</h1>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :offset="8" :span="8">
-							<h2 style="align-content: center;">（黑蚊香）首检确认表</h2>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :offset="16" :span="8">
-							<el-form-item label="检验标准" prop="incomeBatchNo">
-								<el-input v-model="form.incomeBatchNo" disabled/>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="16">
-							<el-form-item label="产品名称" prop="materialName">
-								<el-input v-model="form.materialName" disabled />
-							 </el-form-item>
-						 </el-col>
-						<el-col :span="8">
-							<el-form-item label="产品编码" prop="materialCode">
-								<el-input v-model="form.materialCode" disabled />
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="8">
-							<el-form-item label="首检日期" prop="checkTime">
-								<el-input v-model="form.checkTime" disabled>
-									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-								</el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="16">	
-							<el-form-item label="首检原因" >
-								<el-input   disabled/>
-							</el-form-item>
-						</el-col>
-					</el-row>	
-					<el-row>
-						<el-col :span="24">	
-							<!-- 检验项目明细 -->
-							<el-table v-loading="loading" :data="checkProjectList" >
-								<el-table-column type="selection" width="55" align="center" />
-								<el-table-column label="序号" align="center" type="index" width="100"/>
-								<el-table-column label="检验项目" align="center" prop="ruleName" />
-								<el-table-column label="内容" align="center" prop="checkStandard" width="200"/>
-								<el-table-column label="实际检验结果" align="center" prop="propertyCode" width="200">
-									<template slot-scope="scope">
-										<dict-tag
-											:options="dict.type.qc_rule_prop"
-											:value="scope.row.propertyCode"
-										/>
-									</template>
-								</el-table-column>
-								<el-table-column label="判定" align="center" prop="status" >
-								    <template slot-scope="scope">
-										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
-									</template>
-								</el-table-column>	
-							</el-table>
-						</el-col>
-					</el-row>
-					<el-row style="margin-top: 10px;">
-						<el-col :span="20">
-							<el-form-item label="备注：" label-width="160px">
-								<el-input type="textarea" disabled/>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="20">
-							<el-form-item label="综合结论："  label-width="160px">
-								<el-input type="textarea" disabled/>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="20">
-							<el-form-item label="车间组长/机管员签名"  label-width="160px">
-								<el-input disabled/>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="20">
-							<el-form-item label="质量管理部品管员签名" prop="checkManName" label-width="160px">
-								<el-input disabled/>
-							</el-form-item>
-						</el-col>
-					</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>
-
-<script>
-import { listIncome, getIncome, delIncome, addIncome, updateIncome,getCkeckProjectList} from "@/api/quality/firstReport";
-import { getCheckTypes } from "@/api/quality/qcProduce";
-import moment from 'moment';
-export default {
-	name: "First",
-	dicts: ["unit","check_status","check_result","qc_rule_prop"],
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			//打印
-			formRef: 'form',
-			validateRules: [],
-			printData: {
-				printable: 'printFrom',
-				ignore: ['no-print'],
-				workCenter: "暂无数据",
-				SAPNo: null,
-				manufacture: null,
-				auditor: null,
-				printDate: null,
-				factory: null,
-				productDate: null,
-				workTable: [],
-			},
-			printDialogVisible: false,
-			// 首检表格数据
-			incomeList: [],
-			// 检验项目列表
-			checkProjectList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				checkTimeArray: [],
-				pageNum: 1,
-				pageSize: 10,
-				checkNo: null,
-				incomeBatchNo: null,
-				orderNo: null,
-				materialCode: null,
-				materialName: null,
-				quality: null,
-				unit: null,
-				supplierCode: null,
-				supplierName: null,
-				incomeTime: null,
-				checkLoc: null,
-				checkStatus: null,
-				checkManCode: null,
-				checkManName: null,
-				checkTime: null,
-				checkResult: null,
-				status: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
-				factoryCode: null,
-			},
-			// 表单参数
-			form: {},
-			checkTypes:[],
-			// 表单校验
-			rules: {
-				/* incomeBatchNo: [
-					{ required: true, message: "来料批次号不能为空", trigger: "blur" }
-				], */
-			}
-		};
-	},
-	created() {
-		this.getDate();
-		this.getList();
-		this.getCheckTypes();
-	},
-	methods: {
-		/****/
-		getCheckTypes() {
-           	getCheckTypes('material').then(response => {
-				this.checkTypes = response;
-			});
-		},
-        /**获取默认查询时间段**/
-		getDate() {
-			let start = this.Fungetdate (0)
-			let end = this.Fungetdate (1)
-			//this.queryParams.incomeTimeArray.push(start,end)
-			this.queryParams.checkTimeArray.push(start,end)
-		},
-		Fungetdate (num) {
-			var dd = new Date();
-			dd.setDate(dd.getDate() + num);
-			var y = dd.getFullYear();
-			var m = dd.getMonth() + 1;//获取当前月份的日期
-			var d = dd.getDate();
-			return y + "-" + m + "-" + d+" 00:00:00";
-		},
-
-		/** 查询首检列表 */
-		getList() {
-			this.loading = true;
-
-			if(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');
-			}
-
-			listIncome(this.queryParams).then(response => {
-				this.incomeList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				recordId: null,
-				checkNo: null,
-				incomeBatchNo: null,
-				orderNo: null,
-				materialCode: null,
-				materialName: null,
-				quality: null,
-				unit: null,
-				supplierCode: null,
-				supplierName: null,
-				incomeTime: null,
-				checkLoc: null,
-				checkStatus: null,
-				checkManCode: null,
-				checkManName: null,
-				checkTime: null,
-				checkResult: null,
-				status: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null,
-				factoryCode: null,
-				delFlag: null,
-				
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.recordId)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = "添加首检";
-		},
-		/** 查看按钮操作 */
-		handleLook(row) {
-			this.reset();
-			const recordId = row.recordId || this.ids
-			this.queryParams.recordId = recordId;
-			getIncome(recordId).then(response => {
-				this.form = response.data;
-				this.form.printable = 'printFrom'; //打印时需要
-				this.form.ignore = ['no-print'];//打印时需要
-				this.open = true;
-				this.title = "查看首检报告";
-			});
-			this.getCheckedProjectList();
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.recordId != null) {
-						updateIncome(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addIncome(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const recordIds = row.recordId || this.ids;
-			this.$modal.confirm('是否确认删除首检编号为"' + recordIds + '"的数据项？').then(function() {
-				return delIncome(recordIds);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('quality/qcIncome/export', {
-				...this.queryParams
-			}, `income_${new Date().getTime()}.xlsx`)
-		},
-		/**获取检验项目列表 */
-		getCheckedProjectList(){
-			this.loading = true;
-			getCkeckProjectList(this.queryParams).then((response) => {
-				this.checkProjectList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 打印预览-浏览器打印
-		handlePrint(params) {
-			console.log(this.form);
-			printJS({
-				printable: params.printable, // 'printFrom', // 标签元素id
-				type: params.type || 'html',
-				maxWidth: 1500, // 最大宽度
-				font_size: "",// 设置字体大小
-				header: "首检结果报告",//params.header, // '表单',
-				targetStyles: ['*'],
-				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
-				ignoreElements: params.ignore || [], // ['no-print']
-				properties: params.properties || null
-			})
-		},
-	}
-};
-</script>
-<style scoped>
-.print-btn{
-	margin-bottom: 15px;
-	margin-left: 10px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/quality/qcSampleRule/index.vue b/src/views/quality/qcSampleRule/index.vue
index 9274ed0..f6c71fe 100644
--- a/src/views/quality/qcSampleRule/index.vue
+++ b/src/views/quality/qcSampleRule/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
 			<el-form-item label="开始值" prop="startValue">
 				<el-input
 					v-model="queryParams.startValue"
@@ -26,7 +26,7 @@
 				/>
 			</el-form-item>
 			<el-form-item label="检验类型" prop="typeCode">
-				<el-select v-model="form.typeCode" placeholder="请选择检验类型" clearable style="width:100%">
+				<el-select v-model="queryParams.typeCode" placeholder="请选择检验类型" clearable style="width:100%">
 					<el-option 
 					v-for="dict in dict.type.check_type" 
 					:key="dict.value" 
@@ -35,16 +35,6 @@
 					></el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item label="检验类型子项目" prop="checkType">
-				<el-select v-model="form.checkType" placeholder="请选择检验类型子项目" clearable style="width:100%">
-					<el-option 
-					v-for="item in checkTypeList" 
-					:key="item.value" 
-					:label="item.label" 
-					:value="item.value"
-					></el-option>
-				</el-select>
-			</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>
@@ -143,16 +133,17 @@
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 				<el-form-item label="开始值" prop="startValue">
-					<el-input v-model="form.startValue" placeholder="请输入开始值" />
+					<el-input v-model="form.startValue" placeholder="请输入数字" />
 				</el-form-item>
 				<el-form-item label="结束值" prop="endValue">
-					<el-input v-model="form.endValue" placeholder="请输入检测项方案名称" />
+					<el-input v-model="form.endValue" placeholder="请输入数字" />
 				</el-form-item>
 				<el-form-item label="抽样数量" prop="sampleQuality">
 					<el-input v-model="form.sampleQuality" placeholder="请输入抽样数量" />
 				</el-form-item>
 				<el-form-item label="检验类型" prop="typeCode">
-					<el-select v-model="form.typeCode" placeholder="请选择检验类型" style="width:100%">
+					<el-select v-model="form.typeCode" placeholder="请选择检验类型" 
+					@change="handleGetCheckType" clearable style="width:100%">
 						<el-option 
 						v-for="dict in dict.type.check_type" 
 						:key="dict.value" 
@@ -162,12 +153,12 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item label="检验类型子项目" prop="checkType">
-					<el-select v-model="form.checkType" placeholder="请选择检验类型子项目" style="width:100%">
+					<el-select v-model="form.checkType" placeholder="请先选择检验类型" :disabled="!(form.typeCode)" style="width:100%">
 						<el-option 
-						v-for="item in checkTypeList" 
-						:key="item.value" 
-						:label="item.label" 
-						:value="item.value"
+						v-for="item in addCheckTypeList" 
+						:key="item.id" 
+						:label="item.checkName" 
+						:value="item.id"
 						></el-option>
 					</el-select>
 				</el-form-item>
@@ -181,8 +172,8 @@
 </template>
 
 <script>
-import { listQcSampleRule, getQcSampleRule, delQcSampleRule, addQcSampleRule, updateQcSampleRule } from "@/api/quality/qcSampleRule";
-
+import { listQcSampleRule, getQcSampleRule, delQcSampleRule, addQcSampleRule, updateQcSampleRule, getCheckType } from "@/api/quality/qcSampleRule";
+import { listCheckType,} from "@/api/quality/checkType";
 export default {
 	name: "QcSampleRule",
 	dicts: ["check_type"],
@@ -206,24 +197,8 @@ export default {
 			title: "",
 			// 是否显示弹出层
 			open: false,
-			checkTypeList: [
-				{
-					value: 'checkTypeCP',
-					label: '成品入库检验',
-				},
-				{
-					value: 'checkTypeLL',
-					label: '来料检验',
-				},
-				{
-					value: 'checkTypeSC',
-					label: '首件检验',
-				},
-				{
-					value: 'checkTypeSCXJ',
-					label: '过程巡检',
-				},
-			],
+			checkTypeList: [],
+			addCheckTypeList: [],
 			// 查询参数
 			queryParams: {
 				pageNum: 1,
@@ -240,14 +215,31 @@ export default {
 			form: {},
 			// 表单校验
 			rules: {
-				factoryCode: [
-					{ required: true, message: "工厂编码不能为空", trigger: "blur" }
+				startValue: [
+					{ required: true, message: "开始值不能为空", trigger: "blur" },
+					{ pattern: /^[1-9]\d*$/, message: "请输入正整数,且开头不能为0", trigger: "blur"}
+				],
+				endValue: [
+					{ required: true, message: "结束值不能为空", trigger: "blur" },
+					{ pattern: /^[1-9]\d*$/, message: "请输入正整数,且开头不能为0", trigger: "blur"}
+				],
+				sampleQuality: [
+					{ required: true, message: "抽样数量不能为空", trigger: "blur" },
+					{ pattern: /^[1-9]\d*$/, message: "请输入正整数,且开头不能为0", trigger: "blur"}
+				],
+				typeCode: [
+					{ required: true, message: "检验类型不能为空", trigger: "blur" }
 				],
+				checkType: [
+					{ required: true, message: "检验类型子项目不能为空", trigger: "blur" }
+				],
+
 			}
 		};
 	},
 	created() {
 		this.getList();
+		this.getCheckTypeList();
 	},
 	methods: {
 		/** 查询来料抽样规则列表 */
@@ -259,6 +251,11 @@ export default {
 				this.loading = false;
 			});
 		},
+		getCheckTypeList() {
+			listCheckType().then(response => {
+				this.checkTypeList = response.rows
+			});
+		},
 		// 取消按钮
 		cancel() {
 			this.open = false;
@@ -313,6 +310,7 @@ export default {
 				this.form = response.data;
 				this.open = true;
 				this.title = "修改来料抽样规则";
+				this.handleGetCheckType(this.form.typeCode);
 			});
 		},
 		/** 提交按钮 */
@@ -352,9 +350,15 @@ export default {
 			}, `qcSampleRule_${new Date().getTime()}.xlsx`)
 		},
 		formatCheckType(checkType) {
-			const checkTypeBody = this.checkTypeList.find((item) => item.value === checkType);
-    		return checkTypeBody ? checkTypeBody.label : '——';
-		}
+			const checkTypeBody = this.checkTypeList.find((item) => item.id === checkType);
+    		return checkTypeBody ? checkTypeBody.checkName : '';
+		},
+		handleGetCheckType(value) {
+			this.form.checkType = '';
+			getCheckType(value).then(response => {
+				this.addCheckTypeList = response.rows
+			});
+		},
 	}
 };
 </script>

From f3f49d6a6d30bb57031cf47de308579b770b059f Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 9 Jan 2024 09:51:39 +0800
Subject: [PATCH 09/14] =?UTF-8?q?2024-1-9-1=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=E8=AE=BE=E5=A4=87-=E5=B1=95=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/equipment/index.vue         | 7 +++++++
 src/views/wms/equipment/itemEquipment.vue | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index d9997b5..19ee090 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -221,6 +221,13 @@
           />
         </template>
       </el-table-column>
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        width="100"
+      >
+      </el-table-column>
       <el-table-column
         label="设备类型编码"
         align="center"
diff --git a/src/views/wms/equipment/itemEquipment.vue b/src/views/wms/equipment/itemEquipment.vue
index 74bf193..5379335 100644
--- a/src/views/wms/equipment/itemEquipment.vue
+++ b/src/views/wms/equipment/itemEquipment.vue
@@ -16,6 +16,7 @@
       <el-table-column
         label="设备编码"
         align="center"
+        width="120"
         prop="equipmentCode"
         fixed
       />
@@ -27,6 +28,7 @@
       <el-table-column
         label="设备状态"
         align="center"
+        width="150"
         prop="equipmentStatus"
       >
         <template slot-scope="scope">

From 98d72af284c63f5f5de2fb58cb322e1856fc503a Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 9 Jan 2024 11:22:15 +0800
Subject: [PATCH 10/14] =?UTF-8?q?2024-1-9-2=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=E5=B7=A5=E5=8E=82-=E5=8A=A0=E5=B7=A5=E5=8E=82?=
 =?UTF-8?q?=E5=BB=BA=E6=A8=A1=E7=B1=BB=E5=9E=8B+=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/factory/index.vue | 53 ++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/views/wms/factory/index.vue b/src/views/wms/factory/index.vue
index ae17367..510a5cf 100644
--- a/src/views/wms/factory/index.vue
+++ b/src/views/wms/factory/index.vue
@@ -67,6 +67,14 @@
 		>
 			<el-table-column label="组织名称" align="center" prop="factoryName" width="350"/>
 			<el-table-column label="组织编码" align="center" prop="factoryCode" />
+      <el-table-column prop="ftype" label="工厂建模类型" width="100" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.f_type"
+            :value="scope.row.ftype"
+          />
+        </template>
+      </el-table-column>
 			<el-table-column label="创建人" align="center" prop="createBy" />
       		<el-table-column label="创建时间" align="center" prop="createTime" />
       		<el-table-column prop="status" label="是否启用" align="center" >
@@ -103,30 +111,45 @@
 
 		<!-- 添加或修改工厂模型对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item label="父组织名" prop="parentId" style="width:430px">
+			<el-form ref="form" :model="form" :rules="rules" label-width="120px">
+				<el-form-item label="父组织名" prop="parentId" style="width:350px">
 					<treeselect v-model="form.parentId" :options="factoryOptions" :normalizer="normalizer" placeholder="请选择父组织id" />
 				</el-form-item>
-				<el-form-item label="组织名称" prop="factoryName" style="width:430px">
+				<el-form-item label="组织名称" prop="factoryName" style="width:350px">
 					<el-input v-model="form.factoryName" placeholder="请输入组织名称" />
 				</el-form-item>
-				<el-form-item label="组织编码" prop="factoryCode" style="width:430px">
-        			<el-input v-model="form.factoryCode" placeholder="请输入组织编码" />
-   				</el-form-item>
-				<el-form-item label="负责人" prop="leader" style="width:430px">
+				<el-form-item label="组织编码" prop="factoryCode" style="width:350px">
+        	<el-input v-model="form.factoryCode" placeholder="请输入组织编码" />
+   			</el-form-item>
+        <el-form-item label="工厂建模分类" prop="ftype">
+          <el-select
+            v-model="form.ftype"
+            placeholder="请选择设备类型"
+            filterable
+            style="width: 230px"
+          >
+            <el-option
+              v-for="dict in dict.type.f_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+				<el-form-item label="负责人" prop="leader" style="width:350px">
 					<el-input v-model="form.leader" placeholder="请输入负责人" />
 				</el-form-item>
-				<el-form-item label="联系电话" prop="phone" style="width:430px">
+				<el-form-item label="联系电话" prop="phone" style="width:350px">
 					<el-input v-model="form.phone" placeholder="请输入联系电话" />
 				</el-form-item>
-				<el-form-item label="邮箱" prop="email" style="width:430px">
+				<el-form-item label="邮箱" prop="email" style="width:350px">
 					<el-input v-model="form.email" placeholder="请输入邮箱" />
 				</el-form-item>
 				<el-form-item label="是否启用" prop="status" >
-          			<el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:350px">
-            			<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
-          			</el-select>
-        		</el-form-item>
+          <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:230px">
+            <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
+          </el-select>
+        </el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -143,6 +166,9 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
 	name: "Factory",
+  dicts: [
+    "f_type",
+  ],
 	components: {
 		Treeselect
 	},
@@ -185,7 +211,6 @@ export default {
 			// 表单参数
 			form: {},
 			// 表单校验
-						// 表单校验
       			rules: {
       			  factoryCode: [
             	  { required: true, message: "组织编码不能为空", trigger: "blur" }

From 82de7503d3f3c560574b166ee88e4e89db1dbcea Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 9 Jan 2024 14:09:53 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/produceReport.js          |  10 ++
 src/views/quality/produceReport/index.vue | 108 +++++++++++-----------
 2 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/src/api/quality/produceReport.js b/src/api/quality/produceReport.js
index d8b4e8f..e7467de 100644
--- a/src/api/quality/produceReport.js
+++ b/src/api/quality/produceReport.js
@@ -43,3 +43,13 @@ export function delProduce(recordId) {
 	});
 }
 
+export function getProduceReportXJ(orderNo) {
+	const data = {
+		orderNo
+	}
+	return request({
+		url: '/quality/qcProduceReport/getProduceReportXJ',
+		method: 'post',
+		data: data
+	});
+}
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 67f259a..d8b0b45 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -1,18 +1,18 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-		    <el-form-item label="任务编号" prop="checkNo">
+		    <el-form-item label="订单编码" prop="orderNo">
 				<el-input
-					v-model="queryParams.checkNo"
-					placeholder="请输入检验任务编号"
+					v-model="queryParams.orderNo"
+					placeholder="请输入物料编码"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="物料名称" prop="materialName">
+			<el-form-item label="物料编码" prop="materialCode">
 				<el-input
-					v-model="queryParams.materialName"
-					placeholder="请输入物料名称"
+					v-model="queryParams.materialCode"
+					placeholder="请输入物料编码"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -72,6 +72,7 @@
 		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
+			<el-table-column label="任务日期" align="center" prop="createTimeStr" width="100"/>
 			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
 			<el-table-column label="订单号" align="center" prop="orderNo" width="150"/>
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
@@ -101,7 +102,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-
+		
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -114,7 +115,7 @@
 		<el-dialog :title="title" :visible.sync="open" width="1370px" append-to-body>
 			<el-row>
 				<el-col :span="20">
-					<el-button
+					<el-button 
 						    class="print-btn"
 							size="mini"
 							type="primary"
@@ -124,8 +125,8 @@
 				</el-col>
 			</el-row>
 			<!-- 打印整个printFrom区域 -->
-			<div id="printFrom">
-				<el-form :ref="formRef" :model="form" :rules="validateRules">
+			<div id="printForm">
+				<el-form :ref="formRef" :model="form">
 					<!-- 表头-工单信息 -->
 					<el-row>
 						<el-col :offset="7" :span="10" class="center-text">
@@ -139,11 +140,11 @@
 					</el-row>
 					<!-- 导航栏 -->
 					<el-row class="my-print-nav">
-						<el-col :span="4">生成车间:{{printData.workCenter}}</el-col>
-						<el-col :span="4">生成线体:{{printData.workCenter}}</el-col>
-						<el-col :span="4">检查日期:{{printData.productDate}}</el-col>
-						<el-col :span="4">产品名称:{{printData.printDate}}</el-col>
-						<el-col :span="4">批次号:{{printData.printDate}}</el-col>
+						<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>
@@ -157,7 +158,7 @@
 						v-if="refreshNewWorkerTable"
 						v-loading="newWorkerLoading"
 						class="my-print-table"
-						:data="printData.workTable"
+						:data="form.checkInfos"
 						border
 						style="width: 100%">
 						<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
@@ -188,11 +189,11 @@
 					<el-row class="my-print-foot">
 						<el-col :offset="1" :span="3">检查人:</el-col>
 						<el-col :offset="2" :span="3">品质主管:</el-col>
-
+	
 					</el-row>
 					</el-form>
 			</div>
-
+			
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="cancel">取 消</el-button>
 			</div>
@@ -202,7 +203,7 @@
 		<el-dialog :title="title" :visible.sync="firstReportOpen" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
-					<el-button
+					<el-button 
 						    class="print-btn"
 							size="mini"
 							type="primary"
@@ -213,12 +214,9 @@
 			</el-row>
 			<!-- 打印整个firstReportPrint区域 -->
 			<div id="firstReportPrint">
-				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+				<el-form ref="form" :model="form" label-width="100px">
 					<el-row>
-						<el-col :span="7">
-							<img src="@/assets/logo/lanjv.png" class="report-logo"/>
-						</el-col>
-						<el-col :span="10" class="center-text">
+						<el-col :offset="7" :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -254,14 +252,14 @@
 								</el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :span="16">
+						<el-col :span="16">	
 							<el-form-item label="首检原因" >
 								<el-input   disabled/>
 							</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="55" align="center" />
@@ -280,7 +278,7 @@
 								    <template slot-scope="scope">
 										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
 									</template>
-								</el-table-column>
+								</el-table-column>	
 							</el-table>
 						</el-col>
 					</el-row>
@@ -314,7 +312,7 @@
 					</el-row>
 				</el-form>
 			</div>
-
+			
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="handleDone">确 定</el-button>
 			</div>
@@ -323,7 +321,7 @@
 </template>
 
 <script>
-import { listProduce, getProduce, delProduce, addProduce, updateIncome} from "@/api/quality/produceReport";
+import { listProduce, getProduce, delProduce, addProduce, updateIncome,getProduceReportXJ} from "@/api/quality/produceReport";
 import { getCkeckProjectList} from "@/api/quality/incomeReport";
 import { getCheckTypes } from "@/api/quality/qcProduce";
 import moment from 'moment';
@@ -351,7 +349,7 @@ export default {
 			validateRules: [],
 			checkList: [],
 			printData: {
-				printable: 'printFrom',
+				printable: 'printForm',
 				ignore: ['no-print'],
 				workCenter: "暂无数据",
 				SAPNo: null,
@@ -360,7 +358,12 @@ export default {
 				printDate: null,
 				factory: null,
 				productDate: null,
-				workTable: [],
+				supplierName:null,
+				lineName:null,
+				checkTimeStart:null,
+				materialName:null,
+				incomeBatchNo:null,
+				checkInfos:[]
 			},
 			printDialogVisible: false,
 			// 来料检验表格数据
@@ -432,7 +435,7 @@ export default {
 		getDate() {
 			let start = this.Fungetdate (0)
 			let end = this.Fungetdate (1)
-			this.queryParams.incomeTimeArray.push(start,end)
+			//this.queryParams.incomeTimeArray.push(start,end)
 			this.queryParams.checkTimeArray.push(start,end)
 		},
 		Fungetdate (num) {
@@ -495,7 +498,7 @@ export default {
 				updateTime: null,
 				factoryCode: null,
 				delFlag: null,
-
+				
 			};
 			this.resetForm("form");
 		},
@@ -525,7 +528,7 @@ export default {
 		handleLook(row) {
 			this.reset();
 			const recordId = row.recordId || this.ids
-
+			
 			if(row.checkType =='checkTypeSC') {
 				getProduce(recordId).then(response => {
 					this.form = response.data;
@@ -538,22 +541,20 @@ export default {
 				this.queryParams.recordId = recordId;
 				this.getCheckedProjectList();
 			}else {
-				//巡检报告
-				this.form.printable = 'printForm'; //打印时需要
-				this.form.ignore = ['no-print'];//打印时需要
-				this.open = true;
-				this.title = "巡检检验报告";
+
 				const orderNo = row.orderNo;
-				getProduceXJ(orderNo).then(response => {
-					this.form = response.data;
-					//首检报告
-					this.form.printable = 'firstReportPrint'; //打印时需要
+				getProduceReportXJ(orderNo).then(response => {
+					this.form = response;
+					//巡检报告
+					this.form.printable = 'printForm'; //打印时需要
 					this.form.ignore = ['no-print'];//打印时需要
-					this.firstReportOpen = true;
-					this.title = "首检检验报告";
+					this.open = true;
+					this.title = "巡检检验报告";
+					this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
+					this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
 				})
 			}
-
+			
 		},
 		/** 提交按钮 */
 		submitForm() {
@@ -602,9 +603,9 @@ export default {
 		},
 		// 打印预览-浏览器打印
 		handlePrint(params) {
-			console.log(this.form);
+
 			printJS({
-				printable: params.printable, // 'printFrom', // 标签元素id
+				printable: params.printable, // 标签元素id
 				type: params.type || 'html',
 				maxWidth: 1500, // 最大宽度
 				font_size: "",// 设置字体大小
@@ -627,16 +628,11 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
-.center-text {
+.center-text {  
   text-align: center;
 }
-.report-logo {
-	margin-top: 15px;
-	margin-left: 15px;
-    height: 38px;
-}
 .my-print-nav {
   margin-top: 15px;
   margin-bottom: 15px;
 }
-</style>
+</style>
\ No newline at end of file

From 0dce33b14fa32380b6e325ba2cccc7ee6c7ee53d Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 9 Jan 2024 14:22:26 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E6=88=90=E5=93=81=E7=BA=BF=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finishproduct/BottomRightTable1.vue       |  10 +-
 .../kanban/finishproduct/TopMiddleCmp.vue     |  16 +-
 src/views/kanban/finishproduct/index.vue      | 205 +++++++++---------
 src/views/mes/unitprice/index.vue             |   8 +-
 4 files changed, 125 insertions(+), 114 deletions(-)

diff --git a/src/views/kanban/finishproduct/BottomRightTable1.vue b/src/views/kanban/finishproduct/BottomRightTable1.vue
index d96ac3d..765e2e2 100644
--- a/src/views/kanban/finishproduct/BottomRightTable1.vue
+++ b/src/views/kanban/finishproduct/BottomRightTable1.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="bottom-right-table-1">
-    <dv-border-box-6>
+    <dv-border-box-13 :key="borderBoxKey">
       <div class="table-name">
-        <dv-scroll-board :config="getScrollBoardConfig()"  />
+        <dv-scroll-board :config="getScrollBoardConfig()" />
+<!--        <dv-scroll-board :config="getScrollBoardConfig()"  />-->
       </div>
-    </dv-border-box-6>
+    </dv-border-box-13>
   </div>
 </template>
 
@@ -19,6 +20,7 @@ export default {
   },
   data () {
     return {
+      borderBoxKey: 1, // 初始化一个key值
       config:{
         header: ['工单号', '产线名称', '产品名称', '生产数量', '单位'],
         data: [
@@ -37,6 +39,7 @@ export default {
     tableData(newVal) {
       console.log("newVal-",newVal)
       this.config.data = this.formatTableData(newVal);
+      this.borderBoxKey += 1;
     }
   },
   methods: {
@@ -100,5 +103,6 @@ export default {
   .dv-scroll-board {
     height: calc(~"100% - 0px");
   }
+
 }
 </style>
diff --git a/src/views/kanban/finishproduct/TopMiddleCmp.vue b/src/views/kanban/finishproduct/TopMiddleCmp.vue
index 3941989..de13d20 100644
--- a/src/views/kanban/finishproduct/TopMiddleCmp.vue
+++ b/src/views/kanban/finishproduct/TopMiddleCmp.vue
@@ -87,15 +87,15 @@ export default {
 <style scoped>
 .top-middle-cmp {
   position: relative;
-  padding: 0 50px;
+  padding: 0 0px;
   box-sizing: border-box;
 
-.chart-name {
-  position: absolute;
-  right: 70px;
-  text-align: right;
-  font-size: 20px;
-  top: 10px;
-}
+/*.chart-name {*/
+/*  position: absolute;*/
+/*  right: 70px;*/
+/*  text-align: right;*/
+/*  font-size: 20px;*/
+/*  top: 10px;*/
+/*}*/
 }
 </style>
diff --git a/src/views/kanban/finishproduct/index.vue b/src/views/kanban/finishproduct/index.vue
index 9ae42c8..8715499 100644
--- a/src/views/kanban/finishproduct/index.vue
+++ b/src/views/kanban/finishproduct/index.vue
@@ -1,32 +1,47 @@
 <template>
-  <div id="data-view">
-    <dv-full-screen-container>
-      <div class="main-header">
-        <div class="mh-left">
+  <v-scale-screen width="1920" height="1080" :fullScreen="true">
+    <div class="app-container home" style="">
+      <div class="head">
+        <div class="head-content">
+          <div class="title">成品包装线生产看板</div>
+        </div>
+        <div class="head-logo">
           <img src="../../../assets/images/logo.png" alt="" />
         </div>
-        <div class="mh-middle">成品包装线生产看板</div>
-        <div class="mh-right">{{currentDateTime}}
+        <div class="back">
+          <el-button
+            @click="back()"
+            type="primary"
+            icon="el-icon-s-home"
+          ></el-button>
         </div>
       </div>
-
-      <dv-border-box-1 class="main-container">
+      <div class="content-top">
+        <div class="timebox">
+          <div class="time">
+            {{ currentDateTime }}
+          </div>
+        </div>
+      </div>
+      <div class="content">
         <div class="mc-top">
-          <Top-Left-Cmp :data="valueForTopLeftCmp"/>
-          <Top-Middle-Cmp :data="valueForTopMiddleCmp" />
-          <Top-right-Cmp />
+          <div class="mc-left">
+            <Top-Left-Cmp :data="valueForTopLeftCmp"/>
+          </div>
+          <div class="mc-middle">
+
+          </div>
+          <div class="mc-right">
+            <Top-Middle-Cmp :data="valueForTopMiddleCmp"  style="height: 100%;"/>
+          </div>
         </div>
         <div class="mc-bottom">
-          <BottomRightTable1  :tableData="BottomRightTableValue"/>
+          <BottomRightTable1 :tableData="BottomRightTableValue" style="height: 600px; margin-top: 50px"/>
+          <!-- 设置 .mc-bottom 的高度，你可以根据实际情况调整 -->
         </div>
-
-<!--        <div class="mc-bottom">-->
-<!--          <BottomRightTable1 v-for="index in 4" :key="index+4" :tableIndex="index" :tableData="BottomRightTable2Value"/>-->
-<!--        </div>-->
-      </dv-border-box-1>
-
-    </dv-full-screen-container>
-  </div>
+      </div>
+    </div>
+  </v-scale-screen>
 </template>
 
 <script>
@@ -104,100 +119,92 @@ export default {
 }
 </script>
 
-<style lang="less">
-#data-view {
+<style lang="scss" scoped>
+
+.app-container {
+  padding: 0px 24px;
+  color: #fff;
+}
+.home {
   width: 100%;
   height: 100%;
-  background-color: #030409;
-  color: #fff;
-
-  #dv-full-screen-container {
-    background-image: url("../../../assets/images/bg-finishproduct.png");
-    background-size: 100% 100%;
-    box-shadow: 0 0 3px blue;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .main-header {
-    height: 80px;
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
-
-    .mh-left {
-      margin-top: 10px;
+  background: url("../../../assets/images/bg-finishproduct.png") no-repeat;
+  background-size: 100% 100%;
+  background-color: #050711;
+  .head {
+    width: 100%;
+    height: 74px;
+    position: relative;
+    .head-content {
+      height: 74px;
+      background-image: url("../../../assets/images/bg-head.png");
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+      .title {
+        font-size: 42px;
+        font-weight: 400;
+        color: #ffffff;
+      }
     }
-
-    .mh-middle {
-      font-size: 30px;
+    .head-logo {
+      position: absolute;
+      left: 0px;
+      top: 1px;
+      img {
+        height: 38px;
+        // width: ;
+      }
     }
-
-    .mh-left, .mh-right {
-      width: 200px;
+    .back {
+      position: absolute;
+      right: 0px;
+      top: 5px;
     }
   }
-
-  .main-container {
-    height: calc(~"100% - 80px");
-    margin-left:0px;
-    .mc-top, .mc-bottom ,mc-bottom-1 {
-      box-sizing: border-box;
-      padding: 30px;
-      display: flex;
-
+  .content-top {
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+    .timebox {
+      width: 480px;
+      height: 100px;
+
+      background-size: 100% 100%;
+      text-align: center;
+      position: absolute;
+      top: -17px;
+      right: 0px;
+      .time {
+        font-size: 30px;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 71px;
+      }
     }
-
+  }
+  .content {
+    margin-top: 63px;
+    display: block;
+    justify-content: space-between;
     .mc-top {
-      height: 40%;
-    }
-
-    .mc-bottom-1, .mc-bottom-2 {
       height: 100%;
-    }
-
-    .top-left-cmp, .bottom-left-container {
-      width: 32%;
-    }
-
-    .top-middle-cmp, .top-right-cmp {
-      width: 34%;
-    }
-
-    .bottom-left-container {
-      position: relative;
-
-      .border-box-content {
-        display: flex;
-      }
-
-      .mcb-decoration-1, .mcb-decoration-2 {
-        position: absolute;
-        left: 50%;
-        margin-left: -2px;
-      }
-
-      .mcb-decoration-1 {
-        top: 5%;
-        transform: rotate(180deg);
+      width: 100%;
+      display: flex;
+      .mc-left {
+        flex: 2;  // 占据剩余的空间
       }
 
-      .mcb-decoration-2 {
-        top: 50%;
+      .mc-middle {
+        flex: 1;  // 占据剩余的空间
       }
-
-      .bottom-left-chart-1, .bottom-left-chart-2 {
-        width: 50%;
-        height: 100%;
+      .mc-right {
+        flex: 2;  // 占据剩余的空间
       }
     }
 
-    .bottom-right-container {
-      width: 68%;
-      padding-left: 30px;
-      box-sizing: border-box;
-      display: flex;
-    }
   }
+
 }
+
 </style>
diff --git a/src/views/mes/unitprice/index.vue b/src/views/mes/unitprice/index.vue
index dba26fb..00c7e02 100644
--- a/src/views/mes/unitprice/index.vue
+++ b/src/views/mes/unitprice/index.vue
@@ -106,9 +106,9 @@
 			<el-table-column label="物料描述" align="center" prop="productName" />
 			<el-table-column label="产线编码" align="center" prop="lineCode" />
 			<el-table-column label="产线名称" align="center" prop="lineName" />
-
 			<el-table-column label="子工序编码" align="center" prop="childprocessCode" />
 			<el-table-column label="子工序名称" align="center" prop="childprocessName" />
+      <el-table-column label="工序单价（元/pc）" align="center" prop="attr1" />
 
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
@@ -256,7 +256,7 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
@@ -340,7 +340,7 @@ export default {
         // 设置上传的请求头部
         headers: {poolName: localStorage.getItem("USER_POOL_NAME_CURRENT"), Authorization: "Bearer " + getToken()},
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/mes/unitprice/importData"
+        url: process.env.VUE_APP_BASE_API + "/mes/unitPrice/importData"
       },
 			// 查询参数
 			queryParams: {
@@ -543,7 +543,7 @@ export default {
 
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "子工序导入";
+      this.upload.title = "导入";
       this.upload.open = true;
     },
 

From bd5a646b5936b3c766d145f4948965e2f8e1f36a Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 9 Jan 2024 16:58:04 +0800
Subject: [PATCH 13/14] =?UTF-8?q?2024-1-9-2=20=E8=AE=BE=E5=A4=87-=E5=AE=8C?=
 =?UTF-8?q?=E5=A5=BD=E7=8E=87=E6=8A=A5=E8=A1=A8=E5=8A=A0=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/operation/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/device/operation/index.vue b/src/views/device/operation/index.vue
index 9fdaf91..e8ecf40 100644
--- a/src/views/device/operation/index.vue
+++ b/src/views/device/operation/index.vue
@@ -228,6 +228,8 @@
 			<el-table-column width="100" label="实际运行时间" align="center" prop="actualOperationTime" />
 			<el-table-column width="100" label="运行时间" align="center" prop="operationTime" />
 			<el-table-column width="100" label="故障率" align="center" prop="failureRate" />
+			<el-table-column width="100" label="故障次数" align="center" prop="failureTimes" />
+			<el-table-column width="100" label="停机次数" align="center" prop="shutdownTimes" />
 			<el-table-column width="200" label="故障描述" align="center" prop="failureDescription" />
 			<el-table-column width="200" label="原因分析" align="center" prop="reasonAnalyze" />
       <el-table-column width="200" label="设备状态描述" align="center" prop="equStatusDes" />

From 078622e7a4559e160dfa4965093bb1daa9b75af6 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 9 Jan 2024 17:27:50 +0800
Subject: [PATCH 14/14] =?UTF-8?q?2024-1-9-4=20=E8=AE=BE=E5=A4=87-=E5=A4=87?=
 =?UTF-8?q?=E4=BB=B6-=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/sparePartsLedger/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue
index 96615e7..7213c75 100644
--- a/src/views/device/sparePartsLedger/index.vue
+++ b/src/views/device/sparePartsLedger/index.vue
@@ -139,17 +139,17 @@
       <el-table-column label="备品备件号" align="center" prop="materialCode" width="120"/>
       <el-table-column label="备品备件名称" align="center" prop="materialDesc" width="120"/>
       <el-table-column label="规格型号" align="center" prop="spareMode" width="200"/>
-      <el-table-column label="单机装配数量" align="center" prop="unitQuantity" width="50"/>
+      <el-table-column label="单机装配数量" align="center" prop="unitQuantity" width="100"/>
       <el-table-column label="单价" align="center" prop="unitPrice" width="50"/>
       <el-table-column label="单位" align="center" prop="userDefined1" width="50"/>
-      <el-table-column label="代用件" align="center" prop="substituteParts" width="50"/>
-      <el-table-column label="安全库存" align="center" prop="safeStock" width="50"/>
-      <el-table-column label="现有库存" align="center" prop="amount" width="50"/>
+      <el-table-column label="代用件" align="center" prop="substituteParts" width="80"/>
+      <el-table-column label="安全库存" align="center" prop="safeStock" width="80"/>
+      <el-table-column label="现有库存" align="center" prop="amount" width="80"/>
       <el-table-column label="采购方式" align="center" prop="procurementMethod" width="150"/>
       <!-- 生产厂商暂时没有用 -->
       <!-- <el-table-column label="生产厂商" align="center" prop="spareManufacturer" width="200"/> -->
-      <el-table-column label="更换周期（月）" align="center" prop="spareReplacementCycle"/>
-      <el-table-column label="采购周期（天）" align="center" prop="procurementCycle"/>
+      <el-table-column label="更换周期（月）" align="center" prop="spareReplacementCycle"width="120"/>
+      <el-table-column label="采购周期（天）" align="center" prop="procurementCycle"width="120"/>
       <el-table-column label="期初结存" align="center" prop="openingBalance"/>
       <el-table-column label="入库记录" align="center" prop="inputRecords"/>
       <el-table-column label="出库记录" align="center" prop="outputRecords"/>