mes-jdhj-uniapp.git

			@@ -17,7 +17,7 @@
			<scroll-view class="finishProductIn-locno-scroll-list" scroll-y="true">
			<u-cell-group class="finishProductIn-locno-scroll-list-group" :border="false">
			<view class="content" v-for="(item, index) in list" :key="item.moNo" :index="index"
			@click="cancelReport(item,index)">
			@click="cancelReport(item, index)">
			<view class="content-header">
			<view class="content-header-title">{{ index + 1 }}</view>
			</view>
			@@ -85,9 +85,7 @@
			<text class="item-one">零件描述</text>
			</view>
			<view class="packing-registration-param-item-right">
			<span class="item-one">{{
			detailedList.partName
			}}</span>
			<span class="item-one">{{ detailedList.partName }}</span>
			</view>
			</view>
			<view class="packing-registration-param-item param-extra">
			@@ -95,9 +93,7 @@
			<text class="item-one">取消接收数量</text>
			</view>
			<view class="packing-registration-param-item-right">
			<span class="item-one">{{
			detailedList.netWeight
			}}</span>
			<span class="item-one">{{ detailedList.netWeight }}</span>
			</view>
			</view>
			</view>
			@@ -132,30 +128,28 @@
			detailedList: {},
			list: [],
			rules: {},
			showModal: false,
			id: "",
			showModal: false,
			id: "",
			};
			},
			onReady() {},
			// onShow() {
			// let that = this;
			// uni.$off("scan"); // 每次进来先移除全局自定义事件监听器
			// uni.$on("scan", function (data) {
			// console.log("onscan");
			// //扫码成功后的回调，你可以写自己的逻辑代码在这里
			// console.log("页面扫码结果：", data.code);
			// if (data.code) {
			// let codeInfo = JSON.parse(data.code);
			// console.log('222')
			// if (codeInfo.moNo) {
			// console.log('1111')
			// // 扫描报工单二维码
			// that.saveForm(codeInfo);
			// // that.$forceUpdate();
			// }
			// }
			// });
			// },
			onShow() {
			let that = this;
			uni.$off("scan"); // 每次进来先移除全局自定义事件监听器
			uni.$on("scan", function(data) {
			console.log("onscan");
			//扫码成功后的回调，你可以写自己的逻辑代码在这里
			console.log("页面扫码结果：", data.code);
			if (data.code) {
			let codeInfo = JSON.parse(data.code);
			if (codeInfo.BN) {
			// 扫描报工单二维码
			that.saveForm(codeInfo);
			// that.$forceUpdate();
			}
			}
			});
			},
			methods: {
			//工单
			seachWork() {
			@@ -183,44 +177,48 @@
			},
			// 回显扫码的信息-报工单
			saveForm(val) {
			console.log('1111@@@@@@1', this.form)
			if (this.form.moNo == '') {
			uni.showToast({
			icon: "none",
			title: "请先选择订单号！",
			duration: 2 * 1000,
			});
			return;
			}
			if (this.form.moNo != val.moNo) {
			uni.showToast({
			icon: "none",
			title: "扫描的二维码与该订单不一致",
			duration: 2 * 1000,
			});
			return;
			}
			// if (this.form.moNo == "") {
			// uni.showToast({
			// icon: "none",
			// title: "请先选择订单号！",
			// duration: 2 * 1000,
			// });
			// return;
			// }
			// if (this.form.moNo != val.moNo) {
			// uni.showToast({
			// icon: "none",
			// title: "扫描的二维码与该订单不一致",
			// duration: 2 * 1000,
			// });
			// return;
			// }
			this.detailedList = val;
			this.detailedList.outBatchNo = val.BN;
			this.detailedList.partNo = val.PN;
			this.detailedList.partName = val.ST;
			this.detailedList.netWeight = val.NW;
			console.log("this.detailedList扫码取消报工", this.detailedList);
			this.showModal = true;
			},
			// 工单回显
			workNo(val) {
			this.id = val.id;
			this.getBGList();
			this.id = val.id;
			this.getBGList();
			this.form.optaskNo = val.optaskNo;
			},
			getBGList() {
			this.$u.api.workReporting
			.getProductMainV1({
			current: 1,
			size: -1,
			id:this.id,
			})
			.then((res) => {
			console.log('res',res)
			this.list = res.data.productOutputList;
			});
			},
			},
			getBGList() {
			this.$u.api.workReporting
			.getProductMainV1({
			current: 1,
			size: -1,
			id: this.id,
			})
			.then((res) => {
			console.log("res", res);
			this.list = res.data.productOutputList;
			});
			},
			// 取消报工
			cancelReport(item, index) {
			let that = this;
			@@ -243,14 +241,18 @@
			this.$u.api.cancelReporting
			.cancelDTAOfWorkApplication({
			outBatchNo: this.detailedList.outBatchNo,
			outputId: this.detailedList.id
			outputId: this.detailedList.id,
			})
			.then((res) => {
			console.log("res", res);
			if (this.detailedList.BN) {
			this.showModal = false;
			this.$u.toast("取消报工成功");
			} else {
			this.getBGList();
			this.showModal = false;
			// this.getHandelList();
			this.$u.toast("取消报工成功");
			}
			});
			},
			},