~jhz/STUWMS.git

			@@ -14,11 +14,17 @@
			<view class="title"><text>*</text>流水号:</view>
			<view class="right" style="width: 380rpx;">
			<input v-model="hform.HProcNo" placeholder="请输入(或扫描)流水号"
			@confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
			@blur="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
			</view>
			<uni-icons type="scan"
			style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
			size="20" @click="toScanProcNo"></uni-icons>
			</view>
			<view class="form-item">
			<view class="title">工序编码:</view>
			<view class="righton">
			<input disabled v-model="hform.HProcNumber" placeholder="请输入工序编码" />
			</view>
			</view>
			<view class="form-item">
			<view class="title">未报工数量:</view>
			@@ -58,7 +64,7 @@
			@input="HEmpNameChange"></uni-combox>
			</view>
			</view>
			<view class="form-item">
			<!-- <view class="form-item">
			<view class="title">工序:</view>
			<view class="right">
			<uni-combox :candidates="arrayHProcName" placeholder="请选择工序" v-model="hform.HProcName"
			@@ -66,12 +72,12 @@
			</view>
			</view>
			<view class="form-item">
			<view class="title">部门:</view>
			<view class="title"><text>*</text>部门:</view>
			<view class="right">
			<uni-combox :candidates="arrayHDept" placeholder="请选择部门" v-model="hform.HDept"
			@input="HHDeptChange"></uni-combox>
			</view>
			</view>
			</view> -->
			<view class="form-item">
			<view class="title">送货单号:</view>
			<view class="right">
			@@ -407,6 +413,7 @@
			HNotReportQty: 0,
			HQty: 0,
			HPieceQty: 0,
			HProcNumber: '',
			HWasterQty: 0,
			HEmpName: '',
			HEmpID: 0,
			@@ -458,7 +465,7 @@
			HGroupName: '',
			HGroupID: 0,
			HDept: '',
			HDeptID: '',
			HDeptID: 0,

			HMaker: '',
			HMakeDate: '',
			@@ -494,13 +501,15 @@
			this.getHProcList()
			this.getHSupList()
			this.getHEmpList()
			this.getHProcList()
			this.getHDeptList()
			//this.getHProcList()
			//this.getHDeptList()

			this.getDefValByUser()

			uni.$on('BillSelectComplete', (e) => {
			console.log("接收到的消息: ", e.HBillNo)
			uni.$on('BillSelectComplete2', (e) => {
			console.log("接收到的消息: ", e.HBillNo, e.HProcNumber)
			this.hform.HBarCode = e.HBillNo
			this.hform.HProcNo = e.HProcNo
			this.getHBarCodeData(e.HBillNo)
			this.$refs.billList.exit()
			})
			@@ -874,8 +883,8 @@
			console.log(1, res.data.data[0]);
			if (res.data.code == 1) {
			var data = res.data.data[0]
			this.getHBarCodeData(data.HBarCode)
			this.getHProcNoData(data.HBarCode, data.HProcNo)
			this.getHBarCodeData(data.HBarCode,1)
			// this.getHProcNoData(data.HBarCode, data.HProcNo)

			this.hform.HInterID = data.HInterID
			this.hform.HBillNo = data.HBillNo
			@@ -1014,6 +1023,7 @@
			this.hform.HCenterName = data.工作中心
			this.hform.HCenterID = data.HCenterID
			this.hform.HNotReportQty = data['未报工数量']
			this.hform.HProcNumber = data['工序代码']
			if (!this.hform.HSupName) {
			this.hform.HSupName = data.供应商
			this.hform.HSupID = data.HSupID
			@@ -1068,6 +1078,9 @@
			})
			},
			submit() {
			//去除分号以免后端分解报错
			this.hform.HMaterName= this.hform.HMaterName.replace(/;/g, '');
			this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
			if (!this.hform.HBarCode) {
			uni.showToast({
			title: '请扫描设备条形码',
			@@ -1083,7 +1096,14 @@
			title: '请选择供应商',
			icon: 'none'
			})
			} else if (!this.hform.HEmpName) {
			}
			// else if (!this.hform.HDeptID) {
			// uni.showToast({
			// title: '请选择部门',
			// icon: 'none'
			// })
			// }
			else if (!this.hform.HEmpName) {
			uni.showToast({
			title: '请选择操作员',
			icon: 'none'
			@@ -1110,10 +1130,13 @@
			// let prePage = pages[pages.length - 2];
			// prePage.$vm.getList()
			if (this.isEdit) {
			uni.showToast({
			title: '修改成功',
			icon: 'none'
			})
			setTimeout(() => {
			uni.redirectTo({
			url: '/pages/weiwaigxOut/form?linterid=' + this
			.linterid + '&HBillNo=' + this.linterid
			url: '/pages/weiwaigxOut/table'
			})
			}, 1000)
			} else {