浏览代码

打印bug 修复

lilei 3 年之前
父节点
当前提交
fcfd555e79

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "iSCM智慧供应链",
     "appid" : "__UNI__5B57B68",
     "description" : "iSCM智慧供应链系统",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 3
pages/common/printTag/printTag.vue

@@ -105,13 +105,13 @@
 					return
 				}
 				let top = 10 // 距离顶部10点像素
-				const left = 32 // 距离左边
+				const left = 8 // 距离左边
 				const lightHeight = 24 // 行高3mm,1mm = 8点
 				const pageW = 40 // 页签宽度mm
 				const pageH = 30 // 页签高度mm
 				const maxFontNums = Math.floor((pageW*8-left*2)/lightHeight) // 每行最多字体数
 				let rightTop = 0
-				let rightLeft = Math.floor(maxFontNums*0.7)*lightHeight
+				let rightLeft = Math.floor(maxFontNums*0.6)*lightHeight
 				// 初始化打印机
 				const command = tsc.jpPrinter.createNew()
 				command.init()
@@ -124,7 +124,6 @@
 				top = top+10
 				rightTop = top
 				const lwidth = Math.floor(maxFontNums*0.6)
-				rightLeft = (lwidth + 1.5) * lightHeight
 				top = textFormat(command,this.printInfo.shelfName,lwidth,left,top,lightHeight,"left",1)
 				// 产品编码
 				top = top+10

+ 1 - 1
pages/replenishmentManage/chooseTypeModal.vue

@@ -86,7 +86,7 @@
 		z-index: 9999999;
 		.modal-con{
 			width: 78%;
-			margin: 59% auto 0;
+			margin: 40vh auto 0;
 			background-color: #fff;
 			border-radius: 24upx;
 			.modal-title{

+ 1 - 0
pages/replenishmentManage/confirm.vue

@@ -133,6 +133,7 @@
 					if (res.status == 200) {
 						this.toashMsg(res.message)
 						uni.$emit('refreshBL')
+						uni.$emit("refreshBhList",'WAIT_OUT_STOCK')
 						uni.navigateBack()
 					}else{
 						this.toashMsg(res.message)

+ 2 - 3
pages/replenishmentManage/manualPrint.vue

@@ -85,13 +85,13 @@
 				const dealer = this.$store.state.vuex_userData
 				console.log(opt,data,'opt')
 				let top = 10 // 距离顶部10点像素
-				const left = 32 // 距离左边
+				const left = 8 // 距离左边
 				const lightHeight = 24 // 行高3mm,1mm = 8点
 				const pageW = 40 // 页签宽度mm
 				const pageH = 30 // 页签高度mm
 				const maxFontNums = Math.floor((pageW*8-left*2)/lightHeight) // 每行最多字体数
 				let rightTop = 0
-				let rightLeft = Math.floor(maxFontNums*0.7)*lightHeight
+				let rightLeft = Math.floor(maxFontNums*0.6)*lightHeight
 				// 初始化打印机
 				const command = tsc.jpPrinter.createNew()
 				command.init()
@@ -104,7 +104,6 @@
 				top = top+10
 				rightTop = top
 				const lwidth = Math.floor(maxFontNums*0.6)
-				rightLeft = (lwidth + 1.5) * lightHeight
 				top = textFormat(command,this.basicInfoData.shelfInfo.shelfName,lwidth,left,top,lightHeight,"left",1)
 				// 产品编码
 				top = top+10

+ 1 - 21
pages/replenishmentManage/outWarehousing.vue

@@ -33,7 +33,7 @@
 
 <script>
 	import printStickerModal from './printStickerModal.vue'
-	import { shelfReplenishDetail, shelfReplenishDetailList, shelfReplenishPutStock } from '@/api/shelfReplenish'
+	import { shelfReplenishDetail, shelfReplenishDetailList } from '@/api/shelfReplenish'
 	import partList from '@/pages/common/partList.vue'
 	export default {
 		components: { partList, printStickerModal },
@@ -92,26 +92,6 @@
 					}
 				})
 			},
-			// 确认签收 confirm
-			modalConfirm(){
-				const arr = []
-				this.partList.map((item, index) => {
-				  if (item.putQty || item.putQty == 0) {
-				    arr.push({ productSn: item.productSn, putQty: item.putQty })
-				  }
-				})
-				const params = {
-				  replenishBillSn: this.replenishBillSn,
-				  detailList: arr
-				}
-				shelfReplenishPutStock(params).then(res => {
-					if(res.status == 200){
-						uni.$emit('refreshBL')
-						uni.navigateBack()
-					}
-					this.toashMsg(res.message)
-				})
-			},
 			// 打印贴签 confirm
 			modalPrint(type){
 				this.printModal = false

+ 10 - 6
pages/replenishmentManage/replenishmentList.vue

@@ -85,12 +85,9 @@
 		onLoad(options) {
 			const _this = this
 			if(options&&options.billState){  // 指定单据状态
-				this.tabList.map((item,index) => {
-					if(item.status == options.billState){
-						_this.swiperCurrent = index
-						_this.current = index
-					}
-				})
+				const index = this.tabList.findIndex(item => item.status == options.billState)
+				_this.swiperCurrent = index
+				_this.current = index
 			}else{
 				_this.swiperCurrent = 0
 				_this.current = 0
@@ -98,6 +95,8 @@
 			// 监听整改完成后刷新事件
 			uni.$on('refreshBL', this.queryByTypeSum)
 			this.queryByTypeSum()
+			// 跳到指定tab
+			uni.$on('refreshBhList',this.refreshBhList)
 		},
 		onUnload() {
 			uni.$off('refreshBL')
@@ -205,6 +204,11 @@
 					}
 				})
 			},
+			refreshBhList(tab){
+				const _this = this
+				const index = this.tabList.findIndex(item => item.status == tab)
+				_this.tabsChange(index)
+			}
 		}
 	}
 </script>

+ 1 - 0
pages/replenishmentManage/scanCodePrint.vue

@@ -114,6 +114,7 @@
 				 
 				// 扫码成功后
 				this.barcode.onmarked = function(type, result) {
+					console.log(type,result)
 					_this.scanResult(result)
 				}
 				// 扫码识别出错

+ 6 - 1
pages/replenishmentManage/sendOutGoods.vue

@@ -105,7 +105,12 @@
 				  if (res.status == 200) {
 				    _this.toashMsg(res.message)
 					_this.chooseModal = false
-					uni.navigateTo({ url: '/pages/replenishmentManage/replenishmentList?billState=WAIT_OUT_STOCK' })
+					
+					uni.$emit('refreshBL')
+					uni.$emit("refreshBhList",'WAIT_CHECK')
+					uni.navigateBack({
+						delta:2
+					})
 				  }else{
 					  _this.toashMsg(res.message)
 				  }

+ 1 - 0
pages/replenishmentManage/signWarehousing.vue

@@ -117,6 +117,7 @@
 				shelfReplenishPutStock(params).then(res => {
 					if(res.status == 200){
 						uni.$emit('refreshBL')
+						uni.$emit("refreshBhList",'FINISH')
 						uni.navigateBack()
 					}
 					this.toashMsg(res.message)