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

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -680,8 +680,8 @@
         var month = now.getMonth(); //得到月份
         var date = now.getDate(); //得到日期
         month = month + 1;
-        month = month.toString().padStart(2, "0");
-        date = date.toString().padStart(2, "0");
+        month = month.toString().padStart(2, '0');
+        date = date.toString().padStart(2, '0');
         var defaultDate = `${year}-${month}-${date}`
         this.deptBudgetList.inOutDate=defaultDate
       },

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -1509,7 +1509,7 @@
                                 warehousing.deductionAmount *= 1000
                                 warehousing.deductionWeight /= 1000
                                 warehousing.statusFlag = 1
-                                warehousing.inOutFlag =
+                                warehousing.inOutFlag =2
                                 warehousing.id = warehousing.warehouseInOutId
                                 warehousing.warehouseInOutDetail.id = warehousing.inOutDetailId
                                 addstorageputList(warehousing).toPromise().then((response) => {