From ac111cac2389cabc7eb1c8776b9edb59157a7acf Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Thu, 6 Jan 2022 18:22:10 +0800
Subject: [PATCH] update

---
 src/pages/counter/list/index.vue | 64 ++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 8676a33..4bb2e8e 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -172,6 +172,28 @@
                     </div>
                 </div>
             </div>
+
+            <div v-else-if="popText==='身份证扫描仪'" class="list" ref="popUp">
+                <div class="img-wrap" :class="{ checked: commonChecked.includes(item.id),'img-wrap':true }" @click='dislodgeItem(item.id)' v-for="(item) in  receptionList" :key="item.id">
+                    <img :src="item.src" class="file"  alt="" />
+                    <p class="text">{{item.name}}</p>
+                </div>
+            </div>
+
+            <div v-else-if="popText==='身份证扫描器'" class="list" ref="popUp">
+                <div class="img-wrap" :class="{ checked: commonChecked.includes(item.id),'img-wrap':true }" @click='dislodgeItem(item.id)' v-for="(item) in  receptionList" :key="item.id">
+                    <img :src="item.src" class="file"  alt="" />
+                    <p class="text">{{item.name}}</p>
+                </div>
+            </div>
+
+            <div v-else-if="popText==='刷卡器'" class="list" ref="popUp">
+                <div class="img-wrap" :class="{ checked: commonChecked.includes(item.id),'img-wrap':true }" @click='dislodgeItem(item.id)' v-for="(item) in  receptionList" :key="item.id">
+                    <img :src="item.src" class="file"  alt="" />
+                    <p class="text">{{item.name}}</p>
+                </div>
+            </div>
+
             <!-- 暂时未确定是否公共使用一个弹框  receptionList-->
             <div v-else class="list" ref="popUp"><!-- 钱箱 / 传票栏 ... 一系列可存物品弹框  -->
                 <div class="img-wrap" :class="{ checked: commonChecked.includes(item.id),'img-wrap':true }" @click='dislodgeItem(item.id)' v-for="(item) in  goodState" :key="item.id">
@@ -1050,7 +1072,7 @@ export default {
                         // console.log(that.goodsShelfTotalData[evt.oldIndex].name,'执行拖拽2');
                         // that.clickList.push(that.goodsShelfTotalData[evt.oldIndex].name)
 
-                        if(that.$refs.popUp) {
+                        if(that.$refs.popUp && that.myMap) {
                             const index = that.goodState.findIndex(item => item.id === that.goodsShelfTotalData[evt.oldIndex].id)
                             if(index !== -1) {
                                 return
@@ -1087,6 +1109,24 @@ export default {
 
                             that.pushThings({ idArr: that.goodsShelfTotalData[evt.oldIndex].id, name: that.myMap})
                             that.outThingsGoods([that.goodsShelfTotalData[evt.oldIndex].id])
+                        }else{
+                            for(var i=0;i<that.popArr.length;i++){
+                                if (that.goodsShelfTotalData[evt.oldIndex].name == that.popArr[i].name){
+                                    if (that.receptionList == null){
+                                        that.receptionList = []
+                                    }
+                                    if (that.receptionList.length){
+                                        for(var j=0;j< that.receptionList.length;j++){
+                                            if (that.receptionList[j].name == that.goodsShelfTotalData[evt.oldIndex].name){
+                                                return;
+                                            }
+                                        }
+                                        that.receptionList.push(that.popArr[i])
+                                    }else{
+                                        that.receptionList.push(that.popArr[i])
+                                    }
+                                }
+                            }
                         }
                         
                     }
@@ -1215,6 +1255,8 @@ export default {
                 // }
             }else {
                 // 
+                const index = this.receptionList.findIndex(item => item.id === id)
+                this.receptionList.splice(index,1);
             }
             // this.receptionList.splice(index,1);
         },
@@ -1432,25 +1474,9 @@ export default {
                 
                 const sealArr = [...this.sealChecked]
                 this.stampJudge(sealArr)
-            }
-            // else if(this.popText == '钱箱') {
-            //     for(let i=0; i<this.receptionList.length; i++) {
-            //         if(this.receptionList[i].id === 15) {
-            //             this.payMoney()
-            //             break;
-            //         }
-            //         // this.moneyBox.splice(0, this.moneyBox.length, ...this.receptionList)
-            //     }
-            // }else if(this.popText == '客户签字') {
-            //     const idArr = this.receptionList.map(item => item.id)
-            //     this.backPeople(idArr)
-            //     // this.stampJudge()
-            // }else if(this.popText == '传票栏') {
-            //     const idArr = this.receptionList.map(item => item.id)
-            //     this.backCulture(idArr)
-            // }
-            else{
+            }else{
                 // this.goodsShelfTotalData = this.auditGoodsShelf
+                console.log(this.receptionList)
                 if (this.$store.state.system.id == '33'){
                     this.nbm = 33
                     // this.goodsShelfTotalData = this.auditGoodsShelf