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

# Conflicts:
#	src/views/outboundManagement/weighingManagementNew.vue

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -369,6 +369,7 @@
       },
       print(row, type, pageType) {
         //打印
+        debugger
         if (type == 1) { //
           if (this.modification.length == 0) {
             this.$message.error('请选择批量打印的条目！')
@@ -376,7 +377,7 @@
           }
           for (let _num = 0; _num < this.modification.length; _num++) {
             if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this
-                .warehouseName == '白城内陆港')) {
+                .warehouseName == '白城内陆港'|| this.warehouseName == '哈尔滨依兰库')) {
               if (this.modification[_num].seller && this.modification[_num].buyer) {
                 let cang = {}
                 cang.value = this.modification[_num].seller
@@ -395,7 +396,7 @@
           }
           this.isShowPrintType = true
         } else {
-          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港')) {
+          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港'|| this.warehouseName == '哈尔滨依兰库')) {
             if (row.seller && row.buyer) {
               let cang = {}
               cang.value = row.seller

src/views/outboundManagement/weighingManagementNew.vue

@@ -489,7 +489,7 @@
               } else if (this.types == 4) {
                 this.weighingList.flag = 1
               }
-              grossWeight(this.weighingList)
+              tareEdit(this.weighingList)
                 .toPromise()
                 .then((response) => {
                   this.types = ''
@@ -544,7 +544,7 @@
               } else if (this.types == 4) {
                 this.weighingList.flag = 1
               }
-              grossWeight(this.weighingList)
+              tareEdit(this.weighingList)
                 .toPromise()
                 .then((response) => {
                   this.types = ''
@@ -910,8 +910,6 @@
                     this.$notify.warning(response)
                   })
               } else {
-				  console.log(22222)
-				
                 this.weighingList.relationId = this.relationId
                 this.weighingList.warehouseId = this.warehouseId
                 this.weighingList.baseId = this.warehouseId
@@ -1013,7 +1011,6 @@
                   .catch((response) => {})
               }
             } else if (this.tpyeNo == 2) {
-				this.weighingList.serviceManagementType=2
               this.weighingList.secretaryWeigher =
                 localStorage.getItem('ws-pf_staffName')
               this.weighingList.warehouseId = this.warehouseId
@@ -1358,7 +1355,6 @@
         if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.weighingList.contractNo) {
-            this.weighingList.goodsName = this.outContractNo[i].goodsName
             this.weighingList.goodsName = this.outContractNo[i].goodsName
             if (this.weighingList.goodsName == '玉米（潮粮）') {
               this.weighingList.type = '潮粮'
@@ -1394,7 +1390,7 @@
                 'YKCK' +
                 this.getTime() +
                 this.warehouseNo +
-                num.substring(num.length - 4,num.length)
+                this.warehouseCount.substring(this.warehouseCount.length - 4)
               this.weighingList.buyer = this.outContractNo[i].receiveWarehouse
               this.weighingList.seller = this.outContractNo[i].sendWarehouse
               this.weighingList.goodsName = data.goodsName