MeiRuiAn/HuaiAn.git

			@@ -16,12 +16,12 @@
			<uni-easyinput type="text" placeholder="è¯·æ«æåç®±æ ç¾" ref='midInput' :focus="focus"
			v-model="materSn" @input="snInput" />
			</uni-forms-item>


			<uni-forms-item :label="Testlabel" v-if="Test">
			<uni-easyinput type="text" :placeholder="Testplaceholder" ref='midInput'
			v-model="Initiallife" />
			</uni-forms-item>


			<!-- <uni-forms-item>
			<checkbox checked="check">æ¯å¦æ»¡ç</checkbox>
			</uni-forms-item> -->
			@@ -99,49 +99,29 @@
			</view>
			<view v-if="current === 3" class="headerstyle">
			<view class="itemstyle">
			<uni-forms label-width="120">
			<uni-forms-item>
			<uni-easyinput type="text" @input="releaseboxInput" v-model="value" placeholder="è¯·æ«ç "
			ref='midInput' :focus="true" />
			<uni-forms label-width="180">
			<uni-forms-item label="åç®±æ ç¾:">
			<uni-easyinput type="text" placeholder="è¯·æ«æåç®±æ ç¾" ref='midInput' :focus="pkfocus"
			v-model="pkmaterSn" @input="pksnInput" />
			</uni-forms-item>
			<uni-forms-item>
			<button @click="releasebox" type="primary" size="default">è§£ç</button>
			<button @click="pksubmit" type="primary" size="default" style="margin-top: 2%;">å¥å¹³åº</button>
			</uni-forms-item>
			</uni-forms>
			<uni-list>
			<uni-list-item direction="column" v-if="value2">
			<uni-list-item direction="column" v-for="(item,index) in pkmatInfos" :key="index">
			<template v-slot:body>
			<view class="uni-list-box">
			<uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
			@click="pkdeleteList(index)">
			</uni-icons>
			<view class="uni-content">
			<view class="uni-title-sub uni-ellipsis-2">æçå·ï¼{{value2}}</view>
			</view>
			</view>
			</template>
			</uni-list-item>
			<uni-list-item direction="column" v-for="item in matTotal" :key="item.matCode">
			<template v-slot:body>
			<view class="uni-list-box">
			<view class="uni-content">
			<view class="uni-title-sub uni-ellipsis-2">ç©æç¼ç ï¼{{item.matCode}}</view>
			<view class="uni-title-sub uni-ellipsis-2">æ°éï¼{{item.matQuantity}}</view>
			</view>
			</view>
			</template>
			</uni-list-item>

			<uni-list-item direction="column" v-for="(item,index) in matInfo" :key="index">
			<template v-slot:body>
			<view class="uni-list-box">
			<view class="uni-content">
			<view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
			ç©æç¼ç ï¼{{item.matCode}}
			</view>
			<view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
			ç©æåç§°ï¼{{item.matName}}
			</view>
			<view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
			æ°éï¼{{item.matQty}}
			</view>
			<view class="uni-title-sub uni-ellipsis-2">éè´åå·ï¼{{item.purchaseOrderNo}}</view>
			<view class="uni-note">ç©æç¼ç ï¼{{item.materielCode}}</view>
			<view class="uni-note">æ¹æ¬¡å·ï¼{{item.lotNo}}</view>
			<view class="uni-note">æ°éï¼{{item.quantity}}</view>
			<view class="uni-note">çäº§æ¥æï¼{{item.productionDate}}</view>
			<view class="uni-note">æææï¼{{item.effectiveDate}}</view>
			</view>
			</view>
			</template>
			@@ -167,10 +147,12 @@
			label: "",
			orderInfo: [],
			focus: false,
			pkfocus:false,
			barcode: "",
			materSn: "",
			Initiallife: 1000,
			sns: [],
			pksns:[],
			addressFocus: false,
			inboundBarcode: "",
			address: "",
			@@ -184,6 +166,8 @@
			Testlabel: "",
			Testplaceholder: "",
			Testcheck: false,
			pkmaterSn: "",
			pkmatInfos: []
			}
			},
			onShow() {},
			@@ -201,6 +185,10 @@
			this.Testlabel = "æ°é:";
			this.Testplaceholder = "è¯·è¾å¥æ°é";
			this.Initiallife = 16;
			} else if (this.warehouseId == 5) { //è¾æ
			this.items.push("å¥å¹³åº");
			this.items[1] = "å¥ç«åº";
			this.address = "8005";
			}
			this.label = "åæ®ç¼å·ï¼" + this.orderNo;
			this.getData();
			@@ -360,91 +348,70 @@
			this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
			this.Testcheck = false;
			if (res.status) {
			// debugger
			// this.matTotal.push({
			// matCode: res.data.materielCode,
			// matQuantity: parseInt(res.data.quantity)
			// });
			this.sns.push(res.data.serialNumber);

			// this.matInfos.splice(0, this.matInfos.length);
			this.matInfos.push(res.data);
			if (res.message) {
			this.$refs.uToast.show({
			title: res.message,
			type: "error"
			})
			// setTimeout(this.updateFocus,200);
			setTimeout(() => {
			this.voiceSpeech('../../static/fail.mp3');
			}, 100);
			return;
			}
			// setTimeout(this.updateFocus,200);
			setTimeout(() => {
			this.voiceSpeech('../../static/success.mp3');
			}, 100);
			} else {
			// this.innerCode = "";
			this.$refs.uToast.show({
			title: res.message,
			type: "error"
			})
			// setTimeout(this.updateFocus,200);
			setTimeout(() => {
			this.voiceSpeech('../../static/fail.mp3');
			}, 100);
			}
			})


			// var matInfo = matSn.split('\|');

			// if (matInfo.length == 7) {
			// var matObj = {
			// matCode: matInfo[1],
			// matProductionDate: matInfo[3],
			// matQty: matInfo[5],
			// orderNo: matInfo[6],
			// sn: matSn
			// }
			// var temp = this.matInfos.find(x => x.orderNo == matObj.orderNo);
			// if (!temp) {
			// var tmp = this.matTotal.find(x => x.matCode == matObj.matCode);
			// if (!tmp) {
			// this.matTotal.push({
			// matCode: matObj.matCode,
			// matQuantity: parseInt(matObj.matQty)
			// })
			// } else {
			// tmp.matQuantity += parseInt(matObj.matQty);
			// }
			// this.sns.push(matSn);
			// this.matInfos.push(matObj);
			// setTimeout(this.updateFocus, 200);
			// setTimeout(() => {
			// this.voiceSpeech('../../static/success.mp3');
			// }, 100);
			// } else {
			// this.$refs.uToast.show({
			// title: "æ«ç éå¤",
			// type: "error"
			// })
			// setTimeout(this.updateFocus, 200);
			// setTimeout(() => {
			// this.voiceSpeech('../../static/fail.mp3');
			// }, 100);
			// }
			// } else {
			// this.$refs.uToast.show({
			// title: "æ«ç éè¯¯,è¯·æ«ææ£ç¡®åç®±ç ",
			// type: "error"
			// })
			// setTimeout(this.updateFocus, 200);
			// setTimeout(() => {
			// this.voiceSpeech('../../static/fail.mp3');
			// }, 100);
			// }
			}
			})
			},
			pksnInput() {
			this.$nextTick(() => {
			if (this.pkmaterSn != "") {
			this.focus = false;
			var matSn = this.pkmaterSn;
			setTimeout(() => {
			this.pkmaterSn = "";
			}, 10);
			this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
			if (res.status) {
			this.pksns.push(res.data.serialNumber);
			this.pkmatInfos.push(res.data);
			if (res.message) {
			this.$refs.uToast.show({
			title: res.message,
			type: "error"
			})
			setTimeout(() => {
			this.voiceSpeech('../../static/fail.mp3');
			}, 100);
			return;
			}
			setTimeout(() => {
			this.voiceSpeech('../../static/success.mp3');
			}, 100);
			} else {
			this.$refs.uToast.show({
			title: res.message,
			type: "error"
			})
			setTimeout(() => {
			this.voiceSpeech('../../static/fail.mp3');
			}, 100);
			}
			})
			}
			})
			},
			@@ -472,11 +439,14 @@
			}
			this.$u.post('/api/Task/RequestInboundTask', postData).then(res => {
			if (res.status) {
			uni.$showMsg(res.message);
			this.inboundBarcode = "";
			this.address = "";
			if (this.warehouseId != 5) this.address = "";
			setTimeout(() => {
			this.addressFocus = false;
			this.$refs.uToast.show({
			title: "æå",
			type: "success"
			})
			}, 200);
			} else {
			this.$refs.uToast.show({
			@@ -503,6 +473,35 @@
			this.matInfos.splice(res, 1);
			this.sns.splice(res, 1);
			},
			pkdeleteList(res) {
			this.pkmatInfos.splice(res, 1);
			this.pksns.splice(res, 1);
			},
			pksubmit(){
			if (this.pkmatInfos.length == 0) {
			this.$refs.uToast.show({
			title: "è¯·æ«æåç®±æ ç¾",
			type: 'error'
			})
			return;
			}
			this.$u.post('/api/InboundOrder/InPinKu?warehouseId=' + this.warehouseId+"&orderNo="+ this.orderNo, this.pksns).then(res => {
			if (res.status) {
			this.$refs.uToast.show({
			title: "å¥åºæå",
			type: "success"
			})
			this.focus = false;
			this.pkmatInfos = [];
			this.pksns = [];
			} else {
			this.$refs.uToast.show({
			title: res.message,
			type: "error"
			})
			}
			})
			},
			submit() {
			if (this.barcode == "") {
			this.$refs.uToast.show({