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

src/views/houseSelfCollect/paymentManagement.vue

@@ -966,7 +966,7 @@
               obj.customerPhone = v.客户手机号
               obj.carNumber = v.车牌号
               obj.grossWeight = v.毛重
-              obj.pureWeight = v.纯重&&this.warehouseName=='榆树库'?v.纯重:''
+              obj.pureWeight = v.纯重&&_this.warehouseName=='榆树库'?v.纯重:''
               obj.tare = v.皮重
               obj.netWeight = v.净重
               obj.dryGrainPrice = v.单价

src/views/outboundManagement/weighingManagementNew.vue

@@ -1513,8 +1513,7 @@
               String(this.weighingList.tare).length -
               (String(this.weighingList.tare).indexOf('.') + 1) >
               1) ||
-            this.weighingList.tare < 1 ||
-            this.weighingList.tare > 100000
+            this.weighingList.tare < 1 
           ) {
             this.$message({
               message: '皮重输入错误！',
@@ -1537,8 +1536,7 @@
               String(this.weighingList.grossWeight).length -
               (String(this.weighingList.grossWeight).indexOf('.') + 1) >
               1) ||
-            this.weighingList.grossWeight < 1 ||
-            this.weighingList.grossWeight > 120000
+            this.weighingList.grossWeight < 1 
           ) {3
             this.$message({
               message: '毛重输入错误！',

src/views/profitable/contractprofitsdetails.vue

@@ -396,8 +396,8 @@
       getPassYearFormatDate() {
         var _date = new Date()
         var nowDate = new Date()
-        nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
-        var year = nowDate.getFullYear()
+        // nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
+        var year = nowDate.getFullYear()-1
         var year1 = _date.getFullYear()
         var month = nowDate.getMonth() + 1
         var month1 = _date.getMonth() + 1

src/views/profitable/pettyCash.vue

@@ -239,7 +239,7 @@ export default {
       this.$router.push({ name: 'pettyAccount' })
     },
     getPassYearFormatDate() {
-      if (!localStorage.getItem('startDate') && !localStorage.getItem('endDate')) {
+      if (!localStorage.getItem('pettyStartDate') && !localStorage.getItem('pettyEndDate')) {
         var nowDate = new Date()
         var _date = new Date()
         nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
@@ -265,16 +265,16 @@ export default {
         this.startDate = year + '-' + month + '-' + strDate
         this.endDate = year1 + '-' + month1 + '-' + strDate1
       } else {
-        this.startDate = localStorage.getItem('startDate')
-        this.endDate = localStorage.getItem('endDate')
+        this.startDate = localStorage.getItem('pettyStartDate')
+        this.endDate = localStorage.getItem('pettyEndDate')
       }
       this.value = [this.startDate, this.endDate]
     },
     getList() {
         pettCashList({
         compId: localStorage.getItem('ws-pf_compId'),
-        startDate: localStorage.getItem('startDate'),
-        endDate: localStorage.getItem('endDate'),
+        startDate: localStorage.getItem('pettyStartDate')?localStorage.getItem('pettyStartDate'):this.startDate,
+        endDate: localStorage.getItem('pettyEndDate')?localStorage.getItem('pettyEndDate'):this.endDate,
         searchKeyWord: this.searchKeyWord,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
@@ -312,8 +312,8 @@ export default {
       if (this.value) {
         this.startDate = this.value[0]
         this.endDate = this.value[1]
-        localStorage.setItem('startDate', this.startDate)
-        localStorage.setItem('endDate', this.endDate)
+        localStorage.setItem('pettyStartDate', this.startDate)
+        localStorage.setItem('pettyEndDate', this.endDate)
       }
       this.getList()
     },