From 5b62f70d5df5731a571d709f0f9ff312a7cec5dc Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 20 十一月 2025 16:25:59 +0800
Subject: [PATCH] fix: 巡检加上绞合外径可选
---
src/pages/routingInspection/detail/indexJX.vue | 75 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 21 deletions(-)
diff --git a/src/pages/routingInspection/detail/indexJX.vue b/src/pages/routingInspection/detail/indexJX.vue
index 27572e5..1e81d45 100644
--- a/src/pages/routingInspection/detail/indexJX.vue
+++ b/src/pages/routingInspection/detail/indexJX.vue
@@ -77,13 +77,23 @@
{{ formatValue(recordData.fixedInfo?.tensionSetting, "N/m") }}
</wd-form-item>
<!-- 缁炲埗澶栧緞锛堝彲缂栬緫锛� -->
- <wd-form-item label="缁炲悎澶栧緞" prop="twistedOuterDiameter" required>
+ <wd-form-item :label="getDiameterTypeLabel()" prop="twistedOuterDiameter" required>
<template v-if="isEdit">
- <wd-input
- v-model="formData.twistedOuterDiameter"
- placeholder="璇疯緭鍏ョ粸鍚堝寰勶紙mm锛�"
- type="number"
- />
+ <view style="display: flex; flex-direction: column; gap: 8px">
+ <wd-select-picker
+ v-model="formData.diameterType"
+ :columns="diameterTypeColumns"
+ type="radio"
+ placeholder="璇烽�夋嫨绫诲瀷"
+ :clearable="false"
+ @change="handleDiameterTypeChange"
+ />
+ <wd-input
+ v-model="formData.twistedOuterDiameter"
+ :placeholder="`璇疯緭鍏�${getDiameterTypeLabel()}`"
+ type="number"
+ />
+ </view>
</template>
<template v-else>
{{ formatValue(formData.twistedOuterDiameter, "mm") }}
@@ -92,10 +102,10 @@
</wd-col>
</wd-row>
- <!-- 鑷璁板綍璇︽儏妯″潡 -->
+ <!-- 宸ヨ壓璁板綍璇︽儏妯″潡 -->
<wd-row>
<view style="margin: 10rpx">
- <text class="title">{{ "鑷璁板綍璇︽儏" }}</text>
+ <text class="title">{{ "宸ヨ壓璁板綍璇︽儏" }}</text>
</view>
<wd-col :span="24">
<wd-form-item label="璁板綍浣嶇疆" prop="recordPosition">
@@ -276,9 +286,9 @@
<text class="title">{{ "宸℃缁撴灉" }}</text>
</view>
<wd-col :span="24">
- <wd-form-item label="鏍峰搧鏄惁榻愬叏" prop="sampleComplete" required>
+ <wd-form-item label="鏍峰搧鏄惁榻愬叏" prop="isFully" required>
<template v-if="isEdit">
- <wd-radio-group v-model="formData.sampleComplete" inline class="conclusion-radio-group">
+ <wd-radio-group v-model="formData.isFully" inline class="conclusion-radio-group">
<wd-radio
v-for="(opt, idx) in sampleCompleteOptions"
:key="idx"
@@ -290,7 +300,7 @@
</wd-radio-group>
</template>
<template v-else>
- {{ formatValue(formData.sampleComplete) }}
+ {{ formatValue(formData.isFully) }}
</template>
</wd-form-item>
</wd-col>
@@ -356,12 +366,13 @@
const formData = reactive({
twistedOuterDiameter: "", // 缁炲埗澶栧緞
+ diameterType: "缁炲悎澶栧緞(mm)", // 澶栧緞绫诲瀷
structureFormula: "", // 鎴愬搧缁撴瀯
structureItems: [], // 缁撴瀯鏍囧噯鍊煎拰瀹炴祴
inspectTwist: [], // 缁炵嚎宸ヨ壓璐ㄩ噺鎺у埗
productAppearance: [] as string[], // 浜у搧澶栬锛堟敼涓烘暟缁勫瓨鍌ㄩ�変腑鍊硷級
conclusion: "", // 缁撹锛堟敼涓烘暟缁勫瓨鍌ㄩ�変腑鍊硷級
- sampleComplete: "", // 鏍峰搧鏄惁榻愬叏
+ isFully: "", // 鏍峰搧鏄惁榻愬叏
});
const twistDirectionOptions = [
@@ -385,14 +396,34 @@
{ label: "鍚�", value: "鍚�" },
];
+// 澶栧緞绫诲瀷閫夐」
+const diameterTypeColumns = [
+ { label: "缁炲悎澶栧緞(mm)", value: "缁炲悎澶栧緞(mm)" },
+ { label: "鎵囬珮/鎵囧", value: "鎵囬珮/鎵囧" },
+ { label: "T褰㈢瓑鏁堟埅闈�", value: "T褰㈢瓑鏁堟埅闈�" },
+];
+
+// 鑾峰彇澶栧緞绫诲瀷鏍囩
+const getDiameterTypeLabel = () => {
+ return formData.diameterType || "缁炲悎澶栧緞(mm)";
+};
+
+// 澶勭悊澶栧緞绫诲瀷鍙樺寲
+const handleDiameterTypeChange = () => {
+ // 绫诲瀷鍙樺寲鏃跺彲浠ユ竻绌鸿緭鍏ュ�兼垨淇濈暀锛屾牴鎹渶姹傚喅瀹�
+ // formData.twistedOuterDiameter = "";
+};
+
const initFormData = () => {
const structureResult = recordData.value.structureInfo?.structureRecordResult || {};
const inspectionResult = recordData.value.inspectionResult || {};
formData.twistedOuterDiameter =
recordData.value.structureInfo.structureRecordResult.twistedOuterDiameter || "";
+ formData.diameterType =
+ recordData.value.structureInfo.structureRecordResult.diameterType || "缁炲悎澶栧緞(mm)";
formData.structureFormula = structureResult.inspectStructure?.structureFormula || "";
- formData.sampleComplete = inspectionResult.sampleComplete || "";
+ formData.isFully = inspectionResult.isFully || "";
formData.conclusion = structureResult.conclusion || "";
// 鍒濆鍖栦骇鍝佸瑙�
@@ -464,13 +495,14 @@
const saveList = async () => {
// 1. 鍩虹瀛楁鏍￠獙
if (!formData.structureFormula) return uni.showToast({ title: "鎴愬搧缁撴瀯涓哄繀濉」", icon: "none" });
- if (!formData.twistedOuterDiameter)
- return uni.showToast({ title: "缁炲埗澶栧緞涓哄繀濉」", icon: "none" });
+ if (!formData.twistedOuterDiameter) {
+ const label = getDiameterTypeLabel();
+ return uni.showToast({ title: `${label}涓哄繀濉」`, icon: "none" });
+ }
if (!formData.productAppearance.length)
return uni.showToast({ title: "浜у搧澶栬涓哄繀濉」", icon: "none" });
if (!formData.conclusion) return uni.showToast({ title: "缁撹涓哄繀濉」", icon: "none" });
- if (!formData.sampleComplete)
- return uni.showToast({ title: "鏍峰搧鏄惁榻愬叏涓哄繀濉」", icon: "none" });
+ if (!formData.isFully) return uni.showToast({ title: "鏍峰搧鏄惁榻愬叏涓哄繀濉」", icon: "none" });
// 2. 缁撴瀯椤瑰惊鐜牎楠�
for (const item of formData.structureItems) {
if (!item.structureValue)
@@ -505,17 +537,18 @@
const res = await RoutingInspectionApi.strandedPatrolCheckInspection({
deviceUid: deviceUid.value,
id: paramsId.value,
- result: {
+ inspectionResult: {
twistedOuterDiameter: formData.twistedOuterDiameter,
+ diameterType: formData.diameterType || "缁炲悎澶栧緞(mm)",
structureFormula: formData.structureFormula,
structureItems: formData.structureItems,
inspectTwist: formData.inspectTwist,
productAppearance: formData.productAppearance,
conclusion: formData.conclusion,
- sampleComplete: formData.sampleComplete,
+ isFully: formData.isFully,
},
- inspectionResult: {
- sampleComplete: formData.sampleComplete,
+ result: {
+ isFully: formData.isFully,
},
processInspectionAttachmentList: allFileIds,
});
--
Gitblit v1.9.3