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

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -784,14 +784,14 @@
                   }
                   var count=''
                   if(this.serviceManagementType==3){
-                    if(this.warehouseTradeCount<10){
-                      count='000'+(this.warehouseTradeCount+1)
+                    if(this.warehouseCount<10){
+                      count='000'+(this.warehouseCount+1)
                     }
-                    if(this.warehouseTradeCount<100&&this.warehouseTradeCount>=10){
-                      count='00'+(this.warehouseTradeCount+1)
+                    if(this.warehouseCount<100&&this.warehouseCount>=10){
+                      count='00'+(this.warehouseCount+1)
                     }
-                    if(this.warehouseTradeCount<1000&&this.warehouseTradeCount>=100){
-                      count='0'+(this.warehouseTradeCount+1)
+                    if(this.warehouseCount<1000&&this.warehouseCount>=100){
+                      count='0'+(this.warehouseCount+1)
                     }
                     this.deptBudgetList.qualityNo='SGRK'+this.getTime()+this.warehouseNo+count
                   }
@@ -870,14 +870,14 @@
               }
                if(this.serviceManagementType==3){
                     var count=''
-                    if(this.warehouseTradeCount<10){
-                      count='000'+(this.warehouseTradeCount+1)
+                    if(this.warehouseCount<10){
+                      count='000'+(this.warehouseCount+1)
                     }
-                    if(this.warehouseTradeCount<100&&this.warehouseTradeCount>=10){
-                      count='00'+(this.warehouseTradeCount+1)
+                    if(this.warehouseCount<100&&this.warehouseCount>=10){
+                      count='00'+(this.warehouseCount+1)
                     }
-                    if(this.warehouseTradeCount<1000&&this.warehouseTradeCount>=100){
-                      count='0'+(this.warehouseTradeCount+1)
+                    if(this.warehouseCount<1000&&this.warehouseCount>=100){
+                      count='0'+(this.warehouseCount+1)
                     }
                     this.deptBudgetList.qualityNo='SGRK'+this.getTime()+this.warehouseNo+count
                   }
@@ -2203,14 +2203,14 @@
         }
         if(this.serviceManagementType==3){
                     var count=''
-                    if(this.warehouseTradeCount<10){
-                      count='000'+(this.warehouseTradeCount+1)
+                    if(this.warehouseCount<10){
+                      count='000'+ Number(this.warehouseCount+1)
                     }
-                    if(this.warehouseTradeCount<100&&this.warehouseTradeCount>=10){
-                      count='00'+(this.warehouseTradeCount+1)
+                    if(this.warehouseCount<100&&this.warehouseCount>=10){
+                      count='00'+ Number(this.warehouseCount+1)
                     }
-                    if(this.warehouseTradeCount<1000&&this.warehouseTradeCount>=100){
-                      count='0'+(this.warehouseTradeCount+1)
+                    if(this.warehouseCount<1000&&this.warehouseCount>=100){
+                      count='0'+ Number(this.warehouseCount+1)
                     }
                     this.deptBudgetList.qualityNo='SGRK'+this.getTime()+this.warehouseNo+count
                   }

src/views/profitable/contractOtherMoney.vue

@@ -439,7 +439,7 @@
                     this.dialogVisible = false
                     this.$notify({
                       title: '成功',
-                      message: '请款提交成功！',
+                      message: '收款提交成功！',
                       type: 'success'
                     });
                     this.getList()