From f1a88239f6f02e39a207ac2c2c0831b002baf168 Mon Sep 17 00:00:00 2001
From: Zones <765289303@qq.com>
Date: Tue, 14 Jul 2026 10:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scanpages/hj/daily_paper.vue | 337 ++++++++++++++++++-----------------
 scanpages/hj/make_right.vue  | 120 ++-----------
 2 files changed, 194 insertions(+), 263 deletions(-)

diff --git a/scanpages/hj/daily_paper.vue b/scanpages/hj/daily_paper.vue
index 0b1cc1e..748e3bb 100644
--- a/scanpages/hj/daily_paper.vue
+++ b/scanpages/hj/daily_paper.vue
@@ -11,6 +11,21 @@
 			</view>
 		</view>
 
+		<!-- 组对记录 -->
+		<view class="section">
+			<nbd-record-card title="组对" :list="fitupList" :fields="fitupFields" status-key="CheckResult"
+				status-match="合格" />
+		</view>
+		<!-- 互检上一工序 -->
+		<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 class="section">
 			<view class="section__header">
@@ -73,7 +88,8 @@
 					<text class="card__label">焊口位置</text>
 					<view class="card__value-wrap card__value-wrap--clickable">
 						<text class="card__value" :class="{ 'card__value--placeholder': !form.WeldingLocationCode }">
-							{{ form.WeldingLocationCode ? `${form.WeldingLocationCode}(${form.WeldingLocationName || '--'})` : '请选择' }}
+							{{ form.WeldingLocationCode ? `${form.WeldingLocationCode}(${form.WeldingLocationName ||
+								'--'})` : '请选择' }}
 						</text>
 						<u-icon name="arrow-right" :size="24" color="#bbb" />
 					</view>
@@ -113,201 +129,195 @@
 				<view class="card__row card__row--stack">
 					<text class="card__label">备注</text>
 					<view class="card__value-wrap">
-						<textarea class="remark-input" v-model="form.Remark" placeholder="请输入备注" :maxlength="200" auto-height />
+						<textarea class="remark-input" v-model="form.Remark" placeholder="请输入备注" :maxlength="200"
+							auto-height />
 					</view>
 				</view>
 				<!-- 焊前拍照 -->
 				<view class="card__row card__row--stack">
 					<text class="card__label">焊前拍照</text>
 					<view class="card__value-wrap">
-						<nbd-photo-upload ref="beforePhotoRef" v-model:attachUrl="preWeldAttachUrl" typeName="WeldingDaily_Before" />
+						<nbd-photo-upload ref="beforePhotoRef" v-model:attachUrl="preWeldAttachUrl"
+							typeName="WeldingDaily_Before" />
 					</view>
 				</view>
 				<!-- 焊后拍照 -->
 				<view class="card__row card__row--stack">
 					<text class="card__label">焊后拍照</text>
 					<view class="card__value-wrap">
-						<nbd-photo-upload ref="afterPhotoRef" v-model:attachUrl="postWeldAttachUrl" typeName="WeldingDaily_After" />
+						<nbd-photo-upload ref="afterPhotoRef" v-model:attachUrl="postWeldAttachUrl"
+							typeName="WeldingDaily_After" />
 					</view>
 				</view>
 			</view>
 		</view>
 
-		<!-- 互检上一工序 -->
-		<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 class="section">
-			<nbd-record-card title="组对" :list="fitupList" :fields="fitupFields" status-key="CheckResult" status-match="合格" />
-		</view>
 
 		<!-- 底部按钮 -->
 		<view class="bottom-btns">
-			<u-button v-if="!form.WeldingDate" class="btn-submit" size="medium" type="primary" @click="handleReport">填报</u-button>
-			<u-button v-if="form.WeldingDailyId" class="btn-point" size="medium" type="primary" @click="handlePoint">点口</u-button>
+			<u-button v-if="!form.WeldingDate" class="btn-submit" size="medium" type="primary"
+				@click="handleReport">填报</u-button>
+			<u-button v-if="form.WeldingDailyId" class="btn-point" size="medium" type="primary"
+				@click="handlePoint">点口</u-button>
 			<u-button class="btn-cancel" size="medium" @click="handleClose">取消</u-button>
 		</view>
 
 		<!-- 焊口位置选择弹窗 -->
