yangjl/sh-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

下料完成

Browse Source
This commit is contained in:
杨家亮
2026-07-07 15:15:23 +08:00
parent 6ed757e75f
commit 542086a34c
6 changed files with 1034 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scanpages/hj/do_anti_rust.vue
+26 -6
View File
@@ -162,7 +162,9 @@
</view>
<!-- 防腐记录 -->
<nbd-anti-record :params="{ materialCode: form.MaterialCode, projectId: currentProject.ProjectId }" />
<view class="section">
<nbd-record-card title="防腐" :list="antiList" :fields="antiFields" status-key="CheckResult" status-match="合格" />
</view>
@@ -179,7 +181,25 @@ import { onLoad } from '@dcloudio/uni-app'
import { storeToRefs } from 'pinia'
import { watch, nextTick } from 'vue'
import { useUserStore } from '@/store'
import { reqMaterialInfoByMaterialCode, reqPaintCodeList, reqSaveAntiCorrosionCheck , reqGetAntiCorrosionCheck } from '@/api/hj.js'
import { reqMaterialInfoByMaterialCode, reqPaintCodeList, reqSaveAntiCorrosionCheck, reqGetAntiCorrosionCheck } from '@/api/hj.js'
// 防腐记录字段
const antiFields = [
{ label: '防腐等级', key: 'AnticorrosionLevel' },
{ label: '中间漆', key: 'IntermediatePaint' },
{ label: '面漆', key: 'Topcoat' },
{ label: '漆膜厚度', key: 'FilmThickness' },
{ label: '喷砂情况', key: 'SandBlasting' },
{ label: '除锈喷砂情况', key: 'RustSandBlasting' },
{ 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 antiList = ref([])
const userStore = useUserStore()
const { userInfo, currentProject } = storeToRefs(userStore)
@@ -265,12 +285,13 @@ const loadData = async (id) => {
form.value = res.data
}
if (res1.code === 1 && res1.data) {
antiList.value = res1.data
let antiData = res1.data
if(antiData&&antiData.length>0){
if (antiData && antiData.length > 0) {
antiForm.value = {
...antiData[0],
CheckResult: '合格',
UnqualifiedReason: '',
UnqualifiedReason: '',
RectifyRequirement: '',
Remark: ''
}
@@ -284,6 +305,7 @@ const loadData = async (id) => {
}
}
// 提交
const handleSubmit = async () => {
if (!antiForm.value.PaintId) {
uni.showToast({ title: '请选择防腐等级', icon: 'none' })
@@ -480,6 +502,4 @@ $shadow-md: 0 2rpx 12rpx rgba(0, 0, 0, 0.04), 0 8rpx 24rpx rgba(0, 0, 0, 0.06);
opacity: 1;
}
}
</style>
scanpages/hj/make_right.vue
+527 -177
View File
@@ -2,203 +2,281 @@
<view class="detail-page">
<!-- 焊口主标识 -->
<view class="joint-hero">
<text class="joint-hero__code">{{ form.WeldJointCode || '焊口编码' }}</text>
<text class="joint-hero__code">{{ info.WeldJointCode || '--' }}</text>
<view class="joint-hero__meta">
<view class="joint-hero__pill">
<text class="pill-label">管线编码</text>
<text class="pill-value">{{ form.PipelineCode || '--' }}</text>
<text class="pill-value">{{ info.PipelineCode || '--' }}</text>
</view>
<view class="joint-hero__pill">
<text class="pill-label">项目编号</text>
<text class="pill-value">{{ form.ProjectName || form.ProjectId || '--' }}</text>
<text class="pill-label">项目名称</text>
<text class="pill-value">{{ info.ProjectName || info.ProjectId || '--' }}</text>
</view>
</view>
</view>
<!-- 坡口类型 -->
<!-- 组对填报 -->
<view class="section">
<view class="section__header">
<view class="section__bar"></view>
<text class="section__title">坡口类型</text>
<text class="section__title">组对填报</text>
</view>
<view class="card">
<view class="card__row" :class="{ 'card__row--warn': !form.GrooveTypeName }"
@click="showGroovePicker = true">
<text class="card__label"><text class="required">*</text>坡口类型名称</text>
<!-- 坡口类型名称 -->
<view class="card__row" @click="showPaintCodePicker = true">
<text class="card__label">坡口类型名称</text>
<view class="card__value-wrap card__value-wrap--clickable">
<text class="card__value" :class="{ 'card__value--placeholder': !form.GrooveTypeName }">
{{ form.GrooveTypeName || '请选择坡口类型' }}
<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>
<text class="card__value">{{ form.GrooveTypeCode || '--' }}</text>
<view class="card__value-wrap">
<input class="card__input" v-model="makeRightForm.GrooveForm" type="text"
placeholder="请输入坡口形式" />
</view>
</view>
<!-- 坡口加工类型 -->
<view class="card__row">
<text class="card__label">坡口加工类型</text>
<view class="card__value-wrap">
<input class="card__input" v-model="form.GrooveProcessType" type="digit" placeholder="请输入" />
<input class="card__input" v-model="makeRightForm.GrooveAngle" type="digit"
placeholder="请输入坡口角度" />
</view>
</view>
</view>
</view>
<!-- 坡口参数 -->
<view class="section">
<view class="section__header">
<view class="section__bar"></view>
<text class="section__title">坡口参数</text>
</view>
<view class="card">
<!-- 坡口角度 -->
<view class="card__row">
<text class="card__label">坡口角度</text>
<view class="card__value-wrap">
<input class="card__input" v-model="form.GrooveAngle" type="digit" placeholder="请输入" />
<text class="card__unit">°</text>
<nbd-check-btn v-model="makeRightForm.IsMaterialCodeBatchNoAccurate" passKey="准确" failKey="不准确"
passText="准确" failText="不准确" />
</view>
</view>
<!-- 组对间隙 -->
<view class="card__row">
<text class="card__label">组对间隙</text>
<view class="card__value-wrap">
<input class="card__input" v-model="form.FitupGap" type="digit" placeholder="请输入" />
<text class="card__unit">mm</text>
<nbd-check-btn v-model="makeRightForm.IsMaterialQuantityAccurate" passKey="准确" failKey="不准确"
passText="准确" failText="不准确" />
</view>
</view>
<!-- 错边量 -->
<view class="card__row">
<text class="card__label">错边量</text>
<view class="card__value-wrap">
<input class="card__input" v-model="form.Misalignment" type="digit" placeholder="请输入" />
<text class="card__unit">mm</text>
<nbd-check-btn v-model="makeRightForm.IsMaterialQuantityAccurate" passKey="准确" failKey="不准确"
passText="准确" failText="不准确" />
</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="不准确" />
</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="不准确" />
</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="不准确" />
</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="不准确" />
</view>
</view>
</view>
</view>
<!-- 备注 -->
<!-- 检查信息 -->
<view class="section">
<view class="section__header">
<view class="section__bar"></view>
<text class="section__title">备注</text>
<text class="section__title">检查信息</text>
</view>
<view class="card">
<!-- 检查结果 -->
<view class="card__row">
<textarea class="remark-input" v-model="remark" placeholder="请输入备注信息（选填）" :maxlength="200" auto-height />
<text class="card__label">检查结果</text>
<view class="card__value-wrap card__value-wrap--clickable">
<nbd-check-btn v-model="makeRightForm.CheckResult" passKey="合格" failKey="不合格" passText="合格"
failText="不合格" />
</view>
</view>
<view class="fail-section"
:class="{ 'is-visible': failVisible, 'is-enter': failAnimating, 'is-leave': failLeaving }">
<!-- 不合格原因 -->
<view class="card__row card__row--stack">
<text class="card__label">不合格原因</text>
<view class="card__value-wrap">
<textarea class="remark-input" v-model="makeRightForm.UnqualifiedReason" placeholder="请输入"
:maxlength="200" auto-height />
</view>
</view>
<!-- 整改要求 -->
<view class="card__row card__row--stack">
<text class="card__label">整改要求</text>
<view class="card__value-wrap">
<textarea class="remark-input" v-model="makeRightForm.RectifyRequirement" placeholder="请输入"
:maxlength="200" auto-height />
</view>
</view>
</view>
<!-- 备注 -->
<view class="card__row card__row--stack">
<text class="card__label">备注</text>
<view class="card__value-wrap">
<textarea class="remark-input" v-model="makeRightForm.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="photoRef" v-model:attachUrl="formAttachUrl" typeName="AntiRust" />
</view>
</view>
</view>
</view>
<!-- 现场照片 -->
<!-- 下料记录 -->
<view class="section">
<view class="section__header">
<view class="section__bar"></view>
<text class="section__title">照片</text>
</view>
<view class="img-box">
<nbd-photo-upload ref="photoRef" v-model:attachUrl="attachUrl" typeName="MakeRight" />
</view>
<nbd-record-card title="下料" :list="cuttingList" :fields="cuttingFields" status-key="CheckResult"
status-match="合格" />
</view>
<block v-for="(item, index) in info.preWeldMaterialItems" :key="item.MaterialCode || index">
<!-- 材料信息 -->
<view class="section">
<view class="section__header">
<view class="section__bar"></view>
<text class="section__title">{{ item.MaterialName || item.MaterialCode || '--' }}</text>
</view>
<view class="card">
<view class="card__row">
<text class="card__label">炉号</text>
<text class="card__value">
{{ item.HeatNo || '--' }}
</text>
</view>
<view class="card__row">
<text class="card__label">批号</text>
<text class="card__value">{{ item.BatchNo || '--' }}</text>
</view>
<view class="card__row">
<text class="card__label">规格</text>
<text class="card__value">{{ item.MaterialSpec || '--' }}</text>
</view>
<view class="card__row">
<text class="card__label">单位</text>
<text class="card__value">{{ item.MaterialUnit || '--' }}</text>
</view>
<view class="card__row card__row--stack">
<text class="card__label">材料描述</text>
<text class="card__value">{{ item.MaterialDef || '--' }}</text>
</view>
</view>
</view>
</block>
<!-- 提交按钮 -->
<view class="submit-bar">
<view class="btn-primary-gradient" @click="handleSubmit">
<text class="btn-primary-gradient__text">提交</text>
<text class="btn-primary-gradient__text">提交结果</text>
</view>
</view>
<!-- 坡口类型选择器 -->
<nbd-select v-model="showGroovePicker" title="选择坡口类型" :list="grooveTypeOptions" label-key="BaseInfoName"
value-key="BaseInfoCode" @confirm="selectGrooveType" />
</view>
</template>
<script setup>
import { ref, onMounted } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import { ref, watch, nextTick } from 'vue'
import { onLoad, onShow } from '@dcloudio/uni-app'
import { storeToRefs } from 'pinia'
import { useUserStore } from '@/store'
import { reqPreWeldJointByWeldJointId, reqGetGrooveTypeList, reqSaveFitupCheck } from '@/api/hj'
import { reqPreWeldJointByWeldJointId, reqSaveCuttingCheck, reqCuttingCheckByWeldJointId, reqGetAntiCorrosionCheck } from '@/api/hj'
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' },
{ 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 userStore = useUserStore()
const { userInfo, currentProject } = storeToRefs(userStore)
const showGroovePicker = ref(false)
const grooveTypeOptions = ref([])
const attachUrl = ref('')
const info = ref({})
const remark = ref('')
const formAttachUrl = ref('')
const id = ref('')
const makeRightForm = ref({
GrooveTypeId: '', // 坡口类型ID
GrooveTypeName: '', // 坡口类型名称
})
// 照片组件引用
const photoRef = ref(null)
const form = ref({
WeldJointId: '',
WeldJointCode: '',
PipelineId: '',
PipelineCode: '',
ProjectId: '',
GrooveTypeId: '',
GrooveTypeCode: '',
GrooveTypeName: '',
GrooveProcessType: '',
GrooveAngle: '',
FitupGap: '',
Misalignment: ''
})
const failVisible = ref(layingOffForm.value.CheckResult === '不合格')
const failAnimating = ref(false)
const failLeaving = ref(false)
const fetchGrooveTypes = async () => {
try {
const res = await reqGetGrooveTypeList()
if (res.code === 1 && res.data) {
grooveTypeOptions.value = res.data
}
} catch (err) {
console.error('获取坡口类型列表失败:', err)
}
}
const selectGrooveType = (item) => {
form.value.GrooveTypeId = item.BaseInfoId
form.value.GrooveTypeCode = item.BaseInfoCode
form.value.GrooveTypeName = item.BaseInfoName
showGroovePicker.value = false
}
onMounted(() => {
fetchGrooveTypes()
})
onLoad((opt) => {
if (opt?.id) {
loadData(opt.id)
}
if (currentProject.value?.ProjectId) {
form.value.ProjectId = currentProject.value.ProjectId
watch(() => layingOffForm.value.CheckResult, async (val) => {
if (val === '不合格') {
failVisible.value = true
await nextTick()
failAnimating.value = true
failLeaving.value = false
} else {
failLeaving.value = true
failAnimating.value = false
setTimeout(() => {
failVisible.value = false
failLeaving.value = false
}, 250)
}
})
const loadData = async (id) => {
try {
uni.showLoading({ title: '加载中...', mask: true })
const res = await reqPreWeldJointByWeldJointId(id)
if (res.code === 1 && res.data) {
form.value = res.data
attachUrl.value = res.data.FitupAttachUrl1 || ""
}
} catch (err) {
console.error('加载焊口数据失败:', err)
uni.showToast({ title: '加载失败', icon: 'none' })
} finally {
uni.hideLoading()
}
}
const handleSubmit = () => {
if (!form.value.GrooveTypeName) {
uni.showToast({ title: '请选择坡口类型', icon: 'none' })
return
}
uni.showModal({
title: '确认提交',
content: '确定提交组对检查结果吗？',
content: '确定提交吗？',
success: async (res) => {
if (res.confirm) {
if (photoRef.value?.hasPending()) {
@@ -206,36 +284,92 @@ const handleSubmit = () => {
await photoRef.value.uploadAll()
uni.hideLoading()
}
const CuttingAttachUrl1 = formAttachUrl.value || info.value.CuttingAttachUrl1 || ''
const checkTime = new Date().toISOString()
const params = {
FitupCheckId: form.value.FitupCheckId || '',
ProjectId: form.value?.ProjectId,
WeldJointId: form.value.WeldJointId,
PipelineCode: form.value.PipelineCode || '',
WeldJointCode: form.value.WeldJointCode || '',
GrooveTypeId: form.value.GrooveTypeId,
GrooveTypeCode: form.value.GrooveTypeCode || '',
GrooveTypeName: form.value.GrooveTypeName || '',
GrooveProcessType: form.value.GrooveProcessType || '',
GrooveAngle: Number(form.value.GrooveAngle) || 0,
FitupGap: Number(form.value.FitupGap) || 0,
Misalignment: Number(form.value.Misalignment) || 0,
CheckPerson: userInfo.value?.PersonId || '',
CheckPersonName: userInfo.value?.PersonName || '',
CheckTime: checkTime,
FitupAttachUrl1: attachUrl.value || form.value.FitupAttachUrl1 || '',
Remark: remark.value || ''
}
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, // 检查人员
CheckTime: uni.formatTime(new Date().getTime(), 'YYYY-MM-DD HH:mm'), // 检查时间
CreateUser: userInfo.value?.PersonId, // 创建人员
CheckResult: layingOffForm.value.CheckResult, // 检查结果
Remark: remark.value, // 备注
UnqualifiedReason: layingOffForm.value.UnqualifiedReason, // 不合格原因
RectifyRequirement: layingOffForm.value.RectifyRequirement, // 整改要求
AttachUrl1: CuttingAttachUrl1,
}
console.log('提交参数:', params)
await reqSaveFitupCheck(params)
await reqSaveCuttingCheck(params)
uni.showToast({ title: '提交成功', icon: 'none' })
setTimeout(() => { uni.navigateBack() }, 1500)
}
}
})
}
onLoad((opt) => {
if (opt.id) {
id.value = opt.id
}
})
onShow(() => {
if (id.value) {
getInfo(id.value)
}
})
const getInfo = async (id) => {
try {
uni.showLoading({ title: '加载中...', mask: true })
const res = await reqPreWeldJointByWeldJointId(id)
if (res.code === 1) {
info.value = res.data
// 获取下料记录
if (info.value.WeldJointId) {
const cuttingRes = await reqCuttingCheckByWeldJointId(info.value.WeldJointId)
if (cuttingRes.code === 1 && cuttingRes.data) {
cuttingList.value = cuttingRes.data
}
}
// 获取防腐记录（每个材料一条）
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)
uni.showToast({ title: '加载失败', icon: 'none' })
} finally {
uni.hideLoading()
}
}
const handleMutualCheck = (id) => {
if (!id) {
uni.showToast({ title: '缺少材料信息', icon: 'none' })
return
}
uni.navigateTo({ url: `/scanpages/hj/do_anti_rust?id=${id}` })
}
</script>
<style lang="scss" scoped>
@@ -348,54 +482,131 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
}
}
// ===== 卡片页面覆盖（继承 page.scss 公共 .card 样式）=====
.card__row {
&:active {
background: #fafbfc;
}
&--warn .card__label::before {
background: #ef4444;
}
}
.card__value {
text-align: right;
&--placeholder {
color: #b0bec5;
font-weight: 400;
}
}
.card__value-wrap {
justify-content: flex-end;
}
.card__input {
text-align: right;
padding: 0;
&::placeholder {
color: #b0bec5;
}
}
// ===== 备注 =====
.remark-input {
width: 100%;
font-size: 26rpx;
color: $text;
min-height: 120rpx;
// ===== 坡口参数仪表 =====
.spec-grid {
background: $card-bg;
border-radius: $radius;
padding: 8rpx 0;
line-height: 1.6;
box-shadow: $shadow-md;
&::placeholder {
color: #b0bec5;
.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;
left: 0;
@@ -403,7 +614,146 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
bottom: 0;
padding: 20rpx 24rpx;
padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
background: linear-gradient(180deg, rgba($bg, 0) 0%, $bg 20%);
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
// ================================================================
// section 容器：微背景 + 内边距聚合三个子元素
.section {
background: #fafbfc;
border-radius: 20rpx;
padding: 24rpx 0 0;
margin-bottom: 28rpx;
box-shadow: $shadow-md;
}
// ---- 材料详情卡片 ----
// 底部圆角清零，与下方 nav-row 无缝衔接
.card {
border-radius: $radius $radius 0 0;
box-shadow: none;
}
// 编码类字段（炉号 / 批号 / 规格 / 单位）→ monospace
.card__value {
font-family: 'SF Mono', 'Menlo', 'Consolas', monospace;
font-size: 28rpx;
font-weight: 500;
color: $text;
letter-spacing: 0.3rpx;
}
// 材料描述 → 回退系统字体
.card__row--stack .card__value {
font-family: inherit;
font-size: 26rpx;
font-weight: 400;
letter-spacing: normal;
color: $text-secondary;
}
// ---- 互检导航按钮 ----
.nav-row {
display: flex;
align-items: center;
justify-content: space-between;
margin: 0;
padding: 24rpx 28rpx;
background: $card-bg;
border-radius: 0;
border-top: 1rpx solid $border;
box-shadow: none;
transition: background 0.2s ease;
margin-bottom: 28rpx;
&:active {
background: #f5f7fa;
}
&__left {
display: flex;
align-items: center;
gap: 14rpx;
}
&__dot {
width: 10rpx;
height: 10rpx;
border-radius: 50%;
background: $primary;
flex-shrink: 0;
}
&__label {
font-size: 28rpx;
font-weight: 600;
color: $text;
letter-spacing: 1rpx;
}
&__arrow {
font-size: 36rpx;
color: $text-secondary;
font-weight: 300;
line-height: 1;
margin-right: -4rpx;
}
}
// ---- 防腐记录 ----
// 覆盖组件内部边距（已由父 .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>
scanpages/hj/material_sampling.vue
+110 -67
View File
@@ -24,7 +24,7 @@
<view class="card">
<!-- 下料长度 -->
<view class="card__row" @click="showPaintCodePicker = true">
<text class="card__label required">下料长度</text>
<text class="card__label">下料长度</text>
<view class="card__value-wrap">
<input class="card__input" v-model="layingOffForm.CuttingLength" type="digit"
placeholder="请输入下料长度" />
@@ -32,24 +32,40 @@
</view>
<!-- 坡口形式 -->
<view class="card__row">
<text class="card__label required">坡口形式</text>
<text class="card__label">坡口形式</text>
<view class="card__value-wrap">
<input class="card__input" v-model="layingOffForm.GrooveForm" type="text"
placeholder="请输入坡口形式" />
</view>
</view>
<!-- 坡口角度 -->
<view class="card__row required">
<view class="card__row">
<text class="card__label">坡口角度</text>
<view class="card__value-wrap">
<input class="card__input" v-model="layingOffForm.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="layingOffForm.IsMaterialCodeBatchNoAccurate" passKey="准确" failKey="不准确" passText="准确"
failText="不准确" />
</view>
</view>
<!-- 材料数量是否准确 -->
<view class="card__row">
<text class="card__label">材料数量是否准确</text>
<view class="card__value-wrap">
<nbd-check-btn v-model="layingOffForm.IsMaterialQuantityAccurate" passKey="准确" failKey="不准确" passText="准确"
failText="不准确" />
</view>
</view>
</view>
</view>
<!-- 检查信息 -->
<!-- 检查信息 -->
<view class="section">
<view class="section__header">
<view class="section__bar"></view>
@@ -97,12 +113,17 @@
<view class="card__row card__row--stack">
<text class="card__label">照片</text>
<view class="card__value-wrap">
<nbd-photo-upload ref="photoRef" v-model:attachUrl="files" typeName="AntiRust" />
<nbd-photo-upload ref="photoRef" v-model:attachUrl="formAttachUrl" typeName="AntiRust" />
</view>
</view>
</view>
</view>
<!-- 下料记录 -->
<view class="section">
<nbd-record-card title="下料" :list="cuttingList" :fields="cuttingFields" status-key="CheckResult" status-match="合格" />
</view>
<block v-for="(item, index) in info.preWeldMaterialItems" :key="item.MaterialCode || index">
<!-- 材料信息 -->
@@ -143,38 +164,14 @@
<text class="nav-row__arrow">›</text>
</view>
<!-- 防腐记录 -->
<nbd-anti-record :custom-style="{ margin: '0rpx'}" :params="{ materialCode: item.MaterialCode, projectId: currentProject.ProjectId }" />
<nbd-record-card title="防腐" :list="antiListMap[item.MaterialCode] || []" :fields="antiFields" :custom-style="{ margin: '0rpx'}" status-key="CheckResult" status-match="合格" />
</view>
</block>
<!-- 备注 -->
<view class="section">
<view class="section__header">
<view class="section__bar"></view>
<text class="section__title">备注</text>
</view>
<view class="remark-card">
<textarea class="remark-input" v-model="remark" placeholder="请输入备注信息（选填）" :maxlength="200"
auto-height />
<text class="remark-count">{{ remark.length }}/200</text>
</view>
</view>
<!-- 现场照片 -->
<view class="section">
<view class="section__header">
<view class="section__bar"></view>
<text class="section__title">照片</text>
</view>
<view class="img-box">
<nbd-photo-upload ref="photoRef" v-model:attachUrl="formAttachUrl" typeName="MaterialSampling" />
</view>
</view>
<!-- 提交按钮 -->
<view class="submit-bar">
<view class="btn-primary-gradient" @click="handleSubmit">
<text class="btn-primary-gradient__text">提交校验结果</text>
<text class="btn-primary-gradient__text">提交结果</text>
</view>
</view>
</view>
@@ -186,8 +183,38 @@ import { onLoad, onShow } from '@dcloudio/uni-app'
import { storeToRefs } from 'pinia'
import { useUserStore } from '@/store'
import { reqPreWeldJointByWeldJointId, reqSaveCuttingCheck } from '@/api/hj'
import { reqPreWeldJointByWeldJointId, reqSaveCuttingCheck, reqCuttingCheckByWeldJointId, reqGetAntiCorrosionCheck } from '@/api/hj'
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' },
{ 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 antiFields = [
{ label: '防腐等级', key: 'AnticorrosionLevel' },
{ label: '中间漆', key: 'IntermediatePaint' },
{ label: '面漆', key: 'Topcoat' },
{ label: '漆膜厚度', key: 'FilmThickness' },
{ label: '喷砂情况', key: 'SandBlasting' },
{ label: '除锈喷砂情况', key: 'RustSandBlasting' },
{ 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 userStore = useUserStore()
const { userInfo, currentProject } = storeToRefs(userStore)
@@ -195,23 +222,19 @@ const { userInfo, currentProject } = storeToRefs(userStore)
const info = ref({})
const remark = ref('')
const formAttachUrl = ref('')
const id = ref('')
const layingOffForm = ref({
CuttingLength: '',
GrooveForm: '',
GrooveAngle: '',
CheckResult: '合格',
IsMaterialCodeBatchNoAccurate: '准确',
IsMaterialQuantityAccurate: '准确',
UnqualifiedReason: '',
RectifyRequirement: '',
Remark: ''
})
const check = ref({
CodeBatch: true,
Quantity: true
})
// 照片组件引用
const photoRef = ref(null)
@@ -238,7 +261,7 @@ watch(() => layingOffForm.value.CheckResult, async (val) => {
const handleSubmit = () => {
uni.showModal({
title: '确认提交',
content: '确定提交校验结果吗？',
content: '确定提交吗？',
success: async (res) => {
if (res.confirm) {
if (photoRef.value?.hasPending()) {
@@ -248,21 +271,24 @@ const handleSubmit = () => {
}
const CuttingAttachUrl1 = formAttachUrl.value || info.value.CuttingAttachUrl1 || ''
const now = new Date()
const pad = (n) => String(n).padStart(2, '0')
const checkTime = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`
const params = {
ProjectId: currentProject.value?.ProjectId,
WeldJointId: info.value?.WeldJointId,
IsMaterialCodeBatchNoAccurate: check.value.CodeBatch,
IsMaterialQuantityAccurate: check.value.Quantity,
CheckPerson: userInfo.value?.PersonId,
CheckTime: checkTime,
Remark: remark.value,
CuttingAttachUrl1
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, // 检查人员
CheckTime: uni.formatTime(new Date().getTime(), 'YYYY-MM-DD HH:mm'), // 检查时间
CreateUser: userInfo.value?.PersonId, // 创建人员
CheckResult: layingOffForm.value.CheckResult, // 检查结果
Remark: remark.value, // 备注
UnqualifiedReason: layingOffForm.value.UnqualifiedReason, // 不合格原因
RectifyRequirement: layingOffForm.value.RectifyRequirement, // 整改要求
AttachUrl1: CuttingAttachUrl1,
}
console.log('提交参数:', params)
await reqSaveCuttingCheck(params)
uni.showToast({ title: '提交成功', icon: 'none' })
setTimeout(() => { uni.navigateBack() }, 1500)
@@ -273,15 +299,11 @@ const handleSubmit = () => {
onLoad((opt) => {
if (opt.id) {
id.value = opt.id
getInfo(opt.id)
}
})
onShow(() => {
if (id.value) {
getInfo(id.value)
}
})
const getInfo = async (id) => {
try {
@@ -289,7 +311,35 @@ const getInfo = async (id) => {
const res = await reqPreWeldJointByWeldJointId(id)
if (res.code === 1) {
info.value = res.data
formAttachUrl.value = res.data?.CuttingAttachUrl1 || ''
// 获取下料记录
if (info.value.WeldJointId) {
const cuttingRes = await reqCuttingCheckByWeldJointId(info.value.WeldJointId)
if (cuttingRes.code === 1 && cuttingRes.data) {
cuttingList.value = cuttingRes.data
if (cuttingList.value.length > 0) {
layingOffForm.value.CuttingLength = cuttingList.value[0].CuttingLength
layingOffForm.value.GrooveForm = cuttingList.value[0].GrooveForm
layingOffForm.value.GrooveAngle = cuttingList.value[0].GrooveAngle
layingOffForm.value.IsMaterialCodeBatchNoAccurate = cuttingList.value[0].IsMaterialCodeBatchNoAccurate?'准确' : '不准确'
layingOffForm.value.IsMaterialQuantityAccurate = cuttingList.value[0].IsMaterialQuantityAccurate?'准确' : '不准确'
}
}
}
// 获取防腐记录（每个材料一条）
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)
@@ -307,13 +357,6 @@ const handleMutualCheck = (id) => {
uni.navigateTo({ url: `/scanpages/hj/do_anti_rust?id=${id}` })
}
const gaugeWidth = (val, min, max) => {
if (!val && val !== 0) return '0%'
const num = parseFloat(val)
if (isNaN(num)) return '0%'
const pct = Math.min(Math.max((num - min) / (max - min) * 100, 0), 100)
return pct + '%'
}
</script>
<style lang="scss" scoped>
@@ -643,7 +686,7 @@ $shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
border-top: 1rpx solid $border;
box-shadow: none;
transition: background 0.2s ease;
margin-bottom: 28rpx;
&:active {
background: #f5f7fa;
}