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/indexJX.vue | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/pages/routingInspection/detail/indexJX.vue b/src/pages/routingInspection/detail/indexJX.vue
index 1e81d45..03fc4a9 100644
--- a/src/pages/routingInspection/detail/indexJX.vue
+++ b/src/pages/routingInspection/detail/indexJX.vue
@@ -328,6 +328,8 @@
</div>
</wd-popup>
<wd-toast />
+ <!-- 鎵爜缁勪欢 -->
+ <Scan ref="scanRef" emit-name="scanJX" />
</view>
</template>
@@ -339,6 +341,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 paramsType = ref("");
const paramsId = ref("");
@@ -351,6 +354,7 @@
const attachmentRef = ref<any>(null);
const detailData = reactive<any>({});
const detailDataLoaded = ref(false);
+const scanRef = ref(); // 鎵爜缁勪欢寮曠敤
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅
const userStore = useUserStore();
@@ -540,8 +544,10 @@
inspectionResult: {
twistedOuterDiameter: formData.twistedOuterDiameter,
diameterType: formData.diameterType || "缁炲悎澶栧緞(mm)",
- structureFormula: formData.structureFormula,
- structureItems: formData.structureItems,
+ inspectStructure: {
+ structureFormula: formData.structureFormula,
+ structureItems: formData.structureItems,
+ },
inspectTwist: formData.inspectTwist,
productAppearance: formData.productAppearance,
conclusion: formData.conclusion,
@@ -689,12 +695,16 @@
};
const openScan = () => {
- console.log("indexJX - 鐐瑰嚮鎵爜鎸夐挳锛堝叏灞�鎵爜妯″紡锛屾棤闇�鎵嬪姩瑙﹀彂锛�");
- // 鍏ㄥ眬鎵爜妯″紡涓嬶紝纭欢鎵爜浼氳嚜鍔ㄨЕ鍙戯紝鏃犻渶鎵嬪姩璋冪敤
- uni.showToast({
- title: "璇蜂娇鐢ㄦ壂鐮佹灙鎵弿",
- icon: "none",
- });
+ console.log("indexJX - 鐐瑰嚮鎵爜鎸夐挳锛岃Е鍙戞壂鐮�");
+ // 瑙﹀彂鎵爜
+ if (scanRef.value) {
+ scanRef.value.triggerScan();
+ } else {
+ uni.showToast({
+ title: "鎵爜缁勪欢鏈垵濮嬪寲",
+ icon: "none",
+ });
+ }
};
// 椤甸潰鏄剧ず鏃剁殑澶勭悊
@@ -709,15 +719,15 @@
if (!cachedData || !cachedData.uid) {
console.log("鈿狅笍 鏈娴嬪埌鎵爜缂撳瓨锛岀敤鎴烽渶瑕佹壂鎻忚澶囦簩缁寸爜");
// 鍦ㄧ紪杈戞ā寮忎笅鎵嶆彁绀�
- if (isEdit.value) {
- setTimeout(() => {
- uni.showToast({
- title: "璇锋壂鎻忚澶囦簩缁寸爜鍚庡啀淇濆瓨",
- icon: "none",
- duration: 2000,
- });
- }, 500);
- }
+ // if (isEdit.value) {
+ // setTimeout(() => {
+ // uni.showToast({
+ // title: "璇锋壂鎻忚澶囦簩缁寸爜鍚庡啀淇濆瓨",
+ // icon: "none",
+ // duration: 2000,
+ // });
+ // }, 500);
+ // }
}
});
</script>
--
Gitblit v1.9.3