achao 2 years ago
parent
commit
e6c4b74d99
2 changed files with 16 additions and 7 deletions
  1. 8 0
      pages/erpbusiness/sendCommand.vue
  2. 8 7
      pages/user/contractLook/inventoryCost.vue

+ 8 - 0
pages/erpbusiness/sendCommand.vue

@@ -10,6 +10,7 @@
 			<view style='margin-top:4%;display: flex;flex-direction: column;'>
 				<button type='primary' class="btn" @tap='receiptTest' :loading='isReceiptSend'
 					:disabled='isReceiptSend'>打印质检单小票</button>
+				<button type='primary' class="btn" @tap='clearBlue'>重新连接蓝牙</button>
 				<button type='primary' class="btn" @tap='goToList'>返回列表页</button>
 				<!-- <button type='primary' @tap='labelTest' :loading='isLabelSend' :disabled='isLabelSend'>标签测试</button> -->
 			</view>
@@ -157,6 +158,13 @@
 			//    })	
 		},
 		methods: {
+			clearBlue() {
+				this.$store.commit('BLEInformationSet', '');
+				uni.showToast({
+					title: '请重新打印质检小票',
+					icon: 'none'
+				})
+			},
 			goToList() {
 				uni.navigateTo({
 					url: '/pages/erpbusiness/quality_testing?managementType=1'

+ 8 - 7
pages/user/contractLook/inventoryCost.vue

@@ -10,7 +10,7 @@
 				<view class="goods-table-title">
 					<view class="font">货名</view>
 					<view class="font">储量(吨)</view>
-					<view class="font">价值(元)</view>
+					<view class="font">平均成本</view>
 				</view>
 				<view class="goods-table-content" v-for="(item1,index1) in item.goodList">
 					<view class="font" :class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">
@@ -84,7 +84,7 @@
 				value: '入库记录',
 				costList: [],
 				isShowDetailBtn: false,
-				searchMonth:'2022-10-10'
+				searchMonth: '2022-10-10'
 			}
 		},
 		onLoad: function(option) {
@@ -101,9 +101,10 @@
 					url: '/pages/public/login'
 				})
 			},
-			goposition(item){
+			goposition(item) {
 				uni.navigateTo({
-					url: '/pages/user/contractLook/position?warehouse='+item.warehouseName+'&warehouseType='+item.warehouseType
+					url: '/pages/user/contractLook/position?warehouse=' + item.warehouseName + '&warehouseType=' +
+						item.warehouseType
 				})
 			},
 			cancelClick() {
@@ -172,7 +173,7 @@
 					this.$api.doRequest('get', '/costManagementInfo/selectCostManagementInfo', {
 						compId: uni.getStorageSync('pcUserInfo').compId,
 						warehouseType: 1,
-						searchMoth:this.searchMonth
+						searchMoth: this.searchMonth
 					}).then(res => {
 						uni.hideLoading()
 						if (res.data.data) {
@@ -216,7 +217,7 @@
 					groups[group].push(item);
 				});
 				return Object.keys(groups).map(function(group) {
-					console.log(groups,groups[group])
+					console.log(groups, groups[group])
 					return groups[group];
 				})
 			}
@@ -311,7 +312,7 @@
 
 		.goods-table-content {
 			display: flex;
-			margin: 22rpx;
+			margin: 22rpx 0;
 			font-size: 28rpx;
 			font-weight: 400;
 			color: #333333;