修改拍照上传逻辑，避免平板不可以调用照相机

2026-02-10 09:27:52 +08:00
parent d4b23790a1
commit a0ed92319c
5 changed files with 267 additions and 150 deletions
--- a/inventory-web/src/views/stock/inbound/buy.vue
+++ b/inventory-web/src/views/stock/inbound/buy.vue
@ -376,11 +376,11 @@


    <el-dialog v-model="dialogVisibleImage" append-to-body width="50%"><img style="width: 100%" :src="dialogImageUrl" alt="Preview Image" /></el-dialog>
-    <el-dialog v-model="cameraDialogVisible" title="拍照上传" width="500px" append-to-body destroy-on-close>
+    <el-dialog v-model="cameraDialogVisible" title="拍照上传" width="500px" append-to-body destroy-on-close :close-on-click-modal="false">
      <WebRtcCamera
-        ref="cameraRef"
-        @confirm="handleCameraConfirm"
-        @cancel="cameraDialogVisible = false"
+          ref="cameraRef"
+          @photo-submit="handleCameraConfirm"
+          @cancel="cameraDialogVisible = false"
      />
    </el-dialog>

@ -402,7 +402,8 @@
 <script setup lang="ts">
 import {ref, reactive, onMounted, watch} from 'vue'
 import {Plus, Setting, Refresh, Search, Lock, Box, House, InfoFilled, Link, Printer, Camera, Delete, Picture} from '@element-plus/icons-vue'
