123

pages/abnormal/index.vue

@@ -54,7 +54,7 @@
 			this.getluggageList(this.$storage.get("airportName"))
 		},
 		onUnload() {
-			// this.$refs.showMask.show();
+			uni.$off("scancodemsg");
 		},
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
@@ -66,7 +66,7 @@
 			});
 		},
 		onHide() {
-			uni.$off("scancodemsg");
+			
 		},
 		mounted() {
 		},

pages/baggagecheck/index.vue

@@ -135,7 +135,9 @@
 				this.getDetial(this.luggageNum)
 			}
 		},
-		onUnload() {},
+		onUnload() {
+			uni.$off("scancodemsg");
+		},
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
@@ -153,7 +155,6 @@
 				
 		},
 		onHide() {
-			uni.$off("scancodemsg");
 		},
 		mounted() {},
 		components: {
@@ -215,6 +216,10 @@
 			},
 			async sendData(){
 				this.luggageData.sourceAirport = this.$storage.get('airportName');
+				this.luggageData.ID = null;
+				this.luggageData.dataType = "BPM";
+				this.luggageData.agentNumber = this.$storage.getJson("users").user_name;
+				this.luggageData.device_ID = uni.getDeviceInfo().deviceId;
 				let data = {
 					"serviceId": 3005,
 					"dataContent": [

pages/detail/index.vue

@@ -203,8 +203,9 @@
 						"name":"在场未装载，已授权"
 					}
 				],
-				 abnormalNameList:["无","未被授权的装载","已卸载","未找到","在场未装载，未被授权","在场未装载，已授权"],
-				isShow:true
+				abnormalNameList:["无","未被授权的装载","已卸载","未找到","在场未装载，未被授权","在场未装载，已授权"],
+				isShow:true,
+				sourceData:null
 			}
 		},
 		created(option) {
@@ -215,7 +216,9 @@
 			this.getSpecialTypeList()
 			this.getDetial(this.luggageNum)
 		},
