From 3376633198ab673846f7170247d67b163ed06996 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Wed, 18 Jun 2025 21:00:57 +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/back/addBack.vue                    |  4 +---
 src/pages/back/backCode.vue                   | 24 +++++++++++++++++++
 src/pages/back/backCodeScan.vue               |  3 ++-
 .../new-purchase/accept/acceptDetails.vue     |  6 ++---
 src/pages/part/parts-accept/acceptDetails.vue |  6 ++---
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/pages/back/addBack.vue b/src/pages/back/addBack.vue
index cab5e4b..c852afb 100644
--- a/src/pages/back/addBack.vue
+++ b/src/pages/back/addBack.vue
@@ -1,5 +1,5 @@
 <template>
-    <view style="padding-top: 4vh; background-color: rgb(220, 244, 255)">
+    <view style="background-color: rgb(220, 244, 255)">
         <uni-nav-bar
             left-icon="left"
             @clickLeft="leftClick"
@@ -167,8 +167,6 @@ const confirmAdd = () => {
         uni.showToast({ title: '请确认退料单位,退料工程!', icon: 'none' })
     } else if (backPerson.value == '') {
         uni.showToast({ title: '请确认制单人!', icon: 'none' })
-    } else if (phone.value == '') {
-        uni.showToast({ title: '请确认联系电话!', icon: 'none' })
     } else {
         let obj = {
             backApplyInfo: {
diff --git a/src/pages/back/backCode.vue b/src/pages/back/backCode.vue
index c60257c..7cfa942 100644
--- a/src/pages/back/backCode.vue
+++ b/src/pages/back/backCode.vue
@@ -139,6 +139,7 @@ const getMaInfo = () => {
         maCode: maCode.value,
         unitId: taskInfo.value.unitId,
         proId: taskInfo.value.proId,
+        id: taskInfo.value.id,
     }
     getMachine(param)
         .then((res) => {
@@ -237,6 +238,7 @@ const getMaInfoScan = () => {
         qrCode: qrCode.value,
         unitId: taskInfo.value.unitId,
         proId: taskInfo.value.proId,
+        id: taskInfo.value.id,
     }
     getMachine(param)
         .then((res) => {
@@ -272,6 +274,23 @@ const getMaInfoScan = () => {
 //     	}
 //     });
 // }
+
+// function getCamera() {
+//     console.log(1)
+//     navigator.camera.getPicture(this.onCameraSuccess, this.onCameraError, {
+//         quality: 50,
+//         destinationType: window.Camera.DestinationType.DATA_URL,
+//         sourceType: window.Camera.PictureSourceType.CAMERA,
+//     })
+// }
+// function getPhoto() {
+//     console.log(2)
+//     navigator.camera.getPicture(this.onCameraSuccess, this.onCameraError, {
+//         quality: 50,
+//         destinationType: window.Camera.DestinationType.DATA_URL,
+//         sourceType: window.Camera.PictureSourceType.SAVEDPHOTOALBUM,
+//     })
+// }
 // 编码识别按钮
 const onCodeIdentify = () => {
     console.log('编码识别--')
@@ -284,6 +303,8 @@ const submitCode = () => {
     console.log(taskInfo.value)
     if (maId.value == '') {
         uni.showToast({ title: '请先添加退料设备编码！', icon: 'none' })
+    } else if(apDetection.value == '不合格') {
+        uni.showToast({ title: '请上传附件！', icon: 'none' })
     } else {
         // console.log(typeList.value)
         let obj = {
@@ -409,6 +430,9 @@ onLoad((options) => {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .uni-easyinput__content {
+    padding: 0 !important;
+}
 /* 在style部分添加 */
 .upload-container {
   display: flex;
diff --git a/src/pages/back/backCodeScan.vue b/src/pages/back/backCodeScan.vue
index bc91bb6..c8ba452 100644
--- a/src/pages/back/backCodeScan.vue
+++ b/src/pages/back/backCodeScan.vue
@@ -131,7 +131,7 @@ export default {
     onReady() {
         this.cameraHeight = uni.getSystemInfoSync().screenHeight * 0.22
         console.log(this.cameraHeight)
-        this.init()
+        // this.init()
     },
     methods: {
         // 开始识别
@@ -217,6 +217,7 @@ export default {
                 maCode: this.queryCodeParams.maCode,
                 unitId: this.queryParams.unitId,
                 proId: this.queryParams.proId,
+                id: this.queryParams.id,
             }
             console.log(param)
             uni.request({
diff --git a/src/pages/new-purchase/accept/acceptDetails.vue b/src/pages/new-purchase/accept/acceptDetails.vue
index da98bca..c1d5ceb 100644
--- a/src/pages/new-purchase/accept/acceptDetails.vue
+++ b/src/pages/new-purchase/accept/acceptDetails.vue
@@ -125,14 +125,14 @@ const getSignList = async () => {
             auditingList.value = res.data.map((item, index) => {
                 return {
                     ...item,
-                    title: index == 0 ? '供应科审核' : item.deptName || '' + '审核',
+                    title: index == 0 ? '供应科' : item.deptName || '',
                     desc: item.auditStatusName + '\n' + (item.userName || '') + '\n' + (item.createTime || '') + '\n' + (item.auditRemark || '')
                 }
             })
             activeSect.value = auditingList.value.length - 1
             const auditSteps = [
-                { title: '技术科审核', desc: '待审核' },
-                { title: '库管班审核', desc: '待审核' }
+                { title: '安全/技术科', desc: '待审核' },
+                { title: '库管班', desc: '待审核' }
             ]
             if (auditingList.value.length === 1) {
                 auditingList.value.push(...auditSteps)
diff --git a/src/pages/part/parts-accept/acceptDetails.vue b/src/pages/part/parts-accept/acceptDetails.vue
index d932337..5e4109e 100644
--- a/src/pages/part/parts-accept/acceptDetails.vue
+++ b/src/pages/part/parts-accept/acceptDetails.vue
@@ -126,14 +126,14 @@ const getSignList = async () => {
             auditingList.value = res.data.map((item, index) => {
                 return {
                     ...item,
-                    title: index == 0 ? '供应科审核' : item.deptName || '' + '审核',
+                    title: index == 0 ? '供应科' : item.deptName || '',
                     desc: (item.auditStatusName || '') + '\n' + (item.userName || '') + '\n' + (item.createTime || '') + '\n' + (item.auditRemark || '')
                 }
             })
             activeSect.value = auditingList.value.length - 1
             const auditSteps = [
-                { title: '技术科审核', desc: '待审核' },
-                { title: '库管班审核', desc: '待审核' }
+                { title: '技术科', desc: '待审核' },
+                { title: '库管班', desc: '待审核' }
             ]
             if (auditingList.value.length === 1) {
                 auditingList.value.push(...auditSteps)