From a8874e8636cbe4c6433f008f33706e0699d73545 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Thu, 11 Jun 2026 16:33:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(inspection):=20=E4=BF=AE=E5=A4=8D=E6=8E=92?=
 =?UTF-8?q?=E7=A8=8B=E5=8A=9F=E8=83=BD=E9=80=BB=E8=BE=91=E5=92=8C=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改排程视图中排程按钮显示条件，只在主表选中数据且状态为已下达时显示
- 移除无数据提示，改为始终显示左右两个面板
- 优化排程视图的数据加载逻辑，根据主表选择状态决定是否加载排程数据
- 修复QC人员切换时排程数据的加载时机问题
- 调整质量异议详情页面的输入框样式统一性
- 修复日期时间选择器图标的垂直居中显示问题
- 更新检验申请单列表的状态标签，将"已确认"改为"待审核"，"已审核"改为"已下达"
- 优化排程列表页面的排程成功处理逻辑，改为整页数据刷新
- 修复排程视图组件的高度自适应问题，将overflow设置为overflow-y: auto
---
 .../inspection/com_inspectionScheduleView.vue | 238 +++++++++++-------
 .../inspection/inspectionRequestList.vue      |   4 +-
 .../inspection/inspectionScheduleList.vue     |  32 +--
 .../quality/com_qualityIssueDetail.vue        | 177 ++++++++++---
 4 files changed, 318 insertions(+), 133 deletions(-)

diff --git a/src/views/modules/inspection/com_inspectionScheduleView.vue b/src/views/modules/inspection/com_inspectionScheduleView.vue
index e6b3380..cf97947 100644
--- a/src/views/modules/inspection/com_inspectionScheduleView.vue
+++ b/src/views/modules/inspection/com_inspectionScheduleView.vue
@@ -1,68 +1,64 @@
 <template>
   <div class="schedule-container">
-    <!-- 无数据提示 -->
-    <div v-if="!hasSelectedData" class="empty-state">
-      <i class="el-icon-info" style="font-size: 48px; color: #c0c4cc;"></i>
-      <p style="color: #909399; margin-top: 16px;">请先在主表中选择需要排程的申请单</p>
+    <!-- 左侧：QC人员清单 -->
+    <div class="left-panel">
+      <div class="panel-title">QC人员清单</div>
+      <el-table
+        :data="qcList"
+        border
+        size="mini"
+        highlight-current-row
+        ref="qcTable"
+        @current-change="handleQcSelect"
+        @row-click="handleQcSelect"
+        style="width: 100%;"
+        class="qc-table">
+        <el-table-column prop="qcName" label="姓名" width="80" align="center" />
+        <el-table-column prop="region" label="负责区域" min-width="90" show-overflow-tooltip />
+        <el-table-column label="操作" width="80" align="center" fixed="right">
+          <template slot-scope="scope">
+            <!-- 只有当主表选中了数据且状态为已下达时才显示排程按钮 -->
+            <el-link 
+              v-if="hasSelectedData && currentStatusDb === 'Audited'"
+              type="primary" 
+              style="cursor: pointer;" 
+              @click.stop="openScheduleDialog(null, scope.row)">排程</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
 
-    <!-- 有数据时显示正常内容 -->
-    <template v-else>
-      <!-- 左侧：QC人员清单 -->
-      <div class="left-panel">
-        <div class="panel-title">QC人员清单</div>
-        <el-table
-          :data="qcList"
-          border
-          size="mini"
-          highlight-current-row
-          ref="qcTable"
-          @current-change="handleQcSelect"
-          @row-click="handleQcSelect"
-          style="width: 100%;"
-          class="qc-table">
-          <el-table-column prop="qcName" label="姓名" width="80" align="center" />
-          <el-table-column prop="region" label="负责区域" min-width="90" show-overflow-tooltip />
-          <el-table-column label="操作" width="80" align="center" fixed="right" v-if="currentStatusDb !== 'Scheduled'">
-            <template slot-scope="scope">
-              <el-link type="primary" style="cursor: pointer;" @click.stop="openScheduleDialog(null, scope.row)">排程</el-link>
-            </template>
-          </el-table-column>
-        </el-table>
+    <!-- 右侧:排程卡片（始终显示） -->
+    <div class="right-panel">
+      <div class="panel-title">
+        <span v-if="selectedQc">{{ selectedQc.qcName }} - 排程视图（未来10天）</span>
+        <span v-else>查看排程</span>
       </div>
