Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/pages/issue/coms/comIssueRequestPopup.vue

@@ -13,7 +13,7 @@
 					<view class='split_line'></view>
 					<view class="uni-flex uni-column" style="background-color: white; ">
 						<view class="uni-flex uni-column  ">
-							<view class="uni-flex uni-row padding title u-col-center">
+							<!-- <view class="uni-flex uni-row padding title u-col-center">
 								<text>从仓库代码：</text>
 								<view class="uni-flex u-col-center uni-row" @click="showWarseHouseSelect">
 									<view class="" style="margin-left: 20rpx;width: 100% ">
@@ -22,8 +22,8 @@
 									<u-select v-model="showWareHouse" mode="single-column" :list="wareHouseList"
 										@confirm="confirmWareHouse"></u-select>
 								</view>
-							</view>
+							</view> -->
-							<view class='split_line'></view>
+							<!-- <view class='split_line'></view> -->
 	<view class="uni-flex uni-row" style="align-items: center;
 								background-color: #fff; 
 								margin-right: 20rpx;
@@ -278,10 +278,10 @@
 					return
 				}
 
-				if (this.fromWarehouseCode == "请选择仓库代码") {
+				// if (this.fromWarehouseCode == "请选择仓库代码") {
-					this.showErrorMessage("请选择仓库代码")
+				// 	this.showErrorMessage("请选择仓库代码")
-					return
+				// 	return
-				}
+				// }
 
 
 				if (this.itemCode == "请扫描物料信息") {

src/pages/package/record/overPackageRecord.vue

@@ -168,9 +168,13 @@
 			this.getBusinessType();
 			
 			this.$nextTick(()=>{
-				const overPackageRecordPointParams = uni.getStorageSync('overPackageRecordPointParams')
+				if(uni.getStorageSync('overPackageRecordPointParams')){
-				console.log(233,uni.getStorageSync('overPackageRecordPointParams'))
+					const overPackageRecordPointParams = uni.getStorageSync('overPackageRecordPointParams')
-				this.$refs.printService.setDefaultData(overPackageRecordPointParams.printDeafult,overPackageRecordPointParams.templateDeafult)	
+					this.dataContent.printerUuid = overPackageRecordPointParams.printDeafult.value;
+					this.dataContent.modelCode = overPackageRecordPointParams.templateDeafult.value;
+					this.$refs.printService.setDefaultData(overPackageRecordPointParams.printDeafult,overPackageRecordPointParams.templateDeafult)	
+				}
+				
 			})
 		},
 		//返回首页