diff --git a/src/components/case/index.vue b/src/components/case/index.vue index b8863de..f81bd09 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -104,7 +104,7 @@ - +
@@ -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; diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index 5c9661e..23a3074 100644 --- a/src/layouts/header/index.vue +++ b/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; diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 3162e7c..2b6b1a6 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -160,7 +160,7 @@
-
+

{{item.name}}

@@ -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;jtargetDom.left){ if(evt.originalEvent.pageYtargetDom.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('请从物品栏中拖拽所需资料'); } } - } } }; diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue index 0d250cb..60f8605 100644 --- a/src/pages/manage/list/personal/currentAccount/openAccount.vue +++ b/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