-		<nbd-select v-model="showLocationPicker" :show-search="true" title="选择焊口位置" :list="locationList" label-key="BaseInfoCode" value-key="BaseInfoId" @confirm="handleConfirmLocation" />
+		<nbd-select v-model="showLocationPicker" :show-search="true" title="选择焊口位置" :list="locationList"
+			label-key="BaseInfoCode" value-key="BaseInfoId" @confirm="handleConfirmLocation" />
 
 		<!-- 焊工类型选择弹窗 -->
-		<nbd-select v-model="showTypePicker" title="选择焊工类型" :list="welderTypeList" label-key="BaseInfoName" value-key="BaseInfoCode" @confirm="handleConfirmType" />
+		<nbd-select v-model="showTypePicker" title="选择焊工类型" :list="welderTypeList" label-key="BaseInfoName"
+			value-key="BaseInfoCode" @confirm="handleConfirmType" />
 	</view>
 </template>
 
 <script setup>
-	import { ref } from 'vue'
-	import { onLoad } from '@dcloudio/uni-app'
-	import { reqGetWeldJointByWeldJointId, reqSaveWeldingDailyByWeldJointId, reqGetManualPointSave, reqFitupCheckByWeldJointId } from '@/api/hj.js'
-	import { reqWeldingLocation } from '@/api/base.js'
-	import { useUserStore } from '@/store'
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { reqGetWeldJointByWeldJointId, reqSaveWeldingDailyByWeldJointId, reqGetManualPointSave, reqFitupCheckByWeldJointId } from '@/api/hj.js'
+import { reqWeldingLocation } from '@/api/base.js'
+import { useUserStore } from '@/store'
 
 
-	const userStore = useUserStore()
-	const { userInfo } = userStore
+const userStore = useUserStore()
+const { userInfo } = userStore
 
-	// ===== 表单数据 =====
-	const form = ref({})
-	const preWeldAttachUrl = ref('')
-	const postWeldAttachUrl = ref('')
+// ===== 表单数据 =====
+const form = ref({})
+const preWeldAttachUrl = ref('')
+const postWeldAttachUrl = ref('')
 
-	// ===== 弹窗 =====
-	const showLocationPicker = ref(false)
-	const showTypePicker = ref(false)
-	const locationList = ref([])
-	const welderTypeList = ref([
-		{ BaseInfoName: '打底/盖面', BaseInfoCode: 0 },
-		{ BaseInfoName: '打底',     BaseInfoCode: 1 },
-		{ BaseInfoName: '盖面',     BaseInfoCode: 2 },
-	])
+// ===== 弹窗 =====
+const showLocationPicker = ref(false)
+const showTypePicker = ref(false)
+const locationList = ref([])
+const welderTypeList = ref([
+	{ BaseInfoName: '打底/盖面', BaseInfoCode: 0 },
+	{ BaseInfoName: '打底', BaseInfoCode: 1 },
+	{ BaseInfoName: '盖面', BaseInfoCode: 2 },
+])
 
-	const beforePhotoRef = ref(null)
-	const afterPhotoRef = ref(null)
+const beforePhotoRef = ref(null)
+const afterPhotoRef = ref(null)
 
