Переглянути джерело

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

achao 3 роки тому
батько
коміт
1a9625cf45

+ 0 - 1
src/components/balanceAlert.vue

@@ -150,7 +150,6 @@ export default {
                 result += tmp
               }
             }
-            debugger
             if (this.information.indexOf('毛重') > -1) {
               if (parseInt(result) || parseInt(result) == 0) {
                 this.grossWeightVal = parseInt(result)

+ 0 - 1
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -593,7 +593,6 @@
        }
     },
     mounted (){
-      debugger
     },
     methods: {
       refreshClick(){

+ 0 - 2
src/views/houseSelfCollect/weightCheck.vue

@@ -459,7 +459,6 @@
             if (response.compName == '黑龙江秋收有限公司') {
               this.inspect.compName = '黑龙江中天昊元贸易有限公司'
             }
-            debugger
             var dialogData = response
 
             if (this.checked) {
@@ -1161,7 +1160,6 @@
               tare(this.weighingList)
                 .toPromise()
                 .then((response) => {
-                  debugger
                   this.idprint = response
                   if (this.reader) {
                     this.reader.cancel()

+ 13 - 11
src/views/outboundManagement/weighingManagementNew.vue

@@ -460,7 +460,6 @@
         })
       },
       closePrint() {
-        debugger
         this.isShowPrint = false
       },
       printSmall() {
@@ -936,10 +935,11 @@
               this.weighingList.baseId = this.warehouseId
               this.weighingList.skinInspector =
                 localStorage.getItem('ws-pf_staffName')
-              if (this.weighingList.id) {
-                this.weighingList.id = this.weighingList.warehouseInOutId
-                  this.weighingList.warehouseInOutDetail.id = this.weighingList.warehouseInOutId 
-                addstorageputList(this.weighingList)
+              if (this.weighingList.id) { 
+                var weighingList1 =  JSON.parse(JSON.stringify(this.weighingList))
+                weighingList1.id = this.weighingList.warehouseInOutId
+                weighingList1.warehouseInOutDetail.id = this.weighingList.inOutDetailId 
+                addstorageputList(weighingList1)
                   .toPromise()
                   .then((response) => {
                     this.weighingList.tare = this.weighingList.tare * 1000
@@ -1001,9 +1001,10 @@
                 this.weighingList.relationId = this.relationId
                 this.weighingList.warehouseId = this.warehouseId
                 this.weighingList.baseId = this.warehouseId
-                  this.weighingList.id = this.weighingList.warehouseInOutId
-                  this.weighingList.warehouseInOutDetail.id = this.weighingList.warehouseInOutId 
-                addstorageputList(this.weighingList)
+                var weighingList1 =  JSON.parse(JSON.stringify(this.weighingList))
+                weighingList1.id = this.weighingList.warehouseInOutId
+                 weighingList1.warehouseInOutDetail.id = this.weighingList.inOutDetailId 
+                addstorageputList(weighingList1)
                   .toPromise()
                   .then((response) => {
                     this.weighingList.tare = this.weighingList.tare * 1000
@@ -1104,9 +1105,10 @@
                 localStorage.getItem('ws-pf_staffName')
               this.weighingList.warehouseId = this.warehouseId
               this.weighingList.baseId = this.warehouseId
-                this.weighingList.id = this.weighingList.warehouseInOutId
-                  this.weighingList.warehouseInOutDetail.id = this.weighingList.warehouseInOutId 
-              addstorageputList(this.weighingList)
+              var weighingList1 =  JSON.parse(JSON.stringify(this.weighingList))
+              weighingList1.id = this.weighingList.warehouseInOutId
+              weighingList1.warehouseInOutDetail.id = this.weighingList.inOutDetailId 
+              addstorageputList(weighingList1)
                 .toPromise()
                 .then((response) => {
                   this.weighingList.grossWeight =