From f551bbf9842f7a8e41a0760e31f825cb3d087186 Mon Sep 17 00:00:00 2001
From: Zones <765289303@qq.com>
Date: Tue, 7 Jul 2026 18:02:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E9=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/base.js                        |   5 +
 api/hj.js                          |  13 +-
 components/nbd-record-card.vue     |   2 -
 scanpages/hj/do_anti_rust.vue      |  25 --
 scanpages/hj/make_right.vue        | 377 ++++++++++-------------------
 scanpages/hj/material_sampling.vue | 179 +-------------
 6 files changed, 147 insertions(+), 454 deletions(-)

diff --git a/api/base.js b/api/base.js
index 72643e7..475ef05 100644
--- a/api/base.js
+++ b/api/base.js
@@ -26,6 +26,11 @@ export const reqUnitByProjectIdUnitType = (projectId, unitType="")=>get(`Unit/ge
  */
 export const reqToDoItemByProjectIdUserId = (projectId, personId)=>get(`ToDoItem/getToDoItemByProjectIdUserId?projectId=${projectId}&personId=${personId}`)
 
+/**
+ * 获取坡口类型列表
+ */
+export const reqGetGrooveTypeList = ()=>get(`BaseInfo/GetGrooveType`)
+
 /**
  * 附件上传
  * @param {string} filePath   - 本地文件路径
diff --git a/api/hj.js b/api/hj.js
index ca0c7e6..e3e0aea 100644
--- a/api/hj.js
+++ b/api/hj.js
@@ -163,17 +163,18 @@ export const reqCuttingCheckByWeldJointId = (weldJointId)=>get(`/PreWeldCuttingC
  */
 export const reqSaveCuttingCheck = (data)=> post(`/PreWeldCuttingCheck/SaveRecord`, data)
 
-/**
- * 获取坡口类型列表
- * TODO: 确认接口地址
- */
-export const reqGetGrooveTypeList = ()=>get(`BaseInfo/GetGrooveType`)
 
 /**
  * 保存组对抽查记录
  * 
  */
-export const reqSaveFitupCheck = (data)=>post(`PreWeldInspection/SaveFitupCheck`, data)
+export const reqSaveFitupCheck = (data)=>post(`/PreWeldFitupCheck/SaveRecord`, data)
+
+/**
+ * 获取组对检查记录
+ * @param {String} weldJointId 
+ */
+export const reqFitupCheckByWeldJointId = (weldJointId)=>get(`/PreWeldFitupCheck/GetRecordsByWeldJointId?weldJointId=${weldJointId}`)
 
 /**
  * 获取防腐等级
diff --git a/components/nbd-record-card.vue b/components/nbd-record-card.vue
index de2b9b8..9cbb399 100644
--- a/components/nbd-record-card.vue
+++ b/components/nbd-record-card.vue
@@ -160,13 +160,11 @@ $text-secondary: #8e99a4;
 
 .record-card {
 
-	&__loading,
 	&__empty {
 		padding: 40rpx 24rpx;
 		text-align: center;
 	}
 
-	&__loading-text,
 	&__empty-text {
 		font-size: 26rpx;
 		color: $text-secondary;
diff --git a/scanpages/hj/do_anti_rust.vue b/scanpages/hj/do_anti_rust.vue
index 2efd0cd..4f8f805 100644
--- a/scanpages/hj/do_anti_rust.vue
+++ b/scanpages/hj/do_anti_rust.vue
@@ -477,29 +477,4 @@ $shadow-md: 0 2rpx 12rpx rgba(0, 0, 0, 0.04), 0 8rpx 24rpx rgba(0, 0, 0, 0.06);
 		}
 	}
 }
-
-// ===== 动效关键帧 =====
-@keyframes fadeUp {
-	from {
-		opacity: 0;
-		transform: translateY(24rpx);
-	}
-
-	to {
-		opacity: 1;
-		transform: translateY(0);
-	}
-}
-
-@keyframes breathe {
-
-	0%,
-	100% {
-		opacity: 0.6;
-	}
-
-	50% {
-		opacity: 1;
-	}
-}
 </style>
diff --git a/scanpages/hj/make_right.vue b/scanpages/hj/make_right.vue
index 9deb433..c569d82 100644
--- a/scanpages/hj/make_right.vue
+++ b/scanpages/hj/make_right.vue
@@ -23,10 +23,11 @@
 			</view>
 			<view class="card">
 				<!-- 坡口类型名称 -->
-				<view class="card__row" @click="showPaintCodePicker = true">
+				<view class="card__row" @click="showGrooveTypePicker = true">
 					<text class="card__label">坡口类型名称</text>
 					<view class="card__value-wrap card__value-wrap--clickable">
-						<text class="card__value" :class="{ 'card__value--placeholder': !makeRightForm.GrooveTypeName }">
+						<text class="card__value"
+							:class="{ 'card__value--placeholder': !makeRightForm.GrooveTypeName }">
 							{{ makeRightForm.GrooveTypeName || '请选择坡口类型' }}
 						</text>
 						<u-icon name="arrow-down" :size="24" color="#bbb" />
@@ -36,72 +37,71 @@
 				<view class="card__row">
 					<text class="card__label">坡口类型编码</text>
 					<view class="card__value-wrap">
-						<input class="card__input" v-model="makeRightForm.GrooveForm" type="text"
-							placeholder="请输入坡口形式" />
+						{{ makeRightForm.GrooveTypeCode || '--' }}
 					</view>
 				</view>
 				<!-- 坡口加工类型 -->
 				<view class="card__row">
 					<text class="card__label">坡口加工类型</text>
 					<view class="card__value-wrap">
-						<input class="card__input" v-model="makeRightForm.GrooveAngle" type="digit"
-							placeholder="请输入坡口角度" />
+						<input class="card__input" v-model="makeRightForm.GrooveProcessType" type="text"
+							placeholder="请输入坡口加工类型" />
 					</view>
 				</view>
 				<!-- 坡口角度 -->
 				<view class="card__row">
 					<text class="card__label">坡口角度</text>
 					<view class="card__value-wrap">
-						<nbd-check-btn v-model="makeRightForm.IsMaterialCodeBatchNoAccurate" passKey="准确" failKey="不准确"
-							passText="准确" failText="不准确" />
+						<input class="card__input" v-model="makeRightForm.GrooveAngle" type="digit"
+							placeholder="请输入坡口角度" />
 					</view>
 				</view>
 				<!-- 组对间隙 -->
 				<view class="card__row">
 					<text class="card__label">组对间隙</text>
 					<view class="card__value-wrap">
-						<nbd-check-btn v-model="makeRightForm.IsMaterialQuantityAccurate" passKey="准确" failKey="不准确"
-							passText="准确" failText="不准确" />
+						<input class="card__input" v-model="makeRightForm.FitupGap" type="digit"
+							placeholder="请输入组对间隙" />
 					</view>
 				</view>
 				<!-- 错边量 -->
 				<view class="card__row">
 					<text class="card__label">错边量</text>
 					<view class="card__value-wrap">
-						<nbd-check-btn v-model="makeRightForm.IsMaterialQuantityAccurate" passKey="准确" failKey="不准确"
-							passText="准确" failText="不准确" />
+						<input class="card__input" v-model="makeRightForm.Misalignment" type="digit"
+							placeholder="请输入错边量" />
 					</view>
 				</view>
 				<!-- 焊缝余高 -->
 				<view class="card__row">
 					<text class="card__label">焊缝余高</text>
 					<view class="card__value-wrap">
-						<nbd-check-btn v-model="makeRightForm.IsMaterialQuantityAccurate" passKey="准确" failKey="不准确"
-							passText="准确" failText="不准确" />
+						<input class="card__input" v-model="makeRightForm.WeldReinforcement" type="digit"
+							placeholder="请输入焊缝余高" />
 					</view>
 				</view>
 				<!-- 焊缝高度 -->
 				<view class="card__row">
 					<text class="card__label">焊缝高度</text>
 					<view class="card__value-wrap">
-						<nbd-check-btn v-model="makeRightForm.IsMaterialQuantityAccurate" passKey="准确" failKey="不准确"
-							passText="准确" failText="不准确" />
+						<input class="card__input" v-model="makeRightForm.WeldHeight" type="digit"
+							placeholder="请输入焊缝高度" />
 					</view>
 				</view>
 				<!-- 焊缝宽度 -->
 				<view class="card__row">
 					<text class="card__label">焊缝宽度</text>
 					<view class="card__value-wrap">
-						<nbd-check-btn v-model="makeRightForm.IsMaterialQuantityAccurate" passKey="准确" failKey="不准确"
-							passText="准确" failText="不准确" />
+						<input class="card__input" v-model="makeRightForm.WeldWidth" type="digit"
+							placeholder="请输入焊缝宽度" />
 					</view>
 				</view>
 				<!-- 表面缺陷 -->
 				<view class="card__row">
 					<text class="card__label">表面缺陷</text>
 					<view class="card__value-wrap">
-						<nbd-check-btn v-model="makeRightForm.IsMaterialQuantityAccurate" passKey="准确" failKey="不准确"
-							passText="准确" failText="不准确" />
+						<input class="card__input" v-model="makeRightForm.SurfaceDefect" type="text"
+							placeholder="请输入表面缺陷" />
 					</view>
 				</view>
 			</view>
@@ -161,10 +161,23 @@
 			</view>
 		</view>
 
+		<!-- 组对记录 -->
+		<view class="section">
+			<nbd-record-card title="组对" :list="fitupList" :fields="fitupFields" status-key="CheckResult"
+				status-match="合格" />
+		</view>
+
 		<!-- 下料记录 -->
 		<view class="section">
 			<nbd-record-card title="下料" :list="cuttingList" :fields="cuttingFields" status-key="CheckResult"
 				status-match="合格" />
+			<view class="nav-row" @click="handleMutualCheck">
+				<view class="nav-row__left">
+					<view class="nav-row__dot"></view>
+					<text class="nav-row__label">互检上一工序</text>
+				</view>
+				<text class="nav-row__arrow">›</text>
+			</view>
 		</view>
 
 
@@ -209,15 +222,19 @@
 			</view>
 		</view>
 	</view>
+
+	<nbd-select v-model="showGrooveTypePicker" title="选择坡口类型" :list="grooveTypeList" label-key="BaseInfoName"
+		value-key="BaseInfoCode" @confirm="selectGrooveType" />
 </template>
 
 <script setup>
 import { ref, watch, nextTick } from 'vue'
-import { onLoad, onShow } from '@dcloudio/uni-app'
+import { onLoad } from '@dcloudio/uni-app'
 import { storeToRefs } from 'pinia'
 import { useUserStore } from '@/store'
 
-import { reqPreWeldJointByWeldJointId, reqSaveCuttingCheck, reqCuttingCheckByWeldJointId, reqGetAntiCorrosionCheck } from '@/api/hj'
+import { reqPreWeldJointByWeldJointId, reqSaveFitupCheck, reqCuttingCheckByWeldJointId, reqFitupCheckByWeldJointId } from '@/api/hj'
+import { reqGetGrooveTypeList } from '@/api/base'
 
 const cuttingFields = [
 	{ label: '下料长度', key: 'CuttingLength' },
@@ -233,9 +250,27 @@ const cuttingFields = [
 	{ label: '照片', key: 'AttachUrl1', type: 'photo', cols: 4 },
 ]
 
+const fitupFields = [
+	{ label: '坡口类型名称', key: 'GrooveTypeName' },
+	{ label: '坡口类型编码', key: 'GrooveTypeCode' },
+	{ label: '坡口加工类型', key: 'GrooveProcessType' },
+	{ label: '坡口角度', key: 'GrooveAngle' },
+	{ label: '组对间隙', key: 'FitupGap' },
+	{ label: '错边量', key: 'Misalignment' },
+	{ label: '焊缝余高', key: 'WeldReinforcement' },
+	{ label: '焊缝高度', key: 'WeldHeight' },
+	{ label: '焊缝宽度', key: 'WeldWidth' },
+	{ label: '表面缺陷', key: 'SurfaceDefect' },
+	{ label: '检查人', key: 'CheckPersonName' },
+	{ label: '检查时间', key: 'CheckTime' },
+	{ label: '检查结果', key: 'CheckResult', type: 'tag', tagMatch: '合格' },
+	{ label: '不合格原因', key: 'UnqualifiedReason', showWhen: { key: 'CheckResult', notEqual: '合格' } },
+	{ label: '整改要求', key: 'RectifyRequirement', showWhen: { key: 'CheckResult', notEqual: '合格' } },
+	{ label: '照片', key: 'AttachUrl1', type: 'photo', cols: 4 },
+]
 
 const cuttingList = ref([])
-const antiListMap = ref({})
+const fitupList = ref([])
 
 const userStore = useUserStore()
 const { userInfo, currentProject } = storeToRefs(userStore)
@@ -247,17 +282,33 @@ const id = ref('')
 const makeRightForm = ref({
 	GrooveTypeId: '',  // 坡口类型ID
 	GrooveTypeName: '',  // 坡口类型名称
+	GrooveTypeCode: '',  // 坡口类型编码
+	GrooveProcessType: '',  // 坡口加工类型
+	GrooveAngle: '',  // 坡口角度
+	FitupGap: '',  // 组对间隙
+	Misalignment: '',  // 错边量
+	WeldReinforcement: '', // 焊缝余高
+	WeldHeight: '', // 焊缝高度
+	WeldWidth: '', // 焊缝宽度
+	SurfaceDefect: '', // 表面缺陷
+	CheckResult: '合格', // 检查结果
+	UnqualifiedReason: '', // 不合格原因
+	RectifyRequirement: '', // 整改要求
+	Remark: '', // 备注
 })
 
 
+const showGrooveTypePicker = ref(false)
+const grooveTypeList = ref([])
+
 // 照片组件引用
 const photoRef = ref(null)
 
-const failVisible = ref(layingOffForm.value.CheckResult === '不合格')
+const failVisible = ref(makeRightForm.value.CheckResult === '不合格')
 const failAnimating = ref(false)
 const failLeaving = ref(false)
 
-watch(() => layingOffForm.value.CheckResult, async (val) => {
+watch(() => makeRightForm.value.CheckResult, async (val) => {
 	if (val === '不合格') {
 		failVisible.value = true
 		await nextTick()
@@ -272,7 +323,9 @@ watch(() => layingOffForm.value.CheckResult, async (val) => {
 		}, 250)
 	}
 })
-
+const handleMutualCheck = () => {
+	uni.navigateTo({ url: '/scanpages/hj/material_sampling?id=' + id.value })
+}
 const handleSubmit = () => {
 	uni.showModal({
 		title: '确认提交',
@@ -284,28 +337,34 @@ const handleSubmit = () => {
 					await photoRef.value.uploadAll()
 					uni.hideLoading()
 				}
-				const CuttingAttachUrl1 = formAttachUrl.value || info.value.CuttingAttachUrl1 || ''
+				const CuttingAttachUrl1 = formAttachUrl.value||''
 
 
 				const params = {
 					ProjectId: currentProject.value?.ProjectId,  			// 项目ID
 					WeldJointId: info.value?.WeldJointId,  					// 焊口ID
-					CuttingLength: layingOffForm.value.CuttingLength,	    // 下料长度
-					GrooveForm: layingOffForm.value.GrooveForm,			// 坡口形式
-					GrooveAngle: layingOffForm.value.GrooveAngle,		// 坡口角度
-					IsMaterialCodeBatchNoAccurate: layingOffForm.value.IsMaterialCodeBatchNoAccurate,	// 材料编码批次
-					IsMaterialQuantityAccurate: layingOffForm.value.IsMaterialQuantityAccurate,	// 材料数量
-					CheckPerson: userInfo.value?.PersonId,				// 检查人员	
+					GrooveTypeId: makeRightForm.value.GrooveTypeId,			// 坡口类型ID
+					GrooveTypeCode: makeRightForm.value.GrooveTypeCode,		// 坡口类型编码
+					GrooveTypeName: makeRightForm.value.GrooveTypeName,		// 坡口类型名称
+					GrooveProcessType: makeRightForm.value.GrooveProcessType, // 坡口加工类型
+					GrooveAngle: makeRightForm.value.GrooveAngle,			// 坡口角度
+					FitupGap: makeRightForm.value.FitupGap,				// 组对间隙
+					Misalignment: makeRightForm.value.Misalignment,			// 错边量
+					WeldReinforcement: makeRightForm.value.WeldReinforcement, // 焊缝余高
+					WeldHeight: makeRightForm.value.WeldHeight,			// 焊缝高度
+					WeldWidth: makeRightForm.value.WeldWidth,				// 焊缝宽度
+					SurfaceDefect: makeRightForm.value.SurfaceDefect,		// 表面缺陷
 					CheckTime: uni.formatTime(new Date().getTime(), 'YYYY-MM-DD HH:mm'),	// 检查时间
 					CreateUser: userInfo.value?.PersonId,				// 创建人员
-					CheckResult: layingOffForm.value.CheckResult,		// 检查结果
+					CheckPerson: userInfo.value?.PersonId,				// 检查人员
+					CheckResult: makeRightForm.value.CheckResult,		// 检查结果
 					Remark: remark.value,								// 备注
-					UnqualifiedReason: layingOffForm.value.UnqualifiedReason,	// 不合格原因
-					RectifyRequirement: layingOffForm.value.RectifyRequirement,	// 整改要求
+					UnqualifiedReason: makeRightForm.value.UnqualifiedReason,	// 不合格原因
+					RectifyRequirement: makeRightForm.value.RectifyRequirement,	// 整改要求
 					AttachUrl1: CuttingAttachUrl1,
 				}
 				console.log('提交参数:', params)
-				await reqSaveCuttingCheck(params)
+				await reqSaveFitupCheck(params)
 				uni.showToast({ title: '提交成功', icon: 'none' })
 				setTimeout(() => { uni.navigateBack() }, 1500)
 			}
@@ -313,15 +372,29 @@ const handleSubmit = () => {
 	})
 }
 
+const selectGrooveType = (item) => {
+	makeRightForm.value.GrooveTypeId = item.BaseInfoId
+	makeRightForm.value.GrooveTypeCode = item.BaseInfoCode
+	makeRightForm.value.GrooveTypeName = item.BaseInfoName
+	showGrooveTypePicker.value = false
+}
+
+const fetchGrooveTypes = async () => {
+	try {
+		const res = await reqGetGrooveTypeList()
+		if (res.code === 1 && res.data) {
+			grooveTypeList.value = res.data
+		}
+	} catch (err) {
+		console.error('获取坡口类型列表失败:', err)
+	}
+}
+
 onLoad((opt) => {
+	fetchGrooveTypes()
 	if (opt.id) {
 		id.value = opt.id
-	}
-})
-
-onShow(() => {
-	if (id.value) {
-		getInfo(id.value)
+		getInfo(opt.id)
 	}
 })
 
@@ -337,22 +410,25 @@ const getInfo = async (id) => {
 				if (cuttingRes.code === 1 && cuttingRes.data) {
 					cuttingList.value = cuttingRes.data
 				}
+				const fitupRes = await reqFitupCheckByWeldJointId(info.value.WeldJointId)
+				if (fitupRes.code === 1 && fitupRes.data) {
+					fitupList.value = fitupRes.data
+					if (fitupRes.data.length > 0) {
+						makeRightForm.value.GrooveTypeId = fitupRes.data[0].GrooveTypeId
+						makeRightForm.value.GrooveTypeCode = fitupRes.data[0].GrooveTypeCode
+						makeRightForm.value.GrooveTypeName = fitupRes.data[0].GrooveTypeName
+						makeRightForm.value.GrooveProcessType = fitupRes.data[0].GrooveProcessType
+						makeRightForm.value.GrooveAngle = fitupRes.data[0].GrooveAngle
+						makeRightForm.value.FitupGap = fitupRes.data[0].FitupGap
+						makeRightForm.value.Misalignment = fitupRes.data[0].Misalignment
+						makeRightForm.value.WeldReinforcement = fitupRes.data[0].WeldReinforcement
+						makeRightForm.value.WeldHeight = fitupRes.data[0].WeldHeight
+						makeRightForm.value.WeldWidth = fitupRes.data[0].WeldWidth
+						makeRightForm.value.SurfaceDefect = fitupRes.data[0].SurfaceDefect
+					}
+				}
 			}
-			// 获取防腐记录（每个材料一条）
-			const materials = info.value.preWeldMaterialItems || []
-			if (materials.length > 0) {
-				const antiResults = await Promise.all(
-					materials.map(m => reqGetAntiCorrosionCheck({
-						materialCode: m.MaterialCode,
-						projectId: currentProject.value.ProjectId
-					}))
-				)
-				const map = {}
-				antiResults.forEach((r, i) => {
-					if (r.code === 1 && r.data) map[materials[i].MaterialCode] = r.data
-				})
-				antiListMap.value = map
-			}
+			
 		}
 	} catch (error) {
 		console.error('获取焊口详情失败:', error)
@@ -362,13 +438,6 @@ const getInfo = async (id) => {
 	}
 }
 
-const handleMutualCheck = (id) => {
-	if (!id) {
-		uni.showToast({ title: '缺少材料信息', icon: 'none' })
-		return
-	}
-	uni.navigateTo({ url: `/scanpages/hj/do_anti_rust?id=${id}` })
-}
 
 </script>
 
@@ -385,7 +454,6 @@ $radius: $app-radius;
 // 页面专属
 $bg: #f0f2f5;
 $card-bg: #ffffff;
-$shadow-sm: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
 $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 
 .detail-page {
@@ -482,130 +550,6 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 	}
 }
 
-// ===== 坡口参数仪表 =====
-.spec-grid {
-	background: $card-bg;
-	border-radius: $radius;
-	padding: 8rpx 0;
-	box-shadow: $shadow-md;
-
-	.spec-item {
-		padding: 24rpx 28rpx;
-		border-bottom: 1rpx solid $border;
-
-		&:last-child {
-			border-bottom: none;
-		}
-
-		&__header {
-			display: flex;
-			align-items: baseline;
-			justify-content: space-between;
-			margin-bottom: 14rpx;
-		}
-
-		&__label {
-			font-size: 24rpx;
-			color: $text-secondary;
-			font-weight: 500;
-		}
-
-		&__value {
-			font-size: 40rpx;
-			font-weight: 700;
-			color: $text;
-			line-height: 1;
-			font-variant-numeric: tabular-nums;
-		}
-
-		&__unit {
-			font-size: 24rpx;
-			font-weight: 400;
-			color: $text-secondary;
-			margin-left: 6rpx;
-		}
-
-		&__bar-track {
-			height: 8rpx;
-			background: #f0f2f5;
-			border-radius: 4rpx;
-			overflow: hidden;
-			position: relative;
-		}
-
-		&__bar-fill {
-			height: 100%;
-			border-radius: 4rpx;
-			background: linear-gradient(90deg, $primary, #6ba3ff);
-			transition: width 0.6s cubic-bezier(0.34, 1.56, 0.64, 1);
-			position: relative;
-
-			&::after {
-				content: '';
-				position: absolute;
-				right: 0;
-				top: 0;
-				bottom: 0;
-				width: 12rpx;
-				border-radius: 4rpx;
-				background: rgba(255, 255, 255, 0.35);
-			}
-
-			&.fill--amber {
-				background: linear-gradient(90deg, #f59e0b, #fbbf24);
-			}
-
-			&.fill--teal {
-				background: linear-gradient(90deg, #14b8a6, #2dd4bf);
-			}
-		}
-	}
-}
-
-
-// ===== 校验卡片 =====
-.check-card {
-	background: $card-bg;
-	border-radius: $radius;
-	overflow: hidden;
-	box-shadow: $shadow-md;
-}
-
-.check-item {
-	display: flex;
-	align-items: center;
-	padding: 22rpx 28rpx;
-	border-bottom: 1rpx solid $border;
-
-	&:last-child {
-		border-bottom: none;
-	}
-
-	&__left {
-		flex: 1;
-		min-width: 0;
-	}
-
-	&__label {
-		font-size: 26rpx;
-		font-weight: 500;
-		color: $text;
-		display: block;
-		margin-bottom: 4rpx;
-	}
-
-	&__desc {
-		font-size: 22rpx;
-		color: $text-secondary;
-		display: block;
-	}
-
-	&__action {
-		flex-shrink: 0;
-		margin-left: 20rpx;
-	}
-}
-
 // ===== 提交栏（悬浮底部） =====
 .submit-bar {
 	position: fixed;
@@ -617,38 +561,6 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 	background: linear-gradient(180deg, rgba(240, 242, 245, 0) 0%, $bg 20%);
 }
 
-// ===== 备注输入框 =====
-.remark-card {
-	background: $card-bg;
-	border-radius: $radius;
-	padding: 24rpx 28rpx;
-	box-shadow: $shadow-md;
-	position: relative;
-
-	.remark-input {
-		width: 100%;
-		min-height: 120rpx;
-		font-size: 26rpx;
-		color: $text;
-		line-height: 1.6;
-		padding: 0;
-		margin: 0;
-		background: transparent;
-
-		&::placeholder {
-			color: #b0bec5;
-		}
-	}
-
-	.remark-count {
-		position: absolute;
-		bottom: 16rpx;
-		right: 24rpx;
-		font-size: 22rpx;
-		color: $text-secondary;
-	}
-}
-
 // ================================================================
 //  材料质检区块 —— 三合一 section
 // ================================================================
@@ -735,25 +647,4 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 	}
 }
 
-// ---- 防腐记录 ----
-// 覆盖组件内部边距（已由父 .section 聚合）
-:deep(.anti-record__section) {
-	margin: 0;
-}
-
-// 防腐记录卡片底部圆角收口，与 section 容器对齐
-:deep(.anti-record__card) {
-	border-radius: 0 0 $radius $radius;
-	border-top: 1rpx solid $border;
-}
-
-// 防腐记录 header 缩进对齐，隐藏蓝色竖条（父 section header 已承载标题层级）
-:deep(.anti-record__header) {
-	padding: 20rpx 28rpx 12rpx;
-	margin-bottom: 0;
-}
-
-:deep(.anti-record__bar) {
-	display: none;
-}
 </style>
diff --git a/scanpages/hj/material_sampling.vue b/scanpages/hj/material_sampling.vue
index f365917..0e85e2a 100644
--- a/scanpages/hj/material_sampling.vue
+++ b/scanpages/hj/material_sampling.vue
@@ -179,7 +179,7 @@
 
 <script setup>
 import { ref, watch, nextTick } from 'vue'
-import { onLoad, onShow } from '@dcloudio/uni-app'
+import { onLoad } from '@dcloudio/uni-app'
 import { storeToRefs } from 'pinia'
 import { useUserStore } from '@/store'
 
@@ -372,7 +372,6 @@ $radius: $app-radius;
 // 页面专属
 $bg: #f0f2f5;
 $card-bg: #ffffff;
-$shadow-sm: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
 $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 
 .detail-page {
@@ -469,130 +468,6 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 	}
 }
 
-// ===== 坡口参数仪表 =====
-.spec-grid {
-	background: $card-bg;
-	border-radius: $radius;
-	padding: 8rpx 0;
-	box-shadow: $shadow-md;
-
-	.spec-item {
-		padding: 24rpx 28rpx;
-		border-bottom: 1rpx solid $border;
-
-		&:last-child {
-			border-bottom: none;
-		}
-
-		&__header {
-			display: flex;
-			align-items: baseline;
-			justify-content: space-between;
-			margin-bottom: 14rpx;
-		}
-
-		&__label {
-			font-size: 24rpx;
-			color: $text-secondary;
-			font-weight: 500;
-		}
-
-		&__value {
-			font-size: 40rpx;
-			font-weight: 700;
-			color: $text;
-			line-height: 1;
-			font-variant-numeric: tabular-nums;
-		}
-
-		&__unit {
-			font-size: 24rpx;
-			font-weight: 400;
-			color: $text-secondary;
-			margin-left: 6rpx;
-		}
-
-		&__bar-track {
-			height: 8rpx;
-			background: #f0f2f5;
-			border-radius: 4rpx;
-			overflow: hidden;
-			position: relative;
-		}
-
-		&__bar-fill {
-			height: 100%;
-			border-radius: 4rpx;
-			background: linear-gradient(90deg, $primary, #6ba3ff);
-			transition: width 0.6s cubic-bezier(0.34, 1.56, 0.64, 1);
-			position: relative;
-
-			&::after {
-				content: '';
-				position: absolute;
-				right: 0;
-				top: 0;
-				bottom: 0;
-				width: 12rpx;
-				border-radius: 4rpx;
-				background: rgba(255, 255, 255, 0.35);
-			}
-
-			&.fill--amber {
-				background: linear-gradient(90deg, #f59e0b, #fbbf24);
-			}
-
-			&.fill--teal {
-				background: linear-gradient(90deg, #14b8a6, #2dd4bf);
-			}
-		}
-	}
-}
-
-
-// ===== 校验卡片 =====
-.check-card {
-	background: $card-bg;
-	border-radius: $radius;
-	overflow: hidden;
-	box-shadow: $shadow-md;
-}
-
-.check-item {
-	display: flex;
-	align-items: center;
-	padding: 22rpx 28rpx;
-	border-bottom: 1rpx solid $border;
-
-	&:last-child {
-		border-bottom: none;
-	}
-
-	&__left {
-		flex: 1;
-		min-width: 0;
-	}
-
-	&__label {
-		font-size: 26rpx;
-		font-weight: 500;
-		color: $text;
-		display: block;
-		margin-bottom: 4rpx;
-	}
-
-	&__desc {
-		font-size: 22rpx;
-		color: $text-secondary;
-		display: block;
-	}
-
-	&__action {
-		flex-shrink: 0;
-		margin-left: 20rpx;
-	}
-}
-
 // ===== 提交栏（悬浮底部） =====
 .submit-bar {
 	position: fixed;
@@ -604,37 +479,6 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 	background: linear-gradient(180deg, rgba(240, 242, 245, 0) 0%, $bg 20%);
 }
 
-// ===== 备注输入框 =====
-.remark-card {
-	background: $card-bg;
-	border-radius: $radius;
-	padding: 24rpx 28rpx;
-	box-shadow: $shadow-md;
-	position: relative;
-
-	.remark-input {
-		width: 100%;
-		min-height: 120rpx;
-		font-size: 26rpx;
-		color: $text;
-		line-height: 1.6;
-		padding: 0;
-		margin: 0;
-		background: transparent;
-
-		&::placeholder {
-			color: #b0bec5;
-		}
-	}
-
-	.remark-count {
-		position: absolute;
-		bottom: 16rpx;
-		right: 24rpx;
-		font-size: 22rpx;
-		color: $text-secondary;
-	}
-}
 
 // ================================================================
 //  材料质检区块 —— 三合一 section
@@ -721,25 +565,4 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 	}
 }
 
-// ---- 防腐记录 ----
-// 覆盖组件内部边距（已由父 .section 聚合）
-:deep(.anti-record__section) {
-	margin: 0;
-}
-
-// 防腐记录卡片底部圆角收口，与 section 容器对齐
-:deep(.anti-record__card) {
-	border-radius: 0 0 $radius $radius;
-	border-top: 1rpx solid $border;
-}
-
-// 防腐记录 header 缩进对齐，隐藏蓝色竖条（父 section header 已承载标题层级）
-:deep(.anti-record__header) {
-	padding: 20rpx 28rpx 12rpx;
-	margin-bottom: 0;
-}
-
-:deep(.anti-record__bar) {
-	display: none;
-}
 </style>