Merge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_bankTeaching into master

src/pages/counter/list/index.vue

@@ -952,25 +952,25 @@ export default {
                 this.goodsShelfTotalData = this.systemInputGoodsShelf
                 let parentId = ''
                 if(type == '普通凭证箱'){
-                    parentId = '0,3'
+                    parentId = '287,3'
                 }
                 if(type == '系统'){
-                    parentId = '0,5'
+                    parentId = '287,5'
                 }
             }else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料' || type == '重要空白凭证箱'){
               this.goodsShelfTotalData = this.auditGoodsShelf
                 let parentId = ''
                 if(type == '重要空白凭证箱'){
-                    parentId = '0,2'
+                    parentId = '287,2'
                 }
                 if(type == '资料'){
-                    parentId = '0,11'
+                    parentId = '287,11'
                 }
                 if(type == '验钞机'){
-                    parentId = '0,9'
+                    parentId = '287,9'
                 }
                 if(type == '身份证扫描仪'){
-                    parentId = '0,7'
+                    parentId = '287,7'
                 }
                 let param= {
                     parentId: parentId
@@ -979,18 +979,18 @@ export default {
               this.goodsShelfTotalData = this.printoutGoodsShelf
                 let parentId = ''
                 if(type == '打印机'){
-                    parentId = '0,10'
+                    parentId = '287,10'
                 }
                 if(type == '客户签字'){
-                    parentId = '0,12'
+                    parentId = '287,12'
                 }
                 if(type == '印章盒'){
-                    parentId = '0,8'
+                    parentId = '287,8'
                 }
             }else if(type == '钱箱'){
                 this.goodsShelfTotalData = this.cashboxGoodsShelf;
                 let param= {
-                    parentId: '0,1'
+                    parentId: '287,1'
                 }
                 getOperation(param).then((data)=> {
                     if (data.data.status == 200) {
@@ -1243,7 +1243,7 @@ export default {
                   let formList = []
                   let ruleReqs = sessionStorage.getItem('ruleReqs')
                   if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                  for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "18", "emptyTwo": this.passwordForm.passwordAgain, "operationIds": "0,282,"+this.receptionList[i].id,"type": "3"})}
+                  for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "18", "emptyTwo": this.passwordForm.passwordAgain, "operationIds": "287,282,"+this.receptionList[i].id,"type": "3"})}
                   sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
               }
               if(this.passwordForm.password && this.passwordForm.passwordAgain){
@@ -1265,9 +1265,9 @@ export default {
                 }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": "0,4,"+this.receptionList[i].id,"type": ""})}
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "287,4,"+this.receptionList[i].id,"type": ""})}
                     let params= {
-                        parentId:'0,4',
+                        parentId:'287,4',
                         lcJudgmentRuleReq:formList,
                         projectId:+projectId,
                         startTime:startTime,
@@ -1282,9 +1282,9 @@ export default {
                 }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": "0,3,"+this.receptionList[i].id, "type": "" })}
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({ "answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "287,3,"+this.receptionList[i].id, "type": "" })}
                     let params= {
-                        parentId:'0,3',
+                        parentId:'287,3',
                         lcJudgmentRuleReq:formList,
                         projectId:+projectId,
                         startTime:startTime,
@@ -1299,9 +1299,9 @@ export default {
                 }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": "0,2,"+this.receptionList[i].id, "type": "" })}
+                    for (var i=0;i<this.receptionList.length;i++){formList.push({ "answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "287,2,"+this.receptionList[i].id, "type": "" })}
                     let params= {
-                        parentId:'0,2',
+                        parentId:'287,2',
                         lcJudgmentRuleReq:formList,
                         projectId:+projectId,
                         startTime:startTime,
@@ -1321,10 +1321,10 @@ export default {
                          "answerId":this.receptionList[i].id,
                          "emptyOne": "",
                          "emptyTwo": "",
-                         "operationIds": "0,1,"+this.receptionList[i].id,
+                         "operationIds": "287,1,"+this.receptionList[i].id,
                          "type": "" })}
                     let params= {
-                        parentId:'0,1',
+                        parentId:'287,1',
                         lcJudgmentRuleReq:formList,
                         projectId:+projectId,
                         startTime:startTime,
@@ -1339,9 +1339,9 @@ export default {
                 }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": "0,8,"+this.receptionList[i].id,"type": ""})}
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "287,8,"+this.receptionList[i].id,"type": ""})}
                     let params= {
-                        parentId:'0,8',
+                        parentId:'287,8',
                         lcJudgmentRuleReq:formList,
                         projectId:+projectId,
                         startTime:startTime,
@@ -1356,9 +1356,9 @@ export default {
                 }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": "0,9,"+this.receptionList[i].id,"type": ""})}
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "287,9,"+this.receptionList[i].id,"type": ""})}
                     let params= {
-                        parentId:'0,9',
+                        parentId:'287,9',
                         lcJudgmentRuleReq:formList,
                         projectId:+projectId,
                         startTime:startTime,
@@ -1373,7 +1373,7 @@ export default {
                 }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": "0,10,"+this.receptionList[i].id,"type": ""})}
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "287,10,"+this.receptionList[i].id,"type": ""})}
                     let params= {
                         parentId:'0,10',
                         lcJudgmentRuleReq:formList,