Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/layout/index/top/index.vue

@@ -383,7 +383,6 @@
       ...mapActions('common', ['setLocalVessels']),
       ...mapActions('user', ['getUserInfo','toSetShow']),
       payCode() {
-		this.barCode = this.barCode.toLocaleLowerCase()
 		  console.log('input', this.barCode)
         this.btnStatus = {
           status1: false,
@@ -395,10 +394,10 @@
         }
         // let _userCompId = "2710b21efc1e4393930c5dc800010dc4"
         // let _qualityNo = "SGRK202112140060003"
-        let _userCompId = this.barCode.split('&')[0]
+        let _userCompId = this.barCode.split('&')[0].toLocaleLowerCase()
         let _qualityNo = this.barCode.split('&')[1]
-        let _userHouseId = this.barCode.split('&')[2]
-        this.cangid = this.barCode.split('&')[2]
+        let _userHouseId = this.barCode.split('&')[2].toLocaleLowerCase()
+        this.cangid = this.barCode.split('&')[2].toLocaleLowerCase()
         if(_userCompId.indexOf(',') != -1){
          _userCompId =  _userCompId.split(',')[1]
         }

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -278,7 +278,7 @@
               statusFlag: row.statusFlag,
               tare: row.tare,
               warehouseName: row.warehouseName,
-              warehouseInOutDetail: row.warehouseInOutDetail,
+              warehouseInOutDetail: JSON.stringify(row.warehouseInOutDetail),
               warehouseType: this.deptBudgetList.warehouseType,
               createType: this.createType,
               temporaryOutType: row.temporaryOutType,
@@ -295,6 +295,8 @@
               automaticWeightAcquisition: row.automaticWeightAcquisition,
               outType:row.outType,//运输类型
               carId:row.carId,//派车id
+              tranCarNo:row.tranCarNo,//派车编号
+              selfLoading:row.selfLoading,
             },
           })
         } else if (row.inOutFlag == 1) {
@@ -329,7 +331,7 @@
               statusFlag: row.statusFlag,
               tare: row.tare,
               warehouseName: row.warehouseName,
-              warehouseInOutDetail: row.warehouseInOutDetail,
+              warehouseInOutDetail: JSON.stringify(row.warehouseInOutDetail),
               warehouseType: this.deptBudgetList.warehouseType,
               temporaryOutType: this.temporaryOutType,
               cost: row.cost,
@@ -345,6 +347,8 @@
               automaticWeightAcquisition: row.automaticWeightAcquisition,
               outType:row.outType,//运输类型
               carId:row.carId,//派车id
+              tranCarNo:row.tranCarNo,//派车编号
+              selfLoading:row.selfLoading,
             },
           })
         }

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -593,7 +593,7 @@
       this.dataList.inOutFlag = this.$route.inOutFlag
       this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
       this.dataList.statusFlag = this.$route.statusFlag
-      this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
+      this.dataList.warehouseInOutDetail = JSON.parse(this.$route.query.warehouseInOutDetail) 
       this.dataList.warehouseType = this.$route.query.warehouseType
       this.dataList.createType = this.$route.query.createType
       this.dataList.temporaryOutType = this.$route.query.temporaryOutType

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -542,9 +542,11 @@
       this.dataList.inOutFlag = this.$route.inOutFlag
       this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
       this.dataList.statusFlag = this.$route.statusFlag
-      this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
+      this.dataList.warehouseInOutDetail = JSON.parse(this.$route.query.warehouseInOutDetail)
       this.dataList.outType = this.$route.query.outType//运输方式
-      this.dataList.selfLoading = this.$route.query.selfLoading//
+      this.dataList.tranCarNo = this.$route.query.tranCarNo,//派车编号
+      this.dataList.selfLoading = this.$route.query.selfLoading,
+      // this.dataList.selfLoading = this.$route.query.selfLoading//
       // if (this.$route.query.automaticWeightAcquisition == '1') {
       //   this.isShowBalance = true
       // }