From 057c13502ecedf49d85d47ab23f3492859f16653 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期六, 29 十一月 2025 10:43:15 +0800
Subject: [PATCH] fix: 技术文件变更时，生产就不能继续报工了。
---
src/pages/routingInspection/detail/indexLS.vue | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/pages/routingInspection/detail/indexLS.vue b/src/pages/routingInspection/detail/indexLS.vue
index 31b72e3..5c35396 100644
--- a/src/pages/routingInspection/detail/indexLS.vue
+++ b/src/pages/routingInspection/detail/indexLS.vue
@@ -82,10 +82,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="processInspectionUserName">
@@ -248,12 +248,17 @@
</wd-row>
<!-- 宸℃缁撴灉 -->
- <wd-row v-if="detailData.processInspectionResult?.isFully">
+ <wd-row>
<view style="margin: 10rpx">
<text class="title">{{ "宸℃缁撴灉" }}</text>
</view>
<wd-col :span="24">
- <wd-form-item label="閾濇潌鍓嶃�佷腑銆佸熬鏍峰搧鏄惁榻愬叏" prop="isFully" required>
+ <wd-form-item
+ label="閾濇潌鍓嶃�佷腑銆佸熬鏍峰搧鏄惁榻愬叏"
+ prop="isFully"
+ required
+ label-width="420rpx"
+ >
<template v-if="isEdit">
<wd-radio-group v-model="formData.isFully" inline class="conclusion-radio-group">
<wd-radio
@@ -279,7 +284,7 @@
</wd-row>
<!-- 闄勪欢妯″潡 -->
- <wd-row class="attachment-section" v-if="detailData.files && detailData.files.length > 0">
+ <wd-row class="attachment-section">
<view style="margin: 10rpx">
<text class="title">{{ "闄勪欢" }}</text>
</view>
@@ -298,6 +303,8 @@
</div>
</wd-popup>
<wd-toast />
+ <!-- 鎵爜缁勪欢 -->
+ <Scan ref="scanRef" emit-name="scanLS" />
</view>
</template>
@@ -309,6 +316,7 @@
import AttachmentUpload from "../upload.vue";
import { useUserStore } from "@/store/modules/user";
import { useScanCode } from "@/composables/useScanCode";
+import Scan from "@/components/scan/index.vue";
// 鏍稿績鐘舵��
const paramsId = ref("");
@@ -320,6 +328,7 @@
const tempFiles = ref<any[]>([]);
const toast = useToast();
const attachmentRef = ref<any>(null);
+const scanRef = ref(); // 鎵爜缁勪欢寮曠敤
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅
const userStore = useUserStore();
@@ -546,7 +555,7 @@
const res = await RoutingInspectionApi.drawPatrolCheckInspection({
deviceUid: deviceUid.value,
id: paramsId.value,
- result: {
+ inspectionResult: {
dia: formData.dia,
maxDia: formData.maxDia,
minDia: formData.minDia,
@@ -557,7 +566,7 @@
jointCondition: formData.jointCondition,
conclusion: formData.conclusion,
},
- inspectionResult: { isFully: formData.isFully },
+ result: { isFully: formData.isFully },
processInspectionAttachmentList: allFileIds,
});
if (res.code === 200) {
@@ -589,12 +598,16 @@
};
const openScan = () => {
- console.log("indexLS - 鐐瑰嚮鎵爜鎸夐挳锛堝叏灞�鎵爜妯″紡锛屾棤闇�鎵嬪姩瑙﹀彂锛�");
- // 鍏ㄥ眬鎵爜妯″紡涓嬶紝纭欢鎵爜浼氳嚜鍔ㄨЕ鍙戯紝鏃犻渶鎵嬪姩璋冪敤
- uni.showToast({
- title: "璇蜂娇鐢ㄦ壂鐮佹灙鎵弿",
- icon: "none",
- });
+ console.log("indexLS - 鐐瑰嚮鎵爜鎸夐挳锛岃Е鍙戞壂鐮�");
+ // 瑙﹀彂鎵爜
+ if (scanRef.value) {
+ scanRef.value.triggerScan();
+ } else {
+ uni.showToast({
+ title: "鎵爜缁勪欢鏈垵濮嬪寲",
+ icon: "none",
+ });
+ }
};
// 椤甸潰鏄剧ず鏃剁殑澶勭悊
@@ -610,13 +623,13 @@
console.log("鈿狅笍 鏈娴嬪埌鎵爜缂撳瓨锛岀敤鎴烽渶瑕佹壂鎻忚澶囦簩缁寸爜");
// 鍦ㄧ紪杈戞ā寮忎笅鎵嶆彁绀�
if (isEdit.value) {
- setTimeout(() => {
- uni.showToast({
- title: "璇锋壂鎻忚澶囦簩缁寸爜鍚庡啀淇濆瓨",
- icon: "none",
- duration: 2000,
- });
- }, 500);
+ // setTimeout(() => {
+ // uni.showToast({
+ // title: "璇锋壂鎻忚澶囦簩缁寸爜鍚庡啀淇濆瓨",
+ // icon: "none",
+ // duration: 2000,
+ // });
+ // }, 500);
}
}
});
--
Gitblit v1.9.3