From 7bf761f5af0e161dfa6c3b0520df7ebfd88c7b82 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Tue, 1 Mar 2022 18:29:06 +0800
Subject: [PATCH] update

---
 src/App.vue                        |  7 ++++-
 src/components/tipDialog/index.vue |  1 +
 src/pages/counter/list/index.vue   | 50 +++++++++++++++++++++++++-----
 src/utils/utilFunction.js          |  2 +-
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 33d7018..4c1245f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,7 @@
             <select-business class="selectBusiness" :showIt.sync="showIt" v-show="!showIt && showBusiness" />
             <router-view></router-view>
             <vCase :showIt.sync="showIt"></vCase>
-            <tip-dialog />
+            <tip-dialog class="Z-9999" />
     </div>
 </template>
 <script>
@@ -93,4 +93,9 @@
 .fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
   opacity: 0;
 }
+
+.Z-9999 {
+    position: absolute;
+    z-index: 9999;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/tipDialog/index.vue b/src/components/tipDialog/index.vue
index 1183764..4d169e9 100644
--- a/src/components/tipDialog/index.vue
+++ b/src/components/tipDialog/index.vue
@@ -61,6 +61,7 @@ export default {
 <style lang='scss' scoped>
     /deep/.data-dia{
         // width:80%;
+        position: relative;
         width: 800px;
         min-width:400px;
         margin: auto;
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index f81a012..063aed1 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -3,7 +3,8 @@
         <back-Button />
        <!-- <img class="sth bg" v-lazy="lazyImg[2]" alt="" /> -->
         <!-- <img class="sth guide" src="@/assets/img/guide.png" alt="" /> -->
-        <img class="sth man cp" v-lazy="lazyImg[0]" alt=""  @click="changePeopleJudge"/>
+        <!-- <img class="sth man cp" v-lazy="lazyImg[0]" alt=""  @click="changePeopleJudge"/> -->
+        <img slot="reference" class="sth man cp" v-lazy="lazyImg[0]" alt=""  @click="changePeopleJudge"/>
         <img class="sth counter" v-lazy="lazyImg[1]" alt="" />
         <img class="sth glass" v-lazy="lazyImg[2]" alt="" @click="changePeopleJudge"/>
 
@@ -310,11 +311,11 @@
         <el-dialog
             title="客户对话中..."
             :visible.sync="peopleJudge"
-            custom-class="2xl:w-7/12 xl:w-9/12 lg:w-full h-auto rounded-2xl border-2 border-gray-600 border-dashed"
+            custom-class="2xl:w-7/12 xl:w-9/12 lg:w-full h-auto rounded-2xl border-2 border-gray-600"
             center>
             <h3 class="text-4xl antialiased text-center">客户: 你好!我现在该做什么呢？</h3>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="peopleDoing(1)">找我签字</el-button>
+                <el-button @click="peopleDoing(1)">找他签字</el-button>
                 <el-button type="primary" @click="peopleDoing(2)">返还资料</el-button>
             </span>
         </el-dialog>
@@ -626,6 +627,8 @@ export default {
                 
             this.$refs.dataDia
             this.receptionList = []
+            this.passwordForm.passwordAgain = ''
+            this.passwordForm.password2 = ''
             if(!this.showGoods) this.checkList = []
             return this.$store.state.system.showPop;
             // 以下代码是之前的，想用来存刷过的证
@@ -1527,10 +1530,20 @@ export default {
                 //     }
                 // }
                 if(this.passwordForm.passwordAgain.length !== 6) {
-                    this.setTipsOperate('您输入的密码不足6位!')
+                    this.$message({
+                        center: true,
+                        showClose: true,
+                        message: '您输入的密码不足6位!',
+                        type: 'error'
+                    });
                     return
                 }else if(this.passwordForm.password2 !== this.passwordForm.passwordAgain) {
-                    this.setTipsOperate('您输入的密码和确认密码不一致!')
+                    this.$message({
+                        center: true,
+                        showClose: true,
+                        message: '您输入的密码和确认密码不一致!',
+                        type: 'error'
+                    });
                     return
                 }
             }else if(this.popText.includes('身份证扫描')) {
@@ -1755,6 +1768,7 @@ export default {
                     })
                 }else if (this.popText === '密码器') {
                     this.setTipsOperate('输入密码成功!')
+                    
                 }
                 // this.showGoods = false
                 this.changeShowGoods(false)
@@ -1800,6 +1814,10 @@ export default {
                         })
                     }
                 }else if (this.nbm == 1){ //传票栏
+                    if(this.goodState.length === 0) {
+                        this.setTipsOperate('传票栏中未放入物品!')
+                        return
+                    }
                     let projectId = sessionStorage.getItem('projectId')
                     let startTime = sessionStorage.getItem('startTime')
                     for (var i=0;i<this.goodState.length;i++){formList.push({"answerId":this.goodState[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,4,"+this.goodState[i].id,"type": ""})}
@@ -1949,6 +1967,15 @@ export default {
                     // this.sealChecked = []
                     // this.$store.commit('system/changePop', {show: false, text: ''})
                 }else if (this.nbm == 6){ //验钞机
+                    if(this.goodState.length === 0 || this.goodState[0].id !== 15) {
+                        this.$message({
+                            center: true,
+                            showClose: true,
+                            message: '请放入现金!',
+                            type: 'error'
+                        });
+                        return
+                    }
                     let projectId = sessionStorage.getItem('projectId')
                     let startTime = sessionStorage.getItem('startTime')
                     for (var i=0;i<this.goodState.length;i++){formList.push({"answerId":this.goodState[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,9,"+this.goodState[i].id,"type": ""})}
@@ -1965,6 +1992,15 @@ export default {
 
                     // that.outThingsGoods([that.goodsShelfTotalData[evt.oldIndex].id])
                 }else if (this.nbm == 7){ //打印机
+                    if(this.goodState.length === 0) {
+                        this.$message({
+                            center: true,
+                            showClose: true,
+                            message: '请放入证件!',
+                            type: 'error'
+                        });
+                        return
+                    }
                     let projectId = sessionStorage.getItem('projectId')
                     let startTime = sessionStorage.getItem('startTime')
                     for (var i=0;i<this.goodState.length;i++){formList.push({"answerId":this.goodState[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,10,"+this.goodState[i].id,"type": ""})}
@@ -1979,7 +2015,6 @@ export default {
                     }).catch((error)=>{
                     })
                 }else if(this.nbm == 8){  // 密码器
-                    if (this.nbm == 8){
                         let formList = []
                         let ruleReqs = sessionStorage.getItem('ruleReqs')
                         if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
@@ -3164,7 +3199,7 @@ export default {
     left: 50%;
     transform: translate(-50%, 0);
     padding: 0 15px 15px;
-    z-index: 999;
+    z-index: 2900;
     // border: 1px solid #e6e6e6;
     // border-color: black;
     box-shadow: 0 2px 6px rgba(0, 0, 0, .12), 0 0 8px rgba(0, 0, 0, .04);
@@ -3467,6 +3502,7 @@ export default {
             top: -3%;
             left: 50%;
             min-height: 65vh;
+            z-index: 9980;
             .seal{
                 margin-top: -5vh;
                 // max-height: 40vh;
diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js
index 4e0cdb1..162a988 100644
--- a/src/utils/utilFunction.js
+++ b/src/utils/utilFunction.js
@@ -192,7 +192,7 @@ const autoPlay = (parentId, form,  myTable2, myTable, cards=[]) => {
         // })
     }).catch((error)=>{
         this.$message({
-            message: '服务器繁忙哦，提交失败。',
+            message: '服务器繁忙，提交失败。',
             center: true,
             type: 'info'
         });