From 4aed2a6ece37556ff9ca6a74e41b5291d5539a06 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 5 Nov 2025 16:43:47 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-05=20=E6=8E=A5=E5=8F=A3=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sys/interface-log.js                  |   5 +-
 src/views/modules/qc/FQCResultEntry.vue       |  29 ++++-
 src/views/modules/qc/IQCResultEntry.vue       |  29 ++++-
 src/views/modules/qc/OQCResultEntry.vue       |  30 ++++-
 .../modules/sys/interface/interfaceLog.vue    | 112 +++++++++++++++---
 .../modules/warehouse/countingReport.vue      |  73 ++++++++++--
 6 files changed, 253 insertions(+), 25 deletions(-)

diff --git a/src/api/sys/interface-log.js b/src/api/sys/interface-log.js
index 764c007..469c676 100644
--- a/src/api/sys/interface-log.js
+++ b/src/api/sys/interface-log.js
@@ -10,7 +10,10 @@ export const getApiLogParams = data => createAPI(`/sys/interfaceLog/getParams`,'
 // 删除接口日志
 export const deleteApiLogs = data => createAPI(`/sys/interfaceLog/delete`,'post',data)
 
-// 重试接口
+// 批量重试接口
 export const retryApiLogs = data => createAPI(`/sys/interfaceLog/retry`,'post',data)
 
+// 手动重试单个接口
+export const retryInterface = data => createAPI(`/sys/interfaceLog/retryInterface`,'post',data)
+
 
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 818b67e..1051f20 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -122,7 +122,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="状态">
-                <el-select v-model="searchData.states" multiple collapse-tags placeholder="请选择状态">
+                <el-select v-model="searchData.states" multiple collapse-tags placeholder="请选择状态" class="status-select">
                   <el-option label="未开始" value="未开始"></el-option>
                   <el-option label="待检验" value="待检验"></el-option>
                   <el-option label="待审核" value="待审核"></el-option>
@@ -4248,6 +4248,33 @@
   width: 100%;
 }
 
