修改bug

src/components/case/index.vue

@@ -104,7 +104,7 @@
               </div>
               </el-collapse>
             </el-tab-pane>
-            <el-tab-pane label="实验提示" name="fifth" v-if="isstartexperimentSuggests">
+            <el-tab-pane label="实验提示" name="fifth" v-if="hintOpen == 0">
               <div class="break-all" v-html="projectManage.experimentHint"></div>
             </el-tab-pane>
           </el-tabs>
@@ -176,7 +176,7 @@ export default {
       stopTime: '',
       isSelected: false,
       userId: '',
-      isstartexperimentSuggests: 1,
+        hintOpen: 0,
       topicList:[],
       projectManage:{},
       requires:[],
@@ -271,7 +271,6 @@ export default {
           }else{
               this.getData()
           }
-
       }
   },
   methods: {
@@ -385,7 +384,8 @@ export default {
                   this.seconds = "00";
                   this.minutes = "00";
                   this.hour = "00";
-                  this.sss = 1
+                  this.sss = 1;
+                  this.hintOpen = data.data.projectManage.hintOpen
                   this.startCountFn();
                   let projectId = this.getQueryVariable('projectId')
                   if(projectId != null){
@@ -635,7 +635,6 @@ export default {
       background-color: #f5f5f5;
       z-index: 1001;
     }
-
     .el-header {
       color: #333;
       padding: 0 12px 0 20px;

src/layouts/header/index.vue

@@ -48,7 +48,7 @@ export default {
         position: relative;
         height: 68px;
         background-color: #fff;
-        z-index: 99999;
+        z-index: 1001;
         .logo{
             width: 500px;
             margin-left: 42px;

src/pages/counter/list/index.vue

@@ -160,7 +160,7 @@
             </div>
             <!-- 暂时未确定是否公共使用一个弹框 -->
             <div v-else class="list" ref="popUp"><!-- 钱箱 / 传票栏 ... 一系列可存物品弹框 -->
-                <div class="img-wrap" :class="{ checked: commonChecked.includes(item.id),'img-wrap':true }" v-for="(item, index) in receptionList" :key="index" v-if="receptionList.length" >
+                <div class="img-wrap" :class="{ checked: commonChecked.includes(item.id),'img-wrap':true }" @click='dislodgeItem(index)' v-for="(item, index) in receptionList" :key="index" v-if="receptionList.length" >
                     <img :src="item.src" class="file"  alt="" />
                     <p class="text">{{item.name}}</p>
                 </div>
@@ -215,11 +215,11 @@ export default {
         var validatePass2 = (rule, value, callback) => {
             if (value === '') {
                 callback(new Error('请再次输入密码'));
-            } else if (value.length == 6) {
-                if(value  !== this.passwordForm.password){
-                    callback(new Error('两次输入密码不一致!'));
-                }
-            } else {
+            } else if (value.length < 6) {
+                callback(new Error('两次输入密码不一致!'));
+            } else  if(value  !== this.passwordForm.password){
+                callback(new Error('两次输入密码不一致!'));
+            }else{
                 callback();
             }
         };
@@ -340,13 +340,18 @@ export default {
         },
         showPop:function(){/* 展示弹框 */
             if(this.$store.state.system.popText == '刷卡器'){
-                let dataList = JSON.parse(sessionStorage.getItem('dataList'));
-                if (dataList){
-                    this.receptionList = []
-                    for(var j=0;j<dataList.length;j++){
-                        for(var i=0;i<this.goodsShelfTotalData.length;i++){
-                            if(dataList[j].answerId == this.goodsShelfTotalData[i].id){
-                                this.receptionList.push(this.goodsShelfTotalData[i])
+                if (this.$store.state.system.id == '62,1'){
+                    let receptionList = sessionStorage.getItem('accountVoucher')
+                    this.receptionList = JSON.parse(receptionList)
+                }else{
+                    let dataList = JSON.parse(sessionStorage.getItem('dataList'));
+                    if (dataList){
+                        this.receptionList = []
+                        for(var j=0;j<dataList.length;j++){
+                            for(var i=0;i<this.goodsShelfTotalData.length;i++){
+                                if(dataList[j].answerId == this.goodsShelfTotalData[i].id){
+                                    this.receptionList.push(this.goodsShelfTotalData[i])
+                                }
                             }
                         }
                     }
@@ -354,7 +359,10 @@ export default {
             }
             if(this.$store.state.system.popText == '密码器'){
                 let accountPasswordAll = sessionStorage.getItem('accountPasswordAll');
-                this.passwordForm.password = accountPasswordAll
+                if(accountPasswordAll){
+                    this.passwordForm.password = accountPasswordAll
+                    this.passwordForm.passwordAgain = accountPasswordAll
+                }
                 // this.passwordForm.passwordAgain = accountPasswordAll
             }
             if(!this.showGoods) this.showGoods = this.$store.state.system.showPop
@@ -449,6 +457,9 @@ export default {
                 let targetDom = that.$refs.goods.getBoundingClientRect()
                 if(evt.originalEvent.pageX<targetDom.right&&evt.originalEvent.pageX>targetDom.left){
                     if(evt.originalEvent.pageY<targetDom.bottom&&evt.originalEvent.pageY>targetDom.top){
+                        console.log(evt)
+                        // this.importanceArr[evt.oldIndex]
+                        // this.importanceArr
                         alert('拉入到弹框')
                     }
                 }
@@ -456,6 +467,9 @@ export default {
         });
     },
     methods: {
+        dislodgeItem(index){
+            this.receptionList.splice(index,1);
+        },
         toggleGoods() {
           this.showGoods = !this.showGoods;
         },
@@ -671,10 +685,6 @@ export default {
                 clickList.length = 0
             }else{
               if (this.id == '62,1'){
-                  let accountVouchers = sessionStorage.getItem('accountVoucher')
-                  let accountPasswords = sessionStorage.getItem('accountPassword')
-                  console.log(accountVouchers)
-                  console.log(accountPasswords)
                   this.goodsShelfTotalData = this.auditGoodsShelf
                   let accountVoucher = [];
                   let accountPassword = '';
@@ -735,6 +745,7 @@ export default {
             }
           }else{
             if (this.receptionList.length >0){
+                let formList = []
               this.$message.success(`${this.popText}操作成功！`)
                 if (this.nbm == 0){ //用户
                 }else if (this.nbm == 1){ //传票箱
@@ -917,7 +928,6 @@ export default {
               this.$message.error('请从物品栏中拖拽所需资料');
             }
           }
-
         }
     }
 };

src/pages/manage/list/personal/currentAccount/openAccount.vue

@@ -366,8 +366,6 @@ export default {
           let paymentCode = accountPassword;
           let paymentCodeTwo = accountPasswordTwo;
           let paymentCodeThree = accountPasswordThree;
-          console.log('voucherNumber'+voucherNumber)
-          console.log('accountPassword'+accountPassword)
           if(this.form.userName && this.form.currency && this.form.goldLogo && this.form.accountType && this.form.drawWay && this.form.voucherType && voucherNumber.length && paymentCode){
               for (var i=0;i<voucherNumber.length;i++){
                   formLists.push({"answerId":voucherNumber[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,26,57,62,75,"+voucherNumber[i].id,"type": ""})

src/styles/common.scss

@@ -166,7 +166,7 @@
         }
     }
     .el-message-box__status{
-        top: -30px;
+        //top: -30px;
     }
     .el-message-box__status + .el-message-box__message{
         font-size: 14px;