From 68d61a7f2e51883bb8d93013052d508d06add751 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Mon, 20 Oct 2025 16:15:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualCheck/checkManage/checkLog/index.vue   | 16 ++++++++++++----
 .../checkManage/dataScreening/module/form.vue    |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/views/visualCheck/checkManage/checkLog/index.vue b/src/views/visualCheck/checkManage/checkLog/index.vue
index 1967a27..5e6fbce 100644
--- a/src/views/visualCheck/checkManage/checkLog/index.vue
+++ b/src/views/visualCheck/checkManage/checkLog/index.vue
@@ -247,12 +247,12 @@
                   </ul>
                 </template>
               </el-table-column>
-              <el-table-column prop="progress" label="进度" min-width="140">
+              <el-table-column prop="progress" label="进度" min-width="120" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   <span>{{ scope.row.progress !== null ? scope.row.progress : '-' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="progress" label="备注" min-width="140" :show-overflow-tooltip="true" />
+              <el-table-column prop="detailsRemarks" label="备注" min-width="100" :show-overflow-tooltip="true" />
               <el-table-column prop="state" label="状态" width="80">
                 <template slot-scope="scope">
                   <span v-if="scope.row.state === 0" class="row-state row-lending state-active">已终止</span>
@@ -278,7 +278,7 @@
         <div slot="footer" class="dialog-footer">
           <!-- 排队中会多一个“删除盘点”  进行中的多一个“终止盘点” -->
           <el-button v-if="detailInfo.state === 1" :loading="crud.delAllLoading" type="primary" class="end-btn" @click="toDelete"><i class="iconfont icon-stop" />删除盘点</el-button>
-          <el-button v-if="detailInfo.state === 2" type="primary" class="end-btn" @click="toStopStockBill"><i class="iconfont icon-stop" />终止盘点</el-button>
+          <el-button v-if="detailInfo.state === 2" :loading="stopLoading" type="primary" class="end-btn" @click="toStopStockBill"><i class="iconfont icon-stop" />终止盘点</el-button>
           <el-button :loading="crud.status.cu === 2" type="primary" @click="detailVisible=false">确定</el-button>
         </div>
       </div>
@@ -334,6 +334,7 @@ export default {
       blurryTime: null,
       tabIndex: 0,
       detailVisible: false,
+      stopLoading: false,
       dbRowData: {},
       detailInfo: {},
       taskStockLogData: [],
@@ -433,9 +434,10 @@ export default {
           this.ipStatusList = ipStatusList
           this.ipStatusFalse = this.ipStatusList.filter(item => !item.status)
           this.ipStatusFalseNum = this.ipStatusList.filter(item => !item.status).length
-          // this.reachable = [{ gridName: '111' }, { gridName: '222' }]
           this.reachable = stockInfo.reachable
           this.unreachable = stockInfo.unreachable
+          // 测试
+          // this.reachable = stockInfo.unreachable
           // this.unreachable = []
 
           if (stockInfo && this.reachable.length !== 0) {
@@ -598,6 +600,7 @@ export default {
           } else {
             this.$message({ message: res.message, type: 'error', offset: 8 })
           }
+          this.handleCloseDialog()
           this.crud.delAllLoading = false
         }).catch(err => {
           this.crud.delAllLoading = false
@@ -614,6 +617,7 @@ export default {
         type: 'warning',
         dangerouslyUseHTMLString: true
       }).then(() => {
+        this.stopLoading = true
         const params = {
           'id': this.dbRowData.billId
         }
@@ -625,10 +629,14 @@ export default {
           } else {
             this.$message({ message: res.message, type: 'error', offset: 8 })
           }
+          this.handleCloseDialog()
+          this.stopLoading = false
         }).catch(err => {
           console.log(err)
+          this.stopLoading = false
         })
       }).catch(() => {
+        this.stopLoading = false
       })
     }
   }
diff --git a/src/views/visualCheck/checkManage/dataScreening/module/form.vue b/src/views/visualCheck/checkManage/dataScreening/module/form.vue
index 41c5818..24fa1c9 100644
--- a/src/views/visualCheck/checkManage/dataScreening/module/form.vue
+++ b/src/views/visualCheck/checkManage/dataScreening/module/form.vue
@@ -209,9 +209,10 @@ export default {
         this.ipStatusList = ipStatusList
         this.ipStatusFalse = this.ipStatusList.filter(item => !item.status)
         this.ipStatusFalseNum = this.ipStatusList.filter(item => !item.status).length
-        // this.reachable = [{ gridName: '111' }, { gridName: '222' }]
         this.reachable = stockInfo.reachable
         this.unreachable = stockInfo.unreachable
+        // 测试
+        // this.reachable = stockInfo.unreachable
         // this.unreachable = []
 
         if (stockInfo && this.reachable.length !== 0) {