diff --git a/src/App.vue b/src/App.vue
index 01203cc..06367f4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -67,4 +67,30 @@
 </script>
 <style lang="scss">
 	@import 'vk-uview-ui/index.scss';
+	// @import "./uni_modules/vk-uview-ui/index.scss";
+	@import './common/style/new_style.css';
+	@import './common/style/uni.css';
+	@import './common/style/pdabasic.css';
+	@import './uni.scss';
+	@import './static/scss/index.scss';
+	@import './static/ali_icon/iconfont.css';
+	
+	
+	body {
+		background-color: #EBEEF0;
+	}
+	
+	.content {
+		background-color: #fff
+	}
+	
+	page {
+		// #ifdef APP-PLUS
+		height: 100vh;
+		// #endif
+	
+		// #ifdef H5
+		// height: calc(100vh-94px);
+		// #endif
+	}
 </style>
\ No newline at end of file
diff --git a/src/mycomponents/Batch/Batch.vue b/src/mycomponents/Batch/Batch.vue
new file mode 100644
index 0000000..d251eac
--- /dev/null
+++ b/src/mycomponents/Batch/Batch.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="batch_view">
+		<text class="card_batch">批次</text>
+		<text class="card_batch_content">&nbsp{{batch}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+			}
+		},
+		props: {
+			batch:{
+				type: String,
+				default: ""
+			}
+		},
+		
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
new file mode 100644
index 0000000..545dc79
--- /dev/null
+++ b/src/mycomponents/balance/balance.vue
@@ -0,0 +1,147 @@
+<template>
+	<view :class="dataContent.scaned?'scan_view':''" style="background-color: #ffffff;margin-bottom: 1px; ">
+		<view class="uni-flex uni-row space-between" style="align-items: center">
+			<view>
+				<pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>
+				<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
+				<location title="来源库位" v-if="isShowFromLocation" :locationCode="dataContent.locationCode"></location>
+				<to-location title="目标库位" v-if="isShowToLocation" :locationCode="dataContent.toLocationCode">
+				</to-location>
+			</view>
+			<view>
+				<!-- 	<qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
+					:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty> -->
+				<qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent"
+					:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty>
+				<compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)"
+					:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack">
+				</compare-qty>
+				<!-- <view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
+					<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>
+					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
+				</view> -->
+			</view>
+		</view>
+		<!-- <u-line></u-line> -->
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import toLocation from '@/mycomponents/balance/toLocation.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	// import config from '@/static/config.js'
+
+	export default {
+		components: {
+			pack,
+			location,
+			toLocation,
+			batch,
+			qty,
+			recommendQty,
+			compareQty,
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			isShowToLocation: {
+				type: Boolean,
+				default: false
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+			copy() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HPQ;V1.0;I" + this.dataContent.itemCode + ";P" + this.dataContent.packingNumber + ";B" +
+					this.dataContent.batch + ";Q" + this.dataContent.qty
+				// #ifdef H5
+				this.$copyText(content).then(
+					res => {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none'
+						})
+					}
+				)
+				// #endif
+				// #ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: () => {
+						uni.showToast({
+							title: '复制采购标签成功'
+						})
+					}
+				})
+				// #endif
+			},
+			copyPro() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HMQ;V1.0;I" + this.dataContent.itemCode + ";P" + this.dataContent.packingNumber + ";B" +
+					this.dataContent.batch + ";Q" + this.dataContent.qty
+				// #ifdef H5
+				this.$copyText(content).then(
+					res => {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none'
+						})
+					}
+				)
+				// #endif
+				// #ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: () => {
+						uni.showToast({
+							title: '复制制品标签成功'
+						})
+					}
+				})
+				// #endif
+			},
+			// isDevlement() {
+			// 	return config.isDevelopment;
+			// }
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/balance/balanceDetailPopup.vue b/src/mycomponents/balance/balanceDetailPopup.vue
new file mode 100644
index 0000000..62c0be1
--- /dev/null
+++ b/src/mycomponents/balance/balanceDetailPopup.vue
@@ -0,0 +1,88 @@
+<template>
+	<uni-popup ref="popup">
+		<view class="pop_detail" style="height:80%">
+
+
+			<!-- <com-item :dataContent="dataContent.package"></com-item>
+			<u-line></u-line>
+			<scroll-view style="height:320px ">
+				<view v-for="(item, index) in dataList" style="width: 100%;">
+					<view class="item">
+						<text class="item_title">{{item.item_title}} </text>
+						<text v-if="(item.type=='')||(item.type==undefined)" class="text_wrap">{{item.content}} </text>
+						<text v-else-if="item.type=='dateTime'" class="text_wrap">{{formatDate(item.content)}} </text>
+						<text v-else-if="item.type=='boolean'" class="text_wrap">{{boolean(item.content)}} </text>
+					</view>
+				</view>
+			</scroll-view> -->
+
+			<view class="uni-flex u-row-center ">
+				<view class="close_button" @click="closePopup">
+					关闭</view>
+				<!-- button 滚动不好使 -->
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
+	import detailBalanceInfo from '@/mycomponents/detail/detailBalanceInfo.vue'
+	import detailPackageInfo from '@/mycomponents/detail/detailPackageInfo.vue'
+
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+
+	export default {
+		emits: ['onClose'],
+		components: {
+			detailItemInfo,
+			detailBalanceInfo,
+			detailPackageInfo
+
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				},
+				dataList: []
+			}
+		},
+
+		mounted() {},
+		props: {
+
+		},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			// avaliable(value) {
+			// 	return value == "TRUE" ? "可用" : "不可用"
+			// },
+			// boolean(value) {
+			// 	return value == "TRUE" ? "是" : "否"
+			// },
+			// formatDate(val) {
+			// 	return dateFormat(val)
+			// },
+
+			closePopup(val) {
+				this.$refs.popup.close('bottom')
+				// this.$emit('onClose')
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/balance/balanceLabel.vue b/src/mycomponents/balance/balanceLabel.vue
new file mode 100644
index 0000000..1b20c0f
--- /dev/null
+++ b/src/mycomponents/balance/balanceLabel.vue
@@ -0,0 +1,57 @@
+<template>
+	<view :class="dataContent.scaned?'scan_view':''">
+		<balance :dataContent="dataContent" :isShowStdPack="false" :isShowPack="isShowPack" :isShowFromLocation="isShowLocation"></balance>
+		<purchase-info :dataContent="packageContent"></purchase-info>
+	</view>
+</template>
+
+<script>
+	import balance from '@/mycomponents/balance/balance.vue'
+	import purchaseInfo from '@/mycomponents/purchase/purchaseInfo.vue'
+	export default {
+		components: {
+			balance,
+			purchaseInfo
+		},
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			packageContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/balance/balanceMove.vue b/src/mycomponents/balance/balanceMove.vue
new file mode 100644
index 0000000..c906afe
--- /dev/null
+++ b/src/mycomponents/balance/balanceMove.vue
@@ -0,0 +1,98 @@
+<template>
+	<view :class="dataContent.scaned?'scan_view':''">
+		<view class="uni-flex uni-row space-between uni-inline-item">
+			<view>
+				<pack v-if="isShowPack" :packingCode="dataContent.packingNumber"></pack>
+				<batch v-if="isShowBatch" :batch="dataContent.batch"></batch>
+				<location v-if="isShowLocation" :locationCode="dataContent.locationCode"></location>
+			</view>
+			<view>
+				<qty :isShowStatus="dataContent.inventoryStatus==dataContent.toInventoryStatus" v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
+					:isShowStdPack="isShowStdPack"></qty>
+
+				<compare-qty v-else :dataContent="dataContent" :recommendQty="dataContent.qty"
+					:handleQty="dataContent.record.qty" :isShowStdPack="isShowStdPack">
+				</compare-qty>
+				<moveStatus v-if="dataContent.inventoryStatus!=dataContent.toInventoryStatus"  :fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus">
+				</moveStatus>
+
+			</view>
+		</view>
+		<u-line></u-line>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import moveStatus from '@/mycomponents/balance/moveStatus.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			qty,
+			recommendQty,
+			compareQty,
+			moveStatus
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBusiness: {
+				type: Boolean,
+				default: false
+			},
+			scaned: {
+				type: Boolean,
+				default: true
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/balance/balanceSelect.vue b/src/mycomponents/balance/balanceSelect.vue
new file mode 100644
index 0000000..0b63c99
--- /dev/null
+++ b/src/mycomponents/balance/balanceSelect.vue
@@ -0,0 +1,54 @@
+<!--发料任务卡片-->
+<template>
+	<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<uni-popup ref="popupItems" type="center">
+		<scroll-view scroll-y="true" style="background-color: #EEEEEE;height: 90vh;">
+			<item :dataContent="balanceItems[0]"></item>
+			<view class="popinpop count_shadow" style="width: 90vw;margin: 20rpx 20rpx 30rpx 20rpx;"
+				v-for="(item, index) in balanceItems" :key="item.id" @click="callback(item)">
+				<balance :dataContent="item"></balance>
+			</view>
+		</scroll-view>
+	</uni-popup>
+</template>
+
+<script>
+	import item from '@/mycomponents/item/item.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+
+	export default {
+		name: "balanceSelect",
+		emits: ['onSelectItem'],
+		components: {
+			item,
+			balance
+		},
+		data() {
+			return {
+				balanceItems: [],
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			// datacontent: {
+			// 	type: Object,
+			// 	value: null
+			// }
+		},
+		methods: {
+			openPopup(items) {
+				this.balanceItems = items;
+				this.$refs['popupItems'].open("center");
+			},
+
+			callback(item) {
+				this.$emit("onSelectItem", item);
+				this.$refs['popupItems'].close();
+			},
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/mycomponents/balance/batch.vue b/src/mycomponents/balance/batch.vue
new file mode 100644
index 0000000..1fda071
--- /dev/null
+++ b/src/mycomponents/balance/batch.vue
@@ -0,0 +1,24 @@
+<template>
+	<view class="card_view ">
+		<text class="card_batch card_content ">批次</text>
+		<text class="card_content ">{{batch}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {}
+		},
+		props: {
+			batch: {
+				type: String,
+				default: ""
+			}
+		},
+
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/balance/bussinessType.vue b/src/mycomponents/balance/bussinessType.vue
new file mode 100644
index 0000000..82029e3
--- /dev/null
+++ b/src/mycomponents/balance/bussinessType.vue
@@ -0,0 +1,37 @@
+<template>
+	<view class="business_view">
+		<text class="card_business">{{businessTypeDesc(bussinessType)}}</text>
+		<text class="card_business_content">{{number}}</text>
+	</view>
+</template>
+
+<script>
+	import {
+		getBusinessTypeDesc
+	} from '@/common/directory.js';
+	export default {
+		data() {
+			return {}
+		},
+		props: {
+			bussinessType: {
+				type: String,
+				default: ""
+			},
+			number: {
+				type: String,
+				default: ""
+			}
+		},
+		methods:{
+			businessTypeDesc(type){
+				return getBusinessTypeDesc(type)
+			}
+			
+		}
+
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/balance/handleBalance.vue b/src/mycomponents/balance/handleBalance.vue
new file mode 100644
index 0000000..1707d4a
--- /dev/null
+++ b/src/mycomponents/balance/handleBalance.vue
@@ -0,0 +1,80 @@
+<template>
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
+		<view class="space_between center" >
+			<view style="word-break: break-all;width: 60%;">
+				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
+				<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
+			</view>
+			<view style="word-break: break-all;">
+				<recommend-qty v-if="detail.record==null || detail.record==undefined" :dataContent="detail"
+					:isShowStdPack="false"></recommend-qty>
+
+				<compare-qty v-else :dataContent="detail" :recommendQty="detail.qty" :handleQty="detail.record.qty"
+					:isShowStdPack="false">
+				</compare-qty>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.recommend {
+		position: absolute;
+		left: 25px;
+		top: 70px;
+		width: 10px;
+		height: 30px;
+		opacity: 1;
+
+	}
+</style>
diff --git a/src/mycomponents/balance/location.vue b/src/mycomponents/balance/location.vue
new file mode 100644
index 0000000..d5956aa
--- /dev/null
+++ b/src/mycomponents/balance/location.vue
@@ -0,0 +1,31 @@
+<template>
+	<view class="card_view ">
+		<text class="card_location card_content ">{{title}}</text>
+		<text class="card_content ">{{locationCode}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+		},
+		data() {
+			return {}
+		},
+		props: {
+			locationCode: {
+				type: String,
+				default: ''
+			},
+			title: {
+				type: String,
+				default: '库位'
+			},
+			
+		},
+
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/balance/moveStatus.vue b/src/mycomponents/balance/moveStatus.vue
new file mode 100644
index 0000000..b65f39d
--- /dev/null
+++ b/src/mycomponents/balance/moveStatus.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="uni-row uni-flex center" style="font-size: 30rpx;">
+		<status :status='fromInventoryStatus' :showDesc="true"></status>
+		<view class="uni-flex uni-row center"
+			v-if='showToInventoryStatus  && toInventoryStatus!="" &&   toInventoryStatus!=fromInventoryStatus'>
+			<text style="color:#909399 ; ">
+				—>
+			</text>
+			<status :status='toInventoryStatus' :showDesc="true"></status>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import {
+		getInventoryStatusStyle,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+	import status from '@/mycomponents/status/status.vue'
+	export default {
+		components: {
+			status
+		},
+
+		data() {
+			return {
+
+			}
+		},
+
+		props: {
+			fromInventoryStatus: {
+				type: String,
+				default: ''
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ''
+			},
+			showToInventoryStatus: {
+				type: Boolean,
+				default: false
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+			statusStyle(value) {
+				return getInventoryStatusStyle(value);
+			},
+			statusDesc(value) {
+				return getInventoryStatusName(value)
+			}
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/balance/pack.vue b/src/mycomponents/balance/pack.vue
new file mode 100644
index 0000000..dc01084
--- /dev/null
+++ b/src/mycomponents/balance/pack.vue
@@ -0,0 +1,34 @@
+<template>
+	<view class="card_view">
+		<text class="card_packing_code card_content ">箱码</text>
+		<text class="card_content ">{{packingCode}}</text>
+	</view>
+</template>
+
+<script> 
+	export default {
+		components: {
+		},
+
+		data() {
+			return {
+				 
+			}
+		},
+		props: {
+			packingCode: {
+				type: String,
+				default: ''
+			},
+		},
+		watch: {
+			 
+		},
+		methods: {
+			 
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/balance/productionLabel.vue b/src/mycomponents/balance/productionLabel.vue
new file mode 100644
index 0000000..4f3824a
--- /dev/null
+++ b/src/mycomponents/balance/productionLabel.vue
@@ -0,0 +1,59 @@
+<template>
+	<view :class="dataContent.scaned?'scan_view':''">
+		<balance :dataContent="dataContent" :isShowStdPack="false" :isShowPack="isShowPack" 
+		:isShowFromLocation="isShowLocation"></balance>
+		<production-info :dataContent="packageContent"></production-info>
+	</view>
+</template>
+
+<script>
+	import balance from '@/mycomponents/balance/balance.vue'
+	import productionInfo from '@/mycomponents/production/productionInfo.vue'
+	
+	export default {
+		components: {
+			balance,
+			productionInfo
+		},
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			packageContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/balance/purchaseLabel.vue b/src/mycomponents/balance/purchaseLabel.vue
new file mode 100644
index 0000000..92c9736
--- /dev/null
+++ b/src/mycomponents/balance/purchaseLabel.vue
@@ -0,0 +1,58 @@
+<template>
+	<view :class="dataContent.scaned?'scan_view':''">
+		<balance :dataContent="dataContent" :isShowStdPack="false" :isShowPack="isShowPack"
+			:isShowFromLocation="isShowLocation"></balance>
+		<!-- <purchase-info :dataContent="packageContent"></purchase-info> -->
+	</view>
+</template>
+
+<script>
+	import balance from '@/mycomponents/balance/balance.vue'
+	import purchaseInfo from '@/mycomponents/purchase/purchaseInfo.vue'
+	export default {
+		components: {
+			balance,
+			purchaseInfo
+		},
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			packageContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/balance/recommendBalance.vue b/src/mycomponents/balance/recommendBalance.vue
new file mode 100644
index 0000000..ce7daee
--- /dev/null
+++ b/src/mycomponents/balance/recommendBalance.vue
@@ -0,0 +1,84 @@
+<template>
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #fff;">
+		<view class="uni-flex uni-row space-between center ">
+			<view class="uni-flex uni-row " style="width: 60%;margin-left: 30rpx;" >
+				<view style=" width: 25rpx;color: #32C1E8;">
+					推荐
+				</view>
+				<view style="word-break: break-all">
+					<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+					<batch v-if="isShowBatch" :batch="detail.batch"></batch>
+					<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
+				</view>
+			</view>
+			<view style="word-break: break-all">
+				<recommend-qty v-if="detail.Records==null || detail.Records.length==0" :dataContent="detail"
+					:isShowStdPack="false" :isShowStatus="false"></recommend-qty>
+				<compare-qty v-else :dataContent="detail" :recommendQty="Number( detail.qty)"
+					:handleQty="Number(detail.handleQty)" :isShowStdPack="false" :isShowStatus="false">
+				</compare-qty>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/RecommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.recommend {
+		position: absolute;
+		left: 25px;
+		top: 70px;
+		width: 10px;
+		height: 30px;
+		opacity: 1;
+
+	}
+</style>
diff --git a/src/mycomponents/balance/toLocation.vue b/src/mycomponents/balance/toLocation.vue
new file mode 100644
index 0000000..d44ba99
--- /dev/null
+++ b/src/mycomponents/balance/toLocation.vue
@@ -0,0 +1,31 @@
+<template>
+	<view class="card_view ">
+		<text class="card_to_location card_content ">{{title}}</text>
+		<text class="card_content ">{{locationCode}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+		},
+		data() {
+			return {}
+		},
+		props: {
+			locationCode: {
+				type: String,
+				default: ''
+			},
+			title: {
+				type: String,
+				default: '库位'
+			},
+			
+		},
+
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/button/requestButton.vue b/src/mycomponents/button/requestButton.vue
new file mode 100644
index 0000000..8db55a8
--- /dev/null
+++ b/src/mycomponents/button/requestButton.vue
@@ -0,0 +1,57 @@
+<template>
+	<view>
+		<view class="scan_float" @click="goScan('bottom')">
+			<image src="@/static/icons_ui/icon_add.svg"></image>
+			<view>{{btnName}}</view>
+		</view>
+		<!-- <movable-area>
+			<movable-view class="max" direction="all">扫描</movable-view>
+		</movable-area> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				x: 0,
+				y: 0,
+				old: {
+					x: 0,
+					y: 0
+				}
+			}
+		},
+		props: {
+			btnName: {
+				type: String,
+				default: '创建'
+			},
+		
+		},
+		
+		created() {
+
+		},
+		methods: {
+			goScan(content) {
+				this.$emit("goScan", '');
+			},
+			tap: function(e) {
+				this.x = this.old.x
+				this.y = this.old.y
+				this.$nextTick(function() {
+					this.x = 30
+					this.y = 30
+				})
+			},
+			onChange: function(e) {
+				this.old.x = e.detail.x
+				this.old.y = e.detail.y
+			}
+		},
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/common/comBlankView.vue b/src/mycomponents/common/comBlankView.vue
new file mode 100644
index 0000000..96a64f6
--- /dev/null
+++ b/src/mycomponents/common/comBlankView.vue
@@ -0,0 +1,31 @@
+<template>
+	<view class="default_goscan">
+		<image class="img_goscan" src="@/static/icons_ui/default_blank.png"></image>
+		<button @click="goScan">
+			<image src="@/static/icons_ui/icon_add.svg"></image>
+			去扫描
+		</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			goScan(content) {
+				this.$emit("goScan", '');
+			}
+		}
+	}
+</script>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/common/comEmptyView.vue b/src/mycomponents/common/comEmptyView.vue
new file mode 100644
index 0000000..c8b41ab
--- /dev/null
+++ b/src/mycomponents/common/comEmptyView.vue
@@ -0,0 +1,41 @@
+<template>
+	<view class=" " >
+		
+		<view class="">
+			<image class="default_nodata" src="@/static/icons_ui/default_data.png"></image>
+		</view>
+<!-- 
+		<view class="" style="display: flex;flex-direction: column;
+		align-items: center;">
+			<view class="" >
+				<image class="nodata" src="/static/icons_ui/default_data.png"></image>
+			</view>
+
+			<view style="font-size: 40rpx;color: #909193;">
+				暂无数据
+			</view>
+			
+		</view> -->
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		created() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/common/comListHint.vue b/src/mycomponents/common/comListHint.vue
new file mode 100644
index 0000000..7808084
--- /dev/null
+++ b/src/mycomponents/common/comListHint.vue
@@ -0,0 +1,162 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<view class="uni-flex uni-column pop_detail">
+				<view class="uni-flex space-between u-col-center"
+				style="padding-bottom: 15rpx;">
+					<view class="text_ellipsis" v-if="number" style="font-size: 35rpx;flex: 3;">
+						编号:{{number}}
+					</view>
+					
+					<view class="text_ellipsis" v-else style="font-size: 40rpx;">
+						<view class="">
+							{{itemCode}}
+						</view>
+						<view class="">
+							{{itemDesc}}
+						</view>
+					
+					</view>
+					
+					<view class="uni-center" style="flex: 1;">
+						<view v-if="jobStatus==2" class="task_state_doing">
+							<text>执行中</text>
+						</view>
+						<view v-if="jobStatus==1" class="task_state_un-doing">
+							<text>待执行</text>
+						</view>
+					</view>
+				<!-- <view class="" v-else="number">
+					<view class="text_ellipsis" style="font-size: 40rpx;flex: 1;">
+						<view class="">
+							{{itemCode}}
+						</view>
+						<view class="">
+							{{itemDesc}}
+						</view>
+					
+					</view>
+				</view> -->
+					
+				</view>
+				<u-line></u-line>
+				<view class="" v-for="(item, index) in dataList">
+					<view class="item" v-if="(item.title!='worker')" v-show="(item.title!='date')">
+						<text class="item_title">{{item.title}} : </text>
+						<text class="text_wrap">{{item.content}} </text>
+					</view>
+				</view>
+				<u-line></u-line>
+				<view v-if="isShowbottom" style="margin-top: 10rpx;margin-bottom: 10rpx;width: 100%;display: flex;"
+					class="uni-flex uni-row space-between u-col-center">
+					<view class="uni-flex uni-row  u-col-center " style="flex: 1; overflow: hidden;">
+						<image class="card_icon_normal" src="/static/icons/icon_customer.svg" alt="" />
+						<text class="text_ellipsis">{{getContent("worker")}}</text>
+					</view>
+					<view class="uni-flex uni-row  u-col-center " style="flex: 3;justify-content: flex-end;overflow: hidden;">
+						<image class="card_icon_normal" src="/static/icons/icon_date.svg" alt="" />
+						<text>{{formatDate(getContent("date"))}}</text>
+					</view>
+				</view>
+			</view>
+			
+			<view class="uni-flex u-row-center ">
+				<image src="/static/icons/icons_close-circle.svg" 
+				 mode=""
+				 class="icons_close"
+				 @click="closeScanPopup()"
+				 ></image>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat,
+	} from '@/common/basic.js';
+	export default {
+
+		mounted() {
+		},
+
+		props: {
+			title: {
+				type: String,
+				default: ""
+			},
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			
+			number:{
+				type: String,
+				default: ""
+			},
+			jobStatus:{
+				type: Number,
+				default: -1
+			},
+			dataList:{
+				type: Object,
+				default: []
+			},
+			worker:{
+				type: String,
+				default: ""
+			},
+			date:{
+				type: String,
+				default: ""
+			},
+			itemCode:{
+				type: String,
+				default: ""
+			},
+			itemDesc:{
+				type: String,
+				default: ""
+			},
+			isShowbottom:{
+				type: Boolean,
+				default: true
+			}
+		},
+
+		methods: {
+			openScanPopup() {
+				this.$refs.popup.open('center')
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			startEdit() {
+				this.$refs.receiptCountEdit.openScanPopup();
+			},
+			formatDate(val) {
+				return dateFormat(val)
+			},
+			statusColor: function(val) {
+				return getJobStatuDesc(val);
+			},
+			 
+			getContent(title){
+				let items = this.dataList.filter(r => {
+					if (r.title==title) {
+						return r;
+					}
+				})
+				if(items!=null&&items.length>0){
+					return items[0].content;
+				}
+			}
+		}
+
+	}
+</script>
+
+<style>
+	
+</style>
diff --git a/src/mycomponents/common/comListItem.vue b/src/mycomponents/common/comListItem.vue
new file mode 100644
index 0000000..ec9b85b
--- /dev/null
+++ b/src/mycomponents/common/comListItem.vue
@@ -0,0 +1,108 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view class="item" v-for="(item,index) in dataList">
+				<text class="item_title">{{item.title}} : </text>
+				<text v-if="(item.type=='')||(item.type==undefined)" class="text_wrap">{{item.content}} </text>
+				<text v-else-if="item.type=='dateTime'" class="text_wrap">{{formatDate(item.content)}} </text>
+				<text v-else-if="item.type=='boolean'" class="text_wrap">{{boolean(item.content)}} </text>
+				<text v-else-if="item.type=='transferMode'" class="text_wrap">{{getTransferModeName(item.content)}} </text>
+				<text v-else-if="item.type=='locationType'" class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(item.content))}} </text>
+				<text v-else-if="item.type=='uom'" class="text_wrap">{{getUnitInfo(item.content)}} </text>
+				<text v-else-if="item.type=='inspectType'" class="text_wrap">{{getInspectType(item.content)}} </text>
+				<text v-else-if="item.type=='sampleMethod'" class="text_wrap">{{getSampleMethod(item.content)}} </text>
+				<text v-else-if="item.type=='requestState'" class="text_wrap">{{getRequestStateInfo(item.content)}} </text>
+			    <text v-else-if="item.type=='inventoryStatus'" class="text_wrap">{{getInventoryStatusName(item.content)}} </text>
+				 <text v-else-if="item.type=='locationCode'" class="text_wrap">{{getLocationTypeName(item.content)}} </text>
+			
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+	
+	import {
+		getTransferModeName,
+		getLocationTypeNameList,
+		getDirectoryItemArray,
+		getUnitInfo,
+		getInspectType,
+		getSampleMethod,
+		getRequestStateInfo,
+		getInventoryStatusName,
+		getLocationTypeName
+		
+	} from '@/common/directory.js';
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		watch: {
+			// dataContent: {
+			// 	handler(newName, oldName) {
+			// 	},
+			// 	immediate: true,
+			// 	deep: true
+			// }
+		},
+		props: {
+			dataList: {
+				type: Array,
+				default: []
+			}
+		},
+
+		methods: {
+			avaliable(value) {
+				return value == "TRUE" ? "可用" : "不可用"
+			},
+			boolean(value) {
+				return value == "TRUE" ? "是" : "否"
+			},
+			formatDate(val) {
+				return dateFormat(val)
+			},
+			getTransferModeName(value){
+				return getTransferModeName(value)
+			},
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
+			},
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			},
+			getUnitInfo(value){
+				return getUnitInfo(value).label
+			},
+			getInspectType(value){
+				return getInspectType(value)
+			},
+			getSampleMethod(value){
+				return getSampleMethod(value)
+			},
+			getRequestStateInfo(value){
+				return getRequestStateInfo(value).label
+			},
+			getInventoryStatusName(value){
+				return getInventoryStatusName(value)
+			},
+			getLocationTypeName(value){
+				return getLocationTypeName(value)
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue
new file mode 100644
index 0000000..9b560ca
--- /dev/null
+++ b/src/mycomponents/common/comMessage.vue
@@ -0,0 +1,479 @@
+<template name="show-modal">
+	<view>
+		<u-modal v-model="show" :title-style="{color: 'red'}" :title="title" :showTitle="false"
+			:showConfirmButton="false" ref="modal">
+			<view class="slot-content">
+				<slot name="icon">
+					<image class="icon" :src="icon" />
+				</slot>
+				<slot name="content">
+					<rich-text class="content" :nodes="content">
+					</rich-text>
+
+				</slot>
+				<u-line></u-line>
+				<slot name="button">
+					<view class="uni-flex uni-row u-col-center space-between" style="width: 100%;height: 48px;">
+						<view v-if="showCancelButton" class="cance_button" @tap="cancelClose">
+							<text :style="{'color':cancelColor}">{{ cancelText }}</text>
+						</view>
+						<u-line direction="col" length="100%"></u-line>
+						<view v-if="showConfirmButton" class="confirm_button" @tap="confirmClose">
+							<text :style="{'color':confirmColor}">{{confirmText}}</text>
+							<text v-if="showConfirmCountdown">({{seconds}}s关闭)</text>
+						</view>
+					</view>
+				</slot>
+			</view>
+		</u-modal>
+	</view>
+</template>
+
+<script>
+	/**
+	 * modal 模态框
+	 * @description 弹出模态框，常用于消息提示、消息确认、在当前页面内完成特定的交互操作
+	 * */
+	export default {
+		data() {
+			return {
+				timer: null,
+				show: false, // 是否显示
+				iconType: '消息',
+				icon: '../../static/icons/error-circle.svg',
+				title: '', // 提示标题
+				content: '', // 提示内容
+				cancelText: '取消', // 取消按钮的文字  
+				confirmText: '确定', // 确认按钮文字  
+				showCancel: true, // 是否显示取消按钮，默认为 true
+				confirmColor: '#007aff', // 确定按钮颜色
+				cancelColor: null, // 取消按钮颜色
+				showConfirmButton: true, // 是否显示确认按钮
+				showConfirmCountdown: true, // 是否显示确定倒计时
+				showCancelButton: true, // 是否显示取消按钮
+				showClose: false,
+				confirm: false, //为 true 时，表示用户点击了确定按钮
+				cancel: false, //为 true 时，表示用户点击了取消
+				isDisabled: true, //为 true 时，表示用户可以点击，反之则不可以
+				seconds: 0,
+				success: () => {} // 回调方法
+			}
+		},
+
+
+		methods: {
+			open() {
+				this.show = true;
+				this.isDisabled = true;
+			},
+			close() {
+				this.$.refs.modal.popupClose();
+				this.isDisabled = false;
+			},
+			confirmClose() {
+				if (!this.isDisabled) return
+				this.isDisabled = false
+				// console.log('确定点击')
+				if (this.show) {
+					this.show = false;
+					clearInterval(this.timer) //清空timer
+					this.$.refs.modal.popupClose();
+					this.success({
+						// cancel: false,
+						confirm: true,
+					});
+				}
+			},
+
+			cancelClose() {
+				if (!this.isDisabled) return
+				this.isDisabled = false
+				clearInterval(this.timer) //清空timer
+				this.$.refs.modal.popupClose();
+				this.success({
+					// cancel: true,
+					confirm: false,
+				});
+			},
+
+			// 打开消息弹框(确定+倒计时)
+			showMessage(mContent, callback) {
+				this.showConfirmCountdownModal("消息", mContent, callback);
+			},
+
+			// 打开成功弹框(确定+倒计时)
+			showSuccessMessage(mContent, callback) {
+				this.showConfirmCountdownModal("成功", mContent, callback);
+			},
+
+			// 打开失败弹框(确定）
+			showErrorMessage(mContent, callback) {
+				this.showConfirmModal("失败", mContent, callback);
+			},
+
+			// 显示崩溃消息(无确定）
+			showBreakMessage(mContent, callback) {
+				this.showNoButtonModal("失败", mContent, callback);
+			},
+
+			// 打开疑问弹框(取消+确定）
+			showQuestionMessage(mContent, callback) {
+				this.showSelectModal("疑问", mContent, callback);
+			},
+
+			// 打开警告弹框(确定+倒计时)
+			showWarningMessage(mContent, callback) {
+				this.showConfirmCountdownModal("警告", mContent, callback);
+			},
+
+			// 打开失败弹框(确定+倒计时)
+			showConfirmCountdownFailModal(mContent, callback) {
+				this.showConfirmCountdownModal("失败", mContent, callback);
+			},
+
+			// 打开消息弹框(确定）
+			showConfirmMessageModal(mContent, callback) {
+				this.showConfirmModal("消息", mContent, callback);
+			},
+
+			// 打开成功弹框(确定）
+			showConfirmSuccessModal(mContent, callback) {
+				this.showConfirmModal("成功", mContent, callback);
+			},
+
+
+			// 打开警告弹框(确定）
+			showConfirmWarningModal(mContent, callback) {
+				this.showConfirmModal("警告", mContent, callback);
+			},
+
+			// 打开疑问弹框(确定）
+			showConfirmQuestionModal(mContent, callback) {
+				this.showConfirmModal("疑问", mContent, callback);
+			},
+			
+			// 初始化弹框并打开(确定）
+			showNoButtonModal(mIconType, mContent, callback) {
+				this.showModal({
+					iconType: mIconType,
+					content: mContent,
+					showConfirmButton:false,
+					showCancelButton: false,
+					success: function(res) {
+						if (callback != undefined) {
+							if (res.confirm == true) {
+								callback(true);
+							} else {
+								callback(false);
+							}
+						}
+			
+					}
+				});
+			},
+
+			// 初始化弹框并打开(确定）
+			showConfirmModal(mIconType, mContent, callback) {
+				this.showModal({
+					iconType: mIconType,
+					content: mContent,
+					showCancelButton: false,
+					success: function(res) {
+						if (callback != undefined) {
+							if (res.confirm == true) {
+								callback(true);
+							} else {
+								callback(false);
+							}
+						}
+
+					}
+				});
+			},
+
+			// 打开消息弹框(取消+确定）
+			showSelectMessageModal(mContent, callback) {
+				this.showSelectModal("消息", mContent, callback);
+			},
+
+			// 打开成功弹框(取消+确定）
+			showSelectSuccessModal(mContent, callback) {
+				this.showSelectModal("成功", mContent, callback);
+			},
+
+			// 打开失败弹框(取消+确定）
+			showSelectFailModal(mContent, callback) {
+				this.showSelectModal("失败", mContent, callback);
+			},
+
+			// 打开警告弹框(取消+确定）
+			showSelectWarningModal(mContent, callback) {
+				this.showSelectModal("警告", mContent, callback);
+			},
+
+			// 初始化弹框并打开(取消+确定）
+			showSelectModal(mIconType, mContent, callback) {
+				this.showModal({
+					iconType: mIconType,
+					content: mContent,
+					success: function(res) {
+						if (callback != undefined) {
+							if (res.confirm == true) {
+								callback(true);
+								console.log('用户点击确定')
+							} else {
+								callback(false);
+								console.log('用户点击取消')
+							}
+						}
+
+					}
+				});
+			},
+
+			// 打开疑问弹框(确定+倒计时)
+			showConfirmCountdownQuestionModal(mContent, callback) {
+				this.showConfirmCountdownModal("疑问", mContent, callback);
+			},
+
+			// 初始化弹框并打开(确定+倒计时)
+			showConfirmCountdownModal(mIconType, mContent, callback) {
+				this.showModal({
+					iconType: mIconType,
+					content: mContent,
+					showCancelButton: false,
+					showConfirmCountdown: true,
+					success: function(res) {
+						if (callback != undefined) {
+							if (res.confirm == true) {
+								callback(true);
+							} else {
+								callback(false);
+							}
+						}
+					}
+				});
+			},
+
+			// 打开消息弹框(取消+确定+倒计时)
+			showSelectCountdownMessageModal(mContent, callback) {
+				this.showSelectCountdownModal("消息", mContent, callback);
+			},
+
+			// 打开成功弹框(取消+确定+倒计时)
+			showSelectCountdownSuccessModal(mContent, callback) {
+				this.showSelectCountdownModal("成功", mContent, callback);
+			},
+
+			// 打开失败弹框(取消+确定+倒计时)
+			showSelectCountdownFailModal(mContent, callback) {
+				this.showSelectCountdownModal("失败", mContent, callback);
+			},
+
+			// 打开警告弹框(取消+确定+倒计时)
+			showSelectCountdownWarningModal(mContent, callback) {
+				this.showSelectCountdownModal("警告", mContent, callback);
+			},
+
+			// 打开疑问弹框(取消+确定+倒计时)
+			showSelectCountdownQuestionModal(mContent, callback) {
+				this.showSelectCountdownModal("疑问", mContent, callback);
+			},
+
+			// 初始化弹框并打开(取消+确定+倒计时)
+			showSelectCountdownModal(mIconType, mContent, callback) {
+				this.showModal({
+					iconType: mIconType,
+					content: mContent,
+					showConfirmCountdown: true,
+					success: function(res) {
+						if (callback != undefined) {
+							if (res.confirm == true) {
+								callback(true);
+								console.log('用户点击确定')
+							} else {
+								callback(false);
+								console.log('用户点击取消')
+							}
+						}
+					}
+				});
+			},
+
+			// 初始化弹框并打开
+			showModal(data) {
+				if (data.iconType) {
+					this.iconType = data.iconType
+					switch (data.iconType) {
+						case '消息':
+							this.icon = '/static/icons/error-circle.svg';
+							break;
+						case '成功':
+							this.icon = '/static/icons/checkmark-circle.svg';
+							break;
+						case '失败':
+							this.icon = '/static/icons/close-circle.svg';
+							break;
+						case '警告':
+							this.icon = '/static/icons/warning.svg';
+							break;
+						case '疑问':
+							this.icon = '/static/icons/question-circle.svg';
+							break;
+						default:
+							break;
+					}
+				}
+				// image
+				if (data.title) {
+					this.title = data.title
+				}
+				if (data.content) {
+					this.content = data.content
+				} else {
+					this.content = ''
+				}
+				if (data.cancelText) {
+					this.cancelText = data.cancelText
+				} else {
+					this.cancelText = '取消'
+				}
+				if (data.confirmText) {
+					this.confirmText = data.confirmText
+				} else {
+					this.confirmText = '确定'
+				}
+
+				if (data.showCancel === false || data.showCancel === true) {
+					this.showCancel = data.showCancel
+				} else {
+					this.showCancel = true
+				}
+
+				if (data.confirmColor) {
+					this.confirmColor = data.confirmColor
+				} else {
+					this.confirmColor = '#007aff'
+				}
+
+				if (data.cancelColor) {
+					this.cancelColor = data.cancelColor
+				} else {
+					this.cancelColor = '#666F83'
+				}
+
+				if (data.showConfirmButton === false || data.showConfirmButton === true) {
+					this.showConfirmButton = data.showConfirmButton
+				} else {
+					this.showConfirmButton = true
+				}
+
+				if (data.showConfirmCountdown === false || data.showConfirmCountdown === true) {
+					this.showConfirmCountdown = data.showConfirmCountdown
+				} else {
+					this.showConfirmCountdown = false
+				}
+
+				if (data.showCancelButton === false || data.showCancelButton === true) {
+					this.showCancelButton = data.showCancelButton
+				} else {
+					this.showCancelButton = true
+				}
+
+				if (data.success) {
+					this.success = data.success
+				} else {
+					this.success = () => {}
+				}
+				setTimeout(res => {
+					this.open();
+				}, 500)
+				if (this.showConfirmCountdown) {
+					this.startTimer();
+				}
+
+			},
+
+			startTimer() {
+				this.seconds = 3;
+				clearInterval(this.timer)
+				this.timer = setInterval(() => {
+					this.seconds--
+					// console.log("倒计时时间", this.seconds);
+					if (this.seconds <= 0) {
+						this.timeUp()
+						return
+					}
+				}, 1000)
+			},
+
+			timeUp() {
+				// clearInterval(this.timer)
+				console.log('时间到')
+				this.confirmClose();
+			},
+
+		},
+
+
+
+	}
+</script>
+<style lang="scss" scoped>
+	.slot-content {
+		font-size: 36rpx;
+		display: flex; //弹性布局
+		flex-direction: column; //垂直排列
+		align-items: center; //子元素居中
+		// background-image: url()
+	}
+
+	.icon {
+		width: 70rpx;
+		height: 70rpx;
+		opacity: 1; //透明度
+		margin-top: 16px;
+	}
+
+	.title {
+		font-size: 35rpx;
+	}
+
+	.content {
+		width: 100%;
+		margin-top: 16px;
+		margin-bottom: 16px;
+		margin-left: 8px;
+		margin-right: 8px;
+		font-size: 32rpx;
+		text-align: center;
+	}
+
+	.cance_button {
+		width: 100%;
+		margin-top: 10px;
+		margin-bottom: 10px;
+		font-size: 32rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.confirm_button {
+		width: 100%;
+		margin-top: 10px;
+		margin-bottom: 10px;
+		font-size: 32rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.confirm_text {
+		// color: $uni-color-primary;
+	}
+
+	.def_text {
+		color: $uni-color-primary;
+	}
+</style>
diff --git a/src/mycomponents/common/comPopup.vue b/src/mycomponents/common/comPopup.vue
new file mode 100644
index 0000000..d0b37dc
--- /dev/null
+++ b/src/mycomponents/common/comPopup.vue
@@ -0,0 +1,39 @@
+<template>
+	<view>
+		<scroll-view scroll-y="true" style="height: 450px;">
+			<slot></slot>
+		</scroll-view>
+		<view class="uni-flex u-row-center">
+			<image src="/static/icons/icons_close-circle.svg" class="icons_close" @click="closeScanPopup()">
+			</image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		emits: ["onClose"],
+		components: {
+
+		},
+		props: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			closeScanPopup() {
+				this.$emit("onClose", );
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
+
+<style>
+</style>
diff --git a/src/mycomponents/common/comUploadCamera.vue b/src/mycomponents/common/comUploadCamera.vue
new file mode 100644
index 0000000..b1f0857
--- /dev/null
+++ b/src/mycomponents/common/comUploadCamera.vue
@@ -0,0 +1,120 @@
+<!--拍照上传-->
+<template>
+	<view>
+		<!-- <button @click="camera">拍照</button> -->
+		<uni-file-picker ref="files" limit="3" title="最多选择3张图片" :auto-upload="false" v-model="imageValue"
+			:sizeType="sizeType" fileMediatype="image" mode="grid" file-extname="png,jpg" @select="select"
+			@delete="deleteImg" @progress="progress" @success="success" 
+			:disabled="disabled" :del-icon='!disabled'
+			@fail="fail" />
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "uploadCamera",
+		data() {
+			return {
+				imageValue: [],
+				sizeType: ['compressed']
+			}
+		},
+		props: {
+			disabled: {
+				type: Boolean,
+				value: false
+			}
+		},
+		watch: {},
+		methods: {
+			// 父组件上传调用
+			upload() {
+				this.$refs.files.upload()
+			},
+			// 获取上传状态
+			select(e) {
+				console.log('选择文件：', e)
+			},
+
+			//删除
+			deleteImg(e) {
+				console.log('删除：', e)
+			},
+
+			// 获取上传进度
+			progress(e) {
+				console.log('上传进度：', e)
+			},
+
+			// 上传成功
+			success(e) {
+				console.log('上传成功')
+			},
+
+			// 上传失败
+			fail(e) {
+				console.log('上传失败：', e)
+			},
+
+			getFiles() {
+				return this.$refs.files.files;
+			},
+			setFiles(files) {
+				this.$refs.files.files = files;
+			},
+			clearFiles() {
+				this.$refs.files.files = []
+			}
+
+
+			// camera(){
+			// 	let that = this
+			// 	uni.chooseImage({
+			// 		count: 3, //默认9
+			// 		sizeType: ['original'], //原图
+			// 		sourceType: ['camera'], //拍照
+			// 		success: function (res) {
+			// 			console.log(res.tempFilePaths)
+			// 			console.log(JSON.stringify(res.tempFilePaths));
+			// 			that.select({
+			// 				tempFilePaths:[
+			// 					JSON.stringify(res.tempFilePaths[0])
+			// 				],
+			// 				tempFiles:[
+			// 					{path: res.tempFilePaths[0]}
+			// 				]})
+			// 		}
+			// 	});
+			// },
+			// camera(){
+			// 	// 获取摄像头管理对象 getCamera 参数 index 指定要获取摄像头的索引值，1表示主摄像头，2表示辅摄像头。如果没有设置则使用系统默认主摄像头。
+			// 	// 安卓不能默认打开前置摄像头 ios可以
+			// 	const cmr = plus.camera.getCamera()
+			// 	// 字符串数组，摄像头支持的拍照分辨率
+			// 	const res = cmr.supportedImageResolutions[0]
+			// 	// 字符串数组，摄像头支持的拍照文件格式
+			// 	const fmt = cmr.supportedImageFormats[0]
+			// 	// 进行拍照操作
+			// 	cmr.captureImage((path) => {
+			// 	    // this.compressImage(path)
+			// 	    // path 图片地址
+			// 	    console.log(path)
+			// 		plus.gallery.save( path, function () {
+			// 			alert( "保存图片到相册成功" );
+			// 		},(error) => {
+			// 			alert(error);
+			// 		});
+			// 	},
+			// 	(error) => {
+			// 	    console.log('Capture image failed: ' + error.message)
+			// 	}, {
+			// 	    resolution: res,
+			// 	    format: fmt,
+			// 		filename:''
+			// 	})
+			// },
+		}
+	}
+</script>
+<style scoped lang="scss">
+</style>
diff --git a/src/mycomponents/container/container.vue b/src/mycomponents/container/container.vue
new file mode 100644
index 0000000..cf510da
--- /dev/null
+++ b/src/mycomponents/container/container.vue
@@ -0,0 +1,24 @@
+<template>
+	<view class="card_view ">
+		<text class="card_container card_content ">托码</text>
+		<text class="card_content ">{{container}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {}
+		},
+		props: {
+			container: {
+				type: String,
+				default: ""
+			}
+		},
+
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/container/containerInfo.vue b/src/mycomponents/container/containerInfo.vue
new file mode 100644
index 0000000..36ef39f
--- /dev/null
+++ b/src/mycomponents/container/containerInfo.vue
@@ -0,0 +1,54 @@
+<!--包装组件-->
+<template>
+	<view class="">
+		<view class="uni-flex space-between padding_10" style="background-color: #fff;" >
+			<view>
+				<view class="font_xl text_black text_bold">
+					{{ itemDetail.number }}
+				</view>
+				<view class="">
+					总容量 : {{ itemDetail.capacity }}
+				</view>
+			</view>
+			<view class="">
+				<containerStatus :status="itemDetail.status"></containerStatus>
+			</view>
+		</view>
+
+		<itemInfoPopup ref="showHint" :dataContent="itemDetail" :type="'partCode'"></itemInfoPopup>
+	</view>
+
+</template>
+
+<script>
+	import containerStatus from '@/mycomponents/container/containerStatus.vue';
+	import itemInfoPopup from '@/mycomponents/item/itemInfoPopup.vue';
+
+	export default {
+		name: "comItem",
+		components: {
+			itemInfoPopup,
+			containerStatus
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			itemDetail: {
+				type: Object,
+				value: null
+			}
+		},
+		methods: {
+			showHint() {
+				this.$refs.showHint.openScanPopup()
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/container/containerStatus.vue b/src/mycomponents/container/containerStatus.vue
new file mode 100644
index 0000000..c3fe658
--- /dev/null
+++ b/src/mycomponents/container/containerStatus.vue
@@ -0,0 +1,47 @@
+<template>
+	<view class="">
+		<text :class="statusStyle(status)" 
+		style="padding-top: 5rpx;padding-bottom: 5rpx;padding-left: 15rpx;padding-right: 15rpx;">{{statusDesc(status)}}</text>
+	</view>
+</template>
+
+
+
+<script>
+	import {
+		getContainerStatusInfo
+	} from '@/common/directory.js';
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+
+			};
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {},
+			},
+			status: {
+				type: String,
+				default: "",
+			},
+		},
+
+		methods: {
+			statusDesc(value) {
+				return getContainerStatusInfo(value).name
+			},
+			statusStyle(value) {
+				return getContainerStatusInfo(value).remark;
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/container/targetContainer.vue b/src/mycomponents/container/targetContainer.vue
new file mode 100644
index 0000000..e8e0ac2
--- /dev/null
+++ b/src/mycomponents/container/targetContainer.vue
@@ -0,0 +1,68 @@
+<template>
+	<view class="uni-flex u-col-center" style="padding-top: 15rpx; 
+	padding-bottom: 15rpx;
+	 padding-left: 10rpx;
+	 padding-right: 10rpx;
+	 font-size:32rpx;">
+		<text style="font-size: 35rpx;">{{title}} </text>
+		<view class="uni-flex u-col-center" @click="showLocation">
+			<text style="color:#3FBAFF;font-size: 35rpx;" v-if="containerCode==''&&isShowEdit==true">&nbsp 请扫描</text>
+			<text style="color:#3FBAFF; font-size: 35rpx;">&nbsp {{containerCode}}</text>
+			<image v-if="isShowEdit" style="width: 45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image>
+		</view>
+		<winScanContainer ref="scanContainer" :title="title" @getContainer='getContainer'></winScanContainer>
+	</view>
+</template>
+
+<script>
+	import winScanContainer from "@/mycomponents/scan/winScanContainer.vue"
+
+	export default {
+		components: {
+			winScanContainer
+		},
+		data() {
+			return {
+				defaultContainerCode: ""
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: "需求库位"
+			},
+			containerCode: {
+				type: String,
+				default: ""
+			},
+			isShowEdit: {
+				type: Boolean,
+				default: true
+			},
+		},
+
+		watch: {
+			containerCode: {
+				handler(newName, oldName) {
+					if (this.containerCode != "") {
+						this.defaultContainerCode = this.containerCode;
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+		methods: {
+			showLocation() {
+				this.$refs.scanContainer.openScanPopup();
+			},
+			//扫描源库位
+			getContainer(containerInfo) {
+				this.$emit("getContainer", containerInfo)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue
new file mode 100644
index 0000000..e6e2fda
--- /dev/null
+++ b/src/mycomponents/detail/comDetailCard.vue
@@ -0,0 +1,162 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-compare-qty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowStdPack="false">
+					</item-compare-qty>
+				</template>
+				<u-line></u-line>
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions"
+							style='padding:0px 0px  5px 0px;align-items: center;'>
+							<recommend :detail="item" :isShowToLocation="false">
+							</recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
+		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
+			:locationTypeList="locationTypeList"></win-scan-location>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import {
+		getDetailOption,
+		getPurchaseReceiptOption
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['openDetail', "updateData"],
+		components: {
+			itemCompareQty,
+			recommend,
+			balanceQtyEdit,
+			winScanLocation
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			locationTypeList: {
+				type: Array,
+				default: []
+			},
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				locatonItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
+					.allowModifyLocation)
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "库位") {
+					this.showLocation(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.handleQty);
+			},
+
+			detail(item) {
+				this.$emit('openDetail', item);
+				// this.showItem = item;
+				// this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.balance = {}
+							item.handleQty = null;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			},
+			showLocation(item) {
+				this.locatonItem = item;
+				this.$refs.scanLocationCode.openScanPopup();
+			},
+			//扫描源库位
+			getLocation(location, code) {
+				this.locatonItem.toLocationCode = code;
+				this.$emit('updateData')
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/detail/comRequestDetailCard.vue b/src/mycomponents/detail/comRequestDetailCard.vue
new file mode 100644
index 0000000..e687afa
--- /dev/null
+++ b/src/mycomponents/detail/comRequestDetailCard.vue
@@ -0,0 +1,151 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<!-- <comReturnRequestInfo :workShopCode="dataContent.workshopCode" :dataContent="requestItem">
+		</comReturnRequestInfo> -->
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-compare-qty 
+					:dataContent="dataContent" 
+					:handleQty="Number(dataContent.handleQty)"
+					:isShowStdPack="false">
+					</item-compare-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" :record="item.record" :isShowPack="isShowPack"
+								:isShowBatch="isShowBatch" :isShowFromLocation="isShowLocation"></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import comReturnRequestInfo from '@/pages/productionReturn/coms/comReturnRequestInfo.vue'
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getDetailRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['openDetail'],
+		components: {
+			itemCompareQty,
+			recommend,
+			balanceQtyEdit,
+			comReturnRequestInfo
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+		},
+		watch: {
+			dataContent(newVal) {
+				var test =this.dataContent
+				this.requestItem = newVal.subList[0];
+			},
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: [],
+				requestItem:{}
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getDetailEditRemoveOption();
+				// if (this.dataContent.allowModifyQty == 1) {
+				// 	this.scanOptions = getDetailEditRemoveOption();
+				// } else {
+				// 	this.scanOptions = getDetailRemoveOption();
+				// }
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.record.qty);
+			},
+
+			detail(item) {
+				this.$emit('openDetail', item);
+				// this.showItem = item;
+				// this.$refs.jobDetailPopup.openPopup(item)
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.record = {}
+							item.balance = {}
+							item.inventoryStatus = item.RecommendInventoryStatus
+							// item.record.qty = 0;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.record.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/detail/detailBalanceInfo.vue b/src/mycomponents/detail/detailBalanceInfo.vue
new file mode 100644
index 0000000..ea844ea
--- /dev/null
+++ b/src/mycomponents/detail/detailBalanceInfo.vue
@@ -0,0 +1,67 @@
+<template>
+	<view>
+		<!-- <view class="item_big_title">
+			[明细]
+		</view> -->
+		<view class="item">
+			<text class="item_title">箱码 : </text>
+			<text class="text_wrap">{{dataContent.packingNumber}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">批次 : </text>
+			<text class="text_wrap">{{dataContent.batch}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">数量 : </text>
+			<view class="text_wrap">
+				<text class="text_wrap">{{Number(dataContent.qty)}}</text>
+				<text class="text_wrap">{{getUnitInfo(dataContent.uom)}}</text>
+			</view>
+		</view>
+		<view class="item">
+			<text class="item_title">库存状态 : </text>
+			<text class="text_wrap">{{getInventoryStatusInfo(dataContent.inventoryStatus)}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">来源库位 : </text>
+			<text class="text_wrap">{{dataContent.fromLocationCode}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryStatusName,
+		getStdPackUnitInfo,
+		getUnitInfo
+	} from '@/common/directory.js';
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			getInventoryStatusInfo(value) {
+				return getInventoryStatusName(value)
+			},
+			getUnitInfo(value){
+				return getUnitInfo(value).label
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/detail/detailCommonInfo.vue b/src/mycomponents/detail/detailCommonInfo.vue
new file mode 100644
index 0000000..9705aa5
--- /dev/null
+++ b/src/mycomponents/detail/detailCommonInfo.vue
@@ -0,0 +1,65 @@
+<template>
+	<view class="pop_detail" style="height:80%">
+		<com-item :dataContent="dataContent"></com-item>
+		<u-line></u-line>
+		<scroll-view style="height:320px ">
+			<detail-item-info :dataContent="dataContent"></detail-item-info>
+			<u-line></u-line>
+			<detail-recommend-info :dataContent="dataContent"></detail-recommend-info>
+			<u-line></u-line>
+			<view v-if="dataContent.record!=undefined">
+				<detail-handle-info :dataContent="dataContent">
+				</detail-handle-info>
+				<u-line></u-line>
+			</view>
+			<slot>
+				<!-- 每个任务的详情 -->
+			</slot>
+		</scroll-view>
+
+		<view class="uni-flex u-row-center ">
+			<view class="close_button" @click="closePopup">
+				关闭</view>
+			<!-- button 滚动不好使 -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import comItem from '@/mycomponents/item/item.vue'
+	import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
+	import detailRecommendInfo from '@/mycomponents/detail/detailRecommendInfo.vue'
+	import detailHandleInfo from '@/mycomponents/detail/detailHandleInfo.vue'
+
+	export default {
+		emits: ['onClose'],
+		components: {
+			comItem,
+			detailItemInfo,
+			detailRecommendInfo,
+			detailHandleInfo
+		},
+		data() {
+			return {}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			closePopup() {
+				this.$emit('onClose')
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/mycomponents/detail/detailHandleInfo.vue b/src/mycomponents/detail/detailHandleInfo.vue
new file mode 100644
index 0000000..3f270f5
--- /dev/null
+++ b/src/mycomponents/detail/detailHandleInfo.vue
@@ -0,0 +1,63 @@
+<template>
+	<view>
+		<!-- <view class="item_big_title">
+			[扫描]
+		</view> -->
+		<view class="item">
+			<text class="item_title">扫描箱码 : </text>
+			<text class="text_wrap">{{dataContent.record.packingNumber}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">扫描批次 : </text>
+			<text class="text_wrap">{{dataContent.record.batch}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">扫描数量 : </text>
+			<view class="text_wrap">
+				<text class="text_wrap">{{Number(dataContent.record.qty)}}</text>
+				<text class="text_wrap">{{dataContent.record.uom}}</text>
+			</view>
+		</view>
+		<view class="item">
+			<text class="item_title">扫描状态 : </text>
+			<text class="item_title">{{getInventoryStatusInfo(dataContent.record.inventoryStatus)}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">目标库位 : </text>
+			<text class="item_title">{{dataContent.record.locationCode}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryStatusName,
+		getStdPackUnitInfo
+	} from '@/common/directory.js';
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			getInventoryStatusInfo(value) {
+				return getInventoryStatusName(value).label
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/detail/detailItemInfo.vue b/src/mycomponents/detail/detailItemInfo.vue
new file mode 100644
index 0000000..dfbaf50
--- /dev/null
+++ b/src/mycomponents/detail/detailItemInfo.vue
@@ -0,0 +1,46 @@
+<template>
+	<view class="">
+		<view class="item">
+			<text class="item_title">物品描述1 : </text>
+			<text class="text_wrap">{{dataContent.itemDesc1}} </text>
+		</view>
+		<view class="item">
+			<text class="item_title">物品描述2 : </text>
+			<text class="text_wrap">{{dataContent.itemDesc2}} </text>
+		</view>
+		<view class="item">
+			<text class="item_title">数量 : </text>
+			<text class="text_wrap">{{dataContent.qty}}{{getUnitInfo(dataContent.uom)}} </text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import{getUnitInfo} from "@/common/directory.js"
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			getUnitInfo(value){
+				return getUnitInfo(value).label
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/detail/detailPackageInfo.vue b/src/mycomponents/detail/detailPackageInfo.vue
new file mode 100644
index 0000000..52c2e5c
--- /dev/null
+++ b/src/mycomponents/detail/detailPackageInfo.vue
@@ -0,0 +1,65 @@
+<template>
+	<view>
+		<view class="item">
+			<text class="item_title">供应商代码 : </text>
+			<text class="text_wrap">{{dataContent.supplierCode}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">采购订单 : </text>
+			<text class="text_wrap">{{dataContent.asnNumber}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">订单行 : </text>
+			<text class="text_wrap">{{dataContent.poNumber}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">订单行 : </text>
+			<view class="text_wrap">
+				<text class="text_wrap">{{dataContent.poLine}}</text>
+			</view>
+		</view>
+		<view class="item">
+			<text class="item_title">标包 : </text>
+			<view class="text_wrap">
+				<text class="text_wrap">{{dataContent.stdPackQty}}{{dataContent.stdPackUnit}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryStatusName,
+		getStdPackUnitInfo,
+		getUnitInfo
+	} from '@/common/directory.js';
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			getInventoryStatusInfo(value) {
+				return getInventoryStatusName(value)
+			},
+			getUnitInfo(value){
+				return getUnitInfo(value).label
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/detail/detailRecommendInfo.vue b/src/mycomponents/detail/detailRecommendInfo.vue
new file mode 100644
index 0000000..f81b1d7
--- /dev/null
+++ b/src/mycomponents/detail/detailRecommendInfo.vue
@@ -0,0 +1,71 @@
+<template>
+	<view>
+		<!-- <view class="item_big_title">
+			[明细]
+		</view> -->
+		<view class="item">
+			<text class="item_title">明细箱码 : </text>
+			<text class="text_wrap">{{dataContent.packingNumber}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">明细批次 : </text>
+			<text class="text_wrap">{{dataContent.batch}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">明细数量 : </text>
+			<view class="text_wrap">
+				<text class="text_wrap">{{Number(dataContent.qty)}}</text>
+				<text class="text_wrap">{{getUnitInfo(dataContent.uom)}}</text>
+			</view>
+		</view>
+		<view class="item">
+			<text class="item_title">明细状态 : </text>
+			<text class="text_wrap">{{getInventoryStatusInfo(dataContent.inventoryStatus)}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">来源库位 : </text>
+			<text class="text_wrap">{{dataContent.fromLocationCode}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">目标库位 : </text>
+			<text class="text_wrap">{{dataContent.toLocationCode}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryStatusName,
+		getStdPackUnitInfo,
+		getUnitInfo
+	} from '@/common/directory.js';
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			getInventoryStatusInfo(value) {
+				return getInventoryStatusName(value)
+			},
+			getUnitInfo(value){
+				return getUnitInfo(value).label
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/detail/jobDetailPopup.vue b/src/mycomponents/detail/jobDetailPopup.vue
new file mode 100644
index 0000000..85a10d0
--- /dev/null
+++ b/src/mycomponents/detail/jobDetailPopup.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent='dataContent'></detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryStatusName,
+		getStdPackUnitInfo
+	} from '@/common/directory.js';
+	 
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {}
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: ""
+			},
+
+		},
+		methods: {
+			openScanPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			getInventoryStatusInfo(value) {
+				return getInventoryStatusName(value).label
+			},
+			getStdPackUnit(uom) {
+				let item = getStdPackUnitInfo(uom);
+				if (item == '') {
+					return uom;
+				} else {
+					return item.label
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+	.popup_box {
+		width: 500rpx;
+		height: 500rpx;
+	}
+
+	.item_big_title {
+		color: #2196F3;
+		font-size: 35rpx;
+		margin-top: 15rpx;
+		margin-bottom: 15rpx;
+	}
+
+	.item {
+		padding-top: 5rpx;
+		padding-bottom: 5rpx;
+	}
+
+	.item_title {
+		color: #000000;
+		font-size: 32rpx;
+	}
+</style>
diff --git a/src/mycomponents/detail/recordDetailBasicInfo.vue b/src/mycomponents/detail/recordDetailBasicInfo.vue
new file mode 100644
index 0000000..0b63bbe
--- /dev/null
+++ b/src/mycomponents/detail/recordDetailBasicInfo.vue
@@ -0,0 +1,66 @@
+<template>
+
+	<view class="">
+		<comListItem :dataList="dataList"></comListItem>
+	</view>
+
+</template>
+
+<script>
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			comListItem
+		},
+		data() {
+			return {
+				dataList: []
+			}
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					this.dataList = [{
+						title: '物品代码',
+						content: this.dataContent.itemCode
+					}, {
+						title: '物品名称',
+						content: this.dataContent.itemName
+					}, {
+						title: '物品描述1',
+						content: this.dataContent.itemDesc1,
+					}, {
+						title: '物品描述2',
+						content: this.dataContent.itemDesc2,
+					}, {
+						title: '项目代码',
+						content: this.dataContent.projectCode,
+					}, {
+						title: '数量',
+						content: this.dataContent.qty,
+					}, {
+						title: '计量单位',
+						content: this.dataContent.uom,
+						type:"uom"
+					}];
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/detail/recordDetailCommonInfo.vue b/src/mycomponents/detail/recordDetailCommonInfo.vue
new file mode 100644
index 0000000..ef7a547
--- /dev/null
+++ b/src/mycomponents/detail/recordDetailCommonInfo.vue
@@ -0,0 +1,60 @@
+<template>
+	<view class="pop_detail" style="height:80%">
+		<u-line></u-line>
+		<scroll-view style="height:320px ">
+			<scroll-view style="height:320px ">
+				<!-- 物品 -->
+				<detail-item-info :dataContent="dataContent"></detail-item-info>
+				<!-- <request-detail-basic-info :dataContent="dataContent"></request-detail-basic-info> -->
+				<u-line></u-line>
+				<!-- 库存余额 -->
+				<detail-balance-info :dataContent="dataContent"></detail-balance-info>
+				<!-- 包装 -->
+				<!-- <detail-package-info :dataContent="dataContent"></detail-package-info> -->
+			</scroll-view>
+		</scroll-view>
+
+		<view class="uni-flex u-row-center ">
+			<view class="close_button" @click="closePopup">
+				关闭</view>
+			<!-- button 滚动不好使 -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
+	import detailPackageInfo from '@/mycomponents/detail/detailPackageInfo.vue'
+	import detailBalanceInfo from '@/mycomponents/detail/detailBalanceInfo.vue'
+
+	export default {
+		emits: ['onClose'],
+		components: {
+			detailItemInfo,
+			detailPackageInfo,
+			detailBalanceInfo
+		},
+		data() {
+			return {}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			closePopup() {
+				this.$emit('onClose')
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/mycomponents/detail/recordDetailPopup.vue b/src/mycomponents/detail/recordDetailPopup.vue
new file mode 100644
index 0000000..a92991f
--- /dev/null
+++ b/src/mycomponents/detail/recordDetailPopup.vue
@@ -0,0 +1,71 @@
+<template>
+	<uni-popup ref="popup">
+		<view class="pop_detail" style="height:80%">
+			<com-item :dataContent="dataContent"></com-item>
+			<u-line></u-line>
+			<scroll-view style="height:320px ">
+				<!-- 物品 -->
+				<detail-item-info :dataContent="dataContent"></detail-item-info>
+				<u-line></u-line>
+				<!-- 库存余额 -->
+				<detail-balance-info :dataContent="dataContent"></detail-balance-info>
+				<u-line></u-line>
+				<!-- 包装 -->
+				<detail-package-info :dataContent="dataContent.package"></detail-package-info>
+			</scroll-view>
+
+			<view class="uni-flex u-row-center ">
+				<view class="close_button" @click="closePopup">
+					关闭</view>
+				<!-- button 滚动不好使 -->
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import comItem from '@/mycomponents/item/item.vue'
+	import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
+	import detailPackageInfo from '@/mycomponents/detail/detailPackageInfo.vue'
+	import detailBalanceInfo from '@/mycomponents/detail/detailBalanceInfo.vue'
+
+	export default {
+		emits: ['onClose'],
+		components: {
+			comItem,
+			detailItemInfo,
+			detailPackageInfo,
+			detailBalanceInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				}
+			}
+		},
+
+		mounted() {},
+		props: {
+
+		},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/mycomponents/detail/requestDetailBasicInfo.vue b/src/mycomponents/detail/requestDetailBasicInfo.vue
new file mode 100644
index 0000000..97451a1
--- /dev/null
+++ b/src/mycomponents/detail/requestDetailBasicInfo.vue
@@ -0,0 +1,43 @@
+<template>
+	<view class="">
+		<detail-item-info :dataContent="dataContent"></detail-item-info>
+		<!-- <comListItem :dataList="dataList"></comListItem> -->
+		 
+	</view>
+</template>
+
+<script>
+	 
+	import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
+	export default {
+		components: {
+			 detailItemInfo
+		},
+		data() {
+			return {
+				dataList: []
+			}
+		},
+		watch: {
+		 
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			getUnitInfo(value){
+				return getUnitInfo(value).label
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/detail/requestDetailCommonInfo.vue b/src/mycomponents/detail/requestDetailCommonInfo.vue
new file mode 100644
index 0000000..3fa9226
--- /dev/null
+++ b/src/mycomponents/detail/requestDetailCommonInfo.vue
@@ -0,0 +1,65 @@
+<template>
+	<view class="pop_detail" style="height:80%">
+		<com-item :dataContent="dataContent"></com-item>
+		<u-line></u-line>
+		<scroll-view style="height:320px ">
+			<!-- 物品 -->
+			<detail-item-info :dataContent="dataContent"></detail-item-info>
+			<!-- <request-detail-basic-info :dataContent="dataContent"></request-detail-basic-info> -->
+			<u-line></u-line>
+			<!-- 包装 -->
+
+			<!-- 库存余额 -->
+			<detail-balance-info :dataContent="dataContent"></detail-balance-info>
+			<slot>
+				<!-- 每个任务的详情 -->
+			</slot>
+		</scroll-view>
+
+		<view class="uni-flex u-row-center ">
+			<view class="close_button" @click="closePopup">
+				关闭</view>
+			<!-- button 滚动不好使 -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import comItem from '@/mycomponents/item/item.vue'
+	import requestDetailBasicInfo from '@/mycomponents/detail/requestDetailBasicInfo.vue'
+	import detailRecommendInfo from '@/mycomponents/detail/detailRecommendInfo.vue'
+	import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
+	import detailBalanceInfo from '@/mycomponents/detail/detailBalanceInfo.vue'
+	export default {
+		emits: ['onClose'],
+		components: {
+			comItem,
+			requestDetailBasicInfo,
+			detailRecommendInfo,
+			detailItemInfo,
+			detailBalanceInfo
+		},
+		data() {
+			return {}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			closePopup() {
+				this.$emit('onClose')
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/mycomponents/item/item.vue b/src/mycomponents/item/item.vue
new file mode 100644
index 0000000..abcceaa
--- /dev/null
+++ b/src/mycomponents/item/item.vue
@@ -0,0 +1,48 @@
+<template>
+	<view>
+		<view class="uni-flex u-col-center space-between" style="
+	background-color:#fff;
+	margin-left: 10rpx;">
+			<view >
+				<view class="card_itemCode" :class="openPopup(dataContent)">
+					{{dataContent.itemCode}}
+				</view>
+				<view class="card_itemName">
+					{{dataContent.itemName}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+			openPopup(val) {
+
+				// console.log(JSON.stringify(val));
+			},
+		},
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue
new file mode 100644
index 0000000..c570dcd
--- /dev/null
+++ b/src/mycomponents/item/itemCompareQty.vue
@@ -0,0 +1,63 @@
+<template>
+	<view class="uni-flex uni-row space-between uni-inline-item" style="background-color:#fff;">
+		<view style="word-break: break-all;width: 50%;">
+			<item :dataContent="dataContent"></item>
+		</view>
+		<view style="word-break: break-all;width: 50%;display: flex;justify-content:flex-end;margin-right: 10rpx;">
+			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack ="isShowStdPack"></recommend-qty>
+			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
+				:handleQty="Number(handleQty)" :isShowStatus="false"
+				:isShowStdPack ="isShowStdPack">
+			</compare-qty>
+		</view>
+	</view>
+</template>
+<script>
+	import item from '@/mycomponents/item/item.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import balanceQty from '@/mycomponents/qty/balanceQty.vue'
+
+	export default {
+		components: {
+			item,
+			recommendQty,
+			compareQty,
+			balanceQty
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			type: {
+				type: String,
+				default: 'recommend' //recommend:推荐 compare:对比 
+			},
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			handleQty: {
+				type: Number,
+				default: 0
+			},
+			isShowStdPack:{
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+
+		},
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/item/itemDetailInfo.vue b/src/mycomponents/item/itemDetailInfo.vue
new file mode 100644
index 0000000..6649a07
--- /dev/null
+++ b/src/mycomponents/item/itemDetailInfo.vue
@@ -0,0 +1,74 @@
+<template>
+	<uni-popup ref="popup">
+		<view class="uni-flex uni-column" style="background-color: white;width: 200px; height:60%;">
+			<view class="uni-flex">
+				<text>物料号</text>
+				<text>{{dataContent.code}}</text>
+			</view>
+			<view class="uni-flex">
+				<text>物料名称</text>
+				<text>{{dataContent.name}}</text>
+			</view>
+			<view class="uni-flex">
+				<text>描述1</text>
+				<text>{{dataContent.desc1}}</text>
+			</view>
+			<view class="uni-flex">
+				<text>描述2</text>
+				<text>{{dataContent.desc2}}</text>
+			</view>
+			<view class="uni-flex">
+				<text>状态</text>
+				<text>{{dataContent.status}}</text>
+			</view>
+			<view class="uni-flex">
+				<text>类型</text>
+				<text>{{dataContent.type}}</text>
+			</view>
+			<view class="uni-flex">
+				<text>制造件</text>
+				<text>{{dataContent.canMake}}</text>
+			</view>
+
+			<view class="uni-flex">
+				<text>采购件</text>
+				<text>{{dataContent.canBuy}}</text>
+			</view>
+			<view class="uni-flex">
+				<text>外包件</text>
+				<text>{{dataContent.canOutsourcing}}</text>
+			</view>
+			<view class="uni-flex">
+				<text>回收件</text>
+				<text>{{dataContent.isRecycled}}</text>
+			</view>
+			<view class="uni-flex">
+				<text>ABC类</text>
+				<text>{{dataContent.abcClass}}</text>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dataContent: {}
+			}
+		},
+		props: {
+
+		},
+		methods: {
+			openDetail() {
+				this.$refs['popup'].open("center");
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+<style>
+</style>
diff --git a/src/mycomponents/item/itemInfo.vue b/src/mycomponents/item/itemInfo.vue
new file mode 100644
index 0000000..f40e16c
--- /dev/null
+++ b/src/mycomponents/item/itemInfo.vue
@@ -0,0 +1,58 @@
+<!--包装组件-->
+<template>
+	<view class="">
+		<view class="uni-flex space-between padding_10" style="background-color: #fff;" >
+			<view>
+				<view class="font_xl text_black text_bold " style="font-size: 38rpx;">
+					{{ itemdetail.code }}
+				</view>
+				<view class="" style="font-size: 32rpx;">
+					{{ itemdetail.name }}
+				</view>
+				<view class="" style="font-size: 32rpx;">
+					{{ itemdetail.desc1 }}
+					{{ itemdetail.desc2 }}
+				</view>
+			</view>
+			<view class="">
+				<item-status :status="itemdetail.status"></item-status>
+			</view>
+		</view>
+
+		<itemInfoPopup ref="showHint" :dataContent="itemdetail" :type="'partCode'"></itemInfoPopup>
+	</view>
+
+</template>
+
+<script>
+	import itemStatus from '@/mycomponents/item/itemStatus.vue';
+	import itemInfoPopup from '@/mycomponents/item/itemInfoPopup.vue';
+
+	export default {
+		name: "comItem",
+		components: {
+			itemInfoPopup,
+			itemStatus
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			itemdetail: {
+				type: Object,
+				value: null
+			}
+		},
+		methods: {
+			showHint() {
+				this.$refs.showHint.openScanPopup()
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/item/itemInfoPopup.vue b/src/mycomponents/item/itemInfoPopup.vue
new file mode 100644
index 0000000..9ce3580
--- /dev/null
+++ b/src/mycomponents/item/itemInfoPopup.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<view class="uni-flex uni-column pop_detail">
+				<view class="uni-flex space-between u-col-center"
+				style="padding-bottom: 15rpx;">
+					<view class="text_ellipsis" v-if="number" style="font-size: 35rpx;flex: 3;">
+						编号:{{number}}
+					</view>
+					
+					<view class="text_ellipsis" v-else style="font-size: 40rpx;">
+						<view class="">
+							{{itemCode}}
+						</view>
+						<view class="">
+							{{itemDesc}}
+						</view>
+					
+					</view>
+					
+					<view class="uni-center" style="flex: 1;">
+						<view v-if="jobStatus==2" class="task_state_doing">
+							<text>执行中</text>
+						</view>
+						<view v-if="jobStatus==1" class="task_state_un-doing">
+							<text>待执行</text>
+						</view>
+					</view>
+				<!-- <view class="" v-else="number">
+					<view class="text_ellipsis" style="font-size: 40rpx;flex: 1;">
+						<view class="">
+							{{itemCode}}
+						</view>
+						<view class="">
+							{{itemDesc}}
+						</view>
+					
+					</view>
+				</view> -->
+					
+				</view>
+				<u-line></u-line>
+				<view class="" v-for="(item, index) in dataList">
+					<view class="item" v-if="(item.title!='worker')" v-show="(item.title!='date')">
+						<text class="item_title">{{item.title}} : </text>
+						<text class="text_wrap">{{item.content}} </text>
+					</view>
+				</view>
+				<u-line></u-line>
+				<view v-if="isShowbottom" style="margin-top: 10rpx;margin-bottom: 10rpx;width: 100%;display: flex;"
+					class="uni-flex uni-row space-between u-col-center">
+					<view class="uni-flex uni-row  u-col-center " style="flex: 1; overflow: hidden;">
+						<image class="card_icon_normal" src="/static/icons/icon_customer.svg" alt="" />
+						<text class="text_ellipsis">{{getContent("worker")}}</text>
+					</view>
+					<view class="uni-flex uni-row  u-col-center " style="flex: 3;justify-content: flex-end;overflow: hidden;">
+						<image class="card_icon_normal" src="/static/icons/icon_date.svg" alt="" />
+						<text>{{formatDate(getContent("date"))}}</text>
+					</view>
+				</view>
+			</view>
+			
+			<view class="uni-flex u-row-center ">
+				<image src="/static/icons/icons_close-circle.svg" 
+				 mode=""
+				 class="icons_close"
+				 @click="closeScanPopup()"
+				 ></image>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat,
+	} from '@/common/basic.js';
+	export default {
+
+		mounted() {
+		},
+
+		props: {
+			title: {
+				type: String,
+				default: ""
+			},
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			
+			number:{
+				type: String,
+				default: ""
+			},
+			jobStatus:{
+				type: Number,
+				default: -1
+			},
+			dataList:{
+				type: Object,
+				default: []
+			},
+			worker:{
+				type: String,
+				default: ""
+			},
+			date:{
+				type: String,
+				default: ""
+			},
+			itemCode:{
+				type: String,
+				default: ""
+			},
+			itemDesc:{
+				type: String,
+				default: ""
+			},
+			isShowbottom:{
+				type: Boolean,
+				default: true
+			}
+		},
+
+		methods: {
+			openScanPopup() {
+				this.$refs.popup.open('center')
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			startEdit() {
+				this.$refs.receiptCountEdit.openScanPopup();
+			},
+			formatDate(val) {
+				return dateFormat(val)
+			},
+			 
+			getContent(title){
+				let items = this.dataList.filter(r => {
+					if (r.title==title) {
+						return r;
+					}
+				})
+				if(items!=null&&items.length>0){
+					return items[0].content;
+				}
+			}
+		}
+
+	}
+</script>
+
+<style>
+	
+</style>
diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue
new file mode 100644
index 0000000..ed98009
--- /dev/null
+++ b/src/mycomponents/item/itemQty.vue
@@ -0,0 +1,67 @@
+<template>
+	<view class="uni-flex uni-row space-between center" style="background-color:#fff;">
+		<view>
+			<item :dataContent="dataContent"></item>
+		</view>
+		<view>
+
+			<!-- showBalanceQty -->
+			<balanceQty v-if="isShowBalanceQty" :dataContent="dataContent"></balanceQty>
+			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
+				:handleQty="dataContent.handleQty" :isShowStatus="false" :isShowStdPack="showStdPack">
+			</compare-qty>
+		</view>
+		<!-- 	<view v-else>
+			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false"></recommend-qty>
+			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
+				:handleQty="Number(handleQty)" :isShowStatus="false">
+			</compare-qty>
+		</view> -->
+	</view>
+</template>
+<script>
+	import item from '@/mycomponents/item/item.vue'
+	import balanceQty from '@/mycomponents/qty/balanceQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+
+	export default {
+		components: {
+			item,
+			balanceQty,
+			compareQty
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			handleQty: {
+				type: Number,
+				default: 0
+			},
+			isShowBalanceQty: {
+				type: Boolean,
+				default: true
+			},
+			showStdPack: {
+				type: Boolean,
+				default: false
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+
+		},
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/item/itemRecommendQty.vue b/src/mycomponents/item/itemRecommendQty.vue
new file mode 100644
index 0000000..92574af
--- /dev/null
+++ b/src/mycomponents/item/itemRecommendQty.vue
@@ -0,0 +1,65 @@
+<template>
+	<view class="uni-flex uni-row space-between uni-inline-item" style="background-color:#fff;">
+		<view>
+			<item :dataContent="dataContent"></item>
+		</view>
+		<view v-if="isShowBalance">
+			<balanceQty :dataContent="dataContent"></balanceQty>
+		</view>
+		<view v-else>
+			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false"></recommend-qty>
+			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
+				:handleQty="Number(handleQty)" :isShowStatus="false">
+			</compare-qty>
+		</view>
+	</view>
+</template>
+<script>
+	import item from '@/mycomponents/item/item.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import balanceQty from '@/mycomponents/qty/balanceQty.vue'
+
+	export default {
+		components: {
+			item,
+			recommendQty,
+			compareQty,
+			balanceQty
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			type: {
+				type: String,
+				default: 'recommend' //recommend:推荐 compare:对比 
+			},
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			handleQty: {
+				type: Number,
+				default: 0
+			},
+			isShowBalance: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+
+		},
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/item/itemSelect.vue b/src/mycomponents/item/itemSelect.vue
new file mode 100644
index 0000000..6a059ff
--- /dev/null
+++ b/src/mycomponents/item/itemSelect.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="" style="background-color:#fff;">
+		<view class="uni-flex uni-row" style="display: flex;align-items: center;">
+			物料
+			<uni-easyinput ref='scanInput' v-model="partCode" @confirm="confirmPartCode" @clear="clear"
+				style='font-size: 18px;padding: 10rpx 20rpx;' placeholder="请输入物料号" @iconClick="">
+			</uni-easyinput>
+		</view>
+		<view class="">
+			<u-select v-model="showPartCode" mode="single-column" :list="list" @confirm="confirmSelectPartCode">
+			</u-select>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		components: {},
+
+		data() {
+			return {
+				partCode: "",
+				showPartCode: false,
+			}
+		},
+		props: {
+			list: {
+				type: Object,
+				default: []
+			}
+
+		},
+		watch: {
+			// recommend
+
+		},
+		methods: {
+			confirmPartCode() {
+				if (this.partCode == '') {
+					uni.showToast({
+						title: "请扫描物料"
+					})
+					return;
+				}
+				this.showPartCode = true;
+			},
+			confirmSelectPartCode(e) {
+				this.partCode = e[0].label
+				this.$emit("confirmSelectPartCode", this.partCode)
+
+			},
+			clear() {
+				this.partCode = "";
+				this.$emit("clearPartCode", this.partCode)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/item/itemStatus.vue b/src/mycomponents/item/itemStatus.vue
new file mode 100644
index 0000000..b7f1c7e
--- /dev/null
+++ b/src/mycomponents/item/itemStatus.vue
@@ -0,0 +1,47 @@
+<template>
+	<view class="">
+		<text :class="statusStyle(status)" 
+		style="padding-top: 5rpx;padding-bottom: 5rpx;padding-left: 15rpx;padding-right: 15rpx;">{{statusDesc(status)}}</text>
+	</view>
+</template>
+
+
+
+<script>
+	import {
+		getItemStateInfo
+	} from '@/common/directory.js';
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+
+			};
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {},
+			},
+			status: {
+				type: String,
+				default: "",
+			},
+		},
+
+		methods: {
+			statusDesc(value) {
+				return getItemStateInfo(value).label
+			},
+			statusStyle(value) {
+				return getItemStateInfo(value).remark;
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/job/jobBottom.vue b/src/mycomponents/job/jobBottom.vue
new file mode 100644
index 0000000..46e9ad6
--- /dev/null
+++ b/src/mycomponents/job/jobBottom.vue
@@ -0,0 +1,49 @@
+<template>
+	<!-- style="margin-top: 10rpx;margin-bottom: 10rpx;" class="uni-flex uni-row space-between u-col-center" -->
+	<view class="task_item">
+		<view class="uni-flex space-between u-col-center">
+			<view class="uni-flex uni-row  u-col-center">
+				<image class="card_icon_normal" src="/static/icons/icon_customer.svg" alt="" />
+				<text>{{dataContent.creator}}</text>
+			</view>
+			<view class="uni-flex uni-row  u-col-center">
+				<image class="card_icon_normal" src="/static/icons/icon_date.svg" alt="" />
+				<text class="center">{{formatDate(dataContent.createTime)}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			};
+		},
+		watch: {},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			formatDate: function(val) {
+				return dateFormat(val)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/mycomponents/job/jobCard.vue b/src/mycomponents/job/jobCard.vue
new file mode 100644
index 0000000..0b10b5c
--- /dev/null
+++ b/src/mycomponents/job/jobCard.vue
@@ -0,0 +1,93 @@
+<template>
+	<view>
+		<view class="task_card" @click="openDetail">
+			<job-top :dataContent="dataContent"></job-top>
+			<job-property :propertyList="propertyList"></job-property>
+			<u-line color="#909399" />
+			<job-bottom :dataContent="dataContent"></job-bottom>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import jobBottom from '@/mycomponents/job/jobBottom.vue'
+	import jobProperty from '@/mycomponents/job/jobProperty.vue'
+
+	export default {
+		components: {
+			jobTop,
+			jobBottom,
+			jobProperty
+		},
+		data() {
+			return {
+				options1: [{
+					text: '详情',
+					style: {
+						backgroundColor: '#3C9CFF'
+					}
+				}],
+				options2: [{
+						text: '详情',
+						style: {
+							backgroundColor: '#3C9CFF'
+						}
+					},
+					{
+						text: '放弃',
+						style: {
+							backgroundColor: '#F56C6C'
+						}
+					}
+				],
+				title: "任务详情",
+				dataList: [{
+						title: "供应商",
+						content: '供应商'
+					},
+					{
+						title: "订单号",
+						content: '订单号'
+					},
+					{
+						title: "需求库位",
+						content: "D101"
+					},
+					{
+						title: "需求数量",
+						content: 100
+					},
+				]
+			};
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/src/mycomponents/job/jobComMainCard.vue b/src/mycomponents/job/jobComMainCard.vue
new file mode 100644
index 0000000..3025201
--- /dev/null
+++ b/src/mycomponents/job/jobComMainCard.vue
@@ -0,0 +1,41 @@
+<template>
+	<view>
+		<view class="task_card">
+			<job-top :dataContent="dataContent"></job-top>
+			<slot></slot>
+			<u-line color="#909399" />
+			<job-bottom :dataContent="dataContent"></job-bottom>
+		</view>
+	</view>
+</template>
+
+<script>
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import jobBottom from '@/mycomponents/job/jobBottom.vue'
+
+	export default {
+		components: {
+			jobTop,
+			jobBottom,
+		},
+		data() {
+			return {
+			};
+		},
+		 
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+		 
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/src/mycomponents/job/jobCommonInfo.vue b/src/mycomponents/job/jobCommonInfo.vue
new file mode 100644
index 0000000..28afb77
--- /dev/null
+++ b/src/mycomponents/job/jobCommonInfo.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="pop_detail" style="height:80%">
+		<job-top :dataContent="dataContent"></job-top>
+		<u-line></u-line>
+		<scroll-view style="height:400px ">
+			<slot>
+				<!-- 每个任务的详情 -->
+			</slot>
+			<job-request-info :dataContent="dataContent"></job-request-info>
+			<u-line></u-line>
+			<job-person-info :dataContent="dataContent"></job-person-info>
+			<u-line></u-line>
+			<job-setting-info :dataContent="dataContent"></job-setting-info>
+		</scroll-view>
+
+		<view class="uni-flex u-row-center ">
+			<view class="close_button" @click="closePopup">
+				关闭</view>
+			<!-- button 滚动不好使 -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import jobBottom from '@/mycomponents/job/jobBottom.vue'
+	import jobRequestInfo from '@/mycomponents/job/jobRequestInfo.vue'
+	import jobPersonInfo from '@/mycomponents/job/jobPersonInfo.vue'
+	import jobSettingInfo from '@/mycomponents/job/jobSettingInfo.vue'
+	export default {
+		emits: ['onClose'],
+		components: {
+			jobTop,
+			jobBottom,
+			jobPersonInfo,
+			jobSettingInfo,
+			jobRequestInfo
+		},
+		data() {
+			return {}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			closePopup() {
+				this.$emit('onClose')
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/mycomponents/job/jobDetailPopup.vue b/src/mycomponents/job/jobDetailPopup.vue
new file mode 100644
index 0000000..1b2116e
--- /dev/null
+++ b/src/mycomponents/job/jobDetailPopup.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<detail-common-info :dataContent='dataContent' @onClose="closeScanPopup()" ></detail-common-info>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryStatusName,
+		getStdPackUnitInfo
+	} from '@/common/directory.js';
+	 
+	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
+	export default {
+		components: {
+			detailCommonInfo
+		},
+		data() {
+			return {
+				dataContent: {}
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: ""
+			},
+
+		},
+		methods: {
+			openScanPopup(val) {
+				this.dataContent = val;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			getInventoryStatusInfo(value) {
+				return getInventoryStatusName(value).label
+			},
+			getStdPackUnit(uom) {
+				let item = getStdPackUnitInfo(uom);
+				if (item == '') {
+					return uom;
+				} else {
+					return item.name
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+	.popup_box {
+		width: 500rpx;
+		height: 500rpx;
+	}
+
+	.item_big_title {
+		color: #2196F3;
+		font-size: 35rpx;
+		margin-top: 15rpx;
+		margin-bottom: 15rpx;
+	}
+
+	.item {
+		padding-top: 5rpx;
+		padding-bottom: 5rpx;
+	}
+
+	.item_title {
+		color: #000000;
+		font-size: 32rpx;
+	}
+</style>
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
new file mode 100644
index 0000000..a209c2a
--- /dev/null
+++ b/src/mycomponents/job/jobFilter.vue
@@ -0,0 +1,155 @@
+<template>
+	<uni-popup ref="popup">
+		<view class="maskbox" @tap="maskClick"></view>
+		<view class="uni-flex uni-column center"
+			style="background-color: white;width: 200px; height:auto;padding: 20rpx;z-index: 99;position: relative;">
+			<view class="uni-flex space-between u-col-center" style="width: 100%;">
+					<view class="" style="font-size: 32rpx;">
+						只看当天
+					</view>
+					
+				<u-switch v-model="checkedTodayModel" active-color="#4DD865" inactive-color="#eee" size="35" @change="switchChangeToday"></u-switch>	
+			</view>
+			<view class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;">
+				
+				<view class="" style="font-size: 32rpx;">
+					只看待处理
+				</view>
+				<u-switch v-model="checkedWaitModel" active-color="#4DD865" inactive-color="#eee" size="35" @change="switchChangeWait"></u-switch>	
+			</view>
+			<view class="">
+				<view class="uni-flex u-row-center" style="margin-top: 30rpx;" v-if="isShowAsn">
+					<button class="filter_button" hover-class="filter_button_after"
+						@click="scanOtherClick">扫描ASN单号</button>
+				</view>
+				<view class="uni-flex u-row-center" style="margin-top: 30rpx;">
+					<button class="filter_button" hover-class="filter_button_after"
+						@click="scanNumberClick">扫描任务编号</button>
+				</view>
+			</view>
+		</view>
+	</uni-popup>
+	<win-scan-job-number ref="scanNumber" title="任务编号" @getScanCode='getScanNumber'></win-scan-job-number>
+	<win-scan-asn-number ref="scanAsnNumber" :title="otherTitle" @getScanCode='getScanAsNumber'></win-scan-asn-number>
+</template>
+
+<script>
+	import {
+		getTodayDate
+	} from '@/common/basic.js';
+
+	import winScanJobNumber from "@/mycomponents/scan/winScanJobNumber.vue"
+	import winScanAsnNumber from "@/mycomponents/scan/winScanAsnNumber.vue"
+
+	export default {
+		emits: ["switchChangeToday", "switchChangeWait", "onScanNumber", "onScanAsnNumber"],
+		components: {
+			winScanJobNumber,
+			winScanAsnNumber
+		},
+		
+		props: {
+			checkedToday: {
+				type: Boolean,
+				default: false
+			},
+			checkedWaitTask: {
+				type: Boolean,
+				default: false
+			},
+			otherTitle: {
+				type: String,
+				default: ""
+			},
+			isShowAsn:{
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				dataContent: {},
+				checkedTodayModel:false,
+				checkedWaitModel:false,
+			}
+		},
+		watch: {
+			checkedToday: {
+				handler(newName, oldName) {
+					this.checkedTodayModel = this.checkedToday
+				},
+				immediate: true,
+				deep: true
+			},
+			checkedWaitTask: {
+				handler(newName, oldName) {
+					this.checkedWaitModel = this.checkedWaitTask
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+		mounted() {
+		},
+		methods: {
+			// 点击遮罩
+			maskClick() {
+				// 如果不允许点击遮罩，直接返回
+				this.closeScanPopup();
+			},
+			openFilter() {
+				this.$refs['popup'].open("right");
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			switchChangeToday(isOn) {
+				
+				let creationTime = '';
+				if (isOn) {
+					creationTime = getTodayDate();
+				}
+				
+				this.$emit("switchChangeToday", isOn, creationTime)
+				this.closeScanPopup()
+			},
+			switchChangeWait(isOn) {
+				let status = "1,2";
+				if(isOn){
+					status="1"
+				}
+				this.$emit("switchChangeWait", isOn, status)
+				this.closeScanPopup()
+			},
+
+			scanNumberClick() {
+				this.$refs.scanNumber.openScanPopup();
+			},
+
+			scanOtherClick() {
+				this.$refs.scanAsnNumber.openScanPopup();
+			},
+
+			getScanAsNumber(val) {
+				this.$emit("onScanAsnNumber", val)
+				this.$refs.scanAsnNumber.closeScanPopup();
+				this.closeScanPopup();
+			},
+			getScanNumber(val) {
+				this.$emit("onScanNumber", val)
+				this.$refs.scanNumber.closeScanPopup();
+				this.closeScanPopup();
+			},
+		}
+	}
+</script>
+<style lang="scss">
+	.maskbox {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		z-index: 0;
+	}
+</style>
diff --git a/src/mycomponents/job/jobInfoPopup.vue b/src/mycomponents/job/jobInfoPopup.vue
new file mode 100644
index 0000000..92f04d7
--- /dev/null
+++ b/src/mycomponents/job/jobInfoPopup.vue
@@ -0,0 +1,75 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<view class="pop_detail" style="height:500px">
+				<job-top :dataContent="dataContent"></job-top>
+				<u-line></u-line>
+				<scroll-view style="height:400px ">
+					<slot>
+						<!-- 每个任务的详情 -->
+					</slot>
+					<job-person-info :dataContent="dataContent"></job-person-info>
+					<u-line></u-line>
+					<job-setting-info :dataContent="dataContent"></job-setting-info>
+				</scroll-view>
+
+				<view class="uni-flex u-row-center ">
+					<view class="close_button" @click="closePopup">
+						关闭</view>
+					<!-- button 滚动不好使 -->
+					<!-- <button class="close_button" @click="closePopup">关闭</button> -->
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import jobBottom from '@/mycomponents/job/jobBottom.vue'
+	import jobPersonInfo from '@/mycomponents/job/jobPersonInfo.vue'
+	import jobSettingInfo from '@/mycomponents/job/jobSettingInfo.vue'
+	export default {
+		components: {
+			jobTop,
+			jobBottom,
+			jobPersonInfo,
+			jobSettingInfo
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				},
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			title: {
+				type: String,
+				default: ""
+			},
+		},
+
+		methods: {
+			openPopup(dataContent, dataList) {
+				this.dataContent = dataContent;
+				// this.dataList = dataList;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/mycomponents/job/jobNumber.vue b/src/mycomponents/job/jobNumber.vue
new file mode 100644
index 0000000..94a3849
--- /dev/null
+++ b/src/mycomponents/job/jobNumber.vue
@@ -0,0 +1,36 @@
+<template>
+	<view class="task_number">
+		<!-- <text>任务编号 : {{number}}</text> -->
+		<text> {{number}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+
+			};
+		},
+		watch: {
+
+		},
+
+		props: {
+			number: {
+				type: String,
+				default: ''
+			},
+		},
+
+		methods: {}
+	}
+</script>
+
+<style lang="scss">
+</style>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/job/jobPersonInfo.vue b/src/mycomponents/job/jobPersonInfo.vue
new file mode 100644
index 0000000..fa28ee1
--- /dev/null
+++ b/src/mycomponents/job/jobPersonInfo.vue
@@ -0,0 +1,64 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view>
+				<view class="item">
+					<text class="item_title">承接人 : </text>
+					<text class="text_wrap">{{dataContent.acceptUserName}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">承接时间 : </text>
+					<text class="text_wrap">{{dateFormat(dataContent.acceptTime)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">创建人 : </text>
+					<text class="text_wrap">{{dataContent.creator}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">创建时间 : </text>
+					<text class="text_wrap">{{dateFormat(dataContent.createTime)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">完成人 : </text>
+					<text class="text_wrap">{{dataContent.completeUserName}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">完成时间 : </text>
+					<text class="text_wrap">{{dateFormat(dataContent.completeTime)}} </text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	
+	import {dateFormat} from "@/common/basic.js"
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			dateFormat(value){
+				return dateFormat(value)
+			}
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/job/jobProperty.vue b/src/mycomponents/job/jobProperty.vue
new file mode 100644
index 0000000..f231f5e
--- /dev/null
+++ b/src/mycomponents/job/jobProperty.vue
@@ -0,0 +1,36 @@
+<template>
+	<view class="task_item">
+		<view class="task_text">
+			<view class="" v-for="(item, index) in propertyList" >
+				<view class="">
+					{{item.name}} : {{item.value}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+			};
+		},
+		watch: {
+	
+		},
+	
+		props: {
+			propertyList: {
+				type: Object,
+				default: {}
+			},
+		},
+	
+		methods: {
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/job/jobRequestInfo.vue b/src/mycomponents/job/jobRequestInfo.vue
new file mode 100644
index 0000000..31cb230
--- /dev/null
+++ b/src/mycomponents/job/jobRequestInfo.vue
@@ -0,0 +1,96 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view>
+				<view class="item">
+					<text class="item_title">申请单号 : </text>
+					<text class="text_wrap">{{dataContent.requestNumber}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">申请时间 : </text>
+					<text class="text_wrap">{{dateFormat(dataContent.requestTime)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">要求截至时间 : </text>
+					<text class="text_wrap">{{dateFormat(dataContent.requestDueTime)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">从仓库代码 : </text>
+					<text class="text_wrap">{{dataContent.fromWarehouseCode}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">到仓库代码 : </text>
+					<text class="text_wrap">{{dataContent.toWarehouseCode}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">出库库存状态范围 : </text>
+					<text class="text_wrap">{{getInventoryStatusDesc(getDirectoryItemArray(dataContent.outInventoryStatuses))}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">入库库存状态范围 : </text>
+					<text class="text_wrap">{{getInventoryStatusDesc(getDirectoryItemArray(dataContent.inInventoryStatuses))}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">从库位类型范围 : </text>
+					<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.fromLocationTypes))}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">到库位类型范围 : </text>
+					<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.toLocationTypes))}} </text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat,
+		getDirectoryItemArray,
+	} from '@/common/basic.js';
+	
+	import {
+		getInventoryStatusDesc,
+		getLocationTypeNameList
+	} from '@/common/directory.js';
+	
+	export default {
+		components: {},
+		data() {
+			return {
+				list:["OK"]
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			dateFormat(value){
+				return dateFormat(value)
+			},
+			getInventoryStatusDesc(value){
+				return getInventoryStatusDesc(value)
+			},
+			
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			},
+			
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
+			}
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/job/jobSettingInfo.vue b/src/mycomponents/job/jobSettingInfo.vue
new file mode 100644
index 0000000..db1ab47
--- /dev/null
+++ b/src/mycomponents/job/jobSettingInfo.vue
@@ -0,0 +1,77 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view>
+				<view class="item">
+					<text class="item_title">允许修改库位 : </text>
+					<text class="text_wrap">{{ converter( dataContent.allowModifyLocation)}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">允许修改数量 : </text>
+					<text class="text_wrap">{{converter(dataContent.allowModifyQty)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">允许大于推荐数量 : </text>
+					<text class="text_wrap">{{converter(dataContent.allowBiggerQty)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">允许小于推荐数量 : </text>
+					<text class="text_wrap">{{converter(dataContent.allowSmallerQty)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">允许修改库存状态 : </text>
+					<text class="text_wrap">{{converter(dataContent.allowModifyInventoryStatus)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">允许修改箱码 : </text>
+					<text class="text_wrap">{{converter(dataContent.allowModifyPackingNumber)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">允许修改批次 : </text>
+					<text class="text_wrap">{{converter(dataContent.allowModifyBach)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">允许部分完成 : </text>
+					<text class="text_wrap">{{converter(dataContent.allowPartialComplete)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">允许连续扫描 : </text>
+					<text class="text_wrap">{{converter(dataContent.allowContinuousScanning)}} </text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			converter(val) {
+				// return '是'
+				return val == "TRUE" ? '是' : '否'
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/job/jobStatus.vue b/src/mycomponents/job/jobStatus.vue
new file mode 100644
index 0000000..26ea46a
--- /dev/null
+++ b/src/mycomponents/job/jobStatus.vue
@@ -0,0 +1,45 @@
+<template>
+	<view >
+		<text :class="statusStyle(jobStatus)">
+			{{ jobStatusInfo.label}}
+		</text>
+	</view>
+</template>
+
+<script>
+	import {
+		getJobStateInfo
+	} from '@/common/directory.js';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				jobStatusInfo: {}
+			};
+		},
+		watch: {},
+
+		props: {
+			jobStatus: {
+				type: String,
+				default: ""
+			}
+		},
+
+		mounted() {},
+
+		methods: {
+			statusStyle(value) {
+				this.jobStatusInfo = getJobStateInfo(value);
+				return getJobStateInfo(value).remark
+			},
+		}
+	}
+</script>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/job/jobTop.vue b/src/mycomponents/job/jobTop.vue
new file mode 100644
index 0000000..7aab393
--- /dev/null
+++ b/src/mycomponents/job/jobTop.vue
@@ -0,0 +1,41 @@
+<template>
+	<view class="task_top">
+		<view class="uni-flex space-between u-col-center align-center" >
+			<job-number :number="dataContent.number"></job-number>
+			<job-status :jobStatus="dataContent.status"></job-status>
+		</view>
+	</view>
+</template>
+
+<script>
+	import jobNumber from '@/mycomponents/job/jobNumber.vue'
+	import jobStatus from '@/mycomponents/job/jobStatus.vue'
+	export default {
+		components: {
+			jobNumber,
+			jobStatus
+		},
+		data() {
+			return {
+
+			};
+		},
+		watch: {},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+			openDetail(item) {
+				this.$emit("openDetail", this.dataContent);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/mycomponents/job/jobcomDetailCard.vue b/src/mycomponents/job/jobcomDetailCard.vue
new file mode 100644
index 0000000..77fc6fe
--- /dev/null
+++ b/src/mycomponents/job/jobcomDetailCard.vue
@@ -0,0 +1,146 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<item-compare-qty :dataContent="dataContent" :handleQty="Number(dataContent.handleQty)">
+					</item-compare-qty>
+				</template>
+				<u-line />
+				<view class="" v-for="(item,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<recommend :detail="item" :record="item.record" :isShowPack="isShowPack"
+								:isShowBatch="isShowBatch" :isShowFromLocation="isShowLocation"></recommend>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
+		<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
+		<comMessage ref="message"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getDetailRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		components: {
+			itemCompareQty,
+			recommend,
+			balanceQtyEdit,
+			jobDetailPopup,
+			batch
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			jobType: {
+				type: String,
+				default: ""
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			if (this.detailOptions.length == 0) {
+				this.detailOptions = getDetailOption();
+			}
+			if (this.scanOptions.length == 0) {
+				this.scanOptions = getDetailEditRemoveOption();
+				// if (this.dataContent.allowModifyQty == 1) {
+				// 	this.scanOptions = getDetailEditRemoveOption();
+				// } else {
+				// 	this.scanOptions = getDetailRemoveOption();
+				// }
+			}
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				this.$refs.qtyEdit.openEditPopup(item.balance, item.record.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(item) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false
+							item.balance = {}
+							item.inventoryStatus = item.RecommendInventoryStatus
+							// item.record.qty = 0;
+							this.$forceUpdate()
+							this.$emit('remove', item)
+						}
+					});
+			},
+			confirm(qty) {
+				this.editItem.record.qty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/label/label.vue b/src/mycomponents/label/label.vue
new file mode 100644
index 0000000..438ad69
--- /dev/null
+++ b/src/mycomponents/label/label.vue
@@ -0,0 +1,57 @@
+<template>
+	<view>
+		<balance :dataContent="detail" :isShowStdPack="false" :isShowPack="true" :isShowFromLocation="true"></balance>
+		<purchase-info :dataContent="labelContent"></purchase-info>
+	</view>
+</template>
+
+<script>
+	import balance from '@/mycomponents/balance/balance.vue'
+	import purchaseInfo from '@/mycomponents/purchase/purchaseInfo.vue'
+	export default {
+		components: {
+			balance,
+			purchaseInfo
+		},
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			packageContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/location/location.vue b/src/mycomponents/location/location.vue
new file mode 100644
index 0000000..b2286bf
--- /dev/null
+++ b/src/mycomponents/location/location.vue
@@ -0,0 +1,55 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<view class="uni-flex uni-row space-between u-col-center" >
+			<view class="location_view" >
+				<text class="card_location"> 库位 </text>
+				<text> {{locationCode}}</text>
+			</view>
+			<view class="" v-if="recommendQty>0">
+				<count :countType="'recommend_handle_no_pack'"
+				:recommendQty="recommendQty"
+				:handledQty="handledQty"
+				:uom="uom"></count>
+			</view>
+			
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+		},
+		data(){
+			return {
+			}
+		},
+		props: {
+			locationInfo:{
+				type: Object,
+				default: {}
+			},
+			locationCode:{
+				type: String,
+				default: ''
+			},
+			recommendQty:{
+				type: Number,
+				default: 0
+			},
+			handledQty:{
+				type: Number,
+				default: 0
+			},
+			uom:{
+				type: String,
+				default: ''
+			}
+		},
+		
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/location/locationDetail.vue b/src/mycomponents/location/locationDetail.vue
new file mode 100644
index 0000000..c6fd752
--- /dev/null
+++ b/src/mycomponents/location/locationDetail.vue
@@ -0,0 +1,47 @@
+<template>
+	<view class="cen_card" style="background-color: #fff;">
+		<view class="cell_box uni-flex uni-row">
+			<view class="cell_info">
+				<view class="text_lightblue">仓库</view>
+				<view>{{dataContent.warehouseCode}}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">库区</view>
+				<view>{{dataContent.areaCode }}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">库位组</view>
+				<view>{{ dataContent.locationGroupCode }}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">ERP储位</view>
+				<view>{{ dataContent.erpLocationCode }}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'comItemLocationCenter',
+		components: {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/location/locationDrop.vue b/src/mycomponents/location/locationDrop.vue
new file mode 100644
index 0000000..6862f92
--- /dev/null
+++ b/src/mycomponents/location/locationDrop.vue
@@ -0,0 +1,58 @@
+<template>
+	<view class="" style="background-color:#fff;">
+		<view class="uni-flex uni-row u-col-center" >
+			库位 <uni-easyinput ref='scanInput' v-model="locationCode" :focus="inputFocus"
+				@confirm="confirmLocation" suffixIcon="arrowdown" style='font-size: 18px;padding: 10rpx 20rpx;'
+				placeholder="请输入库位" @iconClick="showLocationSelect" :disabled="locationDisabled">
+			</uni-easyinput>
+		</view>
+		<view class="" >
+			<u-select v-model="showLocation" mode="mutil-column-auto" :list="listLode" @confirm="confirmSelectLocation">
+			</u-select>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+		},
+		data(){
+			return {
+				locationCode:"",
+				inputFocus: false,
+				showLocation: false,
+				showPartCode: false
+			}
+		},
+		props: {
+			locationDisabled:{
+				type: Boolean,
+				default: false
+			},
+			listLode:{
+				type: Object,
+				default: []
+			},
+		},
+		methods:{
+			confirmLocation(){
+				// this.showLocation =true
+				
+			},
+			confirmSelectLocation(e) {
+				this.locationCode = e[2].label
+				this.$emit("confirm",this.locationCode)
+			},
+			
+			showLocationSelect() {
+				this.showLocation = true;
+			},
+		}
+		
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/location/locationInfo.vue b/src/mycomponents/location/locationInfo.vue
new file mode 100644
index 0000000..6a63f0a
--- /dev/null
+++ b/src/mycomponents/location/locationInfo.vue
@@ -0,0 +1,45 @@
+<!--库位组件-->
+<template>
+	<view class="" >
+		<view class=""  style="background-color: #fff;">
+			<view class="uni-flex space-between" style="padding: 20rpx;">
+				<view class="" >
+					<text class="font_xl text_black text_bold">{{locationDetail.code}}</text>
+				</view>
+				<view class="">
+					<location-status :type="locationDetail.type" ></location-status>
+				</view>
+			</view>
+			<location-detail :dataContent="locationDetail"></location-detail>
+		</view>
+	</view>
+</template>
+
+<script>
+	import locationDetail from '@/mycomponents/location/locationDetail.vue'
+	import locationStatus from '@/mycomponents/location/locationStatus.vue'
+	export default {
+		name: "comlocation",
+		components: {
+			locationDetail,
+			locationStatus,
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			locationDetail: {
+				type: Object,
+				value: null
+			}
+		},
+		methods:{
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/mycomponents/location/locationStatus.vue b/src/mycomponents/location/locationStatus.vue
new file mode 100644
index 0000000..cf26117
--- /dev/null
+++ b/src/mycomponents/location/locationStatus.vue
@@ -0,0 +1,46 @@
+<template>
+	<view class="">
+		<text :class="statusStyle(type)" style="padding-top: 5rpx;padding-bottom: 5rpx;padding-left: 15rpx;padding-right: 15rpx;">{{statusDesc(type)}}</text>
+	</view>
+</template>
+
+<script>
+	import {
+		getLocationTypeInfo
+	} from '@/common/directory.js';
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+
+			};
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {},
+			},
+			type: {
+				type: String,
+				default: "",
+			},
+		},
+
+		methods: {
+			statusDesc(code) {
+				return getLocationTypeInfo(code).label
+			},
+			statusStyle(code) {
+				
+				return getLocationTypeInfo(code).remark;
+				
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/location/requiredLocation.vue b/src/mycomponents/location/requiredLocation.vue
new file mode 100644
index 0000000..ff43f42
--- /dev/null
+++ b/src/mycomponents/location/requiredLocation.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="uni-flex u-col-center" style="padding-top: 15rpx; 
+	padding-bottom: 15rpx;
+	 padding-left: 10rpx;
+	 padding-right: 10rpx;
+	 font-size:32rpx;">
+		<view class="uni-flex uni-row u-col-center" @click="showLocation">
+			<view>
+				{{title}}
+				<!-- <text style="font-size: 35rpx;">{{title}}&nbsp {{locationCode}} </text> -->
+				<text style="font-size: 35rpx;color:#3FBAFF;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text>
+				<text style="font-size: 35rpx;color:#3FBAFF;">&nbsp {{locationCode}}</text>
+			</view>
+			<image v-if="isShowEdit" style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image>
+		</view>
+		<win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation'
+			:locationTypeList="locationTypeList"></win-scan-location>
+	</view>
+</template>
+
+<script>
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+
+	export default {
+		components: {
+			winScanLocation
+		},
+		data() {
+			return {
+				defaultlocationCode: ""
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: "需求库位"
+			},
+			locationCode: {
+				type: String,
+				default: ""
+			},
+			isShowEdit: {
+				type: Boolean,
+				default: true
+			},
+			locationTypeList: {
+				type: Array,
+				default: []
+			}
+		},
+
+		watch: {
+			// locationCode: {
+			// 	handler(newName, oldName) {
+			// 		if (this.locationCode != "") {
+			// 			this.defaultlocationCode = this.locationCode;
+			// 		}
+			// 	},
+			// 	immediate: true,
+			// 	deep: true
+			// }
+		},
+		methods: {
+			showLocation() {
+				if (this.isShowEdit) {
+					this.$refs.scanLocationCode.openScanPopup();
+				}
+
+			},
+			//扫描源库位
+			getLocation(location, code) {
+				this.$emit("getLocation", location, code)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/package/packageBalance.vue b/src/mycomponents/package/packageBalance.vue
new file mode 100644
index 0000000..8fab758
--- /dev/null
+++ b/src/mycomponents/package/packageBalance.vue
@@ -0,0 +1,84 @@
+<template>
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
+		<view class="uni-flex uni-row space-between uni-inline-item">
+			<view class="uni-flex uni-row  uni-inline-item">
+				<view style=" width: 20px;display: flex;justify-content: center;align-items: center; color: #32C1E8;">
+					原始
+				</view>
+				<view>
+					<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+					<batch v-if="isShowBatch" :batch="detail.batch"></batch>
+					<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
+				</view>
+			</view>
+			<view>
+				<recommend-qty v-if="detail.Records==null || detail.Records.length==0" :dataContent="detail"
+					:isShowStdPack="false" :isShowStatus="false"></recommend-qty>
+				<compare-qty v-else :dataContent="detail" :recommendQty="Number( detail.qty)"
+					:handleQty="Number(detail.handleQty)" :isShowStdPack="false" :isShowStatus="false">
+				</compare-qty>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.recommend {
+		position: absolute;
+		left: 25px;
+		top: 70px;
+		width: 10px;
+		height: 30px;
+		opacity: 1;
+
+	}
+</style>
diff --git a/src/mycomponents/package/packageDetailPopup.vue b/src/mycomponents/package/packageDetailPopup.vue
new file mode 100644
index 0000000..de2c5a5
--- /dev/null
+++ b/src/mycomponents/package/packageDetailPopup.vue
@@ -0,0 +1,204 @@
+<template>
+	<uni-popup ref="popup">
+		<view class="pop_detail" style="height:80%">
+			<com-item :dataContent="dataContent"></com-item>
+			<u-line></u-line>
+			<scroll-view style="height:320px ">
+				<view v-for="(item, index) in dataList" style="width: 100%;">
+					<view class="item">
+						<text class="item_title">{{item.item_title}} </text>
+						<text v-if="(item.type=='')||(item.type==undefined)" class="text_wrap">{{item.content}}</text>
+						<text v-else-if="item.type=='dateTime'" class="text_wrap">{{formatDate(item.content)}} </text>
+					</view>
+				</view>
+			</scroll-view>
+
+			<view class="uni-flex u-row-center ">
+				<view class="close_button" @click="closePopup">
+					关闭</view>
+				<!-- button 滚动不好使 -->
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import comItem from '@/mycomponents/item/item.vue'
+	import { dateFormat 	} from '@/common/basic.js';
+	export default {
+		emits: ['onClose'],
+		components: {
+			comItem
+		},
+		data() {
+			return {
+				dataContent: {
+					type: Object,
+					default: {}
+				},
+				dataList: []
+			}
+		},
+
+		mounted() {},
+		props: {
+
+		},
+
+		methods: {
+			openPopup(val) {
+				this.dataContent = val;
+				this.getDataList();
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+
+			},
+			closePopup(val) {
+				this.$refs.popup.close('bottom')
+				// this.$emit('onClose')
+			},
+			getDataList() {
+				// console.log(JSON.stringify(this.dataContent));
+				this.dataList.length = 0;
+				this.dataList.push(...[{
+					item_title: '包装号',
+					content: this.dataContent.number
+				}, {
+					item_title: '物料代码',
+					content: this.dataContent.itemCode
+				}, {
+					item_title: '物品名称',
+					content: this.dataContent.itemName
+				}, {
+					item_title: '物品描述1',
+					content: this.dataContent.itemDesc1
+				}, {
+					item_title: '物品描述2',
+					content: this.dataContent.itemDesc2
+				}, {
+					item_title: '批次',
+					content: this.dataContent.batch
+				}, {
+					item_title: '替代批次',
+					content: this.dataContent.altBatch
+				}, {
+					item_title: '生产日期',
+					content: this.dataContent.produceDate,
+					type:"dateTime"
+				}, {
+					item_title: '有效日期',
+					content: this.dataContent.validityDays,
+					type:"dateTime"
+				}, {
+					item_title: '失效日期',
+					content: this.dataContent.expireDate,
+					type:"dateTime"
+				}, {
+					item_title: '计量单位',
+					content: this.dataContent.uom,
+					type:"uom"
+				}, {
+					item_title: '数量',
+					content: this.dataContent.qty
+				}, {
+					item_title: '替代计量单位',
+					content: this.dataContent.altUom
+				}, {
+					item_title: '替代数量',
+					content: this.dataContent.altQty
+				}, {
+					item_title: '转换率',
+					content: this.dataContent.convertRate
+				}, {
+					item_title: '标包数量',
+					content: this.dataContent.stdPackQty
+				}, {
+					item_title: '标包单位',
+					content: this.dataContent.stdPackUnit
+				}, {
+					item_title: '仓库代码',
+					content: this.dataContent.toWarehouseCode
+				}, {
+					item_title: '月台代码',
+					content: this.dataContent.toDockCode
+				}, {
+					item_title: '库位代码',
+					content: this.dataContent.toLocationCode
+				}, {
+					item_title: '供应商代码',
+					content: this.dataContent.supplierCode
+				}, {
+					item_title: '供应商物品代码',
+					content: this.dataContent.supplierItemCode
+				}, {
+					item_title: '采购订单号',
+					content: this.dataContent.poNumber
+				}, {
+					item_title: '采购订单行',
+					content: this.dataContent.poLine
+				}, {
+					item_title: '采购计划单号',
+					content: this.dataContent.rpNumber
+				}, {
+					item_title: '发货单号',
+					content: this.dataContent.asnNumber
+				}, {
+					item_title: '生产订单号',
+					content: this.dataContent.woNumber
+				}, {
+					item_title: '生产订单行',
+					content: this.dataContent.woLine
+				}, {
+					item_title: '生产线代码',
+					content: this.dataContent.productionLineCode
+				}, {
+					item_title: '班组代码',
+					content: this.dataContent.teamCode
+				}, {
+					item_title: '班次代码',
+					content: this.dataContent.shiftCode
+				}, {
+					item_title: '客户代码',
+					content: this.dataContent.customerCode
+				}, {
+					item_title: '客户月台代码',
+					content: this.dataContent.customerDockCode
+				}, {
+					item_title: '客户物品代码',
+					content: this.dataContent.customerItemCode
+				}, {
+					item_title: '销售订单号',
+					content: this.dataContent.soNumber
+				}, {
+					item_title: '销售订单行',
+					content: this.dataContent.soLine
+				}, {
+					item_title: '质量等级',
+					content: this.dataContent.eqLevel
+				}, {
+					item_title: '货主代码',
+					content: this.dataContent.ownerCode
+				}, {
+					item_title: '重量',
+					content: this.dataContent.weight
+				}, {
+					item_title: '面积',
+					content: this.dataContent.area
+				}, {
+					item_title: '体积',
+					content: this.dataContent.volume
+				}]);
+			},
+			formatDate(val) {
+				return dateFormat(val)
+			},
+			
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/mycomponents/package/packageHandle.vue b/src/mycomponents/package/packageHandle.vue
new file mode 100644
index 0000000..ecb4274
--- /dev/null
+++ b/src/mycomponents/package/packageHandle.vue
@@ -0,0 +1,85 @@
+<template>
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
+		<view class="uni-flex uni-row space-between uni-inline-item">
+			<view class="uni-flex uni-row  uni-inline-item">
+				
+				<view style=" width: 20px;display: flex;justify-content: center;align-items: center; color: #32C1E8;">
+					实际
+				</view>
+				<view>
+					<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+					<batch v-if="isShowBatch" :batch="detail.batch"></batch>
+					<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
+				</view>
+			</view>
+			<view>
+				<recommend-qty v-if="detail.Records==null || detail.Records.length==0" :dataContent="detail"
+					:isShowStdPack="false" :isShowStatus="false"></recommend-qty>
+				<compare-qty v-else :dataContent="detail" :recommendQty="Number( detail.qty)"
+					:handleQty="Number(detail.handleQty)" :isShowStdPack="false" :isShowStatus="false">
+				</compare-qty>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.recommend {
+		position: absolute;
+		left: 25px;
+		top: 70px;
+		width: 10px;
+		height: 30px;
+		opacity: 1;
+
+	}
+</style>
diff --git a/src/mycomponents/package/packageTarget.vue b/src/mycomponents/package/packageTarget.vue
new file mode 100644
index 0000000..a1af74a
--- /dev/null
+++ b/src/mycomponents/package/packageTarget.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="uni-flex u-col-center" style="padding-top: 15rpx; 
+	padding-bottom: 15rpx;
+	 padding-left: 10rpx;
+	 padding-right: 10rpx;
+	 font-size:32rpx;background-color: #fff;">
+		<text style="font-size: 35rpx;">{{title}} </text>
+		<view class="uni-flex u-col-center" @click="showPack">
+			<text style="color:#3FBAFF;font-size: 35rpx;" v-if="packingNumber==''&&isShowEdit==true">&nbsp 请扫描</text>
+			<text style="color:#3FBAFF; font-size: 35rpx;">&nbsp {{packingNumber}}</text>
+			<image v-if="isShowEdit" style="width: 45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"
+				></image>
+		</view>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult'  headerType="HPQ"></win-scan-pack>
+	</view>
+</template>
+
+<script>
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	export default {
+		components: {
+			winScanPack
+		},
+		data() {
+			return {
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: "需求库位"
+			},
+			packingNumber: {
+				type: String,
+				default: ""
+			},
+			isShowEdit: {
+				type: Boolean,
+				default: true
+			}
+		},
+
+		watch: {
+		},
+		methods: {
+			showPack() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+			getScanResult(result) {
+				this.$emit("getScanResult", result)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/partCode/partCode.vue b/src/mycomponents/partCode/partCode.vue
new file mode 100644
index 0000000..915106b
--- /dev/null
+++ b/src/mycomponents/partCode/partCode.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="">
+		<uni-swipe-action ref="swipeAction">
+			<uni-swipe-action-item :right-options="options" @click="swipeClicks($event)">
+				<view class="uni-flex u-col-center space-between" style="
+				background-color:#fff;
+				margin-left: 10rpx;">
+					<view class="card_partCode" >
+						<view class="" >
+							{{itemCode}}
+						</view>
+						<view class="">
+							{{itemName}}
+						</view>
+					</view>
+					<view class="" v-if="showCount">
+						<count :countType="countType"
+						:recommendQty="recommendQty" 
+						:uom="uom" 
+						:stdPackQty="stdPackQty"
+						:handledQty="handledQty"></count>
+					</view>
+					
+				</view>
+			</uni-swipe-action-item>
+		</uni-swipe-action>
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+		components: {
+		},
+
+		data() {
+			return {
+				options_edit: [{
+					text: '编辑',
+					style: {
+						backgroundColor: '#F1A532'
+					}
+				}],
+				options_clear: [{
+					text: '清空',
+					style: {
+						backgroundColor: '#F56C6C'
+					}
+				}],
+				options_remove: [{
+					text: '移除',
+					style: {
+						backgroundColor: '#F56C6C'
+					}
+				}],
+				options_all: [{
+					text: '详情',
+					style: {
+						backgroundColor: '#3C9CFF'
+					}
+				},{
+					text: '编辑',
+					style: {
+						backgroundColor: '#F1A532'
+					}
+				},
+				{
+					text: '移除',
+					style: {
+						backgroundColor: '#F56C6C'
+					}
+				}],
+				index: 10,
+				options: []
+			}
+		},
+		props: {
+			itemCode: {
+				type: String,
+				default: ''
+			},
+			itemName: {
+				type: String,
+				default: ''
+			},
+			itemDesc: {
+				type: String,
+				default: ''
+			},
+			recommendQty: {
+				type: Number,
+				default: 0
+			},
+			handledQty: {
+				type: Number,
+				default: 0
+			},
+			stdPackQty: {
+				type: Number,
+				default: 0,
+			},
+			uom: {
+				type: String,
+				default: ''
+			},
+			jobStatus: {
+				type: Number,
+				default: 0
+			},
+			actionType: {
+				type: String,
+				default: ''
+			},
+			countType: {
+				type: String,
+				default: 'recommend_handle_no_state'
+			},
+			showCount:{
+				type:Boolean,
+				default:true
+			}
+		},
+		watch: {
+			// recommend
+			actionType: {
+				handler(newval, oldval) {
+					if (this.actionType == "edit") {
+						this.options = this.options_edit;
+					} else if(this.actionType == "clear"){
+						this.options = this.options_clear;
+					}else if(this.actionType == "remove"){
+						this.options = this.options_remove;
+					}else if(this.actionType == "all"){
+						this.options = this.options_all;
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+		methods: {
+			swipeClicks(e) {
+				if (e.content.text == '详情') {
+					this.$emit("detail")
+				}else if (e.content.text == '编辑') {
+					this.$emit("edit")
+				} else if (e.content.text == '清空'|| e.content.text == '移除') {
+					this.$emit("clear")
+				}
+
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/partCode/partCodeSelect.vue b/src/mycomponents/partCode/partCodeSelect.vue
new file mode 100644
index 0000000..6a059ff
--- /dev/null
+++ b/src/mycomponents/partCode/partCodeSelect.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="" style="background-color:#fff;">
+		<view class="uni-flex uni-row" style="display: flex;align-items: center;">
+			物料
+			<uni-easyinput ref='scanInput' v-model="partCode" @confirm="confirmPartCode" @clear="clear"
+				style='font-size: 18px;padding: 10rpx 20rpx;' placeholder="请输入物料号" @iconClick="">
+			</uni-easyinput>
+		</view>
+		<view class="">
+			<u-select v-model="showPartCode" mode="single-column" :list="list" @confirm="confirmSelectPartCode">
+			</u-select>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		components: {},
+
+		data() {
+			return {
+				partCode: "",
+				showPartCode: false,
+			}
+		},
+		props: {
+			list: {
+				type: Object,
+				default: []
+			}
+
+		},
+		watch: {
+			// recommend
+
+		},
+		methods: {
+			confirmPartCode() {
+				if (this.partCode == '') {
+					uni.showToast({
+						title: "请扫描物料"
+					})
+					return;
+				}
+				this.showPartCode = true;
+			},
+			confirmSelectPartCode(e) {
+				this.partCode = e[0].label
+				this.$emit("confirmSelectPartCode", this.partCode)
+
+			},
+			clear() {
+				this.partCode = "";
+				this.$emit("clearPartCode", this.partCode)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/popup/selectList.vue b/src/mycomponents/popup/selectList.vue
new file mode 100644
index 0000000..a7e9553
--- /dev/null
+++ b/src/mycomponents/popup/selectList.vue
@@ -0,0 +1,116 @@
+<template>
+	<uni-popup ref="popupItems">
+		<com-popup @onClose="closePopup">
+			<view class="uni-center" style="position: relative;height:900rpx ;">
+				<view class="" style="position: absolute;font-size: 38rpx;height: 50rpx; margin-top: 10rpx;margin-bottom: 10rpx;left: 0;top: 0;right: 0;">
+					选择物料
+				</view>
+				<u-line/>
+				<view class="" style="position: absolute;height: 720rpx; font-size: 40rpx;top: 70rpx;bottom: 80rpx;left: 0;right: 0;">
+					<view style="margin: 15rpx;text-align: left;" v-for="(item, index) in showList" :key="index" >
+						<view class="" style="padding: 10rpx;font-size: 30rpx; " @click="selectItem(item)">
+							({{index+1}}) 物料: {{item.itemCode}}
+						</view>
+						<u-line/>
+					</view>
+				</view>
+				<view class="" style="position: absolute; height:80rpx ;left: 0;bottom: 0;right: 0;">
+					<view class="flex uni-center" style="width: 100%;justify-content: center;margin-top: 10rpx;margin-bottom: 10rpx;" >
+						<view class="">
+							当前页：{{ pageCurrent }}，数据总量：{{ total }}条，每页数据：{{ pageSize }}
+						</view>
+						
+					</view>
+					<view class="">
+						<uni-pagination :page-size="pageSize" :current="pageCurrent" :total="total" @change="change" />
+					</view> 
+				</view>
+			</view>
+			
+		</com-popup>
+	</uni-popup>
+</template>
+
+<script>
+	
+	import {
+		getCustomerItemList
+	} from '@/api/request2.js';
+	import comPopup from '@/mycomponents/common/comPopup.vue'
+	export default {
+		emits: ["selectedItem"],
+		components: {
+			comPopup,
+		},
+		props: {
+
+		},
+		data() {
+			return {
+				showList: [],
+				pageCurrent:1,
+				pageSize:10,
+				total:0
+				
+			}
+		},
+		methods: {
+			queryList(lineCode){
+				var filters =[]
+				filters.push({
+					column: "customerCode",
+					action: "==",
+					value: lineCode
+				})
+				
+				var params = {
+					filters: filters,
+					pageNo: this.pageCurrent,
+					pageSize: this.pageSize,
+				}
+				getCustomerItemList(params).then(res => {
+					if (res.data != null && res.data.list.length > 0) {
+						this.showList = res.data.list;
+						this.total = res.data.total;
+						this.$forceUpdate()
+						this.$refs['popupItems'].open("center");
+					} else {
+						//没有查询到生产线对应的物料信息
+						// this.showErrorMessage('未查找到生产线【' + lineCode + '】对应的物料');
+						this.$refs['popupItems'].open("center");
+					}
+				}).catch(error => {
+					// this.showErrorMessage(error);
+				})
+			},
+			openPopup(items) {
+				this.showList = items;
+				this.$refs['popupItems'].open("center");
+			},
+			closePopup() {
+				this.$refs.popupItems.close()
+			},
+			selectItem(item) {
+				this.$emit("selectedItem", item);
+				this.$refs['popupItems'].close();
+			},
+			change(e){
+				this.pageCurrent = e.current
+				console.log("分页",e.current)
+			}
+			
+		}
+	}
+</script>
+
+<style>
+	.fixed-bottom {
+	  position: fixed;
+	  bottom: 0;
+	  width: 100%;
+	  text-align: center;
+	  background-color: #fff;
+	  padding: 10px 0;
+	  box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.1);
+	}
+</style>
diff --git a/src/mycomponents/production/productionInfo.vue b/src/mycomponents/production/productionInfo.vue
new file mode 100644
index 0000000..e54bbaa
--- /dev/null
+++ b/src/mycomponents/production/productionInfo.vue
@@ -0,0 +1,39 @@
+<template>
+	<view class="pack_view uni-inline-item">
+		<text style="color: #606266;font-size: 13px;">生产线</text>
+		<text style="color: #606266;font-size: 13px;">{{dataContent.productionLineCode}}</text>
+	</view>
+	<view class="pack_view uni-inline-item">
+		<text style="color: #606266;font-size: 13px;">生产日期</text>
+		<text style="color: #606266;font-size: 13px;">{{dataContent.produceDate}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/purchase/purchaseInfo.vue b/src/mycomponents/purchase/purchaseInfo.vue
new file mode 100644
index 0000000..b831c77
--- /dev/null
+++ b/src/mycomponents/purchase/purchaseInfo.vue
@@ -0,0 +1,37 @@
+<template>
+	<view class="pack_view uni-inline-item">
+		<text style="color: #606266;font-size: 13px;">供应商</text>
+		<text style="color: #606266;font-size: 13px;">{{dataContent.SupplierName}}</text>
+	</view>
+	<view class="pack_view uni-inline-item">
+		<text style="color: #606266;font-size: 13px;">采购订单</text>
+		<text style="color: #606266;font-size: 13px;">{{dataContent.PoNumber}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: ''
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/qty/CountQtyEdit.vue b/src/mycomponents/qty/CountQtyEdit.vue
new file mode 100644
index 0000000..1d1cbce
--- /dev/null
+++ b/src/mycomponents/qty/CountQtyEdit.vue
@@ -0,0 +1,269 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<view class="uni-flex uni-column pop_customer">
+				<view class="" style="padding:10rpx">
+					<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
+						<view class="" style="font-size: 35rpx;">
+							{{title}}
+						</view>
+						<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+							@click="closeEditPopup"></image>
+					</view>
+					<u-line />
+					<view class="uni-flex uni-column" style="background-color: white; height:60%;">
+						<view class="uni-flex uni-column  ">
+							<view class="uni-flex uni-row space-between padding title ">
+								<text>标包个数 : </text>
+								<view class="uni-flex uni-row u-col-center">
+									<uni-number-box @change="calcQty($event,stdCount)" :value="stdCount" :focus="false">
+									</uni-number-box>
+									<view class="std_pack">
+										{{getStdPackUnitInfo(dataContent.stdPackUnit)}}
+									</view>
+								</view>
+
+							</view>
+							<u-line />
+							<view class="uni-flex uni-row space-between padding title u-col-center">
+								<text>标包量 : </text>
+								<view class="uni-flex u-col-center uni-row">
+									<text>{{Number(dataContent.stdPackQty)}}</text>
+									<uom :uom="dataContent.uom"></uom>
+								</view>
+							</view>
+
+							<u-line />
+							<view class="uni-flex uni-row space-between padding title u-col-center">
+								<text>数量 : </text>
+								<view class="uni-flex uni-row uni-center" style="align-items: center;">
+									<input class="qty_input" v-model="allQty" :focus="true" type="number"
+										@mousedown="mousedown" @input="checkNum" :maxlength="maxlength" />
+									<uom :uom="dataContent.uom"></uom>
+								</view>
+							</view>
+							<u-line />
+							<view v-if="isShowBalance"
+								class="uni-flex uni-row space-between padding title u-col-center">
+								<text>库存数量 : </text>
+								<view class="uni-flex uni-row uni-center" style="align-items: center;">
+									<text class="text_recommend">{{Number(dataContent.balanceQty)}}</text>
+									<uom :uom="dataContent.uom"></uom>
+								</view>
+							</view>
+							<u-line />
+							<view v-if="isShowStatus" class="uni-flex uni-row space-between title"
+								style="align-items: center; padding-left: 30rpx;">
+								<text>库存状态 : </text>
+								<view class="uni-flex uni-row uni-center" style="align-items: center;">
+									<balanceStatus ref="balanceStatus" :status="inventoryStatus" :allowEdit='true'
+										@updateStatus="updateStatus" @onOpen="clickState">
+									</balanceStatus>
+								</view>
+							</view>
+							<u-line />
+						</view>
+					</view>
+				</view>
+				<view class="uni-flex uni-row hide_border">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+					<button v-if="showConfirmCountdown" class="btn_edit_big_confirm" hover-class="btn_edit_big_after"
+						@click="confirm()">确认({{seconds}}s关闭)</button>
+					<button v-else class="btn_edit_big_confirm" hover-class="btn_edit_big_after"
+						@click="confirm()">确认</button>
+				</view>
+			</view>
+
+		</uni-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import uom from '@/mycomponents/qty/uom.vue'
+	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
+	import {
+		getStdPackUnitInfo
+	} from "@/common/directory.js"
+	import {
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	export default {
+		components: {
+			uom,
+			balanceStatus,
+		},
+		data() {
+			return {
+				allQty: 0,
+				stdCount: 0,
+				stateData: 0,
+				balanceQty: 0,
+				inventoryStatus: "",
+				dataContent: {},
+				handleQty: 0,
+				seconds: 0,
+				timer: {},
+				showConfirmCountdown: false,
+				detailList: [],
+				maxlength: 10,
+				mode: 'add' //add 新增  edit 编辑
+			}
+		},
+		watch: {
+
+		},
+		created() {
+
+		},
+
+		props: {
+			title: {
+				type: String,
+				default: "编辑数量"
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			isShowBalance: {
+				type: Boolean,
+				default: true
+			},
+			allowEditStatus: {
+				type: Boolean,
+				default: false
+			},
+		},
+		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+			},
+
+			//编辑时弹出
+			openEditPopup(item, detailList) {
+				this.initData(item, detailList);
+				// this.dataContent = item
+				// this.inventoryStatus = this.dataContent.inventoryStatus;
+				// this.allQty = Number(this.dataContent.qty)
+				// this.stdCount = Math.ceil(this.allQty / this.dataContent.stdPackQty);
+				// this.detailList = detailList
+				this.showConfirmCountdown = false;
+				this.mode = 'edit';
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+				clearInterval(this.timer)
+			},
+
+			//新增时弹出
+			openEditPopupShowSeconds(item, detailList) {
+				this.initData(item, detailList);
+				this.showConfirmCountdown = true;
+				this.mode = 'add';
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+				this.startTimer()
+			},
+
+			initData(item, detailList) {
+				this.dataContent = item;
+				this.inventoryStatus = this.dataContent.inventoryStatus;
+				this.allQty = Number(this.dataContent.handleQty);
+				this.stdCount = Math.ceil(this.allQty / this.dataContent.stdPackQty);
+				this.detailList = detailList;
+			},
+
+			mousedown() {
+				this.showConfirmCountdown = false;
+				clearInterval(this.timer)
+			},
+
+			clickState() {
+				this.showConfirmCountdown = false;
+				clearInterval(this.timer)
+			},
+
+			closeEditPopup() {
+				clearInterval(this.timer)
+				this.$emit("close");
+				this.$refs.popup.close()
+			},
+			confirm() {
+				this.setValue();
+			},
+			cancel() {
+				this.closeEditPopup();
+			},
+			startTimer() {
+				this.seconds = 3;
+				clearInterval(this.timer)
+				this.timer = setInterval(() => {
+					this.seconds--
+					if (this.seconds <= 0) {
+						this.confirm();
+						// this.cancel()
+						return
+					}
+				}, 1000)
+			},
+			calcQty(val) {
+				if (val > 0) {
+					this.allQty = val * Number(this.dataContent.stdPackQty);
+				}
+			},
+
+			setValue() {
+				this.dataContent.handleQty = Number(this.allQty)
+				this.$emit("confirm", Number(this.allQty), this.inventoryStatus, this.mode);
+				this.closeEditPopup();
+			},
+
+			updateStatus(value) {
+				this.inventoryStatus = value
+			},
+
+			getStdPackUnitInfo(value) {
+				return getStdPackUnitInfo(value).name
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-popup .uni-popup__wrapper {
+		width: 100% !important;
+		padding: 30rpx;
+	}
+
+	.hide_border {
+		button {
+			border: none;
+		}
+
+		button::after {
+			border: none;
+		}
+	}
+
+	.title {
+		font-size: 30rpx;
+	}
+</style>
diff --git a/src/mycomponents/qty/RecommendQty.vue b/src/mycomponents/qty/RecommendQty.vue
new file mode 100644
index 0000000..b294485
--- /dev/null
+++ b/src/mycomponents/qty/RecommendQty.vue
@@ -0,0 +1,72 @@
+<template>
+	<view>
+		<view class="uni-flex uni-row center">
+			<status v-if="isShowStatus" :status='dataContent.inventoryStatus'></status>
+			<view class="text_recommend ">
+				{{Number(dataContent.qty)}}
+			</view>
+			<uom v-show="!isShowStdPack" :uom="dataContent.uom"></uom>
+		</view>
+		<view>
+			<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty>
+		</view>
+	</view>
+</template>
+
+<script>
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import uom from '@/mycomponents/qty/uom.vue'
+	import status from '@/mycomponents/status/status.vue'
+
+	export default {
+		components: {
+			stdPackQty,
+			uom,
+			status
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			type: {
+				type: String,
+				default: 'default' //recommend:推荐 compare:对比 
+			},
+
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			recommendQty: {
+				type: Number,
+				default: 0
+			},
+
+			handleQty: {
+				type: Number,
+				default: 0
+			},
+
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+
+		},
+	}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/mycomponents/qty/balanceQty.vue b/src/mycomponents/qty/balanceQty.vue
new file mode 100644
index 0000000..f0b80e1
--- /dev/null
+++ b/src/mycomponents/qty/balanceQty.vue
@@ -0,0 +1,73 @@
+<template>
+	<view>
+		<view class="center">
+			<view class="uni-flex uni-row text_balance">
+				<text>
+					{{Number(dataContent.qty)}}
+				</text>
+			</view>
+			<uom v-if="dataContent.stdPackQty==undefined" :uom="dataContent.uom"></uom>
+		</view>
+		<view class="uni-flex uni-row center">
+			<std-pack-qty :dataContent="dataContent"></std-pack-qty>
+		</view>
+	</view>
+</template>
+
+<script>
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import uom from '@/mycomponents/qty/uom.vue'
+	import status from '@/mycomponents/status/status.vue'
+
+	export default {
+		components: {
+			stdPackQty,
+			uom,
+			status
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			type: {
+				type: String,
+				default: 'default' //recommend:推荐 compare:对比 
+			},
+
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			recommendQty: {
+				type: Number,
+				default: 0
+			},
+
+			handleQty: {
+				type: Number,
+				default: 0
+			},
+
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+
+		},
+	}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/mycomponents/qty/balanceQtyEdit.vue b/src/mycomponents/qty/balanceQtyEdit.vue
new file mode 100644
index 0000000..bc8a903
--- /dev/null
+++ b/src/mycomponents/qty/balanceQtyEdit.vue
@@ -0,0 +1,217 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<view class="uni-flex uni-column pop_customer">
+				<view class="" style="padding:10rpx">
+					<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
+						<view class="" style="font-size: 35rpx;">
+							{{title}}
+						</view>
+						<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+							@click="closeEditPopup"></image>
+					</view>
+					<u-line />
+					<view class="uni-flex uni-column" style="background-color: white; height:60%;">
+						<view class="uni-flex uni-column  ">
+							<view class="uni-flex uni-row space-between padding title ">
+								<text>标包个数 : </text>
+								<view class="uni-flex uni-row u-col-center">
+									<uni-number-box @change="calcQty($event,stdCount)" :value="stdCount">
+									</uni-number-box>
+									<std-uom :uom="dataContent.stdPackUnit"></std-uom>
+									<!-- <uom :uom="dataContent.stdPackUnit"></uom> -->
+								</view>
+							</view>
+							<u-line />
+							<view class="uni-flex uni-row space-between padding title u-col-center">
+								<text>标包量 : </text>
+								<view class="uni-flex u-col-center uni-row">
+									<text>{{Number(dataContent.stdPackQty)}}</text>
+									<uom :uom="dataContent.uom"></uom>
+								</view>
+							</view>
+
+							<u-line />
+							<view class="uni-flex uni-row space-between padding title u-col-center">
+								<text>数量 : </text>
+								<view class="uni-flex uni-row uni-center" style="align-items: center;">
+									<input class="qty_input" v-model="allQty" :focus="true" type="number"
+										@confirm="confirm()" @input="checkNum" :maxlength="maxlength" />
+									<uom :uom="dataContent.uom"></uom>
+								</view>
+							</view>
+							<u-line />
+							<view class="uni-flex uni-row space-between padding title u-col-center">
+								<text>库存数量 : </text>
+								<view class="uni-flex uni-row uni-center" style="align-items: center;">
+									<text class="text_recommend">{{Number(dataContent.balanceQty)}}</text>
+									<uom :uom="dataContent.uom"></uom>
+								</view>
+							</view>
+							<u-line />
+							<view v-if="isShowStatus" class="uni-flex uni-row space-between  title u-col-center"
+								style="padding-left: 30rpx;">
+								<text>库存状态 : </text>
+								<view class="uni-flex uni-row uni-center" style="align-items: center;">
+									<balanceStatus ref="balanceStatus" :status="inventoryStatus"
+										:allowEdit='allowEditStatus' @updateStatus="updateStatus">
+									</balanceStatus>
+								</view>
+							</view>
+							<u-line />
+						</view>
+					</view>
+				</view>
+				<view class="uni-flex uni-row hide_border">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+					<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import uom from '@/mycomponents/qty/uom.vue'
+	import StdUom from '@/mycomponents/qty/StdUom.vue'
+	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
+	
+	export default {
+		components: {
+			uom,
+			StdUom,
+			balanceStatus,
+		},
+		data() {
+			return {
+				allQty: 0,
+				stdCount: 0,
+				stateData: 0,
+				balanceQty: 0,
+				inventoryStatus: "",
+				originalInventoryStatus: "",
+				dataContent: {},
+				handleQty: 0,
+				maxlength: 10
+			}
+		},
+		watch: {
+
+		},
+		created() {
+
+		},
+
+		props: {
+			title: {
+				type: String,
+				default: "编辑数量"
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			allowEditStatus: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+			},
+			openEditPopup(item, handleQty) {
+				this.dataContent = item
+				this.inventoryStatus = this.dataContent.inventoryStatus
+				this.originalInventoryStatus =this.dataContent.inventoryStatus;
+				this.toInventoryStatus = this.dataContent.toInventoryStatus
+				this.allQty = handleQty
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeEditPopup() {
+				this.$refs.popup.close()
+			},
+			confirm() {
+				this.setValue();
+			},
+			cancel() {
+				this.dataContent.inventoryStatus = this.originalInventoryStatus;
+				this.closeEditPopup();
+			},
+			calcQty(val) {
+				if (val > 0) {
+					this.allQty = val * Number(this.dataContent.stdPackQty);
+				}
+			},
+			setValue() {
+				var balanceQty = Number(this.dataContent.balanceQty);
+				if (this.allQty == 0) {
+					this.$refs.comMessage.showConfirmWarningModal('数量必须大于0',
+						res => {
+							this.allQty = balanceQty;
+						})
+				} else if (this.allQty > balanceQty) {
+					this.$refs.comMessage.showConfirmWarningModal('数量[' + this.allQty + ']不允许大于库存数量[' + balanceQty + ']',
+						res => {
+							this.allQty = balanceQty;
+						})
+				} else {
+					this.callback();
+				}
+			},
+			callback() {
+				let qty = Number(this.allQty);
+				this.dataContent.handleQty = qty;
+				if (this.allowEditStatus) //只有编辑了库存状态,才给库存状态赋值
+				{
+					this.dataContent.toInventoryStatus = this.inventoryStatus;
+				}
+				this.$emit("confirm", qty);
+				this.closeEditPopup();
+			},
+			updateStatus(value) {
+				this.inventoryStatus = value
+				console.log(this.inventoryStatus)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-popup .uni-popup__wrapper {
+		width: 100% !important;
+		padding: 30rpx;
+	}
+
+	.hide_border {
+		button {
+			border: none;
+		}
+
+		button::after {
+			border: none;
+		}
+	}
+
+	.title {
+		font-size: 30rpx;
+	}
+</style>
diff --git a/src/mycomponents/qty/compareQty.vue b/src/mycomponents/qty/compareQty.vue
new file mode 100644
index 0000000..287ca68
--- /dev/null
+++ b/src/mycomponents/qty/compareQty.vue
@@ -0,0 +1,106 @@
+<template>
+	<view>
+		<view class="uni-flex uni-row ">
+			<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
+			<view class="uni-flex uni-row center">
+				<view v-if="Number(handleQty)!=0">
+					<view v-if="isShowRecommendQty">
+						<view v-if="Number(recommendQty)>Number(handleQty)" class="text_greater">
+							{{Number(handleQty)}}
+						</view>
+						<view v-else-if="Number(recommendQty)<Number(handleQty)" class="text_less">
+							{{Number(handleQty)}}
+						</view>
+						<view v-else-if="Number(recommendQty) ==Number(handleQty)" class="text_equal">
+							{{Number(handleQty)}}
+						</view>
+					</view>
+					<view v-else>
+						<view class="text_balance">
+							{{Number(handleQty)}}
+						</view>
+					</view>
+				</view>
+				<view class="center" v-if="isShowRecommendQty">
+					<view v-if="Number(handleQty)!=0" class="std_split">/</view>
+					<view class="text_recommend ">
+						{{Number(recommendQty)}}
+					</view>
+				</view>
+			</view>
+			<uom v-show="!isShowStdPack" :uom="dataContent.uom">
+			</uom>
+			<!-- <uom v-show="Number(handleQty)!=0||(isShowRecommendQty&&Number(recommendQty)>0)" :uom="dataContent.uom">
+			</uom> -->
+		</view>
+		<view>
+			<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty>
+		</view>
+	</view>
+</template>
+
+<script>
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import uom from '@/mycomponents/qty/uom.vue'
+	import status from '@/mycomponents/status/status.vue'
+
+	export default {
+		components: {
+			stdPackQty,
+			uom,
+			status
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			type: {
+				type: String,
+				default: 'default' //recommend:推荐 compare:对比 
+			},
+
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			recommendQty: {
+				type: Number,
+				default: 0
+			},
+
+			handleQty: {
+				type: Number,
+				default: 0
+			},
+
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowRecommendQty: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+			handleQty: {
+				handler(newName, oldName) {},
+				immediate: true,
+				deep: true
+			}
+		},
+		methods: {
+
+		},
+	}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/mycomponents/qty/inspectQtyEdit.vue b/src/mycomponents/qty/inspectQtyEdit.vue
new file mode 100644
index 0000000..c12ab10
--- /dev/null
+++ b/src/mycomponents/qty/inspectQtyEdit.vue
@@ -0,0 +1,198 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<view class="uni-flex uni-column pop_customer">
+				<view class="" style="padding:10rpx">
+					<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
+						<view class="" style="font-size: 35rpx;">
+							{{title}}
+						</view>
+						<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+							@click="closeEditPopup"></image>
+					</view>
+					<u-line />
+					<view class="uni-flex uni-column" style="background-color: white; height:60%;">
+						<view class="uni-flex uni-column  ">
+
+							<view class="uni-flex uni-row space-between padding title u-col-center">
+								<text>数量 : </text>
+								<view class="uni-flex uni-row uni-center" style="align-items: center;">
+									<input class="qty_input" v-model="allQty" :focus="true" type="number"
+										@confirm="confirm()" />
+									<uom :uom="dataContent.uom"></uom>
+								</view>
+							</view>
+							<u-line />
+							<view class="uni-flex uni-row space-between padding title u-col-center">
+								<text>不合格数量 : </text>
+								<view class="uni-flex uni-row uni-center" style="align-items: center;">
+									<input class="qty_input" v-model="FailedQty" :focus="true" type="number"
+										@confirm="confirm()" />
+									<uom :uom="dataContent.uom"></uom>
+								</view>
+							</view>
+							<u-line />
+							<view class="uni-flex uni-row u-col-center" style="width: 100%;">
+								<view class=""
+									style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 20rpx;">
+									不合格原因 :
+								</view>
+								<uni-data-picker style="padding: 20rpx; background-color:#fff;" class='uni-data-picker'
+									placeholder="请选择原因" popup-title="选择不合格原因" :localdata="reasonList" v-model="reason">
+								</uni-data-picker>
+							</view>
+							<u-line />
+
+						</view>
+					</view>
+				</view>
+				<view class="uni-flex uni-row hide_border">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+					<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import uom from '@/mycomponents/qty/uom.vue'
+	import StdUom from '@/mycomponents/qty/StdUom.vue'
+	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
+	import {
+		getInspectReasonList
+	} from '@/common/directory.js';
+
+	export default {
+		components: {
+			uom,
+			StdUom,
+			balanceStatus,
+		},
+		data() {
+			return {
+				allQty: 0,
+				stdCount: 1,
+				stateData: 0,
+				balanceQty: 0,
+				inventoryStatus: "",
+				originalInventoryStatus: "",
+				dataContent: {},
+				handleQty: 0,
+				FailedQty: 0,
+				reasonList: [],
+				reason: ""
+
+			}
+		},
+		watch: {
+
+		},
+		created() {
+			this.reasonList = getInspectReasonList();
+		},
+
+		props: {
+			title: {
+				type: String,
+				default: "编辑数量"
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			allowEditStatus: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			openEditPopup(item, handleQty) {
+				this.dataContent = item
+				this.inventoryStatus = this.dataContent.inventoryStatus
+				this.toInventoryStatus = this.dataContent.toInventoryStatus
+				this.allQty = Number(handleQty)
+				this.FailedQty = Number(item.FailedQty)
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 100)
+			},
+			closeEditPopup() {
+				this.$refs.popup.close()
+			},
+			confirm() {
+				this.setValue();
+			},
+			cancel() {
+				this.dataContent.inventoryStatus = this.originalInventoryStatus;
+				this.closeEditPopup();
+			},
+			calcQty(val) {
+				this.allQty = val * Number(this.dataContent.stdPackQty);
+			},
+			setValue() {
+				var balanceQty = Number(this.dataContent.qty);
+				if (this.allQty == 0) {
+					this.$refs.comMessage.showConfirmWarningModal('数量必须大于0',
+						res => {
+							this.allQty = balanceQty;
+						})
+				} else if (this.allQty > balanceQty) {
+					this.$refs.comMessage.showConfirmWarningModal('数量[' + this.allQty + ']不允许大于库存数量[' + balanceQty + ']',
+						res => {
+							this.allQty = balanceQty;
+						})
+				} else {
+					this.callback();
+				}
+			},
+			callback() {
+				var reasonInfo = this.reasonList.find(res => {
+					if (res.value == this.reason) {
+						return res
+					}
+				})
+
+				if (reasonInfo == undefined) {
+					reasonInfo = {
+						text: "",
+						value: ""
+						}
+			}
+				this.dataContent.toInventoryStatus = this.inventoryStatus
+				this.$emit("confirm", Number(this.allQty), Number(this.FailedQty), reasonInfo);
+				this.closeEditPopup();
+			},
+			updateStatus(value) {
+				this.inventoryStatus = value
+				console.log(this.inventoryStatus)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-popup .uni-popup__wrapper {
+		width: 100% !important;
+		padding: 30rpx;
+	}
+
+	.hide_border {
+		button {
+			border: none;
+		}
+
+		button::after {
+			border: none;
+		}
+	}
+
+	.title {
+		font-size: 30rpx;
+	}
+</style>
diff --git a/src/mycomponents/qty/qty.vue b/src/mycomponents/qty/qty.vue
new file mode 100644
index 0000000..f2d55dc
--- /dev/null
+++ b/src/mycomponents/qty/qty.vue
@@ -0,0 +1,58 @@
+<template>
+	<view class="center uni-column">
+		<view class="uni-flex uni-row">
+			<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
+			<view class="text_default center">
+				{{Number(dataContent.qty)}}
+			</view>
+			<uom v-show="!isShowStdPack" :uom="dataContent.uom"></uom>
+		</view>
+		
+		<view>
+			<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty>
+		</view>
+	</view>
+</template>
+
+<script>
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import uom from '@/mycomponents/qty/uom.vue'
+	import status from '@/mycomponents/status/status.vue'
+
+	export default {
+		components: {
+			stdPackQty,
+			status,
+			uom
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+
+		},
+	}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/mycomponents/qty/recommendQtyEdit.vue b/src/mycomponents/qty/recommendQtyEdit.vue
new file mode 100644
index 0000000..f080036
--- /dev/null
+++ b/src/mycomponents/qty/recommendQtyEdit.vue
@@ -0,0 +1,227 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<view class="uni-flex uni-column pop_customer">
+				<view class="" style="padding:10rpx">
+					<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
+						<view class="" style="font-size: 35rpx;">
+							{{title}}
+						</view>
+						<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+							@click="closeEditPopup"></image>
+					</view>
+					<u-line />
+					<view class="uni-flex uni-column" style="background-color: white; height:60%;">
+						<view class="uni-flex uni-column  ">
+							<view class="uni-flex uni-row space-between padding title ">
+								<text>标包个数 : </text>
+								<view class="uni-flex uni-row u-col-center">
+									<uni-number-box @change="calcQty($event,stdCount)" :value="stdCount">
+									</uni-number-box>
+									<std-uom :uom="dataContent.stdPackUnit"></std-uom>
+								</view>
+
+							</view>
+							<u-line />
+							<view class="uni-flex uni-row space-between padding title u-col-center">
+								<text>标包量 : </text>
+								<view class="uni-flex u-col-center uni-row">
+									<text>{{Number(dataContent.stdPackQty)}}</text>
+									<uom :uom="dataContent.uom"></uom>
+								</view>
+							</view>
+
+
+							<u-line />
+							<view class="uni-flex uni-row space-between padding title u-col-center">
+								<text>总数量 : </text>
+								<view class="uni-flex uni-row uni-center" style="align-items: center;">
+									<input class="qty_input" v-model="allQty" :focus="false" type="number"
+										@input="checkNum" @confirm="confirm()" :maxlength="maxlength" />
+									<uom :uom="dataContent.uom"></uom>
+								</view>
+							</view>
+							<u-line />
+						</view>
+					</view>
+				</view>
+				<view class="uni-flex uni-row hide_border">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+					<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import uom from '@/mycomponents/qty/uom.vue'
+	import stdUom from '@/mycomponents/qty/stdUom.vue'
+	export default {
+		components: {
+			uom,
+			stdUom,
+		},
+		data() {
+			return {
+				allQty: 0,
+				stdCount: 0,
+				labelQty: 0,
+				recommendQty: 0,
+				maxlength: 10
+			}
+		},
+		watch: {
+			// handleQty: {
+			// 	handler(newval, oldval) {
+			// 		this.allQty = Number(this.handleQty)
+			// 	},
+			// 	immediate: true,
+			// 	deep: true
+			// }
+		},
+		created() {
+
+		},
+
+		props: {
+			title: {
+				type: String,
+				default: "编辑数量"
+			},
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			handleQty: {
+				type: Number,
+				default: 0
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+		},
+		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+			},
+			openEditPopup() {
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			openTaskEditPopup(recommendQty, handleQty, labelQty) {
+				this.recommendQty = Number(recommendQty);
+				this.labelQty = Number(labelQty);
+				this.allQty = Number(handleQty)
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			openRecordEditPopup(labelQty) {
+				this.recommendQty = 0;
+				this.labelQty = Number(labelQty);
+				this.allQty = Number(labelQty)
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeEditPopup() {
+				this.$refs.popup.close()
+			},
+			confirm() {
+				this.setValue();
+			},
+			cancel() {
+				this.closeEditPopup();
+			},
+			calcQty(val) {
+				if (val > 0) {
+					this.allQty = val * this.dataContent.stdPackQty;
+				}
+			},
+			setValue() {
+				// var recommendQty = Number(this.dataContent.qty);
+				// var labelQty = Number(this.dataContent.record.label.qty);
+				if (this.allQty > this.labelQty) {
+					this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于标签数量[' +
+						this.labelQty +
+						']',
+						res => {
+							this.allQty = this.labelQty;
+						})
+				} else {
+					if (this.recommendQty != 0) {
+						if (this.allQty > this.recommendQty) {
+							if (this.settingParam.allowBiggerQty != null && this.settingParam.allowBiggerQty ==
+								"TRUE") {
+								this.callback();
+							} else {
+								this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于推荐数量[' +
+									this.recommendQty +
+									']',
+									res => {
+										this.allQty = this.labelQty;
+									})
+							}
+						} else if (this.allQty < this.recommendQty) {
+							if (this.settingParam.allowSmallerQty != null && this.settingParam.allowSmallerQty ==
+								"TRUE") {
+								this.callback();
+							} else {
+								this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许小于推荐数量[' +
+									this.recommendQty +
+									']',
+									res => {
+										this.allQty = this.labelQty;
+									})
+							}
+						} else {
+							this.callback();
+						}
+					} else {
+						this.callback();
+					}
+				}
+			},
+			callback() {
+				this.$emit("confirm", Number(this.allQty));
+				this.closeEditPopup();
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-popup .uni-popup__wrapper {
+		width: 100% !important;
+		padding: 30rpx;
+	}
+
+	.hide_border {
+		button {
+			border: none;
+		}
+
+		button::after {
+			border: none;
+		}
+	}
+
+	.title {
+		font-size: 30rpx;
+	}
+</style>
diff --git a/src/mycomponents/qty/stdPackQty.vue b/src/mycomponents/qty/stdPackQty.vue
new file mode 100644
index 0000000..7ab4cf0
--- /dev/null
+++ b/src/mycomponents/qty/stdPackQty.vue
@@ -0,0 +1,37 @@
+<template>
+	<view class="std_pack" v-if="dataContent.stdPackQty!=undefined">
+		<text>
+			{{Number(dataContent.stdPackQty)}}•{{getStdPackUnit(dataContent.stdPackUnit)}}
+		</text>
+	</view>
+</template>
+<script>
+	import {
+		// getStdPackUnitInfo,
+		getStdPackUnitInfo
+	} from "@/common/directory.js"
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			dataContent: {
+				stdPackQty: 1000,
+				uom: "EA",
+			},
+		},
+		methods: {
+			getStdPackUnit(stdPackUnit) {
+				let std = getStdPackUnitInfo(stdPackUnit);
+				return std == "" ? stdPackUnit : std.label;
+			}
+		}
+	}
+</script>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/qty/stdUom.vue b/src/mycomponents/qty/stdUom.vue
new file mode 100644
index 0000000..03508a7
--- /dev/null
+++ b/src/mycomponents/qty/stdUom.vue
@@ -0,0 +1,40 @@
+<template>
+	<view class="uom">
+		{{getStdPackUnit(uom)}}
+	</view>
+</template>
+
+
+<script>
+	import {
+		getStdPackUnitInfo
+	} from '@/common/directory.js';
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			uom: {
+				type: String,
+				default: ''
+			},
+		},
+		methods: {
+			getStdPackUnit(uom) {
+				let item = getStdPackUnitInfo(uom);
+				if (item == '') {
+					return uom;
+				} else {
+					return item.label
+				}
+			}
+		}
+	}
+</script>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/qty/uom.vue b/src/mycomponents/qty/uom.vue
new file mode 100644
index 0000000..bb138ba
--- /dev/null
+++ b/src/mycomponents/qty/uom.vue
@@ -0,0 +1,40 @@
+<template>
+	<view class="uom">
+		{{getUnitInfo(uom)}}
+	</view>
+</template>
+
+
+<script>
+	import {
+		getUnitInfo
+	} from '@/common/directory.js';
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			uom: {
+				type: String,
+				default: ''
+			},
+		},
+		methods: {
+			getUnitInfo(uom) {
+				let item = getUnitInfo(uom);
+				if (item == '') {
+					return uom;
+				} else {
+					return item.label
+				}
+			}
+		}
+	}
+</script>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/recommend/recommend.vue b/src/mycomponents/recommend/recommend.vue
new file mode 100644
index 0000000..6e1963d
--- /dev/null
+++ b/src/mycomponents/recommend/recommend.vue
@@ -0,0 +1,158 @@
+<template>
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; border-bottom: 1upx solid #EEEEEE;">
+		<view class="uni-flex uni-row space-between" style="align-items: center">
+			<!-- uni-inline-item 暂时拿掉-->
+			<view style="word-break: break-all;">
+				<!-- <container v-if="isShowContainer&&detail.containerNumber!=null" :container="detail.containerNumber">
+				</container> -->
+				<pack v-if="isShowPack && detail.packingNumber!=null" :packingCode="detail.packingNumber"></pack>
+				<batch v-if="isShowBatch && detail.batch!=null" :batch="detail.batch"></batch>
+				<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">
+				</location>
+				<!-- 	<to-location></to-location> -->
+				<to-location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
+				</to-location>
+			</view>
+			<view style="word-break: break-all;">
+				<!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
+				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
+					:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
+				<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
+					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
+				</compare-qty>
+
+
+				<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">
+					<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>
+					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import container from '@/mycomponents/container/container.vue'
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import toLocation from '@/mycomponents/balance/toLocation.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import config from '@/static/config.js'
+
+	export default {
+		components: {
+			container,
+			pack,
+			location,
+			toLocation,
+			batch,
+			recommendQty,
+			compareQty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+			isShowContainer: {
+				type: Boolean,
+				default: true
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowToLocation: {
+				type: Boolean,
+				default: false
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+
+			locationTitle: {
+				type: String,
+				default: '库位'
+			},
+
+		},
+		watch: {
+
+		},
+		methods: {
+			copy() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HPQ;V1.0;I" + this.detail.itemCode + ";P" + this.detail.packingNumber + ";B" + this.detail
+					.batch + ";Q" + this.detail.qty
+				// #ifdef H5
+				this.$copyText(content).then(
+					res => {
+						uni.showToast({
+							title: '复制采购标签成功',
+							icon: 'none'
+						})
+					}
+				)
+				// #endif
+				// #ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: () => {
+						uni.showToast({
+							title: '复制采购标签成功'
+						})
+					}
+				})
+				// #endif
+			},
+			copyPro() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HMQ;V1.0;I" + this.detail.itemCode + ";P" + this.detail.packingNumber + ";B" + this.detail
+					.batch + ";Q" + this.detail.qty
+				// #ifdef H5
+				this.$copyText(content).then(
+					res => {
+						uni.showToast({
+							title: '复制制品标签成功',
+							icon: 'none'
+						})
+					}
+				)
+				// #endif
+				// #ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: () => {
+						uni.showToast({
+							title: '复制制品标签成功'
+						})
+					}
+				})
+				// #endif
+			},
+			isDevlement() {
+				return config.isDevelopment;
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/recommend/recommendBalance.vue b/src/mycomponents/recommend/recommendBalance.vue
new file mode 100644
index 0000000..df79f68
--- /dev/null
+++ b/src/mycomponents/recommend/recommendBalance.vue
@@ -0,0 +1,69 @@
+<template>
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
+		<view class="uni-flex uni-row space-between uni-inline-item">
+			<view>
+				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
+				<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
+			</view>
+			<view>
+				<recommend-qty v-if="detail.record==null || detail.record==undefined" :dataContent="detail" :isShowStdPack="false"></recommend-qty>
+				<compare-qty v-else :dataContent="detail" :recommendQty="detail.qty" :handleQty="detail.record.qty"
+					:isShowStdPack="false">
+				</compare-qty>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/recommend/recommendCount.vue b/src/mycomponents/recommend/recommendCount.vue
new file mode 100644
index 0000000..4d2bc57
--- /dev/null
+++ b/src/mycomponents/recommend/recommendCount.vue
@@ -0,0 +1,146 @@
+<template>
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
+		<view class="uni-flex uni-row space-between ">
+			<!-- uni-inline-item 暂时拿掉-->
+			<view>
+				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
+				<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">
+				</location>
+				<location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
+				</location>
+			</view>
+			<view class="uni-flex uni-row center">
+				<!-- <recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
+					:isShowStdPack="false"></recommend-qty> -->
+				<!-- 					{{detail.scaned}} -->
+				<compare-qty :dataContent="detail" :recommendQty="Number(detail.qty)"
+					:isShowRecommendQty="isShowRecommendQty" :isShowStatus="isShowRecommendQty || detail.scaned==true"
+					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
+				</compare-qty>
+				<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
+					<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>
+					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import config from '@/static/config.js'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowToLocation: {
+				type: Boolean,
+				default: false
+			},
+
+			locationTitle: {
+				type: String,
+				default: '库位'
+			},
+			isShowRecommendQty: {
+				type: Boolean,
+				default: true
+			}
+
+		},
+		watch: {
+
+		},
+		methods: {
+			copy() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HPQ;V1.0;I" + this.detail.itemCode + ";P" + this.detail.packingNumber + ";B" + this.detail
+					.batch + ";Q" + this.detail.qty
+				// #ifdef H5
+				this.$copyText(content).then(
+					res => {
+						uni.showToast({
+							title: '复制采购标签成功',
+							icon: 'none'
+						})
+					}
+				)
+				// #endif
+				// #ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: () => {
+						uni.showToast({
+							title: '复制采购标签成功'
+						})
+					}
+				})
+				// #endif
+			},
+			copyPro() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HMQ;V1.0;I" + this.detail.itemCode + ";P" + this.detail.packingNumber + ";B" + this.detail
+					.batch + ";Q" + this.detail.qty
+				// #ifdef H5
+				this.$copyText(content).then(
+					res => {
+						uni.showToast({
+							title: '复制制品标签成功',
+							icon: 'none'
+						})
+					}
+				)
+				// #endif
+				// #ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: () => {
+						uni.showToast({
+							title: '复制制品标签成功'
+						})
+					}
+				})
+				// #endif
+			},
+			isDevlement() {
+				return config.isDevelopment;
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/record/record.vue b/src/mycomponents/record/record.vue
new file mode 100644
index 0000000..bd7e6b1
--- /dev/null
+++ b/src/mycomponents/record/record.vue
@@ -0,0 +1,96 @@
+<template>
+	<view :class="dataContent.scaned?'scan_view':''">
+		<view class="uni-flex uni-row space-between uni-inline-item">
+			<view>
+				<pack v-if="isShowPack" :packingCode="dataContent.packingNumber"></pack>
+				<batch v-if="isShowBatch" :batch="dataContent.batch"></batch>
+				<location v-if="isShowLocation" :locationCode="dataContent.locationCode"></location>
+			</view>
+			<view>
+				<qty  v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
+					:isShowStdPack="isShowStdPack"></qty>
+
+				<compare-qty v-else :dataContent="dataContent" :recommendQty="dataContent.qty"
+					:handleQty="dataContent.record.qty" :isShowStdPack="isShowStdPack">
+				</compare-qty>
+
+			</view>
+		</view>
+		<u-line></u-line>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import qty from '@/mycomponents/qty/qty.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+	import bussinessType from '@/mycomponents/balance/bussinessType.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			qty,
+			recommendQty,
+			compareQty,
+			bussinessType,
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStdPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBusiness: {
+				type: Boolean,
+				default: false
+			},
+			scaned: {
+				type: Boolean,
+				default: true
+			},
+			fromInventoryStatus: {
+				type: String,
+				default: ""
+			},
+			toInventoryStatus: {
+				type: String,
+				default: ""
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/record/recordBottom.vue b/src/mycomponents/record/recordBottom.vue
new file mode 100644
index 0000000..120265e
--- /dev/null
+++ b/src/mycomponents/record/recordBottom.vue
@@ -0,0 +1,49 @@
+<template>
+	<!-- style="margin-top: 10rpx;margin-bottom: 10rpx;" class="uni-flex uni-row space-between u-col-center" -->
+	<view class="task_item">
+		<view class="uni-flex space-between u-col-center">
+			<view class="uni-flex uni-row  u-col-center">
+				<image class="card_icon_normal" src="/static/icons/icon_customer.svg" alt="" />
+				<text>{{dataContent.creator}}</text>
+			</view>
+			<view class="uni-flex uni-row  u-col-center">
+				<image class="card_icon_normal" src="/static/icons/icon_date.svg" alt="" />
+				<text>{{formatDate(dataContent.createTime)}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			};
+		},
+		watch: {},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			formatDate: function(val) {
+				return dateFormat(val)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
new file mode 100644
index 0000000..81d1cd0
--- /dev/null
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -0,0 +1,179 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<uni-collapse ref="collapse1" @change="">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="removeItem($event,dataContent)" :right-options="removeOptions">
+							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+								:isShowBalance="true" :isShowBalanceQty="isShowBalanceQty"></item-qty>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</template>
+				<!-- <u-line /> -->
+				<view class="" v-for="(detail,index) in dataContent.subList">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,detail,index)"
+							:right-options="detail.scaned?scanOptions:detailOptions">
+							<balance :dataContent="detail" :isShowStdPack="false" :isShowStatus="true"
+								:isShowPack="true" :isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation">
+							</balance>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+					<!-- <u-line /> -->
+				</view>
+			</uni-collapse-item>
+		</uni-collapse>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm"></balance-qty-edit>
+		<record-detail-popup ref="recordDetailPopup"></record-detail-popup>
+	<!-- 	<balance-detail-popup ref="balanceDetailPopup"></balance-detail-popup> -->
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	// import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceDetailPopup from '@/mycomponents/balance/balanceDetailPopup.vue'
+	import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import recordDetailPopup from '@/mycomponents/detail/recordDetailPopup.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+	export default {
+		components: {
+			itemQty,
+			recommend,
+			balance,
+			balanceQtyEdit,
+			balanceDetailPopup,
+			purchaseLabel,
+			location,
+			recordDetailPopup
+			// winListHint
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+
+			isShowStatus: {
+				type: Boolean,
+				default: false
+			},
+
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			},
+
+			isShowToLocation: {
+				type: Boolean,
+				default: true
+			},
+
+			isShowBalanceQty: {
+				type: Boolean,
+				default: false
+			},
+		},
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				showItem: {},
+				editItem: {},
+				detailOptions: [],
+				scanOptions: [],
+				removeOptions: [],
+				dataList: []
+			}
+		},
+
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+			this.removeOptions = getClearOption();
+		},
+
+		methods: {
+			removeItem(e, dataContent) {
+				if (e.content.text == "清空") {
+					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
+						res => {
+							if (res) {
+								this.$emit('removeItem')
+								// this.$emit('removeItem', this.dataContent)
+							}
+						});
+				}
+			},
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				this.editItem = item;
+				this.$refs.balanceQtyEdit.openEditPopup(this.editItem, this.editItem.handleQty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.recordDetailPopup.openPopup(item);
+			},
+
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.dataContent.subList.splice(index, 1)
+							this.$emit('removePack')
+						}
+					});
+			},
+
+			confirm(qty) {
+				// this.editItem.qty = qty;
+				this.editItem.handleQty = qty;
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/record/recordCommonInfo.vue b/src/mycomponents/record/recordCommonInfo.vue
new file mode 100644
index 0000000..efcd0f7
--- /dev/null
+++ b/src/mycomponents/record/recordCommonInfo.vue
@@ -0,0 +1,72 @@
+<template>
+	<view class="pop_detail" style="height:80%">
+		<record-top :dataContent="dataContent"></record-top>
+		<u-line></u-line>
+		<scroll-view style="height:400px ">
+			<recordListCommonInfo :dataContent="dataContent"></recordListCommonInfo>
+			<!-- 主表 -->
+			<!-- <recordMainInfo :dataContent="dataContent"></recordMainInfo>
+			<u-line></u-line>
+			<recordItemInfo :dataContent="detailContent"></recordItemInfo>
+			<u-line></u-line>
+			<recordPersonInfo :dataContent="detailContent"></recordPersonInfo> -->
+		 <u-line></u-line>
+		 <slot>
+		 	<!-- 每个任务的详情 -->
+		 </slot>
+		
+		
+		</scroll-view>
+
+		<view class="uni-flex u-row-center ">
+			<view class="close_button" @click="closePopup">
+				关闭</view>
+			<!-- button 滚动不好使 -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import recordTop from '@/mycomponents/record/recordTop.vue'
+	import recordRequestInfo from '@/mycomponents/record/recordRequestInfo.vue'
+	import recordMainInfo from '@/mycomponents/record/recordMainInfo.vue'
+	import recordItemInfo from '@/mycomponents/record/recordItemInfo.vue'
+	import recordPersonInfo from '@/mycomponents/record/recordPersonInfo.vue'
+	import recordListCommonInfo from '@/mycomponents/record/recordListCommonInfo.vue'
+	
+	
+	
+	export default {
+		emits: ['onClose'],
+		components: {
+			recordTop,
+			recordRequestInfo,
+			recordItemInfo,
+			recordMainInfo,
+			recordPersonInfo,
+			recordListCommonInfo
+		},
+		data() {
+			return {}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			closePopup() {
+				this.$emit('onClose')
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/mycomponents/record/recordDetailCommonInfo.vue b/src/mycomponents/record/recordDetailCommonInfo.vue
new file mode 100644
index 0000000..7655126
--- /dev/null
+++ b/src/mycomponents/record/recordDetailCommonInfo.vue
@@ -0,0 +1,66 @@
+<template>
+	<view class="pop_detail" style="height:80%">
+		<record-top :dataContent="dataContent"></record-top>
+		<u-line></u-line>
+		<scroll-view style="height:400px ">
+			<recordListCommonInfo :dataContent="dataContent"></recordListCommonInfo>
+		 <u-line></u-line>
+		 <slot>
+		 	<!-- 每个任务的详情 -->
+		 </slot>
+		
+		
+		</scroll-view>
+
+		<view class="uni-flex u-row-center ">
+			<view class="close_button" @click="closePopup">
+				关闭</view>
+			<!-- button 滚动不好使 -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import recordTop from '@/mycomponents/record/recordTop.vue'
+	import recordRequestInfo from '@/mycomponents/record/recordRequestInfo.vue'
+	import recordMainInfo from '@/mycomponents/record/recordMainInfo.vue'
+	import recordItemInfo from '@/mycomponents/record/recordItemInfo.vue'
+	import recordPersonInfo from '@/mycomponents/record/recordPersonInfo.vue'
+	import recordListCommonInfo from '@/mycomponents/record/recordListCommonInfo.vue'
+	
+	
+	
+	export default {
+		emits: ['onClose'],
+		components: {
+			recordTop,
+			recordRequestInfo,
+			recordItemInfo,
+			recordMainInfo,
+			recordPersonInfo,
+			recordListCommonInfo
+		},
+		data() {
+			return {}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			closePopup() {
+				this.$emit('onClose')
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/mycomponents/record/recordFilter.vue b/src/mycomponents/record/recordFilter.vue
new file mode 100644
index 0000000..710a59b
--- /dev/null
+++ b/src/mycomponents/record/recordFilter.vue
@@ -0,0 +1,116 @@
+<template>
+	<uni-popup ref="popup">
+		<view class="maskbox" @tap="maskClick"></view>
+		<view class="uni-flex uni-column center"
+			style="background-color: white;width: 200px; height:auto;padding: 20rpx;z-index: 99;position: relative;">
+			<view class="uni-flex space-between u-col-center" style="width: 100%;">
+					<view class="" style="font-size: 32rpx;">
+						只看当天
+					</view>
+					
+				<u-switch v-model="checkedTodayModel" active-color="#4DD865" inactive-color="#eee" size="35" @change="switchChangeToday"></u-switch>	
+			</view>
+			<view class="">
+				<view class="uni-flex u-row-center" style="margin-top: 30rpx;">
+					<button class="filter_button" hover-class="filter_button_after"
+						@click="scanNumberClick">扫描单据编号</button>
+				</view>
+			</view>
+		</view>
+	</uni-popup>
+	<win-scan-job-number ref="scanNumber" title="单据编号" @getScanCode='getScanNumber'></win-scan-job-number>
+</template>
+
+<script>
+	import {
+		getTodayDate
+	} from '@/common/basic.js';
+
+	import winScanJobNumber from "@/mycomponents/scan/winScanJobNumber.vue"
+
+	export default {
+		emits: ["switchChangeToday", "switchChangeWait", "onScanNumber", "onScanAsnNumber"],
+		components: {
+			winScanJobNumber,
+		},
+		data() {
+			return {
+				dataContent: {},
+				checkedTodayModel:false,
+			}
+		},
+		props: {
+			checkedToday: {
+				type: Boolean,
+				default: false
+			},
+			otherTitle: {
+				type: String,
+				default: ""
+			},
+			isShowAsn:{
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			checkedToday: {
+				handler(newName, oldName) {
+					this.checkedTodayModel = this.checkedToday
+				},
+				immediate: true,
+				deep: true
+			},
+		},
+		mounted() {
+			
+		},
+		methods: {
+			// 点击遮罩
+			maskClick() {
+				// 如果不允许点击遮罩，直接返回
+				this.closeScanPopup();
+			},
+			openFilter() {
+				this.$refs['popup'].open("right");
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			switchChangeToday(isOn) {
+				
+				let creationTime = '';
+				if (isOn) {
+					creationTime = getTodayDate();
+				}
+				
+				this.$emit("switchChangeToday", isOn, creationTime)
+				this.closeScanPopup()
+			},
+
+			scanNumberClick() {
+				this.$refs.scanNumber.openScanPopup();
+			},
+
+			scanOtherClick() {
+				this.$refs.scanAsnNumber.openScanPopup();
+			},
+
+			getScanNumber(val) {
+				this.$emit("onScanNumber", val)
+				this.$refs.scanNumber.closeScanPopup();
+				this.closeScanPopup();
+			},
+		}
+	}
+</script>
+<style lang="scss">
+	.maskbox {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		z-index: 0;
+	}
+</style>
diff --git a/src/mycomponents/record/recordItemInfo.vue b/src/mycomponents/record/recordItemInfo.vue
new file mode 100644
index 0000000..dc911f5
--- /dev/null
+++ b/src/mycomponents/record/recordItemInfo.vue
@@ -0,0 +1,91 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view>
+				<view class="" style="font-size: 35rpx; ">
+					详细信息 :
+				</view>
+				<view class="item">
+					<text class="item_title">项目代码 : </text>
+					<text class="text_wrap">{{dataContent.projectCode}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">单据号 : </text>
+					<text class="text_wrap">{{dataContent.number}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">器具号 : </text>
+					<text class="text_wrap">{{dataContent.containerNumber}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">物品代码 : </text>
+					<text class="text_wrap">{{dataContent.itemCode}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">物品名称 : </text>
+					<text class="text_wrap">{{dataContent.itemName}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">物品描述1 : </text>
+					<text class="text_wrap">{{dataContent.itemDesc1}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">物品描述2 : </text>
+					<text class="text_wrap">{{dataContent.itemDesc2}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">库存状态 : </text>
+					<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">包装号 : </text>
+					<text class="text_wrap">{{dataContent.packingNumber}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">批次 : </text>
+					<text class="text_wrap">{{dataContent.batch}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">数量 : </text>
+					<text class="text_wrap">{{dataContent.qty}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">计量单位 : </text>
+					<text class="text_wrap">{{dataContent.uom}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">备注 : </text>
+					<text class="text_wrap">{{dataContent.remark}} </text>
+				</view>
+				
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/record/recordListCommonInfo.vue b/src/mycomponents/record/recordListCommonInfo.vue
new file mode 100644
index 0000000..5d8cabe
--- /dev/null
+++ b/src/mycomponents/record/recordListCommonInfo.vue
@@ -0,0 +1,80 @@
+<template>
+	<view class="">
+		<comListItem :dataList="dataList"></comListItem>
+	</view>
+</template>
+
+<script>
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			comListItem
+		},
+		data() {
+			return {
+				dataList:[]
+			}
+		},
+		watch:{
+			dataContent: {
+				handler(newName, oldName) {
+					this.dataList=[{
+							title: '出库事务类型',
+							content: this.dataContent.outTransaction
+						}, {
+							title: '入库事务类型',
+							content: this.dataContent.inTransaction
+						},{
+							title: '执行时间',
+							content: this.dataContent.executeTime,
+							type:"dateTime"
+						},{
+							title: '生效日期',
+							content: this.dataContent.activeDate,
+							type:"dateTime"
+						},{
+							title: '申请时间',
+							content: this.dataContent.requestTime,
+							type:"dateTime"
+						},{
+							title: '截止时间',
+							content: this.dataContent.dueTime,
+							type:"dateTime"
+						},{
+							title: '部门',
+							content: this.dataContent.departmentCode
+						},{
+							title: '岗位 : 数据库中没有该字段，设计中有',
+							content: this.dataContent.userPositionCode
+						},{
+							title: '是否可用',
+							content: this.dataContent.available
+						}];
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			avaliable(value) {
+				return value =="TRUE"?"可用":"不可用"
+			},
+			formatDate(val) {
+				return dateFormat(val)
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/record/recordListDetailPoup.vue b/src/mycomponents/record/recordListDetailPoup.vue
new file mode 100644
index 0000000..7bbdf29
--- /dev/null
+++ b/src/mycomponents/record/recordListDetailPoup.vue
@@ -0,0 +1,69 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<view class="pop_detail" style="height:80%">
+				<record-top :dataContent="dataContent"></record-top>
+				<u-line></u-line>
+				<scroll-view style="height:400px ">
+					<recordListCommonInfo :dataContent="dataContent"></recordListCommonInfo>
+					<u-line></u-line>
+			 	<slot>
+						<!-- 每个任务的详情 -->
+					</slot>
+
+
+				</scroll-view>
+
+				<view class="uni-flex u-row-center ">
+					<view class="close_button" @click="closePopup">
+						关闭</view>
+					<!-- button 滚动不好使 -->
+				</view>
+			</view>
+			<uni-popup />
+	</view>
+
+</template>
+
+<script>
+	import recordTop from '@/mycomponents/record/recordTop.vue'
+	import recordRequestInfo from '@/mycomponents/record/recordRequestInfo.vue'
+	import recordMainInfo from '@/mycomponents/record/recordMainInfo.vue'
+	import recordListCommonInfo from '@/mycomponents/record/recordListCommonInfo.vue'
+	import recordPersonInfo from '@/mycomponents/record/recordPersonInfo.vue'
+
+
+
+	export default {
+		emits: ['onClose'],
+		components: {
+			recordTop,
+			recordRequestInfo,
+			recordListCommonInfo,
+			recordMainInfo,
+			recordPersonInfo,
+		},
+		data() {
+			return {}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			closePopup() {
+				this.$emit('onClose')
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/mycomponents/record/recordMainInfo.vue b/src/mycomponents/record/recordMainInfo.vue
new file mode 100644
index 0000000..8958184
--- /dev/null
+++ b/src/mycomponents/record/recordMainInfo.vue
@@ -0,0 +1,198 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view>
+				<view class="" style="font-size: 35rpx; ">
+					主要信息 :
+				</view>
+				
+				<view class="item">
+					<text class="item_title">从仓库代码 : </text>
+					<text class="text_wrap">{{dataContent.fromWarehouseCode}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">到仓库代码 : </text>
+					<text class="text_wrap">{{dataContent.toWarehouseCode}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">从库位类型范围 : </text>
+					<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.fromLocationTypes))}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">到库位类型范围 : </text>
+					<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.toLocationTypes))}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">从库区代码范围 : </text>
+					<text class="text_wrap">{{dataContent.fromAreaCodes}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">到库区代码范围 : </text>
+					<text class="text_wrap">{{dataContent.toAreaCodes}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">单据号 : </text>
+					<text class="text_wrap">{{dataContent.number}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">业务类型 : </text>
+					<text class="text_wrap">{{getBusinessTypeDesc(dataContent.businessType)}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">备注 : </text>
+					<text class="text_wrap">{{dataContent.remark}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">创建时间 : </text>
+					<text class="text_wrap">{{dataContent.creationTime}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">创建者Id : </text>
+					<text class="text_wrap">{{dataContent.creatorId}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">创建者用户名 : </text>
+					<text class="text_wrap">{{dataContent.creatorName}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">扩展属性 : </text>
+					<text class="text_wrap">{{dataContent.extraProperties}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">地点ID : </text>
+					<text class="text_wrap">{{dataContent.siteId}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">申请时间 : </text>
+					<text class="text_wrap">{{dateFormat(dataContent.requestTime)}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">截止时间 : </text>
+					<text class="text_wrap">{{dateFormat(dataContent.dueTime)}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">部门 : </text>
+					<text class="text_wrap">{{dataContent.departmentCode}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">状态 : </text>
+					<text class="text_wrap">{{dataContent.status}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">自动提交 : </text>
+					<text class="text_wrap">{{boolean(dataContent.autoCommit)}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">自动通过 : </text>
+					<text class="text_wrap">{{boolean(dataContent.autoAgree)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">自动执行 : </text>
+					<text class="text_wrap">{{boolean(dataContent.autoExecute)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">直接生成记录 : </text>
+					<text class="text_wrap">{{dataContent.directCreateRecord}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">最后更新时间 : </text>
+					<text class="text_wrap">{{dateFormat(dataContent.lastModificationTime)}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">最后更新者Id : </text>
+					<text class="text_wrap">{{dataContent.lastModifierId}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">最后更新者用户名 : </text>
+					<text class="text_wrap">{{dataContent.lastModiferName}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">并发乐观锁 : </text>
+					<text class="text_wrap">{{dataContent.concurrencyStamp}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">权限所属人员id : </text>
+					<text class="text_wrap">{{dataContent.rule_user_id}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">工作流流水号 : </text>
+					<text class="text_wrap">{{dataContent.serialNumber}} </text>
+				</view>
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusDesc,
+		getLocationTypeNameList,
+		getBusinessTypeDesc
+	} from '@/common/directory.js';
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			avaliable(value) {
+				return value == "TRUE" ? "可用" : "不可用"
+			},
+			boolean(value) {
+				return value == "TRUE" ? "是" : "否"
+			},
+			dateFormat(value){
+				return dateFormat(value)
+			},
+			getInventoryStatusDesc(value){
+				return getInventoryStatusDesc(value)
+			},
+			
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			},
+			
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
+			},
+			getBusinessTypeDesc(value){
+				return getBusinessTypeDesc(value)
+			},
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/record/recordNumber.vue b/src/mycomponents/record/recordNumber.vue
new file mode 100644
index 0000000..94a3849
--- /dev/null
+++ b/src/mycomponents/record/recordNumber.vue
@@ -0,0 +1,36 @@
+<template>
+	<view class="task_number">
+		<!-- <text>任务编号 : {{number}}</text> -->
+		<text> {{number}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+
+			};
+		},
+		watch: {
+
+		},
+
+		props: {
+			number: {
+				type: String,
+				default: ''
+			},
+		},
+
+		methods: {}
+	}
+</script>
+
+<style lang="scss">
+</style>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/record/recordPersonInfo.vue b/src/mycomponents/record/recordPersonInfo.vue
new file mode 100644
index 0000000..628a0a8
--- /dev/null
+++ b/src/mycomponents/record/recordPersonInfo.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view>
+				<view class="item">
+					<text class="item_title">创建者Id : </text>
+					<text class="text_wrap">{{dataContent.creatorId}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">创建者用户名 : </text>
+					<text class="text_wrap">{{dataContent.creatorName}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">创建时间 : </text>
+					<text class="text_wrap">{{dataContent.creationTime}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">最后更新者Id : </text>
+					<text class="text_wrap">{{dataContent.lastModifierId}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">最后更新者用户名 : </text>
+					<text class="text_wrap">{{dataContent.lastModiferName}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">最后更新时间 : </text>
+					<text class="text_wrap">{{dataContent.lastModificationTime}} </text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/record/recordRequestInfo.vue b/src/mycomponents/record/recordRequestInfo.vue
new file mode 100644
index 0000000..66d1857
--- /dev/null
+++ b/src/mycomponents/record/recordRequestInfo.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view>
+				<view class="item">
+					<text class="item_title">申请单号 : </text>
+					<text class="text_wrap">{{dataContent.requestNumber}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">申请时间 : </text>
+					<text class="text_wrap">{{dataContent.requestTime}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">要求截至时间 : </text>
+					<text class="text_wrap">{{dataContent.requestDueTime}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">从仓库代码 : </text>
+					<text class="text_wrap">{{dataContent.fromWarehouseCode}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">到仓库代码 : </text>
+					<text class="text_wrap">{{dataContent.toWarehouseCode}} </text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/record/recordStatus.vue b/src/mycomponents/record/recordStatus.vue
new file mode 100644
index 0000000..f0a516f
--- /dev/null
+++ b/src/mycomponents/record/recordStatus.vue
@@ -0,0 +1,47 @@
+<template>
+	<view style="margin: 10rpx;">
+		<text class="request_state_un-doing">
+			{{ jobStatusInfo.name}}
+		</text>
+	</view>
+</template>
+
+<script>
+	import {
+		getRequestStateInfo
+	} from '@/common/directory.js';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				jobStatusInfo: {}
+			};
+		},
+		watch: {},
+
+		props: {
+			jobStatus: {
+				type: String,
+				default: "-1"
+			}
+		},
+
+		mounted() {
+			this.statusStyle(this.jobStatus)
+		},
+
+		methods: {
+			statusStyle(value) {
+				this.jobStatusInfo = getRequestStateInfo(value);
+				return getRequestStateInfo(value).remark
+			},
+		}
+	}
+</script>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/record/recordTop.vue b/src/mycomponents/record/recordTop.vue
new file mode 100644
index 0000000..6c52a50
--- /dev/null
+++ b/src/mycomponents/record/recordTop.vue
@@ -0,0 +1,41 @@
+<template>
+	<view class="task_item">
+		<view class="uni-flex space-between u-col-center">
+			<record-number :number="dataContent.number"></record-number>
+			<record-status :jobStatus="dataContent.status"></record-status>
+		</view>
+	</view>
+</template>
+
+<script>
+	import recordNumber from '@/mycomponents/record/recordNumber.vue'
+	import recordStatus from '@/mycomponents/record/recordStatus.vue'
+	export default {
+		components: {
+			recordNumber,
+			recordStatus
+		},
+		data() {
+			return {
+
+			};
+		},
+		watch: {},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+			openDetail(item) {
+				this.$emit("openDetail", this.dataContent);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/mycomponents/request/requestBottom.vue b/src/mycomponents/request/requestBottom.vue
new file mode 100644
index 0000000..120265e
--- /dev/null
+++ b/src/mycomponents/request/requestBottom.vue
@@ -0,0 +1,49 @@
+<template>
+	<!-- style="margin-top: 10rpx;margin-bottom: 10rpx;" class="uni-flex uni-row space-between u-col-center" -->
+	<view class="task_item">
+		<view class="uni-flex space-between u-col-center">
+			<view class="uni-flex uni-row  u-col-center">
+				<image class="card_icon_normal" src="/static/icons/icon_customer.svg" alt="" />
+				<text>{{dataContent.creator}}</text>
+			</view>
+			<view class="uni-flex uni-row  u-col-center">
+				<image class="card_icon_normal" src="/static/icons/icon_date.svg" alt="" />
+				<text>{{formatDate(dataContent.createTime)}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			};
+		},
+		watch: {},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			formatDate: function(val) {
+				return dateFormat(val)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/mycomponents/request/requestComMainCard.vue b/src/mycomponents/request/requestComMainCard.vue
new file mode 100644
index 0000000..0f4ca8a
--- /dev/null
+++ b/src/mycomponents/request/requestComMainCard.vue
@@ -0,0 +1,41 @@
+<template>
+	<view>
+		<view class="task_card">
+			<request-top :dataContent="dataContent"></request-top>
+			<slot></slot>
+			<u-line color="#909399" />
+			<request-bottom :dataContent="dataContent"></request-bottom>
+		</view>
+	</view>
+</template>
+
+<script>
+	import requestTop from '@/mycomponents/request/requestTop.vue'
+	import requestBottom from '@/mycomponents/request/requestBottom.vue'
+
+	export default {
+		components: {
+			requestTop,
+			requestBottom,
+		},
+		data() {
+			return {
+			};
+		},
+		 
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+		 
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/src/mycomponents/request/requestCommonInfo.vue b/src/mycomponents/request/requestCommonInfo.vue
new file mode 100644
index 0000000..b044adb
--- /dev/null
+++ b/src/mycomponents/request/requestCommonInfo.vue
@@ -0,0 +1,70 @@
+<template>
+	<view class="pop_detail" style="height:80%">
+		<request-top :dataContent="dataContent"></request-top>
+		<u-line></u-line>
+		<scroll-view style="height:400px ">
+			<requestListCommonInfo :dataContent="dataContent"></requestListCommonInfo>
+			<!-- 主表 -->
+			<!-- <requestMainInfo :dataContent="dataContent"></requestMainInfo>
+			<u-line></u-line>
+			<requestItemInfo :dataContent="detailContent"></requestItemInfo>
+			<u-line></u-line>
+			<requestPersonInfo :dataContent="detailContent"></requestPersonInfo> -->
+		 <u-line></u-line>
+		 <slot>
+		 	<!-- 每个任务的详情 -->
+		 </slot>
+		
+		
+		</scroll-view>
+
+		<view class="uni-flex u-row-center ">
+			<view class="close_button" @click="closePopup">
+				关闭</view>
+			<!-- button 滚动不好使 -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import requestTop from '@/mycomponents/request/requestTop.vue'
+	import requestRequestInfo from '@/mycomponents/request/requestRequestInfo.vue'
+	import requestItemInfo from '@/mycomponents/request/requestItemInfo.vue'
+	import requestPersonInfo from '@/mycomponents/request/requestPersonInfo.vue'
+	import requestListCommonInfo from '@/mycomponents/request/requestListCommonInfo.vue'
+	
+	
+	
+	export default {
+		emits: ['onClose'],
+		components: {
+			requestTop,
+			requestRequestInfo,
+			requestItemInfo,
+			requestPersonInfo,
+			requestListCommonInfo
+		},
+		data() {
+			return {}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			closePopup() {
+				this.$emit('onClose')
+			},
+		}
+	}
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/mycomponents/request/requestFilter.vue b/src/mycomponents/request/requestFilter.vue
new file mode 100644
index 0000000..cfdd185
--- /dev/null
+++ b/src/mycomponents/request/requestFilter.vue
@@ -0,0 +1,128 @@
+<template>
+	<uni-popup ref="popup">
+		<view class="maskbox" @tap="maskClick"></view>
+		<view class="uni-flex uni-column center"
+			style="background-color: white;width: 200px; height:auto;padding: 20rpx;z-index: 99;position: relative;">
+			<!-- <view class="uni-flex space-between u-col-center" style="width: 100%;">
+					<view class="" style="font-size: 32rpx;">
+						只看当天
+					</view>
+					
+				<u-switch v-model="checkedTodayModel" active-color="#4DD865" inactive-color="#eee" size="35" @change="switchChangeToday"></u-switch>	
+			</view> -->
+			<view class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;">
+				<view class="" style="font-size: 32rpx;">
+					只看处理中
+				</view>
+				<u-switch v-model="checkedWaitModel" active-color="#4DD865" inactive-color="#eee" size="35" @change="switchChangeWait"></u-switch>	
+			</view>
+			<view class="">
+				<view class="uni-flex u-row-center" style="margin-top: 30rpx;">
+					<button class="filter_button" hover-class="filter_button_after"
+						@click="scanNumberClick">扫描申请编号</button>
+				</view>
+			</view>
+		</view>
+	</uni-popup>
+	<win-scan-job-number ref="scanNumber" title="申请编号" @getScanCode='getScanNumber'></win-scan-job-number>
+</template>
+
+<script>
+	import {
+		getTodayDate
+	} from '@/common/basic.js';
+
+	import winScanJobNumber from "@/mycomponents/scan/winScanJobNumber.vue"
+
+	export default {
+		emits: ["switchChangeToday", "switchChangeWait", "onScanNumber", "onScanAsnNumber"],
+		components: {
+			winScanJobNumber,
+		},
+		data() {
+			return {
+				dataContent: {},
+				checkedTodayModel:false,
+				checkedWaitModel:false
+			}
+		},
+		props: {
+			checkedToday: {
+				type: Boolean,
+				default: false
+			},
+			checkedWaitTask: {
+				type: Boolean,
+				default: false
+			},
+			otherTitle: {
+				type: String,
+				default: ""
+			},
+			isShowAsn:{
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			checkedToday: {
+				handler(newName, oldName) {
+					this.checkedTodayModel = this.checkedToday
+				},
+				immediate: true,
+				deep: true
+			},
+			checkedWaitTask: {
+				handler(newName, oldName) {
+					this.checkedWaitModel = this.checkedWaitTask
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+		mounted() {
+			
+		},
+		methods: {
+			// 点击遮罩
+			maskClick() {
+				// 如果不允许点击遮罩，直接返回
+				this.closeScanPopup();
+			},
+			openFilter() {
+				this.$refs['popup'].open("right");
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			switchChangeWait(isOn) {
+				let status = "1,2,3,4,5,6";
+				if (isOn) {
+					status = "6";
+				}
+				this.$emit("switchChangeWait", isOn, status)
+				this.closeScanPopup()
+			},
+
+			scanNumberClick() {
+				this.$refs.scanNumber.openScanPopup();
+			},
+
+			getScanNumber(val) {
+				this.$emit("onScanNumber", val)
+				this.$refs.scanNumber.closeScanPopup();
+				this.closeScanPopup();
+			},
+		}
+	}
+</script>
+<style lang="scss">
+	.maskbox {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		z-index: 0;
+	}
+</style>
diff --git a/src/mycomponents/request/requestItemInfo.vue b/src/mycomponents/request/requestItemInfo.vue
new file mode 100644
index 0000000..dc911f5
--- /dev/null
+++ b/src/mycomponents/request/requestItemInfo.vue
@@ -0,0 +1,91 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view>
+				<view class="" style="font-size: 35rpx; ">
+					详细信息 :
+				</view>
+				<view class="item">
+					<text class="item_title">项目代码 : </text>
+					<text class="text_wrap">{{dataContent.projectCode}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">单据号 : </text>
+					<text class="text_wrap">{{dataContent.number}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">器具号 : </text>
+					<text class="text_wrap">{{dataContent.containerNumber}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">物品代码 : </text>
+					<text class="text_wrap">{{dataContent.itemCode}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">物品名称 : </text>
+					<text class="text_wrap">{{dataContent.itemName}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">物品描述1 : </text>
+					<text class="text_wrap">{{dataContent.itemDesc1}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">物品描述2 : </text>
+					<text class="text_wrap">{{dataContent.itemDesc2}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">库存状态 : </text>
+					<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">包装号 : </text>
+					<text class="text_wrap">{{dataContent.packingNumber}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">批次 : </text>
+					<text class="text_wrap">{{dataContent.batch}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">数量 : </text>
+					<text class="text_wrap">{{dataContent.qty}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">计量单位 : </text>
+					<text class="text_wrap">{{dataContent.uom}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">备注 : </text>
+					<text class="text_wrap">{{dataContent.remark}} </text>
+				</view>
+				
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/request/requestListCommonInfo.vue b/src/mycomponents/request/requestListCommonInfo.vue
new file mode 100644
index 0000000..611942b
--- /dev/null
+++ b/src/mycomponents/request/requestListCommonInfo.vue
@@ -0,0 +1,84 @@
+<template>
+	<view class="">
+		<comListItem :dataList="dataList"></comListItem>
+	</view>
+</template>
+
+<script>
+	import comListItem from '@/mycomponents/common/comListItem.vue';
+	export default {
+		components: {
+			comListItem
+		},
+		data() {
+			return {
+				dataList:[]
+			}
+		},
+		watch:{
+			dataContent: {
+				handler(newName, oldName) {
+					this.dataList=[{
+							title: '部门',
+							content: this.dataContent.departmentCode
+						}, {
+							title: '状态',
+							content: this.dataContent.status,
+							type:"requestState"
+						},{
+							title: '自动提交',
+							content: this.dataContent.autoCommit,
+							type:"boolean"
+						},{
+							title: '自动通过',
+							content: this.dataContent.autoAgree,
+							type:"boolean"
+						},{
+							title: '自动执行',
+							content: this.dataContent.autoExecute,
+							type:"boolean"
+						},{
+							title: '直接生成记录',
+							content: this.dataContent.directCreateRecord,
+							type:"boolean"
+						},{
+							title: '申请时间',
+							content: this.dataContent.requestTime,
+							type:"dateTime"
+						},{
+							title: '截止时间',
+							content: this.dataContent.dueTime,
+							type:"dateTime"
+						},{
+							title: '最后更新时间',
+							content: this.dataContent.updateTime,
+							type:"dateTime"
+						},{
+							title: '最后更新者用户名',
+							content: this.dataContent.updater
+						},
+						{
+							title: '并发乐观锁',
+							content: this.dataContent.concurrencyStamp
+						}];
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/request/requestMainInfo.vue b/src/mycomponents/request/requestMainInfo.vue
new file mode 100644
index 0000000..1c774cf
--- /dev/null
+++ b/src/mycomponents/request/requestMainInfo.vue
@@ -0,0 +1,168 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view>
+				<view class="" style="font-size: 35rpx; ">
+					主要信息 :
+				</view>
+				
+				<view class="item">
+					<text class="item_title">从仓库代码 : </text>
+					<text class="text_wrap">{{dataContent.fromWarehouseCode}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">到仓库代码 : </text>
+					<text class="text_wrap">{{dataContent.toWarehouseCode}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">从库位类型范围 : </text>
+					<text class="text_wrap">{{dataContent.fromLocationTypes}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">到库位类型范围 : </text>
+					<text class="text_wrap">{{dataContent.toLocationTypes}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">从库区代码范围 : </text>
+					<text class="text_wrap">{{dataContent.fromAreaCodes}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">到库区代码范围 : </text>
+					<text class="text_wrap">{{dataContent.toAreaCodes}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">单据号 : </text>
+					<text class="text_wrap">{{dataContent.number}} </text>
+				</view>
+				
+				
+				<view class="item">
+					<text class="item_title">业务类型 : </text>
+					<text class="text_wrap">{{dataContent.businessType}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">备注 : </text>
+					<text class="text_wrap">{{dataContent.remark}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">创建时间 : </text>
+					<text class="text_wrap">{{dataContent.creationTime}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">创建者Id : </text>
+					<text class="text_wrap">{{dataContent.creatorId}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">创建者用户名 : </text>
+					<text class="text_wrap">{{dataContent.creatorName}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">扩展属性 : </text>
+					<text class="text_wrap">{{dataContent.extraProperties}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">地点ID : </text>
+					<text class="text_wrap">{{dataContent.siteId}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">申请时间 : </text>
+					<text class="text_wrap">{{dataContent.requestTime}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">截止时间 : </text>
+					<text class="text_wrap">{{dataContent.dueTime}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">部门 : </text>
+					<text class="text_wrap">{{dataContent.departmentCode}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">状态 : </text>
+					<text class="text_wrap">{{dataContent.status}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">自动提交 : </text>
+					<text class="text_wrap">{{dataContent.autoCommit}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">自动通过 : </text>
+					<text class="text_wrap">{{dataContent.autoAgree}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">自动执行 : </text>
+					<text class="text_wrap">{{dataContent.autoExecute}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">直接生成记录 : </text>
+					<text class="text_wrap">{{dataContent.directCreateRecord}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">最后更新时间 : </text>
+					<text class="text_wrap">{{dataContent.lastModificationTime}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">最后更新者Id : </text>
+					<text class="text_wrap">{{dataContent.lastModifierId}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">最后更新者用户名 : </text>
+					<text class="text_wrap">{{dataContent.lastModiferName}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">并发乐观锁 : </text>
+					<text class="text_wrap">{{dataContent.concurrencyStamp}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">权限所属人员id : </text>
+					<text class="text_wrap">{{dataContent.rule_user_id}} </text>
+				</view>
+				
+				<view class="item">
+					<text class="item_title">工作流流水号 : </text>
+					<text class="text_wrap">{{dataContent.serialNumber}} </text>
+				</view>
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/request/requestNumber.vue b/src/mycomponents/request/requestNumber.vue
new file mode 100644
index 0000000..94a3849
--- /dev/null
+++ b/src/mycomponents/request/requestNumber.vue
@@ -0,0 +1,36 @@
+<template>
+	<view class="task_number">
+		<!-- <text>任务编号 : {{number}}</text> -->
+		<text> {{number}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+
+			};
+		},
+		watch: {
+
+		},
+
+		props: {
+			number: {
+				type: String,
+				default: ''
+			},
+		},
+
+		methods: {}
+	}
+</script>
+
+<style lang="scss">
+</style>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/request/requestPersonInfo.vue b/src/mycomponents/request/requestPersonInfo.vue
new file mode 100644
index 0000000..628a0a8
--- /dev/null
+++ b/src/mycomponents/request/requestPersonInfo.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view>
+				<view class="item">
+					<text class="item_title">创建者Id : </text>
+					<text class="text_wrap">{{dataContent.creatorId}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">创建者用户名 : </text>
+					<text class="text_wrap">{{dataContent.creatorName}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">创建时间 : </text>
+					<text class="text_wrap">{{dataContent.creationTime}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">最后更新者Id : </text>
+					<text class="text_wrap">{{dataContent.lastModifierId}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">最后更新者用户名 : </text>
+					<text class="text_wrap">{{dataContent.lastModiferName}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">最后更新时间 : </text>
+					<text class="text_wrap">{{dataContent.lastModificationTime}} </text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/request/requestRequestInfo.vue b/src/mycomponents/request/requestRequestInfo.vue
new file mode 100644
index 0000000..66d1857
--- /dev/null
+++ b/src/mycomponents/request/requestRequestInfo.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="">
+		<view class="uni-flex uni-column">
+			<view>
+				<view class="item">
+					<text class="item_title">申请单号 : </text>
+					<text class="text_wrap">{{dataContent.requestNumber}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">申请时间 : </text>
+					<text class="text_wrap">{{dataContent.requestTime}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">要求截至时间 : </text>
+					<text class="text_wrap">{{dataContent.requestDueTime}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">从仓库代码 : </text>
+					<text class="text_wrap">{{dataContent.fromWarehouseCode}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">到仓库代码 : </text>
+					<text class="text_wrap">{{dataContent.toWarehouseCode}} </text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/mycomponents/request/requestStatus.vue b/src/mycomponents/request/requestStatus.vue
new file mode 100644
index 0000000..4d07e6b
--- /dev/null
+++ b/src/mycomponents/request/requestStatus.vue
@@ -0,0 +1,45 @@
+<template>
+	<view style="margin: 10rpx;">
+		<text :class="statusStyle(status)">
+			{{ statusInfo.label}}
+		</text>
+	</view>
+</template>
+
+<script>
+	import {
+		getRequestStateInfo
+	} from '@/common/directory.js';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				statusInfo: {}
+			};
+		},
+		watch: {},
+
+		props: {
+			status: {
+				type: String,
+				default: ""
+			}
+		},
+
+		mounted() {},
+
+		methods: {
+			statusStyle(value) {
+				this.statusInfo = getRequestStateInfo(value);
+				return getRequestStateInfo(value).remark
+			},
+		}
+	}
+</script>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/request/requestTop.vue b/src/mycomponents/request/requestTop.vue
new file mode 100644
index 0000000..5a49dbe
--- /dev/null
+++ b/src/mycomponents/request/requestTop.vue
@@ -0,0 +1,41 @@
+<template>
+	<view class="task_item">
+		<view class="uni-flex space-between u-col-center">
+			<request-number :number="dataContent.number"></request-number>
+			<request-status :status="dataContent.status"></request-status>
+		</view>
+	</view>
+</template>
+
+<script>
+	import requestNumber from '@/mycomponents/request/requestNumber.vue'
+	import requestStatus from '@/mycomponents/request/requestStatus.vue'
+	export default {
+		components: {
+			requestNumber,
+			requestStatus
+		},
+		data() {
+			return {
+
+			};
+		},
+		watch: {},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+			openDetail(item) {
+				this.$emit("openDetail", this.dataContent);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue
new file mode 100644
index 0000000..1144cd7
--- /dev/null
+++ b/src/mycomponents/scan/winComScan.vue
@@ -0,0 +1,276 @@
+<!--扫描组件-->
+<template>
+	<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<view>
+		<view class="pop_tab">
+			<view class="tab_info">
+				<view class="conbox">
+					<textarea v-model="scanMsg" trim="all" maxlength="1000" style="margin-left: 5px;width: 90%;"
+						:focus="boxfocus" :placeholder="placeholderValue" @focus="getfocus" @blur="losefocus"
+						@input="handelScanMsg" :cursor="cursorIndex" ></textarea>
+				</view>
+
+				<view class="uni-flex uni-row space-between u-col-center">
+					<!-- <view class="paizhao" @click="scanQRCode()" v-if="true">
+						<image src="/static/icons/icons_camera.svg" alt="" />
+					</view> -->
+
+					<view class="uni-flex">
+						<button class="clean_scan_btn" @click="clearScanValue()">清空</button>
+						<button class="scan_btn" @click="clickScanMsg()">扫描</button>
+					</view>
+				</view>
+			</view>
+
+			<view style="width: 100%;">
+				<view style="width: 100%;" v-if="scanList.length>0&&isShowHistory">
+					<view class="uni-flex uni-row space-between u-col-center">
+						<view class="" style="padding: 10rpx;">
+							历史记录
+						</view>
+						<view class="" style="padding-right: 10rpx;">
+							<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+						</view>
+					</view>
+					<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'></u-line>
+					<scroll-view scroll-y="true" class="scroll-view" v-if="expand&&scanList.length>0"
+						style="height: 70px;">
+						<view class="uni-flex u-col" v-for="(item,index) in scanList">
+							<view style="width: 100%;max-height: 100px;">
+								<view class="uni-flex u-row space-between u-col-center" @click="showItem(item)">
+									<view class="text_ellipsis" style="padding: 15rpx;">
+										{{item}}
+									</view>
+									<view class="">
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</view>
+								<u-line class='line_color'></u-line>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+<script >
+	import {
+		getLabelInfo
+	} from '../../common/label.js';
+
+	export default {
+		name: "winComScan",
+		emits: ["getResult"],
+		components: {},
+		props: {
+			placeholder: {
+				type: String,
+				default: '请扫描标签'
+			},
+			clearResult: {
+				type: Boolean,
+				default: true
+			},
+			boxFocus: {
+				type: Boolean,
+				default: true
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: true
+			},
+			headerType: {
+				type: String,
+				default: 'HPQ' //HLB   HMQ   HCQ HPQ
+			}
+		},
+		data() {
+			return {
+				// scanMsg: "HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q100",
+				scanMsg: "",
+				boxfocus: true,
+				placeholderValue: '',
+				scanResult: {},
+				scanList: [],
+				expand: true,
+				expendIcon: 'arrow-down',
+				cursorIndex: 0
+			}
+		},
+		mounted() {
+
+			// #ifdef H5
+			if (document.querySelector('textarea') != null) {
+				document.querySelector('textarea').setAttribute('inputmode', 'none')
+			}
+			// #endif 
+			// #ifdef APP-PLUS
+			// 
+			// uni.onKeyboardHeightChange(res => {
+			//   console.log(res.height)
+			//   if(res.height>0){
+			// 	  // uni.hideKeyboard();
+			// 	  plus.key.hideSoftKeybord();
+			//   }
+			// })
+			// 
+			// uni.onWindowResize((res) => {
+			// 	plus.key.hideSoftKeybord()
+			// })
+			// plus.key.hideSoftKeybord();
+			// setInterval(function(){
+			// 	plus.key.hideSoftKeybord();
+			//         // uni.hideKeyboard();//隐藏软键盘
+			//         // plus.key.hideSoftKeybord();
+			//     },60);
+			
+			// #endif 
+
+			// if (this.$el.querySelector('textarea') != null) {
+			// 	this.$el.querySelector('textarea').setAttribute('inputmode', 'none')
+			// }
+		},
+		watch: {
+			placeholder() {
+				this.placeholderValue = '请扫描' + this.placeholder;
+			}
+		},
+		created() {
+			this.placeholderValue = '请扫描' + this.placeholder;
+		},
+		methods: {
+			hide() {
+				// 只是解决软键盘的闪现
+				var interval = setInterval(function() {
+					uni.hideKeyboard(); //隐藏软键盘
+					console.log('刷新')
+				}, 60);
+				setTimeout(() => {
+					clearInterval(interval);
+					console.log('停止刷新')
+				}, 2000);
+			},
+			getValue() {
+				return this.scanMsg
+			},
+			setValue(val) {
+				this.scanMsg = val
+			},
+			clearScanValue() {
+				this.scanMsg = ''
+				this.getfocus();
+			},
+			clickScanMsg() {
+				this.scanMsg = this.scanMsg + "\n";
+				this.handelScanMsg();
+			},
+			handelScanMsg() {
+				//点击了回车
+				// uni.showLoading({
+				// 	title: '解析中...',
+				// 	mask: true
+				// })
+				let that = this;
+				let index = that.scanMsg.indexOf('\n');
+				if (index >= 0) {
+					// that.scanMsg = 'HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q50';
+					setTimeout(() => {
+						that.losefocus();
+						let content = uni.$u.trim(that.scanMsg)
+						if (content == "") {
+							that.getfocus();
+							this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => {
+								if (res) {
+									that.scanMsg = ""
+									that.getfocus();
+								}
+							})
+							return;
+						}
+
+						if (that.isShowHistory) {
+							that.scanList.unshift(content);
+						}
+						getLabelInfo(content, this.headerType, callback => {
+							// uni.hideLoading();
+							let scanResult = callback;
+							if (scanResult.success) {
+								that.clear();
+								// that.getfocus();//不能自动获取焦点
+								that.$emit("getResult", scanResult);
+							} else {
+								that.clear();
+								this.$refs.comMessage.showErrorMessage(scanResult.message, res => {
+									if (res) {
+										that.getfocus();
+									}
+								})
+							}
+						});
+					}, 500);
+				}
+			},
+			getfocus() {
+				let that = this;
+				that.boxfocus = true;
+				this.$nextTick(r => {
+					that.boxfocus = true;
+				});
+			},
+			losefocus() {
+				let that = this;
+				that.boxfocus = false;
+				this.$nextTick(r => {
+					that.boxfocus = false;
+				});
+			},
+			clear() {
+				this.cursorIndex = 0;
+				this.scanMsg = ''
+			},
+			iconClick(type) {
+				this.$emit("clearResult", this.scanMsgk);
+			},
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+			scanClick() {
+				this.handelScanMsg();
+			},
+			cancelClick() {
+				this.clear();
+				this.getfocus();
+			},
+			showItem(item) {
+				this.$refs.comMessage.showMessage(item, res => {
+					if (res) {
+						// this.$refs.modal.cancelClose();
+					}
+				})
+			},
+
+			scanQRCode() {
+				let that = this;
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: (res) => {
+						that.scanMsg = res.result;
+						that.$emit("getResult", res.result);
+						console.log('扫描二维码成功,结果:' + res.result);
+					},
+					fail: (res) => {
+						that.showItem('扫描出现错误:' + res.result);
+						console.log('扫描出现错误:' + res.result);
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/scan/winComScan222.vue b/src/mycomponents/scan/winComScan222.vue
new file mode 100644
index 0000000..bb526e9
--- /dev/null
+++ b/src/mycomponents/scan/winComScan222.vue
@@ -0,0 +1,281 @@
+<!--扫描组件-->
+<template>
+	<!-- <page-meta root-font-size="18px"></page-meta> -->
+	<view>
+		<view class="pop_tab">
+			<view class="tab_info">
+				<view class="conbox">
+					<textarea v-model="scanMsg" trim="all" maxlength="1000" style="margin-left: 5px;width: 90%;"
+						:focus="boxfocus" :placeholder="placeholderValue" @focus="getfocus" @blur="losefocus"
+						@input="handelScanMsg" :cursor="cursorIndex"></textarea>
+				</view>
+
+				<view class="uni-flex uni-row space-between u-col-center">
+					<!-- <view class="paizhao" @click="scanQRCode()" v-if="true">
+						<image src="/static/icons/icons_camera.svg" alt="" />
+					</view> -->
+
+					<view class="uni-flex">
+						<button class="clean_scan_btn" @click="clearScanValue()">清空</button>
+						<button class="scan_btn" @click="clickScanMsg()">扫描</button>
+					</view>
+				</view>
+			</view>
+
+			<!-- <view style="width: 100%;">
+				<view style="width: 100%;" v-if="scanList.length>0&&isShowHistory">
+					<view class="uni-flex uni-row space-between u-col-center">
+						<view class="" style="padding: 10rpx;">
+							历史记录
+						</view>
+						<view class="" style="padding-right: 10rpx;">
+							<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+						</view>
+					</view>
+					<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'></u-line>
+					<scroll-view scroll-y="true" class="scroll-view" v-if="expand&&scanList.length>0"
+						style="height: 70px;">
+						<view class="uni-flex u-col" v-for="(item,index) in scanList">
+							<view style="width: 100%;max-height: 100px;">
+								<view class="uni-flex u-row space-between u-col-center" @click="showItem(item)">
+									<view class="text_ellipsis" style="padding: 15rpx;">
+										{{item}}
+									</view>
+									<view class="">
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</view>
+								<u-line class='line_color'></u-line>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view> -->
+		</view>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+<script module="input" lang="renderjs" setup>
+	import {
+		getLabelInfo
+	} from '../../common/label.js';
+	
+	import {
+		ref,
+		reactive,
+		nextTick,
+		defineProps 
+	} from "vue";
+	 import { defineComponent } from 'vue';
+	
+	const scanMsg =  ref("")
+	const boxfocus= ref(true)
+	const placeholderValue=ref("")
+	const scanResult= reactive({})
+	const scanList=ref([]) 
+	const expand=ref(true)
+	const expendIcon = ref('arrow-down')
+	const cursorIndex= ref(0)
+	const props = defineProps({
+		placeholder: {
+			type: String,
+			default: '请扫描标签'
+		},
+		clearResult: {
+			type: Boolean,
+			default: true
+		},
+		boxFocus: {
+			type: Boolean,
+			default: true
+		},
+		isShowHistory: {
+			type: Boolean,
+			default: true
+		},
+		headerType: {
+			type: String,
+			default: 'HPQ' //HLB   HMQ   HCQ HPQ
+		}
+	})
+	
+
+	// export default {
+	// 	name: "winComScan",
+	// 	emits: ["getResult"],
+	// 	components: {
+	// 	},
+	// 	props: {
+	// 		placeholder: {
+	// 			type: String,
+	// 			default: '请扫描标签'
+	// 		},
+	// 		clearResult: {
+	// 			type: Boolean,
+	// 			default: true
+	// 		},
+	// 		boxFocus: {
+	// 			type: Boolean,
+	// 			default: true
+	// 		},
+	// 		isShowHistory: {
+	// 			type: Boolean,
+	// 			default: true
+	// 		},
+	// 		headerType: {
+	// 			type: String,
+	// 			default: 'HPQ' //HLB   HMQ   HCQ HPQ
+	// 		}
+	// 	},
+	// 	// data() {
+	// 	// 	return {
+	// 	// 		// scanMsg: "HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q100",
+	// 	// 		scanMsg: "",
+	// 	// 		boxfocus: true,
+	// 	// 		placeholderValue: '',
+	// 	// 		scanResult: {},
+	// 	// 		scanList: [],
+	// 	// 		expand: true,
+	// 	// 		expendIcon: 'arrow-down',
+	// 	// 		cursorIndex: 0
+	// 	// 	}
+	// 	// },
+	// 	// mounted() {
+	// 	// 	// if (document.querySelector('textarea') != null) {
+	// 	// 	// 	document.querySelector('textarea').setAttribute('inputmode', 'none')
+	// 	// 	// }
+	// 	// 	// if (this.$el.querySelector('textarea') != null) {
+	// 	// 	// 	this.$el.querySelector('textarea').setAttribute('inputmode', 'none')
+	// 	// 	// }
+	// 	// },
+	// 	// watch: {
+	// 	// 	placeholder() {
+	// 	// 		this.placeholderValue = '请扫描' + this.placeholder;
+	// 	// 	}
+	// 	// },
+	// 	// created() {
+	// 	// 	this.placeholderValue = '请扫描' + this.placeholder;
+	// 	// },
+	// 	// methods: {
+	// 	// 	getValue() {
+	// 	// 		return this.scanMsg
+	// 	// 	},
+	// 	// 	setValue(val) {
+	// 	// 		this.scanMsg = val
+	// 	// 	},
+	// 	// 	clearScanValue() {
+	// 	// 		this.scanMsg = ''
+	// 	// 		this.getfocus();
+	// 	// 	},
+	// 	// 	clickScanMsg() {
+	// 	// 		this.scanMsg = this.scanMsg + "\n";
+	// 	// 		this.handelScanMsg();
+	// 	// 	},
+	// 	// 	handelScanMsg() {
+	// 	// 		//点击了回车
+	// 	// 		// uni.showLoading({
+	// 	// 		// 	title: '解析中...',
+	// 	// 		// 	mask: true
+	// 	// 		// })
+	// 	// 		let that = this;
+	// 	// 		let index = that.scanMsg.indexOf('\n');
+	// 	// 		if (index >= 0) {
+	// 	// 			// that.scanMsg = 'HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q50';
+	// 	// 			setTimeout(() => {
+	// 	// 				that.losefocus();
+	// 	// 				let content = uni.$u.trim(that.scanMsg)
+	// 	// 				if (content == "") {
+	// 	// 					that.getfocus();
+	// 	// 					this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => {
+	// 	// 						if (res) {
+	// 	// 							that.scanMsg=""
+	// 	// 							that.getfocus();
+	// 	// 						}
+	// 	// 					})
+	// 	// 					return;
+	// 	// 				}
+
+	// 	// 				if (that.isShowHistory) {
+	// 	// 					that.scanList.unshift(content);
+	// 	// 				}
+	// 	// 				getLabelInfo(content, this.headerType, callback => {
+	// 	// 					// uni.hideLoading();
+	// 	// 					let scanResult = callback;
+	// 	// 					if (scanResult.success) {
+	// 	// 						that.clear();
+	// 	// 						// that.getfocus();//不能自动获取焦点
+	// 	// 						that.$emit("getResult", scanResult);
+	// 	// 					} else {
+	// 	// 						that.clear();
+	// 	// 						this.$refs.comMessage.showErrorMessage(scanResult.message, res => {
+	// 	// 							if (res) {
+	// 	// 								that.getfocus();
+	// 	// 							}
+	// 	// 						})
+	// 	// 					}
+	// 	// 				});
+	// 	// 			}, 500);
+	// 	// 		}
+	// 	// 	},
+	// 	// 	getfocus() {
+	// 	// 		let that = this;
+	// 	// 		that.boxfocus = true;
+	// 	// 		this.$nextTick(r => {
+	// 	// 			that.boxfocus = true;
+	// 	// 		});
+	// 	// 	},
+	// 	// 	losefocus() {
+	// 	// 		let that = this;
+	// 	// 		that.boxfocus = false;
+	// 	// 		this.$nextTick(r => {
+	// 	// 			that.boxfocus = false;
+	// 	// 		});
+	// 	// 	},
+	// 	// 	clear() {
+	// 	// 		this.cursorIndex = 0;
+	// 	// 		this.scanMsg = ''
+	// 	// 	},
+	// 	// 	iconClick(type) {
+	// 	// 		this.$emit("clearResult", this.scanMsgk);
+	// 	// 	},
+	// 	// 	expands() {
+	// 	// 		this.expand = !this.expand;
+	// 	// 		this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+	// 	// 	},
+	// 	// 	scanClick() {
+	// 	// 		this.handelScanMsg();
+	// 	// 	},
+	// 	// 	cancelClick() {
+	// 	// 		this.clear();
+	// 	// 		this.getfocus();
+	// 	// 	},
+	// 	// 	showItem(item) {
+	// 	// 		this.$refs.comMessage.showMessage(item, res => {
+	// 	// 			if (res) {
+	// 	// 				// this.$refs.modal.cancelClose();
+	// 	// 			}
+	// 	// 		})
+	// 	// 	},
+
+	// 	// 	scanQRCode() {
+	// 	// 		let that = this;
+	// 	// 		uni.scanCode({
+	// 	// 			onlyFromCamera: true,
+	// 	// 			success: (res) => {
+	// 	// 				that.scanMsg = res.result;
+	// 	// 				that.$emit("getResult", res.result);
+	// 	// 				console.log('扫描二维码成功,结果:' + res.result);
+	// 	// 			},
+	// 	// 			fail: (res) => {
+	// 	// 				that.showItem('扫描出现错误:' + res.result);
+	// 	// 				console.log('扫描出现错误:' + res.result);
+	// 	// 			}
+	// 	// 		});
+	// 	// 	}
+	// 	// }
+	// }
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/mycomponents/scan/winScanAsnNumber.vue b/src/mycomponents/scan/winScanAsnNumber.vue
new file mode 100644
index 0000000..38a7f90
--- /dev/null
+++ b/src/mycomponents/scan/winScanAsnNumber.vue
@@ -0,0 +1,94 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup" @change="change">
+			<view class="popup_box">
+				<view class="pop_title uni-flex space-between">
+					<view class="">
+						扫描{{title}}
+					</view>
+					<view class="">
+						<image class=" icons_scan_close" src="/static/icons/icons_scan_close.svg"
+							@click="closeScanPopup()"></image>
+					</view>
+				</view>
+				<view class="">
+					<view class="">
+						<win-com-scan ref="scan" @getResult="getScanResult" :placeholder='title' :clearResult="false" :isShowHistory="false">
+						</win-com-scan>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	export default {
+		name: 'winScanAsnNumber',
+		components: {
+			winComScan
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			isShowRecord: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				code: '',
+				isShow: false,
+				expand: false,
+				scanList: [],
+				expendIcon: 'arrow-down'
+			}
+
+		},
+
+		created() {
+
+		},
+		methods: {
+			openScanPopup() {
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			getfocus() {
+				if (this.isShow) {
+					this.$refs.scan.getfocus()
+				}
+			},
+			scanClick() {
+				this.$refs.scan.handelScanMsg();
+			},
+			cancelClick() {
+				this.$refs.scan.clearScanValue();
+			},
+			getScanResult(result) {
+				 if (result.label.barType === 'BarCode') {
+					this.code = result.label.code;
+				}
+				this.callBack();
+			},
+			callBack() {
+				this.$refs.scan.clear();
+				this.$emit("getScanCode", this.code);
+			},
+			change(e) {
+				this.isShow = e.show
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/scan/winScanButton.vue b/src/mycomponents/scan/winScanButton.vue
new file mode 100644
index 0000000..fd22865
--- /dev/null
+++ b/src/mycomponents/scan/winScanButton.vue
@@ -0,0 +1,53 @@
+<template>
+	<view>
+		<view class="scan_float" @click="goScan('bottom')">
+			<image src="@/static/icons_ui/icon_scan_white.svg"></image>
+			<view>扫描</view>
+		</view>
+		<!-- <movable-area>
+			<movable-view class="max" direction="all">扫描</movable-view>
+		</movable-area> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				x: 0,
+				y: 0,
+				old: {
+					x: 0,
+					y: 0
+				}
+			}
+		},
+		props: {
+		
+		},
+		
+		created() {
+
+		},
+		methods: {
+			goScan(content) {
+				this.$emit("goScan", '');
+			},
+			tap: function(e) {
+				this.x = this.old.x
+				this.y = this.old.y
+				this.$nextTick(function() {
+					this.x = 30
+					this.y = 30
+				})
+			},
+			onChange: function(e) {
+				this.old.x = e.detail.x
+				this.old.y = e.detail.y
+			}
+		},
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/scan/winScanContainer.vue b/src/mycomponents/scan/winScanContainer.vue
new file mode 100644
index 0000000..3324db4
--- /dev/null
+++ b/src/mycomponents/scan/winScanContainer.vue
@@ -0,0 +1,119 @@
+<template>
+	<uni-popup ref="popup" :maskClick='false'>
+		<view class="popup_box">
+			<view class="pop_title uni-flex space-between">
+				<view class="" style="font-size: 35rpx;">
+					扫描{{title}}
+				</view>
+				<view>
+					<image class=" icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()">
+					</image>
+				</view>
+			</view>
+			<view class="">
+				<view class="">
+					<win-com-scan ref="scan" headerType='HCQ' @getResult="getScanResult" :placeholder='title' :clearResult="false"
+						:boxFocus="true" :isShowHistory="isShowHistory">
+					</win-com-scan>
+				</view>
+			</view>
+		</view>
+	</uni-popup>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import {
+		getContainerByNumber
+	} from '@/api/request2.js';
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	export default {
+		components: {
+			winComScan,
+		},
+		emits: ["getContainer"],
+		props: {
+			title: {
+				type: String,
+				default: '器具'
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				code: '',
+				containerInfo: {}
+			}
+		},
+
+		created() {
+
+		},
+		methods: {
+			openScanPopup() {
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			scanClick() {
+				this.$refs.scan.clickScanMsg();
+			},
+			cancelClick() {
+				this.$refs.scan.clearScanValue();
+			},
+			getScanResult(result) {
+				uni.showLoading({
+					title: '扫描中...',
+					mask: true
+				});
+				let label = result.label;
+				this.code = label.container;
+				getContainerByNumber(this.code).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length > 0) {
+						this.containerInfo = res.data.list[0];
+						if (this.containerInfo.containerStatus == 'USED') {
+							this.callBack();
+						} else {
+							this.showErrorMessage("器具[" + this.code + "]状态是[" + this.containerInfo.status + "],不可以绑定")
+						}
+					} else {
+						this.showErrorMessage("未查找到器具[" + this.code + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error)
+				})
+
+			},
+			callBack() {
+				this.closeScanPopup();
+				this.$emit("getContainer", this.containerInfo);
+			},
+			getfocus() {
+				this.$refs.scan.getfocus();
+			},
+			losefocus() {
+				this.$refs.scan.losefocus();
+			},
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.losefocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						this.code = '';
+						this.getfocus();
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/scan/winScanItem.vue b/src/mycomponents/scan/winScanItem.vue
new file mode 100644
index 0000000..05a4164
--- /dev/null
+++ b/src/mycomponents/scan/winScanItem.vue
@@ -0,0 +1,173 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup" @change="change">
+			<view class="popup_box">
+				<view class="pop_title uni-flex space-between">
+					<view class="">
+						扫描{{title}}
+					</view>
+					<view class="">
+						<image class="icons_scan_close" src="../../static/icons/icons_scan_close.svg"
+							@click="closeScanPopup()"></image>
+					</view>
+				</view>
+				<view class="">
+					<view class="">
+						<win-com-scan ref="scan" @getResult="getScanResult" :placeholder='title' :clearResult="false"
+							headerType="HMQ,HPQ">
+						</win-com-scan>
+					</view>
+				</view>
+
+			</view>
+		</uni-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+
+</template>
+
+<script>
+	import {
+		getBasicItemByCode
+	} from '@/api/request2.js';
+	
+	import {
+		checkDirectoryItemExist,
+		getListItemTypeDesc,
+		getItemTypeInfo
+	} from '@/common/directory.js';
+
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+
+	export default {
+		name: 'winScanItem',
+		components: {
+			winComScan,
+		},
+		emits: ["getScanCode", 'getScanResult'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			isShowRecord: {
+				type: Boolean,
+				default: true
+			},
+			itemCodeTypeList: {
+				type: Array,
+				default: []
+			},
+		},
+		data() {
+			return {
+				code: '',
+				result: {},
+				isShow: false,
+				expand: false,
+				scanList: [],
+				expendIcon: 'arrow-down'
+			}
+
+		},
+
+		created() {
+
+		},
+		methods: {
+			openScanPopup() {
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			getfocus() {
+				if (this.isShow) {
+					this.$refs.scan.getfocus()
+				}
+			},
+			scanClick() {
+				this.$refs.scan.clickScanMsg();
+			},
+			cancelClick() {
+				this.$refs.scan.clearScanValue();
+			},
+			getScanResult(result) {
+				uni.showLoading({
+					title: '扫描中...',
+					mask: true
+				});
+				
+				var scanResult = result;
+				if (scanResult.label.barType == "QRCode") {
+					this.code = scanResult.label.itemCode;
+				} else if (scanResult.label.barType == "BarCode") {
+					this.code = scanResult.label.code;
+				}
+				if (this.code == undefined) {
+					uni.hideLoading();
+					this.showErrorMessage("扫描物料[" + this.code + "]为空,请输入正确的物料")
+					return
+				}
+				getBasicItemByCode(this.code).then(res => {
+					uni.hideLoading();
+					if (res.data != null && res.data.list.length > 0) {
+						var result =res.data.list[0];
+						var status =result.status;
+						var type = result.type;
+						var itemCode = result.code
+						var itemName =result.name
+						var uom = result.uom
+						var std = result.uom
+						result.package = scanResult.package
+						if(status=="ENABLE"){
+							if(checkDirectoryItemExist(this.itemCodeTypeList,type)){
+								this.result =result;
+								this.callBack()
+							}else {
+								var hint = getListItemTypeDesc(this.itemCodeTypeList);
+								this.showErrorMessage("扫描物料[" + this.code + "]是[" +
+									getItemTypeInfo(type).label + "],需要的物料类型是[" + hint + "]")
+							}
+						}else {
+							this.showErrorMessage('物料【' + this.code + '】不可用');
+						}
+					} else {
+						this.showErrorMessage('未查找到物料【' + this.code + '】');
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error)
+				})
+			},
+			callBack() {
+				this.closeScanPopup();
+				this.$refs.scan.clear();
+				// this.$emit("getScanCode", this.code);
+				this.$emit("getScanResult", this.code, this.result);
+			},
+			change(e) {
+				this.isShow = e.show
+			},
+			showErrorMessage(message) {
+				this.losefocus();
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					this.code = '';
+					this.getfocus();
+				})
+			},
+			getfocus() {
+				this.$refs.scan.getfocus();
+			},
+			losefocus() {
+				this.$refs.scan.losefocus();
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/scan/winScanJobNumber.vue b/src/mycomponents/scan/winScanJobNumber.vue
new file mode 100644
index 0000000..9dbab85
--- /dev/null
+++ b/src/mycomponents/scan/winScanJobNumber.vue
@@ -0,0 +1,94 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup" @change="change">
+			<view class="popup_box">
+				<view class="pop_title uni-flex space-between">
+					<view class="">
+						扫描{{title}}
+					</view>
+					<view class="">
+						<image class=" icons_scan_close" src="/static/icons/icons_scan_close.svg"
+							@click="closeScanPopup()"></image>
+					</view>
+				</view>
+				<view class="">
+					<view class="">
+						<win-com-scan ref="scan" @getResult="getScanResult" :placeholder='title' :clearResult="false" :isShowHistory="false">
+						</win-com-scan>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	export default {
+		name: 'winScanJobNumber',
+		components: {
+			winComScan
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			isShowRecord: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				code: '',
+				isShow: false,
+				expand: false,
+				scanList: [],
+				expendIcon: 'arrow-down'
+			}
+
+		},
+
+		created() {
+
+		},
+		methods: {
+			openScanPopup() {
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			getfocus() {
+				if (this.isShow) {
+					this.$refs.scan.getfocus()
+				}
+			},
+			scanClick() {
+				this.$refs.scan.handelScanMsg();
+			},
+			cancelClick() {
+				this.$refs.scan.clearScanValue();
+			},
+			getScanResult(result) {
+				if (result.label.barType === 'BarCode') {
+					this.code = result.label.code;
+				}
+				this.callBack();
+			},
+			callBack() {
+				this.$refs.scan.clear();
+				this.$emit("getScanCode", this.code);
+			},
+			change(e) {
+				this.isShow = e.show
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
new file mode 100644
index 0000000..8f40ed8
--- /dev/null
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -0,0 +1,163 @@
+<template>
+	<uni-popup ref="popup" :maskClick='false'>
+		<view class="popup_box">
+			<view class="pop_title uni-flex space-between">
+				<view class="" style="font-size: 35rpx;">
+					扫描{{title}}
+				</view>
+				<view>
+					<image class=" icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()">
+					</image>
+				</view>
+			</view>
+			<view class="">
+				<view class="">
+					<win-com-scan ref="scan"  @getResult="getScanResult" :placeholder='title' :clearResult="false"
+						:boxFocus="true" :isShowHistory="isShowHistory" headerType="HLB">
+					</win-com-scan>
+				</view>
+			</view>
+		</view>
+	</uni-popup>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import {
+		getBasicLocationByCode,
+	} from '@/api/request2.js';
+	import {
+		getLocationTypeName,
+		getListLocationTypeDesc,
+		checkDirectoryItemExist
+	} from '@/common/directory.js';
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	export default {
+		components: {
+			winComScan,
+		},
+		emits: ["getLocation"],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			locationTypeList: {
+				type: Array,
+				default: []
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				code: '',
+				location: {}
+			}
+		},
+
+		created() {
+
+		},
+		methods: {
+			openScanPopup() {
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			scanClick() {
+				this.$refs.scan.clickScanMsg();
+			},
+			cancelClick() {
+				this.$refs.scan.clearScanValue();
+			},
+			getScanResult(result) {
+				uni.showLoading({
+					title: '扫描中...',
+					mask: true
+				});
+				let label = result.label;
+				if (label.barType === 'QRCode') {
+					this.code = label.locationCode;
+				} else if (label.barType === 'BarCode') {
+					this.code = label.code;
+				}
+				if(this.code==undefined){
+					uni.hideLoading();
+					this.showErrorMessage("扫描库位[" + this.code + "]为空,请输入正确的库位")
+					return 
+				}
+				
+				getBasicLocationByCode(this.code).then(res => {
+					uni.hideLoading();
+					if (res.data.total > 0) {
+						let result = res.data.list[0];
+						var type = result.type;
+						var available = result.available;
+						if (available == "TRUE") {
+							if (checkDirectoryItemExist(this.locationTypeList, type)) {
+								this.location = result;
+								this.callBack();
+							} else {
+								var hint = getListLocationTypeDesc(this.locationTypeList);
+								this.showErrorMessage("扫描库位[" + this.code + "]是[" +
+									getLocationTypeName(type) + "],需要的库位类型是[" + hint + "]")
+							}
+						} else {
+							this.showErrorMessage("扫描库位[" + this.code + "]不可用")
+						}
+					} else {
+						this.showErrorMessage('未查询到库位[' + this.code + ']')
+					}
+					
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error)
+				})
+			},
+			callBack() {
+				this.closeScanPopup();
+				this.$emit("getLocation", this.location, this.code);
+			},
+			checkLocationType(type) {
+				var isPass = false;
+				if (this.locationTypeList.length == 0) {
+					isPass = true;
+				} else {
+					var temp = this.locationTypeList.filter(res => {
+						if (res == type) {
+							return res
+						}
+					})
+					if (temp != undefined && temp.length > 0) {
+						isPass = true
+					}
+				}
+				return isPass
+			},
+			getfocus() {
+				this.$refs.scan.getfocus();
+			},
+			losefocus() {
+				this.$refs.scan.losefocus();
+			},
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.losefocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						this.code = '';
+						this.getfocus();
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue
new file mode 100644
index 0000000..07d5087
--- /dev/null
+++ b/src/mycomponents/scan/winScanPack.vue
@@ -0,0 +1,113 @@
+<template>
+	<view>
+		<uni-popup ref="popup" @change="change" @maskClick="closeScanPopup()">
+			<view class="popup_box">
+				<view class="pop_title uni-flex space-between">
+					<view class="" style="font-size: 35rpx;">
+						扫描{{title}}
+					</view>
+
+					<view class="">
+						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+							@click="closeScanPopup()"></image>
+					</view>
+				</view>
+				<view class="">
+					<view class="">
+						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult" :headerType="headerType"
+							:isShowHistory="isShowHistory" :clearResult="true"></win-com-scan>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			winComScan,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '箱标签'
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: true
+			},
+			headerType:{
+				type: String,
+				default: 'HPQ'
+			}
+		},
+		data() {
+			return {
+				show: false,
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			openScanPopup() {
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("close", '');
+			},
+
+			scanClick() {
+				this.$refs.comscan.clickScanMsg();
+			},
+
+			cancelClick() {
+				this.$refs.comscan.clearScanValue();
+			},
+
+			getScanResult(result) {
+				if (result.success) {
+					this.$emit("getResult", result);
+				} else {
+					this.showMessage(result.message)
+				}
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message);
+			},
+			change(e) {
+				this.show = e.show
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+	}
+</style>
diff --git a/src/mycomponents/scan/winScanPackAndCont.vue b/src/mycomponents/scan/winScanPackAndCont.vue
new file mode 100644
index 0000000..c6b5ad6
--- /dev/null
+++ b/src/mycomponents/scan/winScanPackAndCont.vue
@@ -0,0 +1,135 @@
+<template>
+	<view>
+		<uni-popup ref="popup" @change="change" @maskClick="closeScanPopup()">
+			<view class="popup_box">
+				<view class="pop_title uni-flex space-between">
+					<view class="" style="font-size: 35rpx;">
+						扫描 : {{title}}
+					</view>
+
+					<view class="">
+						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+							@click="closeScanPopup()"></image>
+					</view>
+				</view>
+				<view class="">
+					<view class="">
+						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult" :headerType="headerType"
+							:isShowHistory="isShowHistory" :clearResult="true"></win-com-scan>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
+
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import {
+		getContainerByNumber
+	} from '@/api/request2.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			winComScan,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '箱标签或托标签'
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: true
+			},
+			headerType:{
+				type: String,
+				default: 'HPQ,HMQ,HCQ'
+			}
+		},
+		data() {
+			return {
+				show: false,
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			openScanPopup() {
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("close", '');
+			},
+
+			scanClick() {
+				this.$refs.comscan.clickScanMsg();
+			},
+
+			cancelClick() {
+				this.$refs.comscan.clearScanValue();
+			},
+
+			getScanResult(result) {
+				if (result.success) {
+					if(result.label.labelType=="ContainerLabel"){
+						this.getContainerByNumber(result);
+					}else {
+						this.$emit("getResult", result);
+					}
+				} else {
+					this.showMessage(result.message)
+				}
+			},
+			
+			getContainerByNumber(result){
+				getContainerByNumber(result.label.container).then(res => {
+					if (res.data.list.length > 0) {
+						this.$emit("getResult", result);
+					} else {
+						this.showMessage('未查找到托码【' + result.label.container + '】');
+					}
+				
+				}).catch(error => {
+					this.showMessage(error);
+				})
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message);
+			},
+			change(e) {
+				this.show = e.show
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+	}
+</style>
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
new file mode 100644
index 0000000..976e827
--- /dev/null
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -0,0 +1,453 @@
+<template>
+	<view>
+		<uni-popup ref="popup" @change="change" @maskClick="closeScanPopup()">
+			<view class="popup_box">
+				<view class="pop_title uni-flex space-between">
+					<view class="" style="font-size: 35rpx;">
+						扫描{{title}}
+					</view>
+
+					<view class="">
+						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+							@click="closeScanPopup()"></image>
+					</view>
+				</view>
+				<view class="uni-flex uni-row" style="align-items: center;
+					background-color: #fff; 
+					margin-left: 20rpx;
+					margin-right: 20rpx;
+					border-radius: 8rpx;
+					height: 30px;">
+					<view class="uni-center" style="width: 25%; ">
+						来源库位
+					</view>
+					<!-- style="width: 75%;padding: 8rpx" -->
+					<view class="">
+						<!-- <input v-model="fromLocationCode" placeholder="请扫描来源库位" :focus="locationOnFocus"
+							placeholder-style="font-size:12px" style="padding: 5px;" @confirm="scanLocation" /> -->
+
+						<view v-if='allowModifyLocation'>
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位"
+								@confirm="" style='height: 30rpx;border:1px solid #fff ;'></uni-combox>
+						</view>
+						<view v-else>
+							<text style="padding: 5px">
+								{{fromLocationCode}}
+							</text>
+						</view>
+					</view>
+				</view>
+				<view class="">
+					<view class="">
+						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult"
+							:isShowHistory="isShowHistory" :clearResult="true" :headerType="headerType"></win-com-scan>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+	</view>
+	<comMessage ref="comMessage"></comMessage>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+	import {
+		getBalanceByManagementPrecision,
+	} from '@/common/balance.js';
+
+	import {
+		getBasicLocationByCode,
+	} from '@/api/request2.js';
+
+	import {
+		getListLocationTypeDesc,
+		checkDirectoryItemExist,
+		getDirectoryItemArray,
+		getLocationTypeName,
+		getInventoryStatusDesc
+	} from '@/common/directory.js';
+	export default {
+		name: 'winScanPack',
+		emits: ["getResult", "close", "getCountScanResult"],
+		components: {
+			winComScan,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: '箱标签'
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: true
+			},
+			allowNullBalance: {
+				type: Boolean,
+				default: false
+			},
+			//不提示库存
+			noShowBalanceMessage: {
+				type: Boolean,
+				default: false
+			},
+			//是否允许修改库位
+			allowModifyLocation: {
+				type: Boolean,
+				default: true
+			},
+			headerType: {
+				type: String,
+				default: "HPQ,HMQ"
+			},
+		},
+		data() {
+			return {
+				scanResult: {},
+				show: false,
+				scanList: [],
+				expand: false,
+				showScanResult: {},
+				expendIcon: 'arrow-down',
+				fromLocationCode: '',
+				fromLocation: '',
+				fromLocationList: [],
+				fromLocationTypeArray: [],
+				locationOnFocus: false,
+				businessType: {},
+				inventoryStatus: [],
+				managementPrecision: '',
+				fromInventoryStatuses: "",
+				isCheck:false
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			//直接扫描
+			openScanPopupForType(fromLocationCode, businessType) {
+				this.businessType = businessType;
+				this.fromLocationCode = fromLocationCode;
+				if (fromLocationCode != '') {
+					this.packGetFocus();
+				} else {
+					this.locationGetFocus();
+				}
+				this.fromInventoryStatuses = this.businessType.outInventoryStatuses
+				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
+				this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+
+			//在任务中扫描
+			openScanPopupForJob(fromLocationCode, fromLocationList, jobContent) {
+				this.fromLocationCode = fromLocationCode;
+				this.fromLocationList = fromLocationList;
+				if (fromLocationCode != '') {
+					this.packGetFocus();
+				} else {
+					if (this.fromLocationList.length == 0) {
+						this.locationGetFocus();
+					} else {
+						this.fromLocationCode = this.fromLocationList[0];
+					}
+				}
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+				this.fromInventoryStatuses = jobContent.outInventoryStatuses
+				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
+				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
+			},
+
+			closeScanPopup(content) {
+				this.$refs.popup.close();
+				this.$emit("close", '');
+			},
+
+
+			scanLocation(scanResult) {
+				var isCheck = false;
+				if (this.fromLocationCode == '') {
+					this.showErrorMessage('来源库位不能为空', callback => {
+						this.locationGetFocus();
+					})
+					return;
+				}
+				
+				if(this.fromLocationList.length>0){
+					if(!this.isInLocationList(this.fromLocationCode)){
+						this.showErrorMessage("扫描库位【"+this.fromLocationCode+'】不在任务来源库位中', callback => {
+							this.locationGetFocus();
+						})
+						return;
+					}
+				}
+
+				uni.showLoading({
+					title: '扫描中...',
+					mask: true
+				});
+				getBasicLocationByCode(this.fromLocationCode).then(res => {
+					if (res.data.total > 0) {
+						let result = res.data.list[0];
+						var type = result.type;
+						var available = result.available;
+						if (available == "TRUE") {
+							if (checkDirectoryItemExist(this.fromLocationTypeArray, type)) {
+								this.location = result;
+								// this.packGetFocus();
+								this.checkPackage(scanResult);
+							} else {
+								uni.hideLoading();
+								var hint = getListLocationTypeDesc(this.fromLocationTypeArray);
+								this.showErrorMessage("库位[" + this.fromLocationCode + "]是" +
+									getLocationTypeName(type) + ",<br>需要的库位类型是[" + hint + "]", callback => {
+										this.locationGetFocus();
+									})
+							}
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]不可用", res => {
+								this.locationGetFocus();
+							})
+						}
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage('未查询到库位[' + this.fromLocationCode + ']', res => {
+							this.locationGetFocus();
+						})
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error, res => {
+						this.locationGetFocus();
+					})
+				})
+			},
+
+			 getScanResult(result) {
+				// console.log("扫描", result)
+				// if (this.fromLocationCode == '' || this.fromLocationCode == null) {
+				// 	this.showMessage('请先扫描来源库位', callback => {
+				// 		this.locationGetFocus();
+				// 	})
+				// 	return;
+				// } else
+				this.scanLocation(result);
+				// debugger
+				// if(this.isCheck){
+				// 	this.checkPackage(result);
+				// }
+			},
+			
+			checkPackage(result){
+				if (result.label != null) {
+					this.scanResult = result;
+					// uni.showLoading({
+					// 	title: '查询中...',
+					// 	mask: true
+					// })
+					getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
+						res => {
+							uni.hideLoading();
+							if (res.success) {
+								this.managementPrecision = res.managementPrecision
+								this.afterQueryBalance(res.data.list);
+							} else {
+								this.showErrorMessage(res.message, res => {
+									this.packGetFocus();
+								})
+							}
+							// uni.hideLoading();
+						});
+				}
+			},
+
+
+			afterQueryBalance(datas) {
+				if (this.allowNullBalance) {
+					this.allowNoneBalance(datas);
+				} else if (this.noShowBalanceMessage) {
+					this.countCallBack(datas);
+				} else {
+					this.mustHavaBalance(datas);
+				}
+				uni.hideLoading();
+			},
+
+			//允许无库存
+			allowNoneBalance(datas) {
+				if (datas.length == 0) {
+					this.packCallBack(null);
+				} else {
+					this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],已经查找到该包装的库存记录,请重新扫描', res => {
+						this.packGetFocus();
+					})
+				}
+			},
+
+			//必须有库存
+			mustHavaBalance(datas) {
+				if (datas.length == 0) {
+					this.showErrorMessage(this.getQueryCondition() + '<br>未查找到库存记录', res => {
+						this.packGetFocus();
+					})
+				} else if (datas.length == 1) {
+					let balance = datas[0];
+					this.packCallBack(balance);
+
+					//因为盘点时有负库存，暂时去掉判断  2023年12月28日
+
+					// if (balance.qty > 0) {
+					// 	this.packCallBack(balance);
+					// } else {
+					// 	this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],<br>不可以进行操作",
+					// 		res => {
+					// 			this.packGetFocus();
+					// 		})
+					// }
+				} else {
+					this.showBalanceSelect(datas);
+				}
+			},
+
+			showBalanceSelect(items) {
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			selectBalanceItem(balance) {
+				this.packCallBack(balance);
+				//因为盘点时有负库存，暂时去掉判断  2023年12月28日
+				// if (balance.qty > 0) {
+				// 	this.packCallBack(balance);
+				// } else {
+				// 	this.showErrorMessage(this.getQueryCondition() + '<br>查找到库存记录数量为[' + balance.qty + "],不可以进行操作",
+				// 		res => {
+				// 			this.packGetFocus();
+				// 		})
+				// }
+			},
+
+			//盘点回调
+			countCallBack(datas) {
+				this.$refs.comscan.clear();
+				//返回标签信息、库存信息和管理模式
+				let data = {
+					label: this.scanResult.label,
+					package: this.scanResult.package,
+					balance: datas,
+					fromLocationCode: this.fromLocationCode,
+				}
+				this.packGetFocus();
+				this.$emit("getCountScanResult", data);
+			},
+
+			packCallBack(item) {
+				this.$refs.comscan.clear();
+				//返回标签信息、库存信息和管理模式
+				let data = {
+					label: this.scanResult.label,
+					package: this.scanResult.package,
+					balance: item,
+					fromLocationCode: this.fromLocationCode,
+				}
+				this.packGetFocus();
+				this.$emit("getResult", data);
+			},
+
+			packGetFocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			packLoseFocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			locationGetFocus() {
+				this.fromLocationCode = '';
+				this.locationOnFocus = true;
+			},
+
+			getQueryCondition() {
+				let condition = '按照以下条件:<br>';
+				let label = this.scanResult.label;
+				let status = getInventoryStatusDesc(this.inventoryStatus);
+				switch (this.managementPrecision) {
+					case 'BY_PACKAGING':
+						condition = condition + '物料号=[' + label.itemCode + ']<br>箱码=[' + label.packingNumber +
+							']<br>批次=[' +
+							label.batch +
+							']<br>库位=[' + this.fromLocationCode + ']'
+
+						break;
+					case 'BY_BATCH':
+						condition = condition + '物料号=[' + label.itemCode + ']<br>批次=[' +
+							label.batch +
+							']<br>库位=[' + this.fromLocationCode + ']'
+						break;
+					case 'BY_QUANTITY':
+						condition = condition + '物料号=[' + label.itemCode + ']<br>库位=[' + this.fromLocationCode + ']'
+						break;
+					case 'BY_UNIQUEID':
+						condition = condition + '物料号=[' + label.itemCode + ']'
+						break;
+				}
+				if (this.inventoryStatus.length > 0) {
+					condition = condition + '<br>库存状态=[' + status + ']'
+				}
+				return condition;
+			},
+
+
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback)
+				})
+			},
+
+			change(e) {
+				this.show = e.show
+			},
+			isInLocationList(location) {
+				
+				var item = this.fromLocationList.find(res => res == location)
+				
+				if (item = undefined) {
+					return false
+				}
+				return true
+			},
+			addLocationCode(code) {
+				if (!this.isInLocationList(code)) {
+					this.fromLocationList.push(code)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+	}
+</style>
diff --git a/src/mycomponents/scan/winScanPackAndPosition.vue b/src/mycomponents/scan/winScanPackAndPosition.vue
new file mode 100644
index 0000000..8709d07
--- /dev/null
+++ b/src/mycomponents/scan/winScanPackAndPosition.vue
@@ -0,0 +1,225 @@
+<template>
+	<view>
+		<uni-popup ref="popup" @maskClick="closeScanPopup()">
+			<view class="popup_box">
+				<view class="pop_title uni-flex space-between">
+					<view class="" style="font-size: 35rpx;">
+						扫描{{title}}
+					</view>
+
+					<view class="">
+						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+							@click="closeScanPopup()"></image>
+					</view>
+				</view>
+				<view class="uni-flex uni-row" style="align-items: center;
+					background-color: #fff; 
+					margin-left: 20rpx;
+					margin-right: 20rpx;
+					border-radius: 8rpx;
+					height: 30px;">
+					<view class="uni-center" style="width: 25%; ">
+						位置
+					</view>
+					<view class="" style="width: 75%;padding: 8rpx">
+						<view class="uni-flex u-col-center uni-row" @click="showSelect">
+							<view class="" style="margin-left: 20rpx;">
+								{{positionInfo}}
+							</view>
+							<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
+								@confirm="confirmSelect"></u-select>
+						</view>
+
+					</view>
+				</view>
+				<view class="">
+					<view class="">
+						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult"
+							:headerType="headerType" :isShowHistory="isShowHistory" :clearResult="true"></win-com-scan>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+	<comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+
+	import {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	export default {
+		name: 'winScanPack',
+		emits: ["getResult", "close"],
+		components: {
+			winComScan,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '箱标签'
+			},
+			isShowHistory: {
+				type: Boolean,
+				default: true
+			},
+			headerType: {
+				type: String,
+				default: 'HPQ,HMQ'
+			}
+		},
+		data() {
+			return {
+				show: false,
+				positionInfo: "请选择位置",
+				positionList: [],
+				productionLineCode: '',
+				rawLocationCode: "",
+				fgLocationCode: "",
+				workshopCode: "",
+				workStationCode: "",
+				workShopName: "",
+				productionLineName: "",
+				workStationName: "",
+				isEditPosition: true
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			openScanPopup() {
+				if (this.positionList.length == 0) {
+					uni.showLoading({
+						title: "数据加载中....",
+						mask: true
+					});
+					getWorkShopLineStation().then(res => {
+						uni.hideLoading()
+						this.positionList = res.data
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+				}
+
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
+			},
+			
+			initData(){
+				this.positionInfo = "请选择位置";
+				this.positionList = [];
+				this.productionLineCode = '';
+				this.rawLocationCode = "";
+				this.fgLocationCode = "";
+				this.workshopCode = "";
+				this.workStationCode ="";
+				this.workShopName = "";
+				this.productionLineName="";
+				this.workStationName="";
+				this.show = false;
+				this.isEditPosition = true
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("close", '');
+			},
+
+			scanClick() {
+				this.$refs.comscan.clickScanMsg();
+			},
+
+			cancelClick() {
+				this.$refs.comscan.clearScanValue();
+			},
+			getScanResult(result) {
+				if (this.positionInfo == "请选择位置") {
+					this.showErrorMessage("请先选择位置")
+					return
+				}
+				var param = {
+					positionInfo: this.positionInfo,
+					workshopCode: this.workshopCode,
+					productionLineCode: this.productionLineCode,
+					workStationCode: this.workStationCode,
+					rawLocationCode: this.rawLocationCode,
+					fgLocationCode: this.fgLocationCode,
+				}
+				if (result.success) {
+					this.isEditPosition = false
+					this.$emit("getResult", result, param);
+				} else {
+					this.showErrorMessage(result.message)
+				}
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+
+			showSelect() {
+				if (this.isEditPosition) {
+					this.show = !this.show
+				}
+
+			},
+			confirmSelect(e) {
+				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
+				console.log("位置", this.positionInfo)
+				this.workshopCode = e[0].value
+				this.productionLineCode = e[1].value
+				this.workStationCode = e[2].value
+				this.workShopName = e[0].label
+				this.productionLineName = e[1].label
+				this.workStationName = e[2].label
+
+				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
+				if (shop != undefined && shop.children != undefined) {
+					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
+					if (prodLine != undefined && prodLine.children != undefined) {
+						let station = prodLine.children.find(r => r.value == this.workStationCode);
+						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
+							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
+							return;
+						} else {
+							this.rawLocationCode = station.rawLocationCode;
+							this.fgLocationCode = station.fgLocationCode;
+						}
+					} else {
+						this.showErrorMessage("生产线-工位基础信息维护错误")
+					}
+				} else {
+					this.showErrorMessage("车间-生产线基础信息维护错误")
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+	}
+</style>
diff --git a/src/mycomponents/status/balanceStatus.vue b/src/mycomponents/status/balanceStatus.vue
new file mode 100644
index 0000000..786c4ff
--- /dev/null
+++ b/src/mycomponents/status/balanceStatus.vue
@@ -0,0 +1,71 @@
+<template>
+	<view class="uni-flex u-col-center" style="background-color: #fff;">
+		<status :status='status' style='font-size: 70rpx;'></status>
+		<text :class="statusStyle(status)" style='font-size: 38rpx;margin-right: 15rpx;'>
+			{{statusDesc(status) }}</text>
+			 <!-- v-show="allowEdit" -->
+		<image v-if="allowEdit" style="width: 40rpx; height:40rpx" src="/static/icons/icons_edit.svg" @click="open">
+		</image>
+	</view>
+	<status-edit :status='status' ref="statusEdit" @updateStatus="updateStatus"></status-edit>
+</template>
+
+<script>
+	import status from '@/mycomponents/status/status.vue'
+	import statusEdit from '@/mycomponents/status/statusEdit.vue'
+	import {
+		getInventoryStatusStyle,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	export default {
+		emits: ['updateStatus', 'onOpen'],
+		components: {
+			status,
+			statusEdit
+		},
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			status: {
+				type: String,
+				default: ""
+			},
+			allowEdit: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			open() {
+				this.$refs.statusEdit.open('center')
+				this.$emit("onOpen")
+			},
+			updateStatus(value) {
+				this.$emit("updateStatus", value)
+			},
+			close() {
+				this.$refs.popup.close()
+			},
+			statusStyle: function(val) {
+				return getInventoryStatusStyle(val);
+			},
+			statusDesc: function(val) {
+				return getInventoryStatusName(val);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+
+
+</style>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/status/status.vue b/src/mycomponents/status/status.vue
new file mode 100644
index 0000000..b771d9e
--- /dev/null
+++ b/src/mycomponents/status/status.vue
@@ -0,0 +1,52 @@
+<template>
+	<view class="center" style="margin: 5rpx;">
+		<view :class="statusStyle(status)">
+			•
+			<text v-if="showDesc" >
+				{{statusDesc(status)}}
+			</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryStatusStyle,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			status: {
+				type: String,
+				default: "1"
+			},
+			showDesc: {
+				type: Boolean,
+				default: false
+			},
+		},
+		methods: {
+			statusStyle: function(val) {
+				return getInventoryStatusStyle(val);
+			},
+			statusDesc(value) {
+				return getInventoryStatusName(value)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+
+</style>
+
+
+<style>
+</style>
diff --git a/src/mycomponents/status/statusEdit.vue b/src/mycomponents/status/statusEdit.vue
new file mode 100644
index 0000000..f626d4e
--- /dev/null
+++ b/src/mycomponents/status/statusEdit.vue
@@ -0,0 +1,149 @@
+<template>
+	<uni-popup ref="popup">
+		<view class="uni-bg-white">
+			<view class="uni-flex uni-row u-col-center space-between">
+				<text class="title_popup">请选择库存状态</text>
+				<image class="icon_close" @click="close()" src="/static/icons_ui/icon_close.svg"></image>
+			</view>
+			<u-line class="line_color"></u-line>
+			<view class="slot-content">
+				<view class="item-box">
+					<view class="item" v-for="(item, index) in list">
+						<!-- u-button自带点击变换颜色 -->
+						<u-button class="button" @tap="tagClick(item)" :key="index"
+							:class="[mIndex==index ? 'active' : '']">
+							<text :class="statusStyle(item.value)">{{item.text}}</text>
+
+						</u-button>
+					</view>
+				</view>
+
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import {
+		getInventoryStatusStyle
+	} from '@/common/directory.js';
+
+	import {
+		getInventoryStatusArray
+	} from '@/common/array.js';
+	export default {
+		emits: ['updateStatus'],
+		data() {
+			return {
+				show: false,
+				mIndex: 0,
+				list: [],
+			}
+		},
+		props: {
+			status: {
+				type: String,
+				default: ""
+			},
+		},
+		watch: {
+			status: {
+				handler(newName, oldName) {
+					this.list = getInventoryStatusArray();
+					for (var i = 0; i < this.list.length; i++) {
+						if (this.list[i].value == this.status) {
+							this.mIndex = i;
+							break
+						}
+				}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+		mounted() {
+
+		},
+
+		onLoad() {
+
+		},
+		methods: {
+			open() {
+				this.$refs.popup.open('center')
+			},
+			close() {
+				this.$refs.popup.close()
+			},
+			statusStyle(val) {
+				return getInventoryStatusStyle(val);
+			},
+			tagClick(item) {
+				this.$emit('updateStatus', item.value);
+				this.close();
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.slot-content {
+		background-color: #FFFFFF;
+	}
+
+	.slot-content .item-box {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		align-content: space-between;
+		padding-bottom: 20rpx;
+	}
+
+
+	.slot-content {
+		background-color: #FFFFFF;
+
+		.item-box {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: flex-start;
+			align-content: space-between;
+			padding-bottom: 20rpx;
+
+			.item {
+				width: 33.3%;
+				align-items: center;
+				display: flex;
+				flex-direction: row;
+			}
+
+			.button {
+				width: 100%;
+				align-items: center;
+				display: flex;
+				flex-direction: row;
+				// border: 0.5px solid $uni-border-color;
+				color: $uni-border-color;
+				padding: 10rpx 10rpx;
+				margin: 20rpx 20rpx 0rpx 20rpx;
+				hover-start-time: 10; //点击变换颜色时间
+			}
+
+			.active {
+				background-color: #3C9CFF;
+			}
+		}
+
+
+	}
+
+	.active {
+		border: 1rpx solid #3C9CFF;
+	}
+
+	.content {
+		margin-left: 10rpx;
+		margin-right: 10rpx;
+		font-size: 32rpx;
+	}
+</style>
diff --git a/src/mycomponents/transfer/comTransferReceipt.vue b/src/mycomponents/transfer/comTransferReceipt.vue
new file mode 100644
index 0000000..1c9ba30
--- /dev/null
+++ b/src/mycomponents/transfer/comTransferReceipt.vue
@@ -0,0 +1,62 @@
+<!--收货任务卡片-->
+<template>
+	<view class="device-detail">
+		<view class="card_task nopad">
+			<view class="task_num">
+				<!-- <view class="ljh_box nopad margin_bottom">
+					<view class="tit_ljh tit_jxs">
+						<text class="state-style fl margin_xs_top" style="color: #fff;"
+							:class="statusStyle (dataContent.jobStatus ) ">
+							{{statusColor(dataContent.jobStatus) | }}
+						</text>
+						<text style="font-weight: normal; ">{{dataContent.number }}1</text>
+					</view>
+				</view> -->
+			</view>
+		</view>
+		<view class="margin_xs_bottom pda_receipt_label">
+			<view class="label_order">
+				<image class="icon_normal" src="@/static/icons_ui/icon_avn.svg"></image>
+				<text class="text_darkblue">调入人:{{dataContent.acceptUserName}}</text>
+			</view>
+		</view>
+		<view class="margin_xs_bottom pda_receipt_label">
+			<view class="label_order">
+				<image class="icon_normal" src="@/static/icons_ui/icon_date.svg"></image>
+				<text
+					class="text_darkblue">创建时间:{{dataContent.creationTime===null?'无':formatDate(dataContent.creationTime)}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		// getJobStatuStyle,
+		// getJobStatuDesc,
+		dateFormat
+	} from '@/common/basic.js';
+	export default {
+		name: "comTransferReceipt",
+		data() {
+			return {
+
+			};
+		},
+		props: ['dataContent'],
+		methods:{
+			// statusStyle: function(val) {
+			// 	return getJobStatuStyle(val);
+			// },
+			// statusColor: function(val) {
+			// 	return getJobStatuDesc(val);
+			// },
+			formatDate: function(val) {
+				return dateFormat(val)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/mycomponents/wincom/basicCom/winHint.vue b/src/mycomponents/wincom/basicCom/winHint.vue
new file mode 100644
index 0000000..e9945cb
--- /dev/null
+++ b/src/mycomponents/wincom/basicCom/winHint.vue
@@ -0,0 +1,70 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<view class="uni-flex uni-column" style="background-color: white;width: 200px; height:60%;">
+				<view class="">
+					物品信息 {{dataContent.itemCode}}
+				</view>
+				<view class="">
+					描述 {{dataContent.itemDesc1}} {{dataContent.itemDesc2}}
+				</view>
+				<view class="">
+					箱码 {{dataContent.recommendPackingCode}}
+				</view>
+				<view class="">
+					批次 {{dataContent.recommendSupplierBatch}}
+				</view>
+				<view class="">
+					库位 {{dataContent.recommendLocationCode}}
+				</view>
+					<view class="">
+						数量{{dataContent.recommendQty}}
+					</view>
+					<view class="">
+						标包数量{{dataContent.stdPackQty}}
+					</view>
+					<view class="">
+						推荐单位{{dataContent.recommendUom}}
+					</view>
+				
+			</view>
+		</uni-popup>
+	
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			title: {
+				type: String,
+				default: ""
+			},
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+		methods: {
+			openScanPopup() {
+				this.$refs.popup.open('center')
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+			startEdit(){
+				this.$refs.receiptCountEdit.openScanPopup();
+			}
+		}
+		
+		
+	}
+	
+</script>
+
+<style>
+	.popup_box {
+		width: 500rpx;
+		height: 500rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/workStation/workStation.vue b/src/mycomponents/workStation/workStation.vue
new file mode 100644
index 0000000..da284da
--- /dev/null
+++ b/src/mycomponents/workStation/workStation.vue
@@ -0,0 +1,77 @@
+<template>
+	<view class="header_job_top">
+		<view class="cen_card">
+			<view class="cell_box uni-flex uni-row">
+				<view class="cell_info" v-if="fromWarehouseCode!=''">
+					<view class="text_lightblue">仓库</view>
+					<view>{{fromWarehouseCode}}</view>
+				</view>
+				
+				<view class="cell_info">
+					<view class="text_lightblue">车间</view>
+					<view>{{workshopCode}}</view>
+				</view>
+				<view class="cell_info">
+					<view class="text_lightblue">生产线</view>
+					<view>{{productionLineCode}}</view>
+				</view>
+				<view class="cell_info">
+					<view class="text_lightblue">工位</view>
+					<view>{{ workStationCode }}</view>
+				</view>
+				<view class="cell_info">
+					<view class="text_lightblue">原材料库位</view>
+					<view>{{ rawLocationCode }}</view>
+				</view>
+			<!-- 	<view class="cell_info">
+					<view class="text_lightblue">成品库位</view>
+					<view>{{ fgLocationCode }}</view>
+				</view> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		watch: {},
+
+		props: {
+			fromWarehouseCode:{
+				type: String,
+				default: ""
+			},
+			
+			workshopCode: {
+				type: String,
+				default: ""
+			},
+			productionLineCode: {
+				type: String,
+				default: ""
+			},
+			workStationCode: {
+				type: String,
+				default: ""
+			},
+			rawLocationCode: {
+				type: String,
+				default: ""
+			},
+			fgLocationCode: {
+				type: String,
+				default: ""
+			},
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 535579d..b282871 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -1,14 +1,11 @@
 <template>
 	<view class="content">
 		<!-- <image mode="widthFix" class="loginimg" src="../../static/login.png"></image> -->
-		<view class="loginimg-box">
-			<image mode="widthFix" class="loginimg" src="../../static/icons_ui/login_bg.png"></image>
-			<view class="login_title">
-				<text>您好，欢迎使用</text><br>
-				WMS仓库管理系统
-			</view>
+		<image mode="widthFix" class="loginimg" src="../../static/icons_ui/login_bg.png"></image>
+		<view class="login_title">
+			<text>您好，欢迎使用</text><br>
+			WMS仓库管理系统
 		</view>
-		
 		<view class="bgf login_wrap">
 			<view class="loginbox">
 				<form>
@@ -39,7 +36,8 @@
 								用户名
 							</view>
 							<view>
-								<input class="uni-input" style="padding:0px 25rpx" placeholder="请输入用户名" v-model="username" />
+								<input class="uni-input" style="padding:0px 25rpx" placeholder="请输入用户名"
+									v-model="username" />
 							</view>
 						</view>
 						<view class="conone">
@@ -47,9 +45,9 @@
 								<image class="icon_normal" src="../../static/icons_ui/icon_login_password.svg"></image>
 								密码
 							</view>
-							<view class="uni-input-wrapper" >
-								<input class="uni-input" style="padding:0px 25rpx" placeholder="请输入密码" :password="showPassword"
-									v-model="password" />
+							<view class="uni-input-wrapper">
+								<input class="uni-input" style="padding:0px 25rpx" placeholder="请输入密码"
+									:password="showPassword" v-model="password" />
 								<text class="uni-icon" :class="[!showPassword ? 'uni-eye-active' : '']"
 									@click="changePassword">&#xe568;</text>
 							</view>
@@ -70,7 +68,8 @@
 								style="background-color: lightgray;padding-top: 40rpx;padding-bottom: 40rpx;margin-right: 20rpx;" />
 						</view> -->
 						<view class="uni-input-wrapper">
-							<input class="" style="height: 80rpx; background-color: #F7F9FF;margin-right: 20rpx;padding: 0px 20rpx;"
+							<input class=""
+								style="height: 80rpx; background-color: #F7F9FF;margin-right: 20rpx;padding: 0px 20rpx;"
 								placeholder="请输入验证码" type="number" v-model="code" />
 						</view>
 						<view class="display: flex; align-items: center; text-center">
@@ -99,7 +98,9 @@
 		mapState,
 		mapMutations
 	} from 'vuex'
-import { useCountStore } from '@/store'
+	import {
+		useCountStore
+	} from '@/store'
 
 	// 获取自定义的store
 	const store = useCountStore()
@@ -132,14 +133,14 @@ import { useCountStore } from '@/store'
 				frontColor: '#ffffff',
 				backgroundColor: "#476DF5 !important"
 			})
-			
+
 			// #ifdef APP-PLUS
 			uni.setNavigationBarColor({
 				frontColor: "#ffffff",
 				backgroundColor: "#476DF5"
 			})
 			// #endif
-			
+
 
 		},
 		//返回首页
@@ -221,7 +222,7 @@ import { useCountStore } from '@/store'
 				// await this.$store.dispatch('GetTenantIdInfo', this.tenantName)
 				uni.hideLoading()
 				uni.setStorageSync('hasLogin', true)
-				uni.navigateTo({
+				uni.switchTab({
 					url: '/pages/index/index'
 				});
 			},
@@ -384,18 +385,4 @@ import { useCountStore } from '@/store'
 	.conone .uni-eye-active {
 		color: #5a7cf3;
 	}
-	.loginimg-box{
-		position: relative;
-		width: 100%;
-		.login_title{
-			position: absolute;
-			top: 50%;
-			left: 80rpx;
-			color: white;
-			font-size: 36rpx;
-			font-weight: bold;
-			transform: translateY(-50%);
-		}
-	}
-	
 </style>
\ No newline at end of file
diff --git a/src/static/ali_icon/iconfont.css b/src/static/ali_icon/iconfont.css
new file mode 100644
index 0000000..8034fb9
--- /dev/null
+++ b/src/static/ali_icon/iconfont.css
@@ -0,0 +1,25 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 4087030 */
+  src: url('/static/ali_icon/iconfont.ttf') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-shezhi:before {
+  content: "\e706";
+}
+
+.icon-icon_home:before {
+  content: "\e696";
+}
+
+.icon-guolv:before {
+  content: "\e6e2";
+}
+
diff --git a/src/static/ali_icon/iconfont.ttf b/src/static/ali_icon/iconfont.ttf
new file mode 100644
index 0000000..984d072
Binary files /dev/null and b/src/static/ali_icon/iconfont.ttf differ
diff --git a/src/static/bar/home.png b/src/static/bar/home.png
new file mode 100644
index 0000000..747dec3
Binary files /dev/null and b/src/static/bar/home.png differ
diff --git a/src/static/bar/home_p.png b/src/static/bar/home_p.png
new file mode 100644
index 0000000..4576514
Binary files /dev/null and b/src/static/bar/home_p.png differ
diff --git a/src/static/bar/message.png b/src/static/bar/message.png
new file mode 100644
index 0000000..83fe65c
Binary files /dev/null and b/src/static/bar/message.png differ
diff --git a/src/static/bar/message_p.png b/src/static/bar/message_p.png
new file mode 100644
index 0000000..e52621e
Binary files /dev/null and b/src/static/bar/message_p.png differ
diff --git a/src/static/bar/setting.png b/src/static/bar/setting.png
new file mode 100644
index 0000000..6d2c2af
Binary files /dev/null and b/src/static/bar/setting.png differ
diff --git a/src/static/bar/setting_p.png b/src/static/bar/setting_p.png
new file mode 100644
index 0000000..86fef59
Binary files /dev/null and b/src/static/bar/setting_p.png differ
diff --git a/src/static/bar/sy.svg b/src/static/bar/sy.svg
new file mode 100644
index 0000000..09cbb42
--- /dev/null
+++ b/src/static/bar/sy.svg
@@ -0,0 +1,4 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M27.7155 8.67826L11.0832 23.3975C10.7113 23.7265 10.4134 24.1313 10.2094 24.5847C10.0054 25.0382 9.89988 25.53 9.8999 26.0274V49.2941C9.8999 50.2241 10.2682 51.1161 10.9238 51.7737C11.5793 52.4313 12.4685 52.8008 13.3956 52.8008H46.6042C47.5314 52.8008 48.4205 52.4313 49.076 51.7737C49.7316 51.1161 50.0999 50.2241 50.0999 49.2941V26.0248C50.0999 25.5284 49.9947 25.0376 49.7915 24.585C49.5883 24.1324 49.2916 23.7282 48.921 23.3992L32.3446 8.68177C31.7063 8.1149 30.8834 7.80159 30.0309 7.80078C29.1783 7.79998 28.3549 8.11173 27.7155 8.67738V8.67826ZM13.3956 26.0274L30.0279 11.3065L46.6042 26.0248V49.2941H13.3956V26.0274Z" fill="#333333"/>
+<path d="M31.8999 32V45H27.8999V32C27.8999 31.7374 27.9516 31.4773 28.0521 31.2346C28.1527 30.992 28.3 30.7715 28.4857 30.5858C28.6714 30.4001 28.8919 30.2527 29.1345 30.1522C29.3772 30.0517 29.6373 30 29.8999 30C30.1625 30 30.4226 30.0517 30.6653 30.1522C30.9079 30.2527 31.1284 30.4001 31.3141 30.5858C31.4998 30.7715 31.6472 30.992 31.7477 31.2346C31.8482 31.4773 31.8999 31.7374 31.8999 32Z" fill="#333333"/>
+</svg>
diff --git a/src/static/bar/sya.svg b/src/static/bar/sya.svg
new file mode 100644
index 0000000..29704b2
--- /dev/null
+++ b/src/static/bar/sya.svg
@@ -0,0 +1,4 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M27.7155 8.67826L11.0832 23.3975C10.7113 23.7265 10.4134 24.1313 10.2094 24.5847C10.0054 25.0382 9.89988 25.53 9.8999 26.0274V49.2941C9.8999 50.2241 10.2682 51.1161 10.9238 51.7737C11.5793 52.4313 12.4685 52.8008 13.3956 52.8008H46.6042C47.5314 52.8008 48.4205 52.4313 49.076 51.7737C49.7316 51.1161 50.0999 50.2241 50.0999 49.2941V26.0248C50.0999 25.5284 49.9947 25.0376 49.7915 24.585C49.5883 24.1324 49.2916 23.7282 48.921 23.3992L32.3446 8.68177C31.7063 8.1149 30.8834 7.80159 30.0309 7.80078C29.1783 7.79998 28.3549 8.11173 27.7155 8.67738V8.67826ZM13.3956 26.0274L30.0279 11.3065L46.6042 26.0248V49.2941H13.3956V26.0274Z" fill="#5679F8"/>
+<path d="M31.8999 32V45H27.8999V32C27.8999 31.7374 27.9516 31.4773 28.0521 31.2346C28.1527 30.992 28.3 30.7715 28.4857 30.5858C28.6714 30.4001 28.8919 30.2527 29.1345 30.1522C29.3772 30.0517 29.6373 30 29.8999 30C30.1625 30 30.4226 30.0517 30.6653 30.1522C30.9079 30.2527 31.1284 30.4001 31.3141 30.5858C31.4998 30.7715 31.6472 30.992 31.7477 31.2346C31.8482 31.4773 31.8999 31.7374 31.8999 32Z" fill="#00B386"/>
+</svg>
diff --git a/src/static/bar/sz.svg b/src/static/bar/sz.svg
new file mode 100644
index 0000000..5a7549b
--- /dev/null
+++ b/src/static/bar/sz.svg
@@ -0,0 +1,4 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.0744 7.5C24.098 7.5 20.2479 10.02 18.4038 14.2699C17.2243 16.9889 17.0192 19.8672 17.2935 22.5793L17.3281 22.8718C17.6587 25.4316 18.9585 28.4882 20.82 30.7087L20.9273 30.8342L11.4375 38.7984C11.0502 39.1231 10.7387 39.5286 10.5249 39.9866C10.3111 40.4445 10.2002 40.9437 10.2 41.449V49.0385C10.2 49.9565 10.5646 50.837 11.2138 51.4861C11.863 52.1353 12.7434 52.5 13.6615 52.5H46.5461C47.4642 52.5 48.3446 52.1353 48.9938 51.4861C49.6429 50.837 50.0076 49.9565 50.0076 49.0385V41.4516L50.0016 41.2474C49.9737 40.7757 49.8495 40.3146 49.6367 39.8927C49.4239 39.4707 49.1269 39.0968 48.7641 38.794L39.3807 30.964L39.5252 30.8057C41.4611 28.6007 42.6925 25.6488 43.0993 22.6356C43.4662 19.901 43.2092 16.7267 41.9068 13.98C39.9692 9.89106 36.0516 7.5 30.0744 7.5ZM30.0744 10.9615C34.7353 10.9615 37.4241 12.6023 38.7793 15.4615C39.7485 17.5082 39.9545 20.0446 39.668 22.1743C39.2674 25.1538 37.8351 28.0442 35.7158 29.6556C35.5087 29.813 35.3397 30.0151 35.2214 30.2469C35.1032 30.4787 35.0387 30.7341 35.0328 30.9942C35.0269 31.2544 35.0797 31.5125 35.1873 31.7493C35.2949 31.9862 35.4546 32.1958 35.6544 32.3625L46.5461 41.4525V49.0385H13.6615V41.4499L24.6173 32.2578C24.8146 32.0922 24.9724 31.8846 25.0793 31.6503C25.1862 31.4159 25.2394 31.1607 25.2351 30.9031C25.2308 30.6456 25.169 30.3922 25.0544 30.1616C24.9397 29.9309 24.775 29.7288 24.5723 29.5699C22.5879 28.0139 20.9835 24.6485 20.7386 22.2297C20.5179 20.055 20.6841 17.7107 21.5798 15.6476C22.8735 12.6646 25.474 10.9615 30.0744 10.9615Z" fill="#333333"/>
+<path d="M31.8346 36.9222V45.576H28.373V36.9222C28.373 36.6949 28.4178 36.4698 28.5048 36.2598C28.5918 36.0499 28.7193 35.8591 28.88 35.6983C29.0407 35.5376 29.2315 35.4101 29.4415 35.3232C29.6515 35.2362 29.8765 35.1914 30.1038 35.1914C30.3311 35.1914 30.5562 35.2362 30.7662 35.3232C30.9761 35.4101 31.1669 35.5376 31.3277 35.6983C31.4884 35.8591 31.6159 36.0499 31.7028 36.2598C31.7898 36.4698 31.8346 36.6949 31.8346 36.9222V36.9222Z" fill="#333333"/>
+</svg>
diff --git a/src/static/bar/sza.svg b/src/static/bar/sza.svg
new file mode 100644
index 0000000..57dbaaa
--- /dev/null
+++ b/src/static/bar/sza.svg
@@ -0,0 +1,4 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.0744 7.5C24.098 7.5 20.2479 10.02 18.4038 14.2699C17.2243 16.9889 17.0192 19.8672 17.2935 22.5793L17.3281 22.8718C17.6587 25.4316 18.9585 28.4882 20.82 30.7087L20.9273 30.8342L11.4375 38.7984C11.0502 39.1231 10.7387 39.5286 10.5249 39.9866C10.3111 40.4445 10.2002 40.9437 10.2 41.449V49.0385C10.2 49.9565 10.5646 50.837 11.2138 51.4861C11.863 52.1353 12.7434 52.5 13.6615 52.5H46.5461C47.4642 52.5 48.3446 52.1353 48.9938 51.4861C49.6429 50.837 50.0076 49.9565 50.0076 49.0385V41.4516L50.0016 41.2474C49.9737 40.7757 49.8495 40.3146 49.6367 39.8927C49.4239 39.4707 49.1269 39.0968 48.7641 38.794L39.3807 30.964L39.5252 30.8057C41.4611 28.6007 42.6925 25.6488 43.0993 22.6356C43.4662 19.901 43.2092 16.7267 41.9068 13.98C39.9692 9.89106 36.0516 7.5 30.0744 7.5ZM30.0744 10.9615C34.7353 10.9615 37.4241 12.6023 38.7793 15.4615C39.7485 17.5082 39.9545 20.0446 39.668 22.1743C39.2674 25.1538 37.8351 28.0442 35.7158 29.6556C35.5087 29.813 35.3397 30.0151 35.2214 30.2469C35.1032 30.4787 35.0387 30.7341 35.0328 30.9942C35.0269 31.2544 35.0797 31.5125 35.1873 31.7493C35.2949 31.9862 35.4546 32.1958 35.6544 32.3625L46.5461 41.4525V49.0385H13.6615V41.4499L24.6173 32.2578C24.8146 32.0922 24.9724 31.8846 25.0793 31.6503C25.1862 31.4159 25.2394 31.1607 25.2351 30.9031C25.2308 30.6456 25.169 30.3922 25.0544 30.1616C24.9397 29.9309 24.775 29.7288 24.5723 29.5699C22.5879 28.0139 20.9835 24.6485 20.7386 22.2297C20.5179 20.055 20.6841 17.7107 21.5798 15.6476C22.8735 12.6646 25.474 10.9615 30.0744 10.9615Z" fill="#5679F8"/>
+<path d="M31.8346 36.9222V45.576H28.373V36.9222C28.373 36.6949 28.4178 36.4698 28.5048 36.2598C28.5918 36.0499 28.7193 35.8591 28.88 35.6983C29.0407 35.5376 29.2315 35.4101 29.4415 35.3232C29.6515 35.2362 29.8765 35.1914 30.1038 35.1914C30.3311 35.1914 30.5562 35.2362 30.7662 35.3232C30.9761 35.4101 31.1669 35.5376 31.3277 35.6983C31.4884 35.8591 31.6159 36.0499 31.7028 36.2598C31.7898 36.4698 31.8346 36.6949 31.8346 36.9222V36.9222Z" fill="#00B386"/>
+</svg>
diff --git a/src/static/bar/xx.png b/src/static/bar/xx.png
new file mode 100644
index 0000000..8f8b45d
Binary files /dev/null and b/src/static/bar/xx.png differ
diff --git a/src/static/bar/xx.svg b/src/static/bar/xx.svg
new file mode 100644
index 0000000..42893c5
--- /dev/null
+++ b/src/static/bar/xx.svg
@@ -0,0 +1,6 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.0077 7.5C38.6875 7.5 45.4375 14.655 46.4396 23.8714L46.6265 25.6298C46.6906 26.2373 46.7546 26.8647 46.8195 27.512L46.9493 28.83C47.2055 31.4383 47.4616 34.2075 47.7074 36.9975L48.1747 42.4512C48.2112 42.8975 48.0732 43.3406 47.7898 43.6874C47.5064 44.0341 47.0996 44.2575 46.6549 44.3106C46.2103 44.3637 45.7623 44.2424 45.4052 43.9721C45.0481 43.7019 44.8097 43.3038 44.74 42.8614L44.7002 42.4296L44.412 39.0442L44.3644 38.4947C44.1567 36.1097 43.9404 33.7246 43.7232 31.4296L43.5051 29.1684C43.3449 27.5265 43.1762 25.8854 42.9988 24.2452C42.175 16.6757 36.7854 10.9615 30.0077 10.9615C23.0015 10.9615 17.8161 16.2923 17.0182 24.2314L16.7179 27.2706L16.4696 29.8494C16.3441 31.1588 16.2186 32.4932 16.094 33.8406L15.49 40.4781L15.2892 42.7428C15.2495 43.1884 15.0389 43.6013 14.7014 43.895C14.3639 44.1886 13.9259 44.3402 13.4791 44.3179C13.0323 44.2957 12.6115 44.1013 12.3049 43.7755C11.9983 43.4497 11.8297 43.0179 11.8346 42.5706L11.8718 42.0929L12.2733 37.5955L12.5226 34.8739C12.7718 32.16 13.0245 29.4791 13.2728 26.9348L13.5004 24.6243L13.574 23.8852C14.5406 14.2656 21.1202 7.5 30.0077 7.5Z" fill="#333333"/>
+<path d="M50.777 42.2246C51.2261 42.2226 51.6585 42.3953 51.9826 42.7061C52.3068 43.0169 52.4975 43.4416 52.5143 43.8904C52.5312 44.3392 52.3729 44.777 52.0729 45.1113C51.773 45.4456 51.3548 45.6502 50.9068 45.6818L50.777 45.6862H9.23852C8.7894 45.6882 8.35708 45.5155 8.0329 45.2047C7.70872 44.8938 7.51807 44.4692 7.50122 44.0204C7.48437 43.5715 7.64264 43.1338 7.9426 42.7995C8.24255 42.4652 8.6607 42.2606 9.10871 42.229L9.23852 42.2246H50.777Z" fill="#333333"/>
+<path d="M36.4983 42.9336C36.7256 42.9336 36.9506 42.9784 37.1606 43.0653C37.3706 43.1523 37.5614 43.2798 37.7221 43.4405C37.8828 43.6012 38.0103 43.792 38.0973 44.002C38.1843 44.212 38.229 44.4371 38.229 44.6644C38.229 48.9887 34.745 52.5004 30.4406 52.5004C26.1361 52.5004 22.6521 48.9887 22.6521 44.6644C22.6521 44.2053 22.8344 43.7651 23.159 43.4405C23.4836 43.1159 23.9238 42.9336 24.3829 42.9336C24.8419 42.9336 25.2821 43.1159 25.6067 43.4405C25.9313 43.7651 26.1136 44.2053 26.1136 44.6644C26.1136 47.0831 28.0538 49.0389 30.4406 49.0389C32.7641 49.0389 34.6654 47.1852 34.7632 44.8547L34.7675 44.6644C34.7675 44.4371 34.8123 44.212 34.8992 44.002C34.9862 43.792 35.1137 43.6012 35.2744 43.4405C35.4351 43.2798 35.6259 43.1523 35.8359 43.0653C36.0459 42.9784 36.271 42.9336 36.4983 42.9336Z" fill="#333333"/>
+<path d="M21.7865 26.1057C22.0135 26.1171 22.236 26.1731 22.4414 26.2706C22.6468 26.368 22.8309 26.5049 22.9834 26.6735C23.1358 26.8421 23.2535 27.0391 23.3299 27.2531C23.4062 27.4672 23.4396 27.6943 23.4281 27.9213L22.8847 38.6538H19.4197L19.9709 27.7482C19.9822 27.5211 20.0382 27.2985 20.1355 27.093C20.2329 26.8876 20.3698 26.7033 20.5384 26.5508C20.707 26.3983 20.904 26.2805 21.1182 26.2041C21.3323 26.1277 21.5594 26.0943 21.7865 26.1057Z" fill="#333333"/>
+</svg>
diff --git a/src/static/bar/xxa.svg b/src/static/bar/xxa.svg
new file mode 100644
index 0000000..fb354b3
--- /dev/null
+++ b/src/static/bar/xxa.svg
@@ -0,0 +1,6 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.0077 7.5C38.6875 7.5 45.4375 14.655 46.4396 23.8714L46.6265 25.6298C46.6906 26.2373 46.7546 26.8647 46.8195 27.512L46.9493 28.83C47.2055 31.4383 47.4616 34.2075 47.7074 36.9975L48.1747 42.4512C48.2112 42.8975 48.0732 43.3406 47.7898 43.6874C47.5064 44.0341 47.0996 44.2575 46.6549 44.3106C46.2103 44.3637 45.7623 44.2424 45.4052 43.9721C45.0481 43.7019 44.8097 43.3038 44.74 42.8614L44.7002 42.4296L44.412 39.0442L44.3644 38.4947C44.1567 36.1097 43.9404 33.7246 43.7232 31.4296L43.5051 29.1684C43.3449 27.5265 43.1762 25.8854 42.9988 24.2452C42.175 16.6757 36.7854 10.9615 30.0077 10.9615C23.0015 10.9615 17.8161 16.2923 17.0182 24.2314L16.7179 27.2706L16.4696 29.8494C16.3441 31.1588 16.2186 32.4932 16.094 33.8406L15.49 40.4781L15.2892 42.7428C15.2495 43.1884 15.0389 43.6013 14.7014 43.895C14.3639 44.1886 13.9259 44.3402 13.4791 44.3179C13.0323 44.2957 12.6115 44.1013 12.3049 43.7755C11.9983 43.4497 11.8297 43.0179 11.8346 42.5706L11.8718 42.0929L12.2733 37.5955L12.5226 34.8739C12.7718 32.16 13.0245 29.4791 13.2728 26.9348L13.5004 24.6243L13.574 23.8852C14.5406 14.2656 21.1202 7.5 30.0077 7.5Z" fill="#5679F8"/>
+<path d="M50.777 42.2246C51.2261 42.2226 51.6585 42.3953 51.9826 42.7061C52.3068 43.0169 52.4975 43.4416 52.5143 43.8904C52.5312 44.3392 52.3729 44.777 52.0729 45.1113C51.773 45.4456 51.3548 45.6502 50.9068 45.6818L50.777 45.6862H9.23852C8.7894 45.6882 8.35708 45.5155 8.0329 45.2047C7.70872 44.8938 7.51807 44.4692 7.50122 44.0204C7.48437 43.5715 7.64264 43.1338 7.9426 42.7995C8.24255 42.4652 8.6607 42.2606 9.10871 42.229L9.23852 42.2246H50.777Z" fill="#5679F8"/>
+<path d="M36.4983 42.9336C36.7256 42.9336 36.9506 42.9784 37.1606 43.0653C37.3706 43.1523 37.5614 43.2798 37.7221 43.4405C37.8828 43.6012 38.0103 43.792 38.0973 44.002C38.1843 44.212 38.229 44.4371 38.229 44.6644C38.229 48.9887 34.745 52.5004 30.4406 52.5004C26.1361 52.5004 22.6521 48.9887 22.6521 44.6644C22.6521 44.2053 22.8344 43.7651 23.159 43.4405C23.4836 43.1159 23.9238 42.9336 24.3829 42.9336C24.8419 42.9336 25.2821 43.1159 25.6067 43.4405C25.9313 43.7651 26.1136 44.2053 26.1136 44.6644C26.1136 47.0831 28.0538 49.0389 30.4406 49.0389C32.7641 49.0389 34.6654 47.1852 34.7632 44.8547L34.7675 44.6644C34.7675 44.4371 34.8123 44.212 34.8992 44.002C34.9862 43.792 35.1137 43.6012 35.2744 43.4405C35.4351 43.2798 35.6259 43.1523 35.8359 43.0653C36.0459 42.9784 36.271 42.9336 36.4983 42.9336Z" fill="#5679F8"/>
+<path d="M21.7865 26.1057C22.0135 26.1171 22.236 26.1731 22.4414 26.2706C22.6468 26.368 22.8309 26.5049 22.9834 26.6735C23.1358 26.8421 23.2535 27.0391 23.3299 27.2531C23.4062 27.4672 23.4396 27.6943 23.4281 27.9213L22.8847 38.6538H19.4197L19.9709 27.7482C19.9822 27.5211 20.0382 27.2985 20.1355 27.093C20.2329 26.8876 20.3698 26.7033 20.5384 26.5508C20.707 26.3983 20.904 26.2805 21.1182 26.2041C21.3323 26.1277 21.5594 26.0943 21.7865 26.1057Z" fill="#00B386"/>
+</svg>
diff --git a/src/static/config.js b/src/static/config.js
new file mode 100644
index 0000000..d5fe757
--- /dev/null
+++ b/src/static/config.js
@@ -0,0 +1,8 @@
+let request_url = "http://dev.ccwin-in.com:25102/api/admin-api"
+
+let isDevelopment = true
+
+export default {
+	request_url,
+	isDevelopment
+}
diff --git a/src/static/config.json b/src/static/config.json
new file mode 100644
index 0000000..9563e13
--- /dev/null
+++ b/src/static/config.json
@@ -0,0 +1,143 @@
+{
+	"baseInfo": {
+		"companyCode": {
+			"name": "companyCode",
+			"value": "DongYang",
+			"desc": "公司代码"
+		},
+		"warehouseCode": {
+			"name": "warehouseCode",
+			"value": "T8",
+			"desc": "仓库代码"
+		},
+		"dev": {
+			"name": "dev",
+			"value": "http://dev.ccwin-in.com:23132",
+			"desc": "api请求地址"
+		},
+
+		"request_url": {
+			"name": "request_url",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
+			"dev2": "http://192.168.0.157:12080/admin-api",
+			"chefang": "http://192.168.0.176:12080/admin-api",
+			"chenxinming": "http://192.179.0.230:12080/admin-api",
+			"liuchen": "http://192.168.0.157:12080/admin-api",
+			"xuebing": "http://192.168.0.106:12080/admin-api",
+			"dev": "http://dev.ccwin-in.com:25100/api/admin-api",
+			"local": "http://localhost:12080",
+			"desc": "api请求地址"
+		},
+		
+		"tenantId": {
+			"name": "tenantId",
+			"value": "1",
+			"desc": "租户id"
+		},
+		"isDevelopment": {
+			"name": "isDevelopment",
+			"value": true,
+			"desc": "是否是开发模式,true是开发模式,false不是开发模式"
+		}
+		
+
+	},
+	"recepit_configList": [
+
+		{
+			"name": "receipt_isEditLocation",
+			"value": true,
+			"desc": "采购收货_实际库位与推荐库位是否一致"
+		},
+		{
+			"name": "receipt_isEditQty",
+			"value": true,
+			"desc": "采购收货_允许编辑数量"
+		},
+		{
+			"name": "receipt_isHandleQtyGreaterRecommendQty",
+			"value": true,
+			"desc": "采购收货_允许实际数量大于推荐数量"
+		},
+		{
+			"name": "receipt_isHandleQtyLessRecommendQty",
+			"value": true,
+			"desc": "采购收货_允许实际数量小于推荐数量"
+		},
+		{
+			"name": "receipt_isContinueScanning",
+			"value": true,
+			"desc": "采购收货_是否连续扫描"
+		},
+		{
+			"name": "receipt_isPartCommit",
+			"value": true,
+			"desc": "采购收货_是否允许部分提交"
+		},
+		{
+			"name": "receipt_isMatchByPartAndBatch",
+			"value": true,
+			"desc": "采购收货_允许模糊匹配(零件+批次)"
+		}
+	],
+	"feed_configList": [
+
+		{
+			"name": "feed_isEditLocation",
+			"value": true,
+			"desc": "发料_实际库位与推荐库位是否一致"
+		},
+		{
+			"name": "feed_isEditQty",
+			"value": true,
+			"desc": "发料_允许编辑数量"
+		},
+		{
+			"name": "feed_isHandleQtyGreaterRecommendQty",
+			"value": true,
+			"desc": "发料_允许实际数量大于推荐数量"
+		},
+		{
+			"name": "feed_isHandleQtyLessRecommendQty",
+			"value": true,
+			"desc": "发料_允许实际数量小于推荐数量"
+		},
+		{
+			"name": "feed_isContinueScanning",
+			"value": true,
+			"desc": "发料_是否连续扫描"
+		},
+		{
+			"name": "feed_isPartCommit",
+			"value": true,
+			"desc": "发料_是否允许部分提交"
+		},
+		{
+			"name": "feed_isMatchByPartAndBatch",
+			"value": true,
+			"desc": "发料_允许模糊匹配(零件+批次)"
+		},
+		{
+			"name": "feed_isOutIn",
+			"value": true,
+			"desc": "是否按批次先进先出发料"
+		},
+		{
+			"name": "feed_isHandleQtyNoRecommedQty",
+			"value": true,
+			"desc": "实际发料数量是否允许与需求量不同"
+		},
+		{
+			"name": "feed_isScanNoExits",
+			"value": true,
+			"desc": "如果扫描的批次不在列表中,是否允许发料"
+		},
+		{
+			"name": "feed_isScanUpdateCount",
+			"value": true,
+			"desc": "扫描完是否直接修改数量"
+		}
+	]
+
+
+}
diff --git a/src/static/font/iconfont.css b/src/static/font/iconfont.css
new file mode 100644
index 0000000..39aed3d
--- /dev/null
+++ b/src/static/font/iconfont.css
@@ -0,0 +1,90 @@
+@font-face {
+  font-family: "iconfont";
+  src: url('/static/font/iconfont.ttf') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  display: inline-block;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-user:before {
+  content: "\e7ae";
+}
+
+.icon-password:before {
+  content: "\e8b2";
+}
+
+.icon-code:before {
+  content: "\e699";
+}
+
+.icon-setting:before {
+  content: "\e6cc";
+}
+
+.icon-share:before {
+  content: "\e739";
+}
+
+.icon-edit:before {
+  content: "\e60c";
+}
+
+.icon-version:before {
+  content: "\e63f";
+}
+
+.icon-service:before {
+  content: "\e6ff";
+}
+
+.icon-friendfill:before {
+  content: "\e726";
+}
+
+.icon-community:before {
+  content: "\e741";
+}
+
+.icon-people:before {
+  content: "\e736";
+}
+
+.icon-dianzan:before {
+  content: "\ec7f";
+}
+
+.icon-right:before {
+  content: "\e7eb";
+}
+
+.icon-logout:before {
+  content: "\e61d";
+}
+
+.icon-help:before {
+  content: "\e616";
+}
+
+.icon-github:before {
+  content: "\e628";
+}
+
+.icon-aixin:before {
+  content: "\e601";
+}
+
+.icon-clean:before {
+  content: "\e607";
+}
+
+.icon-refresh:before {
+  content: "\e604";
+}
+
diff --git a/src/static/font/iconfont.ttf b/src/static/font/iconfont.ttf
new file mode 100644
index 0000000..53915ca
Binary files /dev/null and b/src/static/font/iconfont.ttf differ
diff --git a/src/static/icon/black_count.svg b/src/static/icons/black_count.svg
similarity index 100%
rename from src/static/icon/black_count.svg
rename to src/static/icons/black_count.svg
diff --git a/src/static/icon/checkmark-circle.svg b/src/static/icons/checkmark-circle.svg
similarity index 100%
rename from src/static/icon/checkmark-circle.svg
rename to src/static/icons/checkmark-circle.svg
diff --git a/src/static/icon/close-circle.svg b/src/static/icons/close-circle.svg
similarity index 100%
rename from src/static/icon/close-circle.svg
rename to src/static/icons/close-circle.svg
diff --git a/src/static/icon/close-circle2.svg b/src/static/icons/close-circle2.svg
similarity index 100%
rename from src/static/icon/close-circle2.svg
rename to src/static/icons/close-circle2.svg
diff --git a/src/static/icon/close.svg b/src/static/icons/close.svg
similarity index 100%
rename from src/static/icon/close.svg
rename to src/static/icons/close.svg
diff --git a/src/static/icon/data-checkbox.png b/src/static/icons/data-checkbox.png
similarity index 100%
rename from src/static/icon/data-checkbox.png
rename to src/static/icons/data-checkbox.png
diff --git a/src/static/icon/error-circle.svg b/src/static/icons/error-circle.svg
similarity index 100%
rename from src/static/icon/error-circle.svg
rename to src/static/icons/error-circle.svg
diff --git a/src/static/icon/icon_customer.svg b/src/static/icons/icon_customer.svg
similarity index 100%
rename from src/static/icon/icon_customer.svg
rename to src/static/icons/icon_customer.svg
diff --git a/src/static/icon/icon_date.svg b/src/static/icons/icon_date.svg
similarity index 100%
rename from src/static/icon/icon_date.svg
rename to src/static/icons/icon_date.svg
diff --git a/src/static/icon/icon_eye-fill.svg b/src/static/icons/icon_eye-fill.svg
similarity index 100%
rename from src/static/icon/icon_eye-fill.svg
rename to src/static/icons/icon_eye-fill.svg
diff --git a/src/static/icon/icon_eye-off-outline.svg b/src/static/icons/icon_eye-off-outline.svg
similarity index 100%
rename from src/static/icon/icon_eye-off-outline.svg
rename to src/static/icons/icon_eye-off-outline.svg
diff --git a/src/static/icon/icon_filter.svg b/src/static/icons/icon_filter.svg
similarity index 100%
rename from src/static/icon/icon_filter.svg
rename to src/static/icons/icon_filter.svg
diff --git a/src/static/icon/iconfont.ttf b/src/static/icons/iconfont.ttf
similarity index 100%
rename from src/static/icon/iconfont.ttf
rename to src/static/icons/iconfont.ttf
diff --git a/src/static/icon/icons_camera.svg b/src/static/icons/icons_camera.svg
similarity index 100%
rename from src/static/icon/icons_camera.svg
rename to src/static/icons/icons_camera.svg
diff --git a/src/static/icon/icons_close-circle.svg b/src/static/icons/icons_close-circle.svg
similarity index 100%
rename from src/static/icon/icons_close-circle.svg
rename to src/static/icons/icons_close-circle.svg
diff --git a/src/static/icon/icons_close.svg b/src/static/icons/icons_close.svg
similarity index 100%
rename from src/static/icon/icons_close.svg
rename to src/static/icons/icons_close.svg
diff --git a/src/static/icon/icons_edit.svg b/src/static/icons/icons_edit.svg
similarity index 100%
rename from src/static/icon/icons_edit.svg
rename to src/static/icons/icons_edit.svg
diff --git a/src/static/icon/icons_scan_close.svg b/src/static/icons/icons_scan_close.svg
similarity index 100%
rename from src/static/icon/icons_scan_close.svg
rename to src/static/icons/icons_scan_close.svg
diff --git a/src/static/icon/light_count.svg b/src/static/icons/light_count.svg
similarity index 100%
rename from src/static/icon/light_count.svg
rename to src/static/icons/light_count.svg
diff --git a/src/static/icon/plus.svg b/src/static/icons/plus.svg
similarity index 100%
rename from src/static/icon/plus.svg
rename to src/static/icons/plus.svg
diff --git a/src/static/icon/question-circle.svg b/src/static/icons/question-circle.svg
similarity index 100%
rename from src/static/icon/question-circle.svg
rename to src/static/icons/question-circle.svg
diff --git a/src/static/icon/screen.png b/src/static/icons/screen.png
similarity index 100%
rename from src/static/icon/screen.png
rename to src/static/icons/screen.png
diff --git a/src/static/icon/search.svg b/src/static/icons/search.svg
similarity index 100%
rename from src/static/icon/search.svg
rename to src/static/icons/search.svg
diff --git a/src/static/icon/warning.svg b/src/static/icons/warning.svg
similarity index 100%
rename from src/static/icon/warning.svg
rename to src/static/icons/warning.svg
diff --git a/src/static/images/message.svg b/src/static/images/message.svg
new file mode 100644
index 0000000..28380e5
--- /dev/null
+++ b/src/static/images/message.svg
@@ -0,0 +1,4 @@
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26.7208 12.1858C26.7208 9.87284 25.802 7.65464 24.1665 6.01914C22.531 4.38365 20.3128 3.46484 17.9999 3.46484C15.6869 3.46484 13.4687 4.38365 11.8332 6.01914C10.1977 7.65464 9.27892 9.87284 9.27892 12.1858C9.27892 22.3602 4.91846 25.2672 4.91846 25.2672H31.0812C31.0812 25.2672 26.7208 22.3602 26.7208 12.1858Z" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.5144 31.082C20.2589 31.5226 19.8921 31.8882 19.4508 32.1424C19.0095 32.3966 18.5092 32.5304 17.9999 32.5304C17.4906 32.5304 16.9903 32.3966 16.549 32.1424C16.1077 31.8882 15.7409 31.5226 15.4854 31.082" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/static/scss/colorui.css b/src/static/scss/colorui.css
new file mode 100644
index 0000000..fade3b2
--- /dev/null
+++ b/src/static/scss/colorui.css
@@ -0,0 +1,3912 @@
+/*
+  ColorUi for uniApp  v2.1.6 | by 文晓港 2019-05-31 10:44:24
+  仅供学习交流，如作它用所承受的法律责任一概与作者无关  
+  
+  *使用ColorUi开发扩展与插件时，请注明基于ColorUi开发 
+  
+  （QQ交流群：240787041）
+*/
+
+/* ==================
+        初始化
+ ==================== */
+body {
+	background-color: #f1f1f1;
+	font-size: 28upx;
+	color: #333333;
+	font-family: Helvetica Neue, Helvetica, sans-serif;
+}
+
+view,
+scroll-view,
+swiper,
+button,
+input,
+textarea,
+label,
+navigator,
+image {
+	box-sizing: border-box;
+}
+
+.round {
+	border-radius: 5000upx;
+}
+
+.radius {
+	border-radius: 6upx;
+}
+
+/* ==================
+          图片
+ ==================== */
+
+image {
+	max-width: 100%;
+	display: inline-block;
+	position: relative;
+	z-index: 0;
+}
+
+image.loading::before {
+	content: "";
+	background-color: #f5f5f5;
+	display: block;
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	z-index: -2;
+}
+
+image.loading::after {
+	content: "\e7f1";
+	font-family: "cuIcon";
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 32upx;
+	height: 32upx;
+	line-height: 32upx;
+	right: 0;
+	bottom: 0;
+	z-index: -1;
+	font-size: 32upx;
+	margin: auto;
+	color: #ccc;
+	-webkit-animation: cuIcon-spin 2s infinite linear;
+	animation: cuIcon-spin 2s infinite linear;
+	display: block;
+}
+
+.response {
+	width: 100%;
+}
+
+/* ==================
+         开关
+ ==================== */
+
+switch,
+checkbox,
+radio {
+	position: relative;
+}
+
+switch::after,
+switch::before {
+	font-family: "cuIcon";
+	content: "\e645";
+	position: absolute;
+	color: #ffffff !important;
+	top: 0%;
+	left: 0upx;
+	font-size: 26upx;
+	line-height: 26px;
+	width: 50%;
+	text-align: center;
+	pointer-events: none;
+	transform: scale(0, 0);
+	transition: all 0.3s ease-in-out 0s;
+	z-index: 9;
+	bottom: 0;
+	height: 26px;
+	margin: auto;
+}
+
+switch::before {
+	content: "\e646";
+	right: 0;
+	transform: scale(1, 1);
+	left: auto;
+}
+
+switch[checked]::after,
+switch.checked::after {
+	transform: scale(1, 1);
+}
+
+switch[checked]::before,
+switch.checked::before {
+	transform: scale(0, 0);
+}
+
+/* #ifndef MP-ALIPAY */
+radio::before,
+checkbox::before {
+	font-family: "cuIcon";
+	content: "\e645";
+	position: absolute;
+	color: #ffffff !important;
+	top: 50%;
+	margin-top: -8px;
+	right: 5px;
+	font-size: 32upx;
+	line-height: 16px;
+	pointer-events: none;
+	transform: scale(1, 1);
+	transition: all 0.3s ease-in-out 0s;
+	z-index: 9;
+}
+
+radio .wx-radio-input,
+checkbox .wx-checkbox-input,
+radio .uni-radio-input,
+checkbox .uni-checkbox-input {
+	margin: 0;
+	width: 24px;
+	height: 24px;
+}
+
+checkbox.round .wx-checkbox-input,
+checkbox.round .uni-checkbox-input {
+	border-radius: 100upx;
+}
+
+/* #endif */
+
+switch[checked]::before {
+	transform: scale(0, 0);
+}
+
+switch .wx-switch-input,
+switch .uni-switch-input {
+	border: none;
+	padding: 0 24px;
+	width: 48px;
+	height: 26px;
+	margin: 0;
+	border-radius: 100upx;
+}
+
+switch .wx-switch-input:not([class*="bg-"]),
+switch .uni-switch-input:not([class*="bg-"]) {
+	background: #8799a3 !important;
+}
+
+switch .wx-switch-input::after,
+switch .uni-switch-input::after {
+	margin: auto;
+	width: 26px;
+	height: 26px;
+	border-radius: 100upx;
+	left: 0upx;
+	top: 0upx;
+	bottom: 0upx;
+	position: absolute;
+	transform: scale(0.9, 0.9);
+	transition: all 0.1s ease-in-out 0s;
+}
+
+switch .wx-switch-input.wx-switch-input-checked::after,
+switch .uni-switch-input.uni-switch-input-checked::after {
+	margin: auto;
+	left: 22px;
+	box-shadow: none;
+	transform: scale(0.9, 0.9);
+}
+
+radio-group {
+	display: inline-block;
+}
+
+
+
+switch.radius .wx-switch-input::after,
+switch.radius .wx-switch-input,
+switch.radius .wx-switch-input::before,
+switch.radius .uni-switch-input::after,
+switch.radius .uni-switch-input,
+switch.radius .uni-switch-input::before {
+	border-radius: 10upx;
+}
+
+switch .wx-switch-input::before,
+radio.radio::before,
+checkbox .wx-checkbox-input::before,
+radio .wx-radio-input::before,
+switch .uni-switch-input::before,
+radio.radio::before,
+checkbox .uni-checkbox-input::before,
+radio .uni-radio-input::before {
+	display: none;
+}
+
+radio.radio[checked]::after,
+radio.radio .uni-radio-input-checked::after {
+	content: "";
+	background-color: transparent;
+	display: block;
+	position: absolute;
+	width: 8px;
+	height: 8px;
+	z-index: 999;
+	top: 0upx;
+	left: 0upx;
+	right: 0;
+	bottom: 0;
+	margin: auto;
+	border-radius: 200upx;
+	/* #ifndef MP */
+	border: 7px solid #ffffff !important;
+	/* #endif */
+
+	/* #ifdef MP */
+	border: 8px solid #ffffff !important;
+	/* #endif */
+}
+
+.switch-sex::after {
+	content: "\e71c";
+}
+
+.switch-sex::before {
+	content: "\e71a";
+}
+
+.switch-sex .wx-switch-input,
+.switch-sex .uni-switch-input {
+	background: #e54d42 !important;
+	border-color: #e54d42 !important;
+}
+
+.switch-sex[checked] .wx-switch-input,
+.switch-sex.checked .uni-switch-input {
+	background: #0081ff !important;
+	border-color: #0081ff !important;
+}
+
+switch.red[checked] .wx-switch-input.wx-switch-input-checked,
+checkbox.red[checked] .wx-checkbox-input,
+radio.red[checked] .wx-radio-input,
+switch.red.checked .uni-switch-input.uni-switch-input-checked,
+checkbox.red.checked .uni-checkbox-input,
+radio.red.checked .uni-radio-input {
+	background-color: #e54d42 !important;
+	border-color: #e54d42 !important;
+	color: #ffffff !important;
+}
+
+switch.orange[checked] .wx-switch-input,
+checkbox.orange[checked] .wx-checkbox-input,
+radio.orange[checked] .wx-radio-input,
+switch.orange.checked .uni-switch-input,
+checkbox.orange.checked .uni-checkbox-input,
+radio.orange.checked .uni-radio-input {
+	background-color: #f37b1d !important;
+	border-color: #f37b1d !important;
+	color: #ffffff !important;
+}
+
+switch.yellow[checked] .wx-switch-input,
+checkbox.yellow[checked] .wx-checkbox-input,
+radio.yellow[checked] .wx-radio-input,
+switch.yellow.checked .uni-switch-input,
+checkbox.yellow.checked .uni-checkbox-input,
+radio.yellow.checked .uni-radio-input {
+	background-color: #fbbd08 !important;
+	border-color: #fbbd08 !important;
+	color: #333333 !important;
+}
+
+switch.olive[checked] .wx-switch-input,
+checkbox.olive[checked] .wx-checkbox-input,
+radio.olive[checked] .wx-radio-input,
+switch.olive.checked .uni-switch-input,
+checkbox.olive.checked .uni-checkbox-input,
+radio.olive.checked .uni-radio-input {
+	background-color: #8dc63f !important;
+	border-color: #8dc63f !important;
+	color: #ffffff !important;
+}
+
+switch.green[checked] .wx-switch-input,
+switch[checked] .wx-switch-input,
+checkbox.green[checked] .wx-checkbox-input,
+checkbox[checked] .wx-checkbox-input,
+radio.green[checked] .wx-radio-input,
+radio[checked] .wx-radio-input,
+switch.green.checked .uni-switch-input,
+switch.checked .uni-switch-input,
+checkbox.green.checked .uni-checkbox-input,
+checkbox.checked .uni-checkbox-input,
+radio.green.checked .uni-radio-input,
+radio.checked .uni-radio-input {
+	background-color: #39b54a !important;
+	border-color: #39b54a !important;
+	color: #ffffff !important;
+	border-color: #39B54A !important;
+}
+
+switch.cyan[checked] .wx-switch-input,
+checkbox.cyan[checked] .wx-checkbox-input,
+radio.cyan[checked] .wx-radio-input,
+switch.cyan.checked .uni-switch-input,
+checkbox.cyan.checked .uni-checkbox-input,
+radio.cyan.checked .uni-radio-input {
+	background-color: #1cbbb4 !important;
+	border-color: #1cbbb4 !important;
+	color: #ffffff !important;
+}
+
+switch.blue[checked] .wx-switch-input,
+checkbox.blue[checked] .wx-checkbox-input,
+radio.blue[checked] .wx-radio-input,
+switch.blue.checked .uni-switch-input,
+checkbox.blue.checked .uni-checkbox-input,
+radio.blue.checked .uni-radio-input {
+	background-color: #0081ff !important;
+	border-color: #0081ff !important;
+	color: #ffffff !important;
+}
+
+switch.purple[checked] .wx-switch-input,
+checkbox.purple[checked] .wx-checkbox-input,
+radio.purple[checked] .wx-radio-input,
+switch.purple.checked .uni-switch-input,
+checkbox.purple.checked .uni-checkbox-input,
+radio.purple.checked .uni-radio-input {
+	background-color: #6739b6 !important;
+	border-color: #6739b6 !important;
+	color: #ffffff !important;
+}
+
+switch.mauve[checked] .wx-switch-input,
+checkbox.mauve[checked] .wx-checkbox-input,
+radio.mauve[checked] .wx-radio-input,
+switch.mauve.checked .uni-switch-input,
+checkbox.mauve.checked .uni-checkbox-input,
+radio.mauve.checked .uni-radio-input {
+	background-color: #9c26b0 !important;
+	border-color: #9c26b0 !important;
+	color: #ffffff !important;
+}
+
+switch.pink[checked] .wx-switch-input,
+checkbox.pink[checked] .wx-checkbox-input,
+radio.pink[checked] .wx-radio-input,
+switch.pink.checked .uni-switch-input,
+checkbox.pink.checked .uni-checkbox-input,
+radio.pink.checked .uni-radio-input {
+	background-color: #e03997 !important;
+	border-color: #e03997 !important;
+	color: #ffffff !important;
+}
+
+switch.brown[checked] .wx-switch-input,
+checkbox.brown[checked] .wx-checkbox-input,
+radio.brown[checked] .wx-radio-input,
+switch.brown.checked .uni-switch-input,
+checkbox.brown.checked .uni-checkbox-input,
+radio.brown.checked .uni-radio-input {
+	background-color: #a5673f !important;
+	border-color: #a5673f !important;
+	color: #ffffff !important;
+}
+
+switch.grey[checked] .wx-switch-input,
+checkbox.grey[checked] .wx-checkbox-input,
+radio.grey[checked] .wx-radio-input,
+switch.grey.checked .uni-switch-input,
+checkbox.grey.checked .uni-checkbox-input,
+radio.grey.checked .uni-radio-input {
+	background-color: #8799a3 !important;
+	border-color: #8799a3 !important;
+	color: #ffffff !important;
+}
+
+switch.gray[checked] .wx-switch-input,
+checkbox.gray[checked] .wx-checkbox-input,
+radio.gray[checked] .wx-radio-input,
+switch.gray.checked .uni-switch-input,
+checkbox.gray.checked .uni-checkbox-input,
+radio.gray.checked .uni-radio-input {
+	background-color: #f0f0f0 !important;
+	border-color: #f0f0f0 !important;
+	color: #333333 !important;
+}
+
+switch.black[checked] .wx-switch-input,
+checkbox.black[checked] .wx-checkbox-input,
+radio.black[checked] .wx-radio-input,
+switch.black.checked .uni-switch-input,
+checkbox.black.checked .uni-checkbox-input,
+radio.black.checked .uni-radio-input {
+	background-color: #333333 !important;
+	border-color: #333333 !important;
+	color: #ffffff !important;
+}
+
+switch.white[checked] .wx-switch-input,
+checkbox.white[checked] .wx-checkbox-input,
+radio.white[checked] .wx-radio-input,
+switch.white.checked .uni-switch-input,
+checkbox.white.checked .uni-checkbox-input,
+radio.white.checked .uni-radio-input {
+	background-color: #ffffff !important;
+	border-color: #ffffff !important;
+	color: #333333 !important;
+}
+
+/* ==================
+          边框
+ ==================== */
+
+/* -- 实线 -- */
+
+.solid,
+.solid-top,
+.solid-right,
+.solid-bottom,
+.solid-left,
+.solids,
+.solids-top,
+.solids-right,
+.solids-bottom,
+.solids-left,
+.dashed,
+.dashed-top,
+.dashed-right,
+.dashed-bottom,
+.dashed-left {
+	position: relative;
+}
+
+.solid::after,
+.solid-top::after,
+.solid-right::after,
+.solid-bottom::after,
+.solid-left::after,
+.solids::after,
+.solids-top::after,
+.solids-right::after,
+.solids-bottom::after,
+.solids-left::after,
+.dashed::after,
+.dashed-top::after,
+.dashed-right::after,
+.dashed-bottom::after,
+.dashed-left::after {
+	content: " ";
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border-radius: inherit;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	pointer-events: none;
+	box-sizing: border-box;
+}
+
+.solid::after {
+	border: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
+.solid-top::after {
+	border-top: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
+.solid-right::after {
+	border-right: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
+.solid-bottom::after {
+	border-bottom: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
+.solid-left::after {
+	border-left: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
+.solids::after {
+	border: 8upx solid #eee;
+}
+
+.solids-top::after {
+	border-top: 8upx solid #eee;
+}
+
+.solids-right::after {
+	border-right: 8upx solid #eee;
+}
+
+.solids-bottom::after {
+	border-bottom: 8upx solid #eee;
+}
+
+.solids-left::after {
+	border-left: 8upx solid #eee;
+}
+
+/* -- 虚线 -- */
+
+.dashed::after {
+	border: 1upx dashed #ddd;
+}
+
+.dashed-top::after {
+	border-top: 1upx dashed #ddd;
+}
+
+.dashed-right::after {
+	border-right: 1upx dashed #ddd;
+}
+
+.dashed-bottom::after {
+	border-bottom: 1upx dashed #ddd;
+}
+
+.dashed-left::after {
+	border-left: 1upx dashed #ddd;
+}
+
+/* -- 阴影 -- */
+
+.shadow[class*='white'] {
+	--ShadowSize: 0 1upx 6upx;
+}
+
+.shadow-lg {
+	--ShadowSize: 0upx 40upx 100upx 0upx;
+}
+
+.shadow-warp {
+	position: relative;
+	box-shadow: 0 0 10upx rgba(0, 0, 0, 0.1);
+}
+
+.shadow-warp:before,
+.shadow-warp:after {
+	position: absolute;
+	content: "";
+	top: 20upx;
+	bottom: 30upx;
+	left: 20upx;
+	width: 50%;
+	box-shadow: 0 30upx 20upx rgba(0, 0, 0, 0.2);
+	transform: rotate(-3deg);
+	z-index: -1;
+}
+
+.shadow-warp:after {
+	right: 20upx;
+	left: auto;
+	transform: rotate(3deg);
+}
+
+.shadow-blur {
+	position: relative;
+}
+
+.shadow-blur::before {
+	content: "";
+	display: block;
+	background: inherit;
+	filter: blur(10upx);
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	top: 10upx;
+	left: 10upx;
+	z-index: -1;
+	opacity: 0.4;
+	transform-origin: 0 0;
+	border-radius: inherit;
+	transform: scale(1, 1);
+}
+
+/* ==================
+          按钮
+ ==================== */
+
+.cu-btn {
+	position: relative;
+	border: 0upx;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	padding: 0 30upx;
+	font-size: 28upx;
+	height: 64upx;
+	line-height: 1;
+	text-align: center;
+	text-decoration: none;
+	overflow: visible;
+	margin-left: initial;
+	transform: translate(0upx, 0upx);
+	margin-right: initial;
+}
+
+.cu-btn::after {
+	display: none;
+}
+
+.cu-btn:not([class*="bg-"]) {
+	background-color: #f0f0f0;
+}
+
+.cu-btn[class*="line"] {
+	background-color: transparent;
+}
+
+.cu-btn[class*="line"]::after {
+	content: " ";
+	display: block;
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border: 1upx solid currentColor;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	box-sizing: border-box;
+	border-radius: 12upx;
+	z-index: 1;
+	pointer-events: none;
+}
+
+.cu-btn.round[class*="line"]::after {
+	border-radius: 1000upx;
+}
+
+.cu-btn[class*="lines"]::after {
+	border: 6upx solid currentColor;
+}
+
+.cu-btn[class*="bg-"]::after {
+	display: none;
+}
+
+.cu-btn.sm {
+	padding: 0 20upx;
+	font-size: 20upx;
+	height: 48upx;
+}
+
+.cu-btn.lg {
+	padding: 0 40upx;
+	font-size: 32upx;
+	height: 80upx;
+}
+
+.cu-btn.cuIcon.sm {
+	width: 48upx;
+	height: 48upx;
+}
+
+.cu-btn.cuIcon {
+	width: 64upx;
+	height: 64upx;
+	border-radius: 500upx;
+	padding: 0;
+}
+
+button.cuIcon.lg {
+	width: 80upx;
+	height: 80upx;
+}
+
+.cu-btn.shadow-blur::before {
+	top: 4upx;
+	left: 4upx;
+	filter: blur(6upx);
+	opacity: 0.6;
+}
+
+.cu-btn.button-hover {
+	transform: translate(1upx, 1upx);
+}
+
+.block {
+	display: block;
+}
+
+.cu-btn.block {
+	display: flex;
+}
+
+.cu-btn[disabled] {
+	opacity: 0.6;
+	color: #ffffff;
+}
+
+/* ==================
+          徽章
+ ==================== */
+
+.cu-tag {
+	font-size: 24upx;
+	vertical-align: middle;
+	position: relative;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	padding: 0upx 16upx;
+	height: 48upx;
+	font-family: Helvetica Neue, Helvetica, sans-serif;
+	white-space: nowrap;
+}
+
+.cu-tag:not([class*="bg"]):not([class*="line"]) {
+	background-color: #f1f1f1;
+}
+
+.cu-tag[class*="line-"]::after {
+	content: " ";
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border: 1upx solid currentColor;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	box-sizing: border-box;
+	border-radius: inherit;
+	z-index: 1;
+	pointer-events: none;
+}
+
+.cu-tag.radius[class*="line"]::after {
+	border-radius: 12upx;
+}
+
+.cu-tag.round[class*="line"]::after {
+	border-radius: 1000upx;
+}
+
+.cu-tag[class*="line-"]::after {
+	border-radius: 0;
+}
+
+.cu-tag+.cu-tag {
+	margin-left: 10upx;
+}
+
+.cu-tag.sm {
+	font-size: 20upx;
+	padding: 0upx 12upx;
+	height: 32upx;
+}
+
+.cu-capsule {
+	display: inline-flex;
+	vertical-align: middle;
+}
+
+.cu-capsule+.cu-capsule {
+	margin-left: 10upx;
+}
+
+.cu-capsule .cu-tag {
+	margin: 0;
+}
+
+.cu-capsule .cu-tag[class*="line-"]:last-child::after {
+	border-left: 0upx solid transparent;
+}
+
+.cu-capsule .cu-tag[class*="line-"]:first-child::after {
+	border-right: 0upx solid transparent;
+}
+
+.cu-capsule.radius .cu-tag:first-child {
+	border-top-left-radius: 6upx;
+	border-bottom-left-radius: 6upx;
+}
+
+.cu-capsule.radius .cu-tag:last-child::after,
+.cu-capsule.radius .cu-tag[class*="line-"] {
+	border-top-right-radius: 12upx;
+	border-bottom-right-radius: 12upx;
+}
+
+.cu-capsule.round .cu-tag:first-child {
+	border-top-left-radius: 200upx;
+	border-bottom-left-radius: 200upx;
+	text-indent: 4upx;
+}
+
+.cu-capsule.round .cu-tag:last-child::after,
+.cu-capsule.round .cu-tag:last-child {
+	border-top-right-radius: 200upx;
+	border-bottom-right-radius: 200upx;
+	text-indent: -4upx;
+}
+
+.cu-tag.badge {
+	border-radius: 200upx;
+	position: absolute;
+	top: -10upx;
+	right: -10upx;
+	font-size: 20upx;
+	padding: 0upx 10upx;
+	height: 28upx;
+	color: #ffffff;
+}
+
+.cu-tag.badge:not([class*="bg-"]) {
+	background-color: #dd514c;
+}
+
+.cu-tag:empty:not([class*="cuIcon-"]) {
+	padding: 0upx;
+	width: 16upx;
+	height: 16upx;
+	top: -4upx;
+	right: -4upx;
+}
+
+.cu-tag[class*="cuIcon-"] {
+	width: 32upx;
+	height: 32upx;
+	top: -4upx;
+	right: -4upx;
+}
+
+/* ==================
+          头像
+ ==================== */
+
+.cu-avatar {
+	font-variant: small-caps;
+	margin: 0;
+	padding: 0;
+	display: inline-flex;
+	text-align: center;
+	justify-content: center;
+	align-items: center;
+	background-color: #ccc;
+	color: #ffffff;
+	white-space: nowrap;
+	position: relative;
+	width: 64upx;
+	height: 64upx;
+	background-size: cover;
+	background-position: center;
+	vertical-align: middle;
+	font-size: 1.5em;
+}
+
+.cu-avatar.sm {
+	width: 48upx;
+	height: 48upx;
+	font-size: 1em;
+}
+
+.cu-avatar.lg {
+	width: 96upx;
+	height: 96upx;
+	font-size: 2em;
+}
+
+.cu-avatar.xl {
+	width: 128upx;
+	height: 128upx;
+	font-size: 2.5em;
+}
+
+.cu-avatar .avatar-text {
+	font-size: 0.4em;
+}
+
+.cu-avatar-group {
+	direction: rtl;
+	unicode-bidi: bidi-override;
+	padding: 0 10upx 0 40upx;
+	display: inline-block;
+}
+
+.cu-avatar-group .cu-avatar {
+	margin-left: -30upx;
+	border: 4upx solid #f1f1f1;
+	vertical-align: middle;
+}
+
+.cu-avatar-group .cu-avatar.sm {
+	margin-left: -20upx;
+	border: 1upx solid #f1f1f1;
+}
+
+/* ==================
+         进度条
+ ==================== */
+
+.cu-progress {
+	overflow: hidden;
+	height: 28upx;
+	background-color: #ebeef5;
+	display: inline-flex;
+	align-items: center;
+	width: 100%;
+}
+
+.cu-progress+view,
+.cu-progress+text {
+	line-height: 1;
+}
+
+.cu-progress.xs {
+	height: 10upx;
+}
+
+.cu-progress.sm {
+	height: 20upx;
+}
+
+.cu-progress view {
+	width: 0;
+	height: 100%;
+	align-items: center;
+	display: flex;
+	justify-items: flex-end;
+	justify-content: space-around;
+	font-size: 20upx;
+	color: #ffffff;
+	transition: width 0.6s ease;
+}
+
+.cu-progress text {
+	align-items: center;
+	display: flex;
+	font-size: 20upx;
+	color: #333333;
+	text-indent: 10upx;
+}
+
+.cu-progress.text-progress {
+	padding-right: 60upx;
+}
+
+.cu-progress.striped view {
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+	background-size: 72upx 72upx;
+}
+
+.cu-progress.active view {
+	animation: progress-stripes 2s linear infinite;
+}
+
+@keyframes progress-stripes {
+	from {
+		background-position: 72upx 0;
+	}
+
+	to {
+		background-position: 0 0;
+	}
+}
+
+/* ==================
+          加载
+ ==================== */
+
+.cu-load {
+	display: block;
+	line-height: 3em;
+	text-align: center;
+}
+
+.cu-load::before {
+	font-family: "cuIcon";
+	display: inline-block;
+	margin-right: 6upx;
+}
+
+.cu-load.loading::before {
+	content: "\e67a";
+	animation: cuIcon-spin 2s infinite linear;
+}
+
+.cu-load.loading::after {
+	content: "加载中...";
+}
+
+.cu-load.over::before {
+	content: "\e64a";
+}
+
+.cu-load.over::after {
+	content: "没有更多了";
+}
+
+.cu-load.erro::before {
+	content: "\e658";
+}
+
+.cu-load.erro::after {
+	content: "加载失败";
+}
+
+.cu-load.load-cuIcon::before {
+	font-size: 32upx;
+}
+
+.cu-load.load-cuIcon::after {
+	display: none;
+}
+
+.cu-load.load-cuIcon.over {
+	display: none;
+}
+
+.cu-load.load-modal {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 140upx;
+	left: 0;
+	margin: auto;
+	width: 260upx;
+	height: 260upx;
+	background-color: #ffffff;
+	border-radius: 10upx;
+	box-shadow: 0 0 0upx 2000upx rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	justify-content: center;
+	font-size: 28upx;
+	z-index: 9999;
+	line-height: 2.4em;
+}
+
+.cu-load.load-modal [class*="cuIcon-"] {
+	font-size: 60upx;
+}
+
+.cu-load.load-modal image {
+	width: 70upx;
+	height: 70upx;
+}
+
+.cu-load.load-modal::after {
+	content: "";
+	position: absolute;
+	background-color: #ffffff;
+	border-radius: 50%;
+	width: 200upx;
+	height: 200upx;
+	font-size: 10px;
+	border-top: 6upx solid rgba(0, 0, 0, 0.05);
+	border-right: 6upx solid rgba(0, 0, 0, 0.05);
+	border-bottom: 6upx solid rgba(0, 0, 0, 0.05);
+	border-left: 6upx solid #f37b1d;
+	animation: cuIcon-spin 1s infinite linear;
+	z-index: -1;
+}
+
+.load-progress {
+	pointer-events: none;
+	top: 0;
+	position: fixed;
+	width: 100%;
+	left: 0;
+	z-index: 2000;
+}
+
+.load-progress.hide {
+	display: none;
+}
+
+.load-progress .load-progress-bar {
+	position: relative;
+	width: 100%;
+	height: 4upx;
+	overflow: hidden;
+	transition: all 200ms ease 0s;
+}
+
+.load-progress .load-progress-spinner {
+	position: absolute;
+	top: 10upx;
+	right: 10upx;
+	z-index: 2000;
+	display: block;
+}
+
+.load-progress .load-progress-spinner::after {
+	content: "";
+	display: block;
+	width: 24upx;
+	height: 24upx;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	border: solid 4upx transparent;
+	border-top-color: inherit;
+	border-left-color: inherit;
+	border-radius: 50%;
+	-webkit-animation: load-progress-spinner 0.4s linear infinite;
+	animation: load-progress-spinner 0.4s linear infinite;
+}
+
+@-webkit-keyframes load-progress-spinner {
+	0% {
+		-webkit-transform: rotate(0);
+		transform: rotate(0);
+	}
+
+	100% {
+		-webkit-transform: rotate(360deg);
+		transform: rotate(360deg);
+	}
+}
+
+@keyframes load-progress-spinner {
+	0% {
+		-webkit-transform: rotate(0);
+		transform: rotate(0);
+	}
+
+	100% {
+		-webkit-transform: rotate(360deg);
+		transform: rotate(360deg);
+	}
+}
+
+/* ==================
+          列表
+ ==================== */
+.grayscale {
+	filter: grayscale(1);
+}
+
+.cu-list+.cu-list {
+	margin-top: 30upx
+}
+
+.cu-list>.cu-item {
+	transition: all .6s ease-in-out 0s;
+	transform: translateX(0upx)
+}
+
+.cu-list>.cu-item.move-cur {
+	transform: translateX(-260upx)
+}
+
+.cu-list>.cu-item .move {
+	position: absolute;
+	right: 0;
+	display: flex;
+	width: 260upx;
+	height: 100%;
+	transform: translateX(100%)
+}
+
+.cu-list>.cu-item .move view {
+	display: flex;
+	flex: 1;
+	justify-content: center;
+	align-items: center
+}
+
+.cu-list.menu-avatar {
+	overflow: hidden;
+}
+
+.cu-list.menu-avatar>.cu-item {
+	position: relative;
+	display: flex;
+	padding-right: 10upx;
+	height: 140upx;
+	background-color: #ffffff;
+	justify-content: flex-end;
+	align-items: center
+}
+
+.cu-list.menu-avatar>.cu-item>.cu-avatar {
+	position: absolute;
+	left: 30upx
+}
+
+.cu-list.menu-avatar>.cu-item .flex .text-cut {
+	max-width: 510upx
+}
+
+.cu-list.menu-avatar>.cu-item .content {
+	position: absolute;
+	left: 146upx;
+	width: calc(100% - 96upx - 60upx - 120upx - 20upx);
+	line-height: 1.6em;
+}
+
+.cu-list.menu-avatar>.cu-item .content.flex-sub {
+	width: calc(100% - 96upx - 60upx - 20upx);
+}
+
+.cu-list.menu-avatar>.cu-item .content>view:first-child {
+	font-size: 30upx;
+	display: flex;
+	align-items: center
+}
+
+.cu-list.menu-avatar>.cu-item .content .cu-tag.sm {
+	display: inline-block;
+	margin-left: 10upx;
+	height: 28upx;
+	font-size: 16upx;
+	line-height: 32upx
+}
+
+.cu-list.menu-avatar>.cu-item .action {
+	width: 100upx;
+	text-align: center
+}
+
+.cu-list.menu-avatar>.cu-item .action view+view {
+	margin-top: 10upx
+}
+
+.cu-list.menu-avatar.comment>.cu-item .content {
+	position: relative;
+	left: 0;
+	width: auto;
+	flex: 1;
+}
+
+.cu-list.menu-avatar.comment>.cu-item {
+	padding: 30upx 30upx 30upx 120upx;
+	height: auto
+}
+
+.cu-list.menu-avatar.comment .cu-avatar {
+	align-self: flex-start
+}
+
+.cu-list.menu>.cu-item {
+	position: relative;
+	display: flex;
+	padding: 0 30upx;
+	min-height: 100upx;
+	background-color: #ffffff;
+	justify-content: space-between;
+	align-items: center
+}
+
+.cu-list.menu>.cu-item:last-child:after {
+	border: none
+}
+
+.cu-list.menu-avatar>.cu-item:after,
+.cu-list.menu>.cu-item:after {
+	position: absolute;
+	top: 0;
+	left: 0;
+	box-sizing: border-box;
+	width: 200%;
+	height: 200%;
+	border-bottom: 1upx solid #ddd;
+	border-radius: inherit;
+	content: " ";
+	transform: scale(.5);
+	transform-origin: 0 0;
+	pointer-events: none
+}
+
+.cu-list.menu>.cu-item.grayscale {
+	background-color: #f5f5f5
+}
+
+.cu-list.menu>.cu-item.cur {
+	background-color: #fcf7e9
+}
+
+.cu-list.menu>.cu-item.arrow {
+	padding-right: 90upx
+}
+
+.cu-list.menu>.cu-item.arrow:before {
+	position: absolute;
+	top: 0;
+	right: 30upx;
+	bottom: 0;
+	display: block;
+	margin: auto;
+	width: 30upx;
+	height: 30upx;
+	color: #8799a3;
+	content: "\e6a3";
+	text-align: center;
+	font-size: 34upx;
+	font-family: cuIcon;
+	line-height: 30upx
+}
+
+.cu-list.menu>.cu-item button.content {
+	padding: 0;
+	background-color: transparent;
+	justify-content: flex-start
+}
+
+.cu-list.menu>.cu-item button.content:after {
+	display: none
+}
+
+.cu-list.menu>.cu-item .cu-avatar-group .cu-avatar {
+	border-color: #ffffff
+}
+
+.cu-list.menu>.cu-item .content>view:first-child {
+	display: flex;
+	align-items: center
+}
+
+.cu-list.menu>.cu-item .content>text[class*=cuIcon] {
+	display: inline-block;
+	margin-right: 10upx;
+	width: 1.6em;
+	text-align: center
+}
+
+.cu-list.menu>.cu-item .content>image {
+	display: inline-block;
+	margin-right: 10upx;
+	width: 1.6em;
+	height: 1.6em;
+	vertical-align: middle
+}
+
+.cu-list.menu>.cu-item .content {
+	font-size: 30upx;
+	line-height: 1.6em;
+	flex: 1
+}
+
+.cu-list.menu>.cu-item .content .cu-tag.sm {
+	display: inline-block;
+	margin-left: 10upx;
+	height: 28upx;
+	font-size: 16upx;
+	line-height: 32upx
+}
+
+.cu-list.menu>.cu-item .action .cu-tag:empty {
+	right: 10upx
+}
+
+.cu-list.menu {
+	display: block;
+	overflow: hidden
+}
+
+.cu-list.menu.sm-border>.cu-item:after {
+	left: 30upx;
+	width: calc(200% - 120upx)
+}
+
+.cu-list.grid>.cu-item {
+	position: relative;
+	display: flex;
+	padding: 20upx 0 30upx;
+	transition-duration: 0s;
+	flex-direction: column
+}
+
+.cu-list.grid>.cu-item:after {
+	position: absolute;
+	top: 0;
+	left: 0;
+	box-sizing: border-box;
+	width: 200%;
+	height: 200%;
+	border-right: 1px solid rgba(0, 0, 0, .1);
+	border-bottom: 1px solid rgba(0, 0, 0, .1);
+	border-radius: inherit;
+	content: " ";
+	transform: scale(.5);
+	transform-origin: 0 0;
+	pointer-events: none
+}
+
+.cu-list.grid>.cu-item text {
+	display: block;
+	margin-top: 10upx;
+	color: #888;
+	font-size: 26upx;
+	line-height: 40upx
+}
+
+.cu-list.grid>.cu-item [class*=cuIcon] {
+	position: relative;
+	display: block;
+	margin-top: 20upx;
+	width: 100%;
+	font-size: 48upx
+}
+
+.cu-list.grid>.cu-item .cu-tag {
+	right: auto;
+	left: 50%;
+	margin-left: 20upx
+}
+
+.cu-list.grid {
+	background-color: #ffffff;
+	text-align: center
+}
+
+.cu-list.grid.no-border>.cu-item {
+	padding-top: 10upx;
+	padding-bottom: 20upx
+}
+
+.cu-list.grid.no-border>.cu-item:after {
+	border: none
+}
+
+.cu-list.grid.no-border {
+	padding: 20upx 10upx
+}
+
+.cu-list.grid.col-3>.cu-item:nth-child(3n):after,
+.cu-list.grid.col-4>.cu-item:nth-child(4n):after,
+.cu-list.grid.col-5>.cu-item:nth-child(5n):after {
+	border-right-width: 0
+}
+
+.cu-list.card-menu {
+	overflow: hidden;
+	margin-right: 30upx;
+	margin-left: 30upx;
+	border-radius: 20upx
+}
+
+
+/* ==================
+          操作条
+ ==================== */
+
+.cu-bar {
+	display: flex;
+	position: relative;
+	align-items: center;
+	min-height: 100upx;
+	justify-content: space-between;
+}
+
+.cu-bar .action {
+	display: flex;
+	align-items: center;
+	height: 100%;
+	justify-content: center;
+	max-width: 100%;
+}
+
+.cu-bar .action.border-title {
+	position: relative;
+	top: -10upx;
+}
+
+.cu-bar .action.border-title text[class*="bg-"]:last-child {
+	position: absolute;
+	bottom: -0.5rem;
+	min-width: 2rem;
+	height: 6upx;
+	left: 0;
+}
+
+.cu-bar .action.sub-title {
+	position: relative;
+	top: -0.2rem;
+}
+
+.cu-bar .action.sub-title text {
+	position: relative;
+	z-index: 1;
+}
+
+.cu-bar .action.sub-title text[class*="bg-"]:last-child {
+	position: absolute;
+	display: inline-block;
+	bottom: -0.2rem;
+	border-radius: 6upx;
+	width: 100%;
+	height: 0.6rem;
+	left: 0.6rem;
+	opacity: 0.3;
+	z-index: 0;
+}
+
+.cu-bar .action.sub-title text[class*="text-"]:last-child {
+	position: absolute;
+	display: inline-block;
+	bottom: -0.7rem;
+	left: 0.5rem;
+	opacity: 0.2;
+	z-index: 0;
+	text-align: right;
+	font-weight: 900;
+	font-size: 36upx;
+}
+
+.cu-bar.justify-center .action.border-title text:last-child,
+.cu-bar.justify-center .action.sub-title text:last-child {
+	left: 0;
+	right: 0;
+	margin: auto;
+	text-align: center;
+}
+
+.cu-bar .action:first-child {
+	margin-left: 30upx;
+	font-size: 30upx;
+}
+
+.cu-bar .action text.text-cut {
+	text-align: left;
+	width: 100%;
+}
+
+.cu-bar .cu-avatar:first-child {
+	margin-left: 20upx;
+}
+
+.cu-bar .action:first-child>text[class*="cuIcon-"] {
+	margin-left: -0.3em;
+	margin-right: 0.3em;
+}
+
+.cu-bar .action:last-child {
+	margin-right: 30upx;
+}
+
+.cu-bar .action>text[class*="cuIcon-"],
+.cu-bar .action>view[class*="cuIcon-"] {
+	font-size: 36upx;
+}
+
+.cu-bar .action>text[class*="cuIcon-"]+text[class*="cuIcon-"] {
+	margin-left: 0.5em;
+}
+
+.cu-bar .content {
+	position: absolute;
+	text-align: center;
+	width: calc(100% - 340upx);
+	left: 0;
+	right: 0;
+	bottom: 0;
+	top: 0;
+	margin: auto;
+	height: 60upx;
+	font-size: 32upx;
+	line-height: 60upx;
+	cursor: none;
+	pointer-events: none;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.cu-bar.ios .content {
+	bottom: 7px;
+	height: 30px;
+	font-size: 32upx;
+	line-height: 30px;
+}
+
+.cu-bar.btn-group {
+	justify-content: space-around;
+}
+
+.cu-bar.btn-group button {
+	padding: 20upx 32upx;
+}
+
+.cu-bar.btn-group button {
+	flex: 1;
+	margin: 0 20upx;
+	max-width: 50%;
+}
+
+.cu-bar .search-form {
+	background-color: #f5f5f5;
+	line-height: 64upx;
+	height: 64upx;
+	font-size: 24upx;
+	color: #333333;
+	flex: 1;
+	display: flex;
+	align-items: center;
+	margin: 0 30upx;
+}
+
+.cu-bar .search-form+.action {
+	margin-right: 30upx;
+}
+
+.cu-bar .search-form input {
+	flex: 1;
+	padding-right: 30upx;
+	height: 64upx;
+	line-height: 64upx;
+	font-size: 26upx;
+	background-color: transparent;
+}
+
+.cu-bar .search-form [class*="cuIcon-"] {
+	margin: 0 0.5em 0 0.8em;
+}
+
+.cu-bar .search-form [class*="cuIcon-"]::before {
+	top: 0upx;
+}
+
+.cu-bar.fixed,
+.nav.fixed {
+	position: fixed;
+	width: 100%;
+	top: 0;
+	z-index: 1024;
+	box-shadow: 0 1upx 6upx rgba(0, 0, 0, 0.1);
+}
+
+.cu-bar.foot {
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	z-index: 1024;
+	box-shadow: 0 -1upx 6upx rgba(0, 0, 0, 0.1);
+}
+
+.cu-bar.tabbar {
+	padding: 0;
+	height: calc(100upx + env(safe-area-inset-bottom) / 2);
+	padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+}
+
+.cu-tabbar-height {
+	min-height: 100upx;
+	height: calc(100upx + env(safe-area-inset-bottom) / 2);
+}
+
+.cu-bar.tabbar.shadow {
+	box-shadow: 0 -1upx 6upx rgba(0, 0, 0, 0.1);
+}
+
+.cu-bar.tabbar .action {
+	font-size: 22upx;
+	position: relative;
+	flex: 1;
+	text-align: center;
+	padding: 0;
+	display: block;
+	height: auto;
+	line-height: 1;
+	margin: 0;
+	background-color: inherit;
+	overflow: initial;
+}
+
+.cu-bar.tabbar.shop .action {
+	width: 140upx;
+	flex: initial;
+}
+
+.cu-bar.tabbar .action.add-action {
+	position: relative;
+	z-index: 2;
+	padding-top: 50upx;
+}
+
+.cu-bar.tabbar .action.add-action [class*="cuIcon-"] {
+	position: absolute;
+	width: 70upx;
+	z-index: 2;
+	height: 70upx;
+	border-radius: 50%;
+	line-height: 70upx;
+	font-size: 50upx;
+	top: -35upx;
+	left: 0;
+	right: 0;
+	margin: auto;
+	padding: 0;
+}
+
+.cu-bar.tabbar .action.add-action::after {
+	content: "";
+	position: absolute;
+	width: 100upx;
+	height: 100upx;
+	top: -50upx;
+	left: 0;
+	right: 0;
+	margin: auto;
+	box-shadow: 0 -3upx 8upx rgba(0, 0, 0, 0.08);
+	border-radius: 50upx;
+	background-color: inherit;
+	z-index: 0;
+}
+
+.cu-bar.tabbar .action.add-action::before {
+	content: "";
+	position: absolute;
+	width: 100upx;
+	height: 30upx;
+	bottom: 30upx;
+	left: 0;
+	right: 0;
+	margin: auto;
+	background-color: inherit;
+	z-index: 1;
+}
+
+.cu-bar.tabbar .btn-group {
+	flex: 1;
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	padding: 0 10upx;
+}
+
+.cu-bar.tabbar button.action::after {
+	border: 0;
+}
+
+.cu-bar.tabbar .action [class*="cuIcon-"] {
+	width: 100upx;
+	position: relative;
+	display: block;
+	height: auto;
+	margin: 0 auto 10upx;
+	text-align: center;
+	font-size: 40upx;
+}
+
+.cu-bar.tabbar .action .cuIcon-cu-image {
+	margin: 0 auto;
+}
+
+.cu-bar.tabbar .action .cuIcon-cu-image image {
+	width: 50upx;
+	height: 50upx;
+	display: inline-block;
+}
+
+.cu-bar.tabbar .submit {
+	align-items: center;
+	display: flex;
+	justify-content: center;
+	text-align: center;
+	position: relative;
+	flex: 2;
+	align-self: stretch;
+}
+
+.cu-bar.tabbar .submit:last-child {
+	flex: 2.6;
+}
+
+.cu-bar.tabbar .submit+.submit {
+	flex: 2;
+}
+
+.cu-bar.tabbar.border .action::before {
+	content: " ";
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	border-right: 1upx solid rgba(0, 0, 0, 0.1);
+	z-index: 3;
+}
+
+.cu-bar.tabbar.border .action:last-child:before {
+	display: none;
+}
+
+.cu-bar.input {
+	padding-right: 20upx;
+	background-color: #ffffff;
+}
+
+.cu-bar.input input {
+	overflow: initial;
+	line-height: 64upx;
+	height: 64upx;
+	min-height: 64upx;
+	flex: 1;
+	font-size: 30upx;
+	margin: 0 20upx;
+}
+
+.cu-bar.input .action {
+	margin-left: 20upx;
+}
+
+.cu-bar.input .action [class*="cuIcon-"] {
+	font-size: 48upx;
+}
+
+.cu-bar.input input+.action {
+	margin-right: 20upx;
+	margin-left: 0upx;
+}
+
+.cu-bar.input .action:first-child [class*="cuIcon-"] {
+	margin-left: 0upx;
+}
+
+.cu-custom {
+	display: block;
+	position: relative;
+}
+
+.cu-custom .cu-bar .content {
+	width: calc(100% - 440upx);
+}
+
+/* #ifdef MP-ALIPAY */
+.cu-custom .cu-bar .action .cuIcon-back {
+	opacity: 0;
+}
+
+/* #endif */
+
+.cu-custom .cu-bar .content image {
+	height: 60upx;
+	width: 240upx;
+}
+
+.cu-custom .cu-bar {
+	min-height: 0px;
+	/* #ifdef MP-WEIXIN */
+	padding-right: 220upx;
+	/* #endif */
+	/* #ifdef MP-ALIPAY */
+	padding-right: 150upx;
+	/* #endif */
+	box-shadow: 0upx 0upx 0upx;
+	z-index: 9999;
+}
+
+.cu-custom .cu-bar .border-custom {
+	position: relative;
+	background: rgba(0, 0, 0, 0.15);
+	border-radius: 1000upx;
+	height: 30px;
+}
+
+.cu-custom .cu-bar .border-custom::after {
+	content: " ";
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border-radius: inherit;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	pointer-events: none;
+	box-sizing: border-box;
+	border: 1upx solid #ffffff;
+	opacity: 0.5;
+}
+
+.cu-custom .cu-bar .border-custom::before {
+	content: " ";
+	width: 1upx;
+	height: 110%;
+	position: absolute;
+	top: 22.5%;
+	left: 0;
+	right: 0;
+	margin: auto;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	pointer-events: none;
+	box-sizing: border-box;
+	opacity: 0.6;
+	background-color: #ffffff;
+}
+
+.cu-custom .cu-bar .border-custom text {
+	display: block;
+	flex: 1;
+	margin: auto !important;
+	text-align: center;
+	font-size: 34upx;
+}
+
+/* ==================
+         导航栏
+ ==================== */
+
+.nav {
+	white-space: nowrap;
+}
+
+::-webkit-scrollbar {
+	display: none;
+}
+
+.nav .cu-item {
+	height: 90upx;
+	display: inline-block;
+	line-height: 90upx;
+	margin: 0 10upx;
+	padding: 0 20upx;
+}
+
+.nav .cu-item.cur {
+	border-bottom: 4upx solid;
+}
+
+/* ==================
+         时间轴
+ ==================== */
+
+.cu-timeline {
+	display: block;
+	background-color: #ffffff;
+}
+
+.cu-timeline .cu-time {
+	width: 120upx;
+	text-align: center;
+	padding: 20upx 0;
+	font-size: 26upx;
+	color: #888;
+	display: block;
+}
+
+.cu-timeline>.cu-item {
+	padding: 30upx 30upx 30upx 120upx;
+	position: relative;
+	display: block;
+	z-index: 0;
+}
+
+.cu-timeline>.cu-item:not([class*="text-"]) {
+	color: #ccc;
+}
+
+.cu-timeline>.cu-item::after {
+	content: "";
+	display: block;
+	position: absolute;
+	width: 1upx;
+	background-color: #ddd;
+	left: 60upx;
+	height: 100%;
+	top: 0;
+	z-index: 8;
+}
+
+.cu-timeline>.cu-item::before {
+	font-family: "cuIcon";
+	display: block;
+	position: absolute;
+	top: 36upx;
+	z-index: 9;
+	background-color: #ffffff;
+	width: 50upx;
+	height: 50upx;
+	text-align: center;
+	border: none;
+	line-height: 50upx;
+	left: 36upx;
+}
+
+.cu-timeline>.cu-item:not([class*="cuIcon-"])::before {
+	content: "\e763";
+}
+
+.cu-timeline>.cu-item[class*="cuIcon-"]::before {
+	background-color: #ffffff;
+	width: 50upx;
+	height: 50upx;
+	text-align: center;
+	border: none;
+	line-height: 50upx;
+	left: 36upx;
+}
+
+.cu-timeline>.cu-item>.content {
+	padding: 30upx;
+	border-radius: 6upx;
+	display: block;
+	line-height: 1.6;
+}
+
+.cu-timeline>.cu-item>.content:not([class*="bg-"]) {
+	background-color: #f1f1f1;
+	color: #333333;
+}
+
+.cu-timeline>.cu-item>.content+.content {
+	margin-top: 20upx;
+}
+
+/* ==================
+         聊天
+ ==================== */
+
+.cu-chat {
+	display: flex;
+	flex-direction: column;
+}
+
+.cu-chat .cu-item {
+	display: flex;
+	padding: 30upx 30upx 70upx;
+	position: relative;
+}
+
+.cu-chat .cu-item>.cu-avatar {
+	width: 80upx;
+	height: 80upx;
+}
+
+.cu-chat .cu-item>.main {
+	max-width: calc(100% - 260upx);
+	margin: 0 40upx;
+	display: flex;
+	align-items: center;
+}
+
+.cu-chat .cu-item>image {
+	height: 320upx;
+}
+
+.cu-chat .cu-item>.main .content {
+	padding: 20upx;
+	border-radius: 6upx;
+	display: inline-flex;
+	max-width: 100%;
+	align-items: center;
+	font-size: 30upx;
+	position: relative;
+	min-height: 80upx;
+	line-height: 40upx;
+	text-align: left;
+}
+
+.cu-chat .cu-item>.main .content:not([class*="bg-"]) {
+	background-color: #ffffff;
+	color: #333333;
+}
+
+.cu-chat .cu-item .date {
+	position: absolute;
+	font-size: 24upx;
+	color: #8799a3;
+	width: calc(100% - 320upx);
+	bottom: 20upx;
+	left: 160upx;
+}
+
+.cu-chat .cu-item .action {
+	padding: 0 30upx;
+	display: flex;
+	align-items: center;
+}
+
+.cu-chat .cu-item>.main .content::after {
+	content: "";
+	top: 27upx;
+	transform: rotate(45deg);
+	position: absolute;
+	z-index: 100;
+	display: inline-block;
+	overflow: hidden;
+	width: 24upx;
+	height: 24upx;
+	left: -12upx;
+	right: initial;
+	background-color: inherit;
+}
+
+.cu-chat .cu-item.self>.main .content::after {
+	left: auto;
+	right: -12upx;
+}
+
+.cu-chat .cu-item>.main .content::before {
+	content: "";
+	top: 30upx;
+	transform: rotate(45deg);
+	position: absolute;
+	z-index: -1;
+	display: inline-block;
+	overflow: hidden;
+	width: 24upx;
+	height: 24upx;
+	left: -12upx;
+	right: initial;
+	background-color: inherit;
+	filter: blur(5upx);
+	opacity: 0.3;
+}
+
+.cu-chat .cu-item>.main .content:not([class*="bg-"])::before {
+	background-color: #333333;
+	opacity: 0.1;
+}
+
+.cu-chat .cu-item.self>.main .content::before {
+	left: auto;
+	right: -12upx;
+}
+
+.cu-chat .cu-item.self {
+	justify-content: flex-end;
+	text-align: right;
+}
+
+.cu-chat .cu-info {
+	display: inline-block;
+	margin: 20upx auto;
+	font-size: 24upx;
+	padding: 8upx 12upx;
+	background-color: rgba(0, 0, 0, 0.2);
+	border-radius: 6upx;
+	color: #ffffff;
+	max-width: 400upx;
+	line-height: 1.4;
+}
+
+/* ==================
+         卡片
+ ==================== */
+
+.cu-card {
+	display: block;
+	overflow: hidden;
+}
+
+.cu-card>.cu-item {
+	display: block;
+	background-color: #ffffff;
+	overflow: hidden;
+	border-radius: 10upx;
+	margin: 30upx;
+}
+
+.cu-card>.cu-item.shadow-blur {
+	overflow: initial;
+}
+
+.cu-card.no-card>.cu-item {
+	margin: 0upx;
+	border-radius: 0upx;
+}
+
+.cu-card .grid.grid-square {
+	margin-bottom: -20upx;
+}
+
+.cu-card.case .image {
+	position: relative;
+}
+
+.cu-card.case .image image {
+	width: 100%;
+}
+
+.cu-card.case .image .cu-tag {
+	position: absolute;
+	right: 0;
+	top: 0;
+}
+
+.cu-card.case .image .cu-bar {
+	position: absolute;
+	bottom: 0;
+	width: 100%;
+	background-color: transparent;
+	padding: 0upx 30upx;
+}
+
+.cu-card.case.no-card .image {
+	margin: 30upx 30upx 0;
+	overflow: hidden;
+	border-radius: 10upx;
+}
+
+.cu-card.dynamic {
+	display: block;
+}
+
+.cu-card.dynamic>.cu-item {
+	display: block;
+	background-color: #ffffff;
+	overflow: hidden;
+}
+
+.cu-card.dynamic>.cu-item>.text-content {
+	padding: 0 30upx 0;
+	max-height: 6.4em;
+	overflow: hidden;
+	font-size: 30upx;
+	margin-bottom: 20upx;
+}
+
+.cu-card.dynamic>.cu-item .square-img {
+	width: 100%;
+	height: 200upx;
+	border-radius: 6upx;
+}
+
+.cu-card.dynamic>.cu-item .only-img {
+	width: 100%;
+	height: 320upx;
+	border-radius: 6upx;
+}
+
+/* card.dynamic>.cu-item .comment {
+  padding: 20upx;
+  background-color: #f1f1f1;
+  margin: 0 30upx 30upx;
+  border-radius: 6upx;
+} */
+
+.cu-card.article {
+	display: block;
+}
+
+.cu-card.article>.cu-item {
+	padding-bottom: 30upx;
+}
+
+.cu-card.article>.cu-item .title {
+	font-size: 30upx;
+	font-weight: 900;
+	color: #333333;
+	line-height: 100upx;
+	padding: 0 30upx;
+}
+
+.cu-card.article>.cu-item .content {
+	display: flex;
+	padding: 0 30upx;
+}
+
+.cu-card.article>.cu-item .content>image {
+	width: 240upx;
+	height: 6.4em;
+	margin-right: 20upx;
+	border-radius: 6upx;
+}
+
+.cu-card.article>.cu-item .content .desc {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.cu-card.article>.cu-item .content .text-content {
+	font-size: 28upx;
+	color: #888;
+	height: 4.8em;
+	overflow: hidden;
+}
+
+/* ==================
+         表单
+ ==================== */
+
+.cu-form-group {
+	background-color: #ffffff;
+	padding: 1upx 30upx;
+	display: flex;
+	align-items: center;
+	min-height: 100upx;
+	justify-content: space-between;
+}
+
+.cu-form-group+.cu-form-group {
+	border-top: 1upx solid #eee;
+}
+
+.cu-form-group .title {
+	text-align: justify;
+	padding-right: 30upx;
+	font-size: 30upx;
+	position: relative;
+	height: 60upx;
+	line-height: 60upx;
+}
+
+.cu-form-group input {
+	flex: 1;
+	font-size: 30upx;
+	color: #555;
+	padding-right: 20upx;
+}
+
+.cu-form-group>text[class*="cuIcon-"] {
+	font-size: 36upx;
+	padding: 0;
+	box-sizing: border-box;
+}
+
+.cu-form-group textarea {
+	margin: 32upx 0 30upx;
+	height: 4.6em;
+	width: 100%;
+	line-height: 1.2em;
+	flex: 1;
+	font-size: 28upx;
+	padding: 0;
+}
+
+.cu-form-group.align-start .title {
+	height: 1em;
+	margin-top: 32upx;
+	line-height: 1em;
+}
+
+.cu-form-group picker {
+	flex: 1;
+	padding-right: 40upx;
+	overflow: hidden;
+	position: relative;
+}
+
+.cu-form-group picker .picker {
+	line-height: 100upx;
+	font-size: 28upx;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+	width: 100%;
+	text-align: right;
+}
+
+.cu-form-group picker::after {
+	font-family: cuIcon;
+	display: block;
+	content: "\e6a3";
+	position: absolute;
+	font-size: 34upx;
+	color: #8799a3;
+	line-height: 100upx;
+	width: 60upx;
+	text-align: center;
+	top: 0;
+	bottom: 0;
+	right: -20upx;
+	margin: auto;
+}
+
+.cu-form-group textarea[disabled],
+.cu-form-group textarea[disabled] .placeholder {
+	color: transparent;
+}
+
+/* ==================
+         模态窗口
+ ==================== */
+
+.cu-modal {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1110;
+	opacity: 0;
+	outline: 0;
+	text-align: center;
+	-ms-transform: scale(1.185);
+	transform: scale(1.185);
+	backface-visibility: hidden;
+	perspective: 2000upx;
+	background: rgba(0, 0, 0, 0.6);
+	transition: all 0.3s ease-in-out 0s;
+	pointer-events: none;
+}
+
+.cu-modal::before {
+	content: "\200B";
+	display: inline-block;
+	height: 100%;
+	vertical-align: middle;
+}
+
+.cu-modal.show {
+	opacity: 1;
+	transition-duration: 0.3s;
+	-ms-transform: scale(1);
+	transform: scale(1);
+	overflow-x: hidden;
+	overflow-y: auto;
+	pointer-events: auto;
+}
+
+.cu-dialog {
+	position: relative;
+	display: inline-block;
+	vertical-align: middle;
+	margin-left: auto;
+	margin-right: auto;
+	width: 680upx;
+	max-width: 100%;
+	background-color: #f8f8f8;
+	border-radius: 10upx;
+	overflow: hidden;
+}
+
+.cu-modal.bottom-modal::before {
+	vertical-align: bottom;
+}
+
+.cu-modal.bottom-modal .cu-dialog {
+	width: 100%;
+	border-radius: 0;
+}
+
+.cu-modal.bottom-modal {
+	margin-bottom: -1000upx;
+}
+
+.cu-modal.bottom-modal.show {
+	margin-bottom: 0;
+}
+
+.cu-modal.drawer-modal {
+	transform: scale(1);
+	display: flex;
+}
+
+.cu-modal.drawer-modal .cu-dialog {
+	height: 100%;
+	min-width: 200upx;
+	border-radius: 0;
+	margin: initial;
+	transition-duration: 0.3s;
+}
+
+.cu-modal.drawer-modal.justify-start .cu-dialog {
+	transform: translateX(-100%);
+}
+
+.cu-modal.drawer-modal.justify-end .cu-dialog {
+	transform: translateX(100%);
+}
+
+.cu-modal.drawer-modal.show .cu-dialog {
+	transform: translateX(0%);
+}
+.cu-modal .cu-dialog>.cu-bar:first-child .action{
+  min-width: 100rpx;
+  margin-right: 0;
+  min-height: 100rpx;
+}
+/* ==================
+         轮播
+ ==================== */
+swiper .a-swiper-dot {
+	display: inline-block;
+	width: 16upx;
+	height: 16upx;
+	background: rgba(0, 0, 0, .3);
+	border-radius: 50%;
+	vertical-align: middle;
+}
+
+swiper[class*="-dot"] .wx-swiper-dots,
+swiper[class*="-dot"] .a-swiper-dots,
+swiper[class*="-dot"] .uni-swiper-dots {
+	display: flex;
+	align-items: center;
+	width: 100%;
+	justify-content: center;
+}
+
+swiper.square-dot .wx-swiper-dot,
+swiper.square-dot .a-swiper-dot,
+swiper.square-dot .uni-swiper-dot {
+	background-color: #ffffff;
+	opacity: 0.4;
+	width: 10upx;
+	height: 10upx;
+	border-radius: 20upx;
+	margin: 0 8upx !important;
+}
+
+swiper.square-dot .wx-swiper-dot.wx-swiper-dot-active,
+swiper.square-dot .a-swiper-dot.a-swiper-dot-active,
+swiper.square-dot .uni-swiper-dot.uni-swiper-dot-active {
+	opacity: 1;
+	width: 30upx;
+}
+
+swiper.round-dot .wx-swiper-dot,
+swiper.round-dot .a-swiper-dot,
+swiper.round-dot .uni-swiper-dot {
+	width: 10upx;
+	height: 10upx;
+	position: relative;
+	margin: 4upx 8upx !important;
+}
+
+swiper.round-dot .wx-swiper-dot.wx-swiper-dot-active::after,
+swiper.round-dot .a-swiper-dot.a-swiper-dot-active::after,
+swiper.round-dot .uni-swiper-dot.uni-swiper-dot-active::after {
+	content: "";
+	position: absolute;
+	width: 10upx;
+	height: 10upx;
+	top: 0upx;
+	left: 0upx;
+	right: 0;
+	bottom: 0;
+	margin: auto;
+	background-color: #ffffff;
+	border-radius: 20upx;
+}
+
+swiper.round-dot .wx-swiper-dot.wx-swiper-dot-active,
+swiper.round-dot .a-swiper-dot.a-swiper-dot-active,
+swiper.round-dot .uni-swiper-dot.uni-swiper-dot-active {
+	width: 18upx;
+	height: 18upx;
+}
+
+.screen-swiper {
+	min-height: 375upx;
+}
+
+.screen-swiper image,
+.screen-swiper video,
+.swiper-item image,
+.swiper-item video {
+	width: 100%;
+	display: block;
+	height: 100%;
+	margin: 0;
+	pointer-events: none;
+}
+
+.card-swiper {
+	height: 420upx !important;
+}
+
+.card-swiper swiper-item {
+	width: 610upx !important;
+	left: 70upx;
+	box-sizing: border-box;
+	padding: 40upx 0upx 70upx;
+	overflow: initial;
+}
+
+.card-swiper swiper-item .swiper-item {
+	width: 100%;
+	display: block;
+	height: 100%;
+	border-radius: 10upx;
+	transform: scale(0.9);
+	transition: all 0.2s ease-in 0s;
+	overflow: hidden;
+}
+
+.card-swiper swiper-item.cur .swiper-item {
+	transform: none;
+	transition: all 0.2s ease-in 0s;
+}
+
+
+.tower-swiper {
+	height: 420upx;
+	position: relative;
+	max-width: 750upx;
+	overflow: hidden;
+}
+
+.tower-swiper .tower-item {
+	position: absolute;
+	width: 300upx;
+	height: 380upx;
+	top: 0;
+	bottom: 0;
+	left: 50%;
+	margin: auto;
+	transition: all 0.2s ease-in 0s;
+	opacity: 1;
+}
+
+.tower-swiper .tower-item.none {
+	opacity: 0;
+}
+
+.tower-swiper .tower-item .swiper-item {
+	width: 100%;
+	height: 100%;
+	border-radius: 6upx;
+	overflow: hidden;
+}
+
+/* ==================
+          步骤条
+ ==================== */
+
+.cu-steps {
+	display: flex;
+}
+
+scroll-view.cu-steps {
+	display: block;
+	white-space: nowrap;
+}
+
+scroll-view.cu-steps .cu-item {
+	display: inline-block;
+}
+
+.cu-steps .cu-item {
+	flex: 1;
+	text-align: center;
+	position: relative;
+	min-width: 100upx;
+}
+
+.cu-steps .cu-item:not([class*="text-"]) {
+	color: #8799a3;
+}
+
+.cu-steps .cu-item [class*="cuIcon-"],
+.cu-steps .cu-item .num {
+	display: block;
+	font-size: 40upx;
+	line-height: 80upx;
+}
+
+.cu-steps .cu-item::before,
+.cu-steps .cu-item::after,
+.cu-steps.steps-arrow .cu-item::before,
+.cu-steps.steps-arrow .cu-item::after {
+	content: "";
+	display: block;
+	position: absolute;
+	height: 0px;
+	width: calc(100% - 80upx);
+	border-bottom: 1px solid #ccc;
+	left: calc(0px - (100% - 80upx) / 2);
+	top: 40upx;
+	z-index: 0;
+}
+
+.cu-steps.steps-arrow .cu-item::before,
+.cu-steps.steps-arrow .cu-item::after {
+	content: "\e6a3";
+	font-family: 'cuIcon';
+	height: 30upx;
+	border-bottom-width: 0px;
+	line-height: 30upx;
+	top: 0;
+	bottom: 0;
+	margin: auto;
+	color: #ccc;
+}
+
+.cu-steps.steps-bottom .cu-item::before,
+.cu-steps.steps-bottom .cu-item::after {
+	bottom: 40upx;
+	top: initial;
+}
+
+.cu-steps .cu-item::after {
+	border-bottom: 1px solid currentColor;
+	width: 0px;
+	transition: all 0.3s ease-in-out 0s;
+}
+
+.cu-steps .cu-item[class*="text-"]::after {
+	width: calc(100% - 80upx);
+	color: currentColor;
+}
+
+.cu-steps .cu-item:first-child::before,
+.cu-steps .cu-item:first-child::after {
+	display: none;
+}
+
+.cu-steps .cu-item .num {
+	width: 40upx;
+	height: 40upx;
+	border-radius: 50%;
+	line-height: 40upx;
+	margin: 20upx auto;
+	font-size: 24upx;
+	border: 1px solid currentColor;
+	position: relative;
+	overflow: hidden;
+}
+
+.cu-steps .cu-item[class*="text-"] .num {
+	background-color: currentColor;
+}
+
+.cu-steps .cu-item .num::before,
+.cu-steps .cu-item .num::after {
+	content: attr(data-index);
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	margin: auto;
+	transition: all 0.3s ease-in-out 0s;
+	transform: translateY(0upx);
+}
+
+.cu-steps .cu-item[class*="text-"] .num::before {
+	transform: translateY(-40upx);
+	color: #ffffff;
+}
+
+.cu-steps .cu-item .num::after {
+	transform: translateY(40upx);
+	color: #ffffff;
+	transition: all 0.3s ease-in-out 0s;
+}
+
+.cu-steps .cu-item[class*="text-"] .num::after {
+	content: "\e645";
+	font-family: 'cuIcon';
+	color: #ffffff;
+	transform: translateY(0upx);
+}
+
+.cu-steps .cu-item[class*="text-"] .num.err::after {
+	content: "\e646";
+}
+
+/* ==================
+          布局
+ ==================== */
+
+/*  -- flex弹性布局 -- */
+
+.flex {
+	display: flex;
+}
+
+.basis-xs {
+	flex-basis: 20%;
+}
+
+.basis-sm {
+	flex-basis: 40%;
+}
+
+.basis-df {
+	flex-basis: 50%;
+}
+
+.basis-lg {
+	flex-basis: 60%;
+}
+
+.basis-xl {
+	flex-basis: 80%;
+}
+
+.flex-sub {
+	flex: 1;
+}
+
+.flex-twice {
+	flex: 2;
+}
+
+.flex-treble {
+	flex: 3;
+}
+
+.flex-direction {
+	flex-direction: column;
+}
+
+.flex-wrap {
+	flex-wrap: wrap;
+}
+
+.align-start {
+	align-items: flex-start;
+}
+
+.align-end {
+	align-items: flex-end;
+}
+
+.align-center {
+	align-items: center;
+}
+
+.align-stretch {
+	align-items: stretch;
+}
+
+.self-start {
+	align-self: flex-start;
+}
+
+.self-center {
+	align-self: flex-center;
+}
+
+.self-end {
+	align-self: flex-end;
+}
+
+.self-stretch {
+	align-self: stretch;
+}
+
+.align-stretch {
+	align-items: stretch;
+}
+
+.justify-start {
+	justify-content: flex-start;
+}
+
+.justify-end {
+	justify-content: flex-end;
+}
+
+.justify-center {
+	justify-content: center;
+}
+
+.justify-between {
+	justify-content: space-between;
+}
+
+.justify-around {
+	justify-content: space-around;
+}
+
+/* grid布局 */
+
+.grid {
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.grid.grid-square {
+	overflow: hidden;
+}
+
+.grid.grid-square .cu-tag {
+	position: absolute;
+	right: 0;
+	top: 0;
+	border-bottom-left-radius: 6upx;
+	padding: 6upx 12upx;
+	height: auto;
+	background-color: rgba(0, 0, 0, 0.5);
+}
+
+.grid.grid-square>view>text[class*="cuIcon-"] {
+	font-size: 52upx;
+	position: absolute;
+	color: #8799a3;
+	margin: auto;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-direction: column;
+}
+
+.grid.grid-square>view {
+	margin-right: 20upx;
+	margin-bottom: 20upx;
+	border-radius: 6upx;
+	position: relative;
+	overflow: hidden;
+}
+.grid.grid-square>view.bg-img image {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+}
+.grid.col-1.grid-square>view {
+	padding-bottom: 100%;
+	height: 0;
+	margin-right: 0;
+}
+
+.grid.col-2.grid-square>view {
+	padding-bottom: calc((100% - 20upx)/2);
+	height: 0;
+	width: calc((100% - 20upx)/2);
+}
+
+.grid.col-3.grid-square>view {
+	padding-bottom: calc((100% - 40upx)/3);
+	height: 0;
+	width: calc((100% - 40upx)/3);
+}
+
+.grid.col-4.grid-square>view {
+	padding-bottom: calc((100% - 60upx)/4);
+	height: 0;
+	width: calc((100% - 60upx)/4);
+}
+
+.grid.col-5.grid-square>view {
+	padding-bottom: calc((100% - 80upx)/5);
+	height: 0;
+	width: calc((100% - 80upx)/5);
+}
+
+.grid.col-2.grid-square>view:nth-child(2n),
+.grid.col-3.grid-square>view:nth-child(3n),
+.grid.col-4.grid-square>view:nth-child(4n),
+.grid.col-5.grid-square>view:nth-child(5n) {
+	margin-right: 0;
+}
+
+.grid.col-1>view {
+	width: 100%;
+}
+
+.grid.col-2>view {
+	width: 50%;
+}
+
+.grid.col-3>view {
+	width: 33.33%;
+}
+
+.grid.col-4>view {
+	width: 25%;
+}
+
+.grid.col-5>view {
+	width: 20%;
+}
+
+/*  -- 内外边距 -- */
+
+.margin-0 {
+	margin: 0;
+}
+
+.margin-xs {
+	margin: 10upx;
+}
+
+.margin-sm {
+	margin: 20upx;
+}
+
+.margin {
+	margin: 30upx;
+}
+
+.margin-lg {
+	margin: 40upx;
+}
+
+.margin-xl {
+	margin: 50upx;
+}
+
+.margin-top-xs {
+	margin-top: 10upx;
+}
+
+.margin-top-sm {
+	margin-top: 20upx;
+}
+
+.margin-top {
+	margin-top: 30upx;
+}
+
+.margin-top-lg {
+	margin-top: 40upx;
+}
+
+.margin-top-xl {
+	margin-top: 50upx;
+}
+
+.margin-right-xs {
+	margin-right: 10upx;
+}
+
+.margin-right-sm {
+	margin-right: 20upx;
+}
+
+.margin-right {
+	margin-right: 30upx;
+}
+
+.margin-right-lg {
+	margin-right: 40upx;
+}
+
+.margin-right-xl {
+	margin-right: 50upx;
+}
+
+.margin-bottom-xs {
+	margin-bottom: 10upx;
+}
+
+.margin-bottom-sm {
+	margin-bottom: 20upx;
+}
+
+.margin-bottom {
+	margin-bottom: 30upx;
+}
+
+.margin-bottom-lg {
+	margin-bottom: 40upx;
+}
+
+.margin-bottom-xl {
+	margin-bottom: 50upx;
+}
+
+.margin-left-xs {
+	margin-left: 10upx;
+}
+
+.margin-left-sm {
+	margin-left: 20upx;
+}
+
+.margin-left {
+	margin-left: 30upx;
+}
+
+.margin-left-lg {
+	margin-left: 40upx;
+}
+
+.margin-left-xl {
+	margin-left: 50upx;
+}
+
+.margin-lr-xs {
+	margin-left: 10upx;
+	margin-right: 10upx;
+}
+
+.margin-lr-sm {
+	margin-left: 20upx;
+	margin-right: 20upx;
+}
+
+.margin-lr {
+	margin-left: 30upx;
+	margin-right: 30upx;
+}
+
+.margin-lr-lg {
+	margin-left: 40upx;
+	margin-right: 40upx;
+}
+
+.margin-lr-xl {
+	margin-left: 50upx;
+	margin-right: 50upx;
+}
+
+.margin-tb-xs {
+	margin-top: 10upx;
+	margin-bottom: 10upx;
+}
+
+.margin-tb-sm {
+	margin-top: 20upx;
+	margin-bottom: 20upx;
+}
+
+.margin-tb {
+	margin-top: 30upx;
+	margin-bottom: 30upx;
+}
+
+.margin-tb-lg {
+	margin-top: 40upx;
+	margin-bottom: 40upx;
+}
+
+.margin-tb-xl {
+	margin-top: 50upx;
+	margin-bottom: 50upx;
+}
+
+.padding-0 {
+	padding: 0;
+}
+
+.padding-xs {
+	padding: 10upx;
+}
+
+.padding-sm {
+	padding: 20upx;
+}
+
+.padding {
+	padding: 30upx;
+}
+
+.padding-lg {
+	padding: 40upx;
+}
+
+.padding-xl {
+	padding: 50upx;
+}
+
+.padding-top-xs {
+	padding-top: 10upx;
+}
+
+.padding-top-sm {
+	padding-top: 20upx;
+}
+
+.padding-top {
+	padding-top: 30upx;
+}
+
+.padding-top-lg {
+	padding-top: 40upx;
+}
+
+.padding-top-xl {
+	padding-top: 50upx;
+}
+
+.padding-right-xs {
+	padding-right: 10upx;
+}
+
+.padding-right-sm {
+	padding-right: 20upx;
+}
+
+.padding-right {
+	padding-right: 30upx;
+}
+
+.padding-right-lg {
+	padding-right: 40upx;
+}
+
+.padding-right-xl {
+	padding-right: 50upx;
+}
+
+.padding-bottom-xs {
+	padding-bottom: 10upx;
+}
+
+.padding-bottom-sm {
+	padding-bottom: 20upx;
+}
+
+.padding-bottom {
+	padding-bottom: 30upx;
+}
+
+.padding-bottom-lg {
+	padding-bottom: 40upx;
+}
+
+.padding-bottom-xl {
+	padding-bottom: 50upx;
+}
+
+.padding-left-xs {
+	padding-left: 10upx;
+}
+
+.padding-left-sm {
+	padding-left: 20upx;
+}
+
+.padding-left {
+	padding-left: 30upx;
+}
+
+.padding-left-lg {
+	padding-left: 40upx;
+}
+
+.padding-left-xl {
+	padding-left: 50upx;
+}
+
+.padding-lr-xs {
+	padding-left: 10upx;
+	padding-right: 10upx;
+}
+
+.padding-lr-sm {
+	padding-left: 20upx;
+	padding-right: 20upx;
+}
+
+.padding-lr {
+	padding-left: 30upx;
+	padding-right: 30upx;
+}
+
+.padding-lr-lg {
+	padding-left: 40upx;
+	padding-right: 40upx;
+}
+
+.padding-lr-xl {
+	padding-left: 50upx;
+	padding-right: 50upx;
+}
+
+.padding-tb-xs {
+	padding-top: 10upx;
+	padding-bottom: 10upx;
+}
+
+.padding-tb-sm {
+	padding-top: 20upx;
+	padding-bottom: 20upx;
+}
+
+.padding-tb {
+	padding-top: 30upx;
+	padding-bottom: 30upx;
+}
+
+.padding-tb-lg {
+	padding-top: 40upx;
+	padding-bottom: 40upx;
+}
+
+.padding-tb-xl {
+	padding-top: 50upx;
+	padding-bottom: 50upx;
+}
+
+/* -- 浮动 --  */
+
+.cf::after,
+.cf::before {
+	content: " ";
+	display: table;
+}
+
+.cf::after {
+	clear: both;
+}
+
+.fl {
+	float: left;
+}
+
+.fr {
+	float: right;
+}
+
+/* ==================
+          背景
+ ==================== */
+
+.line-red::after,
+.lines-red::after {
+	border-color: #e54d42;
+}
+
+.line-orange::after,
+.lines-orange::after {
+	border-color: #f37b1d;
+}
+
+.line-yellow::after,
+.lines-yellow::after {
+	border-color: #fbbd08;
+}
+
+.line-olive::after,
+.lines-olive::after {
+	border-color: #8dc63f;
+}
+
+.line-green::after,
+.lines-green::after {
+	border-color: #39b54a;
+}
+
+.line-cyan::after,
+.lines-cyan::after {
+	border-color: #1cbbb4;
+}
+
+.line-blue::after,
+.lines-blue::after {
+	border-color: #0081ff;
+}
+
+.line-purple::after,
+.lines-purple::after {
+	border-color: #6739b6;
+}
+
+.line-mauve::after,
+.lines-mauve::after {
+	border-color: #9c26b0;
+}
+
+.line-pink::after,
+.lines-pink::after {
+	border-color: #e03997;
+}
+
+.line-brown::after,
+.lines-brown::after {
+	border-color: #a5673f;
+}
+
+.line-grey::after,
+.lines-grey::after {
+	border-color: #8799a3;
+}
+
+.line-gray::after,
+.lines-gray::after {
+	border-color: #aaaaaa;
+}
+
+.line-black::after,
+.lines-black::after {
+	border-color: #333333;
+}
+
+.line-white::after,
+.lines-white::after {
+	border-color: #ffffff;
+}
+
+.bg-red {
+	background-color: #e54d42;
+	color: #ffffff;
+}
+
+.bg-orange {
+	background-color: #f37b1d;
+	color: #ffffff;
+}
+
+.bg-yellow {
+	background-color: #fbbd08;
+	color: #333333;
+}
+
+.bg-olive {
+	background-color: #8dc63f;
+	color: #ffffff;
+}
+
+.bg-green {
+	background-color: #39b54a;
+	color: #ffffff;
+}
+
+.bg-cyan {
+	background-color: #1cbbb4;
+	color: #ffffff;
+}
+
+.bg-blue {
+	background-color: #0081ff;
+	color: #ffffff;
+}
+
+.bg-purple {
+	background-color: #6739b6;
+	color: #ffffff;
+}
+
+.bg-mauve {
+	background-color: #9c26b0;
+	color: #ffffff;
+}
+
+.bg-pink {
+	background-color: #e03997;
+	color: #ffffff;
+}
+
+.bg-brown {
+	background-color: #a5673f;
+	color: #ffffff;
+}
+
+.bg-grey {
+	background-color: #8799a3;
+	color: #ffffff;
+}
+
+.bg-gray {
+	background-color: #f0f0f0;
+	color: #333333;
+}
+
+.bg-black {
+	background-color: #333333;
+	color: #ffffff;
+}
+
+.bg-white {
+	background-color: #ffffff;
+	color: #666666;
+}
+
+.bg-shadeTop {
+	background-image: linear-gradient(rgba(0, 0, 0, 1), rgba(0, 0, 0, 0.01));
+	color: #ffffff;
+}
+
+.bg-shadeBottom {
+	background-image: linear-gradient(rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 1));
+	color: #ffffff;
+}
+
+.bg-red.light {
+	color: #e54d42;
+	background-color: #fadbd9;
+}
+
+.bg-orange.light {
+	color: #f37b1d;
+	background-color: #fde6d2;
+}
+
+.bg-yellow.light {
+	color: #fbbd08;
+	background-color: #fef2ced2;
+}
+
+.bg-olive.light {
+	color: #8dc63f;
+	background-color: #e8f4d9;
+}
+
+.bg-green.light {
+	color: #39b54a;
+	background-color: #d7f0dbff;
+}
+
+.bg-cyan.light {
+	color: #1cbbb4;
+	background-color: #d2f1f0;
+}
+
+.bg-blue.light {
+	color: #0081ff;
+	background-color: #cce6ff;
+}
+
+.bg-purple.light {
+	color: #6739b6;
+	background-color: #e1d7f0;
+}
+
+.bg-mauve.light {
+	color: #9c26b0;
+	background-color: #ebd4ef;
+}
+
+.bg-pink.light {
+	color: #e03997;
+	background-color: #f9d7ea;
+}
+
+.bg-brown.light {
+	color: #a5673f;
+	background-color: #ede1d9;
+}
+
+.bg-grey.light {
+	color: #8799a3;
+	background-color: #e7ebed;
+}
+
+.bg-gradual-red {
+	background-image: linear-gradient(45deg, #f43f3b, #ec008c);
+	color: #ffffff;
+}
+
+.bg-gradual-orange {
+	background-image: linear-gradient(45deg, #ff9700, #ed1c24);
+	color: #ffffff;
+}
+
+.bg-gradual-green {
+	background-image: linear-gradient(45deg, #39b54a, #8dc63f);
+	color: #ffffff;
+}
+
+.bg-gradual-purple {
+	background-image: linear-gradient(45deg, #9000ff, #5e00ff);
+	color: #ffffff;
+}
+
+.bg-gradual-pink {
+	background-image: linear-gradient(45deg, #ec008c, #6739b6);
+	color: #ffffff;
+}
+
+.bg-gradual-blue {
+	background-image: linear-gradient(45deg, #0081ff, #1cbbb4);
+	color: #ffffff;
+}
+
+.shadow[class*="-red"] {
+	box-shadow: 6upx 6upx 8upx rgba(204, 69, 59, 0.2);
+}
+
+.shadow[class*="-orange"] {
+	box-shadow: 6upx 6upx 8upx rgba(217, 109, 26, 0.2);
+}
+
+.shadow[class*="-yellow"] {
+	box-shadow: 6upx 6upx 8upx rgba(224, 170, 7, 0.2);
+}
+
+.shadow[class*="-olive"] {
+	box-shadow: 6upx 6upx 8upx rgba(124, 173, 55, 0.2);
+}
+
+.shadow[class*="-green"] {
+	box-shadow: 6upx 6upx 8upx rgba(48, 156, 63, 0.2);
+}
+
+.shadow[class*="-cyan"] {
+	box-shadow: 6upx 6upx 8upx rgba(28, 187, 180, 0.2);
+}
+
+.shadow[class*="-blue"] {
+	box-shadow: 6upx 6upx 8upx rgba(0, 102, 204, 0.2);
+}
+
+.shadow[class*="-purple"] {
+	box-shadow: 6upx 6upx 8upx rgba(88, 48, 156, 0.2);
+}
+
+.shadow[class*="-mauve"] {
+	box-shadow: 6upx 6upx 8upx rgba(133, 33, 150, 0.2);
+}
+
+.shadow[class*="-pink"] {
+	box-shadow: 6upx 6upx 8upx rgba(199, 50, 134, 0.2);
+}
+
+.shadow[class*="-brown"] {
+	box-shadow: 6upx 6upx 8upx rgba(140, 88, 53, 0.2);
+}
+
+.shadow[class*="-grey"] {
+	box-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
+}
+
+.shadow[class*="-gray"] {
+	box-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
+}
+
+.shadow[class*="-black"] {
+	box-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
+}
+
+.shadow[class*="-white"] {
+	box-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
+}
+
+.text-shadow[class*="-red"] {
+	text-shadow: 6upx 6upx 8upx rgba(204, 69, 59, 0.2);
+}
+
+.text-shadow[class*="-orange"] {
+	text-shadow: 6upx 6upx 8upx rgba(217, 109, 26, 0.2);
+}
+
+.text-shadow[class*="-yellow"] {
+	text-shadow: 6upx 6upx 8upx rgba(224, 170, 7, 0.2);
+}
+
+.text-shadow[class*="-olive"] {
+	text-shadow: 6upx 6upx 8upx rgba(124, 173, 55, 0.2);
+}
+
+.text-shadow[class*="-green"] {
+	text-shadow: 6upx 6upx 8upx rgba(48, 156, 63, 0.2);
+}
+
+.text-shadow[class*="-cyan"] {
+	text-shadow: 6upx 6upx 8upx rgba(28, 187, 180, 0.2);
+}
+
+.text-shadow[class*="-blue"] {
+	text-shadow: 6upx 6upx 8upx rgba(0, 102, 204, 0.2);
+}
+
+.text-shadow[class*="-purple"] {
+	text-shadow: 6upx 6upx 8upx rgba(88, 48, 156, 0.2);
+}
+
+.text-shadow[class*="-mauve"] {
+	text-shadow: 6upx 6upx 8upx rgba(133, 33, 150, 0.2);
+}
+
+.text-shadow[class*="-pink"] {
+	text-shadow: 6upx 6upx 8upx rgba(199, 50, 134, 0.2);
+}
+
+.text-shadow[class*="-brown"] {
+	text-shadow: 6upx 6upx 8upx rgba(140, 88, 53, 0.2);
+}
+
+.text-shadow[class*="-grey"] {
+	text-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
+}
+
+.text-shadow[class*="-gray"] {
+	text-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
+}
+
+.text-shadow[class*="-black"] {
+	text-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
+}
+
+.bg-img {
+	background-size: cover;
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
+.bg-mask {
+	background-color: #333333;
+	position: relative;
+}
+
+.bg-mask::after {
+	content: "";
+	border-radius: inherit;
+	width: 100%;
+	height: 100%;
+	display: block;
+	background-color: rgba(0, 0, 0, 0.4);
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	top: 0;
+}
+
+.bg-mask view,
+.bg-mask cover-view {
+	z-index: 5;
+	position: relative;
+}
+
+.bg-video {
+	position: relative;
+}
+
+.bg-video video {
+	display: block;
+	height: 100%;
+	width: 100%;
+	-o-object-fit: cover;
+	object-fit: cover;
+	position: absolute;
+	top: 0;
+	z-index: 0;
+	pointer-events: none;
+}
+
+/* ==================
+          文本
+ ==================== */
+
+.text-xs {
+	font-size: 20upx;
+}
+
+.text-sm {
+	font-size: 24upx;
+}
+
+.text-df {
+	font-size: 28upx;
+}
+
+.text-lg {
+	font-size: 32upx;
+}
+
+.text-xl {
+	font-size: 36upx;
+}
+
+.text-xxl {
+	font-size: 44upx;
+}
+
+.text-sl {
+	font-size: 80upx;
+}
+
+.text-xsl {
+	font-size: 120upx;
+}
+
+.text-Abc {
+	text-transform: Capitalize;
+}
+
+.text-ABC {
+	text-transform: Uppercase;
+}
+
+.text-abc {
+	text-transform: Lowercase;
+}
+
+.text-price::before {
+	content: "¥";
+	font-size: 80%;
+	margin-right: 4upx;
+}
+
+.text-cut {
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.text-bold {
+	font-weight: bold;
+}
+
+.text-center {
+	text-align: center;
+}
+
+.text-content {
+	line-height: 1.6;
+}
+
+.text-left {
+	text-align: left;
+}
+
+.text-right {
+	text-align: right;
+}
+
+.text-red,
+.line-red,
+.lines-red {
+	color: #e54d42;
+}
+
+.text-orange,
+.line-orange,
+.lines-orange {
+	color: #f37b1d;
+}
+
+.text-yellow,
+.line-yellow,
+.lines-yellow {
+	color: #fbbd08;
+}
+
+.text-olive,
+.line-olive,
+.lines-olive {
+	color: #8dc63f;
+}
+
+.text-green,
+.line-green,
+.lines-green {
+	color: #39b54a;
+}
+
+.text-cyan,
+.line-cyan,
+.lines-cyan {
+	color: #1cbbb4;
+}
+
+.text-blue,
+.line-blue,
+.lines-blue {
+	color: #0081ff;
+}
+
+.text-purple,
+.line-purple,
+.lines-purple {
+	color: #6739b6;
+}
+
+.text-mauve,
+.line-mauve,
+.lines-mauve {
+	color: #9c26b0;
+}
+
+.text-pink,
+.line-pink,
+.lines-pink {
+	color: #e03997;
+}
+
+.text-brown,
+.line-brown,
+.lines-brown {
+	color: #a5673f;
+}
+
+.text-grey,
+.line-grey,
+.lines-grey {
+	color: #8799a3;
+}
+
+.text-gray,
+.line-gray,
+.lines-gray {
+	color: #aaaaaa;
+}
+
+.text-black,
+.line-black,
+.lines-black {
+	color: #333333;
+}
+
+.text-white,
+.line-white,
+.lines-white {
+	color: #ffffff;
+}
diff --git a/src/static/scss/global.scss b/src/static/scss/global.scss
new file mode 100644
index 0000000..ac636bd
--- /dev/null
+++ b/src/static/scss/global.scss
@@ -0,0 +1,90 @@
+.text-center {
+	text-align: center;
+}
+
+.font-13 {
+	font-size: 13px;
+}
+
+.font-12 {
+	font-size: 12px;
+}
+
+.font-11 {
+	font-size: 11px;
+}
+
+.text-grey1 {
+	color: #888;
+}
+.text-grey2 {
+	color: #aaa;
+}
+
+.list-cell-arrow::before {
+    content: ' ';
+    height: 10px;
+    width: 10px;
+    border-width: 2px 2px 0 0;
+    border-color: #c0c0c0;
+    border-style: solid;
+    -webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+    transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+    position: absolute;
+    top: 50%;
+    margin-top: -6px;
+    right: 30rpx;
+  }
+  
+  .list-cell {
+    position: relative;
+    width: 100%;
+    box-sizing: border-box;
+    background-color: #fff;
+    color: #333;
+    padding: 26rpx 30rpx;
+  }
+  
+  .list-cell:first-child {
+    border-radius: 8rpx 8rpx 0 0;
+  }
+  
+  .list-cell:last-child {
+    border-radius: 0 0 8rpx 8rpx;
+  }
+  
+  .list-cell::after {
+    content: '';
+    position: absolute;
+    border-bottom: 1px solid #eaeef1;
+    -webkit-transform: scaleY(0.5) translateZ(0);
+    transform: scaleY(0.5) translateZ(0);
+    transform-origin: 0 100%;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    pointer-events: none;
+  }
+  
+  
+  .menu-list {
+    margin: 15px 15px;
+  
+    .menu-item-box {
+      width: 100%;
+      display: flex;
+      align-items: center;
+  
+      .menu-icon {
+        color: #007AFF;
+        font-size: 16px;
+        margin-right: 5px;
+      }
+      
+      .text-right {
+        margin-left: auto;
+        margin-right: 34rpx;
+        color: #999;
+      }
+    }
+  }
diff --git a/src/static/scss/index.scss b/src/static/scss/index.scss
new file mode 100644
index 0000000..0ae6983
--- /dev/null
+++ b/src/static/scss/index.scss
@@ -0,0 +1,4 @@
+// global
+@import "./global.scss";
+// color-ui
+@import "@/static/scss/colorui.css";
\ No newline at end of file
diff --git a/src/static/version.json b/src/static/version.json
new file mode 100644
index 0000000..05c4a4c
--- /dev/null
+++ b/src/static/version.json
@@ -0,0 +1,3 @@
+{
+	"version": "02.24.2"
+}
\ No newline at end of file
diff --git a/src/static/video/error.wav b/src/static/video/error.wav
new file mode 100644
index 0000000..b89de3e
Binary files /dev/null and b/src/static/video/error.wav differ