From e06f6973ea7d45011c1c51227e35c4fbb729f9f6 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Fri, 7 Jan 2022 11:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=85=AD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/counter/list/index.vue |  59 ++++++++--------
 src/store/modules/system.js      | 111 ++++++++++++++++++++++++++-----
 test.js                          |  29 ++++++++
 3 files changed, 156 insertions(+), 43 deletions(-)

diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 4bb2e8e..2f43f2d 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -476,6 +476,9 @@ export default {
                 {name:'利息清单凭证联',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单凭证联'},
                 {name:'利息清单回单',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单回单'},
                 {name:'盖过章的复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:231},
+                {name:'新定期存单',src:require('@/assets/img/seal/paid.png'),id:192},
+                {name:'新定期存单凭证联',src:require('@/assets/img/seal/paid.png'),id:193},
+                {name:'新定期存单回单',src:require('@/assets/img/seal/paid.png'),id:194},
             ],
           receptionList:[
 
@@ -496,6 +499,7 @@ export default {
                 {name:'转账支票',src:require('@/assets/img/goods/xd-zzzp.png'),id:'转账支票'},
                 {name:'银行承兑汇票',src:require('@/assets/img/seal/paid.png'),id:30},
                 {name:'现金支票',src:require('@/assets/img/goods/xjzp.png'),id:'现金支票'},
+                {name:'新定期存单',src:require('@/assets/img/seal/paid.png'),id:192},
             ],
             commonArr:[/* 普通凭证箱 */
                 {name:'存款凭条',src:require('@/assets/img/goods/ckpt.png'),id:17},
@@ -954,7 +958,7 @@ export default {
             }else if(this.popText === '客户签字'){
                 return 'peopleSign'
             }else if(this.popText == '传票栏') {
-                return 'cultureArr'
+                return 'cultureIn'
             }else if(this.popText == '印章盒') {
                 return 'sealBox'
             }else {
@@ -1072,14 +1076,35 @@ export default {
                         // console.log(that.goodsShelfTotalData[evt.oldIndex].name,'执行拖拽2');
                         // that.clickList.push(that.goodsShelfTotalData[evt.oldIndex].name)
 
-                        if(that.$refs.popUp && that.myMap) {
-                            const index = that.goodState.findIndex(item => item.id === that.goodsShelfTotalData[evt.oldIndex].id)
-                            if(index !== -1) {
-                                return
+                        if(that.$refs.popUp) {
+                            if(that.myMap) {
+                                const index = that.goodState.findIndex(item => item.id === that.goodsShelfTotalData[evt.oldIndex].id)
+                                if(index !== -1) {
+                                    return
+                                }
+                                that.pushThings({ idArr: that.goodsShelfTotalData[evt.oldIndex].id, name: that.myMap})
+                                // that.tmpBox.push(that.goodsShelfTotalData[evt.oldIndex].id)
+                                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])
+                                        }
+                                    }
+                                }
                             }
-                            that.pushThings({ idArr: that.goodsShelfTotalData[evt.oldIndex].id, name: that.myMap})
-                            // that.tmpBox.push(that.goodsShelfTotalData[evt.oldIndex].id)
-                            that.outThingsGoods([that.goodsShelfTotalData[evt.oldIndex].id])
+                            
                             // for(var i=0;i<that.popArr.length;i++){
                             //     if (that.goodsShelfTotalData[evt.oldIndex].name == that.popArr[i].name){
                             //         if (that.receptionList == null){
@@ -1109,24 +1134,6 @@ 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])
-                                    }
-                                }
-                            }
                         }
                         
                     }
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index cc3534b..633f335 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -31,6 +31,10 @@ const allGoods = {
     '利息清单凭证联': {name:'利息清单凭证联',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单凭证联'},
     '利息清单回单': {name:'利息清单回单',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单回单'},
     231: {name:'盖过章的复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:231},
+    191: {name:'旧定期存单',src:require('@/assets/img/seal/paid.png'),id:191},
+    192: {name:'新定期存单',src:require('@/assets/img/seal/paid.png'),id:192},
+    193: {name:'新定期存单凭证联',src:require('@/assets/img/seal/paid.png'),id:193},
+    194: {name:'新定期存单回单',src:require('@/assets/img/seal/paid.png'),id:194},
 }
 
 import { Message } from 'element-ui';
@@ -54,8 +58,9 @@ export default {
                 data: [15, 13, 23, 14],
                 needs: [16, 17],
                 isStamp: {
-                    '业务专用章': [14, 17],
-                    '附件章': [23]
+                    '业务专用章': [14],
+                    '附件章': [23],
+                    '收讫章': [ 17 ]
                 },
                 backPeople: [142, 13, 172, 16],
                 cultureArr: [23, 141, 171],
@@ -95,6 +100,71 @@ export default {
                 cultureIn: [], // 传票栏传票栏
                 sealBox: [] // 印章盒
             },
+            '项目四': {
+                data: [13, 23, 191], // 身份证原件、复印件、 旧定期存单
+                needs: [192, '取款凭条', 17, 15 ], // 新定期存单 取款凭条 存款凭条 现金
+                isStamp: {
+                    '业务专用章': [192],
+                    '付讫章': [ '取款凭条', '利息清单' ],
+                    '收讫章': [ 17 ],
+                    '销户章': [ 191 ],
+                    '附件章': [ 23 ],
+                    // 取款凭条（付讫章）、利息清单（付讫章）、存款凭条（收讫章）、旧定期存单（销户章）、新定期存单（业务专用章）、身份证复印件（附件章）
+                },
+                backPeople: [ 13, 192, 15, '取款凭条回单', 172, '利息清单回单' ], // 
+                cultureArr: [ 23, 191, '取款凭条凭证联', 171, '利息清单凭证联' ], // 
+                // 各种物品信息
+                moneyBox: [ 15 ], // 钱箱
+                peopleSign: [], // 客户签字
+                cultureIn: [], // 传票栏
+                sealBox: [] // 印章盒
+            },
+            '项目五': {
+                data: [13, 23, 191], // 身份证原件、复印件、 旧定期存单
+                needs: [192, '取款凭条', 17, 15 ], // 新定期存单 取款凭条 存款凭条 现金
+                isStamp: { 
+                    '付讫章': [ '取款凭条', '利息清单' ],
+                    '销户章': [ 191 ],
+                    '附件章': [ 23 ],
+                },
+                backPeople: [ 13, 192, 15, '取款凭条回单', 172, '利息清单回单' ], // 
+                cultureArr: [ 23, 191, '取款凭条凭证联', 171, '利息清单凭证联' ], // 
+                // 各种物品信息
+                moneyBox: [ 15 ], // 钱箱
+                peopleSign: [], // 客户签字
+                cultureIn: [], // 传票栏
+                sealBox: [] // 印章盒
+            },
+            '项目六': {
+                data: [13, 23, 14, 15], // 身份证原件、复印件、 开户申请书、 现金
+                needs: [ 16, 17 ], // 银行卡 存款凭条
+                isStamp: { // 还没加逻辑
+                    '附件章': [ 23 ],
+                    '业务专用章': [14],
+                    '收讫章': [ 17 ],
+                },
+                backPeople: [ 16, 172, 13, 142 ], 
+                cultureArr: [ 23, 141, 171 ], 
+                // 各种物品信息
+                moneyBox: [ ], // 钱箱
+                peopleSign: [], // 客户签字
+                cultureIn: [], // 传票栏
+                sealBox: [] // 印章盒
+            },
+            '项目七': {
+                data: [  16, 15 ], // 银行卡、 现金
+                needs: [ 17 ], // 存款凭条
+                isStamp: { 
+                    '收讫章': [ 17 ],
+                },
+                backPeople: [ 16, 172 ], 
+                cultureArr: [ 171 ], 
+                // 各种物品信息
+                moneyBox: [ ], // 钱箱
+                peopleSign: [ ], // 客户签字
+                cultureIn: [], // 传票栏
+                sealBox: [] // 印章盒
+            },
         },
         goods:[// 物品栏的物品
             {
@@ -209,45 +279,52 @@ export default {
         stampJudge(state, sealArr) {
             const needStamp = state.businessSelect[state.businessKey].isStamp
             const id = state.businessSelect[state.businessKey].sealBox[0]
-            let judge = true
+            let judgeDelete = true
             for(let i=0; i<sealArr.length; i++ ) {
                 const seal = sealArr[i]
                 if(seal in needStamp && needStamp[seal].includes(id)) {
-                    
-                    const index = state.businessSelect[state.businessKey].data.findIndex(item => item === id)
                     if(seal === '业务专用章') {
                         if(id === 14) {
                             state.businessSelect[state.businessKey].data.push(141, 142)
-                        }
-                        else if(id === 17) {
-                            state.businessSelect[state.businessKey].data.push(171, 172)
+                            judgeDelete = false // 有些东西改了没变的 所以不能写在最下面
+                        }else if(id === '192') {
+                            console.log('加分 没变成什么')
+                            // state.businessSelect[state.businessKey].data.push('193', '194')
+                            // judgeDelete = false
                         }
                     }else if(seal === '付讫章') {
                         if(id === '取款凭条') {
-                            // state.businessSelect[state.businessKey].data.splice(index, 1, '取款凭条凭证联', '取款凭条回单')
                             state.businessSelect[state.businessKey].data.push('取款凭条凭证联', '取款凭条回单')
+                            judgeDelete = false
                         }
                         else if(id === '利息清单') {
-                            // state.businessSelect[state.businessKey].data.splice(index, 1, '利息清单凭证联', '利息清单回单')
                             state.businessSelect[state.businessKey].data.push('利息清单凭证联', '利息清单回单')
+                            judgeDelete = false
                         }
                     }else if(seal === '转讫章') {
                         if(id === '转账凭条') {
-                            // state.businessSelect[state.businessKey].data.splice(index, 1, '转账凭条凭证联', '转账凭条回单')
                             state.businessSelect[state.businessKey].data.push('转账凭条凭证联', '转账凭条回单')
+                            judgeDelete = false
                         }
                     }else if(seal === '附件章') {
                         if(id === 23) {
-                            // state.businessSelect[state.businessKey].data.splice(index, 1, 231)
-                            state.businessSelect[state.businessKey].data.push(231)
+                            console.log('加分了 没变成什么')
+                            // state.businessSelect[state.businessKey].data.push(231)
+                            // judgeDelete = false
+                        }
+                    }else if(seal === '收讫章') {
+                        if(id === 17) {
+                            state.businessSelect[state.businessKey].data.push(171, 172)
+                            judgeDelete = false
+                        }
+                    }else if(seal === '销户章') {
+                        if(id === '191') {
+                            console.log('加分了 没变成什么')
                         }
                     }
-                    judge = false
                 }
             }
-            if(judge) {
-                console.log('xsws')
-                console.log(sealArr)
+            if(judgeDelete) {
                 this.commit('system/pushThingsGoods', [...state.businessSelect[state.businessKey].sealBox])
             }
             state.businessSelect[state.businessKey].sealBox.splice(0, 1)
diff --git a/test.js b/test.js
index e69de29..f041cfc 100644
--- a/test.js
+++ b/test.js
@@ -0,0 +1,29 @@
+16: {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16},
+    19: {name:'定期存单',src:require('@/assets/img/seal/paid.png'),id:19},
+    '预留印签卡': {name:'预留印签卡',src:require('@/assets/img/seal/paid.png'),id:'预留印签卡'},
+    '转账支票': {name:'转账支票',src:require('@/assets/img/goods/xd-zzzp.png'),id:'转账支票'},
+    30: {name:'银行承兑汇票',src:require('@/assets/img/seal/paid.png'),id:30},
+    '现金支票': {name:'现金支票',src:require('@/assets/img/goods/xjzp.png'),id:'现金支票'},
+    '取款凭条': {name:'取款凭条',src:require('@/assets/img/goods/qkpt.png'),id:'取款凭条'},
+    '转账凭条': {name:'转账凭条',src:require('@/assets/img/goods/zzpt.png'),id:'转账凭条'},
+    '业务收费凭证': {name:'业务收费凭证',src:require('@/assets/img/goods/ywsfpz.png'),id:'业务收费凭证'},
+    '利息清单': {name:'利息清单',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单'},
+    '普通空白凭证': {name:'普通空白凭证',src:require('@/assets/img/goods/ptkbpz.png'),id:'普通空白凭证'},
+    13: {name:'身份证',src:require('@/assets/img/goods/idcard.png'),id:13},
+    23: {name:'身份证复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:23},
+    14: {name:'开户申请书',src:require('@/assets/img/goods/khsqs.png'),id:14},
+    15: {name:'现金',src:require('@/assets/img/goods/cash-sm.png'),id:15},
+    17: {name:'存款凭条',src:require('@/assets/img/goods/ckpt.png'),id:17},
+
+    // 以下是我自己加的id 本来没有的 业务需要
+    141: {name:'开户申请书凭证联',src:require('@/assets/img/goods/khsqs.png'),id:141},
+    142: {name:'开户申请书回单',src:require('@/assets/img/goods/khsqs.png'),id:142},
+    171: {name:'存款凭条凭证联',src:require('@/assets/img/goods/ckpt.png'),id:171},
+    172: {name:'存款凭条回单',src:require('@/assets/img/goods/ckpt.png'),id:172},
+    '取款凭条凭证联': {name:'取款凭条凭证联',src:require('@/assets/img/goods/qkpt.png'),id:'取款凭条凭证联'},
+    '取款凭条回单': {name:'取款凭条回单',src:require('@/assets/img/goods/qkpt.png'),id:'取款凭条回单'},
+    '转账凭条凭证联': {name:'转账凭条凭证联',src:require('@/assets/img/goods/zzpt.png'),id:'转账凭条凭证联'},
+    '转账凭条回单': {name:'转账凭条回单',src:require('@/assets/img/goods/zzpt.png'),id:'转账凭条回单'},
+    '利息清单凭证联': {name:'利息清单凭证联',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单凭证联'},
+    '利息清单回单': {name:'利息清单回单',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单回单'},
+    231: {name:'盖过章的复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:231},
\ No newline at end of file