From c3d88653aab6582052574c4dddc05138eb8d0eee Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Tue, 12 Aug 2025 17:50:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                         |  4 ++--
 src/pages/devicesSearch/ocrSearch2.vue | 28 +++++++++++++-------------
 src/pages/search/index.vue             |  4 ++--
 src/services/picking/outbound.js       | 10 +++++++++
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index 7906cea..7a0e8ba 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -577,13 +577,13 @@
         {
             "path": "pages/devicesSearch/ocrSearch",
             "style": {
-                "navigationBarTitleText": "OCR查询"
+                "navigationBarTitleText": "安全工器具识别"
             }
         },
         {
             "path": "pages/devicesSearch/ocrSearch2",
             "style": {
-                "navigationBarTitleText": "OCR扫描"
+                "navigationBarTitleText": "工器具识别"
             }
         },
         {
diff --git a/src/pages/devicesSearch/ocrSearch2.vue b/src/pages/devicesSearch/ocrSearch2.vue
index 6263b55..edafaf2 100644
--- a/src/pages/devicesSearch/ocrSearch2.vue
+++ b/src/pages/devicesSearch/ocrSearch2.vue
@@ -57,43 +57,43 @@
           <uni-forms-item label="出入库次数：" name="inOutNum">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.inOutNum }}</text>
           </uni-forms-item>
-          <uni-forms-item label="初次入库：" name="inTime">
+          <uni-forms-item v-if="codeData.jiJuType===2" label="初次入库：" name="inTime">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.inTime }}</text>
           </uni-forms-item>
-          <uni-forms-item label="服务工程次数：" name="serviceNum">
+          <uni-forms-item v-if="codeData.jiJuType===2" label="服务工程次数：" name="serviceNum">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.serviceNum }}</text>
           </uni-forms-item>
-          <uni-forms-item label="检验次数：" name="serviceNum">
+          <uni-forms-item v-if="codeData.jiJuType===2" label="检验次数：" name="serviceNum">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.serviceNum }}</text>
           </uni-forms-item>
-          <uni-forms-item label="更换配件次数：" name="checkNum">
+          <uni-forms-item v-if="codeData.jiJuType===2" label="更换配件次数：" name="checkNum">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.checkNum }}</text>
           </uni-forms-item>
           <uni-forms-item label="检修员：" name="inspectionPerson">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.inspectionPerson }}</text>
           </uni-forms-item>
-          <uni-forms-item label="报废：" name="scrapTime">
+          <uni-forms-item v-if="codeData.jiJuType===2" label="报废：" name="scrapTime">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.scrapTime }}</text>
           </uni-forms-item>
           <uni-forms-item label="生产厂家：" name="statusName">
             <text style="height: 100%;display: flex;align-items: center;">{{}}</text>
           </uni-forms-item>
-          <uni-forms-item label="领料单位：" name="leaseUnit">
+          <uni-forms-item v-if="codeData.jiJuType===2" label="领料单位：" name="leaseUnit">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.leaseUnit }}</text>
           </uni-forms-item>
-          <uni-forms-item label="领料工程：" name="leaseProject">
+          <uni-forms-item v-if="codeData.jiJuType===2" label="领料工程：" name="leaseProject">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.leaseProject }}</text>
           </uni-forms-item>
-          <uni-forms-item label="领料时间：" name="leaseTime">
+          <uni-forms-item v-if="codeData.jiJuType===2" label="领料时间：" name="leaseTime">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.leaseTime }}</text>
           </uni-forms-item>
-          <uni-forms-item label="退料单位：" name="backUnit">
+          <uni-forms-item v-if="codeData.jiJuType===2" label="退料单位：" name="backUnit">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.backUnit }}</text>
           </uni-forms-item>
-          <uni-forms-item label="退料工程：" name="backProject">
+          <uni-forms-item v-if="codeData.jiJuType===2" label="退料工程：" name="backProject">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.backProject }}</text>
           </uni-forms-item>
-          <uni-forms-item label="退料时间：" name="backTime">
+          <uni-forms-item v-if="codeData.jiJuType===2" label="退料时间：" name="backTime">
             <text style="height: 100%;display: flex;align-items: center;">{{ codeData.backTime }}</text>
           </uni-forms-item>
 
@@ -148,7 +148,7 @@
 <script>
 import ImageUtils from "../../services/utils/imageUtils";
 import {decryptWithSM4} from "../../utils/sm";
-import {getDeviceListAPI} from "../../services/picking/outbound";
+import {getDeviceListAPINew} from "../../services/picking/outbound";
 import ElectronicSeal from '@/components/ElectronicSeal/index.vue'
 
 export default {
@@ -740,7 +740,7 @@ export default {
         return;
       }
       try {
-        getDeviceListAPI({'maCode': this.queryCodeParams.maCode}).then(response => {
+        getDeviceListAPINew({'maCode': this.queryCodeParams.maCode}).then(response => {
           console.log("xxxxxxxxxxx", response)
           if (response.code === 200 && response.data && response.data.length > 0) {
             this.optionList = response.data.map(option => ({
@@ -774,7 +774,7 @@ export default {
     async changeTag() {
       if (!this.queryCodeParams.maId) return;
       try {
-        const response = await getDeviceListAPI({'maId': this.queryCodeParams.maId})
+        const response = await getDeviceListAPINew({'maId': this.queryCodeParams.maId})
         if (response.data && response.data.length !== 0) {
           this.codeData = response.data[0]
         }
diff --git a/src/pages/search/index.vue b/src/pages/search/index.vue
index 5e82306..2b8d9b6 100644
--- a/src/pages/search/index.vue
+++ b/src/pages/search/index.vue
@@ -113,7 +113,7 @@ const newInfoList = ref([
         iconSrc: '../../static/searchModel/qrCode.png',
     },
     {
-        title: 'OCR查询',
+        title: '安全工器具识别',
         url: '/pages/devicesSearch/ocrSearch',
         iconSrc: '../../static/searchModel/qrCode.png',
     },
@@ -144,7 +144,7 @@ const newInfoList = ref([
         iconSrc: '../../static/searchModel/electTag.png',
     },
   {
-    title: 'OCR扫描',
+    title: '工器具识别',
     url: '/pages/devicesSearch/ocrSearch2',
     iconSrc: '../../static/searchModel/qrCode.png',
   },
diff --git a/src/services/picking/outbound.js b/src/services/picking/outbound.js
index 0c31672..5be6423 100644
--- a/src/services/picking/outbound.js
+++ b/src/services/picking/outbound.js
@@ -107,6 +107,16 @@ export const getDeviceListAPI = (data) => {
         data,
     })
 }
+
+export const getDeviceListAPINew = (data) => {
+    return http({
+        method: 'GET',
+        url: '/material/ma_machine/getHisByCodeNew',
+        data,
+    })
+}
+
+
 //出库退回
 export const leaseOutBackApi = (data) => {
     return http({