-	// ===== 组对记录 =====
-	const weldJointId = ref('')
-	const fitupList = ref([])
-	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 weldJointId = ref('')
+const fitupList = ref([])
+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 handleShowLocationSelect = () => {
-		reqWeldingLocation().then(res => {
-			locationList.value = res.data
-			showLocationPicker.value = true
-		})
-	}
-
-	const handleConfirmLocation = (item) => {
-		form.value.WeldingLocationCode = item.BaseInfoCode
-		form.value.WeldingLocationName = item.BaseInfoName
-		form.value.WeldingLocationId = item.BaseInfoId
-		showLocationPicker.value = false
-	}
-
-	const handleConfirmType = (item) => {
-		form.value.welderType = item.BaseInfoCode
-		form.value.welderTypeName = item.BaseInfoName
-		showTypePicker.value = false
-	}
-
-	// ===== 操作 =====
-	const handlePoint = async () => {
-		await reqGetManualPointSave(form.value.WeldJointId)
-		uni.showToast({ title: '点口成功', icon: 'none' })
-		setTimeout(() => { uni.navigateBack() }, 1500)
-	}
-
-	const handleReport = () => {
-		uni.showModal({
-			title: '信息提示',
-			content: '确定要填报吗？',
-			success: async ({ confirm }) => {
-				if (confirm) {
-					console.log(beforePhotoRef.value?.hasPending())
-					const needBefore = beforePhotoRef.value?.hasPending()
-					const needAfter = afterPhotoRef.value?.hasPending()
-					if (needBefore || needAfter) {
-						uni.showLoading({ title: '上传照片中...', mask: true })
-						if (needBefore) await beforePhotoRef.value.uploadAll()
-						if (needAfter) await afterPhotoRef.value.uploadAll()
-						uni.hideLoading()
-					}
-
-					await reqSaveWeldingDailyByWeldJointId({
-						WeldJointId: form.value.WeldJointId,
-						Personid: userInfo.PersonId,
-						time: form.value.WeldingDateTemp,
-						weldingLocation: form.value.WeldingLocationId || '',
-						welderType: form.value.welderType,
-						PreWeldAttachUrl: preWeldAttachUrl.value || form.value.PreWeldAttachUrl || '',
-						PostWeldAttachUrl: postWeldAttachUrl.value || form.value.PostWeldAttachUrl || ''
-					})
-					uni.showToast({ title: '保存成功', icon: 'none' })
-					setTimeout(() => { uni.navigateBack() }, 1500)
-				}
-			}
-		})
-	}
-
-	const handleClose = () => { uni.navigateBack() }
-
-	const handleMutualCheck = () => {
-		uni.navigateTo({ url: '/scanpages/hj/make_right?id=' + weldJointId.value })
-	}
-
-	// ===== 生命周期 =====
-	onLoad((opt) => {
-		weldJointId.value = opt.id || ''
-
-		reqGetWeldJointByWeldJointId(opt.id).then(res => {
-			form.value = res.data || {}
-			if (form.value.CoverWelderName) {
-				form.value.welderName = form.value.CoverWelderName
-			}
-			if (form.value.BackingWelderName) {
-				form.value.welderName += '/' + form.value.BackingWelderName
-			}
-			const now = new Date()
-			const today = `${now.getFullYear()}-${String(now.getMonth()+1).padStart(2,'0')}-${String(now.getDate()).padStart(2,'0')}`
-			form.value.WeldingDateTemp = form.value.WeldingDate || today
-			form.value.welderType = 0
-			form.value.welderTypeName = "打底/盖面"
-
-			// 回显已有照片
-			preWeldAttachUrl.value = form.value.PreWeldAttachUrl || ''
-			postWeldAttachUrl.value = form.value.PostWeldAttachUrl || ''
-		})
-
-		reqFitupCheckByWeldJointId(opt.id).then(res => {
-			if (res.code === 1 && res.data) {
-				fitupList.value = res.data
-			}
-		})
+// ===== 弹窗 ========
+const handleShowLocationSelect = () => {
+	reqWeldingLocation().then(res => {
+		locationList.value = res.data
+		showLocationPicker.value = true
 	})
+}
+
+const handleConfirmLocation = (item) => {
+	form.value.WeldingLocationCode = item.BaseInfoCode
+	form.value.WeldingLocationName = item.BaseInfoName
+	form.value.WeldingLocationId = item.BaseInfoId
+	showLocationPicker.value = false
+}
+
+const handleConfirmType = (item) => {
+	form.value.welderType = item.BaseInfoCode
+	form.value.welderTypeName = item.BaseInfoName
+	showTypePicker.value = false
+}
+
+// ===== 操作 =====
+const handlePoint = async () => {
+	await reqGetManualPointSave(form.value.WeldJointId)
+	uni.showToast({ title: '点口成功', icon: 'none' })
+	setTimeout(() => { uni.navigateBack() }, 1500)
+}
+
+const handleReport = () => {
+	uni.showModal({
+		title: '信息提示',
+		content: '确定要填报吗？',
+		success: async ({ confirm }) => {
+			if (confirm) {
+				console.log(beforePhotoRef.value?.hasPending())
+				const needBefore = beforePhotoRef.value?.hasPending()
+				const needAfter = afterPhotoRef.value?.hasPending()
+				if (needBefore || needAfter) {
+					uni.showLoading({ title: '上传照片中...', mask: true })
+					if (needBefore) await beforePhotoRef.value.uploadAll()
+					if (needAfter) await afterPhotoRef.value.uploadAll()
+					uni.hideLoading()
+				}
+
+				await reqSaveWeldingDailyByWeldJointId({
+					WeldJointId: form.value.WeldJointId,
+					Personid: userInfo.PersonId,
+					time: form.value.WeldingDateTemp,
+					weldingLocation: form.value.WeldingLocationId || '',
+					welderType: form.value.welderType,
+					PreWeldAttachUrl: preWeldAttachUrl.value || form.value.PreWeldAttachUrl || '',
+					PostWeldAttachUrl: postWeldAttachUrl.value || form.value.PostWeldAttachUrl || ''
+				})
+				uni.showToast({ title: '保存成功', icon: 'none' })
+				setTimeout(() => { uni.navigateBack() }, 1500)
+			}
+		}
+	})
+}
+
+const handleClose = () => { uni.navigateBack() }
+
+const handleMutualCheck = () => {
+	uni.navigateTo({ url: '/scanpages/hj/make_right?id=' + weldJointId.value })
+}
+
+// ===== 生命周期 =====
+onLoad((opt) => {
+	weldJointId.value = opt.id || ''
+
+	reqGetWeldJointByWeldJointId(opt.id).then(res => {
+		form.value = res.data || {}
+		if (form.value.CoverWelderName) {
+			form.value.welderName = form.value.CoverWelderName
+		}
+		if (form.value.BackingWelderName) {
+			form.value.welderName += '/' + form.value.BackingWelderName
+		}
+		const now = new Date()
+		const today = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`
+		form.value.WeldingDateTemp = form.value.WeldingDate || today
+		form.value.welderType = 0
+		form.value.welderTypeName = "打底/盖面"
+
+		// 回显已有照片
+		preWeldAttachUrl.value = form.value.PreWeldAttachUrl || ''
+		postWeldAttachUrl.value = form.value.PostWeldAttachUrl || ''
+	})
+
+	reqFitupCheckByWeldJointId(opt.id).then(res => {
+		if (res.code === 1 && res.data) {
+			fitupList.value = res.data
+		}
+	})
+})
 </script>
 
 <style lang="scss" scoped>
@@ -353,8 +363,15 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 	}
 
 	@keyframes shimmer {
-		0%, 100% { background-position: 0% 0; }
-		50% { background-position: 100% 0; }
+
+		0%,
+		100% {
+			background-position: 0% 0;
+		}
+
+		50% {
+			background-position: 100% 0;
+		}
 	}
 
 	&__code {
diff --git a/scanpages/hj/make_right.vue b/scanpages/hj/make_right.vue
index c569d82..53eb320 100644
--- a/scanpages/hj/make_right.vue
+++ b/scanpages/hj/make_right.vue
@@ -14,7 +14,18 @@
 				</view>
 			</view>
 		</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>
 		<!-- 组对填报 -->
 		<view class="section">
 			<view class="section__header">
@@ -22,24 +33,6 @@
 				<text class="section__title">组对填报</text>
 			</view>
 			<view class="card">
-				<!-- 坡口类型名称 -->
-				<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 }">
-							{{ makeRightForm.GrooveTypeName || '请选择坡口类型' }}
-						</text>
-						<u-icon name="arrow-down" :size="24" color="#bbb" />
-					</view>
-				</view>
-				<!-- 坡口类型编码 -->
-				<view class="card__row">
-					<text class="card__label">坡口类型编码</text>
-					<view class="card__value-wrap">
-						{{ makeRightForm.GrooveTypeCode || '--' }}
-					</view>
-				</view>
 				<!-- 坡口加工类型 -->
 				<view class="card__row">
 					<text class="card__label">坡口加工类型</text>
@@ -48,14 +41,7 @@
 							placeholder="请输入坡口加工类型" />
 					</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="请输入坡口角度" />
-					</view>
-				</view>
+				
 				<!-- 组对间隙 -->
 				<view class="card__row">
 					<text class="card__label">组对间隙</text>
@@ -72,38 +58,7 @@
 							placeholder="请输入错边量" />
 					</view>
 				</view>
-				<!-- 焊缝余高 -->
-				<view class="card__row">
-					<text class="card__label">焊缝余高</text>
-					<view class="card__value-wrap">
-						<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">
-						<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">
-						<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">
-						<input class="card__input" v-model="makeRightForm.SurfaceDefect" type="text"
-							placeholder="请输入表面缺陷" />
-					</view>
-				</view>
+				
 			</view>
 		</view>
 
@@ -167,18 +122,7 @@
 				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>
+
 
 
 		<block v-for="(item, index) in info.preWeldMaterialItems" :key="item.MaterialCode || index">
@@ -239,7 +183,6 @@ import { reqGetGrooveTypeList } from '@/api/base'
 const cuttingFields = [
 	{ label: '下料长度', key: 'CuttingLength' },
 	{ label: '坡口形式', key: 'GrooveForm' },
-	{ label: '坡口角度', key: 'GrooveAngle' },
 	{ label: '材料编码批次', key: 'IsMaterialCodeBatchNoAccurate', type: 'tag', tagMatch: true, tagPassText: '准确', tagFailText: '不准确' },
 	{ label: '材料数量', key: 'IsMaterialQuantityAccurate', type: 'tag', tagMatch: true, tagPassText: '准确', tagFailText: '不准确' },
 	{ label: '检查人', key: 'CheckPersonName' },
@@ -251,16 +194,9 @@ const cuttingFields = [
 ]
 
 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: '合格' },
@@ -281,16 +217,9 @@ const formAttachUrl = ref('')
 const id = ref('')
 const makeRightForm = ref({
 	GrooveTypeId: '',  // 坡口类型ID
-	GrooveTypeName: '',  // 坡口类型名称
-	GrooveTypeCode: '',  // 坡口类型编码
 	GrooveProcessType: '',  // 坡口加工类型
-	GrooveAngle: '',  // 坡口角度
 	FitupGap: '',  // 组对间隙
 	Misalignment: '',  // 错边量
-	WeldReinforcement: '', // 焊缝余高
-	WeldHeight: '', // 焊缝高度
-	WeldWidth: '', // 焊缝宽度
-	SurfaceDefect: '', // 表面缺陷
 	CheckResult: '合格', // 检查结果
 	UnqualifiedReason: '', // 不合格原因
 	RectifyRequirement: '', // 整改要求
@@ -344,16 +273,9 @@ const handleSubmit = () => {
 					ProjectId: currentProject.value?.ProjectId,  			// 项目ID
 					WeldJointId: info.value?.WeldJointId,  					// 焊口ID
 					GrooveTypeId: makeRightForm.value.GrooveTypeId,			// 坡口类型ID
-					GrooveTypeCode: makeRightForm.value.GrooveTypeCode,		// 坡口类型编码
-					GrooveTypeName: makeRightForm.value.GrooveTypeName,		// 坡口类型名称
-					GrooveProcessType: makeRightForm.value.GrooveProcessType, // 坡口加工类型
-					GrooveAngle: makeRightForm.value.GrooveAngle,			// 坡口角度
+					GrooveProcessType: makeRightForm.value.GrooveProcessType,	// 坡口加工类型
 					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,				// 创建人员
 					CheckPerson: userInfo.value?.PersonId,				// 检查人员
@@ -374,8 +296,7 @@ const handleSubmit = () => {
 
 const selectGrooveType = (item) => {
 	makeRightForm.value.GrooveTypeId = item.BaseInfoId
-	makeRightForm.value.GrooveTypeCode = item.BaseInfoCode
-	makeRightForm.value.GrooveTypeName = item.BaseInfoName
+	makeRightForm.value.GrooveProcessType = item.BaseInfoName
 	showGrooveTypePicker.value = false
 }
 
@@ -415,16 +336,9 @@ const getInfo = async (id) => {
 					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
 					}
 				}
 			}