+/* 状态下拉框优化 - 解决不同分辨率下显示问题 */
+.search-form /deep/ .status-select {
+  width: 100%;
+}
+
+.search-form /deep/ .status-select .el-input__inner {
+  min-height: 36px;
+  line-height: 36px;
+  padding-right: 30px;
+}
+
+.search-form /deep/ .status-select .el-select__tags {
+  max-width: calc(100% - 30px);
+  overflow: hidden;
+}
+
+.search-form /deep/ .status-select .el-tag {
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.search-form /deep/ .status-select .el-tag__close {
+  flex-shrink: 0;
+}
+
 /* 操作按钮区域 */
 .search-actions {
   display: flex;
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 722eb56..3b13739 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -112,7 +112,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="状态">
-                <el-select v-model="searchData.states" multiple collapse-tags placeholder="请选择状态">
+                <el-select v-model="searchData.states" multiple collapse-tags placeholder="请选择状态" class="status-select">
                   <el-option label="未开始" value="未开始"></el-option>
                   <el-option label="待检验" value="待检验"></el-option>
                   <el-option label="待审核" value="待审核"></el-option>
@@ -3297,6 +3297,33 @@
   width: 100%;
 }
 
+/* 状态下拉框优化 - 解决不同分辨率下显示问题 */
+.search-form /deep/ .status-select {
+  width: 100%;
+}
+
+.search-form /deep/ .status-select .el-input__inner {
+  min-height: 36px;
+  line-height: 36px;
+  padding-right: 30px;
+}
+
+.search-form /deep/ .status-select .el-select__tags {
+  max-width: calc(100% - 30px);
+  overflow: hidden;
+}
+
+.search-form /deep/ .status-select .el-tag {
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.search-form /deep/ .status-select .el-tag__close {
+  flex-shrink: 0;
+}
+
 /* 操作按钮区域 */
 .search-actions {
   display: flex;
diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue
index 9490ba1..d500079 100644
--- a/src/views/modules/qc/OQCResultEntry.vue
+++ b/src/views/modules/qc/OQCResultEntry.vue
@@ -139,7 +139,8 @@
                   v-model="searchData.states"
                   multiple
                   collapse-tags
-                  placeholder="请选择状态">
+                  placeholder="请选择状态"
+                  class="status-select">
                   <el-option label="未开始" value="未开始"></el-option>
                   <el-option label="待检验" value="待检验"></el-option>
                   <el-option label="待审核" value="待审核"></el-option>
@@ -3254,6 +3255,33 @@
   width: 100%;
 }
 
+/* 状态下拉框优化 - 解决不同分辨率下显示问题 */
+.search-form /deep/ .status-select {
+  width: 100%;
+}
+
+.search-form /deep/ .status-select .el-input__inner {
+  min-height: 36px;
+  line-height: 36px;
+  padding-right: 30px;
+}
+
+.search-form /deep/ .status-select .el-select__tags {
+  max-width: calc(100% - 30px);
+  overflow: hidden;
+}
+
+.search-form /deep/ .status-select .el-tag {
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.search-form /deep/ .status-select .el-tag__close {
+  flex-shrink: 0;
+}
+
 /* 操作按钮区域 */
 .search-actions {
   display: flex;
diff --git a/src/views/modules/sys/interface/interfaceLog.vue b/src/views/modules/sys/interface/interfaceLog.vue
index 785ad2e..21bf60c 100644
--- a/src/views/modules/sys/interface/interfaceLog.vue
+++ b/src/views/modules/sys/interface/interfaceLog.vue
@@ -139,7 +139,6 @@
     <!-- 表格操作按钮 -->
     <div class="table-actions">
       <el-button
-        v-if="dataListSelections.length > 0"
         type="danger"
         @click="deleteHandle()"
         icon="el-icon-delete"
@@ -147,12 +146,11 @@
         批量删除
       </el-button>
       <el-button
-        v-if="dataListSelections.length > 0"
-        type="success"
-        @click="retryHandle()"
-        icon="el-icon-refresh"
+        type="warning"
+        @click="batchRetryInterfaceHandle()"
+        icon="el-icon-refresh-right"
         size="small">
-        批量重试
+        手动重试
       </el-button>
     </div>
 
@@ -297,7 +295,7 @@
 </template>
 
 <script>
-import { searchApiLogs, getApiLogParams, deleteApiLogs, retryApiLogs } from '@/api/sys/interface-log'
+import { searchApiLogs, getApiLogParams, deleteApiLogs, retryApiLogs, retryInterface } from '@/api/sys/interface-log'
 
 export default {
   data() {
@@ -457,22 +455,108 @@ export default {
       })
     },
 
-    // 重试
-    retryHandle() {
-      const ids = this.dataListSelections.map(item => item.id)
-      this.$confirm('确定要重试选中的接口吗?', '提示', {
+    // 批量手动重试接口
+    batchRetryInterfaceHandle() {
+      if (this.dataListSelections.length === 0) {
+        this.$message.warning('请选择要重试的记录！')
+        return
+      }
+
+      const count = this.dataListSelections.length
+      this.$confirm(`确定要手动重试选中的 ${count} 个接口吗？`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        retryApiLogs({ ids }).then(({ data }) => {
+        const loading = this.$loading({
+          lock: true,
+          text: `正在重试 ${count} 个接口，请稍候...`,
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        // 构造批量重试参数
+        const retryList = this.dataListSelections.map(item => ({
+          site: item.site,
+          buNo: item.buNo,
+          requestId: item.requestId,
+          requestGroupId: item.requestGroupId,
+          interfaceName: item.interfaceName
+        }))
+
+        // 调用批量重试接口
+        retryInterface({ retryList }).then(({ data }) => {
+          loading.close()
           if (data && data.code === 0) {
-            this.$message.success('重试成功')
+            const result = data.result
+            const successCount = result.successCount || 0
+            const failureCount = result.failureCount || 0
+            const errorCount = result.errorCount || 0
+
+            // 显示详细结果
+            let message = `重试完成！成功：${successCount}，失败：${failureCount}，异常：${errorCount}`
+            
+            if (successCount === count) {
+              this.$message.success(message)
+            } else if (successCount > 0) {
+              this.$message.warning(message)
+            } else {
+              this.$message.error(message)
+            }
+
+            // 显示详细结果对话框
+            if (result.details && result.details.length > 0) {
+              this.showRetryResultDialog(result.details)
+            }
+
             this.getDataList()
           } else {
-            this.$message.error(data.msg || '重试失败')
+            this.$message.error(data.msg || '批量重试失败')
           }
+        }).catch(err => {
+          loading.close()
+          this.$message.error('批量重试异常：' + (err.message || '请求失败'))
+        })
+      })
+    },
+
+    // 显示重试结果详情对话框
+    showRetryResultDialog(details) {
+      const successList = details.filter(d => d.status === 'success')
+      const failureList = details.filter(d => d.status === 'failure')
+      const errorList = details.filter(d => d.status === 'error')
+
+      let messageHtml = '<div style="max-height: 400px; overflow-y: auto;">'
+      
+      if (successList.length > 0) {
+        messageHtml += '<div style="margin-bottom: 15px;"><strong style="color: #67C23A;">成功 (' + successList.length + ')：</strong><ul style="margin: 5px 0; padding-left: 20px;">'
+        successList.forEach(item => {
+          messageHtml += '<li>' + item.interfaceName + (item.u8CCode ? ' - U8单号：' + item.u8CCode : '') + '</li>'
         })
+        messageHtml += '</ul></div>'
+      }
+
+      if (failureList.length > 0) {
+        messageHtml += '<div style="margin-bottom: 15px;"><strong style="color: #E6A23C;">失败 (' + failureList.length + ')：</strong><ul style="margin: 5px 0; padding-left: 20px;">'
+        failureList.forEach(item => {
+          messageHtml += '<li>' + item.interfaceName + '：' + (item.message || '未知错误') + '</li>'
+        })
+        messageHtml += '</ul></div>'
+      }
+
+      if (errorList.length > 0) {
+        messageHtml += '<div><strong style="color: #F56C6C;">异常 (' + errorList.length + ')：</strong><ul style="margin: 5px 0; padding-left: 20px;">'
+        errorList.forEach(item => {
+          messageHtml += '<li>' + item.interfaceName + '：' + (item.message || '未知异常') + '</li>'
+        })
+        messageHtml += '</ul></div>'
+      }
+
+      messageHtml += '</div>'
+
+      this.$alert(messageHtml, '批量重试结果详情', {
+        confirmButtonText: '确定',
+        dangerouslyUseHTMLString: true
       })
     }
   }
diff --git a/src/views/modules/warehouse/countingReport.vue b/src/views/modules/warehouse/countingReport.vue
index 686ebf7..032f248 100644
--- a/src/views/modules/warehouse/countingReport.vue
+++ b/src/views/modules/warehouse/countingReport.vue
@@ -132,7 +132,7 @@
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
-        <el-form-item>
+        <el-form-item prop="locationId">
           <span style="cursor: pointer" slot="label" @click="getBaseList(22)"><a href="#">盘点货位</a></span>
           <el-input v-model="modalData.locationId" @change="locationBlur(22)" style="width: 135px"></el-input>
           <el-input v-model="modalData.locationName" disabled style="width: 320px"></el-input>
@@ -282,13 +282,23 @@ export default {
           message: ' ',
           trigger: ['blur','change']
         }],
-        warehouseId: [{
+        planDate: [{
           required: true,
           message: ' ',
           trigger: ['blur','change']
         }],
+        warehouseId: [{
+          required: false,
+          message: ' ',
+          trigger: ['blur','change']
+        }],
+        locationId: [{
+          required: false,
+          message: ' ',
+          trigger: ['blur','change']
+        }],
         partNo: [{
-          required: true,
+          required: false,
           message: ' ',
           trigger: ['blur','change']
         }]
@@ -392,6 +402,12 @@ export default {
         partDesc: '',
         remark: ''
       }
+
+      // 初始化校验规则（默认都不必填）
+      this.rules.warehouseId[0].required = false
+      this.rules.locationId[0].required = false
+      this.rules.partNo[0].required = false
+
       this.$nextTick(() => {
         if (this.$refs.modalForm) {
           this.$refs.modalForm.clearValidate()
@@ -420,6 +436,22 @@ export default {
         partDesc: row.partDesc,
         remark: row.remark
       }
+
+      // 根据已有的盘点维度设置校验规则
+      if (row.checkDimension === '按仓库') {
+        this.rules.warehouseId[0].required = true
+        this.rules.locationId[0].required = false
+        this.rules.partNo[0].required = false
+      } else if (row.checkDimension === '按货位') {
+        this.rules.warehouseId[0].required = false
+        this.rules.locationId[0].required = true
+        this.rules.partNo[0].required = false
+      } else if (row.checkDimension === '按物料') {
+        this.rules.warehouseId[0].required = false
+        this.rules.locationId[0].required = false
+        this.rules.partNo[0].required = true
+      }
+
       this.$nextTick(() => {
         if (this.$refs.modalForm) {
           this.$refs.modalForm.clearValidate()
@@ -429,10 +461,37 @@ export default {
 
     // 盘点维度变化
     dimensionChange() {
-      // 根据维度清空不需要的字段
-      if (this.modalData.checkDimension === '按物料') {
-        this.modalData.locationId = ''
-        this.modalData.locationName = ''
+      // 根据维度清空所有字段和校验
+      this.modalData.warehouseId = ''
+      this.modalData.warehouseName = ''
+      this.modalData.locationId = ''
+      this.modalData.locationName = ''
+      this.modalData.partNo = ''
+      this.modalData.partDesc = ''
+
+      // 清除表单校验
+      this.$nextTick(() => {
+        if (this.$refs.modalForm) {
+          this.$refs.modalForm.clearValidate()
+        }
+      })
+
+      // 根据维度设置必填项
+      if (this.modalData.checkDimension === '按仓库') {
+        // 按仓库：仓库必填，货位和物料非必填
+        this.rules.warehouseId[0].required = true
+        this.rules.locationId[0].required = false
+        this.rules.partNo[0].required = false
+      } else if (this.modalData.checkDimension === '按货位') {
+        // 按货位：货位必填，仓库和物料非必填
+        this.rules.warehouseId[0].required = false
+        this.rules.locationId[0].required = true
+        this.rules.partNo[0].required = false
+      } else if (this.modalData.checkDimension === '按物料') {
+        // 按物料：物料必填，仓库和货位非必填
+        this.rules.warehouseId[0].required = false
+        this.rules.locationId[0].required = false
+        this.rules.partNo[0].required = true
       }
     },