查验

2026-06-16 14:17:05 +08:00
parent 62292edc70
commit 916b44bc3c
10 changed files with 725 additions and 133 deletions
@@ -82,8 +82,9 @@ createApp({
    this.refreshAngles()
    this.loadQrConfigs()
    this.nav2Timer = setInterval(this.refreshNavStatus, 3000)
-    this.armCameraUrl = API + '/api/camera/arm_preview?t=' + Date.now()
-  },
+    this.armSnapshotUrl = ""; this.armCameraUrl = API + '/api/camera/arm_preview?t=' + Date.now()
+    this.armSnapshotUrl = ""; this.armCameraUrl = API + "/api/camera/arm_preview?t=" + Date.now()
+    },
  computed: {
    customsTotalPages() {
      return Math.max(1, Math.ceil(this.customsTotal / this.customsPageSize))
@@ -1203,64 +1204,121 @@ createApp({
        alert('❌ 复位请求失败: ' + e.message)
      }
    },
-  },
-  // ===== 报关单方法 =====
-  async loadCustomsList() {
-    this.customsLoading = true
-    try {
-      const url = API + '/api/customs/list?pageNum=' + this.customsPage + '&pageSize=' + this.customsPageSize
-      const res = await fetch(url)
-      const d = await res.json()
-      if (d.ok && d.data) {
-        const raw = d.data
-        let list = []
-        let total = 0
-        if (raw.rows) { list = raw.rows; total = raw.total || list.length }
-        else if (raw.records) { list = raw.records; total = raw.total || list.length }
-        else if (Array.isArray(raw)) { list = raw; total = list.length }
-        else if (raw.data && raw.data.rows) { list = raw.data.rows; total = raw.data.total || list.length }
-        else if (raw.data && raw.data.records) { list = raw.data.records; total = raw.data.total || list.length }
-        else if (raw.data && Array.isArray(raw.data)) { list = raw.data; total = list.length }
-        this.customsList = list
-        this.customsTotal = total || list.length
-      } else {
+    // ===== 报关单方法 =====
+    async loadCustomsList() {
+      this.customsLoading = true
+      try {
+        const url = API + '/api/customs/list?pageNum=' + this.customsPage + '&pageSize=' + this.customsPageSize + '&customsName=' + encodeURIComponent(this.customsName) + '&customsNo=' + encodeURIComponent(this.customsNo)
+        const res = await fetch(url)
+        const d = await res.json()
+        if (d.ok && d.data) {
+          const raw = d.data
+          let list = []
+          let total = 0
+          if (raw.rows) { list = raw.rows; total = raw.total || list.length }
+          else if (raw.records) { list = raw.records; total = raw.total || list.length }
+          else if (Array.isArray(raw)) { list = raw; total = list.length }
+          else if (raw.data && raw.data.rows) { list = raw.data.rows; total = raw.data.total || list.length }
+          else if (raw.data && raw.data.records) { list = raw.data.records; total = raw.data.total || list.length }
+          else if (raw.data && Array.isArray(raw.data)) { list = raw.data; total = list.length }
+          this.customsList = list
+          this.customsTotal = total || list.length
+        } else {
+          this.customsList = []
+          this.customsTotal = 0
+        }
+      } catch (e) {
+        console.error('加载报关单列表失败', e)
        this.customsList = []
        this.customsTotal = 0
+      } finally {
+        this.customsLoading = false
      }
-    } catch (e) {
-      console.error('加载报关单列表失败', e)
-      this.customsList = []
-      this.customsTotal = 0
-    } finally {
-      this.customsLoading = false
-    }
-  },
-  async selectCustomsRow(item) {
-    const id = item.id || item.customsId || item.customs_id || ''
-    if (!id) return
-    this.selectedCustomsId = id
-    this.selectedCustomsName = item.customsNo || item.customs_no || item.name || item.customsName || item.customs_name || id
-    this.customsMachines = []
-    try {
-      const res = await fetch(API + '/api/customs/machines?customsId=' + encodeURIComponent(id))
-      const d = await res.json()
-      if (d.ok && d.data) {
-        const raw = d.data
-        let machines = []
-        if (raw.rows) { machines = raw.rows }
-        else if (raw.records) { machines = raw.records }
-        else if (raw.data && Array.isArray(raw.data)) { machines = raw.data }
-        else if (Array.isArray(raw)) { machines = raw }
-        else if (Array.isArray(raw.data)) { machines = raw.data }
-        this.customsMachines = machines
-      } else {
+    },
+    async selectCustomsRow(item) {
+      // 新数据结构: { customs:{id,orderId,..}, orderCode, drawCode }
+      const id = (item.customs && item.customs.id) || item.id || item.customsId || item.customs_id || ''
+      if (!id) return
+      this.selectedCustomsId = id
+      this.selectedCustomsName = (item.customs && item.customs.customsCode) || item.orderCode || item.drawCode || id
+      this.customsMachines = []
+      try {
+        const url = API + '/api/customs/machines?customsId=' + encodeURIComponent(id)
+        const res = await fetch(url)
+        const d = await res.json()
+        if (d.ok && d.data) {
+          const raw = d.data
+          let machines = []
+          // customsMachines 返回格式: {"code":"0","data":[{serialNumber,inventoryName,...}]}
+          if (raw.rows) { machines = raw.rows }
+          else if (raw.records) { machines = raw.records }
+          else if (raw.data && Array.isArray(raw.data)) { machines = raw.data }
+          else if (Array.isArray(raw)) { machines = raw }
+          else if (Array.isArray(raw.data)) { machines = raw.data }
+          this.customsMachines = machines
+        } else {
+          this.customsMachines = []
+        }
+      } catch (e) {
+        console.error('加载机器列表失败', e)
        this.customsMachines = []
      }
-    } catch (e) {
-      console.error('加载机器列表失败', e)
-      this.customsMachines = []
+    },
+    async startInspection(item) {
+      const id = (item.customs && item.customs.id) || item.id || item.customsId || item.customs_id || ''
+      const name = (item.customs && item.customs.customsCode) || item.orderCode || item.drawCode || id
+      if (!id) return
+      if (!confirm(`确定要对报关单「${name}」开始查验吗？\n点击确定后，运行页将以该报关单的机器进行查验。`)) return
+      try {
+        const res = await fetch(API + '/api/customs/inspection/start', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ customsId: id, customsName: name })
+        })
+        const d = await res.json()
+        if (d.ok) {
+          alert(`✅ 查验已开始！\n报关单: ${name}\n机型: ${d.inspection.items.length} 种\n总数: ${d.inspection.items.reduce((s,i)=>s+i.quantify,0)} 台\n\n请前往「运行」页执行任务。`)
+          // 同时选中该报关单，显示机器列表
+          this.selectedCustomsId = id
+          this.selectedCustomsName = name
+          // 用 inspection items 填充 customsMachines 显示（聚合后）
+          this.customsMachines = d.inspection.items.map(it => ({
+            inventoryCode: it.inventoryCode,
+            inventoryName: it.inventoryName,
+            inventorySpecification: it.spec,
+            serialNumber: '',
+            quantify: it.quantify,
+            inspectionCount: it.inspected,
+          }))
+        } else {
+          alert('❌ 开始查验失败: ' + (d.error || '未知错误'))
+        }
+      } catch (e) {
+        alert('❌ 请求失败: ' + e.message)
+      }
+    },
+    async loadInspectionCounts() {
+      // 轮询查验计数，更新 customsMachines 的 inspectionCount
+      try {
+        const res = await fetch(API + '/api/customs/inspection')
+        const d = await res.json()
+        if (d.ok && d.inspection && this.customsMachines.length) {
+          for (const item of d.inspection.items) {
+            const match = this.customsMachines.find(m => m.inventoryCode === item.inventoryCode)
+            if (match) {
+              match.inspectionCount = item.inspected
+            }
+          }
+        }
+      } catch (e) {}
+    },
+  },
+  watch: {
+    tab(newVal) {
+      if (newVal === 'customs' && this.customsMachines.length > 0) {
+        // 切换到报关单 tab 时刷新查验计数
+        this.loadInspectionCounts()
+      }
    }
  },
-}
-
 }).mount('#app')