前端

src/model/warehouse/index.js

@@ -51,7 +51,7 @@ import {
     API_get_goodsName_All,
     API_GET_WAREHOUSE_RESPONSIBLE,
     API_POST_WAREHOUSE_INWEIGHT,
-    API_GET_WAREHOUSE_ALL
+    API_GET_WAREHOUSE_ALL,
     API_SEND_BACK,
     API_DELETE_WAREHOUSE
 } from '@/api/V2/warehouse'

src/views/contractManagement/salesContractAdd.vue

@@ -1160,11 +1160,7 @@
         //   return
         // }
         if (
-<<<<<<< HEAD
-          this.deptBudgetList.contractGoodsInfo.mildewGrain ||
-=======
           this.deptBudgetList.contractGoodsInfo.mildewGrain &&
->>>>>>> origin
           (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
               '.'
             ) != -1 &&
@@ -1191,11 +1187,7 @@
         //   return
         // }
         if (
-<<<<<<< HEAD
-          this.deptBudgetList.contractGoodsInfo.jiaorenli ||
-=======
           this.deptBudgetList.contractGoodsInfo.jiaorenli &&
->>>>>>> origin
           (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
             -1 &&
             String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
@@ -1221,11 +1213,7 @@
         //   return
         // }
         if (
-<<<<<<< HEAD
-          this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
-=======
           this.deptBudgetList.contractGoodsInfo.imperfectGrain &&
->>>>>>> origin
           (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
               '.'
             ) != -1 &&

src/views/contractManagement/storageContractAdd.vue

@@ -868,11 +868,7 @@
           })
           return
         }
-<<<<<<< HEAD
-        if (!this.deptBudgetList.storageFeeNew) {
-=======
         if (!this.deptBudgetList.storageFee) {
->>>>>>> origin
           this.$message({
             message: '代储费不能为空！',
             type: 'warning',
@@ -887,15 +883,6 @@
           return
         }
         if (
-<<<<<<< HEAD
-          isNaN(this.deptBudgetList.storageFeeNew) ||
-          (String(this.deptBudgetList.storageFeeNew).indexOf('.') != -1 &&
-            String(this.deptBudgetList.storageFeeNew).length -
-            (String(this.deptBudgetList.storageFeeNew).indexOf('.') + 1) >
-            2) ||
-          this.deptBudgetList.storageFeeNew < 0 ||
-          this.deptBudgetList.storageFeeNew > 1000
-=======
           isNaN(this.deptBudgetList.storageFee) ||
           (String(this.deptBudgetList.storageFee).indexOf('.') != -1 &&
             String(this.deptBudgetList.storageFee).length -
@@ -903,7 +890,6 @@
             2) ||
           this.deptBudgetList.storageFee < 0 ||
           this.deptBudgetList.storageFee > 1000
->>>>>>> origin
         ) {
           this.$message({
             message: '代储费填写错误！',

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -890,15 +890,10 @@
             if (index === 0) {
               sums[index] = '合计'
             } else if (
-<<<<<<< HEAD
               index === 7 ||
               index === 8 ||
               index === 9 ||
               index === 10 ||
-=======
-              // index === 10 ||
-              index === 8 ||
->>>>>>> origin
               index === 11 ||
               index === 13 ||
               index === 14 ||