退料问题修复
This commit is contained in:
		
							parent
							
								
									01bed0ed7b
								
							
						
					
					
						commit
						624fb6bbcd
					
				| 
						 | 
					@ -315,7 +315,7 @@ export default {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // 附件拍照
 | 
					        // 附件拍照
 | 
				
			||||||
        getCameraFj(){
 | 
					        getCameraFj(){
 | 
				
			||||||
            navigator.camera.getPicture(onCameraSuccessFj, onCameraErrorFj, {
 | 
					            navigator.camera.getPicture(this.onCameraSuccessFj, this.onCameraErrorFj, {
 | 
				
			||||||
                quality: 50,
 | 
					                quality: 50,
 | 
				
			||||||
                destinationType: window.Camera.DestinationType.DATA_URL,
 | 
					                destinationType: window.Camera.DestinationType.DATA_URL,
 | 
				
			||||||
                sourceType: window.Camera.PictureSourceType.CAMERA,
 | 
					                sourceType: window.Camera.PictureSourceType.CAMERA,
 | 
				
			||||||
| 
						 | 
					@ -323,7 +323,7 @@ export default {
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        // 附件从相册选择
 | 
					        // 附件从相册选择
 | 
				
			||||||
        getPhotoFj(){
 | 
					        getPhotoFj(){
 | 
				
			||||||
            navigator.camera.getPicture(onCameraSuccessFj, onCameraErrorFj, {
 | 
					            navigator.camera.getPicture(this.onCameraSuccessFj, this.onCameraErrorFj, {
 | 
				
			||||||
                quality: 50,
 | 
					                quality: 50,
 | 
				
			||||||
                destinationType: window.Camera.DestinationType.DATA_URL,
 | 
					                destinationType: window.Camera.DestinationType.DATA_URL,
 | 
				
			||||||
                sourceType: window.Camera.PictureSourceType.SAVEDPHOTOALBUM,
 | 
					                sourceType: window.Camera.PictureSourceType.SAVEDPHOTOALBUM,
 | 
				
			||||||
| 
						 | 
					@ -412,6 +412,7 @@ export default {
 | 
				
			||||||
                    typeId: this.codeData.typeId,
 | 
					                    typeId: this.codeData.typeId,
 | 
				
			||||||
                    apDetection: this.apDetection,
 | 
					                    apDetection: this.apDetection,
 | 
				
			||||||
                    bmFileInfos: this.bmFileInfos,
 | 
					                    bmFileInfos: this.bmFileInfos,
 | 
				
			||||||
 | 
					                    maVos:[{maId:this.codeData.maId,maCode:this.codeData.maCode}]
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                let param = {
 | 
					                let param = {
 | 
				
			||||||
                    backApplyInfo: this.queryParams,
 | 
					                    backApplyInfo: this.queryParams,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -360,7 +360,7 @@ export default {
 | 
				
			||||||
        // 相机预览配置 - 始终使用全屏背景模式
 | 
					        // 相机预览配置 - 始终使用全屏背景模式
 | 
				
			||||||
        let cameraY = 0;
 | 
					        let cameraY = 0;
 | 
				
			||||||
        let cameraHeight = screenHeight;
 | 
					        let cameraHeight = screenHeight;
 | 
				
			||||||
        let toBack = true; // 设置为背景层,让UI元素显示在上方
 | 
					        let toBack = false; // 设置为背景层,让UI元素显示在上方
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        console.log('屏幕信息:', {
 | 
					        console.log('屏幕信息:', {
 | 
				
			||||||
          platform: systemInfo.platform,
 | 
					          platform: systemInfo.platform,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -139,6 +139,7 @@ import { baseURL } from '@/utils/http'
 | 
				
			||||||
import treeSelect from '../tree-select/tselectTwo.vue'
 | 
					import treeSelect from '../tree-select/tselectTwo.vue'
 | 
				
			||||||
import { onLoad } from '@dcloudio/uni-app'
 | 
					import { onLoad } from '@dcloudio/uni-app'
 | 
				
			||||||
import PreviewImg from '@/components/PreviewImg/index.vue'
 | 
					import PreviewImg from '@/components/PreviewImg/index.vue'
 | 
				
			||||||
 | 
					import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
 | 
				
			||||||
const queryParams = ref({})
 | 
					const queryParams = ref({})
 | 
				
			||||||
const rowIndex = ref(-1)
 | 
					const rowIndex = ref(-1)
 | 
				
			||||||
// 计算属性:将选中的编码用逗号拼接显示
 | 
					// 计算属性:将选中的编码用逗号拼接显示
 | 
				
			||||||
| 
						 | 
					@ -242,70 +243,6 @@ const uploadImg2 = () => {
 | 
				
			||||||
          console.error('操作菜单选择失败:', err)
 | 
					          console.error('操作菜单选择失败:', err)
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
      })
 | 
					      })
 | 
				
			||||||
 | 
					 | 
				
			||||||
//   uni.chooseImage({
 | 
					 | 
				
			||||||
//     count: 3 - imgList2.value.length, // 最多选择3张,减去已选数量
 | 
					 | 
				
			||||||
//     sizeType: ['original', 'compressed'],
 | 
					 | 
				
			||||||
//     sourceType: ['album', 'camera'],
 | 
					 | 
				
			||||||
//     success: async (res) => {
 | 
					 | 
				
			||||||
//       const tempFiles = res.tempFiles
 | 
					 | 
				
			||||||
//       if (imgList2.value.length + tempFiles.length > 3) {
 | 
					 | 
				
			||||||
//         uni.showToast({ title: '最多只能上传3张图片', icon: 'none' })
 | 
					 | 
				
			||||||
//         return
 | 
					 | 
				
			||||||
//       }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
//       // 显示选择的图片
 | 
					 | 
				
			||||||
//       for (let i = 0; i < tempFiles.length; i++) {
 | 
					 | 
				
			||||||
//         imgList2.value.push({
 | 
					 | 
				
			||||||
//           url: tempFiles[i].path,
 | 
					 | 
				
			||||||
//           uploading: true
 | 
					 | 
				
			||||||
//         })
 | 
					 | 
				
			||||||
//       }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
//       // 上传所有图片
 | 
					 | 
				
			||||||
//       const uploadPromises = tempFiles.map(file => {
 | 
					 | 
				
			||||||
//         return new Promise((resolve, reject) => {
 | 
					 | 
				
			||||||
//           uni.uploadFile({
 | 
					 | 
				
			||||||
//             url: '/file/upload',
 | 
					 | 
				
			||||||
//             filePath: file.path,
 | 
					 | 
				
			||||||
//             name: 'file',
 | 
					 | 
				
			||||||
//             success: (uploadRes) => {
 | 
					 | 
				
			||||||
//               const resData = JSON.parse(uploadRes.data)
 | 
					 | 
				
			||||||
//               if (resData.code === 200) {
 | 
					 | 
				
			||||||
//                 resolve({
 | 
					 | 
				
			||||||
//                   name: resData.data.name,
 | 
					 | 
				
			||||||
//                   url: resData.data.url
 | 
					 | 
				
			||||||
//                 })
 | 
					 | 
				
			||||||
//               } else {
 | 
					 | 
				
			||||||
//                 reject(new Error('上传失败'))
 | 
					 | 
				
			||||||
//               }
 | 
					 | 
				
			||||||
//             },
 | 
					 | 
				
			||||||
//             fail: (err) => {
 | 
					 | 
				
			||||||
//               reject(err)
 | 
					 | 
				
			||||||
//             }
 | 
					 | 
				
			||||||
//           })
 | 
					 | 
				
			||||||
//         })
 | 
					 | 
				
			||||||
//       })
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
//       try {
 | 
					 | 
				
			||||||
//         const results = await Promise.all(uploadPromises)
 | 
					 | 
				
			||||||
//         fileData.value.fileList = [...bmFileInfos.value, ...results]
 | 
					 | 
				
			||||||
//         uni.showToast({ title: '上传成功', icon: 'none' })
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
//         // 更新图片状态
 | 
					 | 
				
			||||||
//         imgList2.value = imgList2.value.map(img => {
 | 
					 | 
				
			||||||
//           return {
 | 
					 | 
				
			||||||
//             ...img,
 | 
					 | 
				
			||||||
//             uploading: false
 | 
					 | 
				
			||||||
//           }
 | 
					 | 
				
			||||||
//         })
 | 
					 | 
				
			||||||
//       } catch (error) {
 | 
					 | 
				
			||||||
//         uni.showToast({ title: '部分图片上传失败', icon: 'none' })
 | 
					 | 
				
			||||||
//         // 移除上传失败的图片
 | 
					 | 
				
			||||||
//         imgList2.value = imgList2.value.filter(img => !img.uploading)
 | 
					 | 
				
			||||||
//       }
 | 
					 | 
				
			||||||
//     }
 | 
					 | 
				
			||||||
//   })
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const generateRandomString = (length) => {
 | 
					const generateRandomString = (length) => {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -220,6 +220,7 @@ import {
 | 
				
			||||||
import { baseURL } from '@/utils/http'
 | 
					import { baseURL } from '@/utils/http'
 | 
				
			||||||
import treeSelect from '../tree-select/tselectTwo.vue';
 | 
					import treeSelect from '../tree-select/tselectTwo.vue';
 | 
				
			||||||
import { onLoad } from '@dcloudio/uni-app'
 | 
					import { onLoad } from '@dcloudio/uni-app'
 | 
				
			||||||
 | 
					import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
 | 
				
			||||||
import PreviewImg from '@/components/PreviewImg/index.vue'
 | 
					import PreviewImg from '@/components/PreviewImg/index.vue'
 | 
				
			||||||
// const query = defineProps() // 获取上级页面传递的路由参数
 | 
					// const query = defineProps() // 获取上级页面传递的路由参数
 | 
				
			||||||
// const queryParams = JSON.parse(query.queryParams)
 | 
					// const queryParams = JSON.parse(query.queryParams)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -142,6 +142,7 @@ import { baseURL } from '@/utils/http'
 | 
				
			||||||
import treeSelect from '../tree-select/tselectTwo.vue'
 | 
					import treeSelect from '../tree-select/tselectTwo.vue'
 | 
				
			||||||
import { onLoad,onShow } from '@dcloudio/uni-app'
 | 
					import { onLoad,onShow } from '@dcloudio/uni-app'
 | 
				
			||||||
import PreviewImg from '@/components/PreviewImg/index.vue'
 | 
					import PreviewImg from '@/components/PreviewImg/index.vue'
 | 
				
			||||||
 | 
					import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
 | 
				
			||||||
const queryParams = ref({})
 | 
					const queryParams = ref({})
 | 
				
			||||||
const rowIndex = ref(-1)
 | 
					const rowIndex = ref(-1)
 | 
				
			||||||
// 计算属性:将选中的编码用逗号拼接显示
 | 
					// 计算属性:将选中的编码用逗号拼接显示
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -273,6 +273,7 @@ import {
 | 
				
			||||||
import { baseURL } from '@/utils/http'
 | 
					import { baseURL } from '@/utils/http'
 | 
				
			||||||
import treeSelect from '../tree-select/tselectTwo.vue'
 | 
					import treeSelect from '../tree-select/tselectTwo.vue'
 | 
				
			||||||
import { onLoad,onShow } from '@dcloudio/uni-app'
 | 
					import { onLoad,onShow } from '@dcloudio/uni-app'
 | 
				
			||||||
 | 
					import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
 | 
				
			||||||
import PreviewImg from '@/components/PreviewImg/index.vue'
 | 
					import PreviewImg from '@/components/PreviewImg/index.vue'
 | 
				
			||||||
const queryParams = ref({})
 | 
					const queryParams = ref({})
 | 
				
			||||||
const rowIndex = ref(-1)
 | 
					const rowIndex = ref(-1)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -261,6 +261,7 @@ import {
 | 
				
			||||||
} from '@/services/repair/repair.js'
 | 
					} from '@/services/repair/repair.js'
 | 
				
			||||||
import treeSelect from '../tree-select/tselectTwo.vue';
 | 
					import treeSelect from '../tree-select/tselectTwo.vue';
 | 
				
			||||||
import {onLoad, onShow} from '@dcloudio/uni-app'
 | 
					import {onLoad, onShow} from '@dcloudio/uni-app'
 | 
				
			||||||
 | 
					import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
 | 
				
			||||||
import PreviewImg from '@/components/PreviewImg/index.vue'
 | 
					import PreviewImg from '@/components/PreviewImg/index.vue'
 | 
				
			||||||
// const query = defineProps() // 获取上级页面传递的路由参数
 | 
					// const query = defineProps() // 获取上级页面传递的路由参数
 | 
				
			||||||
// const queryParams = JSON.parse(query.queryParams)
 | 
					// const queryParams = JSON.parse(query.queryParams)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue