Merge remote-tracking branch 'origin/master'

src/pages/counter/list/index.vue

@@ -982,8 +982,10 @@ export default {
 
                         if(that.$refs.popUp) {
                             if(that.myMap) {
-                                that.outThingsGoods([that.goodsShelfTotalData[evt.oldIndex].id])
+                                const id = that.goodsShelfTotalData[evt.oldIndex].id
-                                that.pushThings({ idArr: [that.goodsShelfTotalData[evt.oldIndex].id], name: that.myMap})
+                                
+                                that.outThingsGoods([id])
+                                that.pushThings({ idArr: [id], name: that.myMap})
                             }else{
                                 for(var i=0;i<that.popArr.length;i++){
                                     if (that.goodsShelfTotalData[evt.oldIndex].name == that.popArr[i].name){
@@ -1238,8 +1240,10 @@ export default {
             }
             setTimeout(() => {
                 if(this.myMap) {
+                    console.log(item.id)
                     this.outThingsGoods([ item.id ])
                     this.pushThings({ idArr: [item.id], name: this.myMap})
+                    
                 }else {
                     const index = this.receptionList.findIndex(item2 => item2.id === item.id)
                     if(index === -1) {