前端 sdy

src/views/tradeServicesManagement/inOutRecord.vue

@@ -457,7 +457,7 @@ export default {
   methods: {
     getList() {
       getrecord({
-        compId: localStorage.getItem('ws-pf_compId'),
+        compId: sessionStorage.getItem('ws-pf_compId'),
         baseId: this.deptBudgetList.baseId,
         positionId: this.deptBudgetList.positionId,
         warehouseName: this.deptBudgetList.warehouseName,
@@ -538,7 +538,6 @@ export default {
       console.log(this.ruleForm.type)
     },
     typePrintClick(selection) {
-<<<<<<< HEAD
 
        for(let j = 0 ; j < this.ruleForm.type.length ; j++){
           if(this.ruleForm.type[j] == "打印磅单"){
@@ -554,101 +553,6 @@ export default {
                  this.$message.error('只有收购入库的条目才能打印结算单，请重新勾选！')
                  return
               }
-=======
-      let index1 = 0
-      let index2 = 0
-      var that = this
-      let _bdList = []
-      let _jsList = []
-      for (let i = 0; i < selection.length; i++) {
-        for (let j = 0; j < this.ruleForm.type.length; j++) {
-          if (
-            this.ruleForm.type[j] == '打印磅单' &&
-            this.ruleForm.type.length < 1
-          ) {
-            selection[i].code =
-              this.getdate() +
-              selection[i].commonWarehouseNo +
-              this.verifyinit()
-            selection[i].printType = '打印磅单'
-            _bdList.push(selection[i])
-            index1++
-            if (index1 == selection.length) {
-              localStorage.setItem(
-                'inOutRecord_printbd',
-                JSON.stringify(_bdList)
-              )
-              window.open('../../../../../static/tradeServicesPrint.html')
-            }
-          } else if (
-            this.ruleForm.type[j] == '打印结算单' &&
-            this.ruleForm.type.length < 1
-          ) {
-            if (!selection[i].paymentId) {
-              this.$message.error(
-                '选择条目错误，收购入库结算单才能打印，请重新勾选！'
-              )
-              return
-            } else {
-              getpaymentexamine({ id: selection[i].paymentId })
-                .toPromise()
-                .then((res) => {
-                  res.printType = '打印结算单'
-                  index2++
-                  _jsList.push(res)
-                  if (index2 == this.selection.length) {
-                    localStorage.setItem(
-                      'inOutRecord_printjs',
-                      JSON.stringify(_jsList)
-                    )
-                    window.open('../../../../../static/tradeServicesPrint.html')
-                    // this.isShowPrint = true
-                    // this.printBig();
-                  }
-                })
-            }
-          } else {
-            // 两条都打
-
-            if (!selection[i].paymentId) {
-              this.$message.error(
-                '选择条目错误，收购入库结算单才能打印，请重新勾选！'
-              )
-              return
-            } else {
-              selection[i].code =
-                this.getdate() +
-                selection[i].commonWarehouseNo +
-                this.verifyinit()
-              selection[i].printType = '打印磅单'
-              _bdList.push(selection[i])
-              index1++
-              // if (index1 == selection.length && index2 == selection.length) {
-                localStorage.setItem(
-                  'inOutRecord_printbd',
-                  JSON.stringify(_bdList)
-                )
-                // window.open('../../../../../static/tradeServicesPrint.html')
-              // }
-              getpaymentexamine({ id: selection[i].paymentId })
-                .toPromise()
-                .then((res) => {
-                  res.printType = '打印结算单'
-                  index2++
-                  _jsList.push(res)
-                  if (
-                    index2 == selection.length
-                  ) {
-                    localStorage.setItem(
-                      'inOutRecord_printjs',
-                      JSON.stringify(_jsList)
-                    )
-                    window.open('../../../../../static/tradeServicesPrint.html')
-                    // this.isShowPrint = true
-                    // this.printBig();
-                  }
-                })
->>>>>>> 6e20e52e0c23fe44f9d09d710d557e476163a850
             }
             this.printSettlementSheet(selection)
           }
@@ -656,10 +560,6 @@ export default {
         
         for(let num = 0 ; num < selection.length ; num++){
           if(this.count == selection.length){
-            
-            console.log(this.count , selection.length)
-            console.log("bang单",this.printList)
-            console.log("结算单",this.printList1)
             sessionStorage.setItem('inOutRecord_printBD', JSON.stringify(this.printList))
             sessionStorage.setItem('inOutRecord_printJSD', JSON.stringify(this.printList1))
               window.open('../../../../../static/tradeServicesPrint.html')