-
-      <!-- 右侧:排程卡片 -->
-      <div class="right-panel">
-        <div class="panel-title">
-          <span v-if="selectedQc">{{ selectedQc.qcName }} - 排程视图（未来10天）</span>
-          <span v-else>查看排程</span>
-        </div>
-        <div class="schedule-grid" v-loading="loading">
-          <div v-for="day in scheduleDays" :key="day.date" class="schedule-card">
-            <div class="card-header">
-              <span class="date-label">{{ day.dateLabel }}</span>
-              <span class="date-weekday">{{ day.weekday }}</span>
-            </div>
-            <div class="card-body">
-              <div
-                v-for="task in day.tasks"
-                :key="task.requestNo"
-                class="task-item"
-                @click="handleTaskClick(task)">
-                <div class="task-no">单号：{{ task.requestNo }}</div>
-                <div class="task-supplier" :title="task.supplierName">{{ task.supplierName }}</div>
-                <div v-if="task.inspectAddress" class="task-address" :title="task.inspectAddress">
-                  <i class="el-icon-location"></i> {{ task.inspectAddress }}
-                </div>
-              </div>
-              <div v-if="day.tasks.length === 0" class="empty-slot">
-                <span class="empty-text">暂无排程</span>
+      <div class="schedule-grid" v-loading="loading">
+        <div v-for="day in scheduleDays" :key="day.date" class="schedule-card">
+          <div class="card-header">
+            <span class="date-label">{{ day.dateLabel }}</span>
+            <span class="date-weekday">{{ day.weekday }}</span>
+          </div>
+          <div class="card-body">
+            <div
+              v-for="task in day.tasks"
+              :key="task.requestNo"
+              class="task-item"
+              @click="handleTaskClick(task)">
+              <div class="task-no">单号：{{ task.requestNo }}</div>
+              <div class="task-supplier" :title="task.supplierName">{{ task.supplierName }}</div>
+              <div v-if="task.inspectAddress" class="task-address" :title="task.inspectAddress">
+                <i class="el-icon-location"></i> {{ task.inspectAddress }}
               </div>
             </div>
+            <div v-if="day.tasks.length === 0" class="empty-slot">
+              <span class="empty-text">暂无排程</span>
+            </div>
           </div>
         </div>
       </div>
-    </template>
+    </div>
 
     <!-- 排程弹窗 -->
     <el-dialog
