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

src/views/outboundManagement/weighingManagementNew.vue

@@ -1575,10 +1575,11 @@
       },
       contractNoChange(e) {
         this.warehouseCount = this.warehouseCount1
-        console.log(this.warehouseCount)
         for (let i = 0; i < this.taskNolist.length; i++) {
           if (this.taskNolist[i].inOutTaskNo == e) {
-             this.weighingList.number = this.taskNolist[i].inOutTaskNo
+            //  this.weighingList.number = this.taskNolist[i].inOutTaskNo
+              this.warehouseCount = '000' + (Number(this.warehouseCount) + 1)
+              this.weighingList.number = 'XSCK' + this.getTime() +  this.warehouseNo + this.warehouseCount.substring(this.warehouseCount.length - 4)
              this.weighingList.goodsName = this.taskNolist[i].goodsName
              this.weighingList.tips = this.taskNolist[i].businessDescribe
             var data = this.taskNolist[i]
@@ -1604,11 +1605,7 @@
             this.weighingList.inOutType = this.outContractNo[i].inOutType
             if (this.outContractNo[i].inOutType == '销售出库') {
               this.warehouseCount = '000' + (Number(this.warehouseCount) + 1)
-              this.weighingList.number =
-                'XSCK' +
-                this.getTime() +
-                this.warehouseNo +
-                this.warehouseCount.substring(this.warehouseCount.length - 4)
+              this.weighingList.number = 'XSCK' + this.getTime() +  this.warehouseNo + this.warehouseCount.substring(this.warehouseCount.length - 4)
               this.weighingList.buyer = this.outContractNo[i].buyer
               this.weighingList.seller = localStorage.getItem('ws-pf_compName')
               if (!this.outContractNo[i].unitContractPrice) {