From 792b663c0afd4f56339ea2657a35aa6b1eaf3a9c Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Wed, 5 Jan 2022 10:39:26 +0800
Subject: [PATCH] update

---
 src/pages/counter/list/index.vue | 395 ++++++++++++++++---------------
 src/store/modules/system.js      |   4 -
 2 files changed, 207 insertions(+), 192 deletions(-)

diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index bf69204..737bf10 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -537,6 +537,9 @@ export default {
         };
     },
     computed: {
+        businessKey() {
+            return this.$store.state.system.businessKey
+        },
         full: function () {// 全屏
             return this.$store.state.system.fullScreen;
         },
@@ -908,6 +911,7 @@ export default {
         goods:function () {/* 物品栏的物品 */
             return this.$store.state.system.goods
         },
+
         showGoods:function() {
             return this.$store.state.system.showGoods
         },
@@ -992,6 +996,7 @@ export default {
         }) 
     },
     mounted(){
+        this.showBusinessSelect(true)
         let that = this
         // 拖拽-物品栏
         new Sortable(this.$refs.goods, {
@@ -1097,11 +1102,24 @@ export default {
             }
         },
         selectBusiness(myKey) {
+            if(!myKey) {
+                this.$message({
+                    message: '请选择一个业务！',
+                    type: 'warning'
+                });
+                return 
+            }
             this.setBusinessKey(myKey)
-            console.log(this.goods2)
             this.showBusiness = false;
         },
         showBusinessSelect (judge) {
+            if(!judge && !this.businessKey) {
+                this.$message({
+                    message: '请选择一个业务！',
+                    type: 'warning'
+                });
+                return 
+            }
             this.showBusiness = judge;
         },
         dislodgeItem(index){
@@ -1422,7 +1440,6 @@ export default {
                     }
                 }else if (this.$store.state.system.id == '62,1'){
                 this.nbm = 62
-                console.log('62,11111111111111111111')
                 // this.goodsShelfTotalData = this.auditGoodsShelf
                 if (this.receptionList.length >0){
                     sessionStorage.setItem('accountVoucher', JSON.stringify(this.receptionList))
@@ -1455,197 +1472,199 @@ export default {
                             accountPasswordThree = this.passwordForm.passwordAgain
                             sessionStorage.setItem('accountPasswordThree', accountPasswordThree)
                         }
+                }else {
+                    let formList = []
+                    this.toggleGoods()
+                    this.$message.success(`${this.popText}操作成功！`)
+                    this.$store.commit('system/changePop',{show:false,text:''}) // 关闭弹窗
+                    console.log('---关闭弹窗')
+                    if (this.nbm == 0){ //用户
+                    }else if (this.nbm == 1){ //传票箱
+                        let projectId = sessionStorage.getItem('projectId')
+                        let startTime = sessionStorage.getItem('startTime')
+                        for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "285,287,4,"+this.receptionList[i].id,"type": ""})}
+                        let params= {
+                            parentId:'285,287,4',
+                            lcJudgmentRuleReq:formList,
+                            projectId:+projectId,
+                            startTime:startTime,
+                        }
+                        addOperation(params).then((data)=>{
+                            this.$message({
+                                message: '提交成功',
+                                type: 'success'
+                            });
+                        }).catch((error)=>{
+                        })
+                    }else if (this.nbm == 2){ //普通凭证箱
+                        let projectId = sessionStorage.getItem('projectId')
+                        let startTime = sessionStorage.getItem('startTime')
+                        for (var i=0;i<this.receptionList.length;i++){formList.push({ "answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285,287,3,"+this.receptionList[i].id, "type": "" })}
+                        let params= {
+                            parentId:'285,287,3',
+                            lcJudgmentRuleReq:formList,
+                            projectId:+projectId,
+                            startTime:startTime,
+                        }
+                        addOperation(params).then((data)=>{
+                            this.$message({
+                                message: '提交成功',
+                                type: 'success'
+                            });
+                        }).catch((error)=>{
+                        })
+                    }else if (this.nbm == 3){ //重要空白凭证箱
+                        let projectId = sessionStorage.getItem('projectId')
+                        let startTime = sessionStorage.getItem('startTime')
+                        for (var i=0;i<this.receptionList.length;i++){formList.push({ "answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285,287,2,"+this.receptionList[i].id, "type": "" })}
+                        let params= {
+                            parentId:'285,287,2',
+                            lcJudgmentRuleReq:formList,
+                            projectId:+projectId,
+                            startTime:startTime,
+                        }
+                        addOperation(params).then((data)=>{
+                            this.$message({
+                                message: '提交成功',
+                                type: 'success'
+                            });
+                        }).catch((error)=>{
+                        })
+                    }else if (this.nbm == 4){ //钱箱
+                        let projectId = sessionStorage.getItem('projectId')
+                        let startTime = sessionStorage.getItem('startTime')
+                        let formList = [];
+                        for (var i=0;i<this.receptionList.length;i++){formList.push({
+                            "answerId":this.receptionList[i].id,
+                            "emptyOne": "",
+                            "emptyTwo": "",
+                            "operationIds": "285,287,1,"+this.receptionList[i].id,
+                            "type": "" })}
+                        let params= {
+                            parentId:'285,287,1',
+                            lcJudgmentRuleReq:formList,
+                            projectId:+projectId,
+                            startTime:startTime,
+                        }
+                        addOperation(params).then((data)=>{
+                            this.$message({
+                                message: '提交成功',
+                                type: 'success'
+                            });
+                        }).catch((error)=>{
+                        })
+                    }else if (this.nbm == 5){ //印章盒
+                        let projectId = sessionStorage.getItem('projectId')
+                        let startTime = sessionStorage.getItem('startTime')
+                        for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285,287,8,"+this.receptionList[i].id,"type": ""})}
+                        let params= {
+                            parentId:'285,287,8',
+                            lcJudgmentRuleReq:formList,
+                            projectId:+projectId,
+                            startTime:startTime,
+                        }
+                        addOperation(params).then((data)=>{
+                            this.$message({
+                                message: '提交成功',
+                                type: 'success'
+                            });
+                        }).catch((error)=>{
+                        })
+                    }else if (this.nbm == 6){ //验钞机
+                        let projectId = sessionStorage.getItem('projectId')
+                        let startTime = sessionStorage.getItem('startTime')
+                        for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285,287,9,"+this.receptionList[i].id,"type": ""})}
+                        let params= {
+                            parentId:'285,287,9',
+                            lcJudgmentRuleReq:formList,
+                            projectId:+projectId,
+                            startTime:startTime,
+                        }
+                        addOperation(params).then((data)=>{
+                            this.$message({
+                                message: '提交成功',
+                                type: 'success'
+                            });
+                        }).catch((error)=>{
+                        })
+                    }else if (this.nbm == 7){ //打印机
+                        let projectId = sessionStorage.getItem('projectId')
+                        let startTime = sessionStorage.getItem('startTime')
+                        for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285,287,10,"+this.receptionList[i].id,"type": ""})}
+                        let params= {
+                            parentId:'0,10',
+                            lcJudgmentRuleReq:formList,
+                            projectId:+projectId,
+                            startTime:startTime,
+                        }
+                        addOperation(params).then((data)=>{
+                            this.$message({
+                                message: '提交成功',
+                                type: 'success'
+                            });
+                        }).catch((error)=>{
+                        })
+                    }else if (this.nbm == 9){//资料
+                        let projectId = sessionStorage.getItem('projectId')
+                        let startTime = sessionStorage.getItem('startTime')
+                        for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,11,"+this.receptionList[i].id,"type": ""})}
+                        let params= {
+                            parentId:'0,11',
+                            lcJudgmentRuleReq:formList,
+                            projectId:+projectId,
+                            startTime:startTime,
+                        }
+                        addOperation(params).then((data)=>{
+                            this.$message({
+                                message: '提交成功',
+                                type: 'success'
+                            });
+                        }).catch((error)=>{
+                        })
+                    }else if (this.nbm == 10){ //刷卡器
+                        let projectId = sessionStorage.getItem('projectId')
+                        let startTime = sessionStorage.getItem('startTime')
+                        for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,6,"+this.receptionList[i].id,"type": ""})}
+                        let params= {
+                            parentId:'0,6',
+                            lcJudgmentRuleReq:formList,
+                            projectId:+projectId,
+                            startTime:startTime,
+                        }
+                        addOperation(params).then((data)=>{
+                            this.$message({
+                                message: '提交成功',
+                                type: 'success'
+                            });
+                        }).catch((error)=>{
+                        })
+                    }else if (this.nbm == 11){ //身份证扫描仪
+                        let projectId = sessionStorage.getItem('projectId')
+                        let startTime = sessionStorage.getItem('startTime')
+                        for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,7,"+this.receptionList[i].id,"type": ""})}
+                        let params= {
+                            parentId:'0,7',
+                            lcJudgmentRuleReq:formList,
+                            projectId:+projectId,
+                            startTime:startTime,
+                        }
+                        addOperation(params).then((data)=>{
+                            this.$message({
+                                message: '提交成功',
+                                type: 'success'
+                            });
+                        }).catch((error)=>{
+                        })
+                    }else{
+                        this.goodsShelfTotalData = this.auditGoodsShelf
+                        
+                    }
                 }
             }
 
 
 
