From 944bc4e8dee43a28ea18f4ebcd8e24c0333b0ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 16 May 2024 16:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pad=E3=80=91kitting=E7=BB=84?=
 =?UTF-8?q?=E5=8C=85=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/padManage/isPadForKittingPack.vue   | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/fe/PC/src/views/padManage/isPadForKittingPack.vue b/fe/PC/src/views/padManage/isPadForKittingPack.vue
index 9a76ae3ed..279eb645c 100644
--- a/fe/PC/src/views/padManage/isPadForKittingPack.vue
+++ b/fe/PC/src/views/padManage/isPadForKittingPack.vue
@@ -3,6 +3,7 @@
     <div class="isPadForKittingPackPage">
       <!-- 左侧按钮 -->
       <div class="leftBtns">
+        【{{loginName}}】您好！
         <div 
           v-for="(item,index) of leftButtons" 
           :key="index"
@@ -32,7 +33,7 @@
               }"
               :key="index"
               @click="selectCenterChassis(item,index)"
-            >{{ item.chassisNumber }}</li>
+            >{{ item.chassisNumber }} ({{item.itemCode}})</li>
           </ul>
           <div class="noDataTipper" v-if="centerChassisList.length <= 0">暂无数据</div>
           <div class="footer-button"><el-button :disabled="isLock" type="primary" @click="createChassisHandle()">创建底盘组</el-button></div>
@@ -76,12 +77,7 @@
                 ></el-table-column>
                 <el-table-column
                   prop="qty"
-                  label="底盘组物品数量"
-                ></el-table-column>
-                <!-- todo: Kiting组数量字段确定-->
-                <el-table-column
-                  prop="qty1"
-                  label="Kiting组数量"
+                  label="KittingBom数量"
                 ></el-table-column>
               </el-table>
             </div>
@@ -104,6 +100,7 @@ export default {
   name: "isPadForKittingPack",
   data() {
     return {
+      loginName:store.getters.name.name,
       loading:false,
       // 循环数据定时器
       intervalId:false,
@@ -162,9 +159,7 @@ export default {
         MaxResultCount: 9999,
       }
       this.loading = true
-      console.log(111)
       return getPageList(_data, 'auth/auth/page-lock')
-      console.log(222)
     },
     // 左侧按钮点击事件 -获取是否锁定
     async getPageLockList(selectItem){
@@ -352,9 +347,31 @@ export default {
       });
     },
     // 完成该组底盘
-    finishChassisHandle(){
+    async finishChassisHandle(){
       if(this.isLock)return
-      this.$confirm('是否确定完成该组底盘', '提示', {
+      // 先判断是否别人锁定，如果是别人锁定，踢出
+      let _filter= [
+        {
+          logic: "And",
+          column: "menuCode",
+          action: "==",
+          value: this.$route.name + '_' + this.currentKittingInfo.code,
+        },
+        {
+          logic: "And",
+          column: "userAccount",
+          action: "!=",
+          value: store.getters.name.name,
+        }
+      ]
+      let _lockList = await this.getPageLockListHttp(_filter) 
+      this.loading = false
+      if(_lockList && _lockList.items && _lockList.items.length > 0){
+        this.$errorMsg(this.lockTip)
+        this.isLock=true
+        return
+      }
+      this.$confirm('是否确定完成该组底盘？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'