-		onUnload() {},
+		onUnload() {
+			uni.$off("scancodemsg");
+		},
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
@@ -225,7 +228,6 @@
 			});
 		},
 		onHide() {
-			uni.$off("scancodemsg");
 		},
 		components: {},
 		methods: {
@@ -313,6 +315,23 @@
 			},
 			async sendData(){
 				this.luggageData.sourceAirport = this.$storage.get('airportName');
+				this.luggageData.ID = null;
+				this.luggageData.dataType = "BPM";
+				this.luggageData.agentNumber = this.$storage.getJson("users").user_name;
+				this.luggageData.device_ID = uni.getDeviceInfo().deviceId;
+				// this.sourceData['ID'] = null;
+				// this.sourceData['dataType'] = "BPM";
+				// this.sourceData['agentNumber'] = this.luggageData.agentNumber;
+				// this.sourceData['loadNumber'] = this.luggageData.loadNumber;
+				// this.sourceData['container_ID'] = this.luggageData.container_ID;
+				// this.sourceData['luggage_describe'] = this.luggageData.luggage_describe;
+				// this.sourceData['nodeCode'] = this.luggageData.nodeCode;
+				// this.sourceData['location_describe'] = this.luggageData.location_describe;
+				// this.sourceData['to_location_describe'] = this.luggageData.to_location_describe;
+				// this.sourceData['specialType'] = this.luggageData.specialType;
+				// this.sourceData['exception_type'] = this.luggageData.exception_type;
+				// this.sourceData['abnormalState'] = this.luggageData.abnormalState;
+				// this.luggageData.sourceData = JSON.stringify(this.sourceData);
 				let data = {
 					"serviceId": 3005,
 					"dataContent": [
@@ -351,7 +370,7 @@
 			},
 			bindPickerChange3(e){
 				this.index3 = e.detail.value
-				this.luggageData.specialType = this.nodeList[this.index3].specialType;
+				this.luggageData.specialType = this.specialTypeList[this.index3].specialType;
 			},
 			bindPickerChange4(e){
 				this.index4 = e.detail.value

pages/extract/index.vue

@@ -96,7 +96,7 @@
 			// }
 		},
 		onUnload() {
-			// this.$refs.showMask.show();
+			uni.$off("scancodemsg");
 		},
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
@@ -108,7 +108,7 @@
 			});
 		},
 		onHide() {
-			uni.$off("scancodemsg");
+			
 		},
 		mounted() {
 			// this.$refs.showMask.show();
@@ -197,6 +197,10 @@
 				this.caps.nodeCode = "extract"
 				this.caps.processing_time = this.datatime();
 				this.caps.sourceAirport = this.$storage.get('airportName');
+				this.caps.ID = null;
+				this.caps.dataType = "BPM";
+				this.caps.agentNumber = this.$storage.getJson("users").user_name;
+				this.caps.device_ID = uni.getDeviceInfo().deviceId;
 				let data = {
 					"serviceId": 3005,
 					"dataContent": [

pages/individual/index.vue

@@ -17,12 +17,12 @@
 		<view class="content">
 			<view class="list">
 				<p>名称</p>
-				<input class="input" name="yonghuming" type="text" value=""
+				<input class="input" name="yonghuming" type="text" v-model="form.user_name" value=""
 					placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="请输入名称" />
 			</view>
 			<view class="list">
 				<p>工号</p>
-				<input class="input" name="yonghuming" type="text" value=""
+				<input class="input" name="yonghuming" type="text" v-model="form.user_id" value=""
 					placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="请输入工号" />
 			</view>
 		</view>
@@ -36,11 +36,18 @@
 		data() {
 			return {
 				navname: '个人信息',
-				url: []
+				url: [],
+				form:{
+					user_name:"",
+					user_id:""
+				}
 			}
 		},
 		created(option) {},
-		onLoad() {},
+		onLoad() {
+			this.form.user_name = this.$storage.getJson("users").user_name
+			this.form.user_id = this.$storage.getJson("users").user_id
+		},
 		onUnload() {},
 		onShow() {},
 		mounted() {},

pages/message/message.vue

@@ -2,8 +2,8 @@
 	<view class="app-content">
 		<view class="title-box">{{navname}}</view>
 		<uni-list :border="true" class="messageList">
-			<uni-list-chat :avatar-circle="true" title="uni-app" avatar="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png" note="您收到一条新的消息" time="2020-02-02 20:20" ></uni-list-chat>
-			<uni-list-chat title="uni-app" avatar="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
+			<uni-list-chat title="app" avatar="static/shuai.png" note="您收到一条新的消息" time="2020-02-02 20:20" ></uni-list-chat>
+			<uni-list-chat title="app" avatar="static/shuai.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
 		</uni-list>
 	</view>
 </template>

pages/mypage/index.vue

@@ -7,8 +7,8 @@
 				<img src="static/shuai.png" alt="">
 			</view>
 			<view class="details">
-				<p>Admin</p>
-				<span>工号：E002</span>
+				<p>{{$storage.getJson("users").user_name}}</p>
+				<span>工号：{{$storage.getJson("users").user_id}}</span>
 			</view>
 			<view class="detail_list">
 				<view class="list_child">

pages/search/index.vue

@@ -45,7 +45,7 @@
 		},
 		created(option) {},
 		onLoad() {},
-		onUnload() {},
+		onUnload() {uni.$off("scancodemsg");},
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
@@ -56,8 +56,6 @@
 			});
 		},
 		mounted() {
-			uni.$off("scancodemsg");
-			
 		},
 		components: {
 			Nav
@@ -165,6 +163,8 @@
 
 <style lang="scss" scoped>
 	.app-content {
+		height:100vh;
+		overflow: hidden;
 		>.nav {
 			width: 100%;
 			position: relative;
@@ -182,12 +182,13 @@
 			}
 		}
 		>.content{
-			height: calc(100vh - 13rem);
+			height: calc(100vh - 14rem);
 			overflow-x: hidden;
 			overflow-y: auto;
 			>.craid {
 				// width: 100%;
-				border-radius: 0;
+				border-radius: 0!important;
+				border-color: none;
 				border: none;
 				z-index: 10;
 				height: 5.625rem;
@@ -196,7 +197,7 @@
 				justify-content: space-between;
 				flex-wrap: wrap;
 				align-items: center;
-				border-bottom: 1px solid #000;
+				border-bottom: 1px solid rgba(59, 111, 142, 1.00);
 				>.craid_data {
 					display: flex;
 					flex-direction: column;

pages/sorting/index.vue

@@ -61,8 +61,8 @@
 						@touchstart="start" @touchend="(e)=>end(e,item)">
 						<view class="list"  @tap="toDetail(item.luggageNum)">行李编号：{{ item.luggageNum }}</view>
 						<view :class="item.abnormalState!=null?'error':'normal'">{{item.abnormalState!=null?item.abnormalName:"正常"}}</view>
-						<view class="down_up" v-if="pagename == 'LOAD'" @tap="up(item,index)"></view>
-						<view class="delete" v-if="pagename == 'LOAD'">
+						<view class="down_up" v-if="pagename == 'LOAD' && item.abnormalState!='OFF'" @tap="up(item,index)"></view>
+						<view class="delete" v-if="pagename == 'LOAD' && item.abnormalState!='OFF'">
 							<view class="log" @click="()=>up(item,index)"></view>
 						</view>
 					</view>
@@ -191,6 +191,7 @@
 			}
 		},
 		onUnload() {
+			uni.$off("scancodemsg");
 			// this.$refs.showMask.show();
 		},
 		onShow() {
@@ -205,7 +206,6 @@
 			}
 		},
 		onHide() {
-			uni.$off("scancodemsg");
 		},
 		mounted() {
 			// this.$refs.showMask.show();
@@ -324,6 +324,7 @@
 				    "serviceId": 3001,
 				    "dataContent": {
 				        "carrierFlights": this.flightNO,
+						"carrierFlightsDate":this.flightDate
 				    },
 				    "event": "0"
 				}
@@ -499,6 +500,10 @@
 			},
 			async sendData(type){
 				this.currentLuggage.sourceAirport = this.$storage.get('airportName');
+				this.currentLuggage.ID = null;
+				this.currentLuggage.dataType = "BPM";
+				this.currentLuggage.agentNumber = this.$storage.getJson("users").user_name;
+				this.currentLuggage.device_ID = uni.getDeviceInfo().deviceId;
 				let data = {
 					"serviceId": 3005,
 					"dataContent": [