-import {ElMessage, ElMessageBox} from 'element-plus'
+// 修改：引入 ElLoading
+import {ElMessage, ElMessageBox, ElLoading} from 'element-plus'
 import dayjs from 'dayjs'
 import {
  getBuyList,
@ -790,40 +791,59 @@ const triggerCamera = (field: 'arrival_photo' | 'inspection_report') => {
  currentCameraField.value = field;
  cameraDialogVisible.value = true;
 }
+
+// ----------------------------------------------------
+// 【修复核心】：处理拍照上传
+// ----------------------------------------------------
 const handleCameraConfirm = async (file: File) => {
+  console.log('✅ 父组件收到照片:', file.name, file.size)
+
  if (!beforeAvatarUpload(file)) {
-    cameraDialogVisible.value = false;
-    return;
+    return
  }
-  const formData = new FormData();
-  formData.append('file', file);
-  const loadingMsg = ElMessage.loading({ message: '照片上传中...', duration: 0 });
-  let success = false;
+
+  // 修复点：使用 ElLoading.service 替代报错的 ElMessage.loading
+  const loadingInstance = ElLoading.service({
+    lock: true,
+    text: '照片上传中，请稍候...',
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+
  try {
-    const res: any = await uploadFile(formData);
+    const formData = new FormData()
+    formData.append('file', file)
+
+    console.log('🚀 开始上传...')
+    const res: any = await uploadFile(formData)
+    console.log('📡 上传结果:', res)
+
    if (res.code === 200) {
-      const newUrl = res.data.url;
-      const field = currentCameraField.value;
-      form[field].push(newUrl);
+      const newUrl = res.data.url
+      const field = currentCameraField.value // 'arrival_photo' 或 'inspection_report'
+
+      // 更新表单数据
+      form[field].push(newUrl)
+
+      // 更新文件展示列表
      if (field === 'arrival_photo') {
-        arrivalFileList.value.push({ name: newUrl.split('/').pop(), url: getImageUrl(newUrl) });
+        arrivalFileList.value.push({ name: newUrl.split('/').pop(), url: getImageUrl(newUrl) })
      } else if (field === 'inspection_report') {
-        reportFileList.value.push({ name: newUrl.split('/').pop(), url: getImageUrl(newUrl) });
+        reportFileList.value.push({ name: newUrl.split('/').pop(), url: getImageUrl(newUrl) })
      }
-      ElMessage.success('拍照上传成功');
-      success = true;
+
+      ElMessage.success('拍照上传成功')
+      cameraDialogVisible.value = false // 成功才关闭弹窗
    } else {
-      ElMessage.error(res.msg || '上传失败');
+      ElMessage.error(res.msg || '上传失败')
    }
-  } catch (e) {
-    ElMessage.error('网络错误，上传失败');
+  } catch (e: any) {
+    console.error('上传异常:', e)
+    ElMessage.error('网络错误，上传失败')
  } finally {
-    loadingMsg.close();
-    if (success) {
-      cameraDialogVisible.value = false;
-    }
+    loadingInstance.close() // 关闭加载状态
  }
-};
+}
+
 const handleDelete = async (row: any) => { try { await deleteBuyInbound(row.id); ElMessage.success('删除成功'); fetchData() } catch (e) { ElMessage.error('删除失败') } }
 const handlePrint = async (row: any) => {
  printVisible.value = true; printLoading.value = true; previewUrl.value = ''
@ -843,7 +863,6 @@ onMounted(() => fetchData())
 </script>

 <style scoped>
-/* 样式部分保持不变，直接复用原有代码 */
 .buy-module { background: #f5f7fa; padding: 20px; min-height: 100vh; }
 .header-tools { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; background: #fff; padding: 15px 20px; border-radius: 8px; box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05); }
 .left-tools { display: flex; gap: 10px; align-items: center; flex: 1; }
@ -898,4 +917,4 @@ onMounted(() => fetchData())
 .camera-card:hover { border-color: #409EFF; color: #409EFF; }
 .camera-card .text { font-size: 12px; margin-top: 5px; }
 .camera-card .el-icon { font-size: 24px; }
-</style>
+</style>
--- a/inventory-web/src/views/stock/inbound/product.vue
+++ b/inventory-web/src/views/stock/inbound/product.vue
@ -321,11 +321,11 @@
    <el-dialog v-model="dialogVisibleImage" append-to-body width="50%">
      <img style="width: 100%" :src="dialogImageUrl" alt="Preview Image" />
    </el-dialog>
-    <el-dialog v-model="cameraDialogVisible" title="拍照上传" width="500px" append-to-body destroy-on-close>
+    <el-dialog v-model="cameraDialogVisible" title="拍照上传" width="500px" append-to-body destroy-on-close :close-on-click-modal="false">
      <WebRtcCamera
-        ref="cameraRef"
-        @confirm="handleCameraConfirm"
-        @cancel="cameraDialogVisible = false"
+          ref="cameraRef"
+          @photo-submit="handleCameraConfirm"
+          @cancel="cameraDialogVisible = false"
      />
    </el-dialog>

@ -353,7 +353,8 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, watch } from 'vue'
 import { Plus, Setting, Refresh, Search, Box, House, Link, InfoFilled, Printer, Camera, Picture } from '@element-plus/icons-vue'
-import { ElMessage } from 'element-plus'
+// 修复：引入 ElLoading
+import { ElMessage, ElLoading } from 'element-plus'
 import dayjs from 'dayjs'
 import { getProductList, createProductInbound, updateProductInbound, deleteProductInbound, searchMaterialBase } from '@/api/inbound/product'
 import { uploadFile, deleteFile } from '@/api/inbound/buy'
@ -566,6 +567,8 @@ const handleRemoveImage = async (uploadFile: any, targetField: 'product_photo' |
    ElMessage.success('已删除')
  } catch (e) { console.error(e) }
 }
+const handlePreviewPicture = (uploadFile: any) => { dialogImageUrl.value = uploadFile.url!; dialogVisibleImage.value = true }
+
 const triggerCamera = (field: any) => {
  currentCameraField.value = field;
  cameraDialogVisible.value = true;
@ -577,7 +580,10 @@ const handleCameraConfirm = async (file: File) => {
  }
  const formData = new FormData();
  formData.append('file', file);
-  const loadingMsg = ElMessage.loading({ message: '上传中...', duration: 0 });
+
+  // 修复点：使用 ElLoading
+  const loadingMsg = ElLoading.service({ text: '照片上传中...', background: 'rgba(0, 0, 0, 0.7)' });
+
  let success = false;
  try {
    const res: any = await uploadFile(formData);
@ -598,7 +604,7 @@ const handleCameraConfirm = async (file: File) => {
      ElMessage.error(res.msg || '上传失败');
    }
  } catch (e) {
-    ElMessage.error('网络错误');
+    ElMessage.error('网络错误，上传失败');
  } finally {
    loadingMsg.close();
    if (success) {
@ -606,7 +612,6 @@ const handleCameraConfirm = async (file: File) => {
    }
  }
 };
-const handlePreviewPicture = (uploadFile: any) => { dialogImageUrl.value = uploadFile.url!; dialogVisibleImage.value = true }

 const submitForm = async () => {
  await formRef.value.validate(async (valid: boolean) => {
@ -695,4 +700,4 @@ onMounted(() => fetchData())
 .camera-card:hover { border-color: #409EFF; color: #409EFF; }
 .camera-card .text { font-size: 12px; margin-top: 5px; }
 .camera-card .el-icon { font-size: 24px; }
-</style>
+</style>
--- a/inventory-web/src/views/stock/inbound/semi.vue
+++ b/inventory-web/src/views/stock/inbound/semi.vue
@ -136,10 +136,7 @@
          <template #default="scope" v-else-if="['detail_link'].includes(col.prop)">
            <el-link v-if="scope.row[col.prop]" type="primary" :href="scope.row[col.prop]" target="_blank"
                     :underline="false">
-              <el-icon>
-                <Link/>
-              </el-icon>
-              查看
+              <el-icon><Link/></el-icon> 查看
            </el-link>
          </template>

@ -152,10 +149,7 @@
      <el-table-column label="操作" width="220" fixed="right" align="center">
        <template #default="{ row }">
          <el-button link type="warning" size="default" @click="handlePrint(row)">
-            <el-icon>
-              <Printer/>
-            </el-icon>
-            打印
+            <el-icon><Printer/></el-icon> 打印
          </el-button>
          <el-button link type="primary" size="default" @click="handleUpdate(row)">编辑</el-button>
          <el-popconfirm title="确定删除该条记录吗？不可恢复。" @confirm="handleDelete(row)" width="220">
@ -410,11 +404,11 @@
    </el-dialog>

    <el-dialog v-model="dialogVisibleImage" append-to-body width="50%"><img style="width: 100%" :src="dialogImageUrl" alt="Preview Image" /></el-dialog>
-    <el-dialog v-model="cameraDialogVisible" title="拍照上传" width="500px" append-to-body destroy-on-close>
+    <el-dialog v-model="cameraDialogVisible" title="拍照上传" width="500px" append-to-body destroy-on-close :close-on-click-modal="false">
      <WebRtcCamera
-        ref="cameraRef"
-        @confirm="handleCameraConfirm"
-        @cancel="cameraDialogVisible = false"
+          ref="cameraRef"
+          @photo-submit="handleCameraConfirm"
+          @cancel="cameraDialogVisible = false"
      />
    </el-dialog>
    <el-dialog v-model="printVisible" title="标签打印预览" width="400px" destroy-on-close append-to-body>
@ -435,7 +429,7 @@
 <script setup lang="ts">
 import {ref, reactive, onMounted, watch} from 'vue'
 import {Plus, Setting, Refresh, Search, Lock, Box, House, InfoFilled, Link, Printer, Camera, Picture} from '@element-plus/icons-vue'
-import {ElMessage} from 'element-plus'
+import {ElMessage, ElLoading} from 'element-plus'
 import dayjs from 'dayjs'
 import {
  getSemiList,
@ -753,7 +747,10 @@ const handleCameraConfirm = async (file: File) => {
  }
  const formData = new FormData();
  formData.append('file', file);
-  const loadingMsg = ElMessage.loading({ message: '照片上传中...', duration: 0 });
+
+  // 修复点：使用 ElLoading
+  const loadingMsg = ElLoading.service({ text: '照片上传中...', background: 'rgba(0, 0, 0, 0.7)' });
+
  let success = false;
  try {
    const res: any = await uploadFile(formData);
@ -879,4 +876,4 @@ onMounted(() => fetchData())
 .camera-card:hover { border-color: #409EFF; color: #409EFF; }
 .camera-card .text { font-size: 12px; margin-top: 5px; }
 .camera-card .el-icon { font-size: 24px; }
-</style>
+</style>