@@ -124,6 +120,7 @@ export default {
     }
   },
   computed: {
+    // 判断主表是否选中了数据
     hasSelectedData() {
       return this.requestNos && this.requestNos.length > 0
     }
@@ -132,41 +129,32 @@ export default {
     requestNos: {
       handler(newVal) {
         if (newVal && newVal.length > 0) {
-          // 重置状态，重新加载
-          this.selectedQc = null
-          this.scheduleDays = []
-          this.loadQcList()
+          // 主表有选择数据时，加载排程数据
+          if (this.selectedQc) {
+            this.loadScheduleData(this.selectedQc)
+          }
         } else {
-          this.selectedQc = null
-          this.scheduleDays = []
-          this.qcList = []
+          // 主表无选择数据时，显示空卡片
+          this.scheduleDays = this.generateNextDays(10)
         }
-      },
-      immediate: true
+      }
     }
   },
   mounted() {
     console.log('[排程视图] 组件已挂载')
+    // 组件挂载时自动加载QC列表和排程数据
+    this.loadQcList()
   },
   methods: {
     // 强制刷新当前选中的QC排程视图（供父组件调用）
     forceRefresh() {
-      console.log('[排程视图] 强制刷新，当前选中QC:', this.selectedQc)
-      if (this.selectedQc) {
-        this.loadScheduleData(this.selectedQc)
-      } else if (this.qcList.length > 0) {
-        // 如果没有选中QC但QC列表有数据，选中第一个并加载
-        this.selectedQc = this.qcList[0]
-        this.loadScheduleData(this.selectedQc)
-        this.$nextTick(() => {
-          if (this.$refs.qcTable) this.$refs.qcTable.setCurrentRow(this.selectedQc)
-        })
-      } else {
-        // 如果QC列表为空，尝试重新加载QC列表
-        this.loadQcList()
-      }
+      console.log('[排程视图] forceRefresh 被调用')
+      // 直接重新加载QC列表和排程数据
+      this.loadQcList()
     },
     loadQcList() {
+      console.log('[排程视图] 开始加载QC列表')
+      
       const params = { page: 1, limit: 100 }
       getQcPersonList(params)
         .then(({ data }) => {
@@ -180,14 +168,26 @@ export default {
             console.log('[排程视图] QC列表加载成功:', this.qcList)
 
             if (this.qcList.length) {
+
               // 优先保持当前选中的QC，如果无效则选中第一个
-              if (!this.selectedQc || !this.qcList.some(q => q.userName === this.selectedQc.userName)) {
+              if (
+                !this.selectedQc ||
+                !this.qcList.some(q => q.userName === this.selectedQc.userName)
+              ) {
                 this.selectedQc = this.qcList[0]
               }
-              // 加载排程数据
-              this.loadScheduleData(this.selectedQc)
+
+              // 只有主表选择了数据时才加载排程数据，否则显示空卡片
+              if (this.hasSelectedData) {
+                this.loadScheduleData(this.selectedQc)
+              } else {
+                this.scheduleDays = this.generateNextDays(10)
+              }
+
               this.$nextTick(() => {
-                if (this.$refs.qcTable) this.$refs.qcTable.setCurrentRow(this.selectedQc)
+                if (this.$refs.qcTable) {
+                  this.$refs.qcTable.setCurrentRow(this.selectedQc)
+                }
               })
             } else {
               this.selectedQc = null
@@ -210,11 +210,68 @@ export default {
     handleQcSelect(row) {
       if (!row) return
       this.selectedQc = row
-      this.loadScheduleData(row)
+      // 只有主表选择了数据时才加载排程数据
+      if (this.hasSelectedData) {
+        this.loadScheduleData(row)
+      } else {
+        this.scheduleDays = this.generateNextDays(10)
+      }
+    },
+    // 打开排程弹窗
+    openScheduleDialog(task, qcRow) {
+      this.scheduleForm = {
+        qcOperator: qcRow ? qcRow.userName : '',
+        qcUserName: qcRow ? qcRow.qcName : '',
+        planStartDate: '',
+        planEndDate: '',
+        remark: ''
+      }
+      this.scheduleDialogVisible = true
+    },
+
+    // 关闭排程弹窗
+    cancelSchedule() {
+      this.scheduleDialogVisible = false
     },
-    // 其他方法保持不变（openScheduleDialog, submitSchedule, cancelSchedule, loadScheduleData, generateNextDays, formatDate, handleTaskClick）
-    // 注意：loadScheduleData 中确保即使请求失败也生成空白卡片
+
+    // 提交排程
+    submitSchedule() {
+      this.$refs.scheduleForm.validate((valid) => {
+        if (!valid) return
+        if (!this.scheduleForm.planStartDate) {
+          this.$message.warning('请选择计划验货日期')
+          return
+        }
+        const params = {
+          requestNos: this.requestNos,
+          site: this.$store.state.user.site,
+          qcOperator: this.scheduleForm.qcOperator,
+          planStartDate: this.scheduleForm.planStartDate,
+          planEndDate: this.scheduleForm.planEndDate || this.scheduleForm.planStartDate,
+          remark: this.scheduleForm.remark
+        }
+        this.loading = true
+        scheduleInspectionRequest(params).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success('排程成功')
+            this.scheduleDialogVisible = false
+            // 通知父组件刷新主表数据（会触发整页刷新）
+            this.$emit('schedule-success')
+          } else {
+            this.$message.error((data && data.msg) || '排程失败')
+          }
+          this.loading = false
+        }).catch((error) => {
+          console.error('排程失败:', error)
+          this.$message.error('排程失败')
+          this.loading = false
+        })
+      })
+    },
+
     loadScheduleData(qc) {
+      console.log('======loadScheduleData======')
+      console.log('qc=', qc)
       if (!qc) {
         console.warn('[排程视图] loadScheduleData 参数为空')
         this.scheduleDays = this.generateNextDays(10)
@@ -251,6 +308,15 @@ export default {
               ...day,
               tasks: tasksByDate[day.date] || []
             }))
+            console.log('scheduleDays=', this.scheduleDays)
+
+            console.log(
+              '任务总数=',
+              this.scheduleDays.reduce(
+                (sum, item) => sum + item.tasks.length,
+                0
+              )
+            )
             console.log('[排程视图] 排程数据加载完成')
           } else {
             console.warn('[排程视图] 加载排程数据失败')
@@ -359,7 +425,7 @@ export default {
   grid-template-columns: repeat(5, 1fr);
   grid-template-rows: repeat(2, 1fr);
   gap: 10px;
-  overflow: hidden;
+  overflow-y: auto;
 }
 
 .schedule-card {
diff --git a/src/views/modules/inspection/inspectionRequestList.vue b/src/views/modules/inspection/inspectionRequestList.vue
index 27b002a..1c4e8e7 100644
--- a/src/views/modules/inspection/inspectionRequestList.vue
+++ b/src/views/modules/inspection/inspectionRequestList.vue
@@ -21,8 +21,8 @@
           <el-select v-model="searchData.status" clearable placeholder="全部" style="width: 100%">
             <el-option label="全部" value="" />
             <el-option label="草稿" value="Draft" />
-            <el-option label="已确认" value="Confirmed" />
-            <el-option label="已审核" value="Audited" />
+            <el-option label="待审核" value="Confirmed" />
+            <el-option label="已下达" value="Audited" />
             <el-option label="已排程" value="Scheduled" />
             <el-option label="已验货" value="Inspected" />
             <el-option label="已取消" value="Cancelled" />
diff --git a/src/views/modules/inspection/inspectionScheduleList.vue b/src/views/modules/inspection/inspectionScheduleList.vue
index 745e8dd..b08bda8 100644
--- a/src/views/modules/inspection/inspectionScheduleList.vue
+++ b/src/views/modules/inspection/inspectionScheduleList.vue
@@ -131,7 +131,6 @@
 
     <!-- 详情页签 -->
     <el-tabs v-model="activeTab" @tab-click="handleTabClick" class="customer-tab" type="border-card">
-      <!-- 排程视图 -->
       <!-- 排程视图 -->
       <el-tab-pane label="排程" name="schedule">
         <inspection-schedule-view
@@ -139,7 +138,7 @@
           :request-nos="selectedRequestNos"
           :current-row="currentRow"
           :current-status-db="currentRow.statusDb"
-          @schedule-success="getMainData" />
+          @schedule-success="handleScheduleSuccess" />
       </el-tab-pane>
       <!-- 基本信息 -->
       <el-tab-pane label="基本信息" name="base">
@@ -440,11 +439,6 @@ export default {
       this.height = 250
       this.detailHeight = 300
       this.getMainData()
-
-      // 默认打开排程页签，自动执行查询
-      if (this.activeTab === 'schedule' && this.$refs.scheduleView) {
-        this.$refs.scheduleView.loadQcList()
-      }
     })
   },
   methods: {
@@ -529,6 +523,12 @@ export default {
       this.getMainData()
     },
 
+    // 处理排程成功事件 - 刷新整个页面数据
+    handleScheduleSuccess() {
+      // 重新查询主表数据（会触发 changeData，进而刷新页签）
+      this.getMainData()
+    },
+
     // 页签点击事件
     handleTabClick (tab) {
       if (tab.name === 'schedule') {
@@ -561,17 +561,22 @@ export default {
 
     // 行点击事件
     changeData (row) {
+      console.log('======changeData======')
+      console.log('row=', row)
+
       this.currentRow = row ? JSON.parse(JSON.stringify(row)) : {}
+
       if (row && row.requestNo) {
         this.selectedRequestNos = [row.requestNo]
       } else {
         this.selectedRequestNos = []
       }
-      this.$nextTick(() => {
-        if (this.activeTab === 'schedule' && this.$refs.scheduleView) {
-          this.$refs.scheduleView.forceRefresh()
-        }
-      })
+
+      // 如果当前在排程页签，刷新排程视图（重新加载QC列表+排程数据）
+      if (this.activeTab === 'schedule' && this.$refs.scheduleView) {
+        console.log('[排程] 刷新排程视图')
+        this.$refs.scheduleView.loadQcList()
+      }
     },
     // 主表格行样式
     mainTableRowClassName ({ row }) {
@@ -622,9 +627,6 @@ export default {
 
 
   },
-  created () {
-    this.getMainData()
-  }
 }
 </script>
 <style scoped lang="scss">
diff --git a/src/views/modules/quality/com_qualityIssueDetail.vue b/src/views/modules/quality/com_qualityIssueDetail.vue
index 10e4694..c536486 100644
--- a/src/views/modules/quality/com_qualityIssueDetail.vue
+++ b/src/views/modules/quality/com_qualityIssueDetail.vue
@@ -525,7 +525,6 @@ export default {
   }
 }
 </script>
-
 <style scoped lang="scss">
 .quality-issue-detail {
   padding: 10px 15px;
@@ -561,22 +560,20 @@ export default {
   white-space: pre-wrap;
   box-sizing: border-box;
 }
+
 .form-item .value.disabled {
   background: #f5f7fa;
   color: #909399;
 }
+
 .form-item.textarea-item .value.textarea-content {
   min-height: 60px;
   line-height: 1.5;
   padding: 8px 10px;
 }
 
-/* 统一编辑模式输入框高度 */
-/deep/ .el-input--small .el-input__inner,
-/deep/ .el-textarea__inner,
-/deep/ .el-select .el-input__inner,
-/deep/ .el-date-editor .el-input__inner,
-/deep/ .el-input-number .el-input__inner {
+/* 统一编辑模式输入框样式 */
+/deep/ .el-input--small .el-input__inner {
   height: 32px;
   line-height: 32px;
   padding: 0 10px;
@@ -586,25 +583,136 @@ export default {
   background-color: #fff;
   font-size: 13px;
 }
+
+/* 文本域样式 */
 /deep/ .el-textarea__inner {
   height: auto;
   line-height: 1.5;
   padding: 8px 10px;
+  min-height: 60px;
+  box-sizing: border-box;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  background-color: #fff;
+  font-size: 13px;
 }
-/deep/ .el-input-number--small {
-  width: 100%;
+
+/* 下拉选择框 */
+/deep/ .el-select .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+  padding: 0 10px;
+  box-sizing: border-box;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  background-color: #fff;
+  font-size: 13px;
 }
-/deep/ .el-input-number--small .el-input-number__increase,
-/deep/ .el-input-number--small .el-input-number__decrease {
-  height: 16px;
-  line-height: 16px;
+
+/* 日期选择器容器 */
+/deep/ .el-date-editor {
+  width: 100% !important;
 }
+
 /deep/ .el-date-editor.el-input,
 /deep/ .el-date-editor.el-input__inner {
   width: 100%;
 }
 
-/* 按钮样式：不长，自适应宽度 */
+/* 日期选择器输入框 */
+/deep/ .el-date-editor .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+  padding: 0 30px 0 10px;
+  box-sizing: border-box;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  background-color: #fff;
+  font-size: 13px;
+}
+
+/* 日期时间选择器输入框 */
+/deep/ .el-date-editor--datetime .el-input__inner {
+  padding: 0 40px 0 10px;
+}
+
+/* 修复图标垂直居中 - 关键 */
+/deep/ .el-input {
+  line-height: 32px;
+}
+
+/deep/ .el-input__prefix,
+/deep/ .el-input__suffix {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  height: 32px !important;
+  top: 0 !important;
+  bottom: auto !important;
+  line-height: 32px !important;
+}
+
+/deep/ .el-input__suffix {
+  right: 5px;
+}
+
+/deep/ .el-input__prefix {
+  left: 5px;
+}
+
+/deep/ .el-input__suffix-inner,
+/deep/ .el-input__prefix-inner {
+  display: flex !important;
+  align-items: center !important;
+  height: 100% !important;
+  line-height: 32px !important;
+}
+
+/deep/ .el-input__icon {
+  line-height: 32px !important;
+  height: 32px !important;
+  width: 25px;
+  text-align: center;
+  font-size: 14px;
+  top: 0 !important;
+}
+
+/* 带后缀的输入框右侧留空间 */
+/deep/ .el-input--suffix .el-input__inner {
+  padding-right: 30px;
+}
+
+/* 带前缀的输入框左侧留空间 */
+/deep/ .el-input--prefix .el-input__inner {
+  padding-left: 30px;
+}
+
+/* 数字输入框 */
+/deep/ .el-input-number--small {
+  width: 100%;
+}
+
+/deep/ .el-input-number--small .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+  padding: 0 40px 0 10px;
+  box-sizing: border-box;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  background-color: #fff;
+  font-size: 13px;
+  text-align: left;
+}
+
+/deep/ .el-input-number--small .el-input-number__increase,
+/deep/ .el-input-number--small .el-input-number__decrease {
+  height: 15px;
+  line-height: 15px;
+  width: 28px;
+  font-size: 12px;
+}
+
+/* 按钮样式 */
 .quality-issue-detail .el-button--small,
 .quality-issue-detail .el-button--default {
   height: 32px;
@@ -615,32 +723,19 @@ export default {
   min-width: auto;
   width: auto;
 }
+
 .quality-issue-detail .el-button + .el-button {
   margin-left: 10px;
 }
 
-/* 索赔信息区域：强制同行 */
-.claim-section .el-row {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-}
-.claim-section .el-select {
-  width: 120px;
-}
-.claim-section .el-input-number {
-  width: 140px;
-}
-.claim-section .el-col {
-  flex: 1 1 auto;
-}
-
+/* 索赔信息区域 */
 .claim-section {
   border: 1px solid #dcdfe6;
   padding: 10px 12px;
   margin: 10px 0;
   background: #fafafa;
 }
+
 .claim-title {
   font-size: 14px;
   font-weight: 500;
@@ -649,6 +744,7 @@ export default {
   padding-left: 8px;
   border-left: 3px solid #409eff;
 }
+
 .btn-area {
   display: flex;
   justify-content: flex-end;
@@ -661,4 +757,25 @@ export default {
   min-width: 80px;
 }
 
+.claim-section /deep/ .el-select {
+  width: 100%;
+}
+
+.claim-section /deep/ .el-input-number {
+  width: 100%;
+}
+
+/* 日期时间选择器图标样式增强 */
+/deep/ .el-date-editor--datetime {
+  .el-input__prefix,
+  .el-input__suffix {
+    height: 32px !important;
+    line-height: 32px !important;
+  }
+
+  .el-input__icon {
+    line-height: 32px !important;
+    height: 32px !important;
+  }
+}
 </style>