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

src/views/warehouse/warehouseManagementGross.vue

@@ -384,8 +384,8 @@
       this.deptBudgetList.warehouseType = this.$route.query.warehouseType
       this.deptBudgetList.createType = this.$route.query.createType
       this.getList()
-      this.deptBudgetList.grade = '一等品'
-      this.deptBudgetList.gradeKey = '1'
+      // this.deptBudgetList.grade = '一等品'
+      // this.deptBudgetList.gradeKey = '1'
       this.deptBudgetList.inOutTypeFlag = 1
       if (this.deptBudgetList.cost) {
         if (this.deptBudgetList.cost > this.deptBudgetList.deductionAmount) {
@@ -1728,6 +1728,7 @@
             console.log(this.outContractNo[i])
             this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
             this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
+            this.deptBudgetList.grade = this.outContractNo[i].grade
             // this.deptBudgetList.cost = this.outContractNo[i].contractPrice
             this.cost = this.outContractNo[i].contractPrice
             if (this.cost) {
@@ -1773,6 +1774,7 @@
             }
             this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
             this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
+            this.deptBudgetList.grade = this.outContractNo[i].grade
             // this.deptBudgetList.cost = this.outContractNo[i].contractPrice
             this.cost = this.outContractNo[i].contractPrice
             if (this.cost) {

src/views/warehouse/warehouseManagementTare.vue

@@ -496,6 +496,7 @@
             }
             this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
             this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
+            this.deptBudgetList.grade = this.outContractNo[i].grade
             this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
             if (this.outContractNo[i].deliverType == '1') {
               this.carstatus = true
@@ -526,6 +527,7 @@
             }
             this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
             this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
+            this.deptBudgetList.grade = this.outContractNo[i].grade
             this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
             if (this.outContractNo[i].tranCarInfoList) {
               this.options2 = this.outContractNo[i].tranCarInfoList