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

src/views/warehouse/transformation.vue

@@ -203,13 +203,15 @@ export default {
     },
     //新增折转
     addTurnAround() {
-      turnAroundXiaLa({
+      if(this.warehouseType==2){
+        turnAroundXiaLa({
         id: this.warehouseId,
-      })
+        })
         .toPromise()
         .then((response) => {
           this.goodsNameList = response
         })
+      }
       turnAroundGoodsNameAll({
         constId: 'CON2',
       })
@@ -252,6 +254,16 @@ export default {
         })
     },
     binNo(e) {
+      if(this.warehouseType==1){
+        turnAroundXiaLa({
+        id: this.binNoList[e].id,
+      })
+        .toPromise()
+        .then((response) => {
+          this.goodsNameList = response
+        })
+      }
+      
       this.transformationAdd.beforeBinNo = this.binNoList[e].binNumber
       this.transformationAdd.positionId = this.binNoList[e].id
     },

src/views/warehouse/warehouseManagementGross.vue

@@ -759,7 +759,7 @@
         }
         if (
           this.deptBudgetList.grossWeight < 100 ||
-          this.deptBudgetList.grossWeight > 500000 ||
+          this.deptBudgetList.grossWeight > 5000000 ||
           (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
             String(this.deptBudgetList.grossWeight).length -
             (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
@@ -1378,7 +1378,7 @@
         if (
           this.information == '毛重检斤' &&
           (this.deptBudgetList.grossWeight < 0 ||
-            this.deptBudgetList.grossWeight > 2000000 ||
+            this.deptBudgetList.grossWeight > 10000000 ||
             (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
               String(this.deptBudgetList.grossWeight).length -
               (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >

src/views/warehouse/warehouseManagementList.vue

@@ -135,7 +135,8 @@
             <div class="adjustment" v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.view`
           " @click="mintor(scope.row)">监控</div>
-           <!-- <div class="adjustment" @click="transformation(scope.row)">折转</div> -->
+           <div v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.turn`" class="adjustment" @click="transformation(scope.row)">折转</div>
           </template>
         </el-table-column>
       </el-table>
@@ -204,7 +205,8 @@
             <div class="adjustment" v-if="scope.row.clearStatusFlag == 3">
               已清仓
             </div>
-              <!-- <div class="adjustment" @click="transformation(scope.row)">折转</div> -->
+              <div v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.turn`" class="adjustment" @click="transformation(scope.row)">折转</div>
           </template>
         </el-table-column>
       </el-table>