From 98e1655647fdf4748ec00a8fccc1a990f6c00736 Mon Sep 17 00:00:00 2001 From: e <2432808546@qq.com> Date: Tue, 2 Nov 2021 14:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/counter/list/index.vue | 224 ++++++++++++++++++++----------- 1 file changed, 146 insertions(+), 78 deletions(-) diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 79cb1e4..fc28759 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -18,56 +18,56 @@
- +
- +
- +
- +
- +
- +
- +
- + @@ -76,21 +76,21 @@
-

资料

+

资料

- +
- + @@ -106,7 +106,7 @@ -
+
{{ popText }}
@@ -134,10 +134,10 @@
-
- -

{{item.name}}

-
+ + + +
@@ -317,6 +317,7 @@ export default { clickNum:0, showImg:false, imgSrc:'', + nbm:0, }; }, computed: { @@ -350,8 +351,6 @@ export default { } }, created() { - console.log(/^[0-9]*$/.test('1234'),'/^[0-9]*$/'); - console.log(/^\/d{6}$/.test('124056'),'/^[0-9]*$/'); let arr = this.$route.path.split('/').slice(-2); if (arr.pop() === 'manage' || arr[0] === 'manage') { this.manageVisible = true; @@ -361,26 +360,27 @@ export default { }, mounted(){ this.getQueryVariable() - // Promise.resolve(2).then(value => { - //     console.log(111, value) - //     return value - //     }) - //     .then(value => { - //     console.log(222, value) - //     return Promise.resolve(value) - //     }) - //     .then(value => { - //     console.log(333, value) - //     }) - //     .then(value => { - //     console.log(444, value) - //     return Promise.reject(value) - //     }) - //     .then(value => { - //     console.log(555, value) - //     }).catch(err => { - //         console.log(666, err) - //     }) + // Promise.resolve(2).then(value=>{ + // console.log(111,value) + // return value + // }) + // .then(value=>{ + // console.log(222,value) + // return Promise.resolve(value) + + // }) + // .then(value=>{ + // console.log(333,value) + // }) + // .then(value=>{ + // console.log(444,value) + // return Promise.reject(value) + // }) + // .then(value=>{ + // console.log(555,value) + // }).catch(err=>{ + // console.log(666,err) + // }) let that = this // 拖拽-物品栏 new Sortable(this.$refs.goods, { @@ -398,28 +398,27 @@ export default { if(evt.originalEvent.pageXtargetDom.left){ if(evt.originalEvent.pageYtargetDom.top){ /* oldindex识别是拖拽了哪个文件 */ - console.log(that.goods[evt.oldIndex].name,'执行拖拽2'); - that.checkList.push(that.goods[evt.oldIndex].name) - let ifElse = 0; - for(var i=0;i 0){ + console.log(that.goodsShelfTotalData[evt.oldIndex].name,'执行拖拽2'); + that.checkList.push(that.goodsShelfTotalData[evt.oldIndex].name) + let ifElse = 0; + for(var i=0;i 0){ - }else{ - that.receptionList.push(that.popArr[i]) - } - }else{ - that.receptionList.push(that.popArr[i]) - } + }else{ + that.receptionList.push(that.popArr[i]) + } + }else{ + that.receptionList.push(that.popArr[i]) + } + } } - } - alert('拉入到物品栏') } } }, @@ -448,26 +447,27 @@ export default { }, methods: { getQueryVariable(variable) { - var query = window.location.href; - var vars = query.split("?"); + // var query = window.location.href; + // var vars = query.split("?"); // if (vars.length <= 0){ - for (var i=1;i=6 && this.passwordForm.passwordAgain.length >=6){ if(this.passwordForm.password == this.passwordForm.passwordAgain) { this.$store.commit('system/changePop', {show: false, text: ''}) @@ -600,9 +608,69 @@ export default { }else{ if (this.receptionList.length >0){ this.$message.success(`${this.popText}操作成功！`) - // setTimeout(()=>{ - // - // },800) + if (this.nbm == 1){ + let formList = [] + let ruleReqs = sessionStorage.getItem('ruleReqs') + if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []} + for (var i=0;i