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

src/layout/index/top/top-setting.vue

@@ -122,7 +122,7 @@ export default {
       }])
     },
     clear(){
-       clearCache({
+       clearCache({compId:localStorage.getItem('ws-pf_compId')
         }).toPromise().then(res => {
           this.$message.success('缓存清理成功')
         })

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1131,8 +1131,8 @@ export default {
         if (this.deptBudgetList.goodsName.indexOf('潮粮') != -1) {
           this.deptBudgetList.type = '潮粮'
           if(!this.deptBudgetList.grade){
-            this.deptBudgetList.grade = this.gradeList[1].constValue
-				    this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+            this.deptBudgetList.grade = this.gradeList[2].constValue
+				    this.deptBudgetList.gradeKey = this.gradeList[2].constKey
           }
           this.deptBudgetList.imperfectGrain=8
 					this.deptBudgetList.impurity=1
@@ -1141,8 +1141,8 @@ export default {
         } else {
           this.deptBudgetList.type = '干粮'
           if(!this.deptBudgetList.grade){
-            this.deptBudgetList.grade = this.gradeList[1].constValue
-				    this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+            this.deptBudgetList.grade = this.gradeList[2].constValue
+				    this.deptBudgetList.gradeKey = this.gradeList[2].constKey
           }
           this.deptBudgetList.imperfectGrain=8
 					this.deptBudgetList.impurity=1
@@ -3737,16 +3737,16 @@ export default {
             this.deptBudgetList.goodsName = this.taskNolist[i].goodsName
             if(this.taskNolist[i].goodsName.indexOf('潮粮') != -1){  //收购从合同中带出货名  单价等信息  用货名是否带有潮粮字符来判断干潮类型
               this.deptBudgetList.type = '潮粮'
-              this.deptBudgetList.grade = this.gradeList[1].constValue
-				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+              this.deptBudgetList.grade = this.gradeList[2].constValue
+				  this.deptBudgetList.gradeKey = this.gradeList[2].constKey
               this.deptBudgetList.imperfectGrain=8
 							this.deptBudgetList.impurity=1
 							this.deptBudgetList.mildewGrain=2
 							this.deptBudgetList.jiaorenli=0
             }else{
               this.deptBudgetList.type = '干粮'
-              this.deptBudgetList.grade = this.gradeList[1].constValue
-				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+              this.deptBudgetList.grade = this.gradeList[2].constValue
+				  this.deptBudgetList.gradeKey = this.gradeList[2].constKey
               this.deptBudgetList.imperfectGrain=8
 							this.deptBudgetList.impurity=1
 							this.deptBudgetList.mildewGrain=2

src/views/profitable/cashout.vue

@@ -296,7 +296,7 @@ export default {
       wareList: [{ key: 1, value: '指定仓库' }, { key: 2, value: '全部仓库' }],
       datesList: [{ key: 1, value: '固定日期' }, { key: 2, value: '指定日期' }],
 
-      typeList: [{ key: 1, value: '杂费' }, { key: 2, value: '电费' }, { key: 3, value: '煤费' }, { key: 4, value: '人工费' }],
+      typeList: [{ key: 1, value: '杂费' }, { key: 2, value: '水电费' }, { key: 3, value: '伙食费' }, { key: 4, value: '人工费' }, { key: 5, value: '物质采买' }, { key: 6, value: '燃料费' }, { key: 7, value: '加油费' }],
       moneysList: [{ key: 1, value: '按重量自动分配' }, { key: 2, value: '指定分配金额' }],
       goodsList: [{ key: 1, value: '全部货品' }, { key: 2, value: '指定货品' }],
       Num: 0,

src/views/universalityAudit/auditprint.vue

@@ -185,7 +185,7 @@ export default {
                         var data = this.deptBudgetList[m].tranTaskInfoList[i].tranSettlementReportList
                         for (var q = 0; q < data.length; q++) {
                           if (data[q].totalPayable) {
-                            this.num += data[q].totalPayable
+                            num += data[q].totalPayable
                           }
                         }
                       }
@@ -373,7 +373,7 @@ export default {
                         var data = this.deptBudgetList[0].tranTaskInfoList[i].tranSettlementReportList
                         for (var q = 0; q < data.length; q++) {
                           if (data[q].totalPayable) {
-                            this.num += data[q].totalPayable
+                            num += data[q].totalPayable
                           }
                         }
                       }