Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -501,6 +501,7 @@
         outContractNo:[],
         carNumberList:[],
         warehouseTradeCount:0,
+        warehouseTradeCount1:0,
         options1:[],
         editcar:false,
         isGetCost:'',
@@ -1896,6 +1897,9 @@
                       }
                       if(this.serviceManagementType==3){
                         this.warehouseCount+=1
+                      }else{
+                        this.warehouseTradeCount=Number(this.warehouseTradeCount)+1
+                        this.warehouseTradeCount1=Number(this.warehouseTradeCount1)+1
                       }
                       
                       this.$message.success('添加成功')
@@ -2138,6 +2142,7 @@
                 this.warehouseCount = response[i].count
                 console.log(response[i].tradeCount)
                 this.warehouseTradeCount = response[i].tradeCount
+                this.warehouseTradeCount1 = response[i].tradeCount
                 this.allowEdit = response[i].allowEdit
                 this.cangid = _wareHouse.warehouseId
                 this.warehouseName = response[i].warehouseName
@@ -2158,6 +2163,7 @@
                   this.warehouseName = response[i].warehouseName
                   this.warehouseCount = response[i].count
                   this.warehouseTradeCount = response[i].tradeCount
+                  this.warehouseTradeCount1 = response[i].tradeCount
                   this.warehouseNo = response[i].commonWarehouseNo
                   this.allowEdit = response[i].allowEdit
                 this.positionInfos=response[i].positionInfos
@@ -2166,6 +2172,7 @@
                   this.warehouseName = this.warehouseList[0].value
                   this.warehouseCount = this.warehouseList[0].count
                   this.warehouseTradeCount = this.warehouseList[0].tradeCount
+                  this.warehouseTradeCount1 = this.warehouseList[0].tradeCount
                   this.warehouseNo = this.warehouseList[0].No
                   this.cangid = this.warehouseList[0].warehouseId
                   this.allowEdit = this.warehouseList[0].allowEdit
@@ -2246,8 +2253,8 @@
             if (this.outContractNo[i].inOutType == '采购入库') {
               this.customerName=this.outContractNo[i].buyer
               this.customerPhone=this.outContractNo[i].buyerPhone
-              console.log(this.warehouseTradeCount)
-              this.warehouseTradeCount = '000' + Number(this.warehouseTradeCount + 1)
+              this.warehouseTradeCount=this.warehouseTradeCount1
+              this.warehouseTradeCount = '000' + (Number(this.warehouseTradeCount) + 1)
               this.deptBudgetList.qualityNo='CGRK'+this.getTime()+this.warehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
               if (!this.outContractNo[i].unitContractPrice) {
                 this.deptBudgetList.tips = '卖方' + this.outContractNo[i].seller
@@ -2257,7 +2264,7 @@
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库入库') {
               this.customerName=localStorage.getItem('ws-pf_compName')
-                this.warehouseTradeCount = '000' + Number(this.warehouseTradeCount + 1)
+                this.warehouseTradeCount = '000' + (Number(this.warehouseTradeCount) + 1)
               this.deptBudgetList.qualityNo='YKRK'+this.getTime()+this.warehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
               this.deptBudgetList.goodsName = data.goodsName
               this.deptBudgetList.goodsNameKey = data.goodsNameKey
@@ -2327,6 +2334,8 @@
           if (this.warehouseList[i].value == e) {
             this.warehouseName = this.warehouseList[i].value
             this.warehouseCount = this.warehouseList[i].count
+             this.warehouseTradeCount = this.warehouseList[i].tradeCount
+             this.warehouseTradeCount1 = this.warehouseList[i].tradeCount
             this.warehouseNo = this.warehouseList[i].No
             this.cangid = this.warehouseList[i].warehouseId
             this.allowEdit = this.warehouseList[i].allowEdit

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -178,7 +178,8 @@
   import {
     addOut,
     selectWarehouseSelf,
-    getinspectList
+    getinspectList,
+    getinspectLook
   } from '@/model/outboundManagement/index'
   import {
     packList
@@ -579,11 +580,23 @@
               .toPromise()
               .then((response) => {
                 this.$message.success('保存成功')
-                this.printData = this.inspect
-                conole.log(this.printData)
+                // this.printData = this.inspect
+                // conole.log(this.printData)
+                
+                // this.isShowPrint = true
+                // this.getList()
+                getinspectLook({
+                        id: response
+                      })
+                      .toPromise()
+                      .then((response2) => {
+                        this.printData = response2
+                        this.printData.contractManagement =this.inspect.contractManagement
+                        console.log(this.printData)
+                        this.isShowPrint = true
+                        this.getList()
+                      })
                 
-                this.isShowPrint = true
-                this.getList()
               })
           })
           .catch(() => {