~jhz/STUWMS.git

			@@ -40,28 +40,28 @@
			<view class="form-item">
			<view class="title">班组:</view>
			<view class="right">
			<uni-combox :candidates="arrayHGroupName" placeholder="请选择车间" v-model="hform.HGroupName"
			<uni-combox :candidates="arrayHGroupName" placeholder="请选择班组" v-model="hform.HGroupName"
			@input="HGroupNameChange"></uni-combox>
			</view>
			</view>
			<view class="form-item">
			<view class="title">班次:</view>
			<view class="right">
			<uni-combox :candidates="arrayHShiftsName" placeholder="请选择车间" v-model="hform.HShiftsName"
			<uni-combox :candidates="arrayHShiftsName" placeholder="请选择班次" v-model="hform.HShiftsName"
			@input="HShiftsNameChange"></uni-combox>
			</view>
			</view>
			<view class="form-item">
			<view class="title">生产资源:</view>
			<view class="right">
			<uni-combox :candidates="arrayHSourceName" placeholder="请选择车间" v-model="hform.HSourceName"
			<uni-combox :candidates="arrayHSourceName" placeholder="请选择生产资源" v-model="hform.HSourceName"
			@input="HSourceNameChange"></uni-combox>
			</view>
			</view>
			<view class="form-item">
			<view class="title">工序:</view>
			<view class="right">
			<uni-combox :candidates="arrayHProcName" placeholder="请选择车间" v-model="hform.HProcName"
			<uni-combox :candidates="arrayHProcName" placeholder="请选择工序" v-model="hform.HProcName"
			@input="HProcNameChange"></uni-combox>
			</view>
			</view>
			@@ -344,14 +344,8 @@
			}
			],
			selectedRows: [], // 存储选中的数据
			HModName: "Sc_PackUnionBill_Packing_PDA",
			ModRightName: "CE_PackUnionBill_Packing", //模块权限参数
			titleData: [], //不需要显示的字段
			OperationType: 1, //从缓存列表中返回数据类型（1新增、2从缓存列表中返回）
			//蓝牙相关信息
			printInfo: "", //打印内容
			maskShow: false, //蓝牙打印机显示绑定
			printListData: [], //
			OperationType: 1, //从缓存列表中返回数据类型（1新增、2从缓存列表中返
			//展示表单
			showResultTable: false, // 控制结果表格显示
			resultTableData: [], // 结果表格数据
			@@ -432,24 +426,7 @@
			HMaterModel: '',
			HRoles: [],
			},
			roleOptions: [],
			// [{
			// value: '班组长',
			// text: '班组长'
			// },
			// {
			// value: '班员',
			// text: '班员'
			// },
			// {
			// value: '机修工',
			// text: '机修工'
			// },
			// {
			// value: '操作工',
			// text: '操作工'
			// }
			// ],
			roleOptions: [],
			// 分页模块元数据
			paginationMeta: {

			@@ -784,106 +761,60 @@
			},
			GetMeesageByBarCode(HBarCode) {

			// 获取待组托条码对应的数据
			let sOldBarCode = this.HBarCode
			let HDeleteFlag = sOldBarCode.substring(0, 1)
			let sBarCode = sOldBarCode.slice(1)
			if (HDeleteFlag == '*') {
			if (!sBarCode) {
			return uni.showToast({
			icon: 'none',
			title: '请扫描要删除的条码',
			})
			} else {
			this.HBarCodeFocusRefresh()
			}
			CommonUtils.doRequest2({
			url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
			data: {
			"HInterID": this.hform.HInterID,
			"HBarCode": sBarCode,
			"HBillType": this.HBillType
			},
			resFunction: (res) => {
			let {
			data,
			count,
			Message
			} = res.data
			if (count == 1) {
			CommonUtils.playSound(1)
			//this.DisBillEntryList()
			} else {
			CommonUtils.playSound(0)
			uni.showToast({
			icon: 'none',
			title: Message
			})
			}
			}
			})
			} else {
			let sBarCode = this.HBarCode
			if (!sBarCode) {
			return uni.showToast({
			icon: 'none',
			title: '条码不能为空，请扫描条码！',
			})
			}
			CommonUtils.doRequest2({
			url: '/Sc_EmployeeSignInNoteBillController/APP_Edit_json',
			data: {
			"HInterID": this.hform.HInterID,
			"HBarCode": sBarCode,
			},

			resFunction: (res) => {
			let {
			data,
			count,
			Message
			} = res.data
			if (count == 1) {
			CommonUtils.playSound(1)
			//let data=res.data
			console.log(sBarCode)
			console.log(res.data.data[0])
			console.log(res.data[1])
			debugger
			this.hform.HMouldID = data[0][0].模具id
			console.log("idwei", data[0][0].模具id)
			this.hform.HMouldNo = data[0][0].模具编码
			this.hform.HMouldName = data[0][0].模具名称
			this.hform.HMouldState = data[0][0].模具状态
			this.listData = []
			let tabledata = data[1][0]
			if (data[1].length > 0) {
			this.hform.HEquipID = tabledata.设备内码
			this.hform.HEquipName = tabledata.设备名称
			//
			//this.hform.HSourceID = tabledata.HSourceID
			this.hform.HMaterID = tabledata.HMaterID
			//this.hform.HProcID = tabledata.HSourceInterID
			for (let i = 0; i < data[1].length; i++) {
			this.listData.push(Object.assign(data[1][i], {
			index: i
			}))
			}
			}


			} else {
			CommonUtils.playSound(0)
			this.listData = []
			this.HBarCodeFocusRefresh()
			uni.showToast({
			icon: 'none',
			title: Message
			})
			}
			}
			let sBarCode = this.HBarCode
			if (!sBarCode) {
			return uni.showToast({
			icon: 'none',
			title: '条码不能为空，请扫描条码！',
			})
			}
			CommonUtils.doRequest2({
			url: '/Sc_EmployeeSignInNoteBillController/APP_Edit_json',
			data: {
			"HInterID": this.hform.HInterID,
			"HBarCode": sBarCode,
			},

			resFunction: (res) => {
			let {
			data,
			count,
			Message
			} = res.data
			if (count == 1) {
			//let data=res.data
			console.log(sBarCode)
			console.log(res.data.data[0])
			console.log(res.data[1])
			this.hform.HMouldID = data[0][0].模具id
			this.hform.HMouldNo = data[0][0].模具编码
			this.hform.HMouldName = data[0][0].模具名称
			this.hform.HMouldState = data[0][0].模具状态
			this.listData = []
			let tabledata = data[1][0]
			if (data[1].length > 0) {
			this.hform.HEquipID = tabledata.设备内码
			this.hform.HEquipName = tabledata.设备名称
			this.hform.HMaterID = tabledata.HMaterID
			for (let i = 0; i < data[1].length; i++) {
			this.listData.push(Object.assign(data[1][i], {
			index: i
			}))
			}
			}


			} else {
			CommonUtils.playSound(0)
			this.listData = []
			this.HBarCodeFocusRefresh()
			uni.showToast({
			icon: 'none',
			title: Message
			})
			}
			}
			})
			},
			onRoleChange(e) {
			console.log('选中的角色:', this.hform.HRoles);
			@@ -903,7 +834,6 @@
			"HBillType": this.HBillType
			},
			resFunction: (d) => {
			console.log('d: ', d);
			let {
			count,
			data,