From 4374511cb2944bab092b95e63a50468bb70a17f7 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 1 Sep 2025 14:46:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/business/leaseApply.vue                         | 4 ++--
 .../materialClerkConfirms/detailsList.vue                 | 5 +++--
 src/pages/picking/outbound/codeOutScan.vue                | 8 +++++++-
 src/services/back.js                                      | 8 ++++++++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/pages/business/leaseApply.vue b/src/pages/business/leaseApply.vue
index 50be21b..9cc2913 100644
--- a/src/pages/business/leaseApply.vue
+++ b/src/pages/business/leaseApply.vue
@@ -207,7 +207,7 @@ import eselect from '@/components/tree-select/eselect.vue'
 import { onLoad, onReady } from '@dcloudio/uni-app'
 import {
     getUnitList,
-    getProjectList,
+    getLeaseProjectListApi,
     getConfigList,
     getLevelThreeType,
     insertApp,
@@ -356,7 +356,7 @@ const getProject = async (e) => {
         // "isApp":true
     }
     try {
-        const res = await getProjectList(obj)
+        const res = await getLeaseProjectListApi(obj)
         proList.value = res.data
         // proId.value=""
         // treeSelect2.value.clearInput();
diff --git a/src/pages/materialsStation/materialClerkConfirms/detailsList.vue b/src/pages/materialsStation/materialClerkConfirms/detailsList.vue
index 797d728..c5fcebe 100644
--- a/src/pages/materialsStation/materialClerkConfirms/detailsList.vue
+++ b/src/pages/materialsStation/materialClerkConfirms/detailsList.vue
@@ -43,8 +43,9 @@ onShow(() => {
 
 onLoad((opt) => {
   console.log('🚀 ~ onLoad ~ opt:', opt)
-  itemId.value = opt.id
-  publishTask.value = opt.publishTask
+  itemId.value = JSON.parse(opt.id)
+  publishTask.value = JSON.parse(opt.publishTask)
+  console.log('🚀 ~ publishTask.value:', publishTask.value)
   console.log('🚀 ~ itemId.value:', itemId.value)
   // getList()
 })
diff --git a/src/pages/picking/outbound/codeOutScan.vue b/src/pages/picking/outbound/codeOutScan.vue
index 1db86da..40563f6 100644
--- a/src/pages/picking/outbound/codeOutScan.vue
+++ b/src/pages/picking/outbound/codeOutScan.vue
@@ -142,6 +142,8 @@ export default {
       focusTimeout: null,
       // 设备信息
       systemInfo: null,
+      screenHeight: null,
+      screenWidth: null,
     }
   },
   onBackPress(options) {
@@ -211,6 +213,10 @@ export default {
         const systemInfo = uni.getSystemInfoSync()
         console.log('设备信息:', systemInfo)
         this.systemInfo = systemInfo
+        const screenHeight = systemInfo.screenHeight; // 屏幕高度：1000
+        const screenWidth = systemInfo.screenWidth;   // 屏幕宽度：600
+        this.screenHeight = screenHeight;
+        this.screenWidth = screenWidth;
       } catch (error) {
         console.error('获取设备信息失败:', error)
       }
@@ -488,7 +494,7 @@ export default {
         console.log('拍照前聚焦...')
         console.log('开始拍照...')
         CameraPreview.takePicture(
-          { width: 640, height: 540, quality: 50 },
+          { width: this.screenWidth, height: this.screenHeight, quality: 50 },
           async (base64PictureData) => {
             console.log('拍照返回数据', base64PictureData)
             await this.processImage(base64PictureData)
diff --git a/src/services/back.js b/src/services/back.js
index 2ce9b8d..d159a05 100644
--- a/src/services/back.js
+++ b/src/services/back.js
@@ -24,6 +24,14 @@ export const getBackInfo = (id,keyWord) => {
         url: '/material/select/getUnitList',
         data:data,
     })
+}
+// 领用工程下拉
+export const getLeaseProjectListApi = (data) => {
+    return http({
+        method: 'POST',
+        url: '/material/select/getLeaseProjectList',
+        data,
+    })
 }
  // 工程下拉选
  export const getProjectList = (data) => {