-            let formList = []
-            this.toggleGoods()
-            this.$message.success(`${this.popText}操作成功！`)
-            this.$store.commit('system/changePop',{show:false,text:''}) // 关闭弹窗
-            console.log('---关闭弹窗')
-            if (this.nbm == 0){ //用户
-            }else if (this.nbm == 1){ //传票箱
-                let projectId = sessionStorage.getItem('projectId')
-                let startTime = sessionStorage.getItem('startTime')
-                for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "285,287,4,"+this.receptionList[i].id,"type": ""})}
-                let params= {
-                    parentId:'285,287,4',
-                    lcJudgmentRuleReq:formList,
-                    projectId:+projectId,
-                    startTime:startTime,
-                }
-                addOperation(params).then((data)=>{
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                }).catch((error)=>{
-                })
-            }else if (this.nbm == 2){ //普通凭证箱
-                let projectId = sessionStorage.getItem('projectId')
-                let startTime = sessionStorage.getItem('startTime')
-                for (var i=0;i<this.receptionList.length;i++){formList.push({ "answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285,287,3,"+this.receptionList[i].id, "type": "" })}
-                let params= {
-                    parentId:'285,287,3',
-                    lcJudgmentRuleReq:formList,
-                    projectId:+projectId,
-                    startTime:startTime,
-                }
-                addOperation(params).then((data)=>{
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                }).catch((error)=>{
-                })
-            }else if (this.nbm == 3){ //重要空白凭证箱
-                let projectId = sessionStorage.getItem('projectId')
-                let startTime = sessionStorage.getItem('startTime')
-                for (var i=0;i<this.receptionList.length;i++){formList.push({ "answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285,287,2,"+this.receptionList[i].id, "type": "" })}
-                let params= {
-                    parentId:'285,287,2',
-                    lcJudgmentRuleReq:formList,
-                    projectId:+projectId,
-                    startTime:startTime,
-                }
-                addOperation(params).then((data)=>{
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                }).catch((error)=>{
-                })
-            }else if (this.nbm == 4){ //钱箱
-                let projectId = sessionStorage.getItem('projectId')
-                let startTime = sessionStorage.getItem('startTime')
-                let formList = [];
-                for (var i=0;i<this.receptionList.length;i++){formList.push({
-                    "answerId":this.receptionList[i].id,
-                    "emptyOne": "",
-                    "emptyTwo": "",
-                    "operationIds": "285,287,1,"+this.receptionList[i].id,
-                    "type": "" })}
-                let params= {
-                    parentId:'285,287,1',
-                    lcJudgmentRuleReq:formList,
-                    projectId:+projectId,
-                    startTime:startTime,
-                }
-                addOperation(params).then((data)=>{
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                }).catch((error)=>{
-                })
-            }else if (this.nbm == 5){ //印章盒
-                let projectId = sessionStorage.getItem('projectId')
-                let startTime = sessionStorage.getItem('startTime')
-                for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285,287,8,"+this.receptionList[i].id,"type": ""})}
-                let params= {
-                    parentId:'285,287,8',
-                    lcJudgmentRuleReq:formList,
-                    projectId:+projectId,
-                    startTime:startTime,
-                }
-                addOperation(params).then((data)=>{
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                }).catch((error)=>{
-                })
-            }else if (this.nbm == 6){ //验钞机
-                let projectId = sessionStorage.getItem('projectId')
-                let startTime = sessionStorage.getItem('startTime')
-                for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285,287,9,"+this.receptionList[i].id,"type": ""})}
-                let params= {
-                    parentId:'285,287,9',
-                    lcJudgmentRuleReq:formList,
-                    projectId:+projectId,
-                    startTime:startTime,
-                }
-                addOperation(params).then((data)=>{
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                }).catch((error)=>{
-                })
-            }else if (this.nbm == 7){ //打印机
-                let projectId = sessionStorage.getItem('projectId')
-                let startTime = sessionStorage.getItem('startTime')
-                for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285,287,10,"+this.receptionList[i].id,"type": ""})}
-                let params= {
-                    parentId:'0,10',
-                    lcJudgmentRuleReq:formList,
-                    projectId:+projectId,
-                    startTime:startTime,
-                }
-                addOperation(params).then((data)=>{
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                }).catch((error)=>{
-                })
-            }else if (this.nbm == 9){//资料
-                let projectId = sessionStorage.getItem('projectId')
-                let startTime = sessionStorage.getItem('startTime')
-                for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,11,"+this.receptionList[i].id,"type": ""})}
-                let params= {
-                    parentId:'0,11',
-                    lcJudgmentRuleReq:formList,
-                    projectId:+projectId,
-                    startTime:startTime,
-                }
-                addOperation(params).then((data)=>{
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                }).catch((error)=>{
-                })
-            }else if (this.nbm == 10){ //刷卡器
-                let projectId = sessionStorage.getItem('projectId')
-                let startTime = sessionStorage.getItem('startTime')
-                for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,6,"+this.receptionList[i].id,"type": ""})}
-                let params= {
-                    parentId:'0,6',
-                    lcJudgmentRuleReq:formList,
-                    projectId:+projectId,
-                    startTime:startTime,
-                }
-                addOperation(params).then((data)=>{
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                }).catch((error)=>{
-                })
-            }else if (this.nbm == 11){ //身份证扫描仪
-                let projectId = sessionStorage.getItem('projectId')
-                let startTime = sessionStorage.getItem('startTime')
-                for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,7,"+this.receptionList[i].id,"type": ""})}
-                let params= {
-                    parentId:'0,7',
-                    lcJudgmentRuleReq:formList,
-                    projectId:+projectId,
-                    startTime:startTime,
-                }
-                addOperation(params).then((data)=>{
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
-                    });
-                }).catch((error)=>{
-                })
-            }else{
-                this.goodsShelfTotalData = this.auditGoodsShelf
-                
-            }
+            
         
             this.$store.commit('system/changePop', {show: false, text: ''})
         
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 2951f6d..d455419 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -31,10 +31,6 @@ export default {
         businessKey: '',
         
         businessSelect: {
-            '': {
-                data: [],
-                needs: []
-            },
             '项目一': {
                 data: [15, 13, 23, 14],
                 needs: [16, 17]