From 86b1f5be9ee4aeccb078d7c06ceb2df0bd174b23 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 30 May 2024 15:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue            |  4 +-
 src/views/quality/produceReport/index.vue     | 62 ++++++++++++++++---
 .../quality/qcIncome/checkProjectType.vue     |  4 +-
 src/views/wms/equipment/index.vue             |  6 +-
 4 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 523c2e73..801e9612 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -385,7 +385,7 @@
 						</el-table-column>
             <el-table-column label="报工单编号" align="center" prop="reportCode" width="120" />
 						<el-table-column label="创建时间" align="center" prop="createTime" width="150" />
-            <!--
+            <!--  --> 
             <el-table-column fixed="right" label="操作" width="160">
 							<template slot-scope="scope">
 								<el-button @click.native.prevent="deleteReportRow(scope.$index, item.libList)" size="small" type="danger" plain 
@@ -397,7 +397,7 @@
 									预报工</el-button>
 							</template>
 						</el-table-column>
-            -->
+           --> 
 					</el-table>
 
 					<div class="demo-input-suffix">
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 522f2342..4ec3bb30 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -518,7 +518,12 @@
 							</el-table-column>
 						</el-table-column>
 					</el-table>
-
+					<el-descriptions title="" border :column="1" :labelStyle="{width: '123px'}" :contentStyle="{width:'85%'}">
+						<el-descriptions-item label="批量或致命性质量异常"></el-descriptions-item>
+					</el-descriptions>
+					<el-descriptions title="" border :column="1" :labelStyle="{width:'100%'}" :contentStyle="{width:'0%'}">
+						<el-descriptions-item label="备注:无异常的打√，有异常的描述异常及数量比例，有数据的需要填写数据"></el-descriptions-item>
+					</el-descriptions>
 					<br/>
 					<!-- 底部 -->
 					<el-row class="my-print-foot">
@@ -572,7 +577,7 @@
 					</el-row>
 					<el-row>
 						<el-col :span="16">
-							<el-form-item label="产品名称" prop="materialName">
+							<el-form-item label="产品名称/生产组" prop="materialName">
 								<el-input v-model="form.materialName" disabled />
 							 </el-form-item>
 						 </el-col>
@@ -584,7 +589,7 @@
 					</el-row>
 					<el-row>
 						<el-col :span="8">
-							<el-form-item label="首检日期" prop="checkTime">
+							<el-form-item label="首检时间" prop="checkTime">
 								<el-input v-model="form.checkTime" disabled>
 									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
 								</el-input>
@@ -601,23 +606,24 @@
 					<el-row>
 						<el-col :span="24">
 							<!-- 检验项目明细 -->
-							<el-table v-loading="loading" :data="checkProjectList" >
-								<el-table-column type="selection" width="55" align="center" />
+							<el-table v-loading="loading" :data="checkProjectList" ><!--:span-method="objectSpanMethod"-->
 								<el-table-column label="序号" align="center" type="index" width="50"/>
-								<el-table-column label="检验项目" align="left" prop="ruleName" width="150"/>
-								<el-table-column label="实际检验结果" align="center" prop="propertyCode" width="100">
+								<el-table-column label="检验项目" align="left" prop="projectRuleName" width="150"/>
+								<el-table-column label="内容" align="left" prop="ruleName" width="300"/>
+								<!--
+								<el-table-column label="检测项类型" align="center" prop="propertyCode" width="100">
 									<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="actualValue" width="100"/>
+								</el-table-column>-->
+								<el-table-column label="实际检测结果" align="center" prop="actualValue" width="250"/>
 								<el-table-column label="判定" align="center" prop="status" width="50"
 									:formatter="checkStatusFormate"
 								/>
-								<el-table-column label="检验描述" align="center" prop="remark" width="200">
+								<!--<el-table-column label="检验描述" align="center" prop="remark" width="200">-->
 								</el-table-column>
 								<el-table-column label="附件" align="center" prop="files" width="200">
 									<template slot-scope="scope">
@@ -770,6 +776,10 @@ export default {
 				/* incomeBatchNo: [
 					{ required: true, message: "来料批次号不能为空", trigger: "blur" }
 				], */
+			},
+			labelStyle: {
+			'min-width': '100px',
+			'word-break': 'keep-all'
 			}
 		};
 	},
@@ -1025,6 +1035,38 @@ export default {
 			}
 			
 		},
+		/**
+		* 1. 若是objectSpanMethod不返回任何东西，表格不会变化
+		* 2. 最外层的判断一般是，先从第几列开始合并
+		* 3. 这次从第0行合并2个，下次就要从第3行开始合并（0行加俩，就到3行了）
+		* 4. 这种方式是有多少条数据，合并多少条数据，比如本案例中有7条数据（从第0条合并到第7条）
+		* 5. return { rowspan: 0, colspan: 0 } // 表示不合并
+		* */
+		objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+			console.log("rowIndex", rowIndex);
+			// 准备在第二列进行合并操作
+			if (columnIndex == 1) {
+				// 从第0行进行合并
+				if (rowIndex == 0) {
+				return {
+					rowspan: 3, // 合并3行
+					colspan: 1, // 合并1列（当前列）
+				};
+				}
+				if (rowIndex == 3) {
+				return {
+					rowspan: 2, // 合并2行
+					colspan: 1, // 合并1列
+				};
+				}
+				if (rowIndex == 5) {
+				return {
+					rowspan: 2, // 合并1行
+					colspan: 1, // 合并1列
+				};
+				}
+			}
+		},
 	}
 };
 </script>
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 9dfc5a9e..e1e7fc5a 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -27,7 +27,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item v-if="form.startOA == '1'" label="来料类别" prop="materialType">
+              <el-form-item v-if="form.startOA == '1'&& form.checkType == 'checkTypeLL'" label="来料类别" prop="materialType">
                 <el-select v-model="form.materialType" placeholder="请选择检验规则属性" clearable>
                   <el-option
                     v-for="dict in dict.type.material_type_oa"
@@ -41,7 +41,7 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item v-if="form.startOA == '1'" label="物料来源" prop="materialType">
+              <el-form-item v-if="form.startOA == '1'&& form.checkType == 'checkTypeLL'" label="物料来源" prop="materialType">
                 <el-select v-model="form.materialFrom" placeholder="请选择检验规则属性" clearable>
                   <el-option
                     v-for="dict in dict.type.material_from_oa"
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index e172f3c6..98484f0a 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -315,7 +315,7 @@
         width="100"
       />
       <el-table-column
-        label="标准产能(时)"
+        label="标准工时(时)"
         align="center"
         prop="unitWorkingHours"
         width="100"
@@ -566,7 +566,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="标准产能(时)" prop="unitWorkingHours">
+              <el-form-item label="标准工时" prop="unitWorkingHours">
                 <el-input-number
                   :min="0"
                   :step="1"
@@ -939,7 +939,7 @@
               <el-descriptions-item label="工段">{{
                 form.workshopSection
               }}</el-descriptions-item>
-              <el-descriptions-item label="标准产能(时)">{{
+              <el-descriptions-item label="标准工时">{{
                 form.unitWorkingHours
               }}</el-descriptions-item>
               <el-descriptions-item label="工时单价">{{