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

mycomponents/balance/bussinessType.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="business_view uni-inline-item">
+	<view class="business_view">
 		<text class="card_business">{{businessTypeDesc(bussinessType)}}</text>
 		<text class="card_business_content">{{number}}</text>
 	</view>

mycomponents/wincom/winScanContainerNumber.vue

@@ -1,110 +0,0 @@
-<template>
-	<winScanStandard ref="standard" :title="title" @getScanResult="getScanResult">
-
-	</winScanStandard>
-</template>
-
-<script>
-	import {
-		getContainerByNumber,
-	} from '@/api/request.js';
-	 
-	import winScanStandard from '@/mycomponents/wincom/scanCom/winScanStandard.vue'
-	export default {
-		components: {
-			winScanStandard
-		},
-		emits: ["getScanCode"],
-		props: {
-			title: {
-				type: String,
-				default: '器具代码'
-			},
-			locationTypeList: {
-				type: Array,
-				default: []
-			},
-			isJudgeStatus: {
-				type: Boolean,
-				default: true
-			},
-		},
-		data() {
-			return {
-				code: '',
-				number: '',
-				container: {}
-			}
-		},
-
-		created() {
-
-		},
-		methods: {
-			openScanPopup() {
-				this.$refs.standard.openScanPopup()
-			},
-			closeScanPopup() {
-				this.$refs.standard.closeScanPopup()
-			},
-			scanClick() {
-				this.$refs.standard.clickScanMsg();
-			},
-			cancelClick() {
-				this.$refs.standard.clearScanValue();
-			},
-			getScanResult(result) {
-				if (result.label.Type == "QRCode") {
-					this.code = result.label.itemCode;
-				} else if (result.label.Type == "BarCode") {
-					this.code = result.label.code;
-				}
-
-				uni.showLoading({
-					title: '扫描中...',
-					mask: true
-				});
-
-				getContainerByNumber(this.code).then(res => {
-					uni.hideLoading();
-
-					if (res.data.total > 0) {
-						var number = res.data.list[0].number;
-						var type = res.data.list[0].type;
-						var status = res.data.list[0].status;
-						if (this.isJudgeStatus) {
-							if (status == 'qjztUsed') {
-								this.container = res.data.list[0];
-								this.callBack();
-							} else {
-								this.$refs.standard.showWarningMessage("扫描器具[" + this.code + "]不可用", res => {})
-							}
-
-						}
-
-					} else {
-						this.$refs.standard.showWarningMessage('未查询到器具' + '【' + this.code + '】', res => {
-
-						})
-					}
-				}).catch(error => {
-					uni.hideLoading();
-					this.$refs.standard.showWarningMessage(error, res => {
-
-					})
-				})
-			},
-			callBack() {
-				this.closeScanPopup();
-				this.$emit("getScanCode", this.container, this.number);
-			},
-			getfocus() {
-				this.$refs.standard.getfocus();
-			},
-
-		}
-	}
-</script>
-
-<style>
-</style>

pages/query/coms/comItemBalance.vue

@@ -1,6 +1,6 @@
 <template>
 	<view :class="dataContent.scaned?'scan_view':''" style="width: 100%;">
-		<view class="uni-flex uni-row space-between uni-inline-item">
+		<view class="uni-flex uni-row space-between">
 			<view>
 				<pack v-if="isShowPack" :packingCode="dataContent.packingNumber"></pack>
 				<batch v-if="isShowBatch" :batch="dataContent.batch"></batch>

pages/query/coms/comItemDetailCard.vue

@@ -2,17 +2,11 @@
 	<view>
 		<com-empty-view v-if="itemList.length==0"></com-empty-view>
 		<view class="" style="background-color: #fff; width: 100%;" v-for="(item,index) in itemList">
-			
+			<!-- <view class="flex uni-center u-col-center" style="flex-direction: row; "> -->
-			<view class="flex uni-center u-col-center" style="flex-direction: row; ">
+			<view>
-				<!-- <view class="" style="font-size: 30rpx;margin: 10rpx;">
+				<com-item-balance :dataContent="item" :isShowStdPack="false" :isShowPack="isShowPack"
-					({{index+1}})
+					:isShowBatch="isShowBatch" :isShowLocation="isShowLocation" :isShowBusiness="isShowBusiness">
-				</view> -->
+				</com-item-balance>
-				<comItemBalance :dataContent="item"
-				 :isShowStdPack="false" 
-				 :isShowPack="isShowPack"
-				 :isShowBatch="isShowBatch"
-				 :isShowLocation ="isShowLocation"
-				 :isShowBusiness="isShowBusiness"></comItemBalance>
 			</view>
 		</view>
 	</view>
@@ -74,8 +68,7 @@
 				default: false
 			},
 		},
-		methods: {
+		methods: {}
-		}
 	}
 </script>
 

pages/query/coms/comLocationDetailCard.vue

@@ -6,12 +6,11 @@
 				<template v-slot:title>
 					<itemQty :dataContent="dataContent" :isShowBalance="true"></itemQty>
 				</template>
-				<u-line />
+			 
 				<view v-for="(item, index) in dataContent.list">
 					<balance :dataContent="item" :isShowFromLocation="false" :isShowPack="isShowPack"
 						:isShowStdPack="false">
 					</balance>
-					<u-line />
 				</view>
 			</uni-collapse-item>
 		</uni-collapse>

pages/query/container.vue

@@ -52,7 +52,7 @@
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import comLocationDetailCard from '@/pages/query/coms/comLocationDetailCard.vue'
-	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
+	import winScanContainer from "@/mycomponents/scan/winScanContainer.vue"
 	import containerInfo from '@/mycomponents/container/containerInfo.vue'
 
 	export default {
@@ -64,7 +64,9 @@
 			comMessage,
 			comLocationDetailCard,
 			winScanItem,
-			containerInfo
+			containerInfo,
+			winScanContainer
+			
 		},
 		data() {
 			return {

pages/query/location.vue

@@ -8,7 +8,6 @@
 			<template #top>
 				<view v-if="locationCode!=''">
 					<location-info :locationDetail='locationDetail' v-if="locationCode"></location-info>
-					<u-line />
 					<z-tabs :list="tabList" @change="tabChange" />
 				</view>