| H5/Js/BarCf.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/BarCfBefore.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/IPQC_SJ/Add.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/PurchaseInventory.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/PurchaseReturn.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/QcPrint.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/Qcrk.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/Scbg.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/Scbl.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/Sccl.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/Scll.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/Scllhb.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/Sctl.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/Js/cprk.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/My.aspx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| H5/PurchaseReturn.aspx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Scripts/config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
H5/Js/BarCf.js
@@ -87,10 +87,13 @@ //that.barMessage = json.data.tbBillList.message; //that.$refs.barcode.focus(); //that.formData.barcode = null; that.$playSound('success'); that.$refs.cfNum.focus(); } else { that.$toast.fail(json.message); that.$playSound('error'); that.$refs.barcode.focus(); that.formData.barcode = null; } @@ -100,6 +103,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); that.$refs.barcode.focus(); }); @@ -113,10 +117,12 @@ if (that.formData.cfNum * 1 <= 0) { that.$toast.fail("拆分数量不能为空!"); that.$playSound('error'); return; } if (that.formData.barcode.length * 1 <= 0) { that.$toast.fail("物料条码不能为空!"); that.$playSound('error'); return; } that.isLoading = true; @@ -134,10 +140,12 @@ that.$refs.barcode.focus(); that.formData.barcode = null; that.formData.cfNum = null; that.$playSound('success'); that.$notify({ type: 'success', message: json.message }); } else { that.$toast.fail(json.message); that.$playSound('error'); that.$refs.cfNum.focus(); } that.isLoading = false; @@ -145,6 +153,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, H5/Js/BarCfBefore.js
@@ -87,10 +87,12 @@ //that.barMessage = json.data.tbBillList.message; //that.$refs.barcode.focus(); //that.formData.barcode = null; that.$playSound('success'); that.$refs.cfNum.focus(); } else { that.$toast.fail(json.message); that.$playSound('error'); that.$refs.barcode.focus(); that.formData.barcode = null; } @@ -100,6 +102,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); that.$refs.barcode.focus(); }); @@ -113,16 +116,19 @@ if (that.formData.cfNum * 1 <= 0) { that.$toast.fail("拆分数量不能为空!"); that.$playSound('error'); return; } // ... existing code ... if (parseFloat(that.formData.cfNum) > parseFloat(that.formData.sumQuantity)) { that.$toast.fail("拆分数量不能大于条码数量!"); that.$playSound('error'); return; } // ... existing code ... if (that.formData.barcode.length * 1 <= 0) { that.$toast.fail("物料条码不能为空!"); that.$playSound('error'); return; } that.isLoading = true; @@ -140,6 +146,7 @@ that.$refs.barcode.focus(); that.formData.barcode = null; that.formData.cfNum = null; that.$playSound('success'); that.$notify({ type: 'success', message: json.message }); } else { @@ -151,6 +158,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, H5/Js/IPQC_SJ/Add.js
@@ -186,9 +186,11 @@ }, true, 1).then(function (res1) { if (res1.rtnCode == 1) { that.tableMxData = res1.rtnData; that.$playSound('success'); } else { that.$toast.fail(res1.rtnMsg); that.$playSound('error'); } }).catch(function (error) { that.$toast.fail("网络错误,请重试!"); @@ -201,6 +203,7 @@ if (!that.inputValue) { this.$toast.fail("检验值不能为空"); that.$playSound('error'); that.isLoading = false; return; } @@ -222,12 +225,14 @@ that.$notify({ type: 'success', message: res1.rtnMsg }); that.$playSound('success'); that.refreshJYItem();//刷新检验项目 //that.handleTabClick();//刷新检验明细面板 //that.$refs.inputValue.focus(); that.inputValue = null; } else { that.$toast.fail(res1.rtnMsg); that.$playSound('error'); that.inputValue = null; } that.isLoading = false; @@ -311,9 +316,11 @@ }, true, 1).then(function (res1) { if (res1.rtnData.outSum == 1) { that.$notify({ type: 'success', message: '提交成功' }); that.$playSound('success'); that.init(); } else { that.$toast.fail(res1.rtnData.outMsg); that.$playSound('error'); } that.ttrre = false }).catch(function (error) { @@ -336,9 +343,11 @@ }, true, 1).then(res1 => { if (res1.rtnCode == 1) { that.$notify({ type: 'success', message: '重新加载成功' }); that.$playSound('success'); that.init(); } else { that.$toast.fail(res1.rtnMsg); that.$playSound('error'); } that.isLoading = false; }).catch(error => { H5/Js/PurchaseInventory.js
@@ -70,6 +70,7 @@ var json = res; if (json.status == 0) { that.depotData = json.data.tbBillList; that.$playSound('success'); that.$refs.barcode.focus(); } else { H5/Js/PurchaseReturn.js
@@ -55,6 +55,7 @@ var json = res; if (json.status == 0) { that.itemOutNoList = json.data.tbBillList; that.$playSound('success'); that.itemOutNoStr = that.itemOutNoList.map(s => { return { name: s.billNo } }); @@ -133,6 +134,7 @@ if (json.status == 0) { that.ItemDetail = json.data.tbBillList; that.$refs.barcode.focus(); that.$playSound('success'); } else { that.$playSound('error'); @@ -168,7 +170,6 @@ //if (json.data.tbBillList) { // //this.ToErp(); //} else { //} that.scanFormData.quantity = json.data.tbBillList.barcodeNum that.getItem(); @@ -242,16 +243,19 @@ var json = res; if (json.status == 0) { // that.modeInfo = json.data.tbBillList; that.getItem(); that.scanInfo.splitNum = null; that.scanFormData.quantity = null; that.scanFormData.barcode = null; that.$notify({ type: 'success', message: json.message }); that.$playSound('success'); that.sendMessage(json.data.tbBillList); //kyy // that.sendMessage(json.data.tbBillList); that.sendPrintMessage(json.data.tbBillList); that.$refs.barcode.focus(); that.getItem(); //kyy // that.getItem(); } else { that.$playSound('error'); H5/Js/QcPrint.js
@@ -135,6 +135,7 @@ that.depotsInfo = json.data.tbBillList.depotsInfo; that.orgInfo = json.data.tbBillList.orgInfo; that.orgID = json.data.tbBillList.fSubsidiary; that.$playSound('success'); that.$refs.selectKey.focus(); } else { H5/Js/Qcrk.js
@@ -28,6 +28,7 @@ if (!value) { this.$toast.fail("库位编码"); that.$playSound('error'); return; } @@ -42,17 +43,20 @@ /*that.$notify({ type: 'success', message: json.data.tbBillList });*/ if (!that.barcode?.trim()) { that.$refs.barcode.focus(); that.$playSound('succcess'); } else { that.scanBarcode(); } } else { that.$toast.fail(json.message); that.$playSound('error'); } }) .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, @@ -72,11 +76,13 @@ that.num = res.data.tbBillList.quantity; if (!that.depotNo?.trim()) { that.$refs.depotNo.focus(); that.$playSound('success'); } else { that.scanBarcode(); } } else { that.$playSound('error'); that.$toast.fail(json.message); that.$refs.barcode.focus(); that.barcode = null; @@ -85,6 +91,7 @@ }) .catch(function (error) { that.isLoading = false; that.$playSound('error'); that.$toast.fail("网络错误,请重试!" + error.message); that.$refs.barcode.focus(); }); @@ -94,18 +101,21 @@ var that = this; if (!that.userInfo.loginAccount) { this.$toast.fail("请重新检查登录状态"); that.$playSound('error'); that.isLoading = false; return; } if (!that.barcode?.trim()) { this.$toast.fail("条码不能为空"); that.$playSound('error'); that.isLoading = false; return; } if (!that.depotNo?.trim()) { this.$toast.fail("仓库不能为空"); that.$playSound('error'); that.isLoading = false; return; } @@ -119,6 +129,7 @@ var json = res; if (json.status == 0) { that.$notify({ type: 'success', message: json.data.tbBillList.message }); that.$playSound('success'); that.barcode = null; that.num = null; that.barInfo = []; @@ -126,12 +137,14 @@ } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); } H5/Js/Scbg.js
@@ -68,15 +68,18 @@ that.$refs.barcode.focus(); } else { that.$toast("未找到匹配的 用户名称"); that.$playSound('error'); } } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) .catch(function (error) { that.isLoading = false; that.$playSound('error'); that.$toast.fail("网络错误,请重试!"); console.log(error); }); @@ -104,17 +107,20 @@ that.actions = json.data.tbBillList.map(item => { return { name: item.staffName } }); that.$playSound('success'); that.stafList = json.data.tbBillList; } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, @@ -136,9 +142,11 @@ }); that.stafList = json.data.result.rksqOrderList; that.$playSound('success'); } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) @@ -183,6 +191,7 @@ this.$refs.sjBillNo.focus(); } else { this.$toast("未找到匹配的送检单号"); that.$playSound('error'); } //this.GetMesItemBlDetailByBillNo(); //this.$toast(item.name); @@ -203,16 +212,19 @@ }); that.stafList = json.data.tbBillList; that.$playSound('success'); console.log('DAWDADWDADADADWD' + that.stafList); } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); // 默认情况下点击选项时不会自动收起 @@ -243,16 +255,19 @@ if (!that.userInfo.loginAccount) { this.$toast.fail("请重新检查登录状态"); that.$playSound('error'); return; } if (!that.barcode) { this.$toast.fail("条码不能为空"); that.$playSound('error'); return; } if (!that.stafId) { that.$toast.fail("员工不允许为空"); that.$playSound('error'); return; } @@ -281,11 +296,13 @@ console.log(entity.barcodesDetail); console.log(that.BarcodesDetail); that.$notify({ type: 'success', message: '扫描成功' }); that.$playSound('success'); that.$refs.barcode.focus(); that.barcode = null; } else { that.$toast.fail(json.message); that.$playSound('error'); that.$refs.barcode.focus(); that.barcode = null; } @@ -294,6 +311,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, @@ -306,6 +324,7 @@ if (!that.userInfo.loginAccount) { this.$toast.fail("请重新检查登录状态"); that.$playSound('error'); that.load = false; return; } @@ -330,6 +349,7 @@ if (!that.sjBillNo) { this.$toast.fail("送检单号不能为空"); that.$playSound('error'); that.load = false; return; } @@ -344,10 +364,13 @@ var json = res; if (json.status == 0) { that.$notify({ type: 'success', message: '送检成功' }); that.BarcodesDetail = []; that.$playSound('success'); } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; that.load = false; @@ -355,6 +378,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, @@ -377,10 +401,12 @@ console.log(that.BarcodesDetail); that.$notify({ type: 'success', message: '扫描成功' }); that.$refs.sjBillNo.focus(); that.$playSound('success'); } else { that.$toast.fail(json.message); that.$refs.sjBillNo.focus(); that.$playSound('error'); that.barcode = null; } that.isLoading = false; @@ -388,6 +414,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); // 默认情况下点击选项时不会自动收起 H5/Js/Scbl.js
@@ -56,12 +56,14 @@ } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, @@ -88,9 +90,11 @@ that.ItemDetail = json.data.tbBillList; that.daa001 = json.data.tbBillList.daa001; that.$refs.barcode.focus(); that.$playSound('success'); } else { that.$toast.fail(json.message); that.$playSound('error'); that.$refs.billNo.focus(); that.billNo = ""; that.daa001 = ""; @@ -101,6 +105,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); //console.log(error); tthat.$refs.billNo.focus(); that.billNo = ""; @@ -121,24 +126,28 @@ if (!that.userInfo.loginAccount) { this.$toast.fail("请重新检查登录状态"); that.$playSound('error'); that.isLoading = false; return; } if (!that.barcode) { this.$toast.fail("条码不能为空"); that.$playSound('error'); that.isLoading = false; return; } if (!that.billNo) { this.$toast.fail("补料单号不能为空"); that.$playSound('error'); that.isLoading = false; return; } if (!that.daa001) { this.$toast.fail("工单号不能为空"); that.$playSound('error'); that.isLoading = false; return; } @@ -203,30 +212,35 @@ if (!that.userInfo.loginAccount) { this.$toast.fail("请重新检查登录状态"); that.$playSound('error'); that.isLoading = false; return; } if (!that.barcode) { this.$toast.fail("条码不能为空"); that.$playSound('error'); that.isLoading = false; return; } if (!that.billNo) { this.$toast.fail("补料单号不能为空"); that.$playSound('error'); that.isLoading = false; return; } if (!that.daa001) { this.$toast.fail("工单号不能为空"); that.$playSound('error'); that.isLoading = false; return; } if (!that.splitNum) { this.$toast.fail("发货数量不能为空"); that.$playSound('error'); that.isLoading = false; return; } @@ -244,6 +258,7 @@ if (json.status == 0) { that.ItemBlDetail = json.data.pendingList; that.$notify({ type: 'success', message: '扫描成功' }); that.$playSound('success'); that.$refs.barcode.focus(); that.barcode = ""; that.num = ""; @@ -252,6 +267,7 @@ } else { that.$toast.fail(json.message); that.$playSound('error'); that.$refs.barcode.focus(); } that.isLoading = false; @@ -259,6 +275,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); //console.log(error); that.$refs.barcode.focus(); that.barcode = ""; H5/Js/Sccl.js
@@ -48,12 +48,14 @@ } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, @@ -84,15 +86,18 @@ if (json.status == 0) { that.ItemBlDetail = json.data.tbBillList.item; that.daa001 = json.data.tbBillList.bl001; that.$playSound('success'); } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, @@ -105,24 +110,28 @@ if (!that.userInfo.loginAccount) { this.$toast.fail("请重新检查登录状态"); that.$playSound('error'); that.isLoading = false; return; } if (!that.barcode) { this.$toast.fail("条码不能为空"); that.$playSound('error'); that.isLoading = false; return; } if (!that.billNo) { this.$toast.fail("补料单号不能为空"); that.$playSound('error'); that.isLoading = false; return; } if (!that.daa001) { this.$toast.fail("工单号不能为空"); that.$playSound('error'); that.isLoading = false; return; } @@ -143,16 +152,19 @@ that.sms = json.data.tbBillList.item.fum; that.num = json.data.tbBillList.item.num; that.ItemBlDetail = json.data.tbBillList.pendingList that.$playSound('error'); that.$notify({ type: 'success', message: '扫描成功' }); } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, @@ -164,30 +176,35 @@ if (!that.userInfo.loginAccount) { this.$toast.fail("请重新检查登录状态"); that.$playSound('error'); that.isLoading = false; return; } if (!that.barcode) { this.$toast.fail("条码不能为空"); that.$playSound('error'); that.isLoading = false; return; } if (!that.billNo) { this.$toast.fail("补料单号不能为空"); that.$playSound('error'); that.isLoading = false; return; } if (!that.daa001) { this.$toast.fail("工单号不能为空"); that.$playSound('error'); that.isLoading = false; return; } if (!that.sms) { this.$toast.fail("发货数量不能为空"); that.$playSound('error'); that.isLoading = false; return; } @@ -204,16 +221,19 @@ var json = res; if (json.status == 0) { that.ItemBlDetail = json.data.tbBillList.pendingList; that.$playSound('success'); that.$notify({ type: 'success', message: '扫描成功' }); } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); } H5/Js/Scll.js
@@ -48,10 +48,12 @@ console.log(json) that.ItemDetail = json.data.tbBillList; that.modeInfo.planNo = json.data.tbBillList.planNo; that.$playSound('success'); that.$refs.barcode.focus(); } else { that.$toast.fail(json.message); that.$playSound('error'); that.$refs.daa001.focus(); that.modeInfo.daa001 = ""; that.modeInfo.planNo = ""; @@ -62,6 +64,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); that.$refs.daa001.focus(); that.modeInfo.daa001 = ""; @@ -76,10 +79,12 @@ var that = this; if (that.modeInfo.daa001.length <= 0) { that.$toast.fail("工单单号不能为空!"); that.$playSound('error'); return; } if (that.scanInfo.barcode.length * 1 <= 0) { that.$toast.fail("物料条码不能为空!"); that.$playSound('error'); return; } @@ -101,6 +106,7 @@ } else if (json.status == 2) { that.$refs.splitNum.focus(); that.$playSound('success'); that.scanInfo.splitNum = json.data.tbBillList.splitNum; that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum; } @@ -129,14 +135,17 @@ var that = this; if (that.modeInfo.daa001.length <= 0) { that.$toast.fail("工单单号不能为空!"); that.$playSound('error'); return; } if (that.scanInfo.splitNum * 1 <= 0) { that.$toast.fail("拆分数量不能为空!"); that.$playSound('error'); return; } if (that.scanInfo.barcode.length * 1 <= 0) { that.$toast.fail("物料条码不能为空!"); that.$playSound('error'); return; } //that.ip = ""; H5/Js/Scllhb.js
@@ -48,10 +48,12 @@ console.log(json) that.ItemDetail = json.data.tbBillList; that.modeInfo.planNo = json.data.tbBillList.planNo; that.$playSound('success'); that.$refs.barcode.focus(); } else { that.$toast.fail(json.message); that.$playSound('error'); that.$refs.daa001.focus(); that.modeInfo.daa001 = ""; that.modeInfo.planNo = ""; @@ -62,6 +64,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); that.$refs.daa001.focus(); that.modeInfo.daa001 = ""; @@ -76,10 +79,12 @@ var that = this; if (that.modeInfo.daa001.length <= 0) { that.$toast.fail("汇报单号不能为空!"); that.$playSound('error'); return; } if (that.scanInfo.barcode.length * 1 <= 0) { that.$toast.fail("物料条码不能为空!"); that.$playSound('error'); return; } @@ -101,6 +106,7 @@ } else if (json.status == 2) { that.$refs.splitNum.focus(); that.$playSound('success'); that.scanInfo.splitNum = json.data.tbBillList.splitNum; that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum; } @@ -129,14 +135,17 @@ var that = this; if (that.modeInfo.daa001.length <= 0) { that.$toast.fail("工单单号不能为空!"); that.$playSound('error'); return; } if (that.scanInfo.splitNum * 1 <= 0) { that.$toast.fail("拆分数量不能为空!"); that.$playSound('error'); return; } if (that.scanInfo.barcode.length * 1 <= 0) { that.$toast.fail("物料条码不能为空!"); that.$playSound('error'); return; } //that.ip = ""; @@ -347,6 +356,7 @@ console.log('提取的DAA001:', this.modeInfo.daa001); } else { this.$toast.fail('工单号格式异常'); that.$playSound('error'); this.modeInfo.daa001 = ''; } this.getModel(); H5/Js/Sctl.js
@@ -50,12 +50,14 @@ } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, @@ -83,9 +85,11 @@ if (json.status == 0) { that.ItemDetail = json.data.tbBillList; that.$refs.sectionCode.focus(); that.$playSound('success'); } else { that.$toast.fail(json.message); that.$playSound('error'); that.$refs.billNo.focus(); that.ItemDetail = null; that.billNo = null; @@ -95,6 +99,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); that.$refs.billNo.focus(); that.ItemDetail = null; that.billNo = null; @@ -115,10 +120,12 @@ var json = res; if (json.status == 0) { that.depot = json.data.tbBillList; that.$playSound('success'); that.$refs.barcode.focus(); } else { that.$toast.fail(json.message); that.$playSound('error'); that.$refs.sectionCode.focus(); that.depotSectionCode = null; } @@ -127,6 +134,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); that.$refs.sectionCode.focus(); that.depotSectionCode = null; console.log(error); @@ -141,6 +149,7 @@ if (!that.billNo) { this.$toast.fail("申请单号不能为空"); that.$playSound('error'); that.$refs.billNo.focus(); that.isLoading = false; return; @@ -148,6 +157,7 @@ if (!that.depotSectionCode) { this.$toast.fail("库位编号不能为空"); that.$playSound('error'); that.$refs.sectionCode.focus(); that.depotSectionCode = null; that.isLoading = false; @@ -156,6 +166,7 @@ if (!that.barcode) { this.$toast.fail("条码编号不能为空"); that.$playSound('error'); that.$refs.barcode.focus(); that.barcode = null; that.isLoading = false; @@ -164,6 +175,7 @@ if (!that.userInfo.loginAccount) { this.$toast.fail(json.message); that.$playSound('error'); return; } @@ -179,16 +191,19 @@ that.itemNo = json.data.tbBillList.itemNo; that.sms = json.data.tbBillList.num; that.$playSound('success'); that.$notify({ type: 'success', message: '扫描成功' }); } else { that.$toast.fail(json.message); that.$playSound('error'); } that.isLoading = false; }) .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); }); }, H5/Js/cprk.js
@@ -55,6 +55,7 @@ if (that.formData.barcode == "" || that.formData.barcode == null) { that.$refs.barcode.focus(); that.$playSound('success'); that.isLoading = false; } else { that.getScan(); @@ -62,6 +63,7 @@ } else { that.$toast.fail(json.message); that.$playSound('error'); that.formData.sectionCode = null; that.$refs.sectionCode.focus(); that.isLoading = false; @@ -72,6 +74,7 @@ .catch(function (error) { that.isLoading = false; that.$toast.fail("网络错误,请重试!"); that.$playSound('error'); console.log(error); that.formData.sectionCode = null; that.$refs.sectionCode.focus(); @@ -97,6 +100,7 @@ //that.formData.sumQuantity = json.data.tbMesItems.quantity; if (that.formData.sectionCode == "" || that.formData.sectionCode == null) { that.$refs.sectionCode.focus(); that.$playSound('sucess'); that.isLoading = false; } else { that.getScan(); @@ -104,6 +108,7 @@ } else { that.$toast.fail(json.message); that.$playSound('error'); that.$refs.barcode.focus(); that.formData.barcode = null; that.isLoading = false; @@ -112,6 +117,7 @@ }) .catch(function (error) { that.isLoading = false; that.$playSound('error'); that.$toast.fail("网络错误,请重试!"); console.log(error); that.$refs.barcode.focus(); @@ -122,10 +128,12 @@ if (that.formData.sectionCode.length * 1 <= 0) { that.$toast.fail("库位编码不能为空!"); that.$playSound('error'); return; } if (that.formData.barcode.length * 1 <= 0) { that.$toast.fail("物料条码不能为空!"); that.$playSound('error'); return; } that.isLoading = true; @@ -141,9 +149,11 @@ that.$refs.barcode.focus(); that.formData.barcode = null; that.formData.cfNum = null; that.$playSound('success'); that.$notify({ type: 'success', message: json.message }); } else { that.$playSound('error'); that.$toast.fail(json.message); that.$refs.barcode.focus(); that.formData.barcode = null; @@ -152,6 +162,7 @@ }) .catch(function (error) { that.isLoading = false; that.$playSound('error'); that.$toast.fail("网络错误,请重试!"); console.log(error); }); @@ -199,6 +210,7 @@ this.Message = ""; if (this.tableData.length == 0) { this.Message = "条码为空,无法推送ERP"; that.$playSound('error'); return; } let userName = this.$loginInfo.account; @@ -237,6 +249,7 @@ this.messageCenter.dealWith = 0; this.messageCenter.status = 1; this.messageCenter.resultData = res.msg; that.$playSound('success'); this.updateMessage(this.messageCenter); } }); @@ -252,8 +265,10 @@ }).then(res => { if (res.data.tbBillList) { this.Message += " 审核成功!"; that.$playSound('success'); } else { this.Message += " 审核失败:"; that.$playSound('error'); } let entity = { H5/My.aspx
@@ -59,6 +59,6 @@ </asp:Content> <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server"> <script src="Js/comWebNav.js"></script> <script src="Js/My.js?<%=123456 %>"></script> <script src="Js/My.js?<%=123457 %>"></script> </asp:Content> H5/PurchaseReturn.aspx
@@ -1,127 +1,155 @@ <%@ Page Title="采购退料" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="PurchaseReturn.aspx.cs" Inherits="H5_Scll" %> <%@ Page Title="采购退料" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="PurchaseReturn.aspx.cs" Inherits="H5_Scll" %> <asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server"> <style> .bg-info { background-color:#fff; } </style> .bg-info { background-color: #fff; } </style> </asp:Content> <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server"> <div class="content-wrapper"> <van-nav-bar title="采购退料" left-text="返回" left-arrow @click-left="GoBack()" ></van-nav-bar> <div class="mySolid"> <van-cell-group> <van-field value="" label="申请单号" clearable placeholder="选择申请单号" :right-icon-size="19" v-model="scanFormData.itemOutNo" @keyup.enter.native="getItem" v-focus.noKeyboard ><template #button> <van-button size="small" type="info" plain @click="getItemOutNo" >选择</van-button> </template></van-field> <van-field ref="barcode" v-model="scanFormData.barcode" label="物料条码" clearable placeholder="请扫描物料条码" :right-icon-size="19" v-focus.noKeyboard @keyup.enter.native="SaveBarCodes" <%--@change="SaveBarCodes"--%> ></van-field> <van-field v-model="scanFormData.itemNo" label="物料编码" placeholder="物料编码" disabled ></van-field> <van-field v-model="scanFormData.quantity" label="数量" placeholder="数量" disabled ></van-field> <van-field ref="splitNum" v-model="scanInfo.splitNum" center clearable label="发料数量" placeholder="发料数量"> <van-button slot="button" type="info" size="small" plain @click="getChaiFen"> 条码拆分 </van-button> </van-field> </van-cell-group> <div class="content-wrapper"> <!-- 导航栏 --> <van-nav-bar title="采购退料" left-text="返回" left-arrow @click-left="GoBack()" ></van-nav-bar> <!-- 表单区域 --> <div class="mySolid"> <van-cell-group> <!-- 申请单号输入框 --> <van-field value="" label="申请单号" clearable placeholder="选择申请单号" :right-icon-size="19" v-model="scanFormData.itemOutNo" @keyup.enter.native="getItem" v-focus.noKeyboard > <template #button> <van-button size="small" type="info" plain @click="getItemOutNo">选择</van-button> </template> </van-field> <!-- 物料条码输入框 --> <van-field ref="barcode" v-model="scanFormData.barcode" label="物料条码" clearable placeholder="请扫描物料条码" :right-icon-size="19" v-focus.noKeyboard @keyup.enter.native="SaveBarCodes" <%--@change="SaveBarCodes"--%> ></van-field> <!-- 物料编码(禁用) --> <van-field v-model="scanFormData.itemNo" label="物料编码" placeholder="物料编码" disabled ></van-field> <!-- 数量(禁用) --> <van-field v-model="scanFormData.quantity" label="数量" placeholder="数量" disabled ></van-field> <!-- 发料数量与条码拆分 --> <van-field ref="splitNum" v-model="scanInfo.splitNum" center clearable label="发料数量" placeholder="发料数量" > <van-button slot="button" type="info" size="small" plain @click="getChaiFen" > 条码拆分 </van-button> </van-field> </van-cell-group> </div> <!-- 标签页区域 --> <van-tabs color="#000" title-active-color="#0283EF"> <!-- 待扫物料标签页 --> <van-tab title="待扫物料" class="mySolid font"> <van-row> <van-col span="8" class="text-left padding-left">物料</van-col> <van-col span="8" class="text-left padding-left">规格</van-col> <van-col span="3">待扫</van-col> <van-col span="5">推荐库位</van-col> </van-row> <van-row v-for="(itm, index) in ItemDetail.items" :key="index"> <van-col span="8" class="text-left padding-left"> <div class="blue-text">{{itm.itemNo}}</div> <div>{{itm.itemName}}</div> </van-col> <van-col span="8" class="text-left padding-left"> <div>{{itm.itemModel}}</div> </van-col> <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col> <van-col span="5">{{itm.recoKw}}</van-col> </van-row> </van-tab> <!-- 已扫物料标签页 --> <van-tab title="已扫物料" class="mySolid font"> <van-row> <van-col span="8" class="text-left padding-left">物料</van-col> <van-col span="8" class="text-left padding-left">规格</van-col> <van-col span="3">需领数</van-col> <van-col span="5">已领数</van-col> </van-row> <van-row v-for="(itm, index) in ItemDetail.ysitems" :key="index"> <van-col span="8" class="text-left padding-left"> <div class="blue-text">{{itm.itemNo}}</div> <div>{{itm.itemName}}</div> </van-col> <van-col span="8" class="text-left padding-left"> <div>{{itm.itemModel}}</div> </van-col> <van-col span="3">{{itm.fQty}}</van-col> <van-col span="5" class="blue-text">{{itm.sQty}}</van-col> </van-row> </van-tab> </van-tabs> <%--<van-button type="primary" @click="SaveBarCodes">确认</van-button>--%> <!-- 底部弹窗 --> <van-action-sheet v-model="show" :actions="itemOutNoStr" @select="onSelect" ></van-action-sheet> </div> <van-tabs color="#000" title-active-color="#0283EF"> <van-tab title="待扫物料" class="mySolid font"> <van-row> <van-col span="8" class="text-left padding-left">物料</van-col> <van-col span="8" class="text-left padding-left">规格</van-col> <van-col span="3">待扫</van-col> <van-col span="5">推荐库位</van-col> </van-row> <van-row v-for="(itm,index) in ItemDetail.items" :key="index"> <van-col span="8" class="text-left padding-left"> <div class="blue-text">{{itm.itemNo}}</div> <div>{{itm.itemName}}</div> </van-col> <van-col span="8" class="text-left padding-left"> <div>{{itm.itemModel}}</div> </van-col> <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col> <van-col span="5">{{itm.recoKw}}</van-col> </van-row> </van-tab> <van-tab title="已扫物料" class="mySolid font"> <van-row> <van-col span="8" class="text-left padding-left">物料</van-col> <van-col span="8" class="text-left padding-left">规格</van-col> <van-col span="3">需领数</van-col> <van-col span="5">已领数</van-col> </van-row> <van-row v-for="(itm,index) in ItemDetail.ysitems" :key="index"> <van-col span="8" class="text-left padding-left"> <div class="blue-text">{{itm.itemNo}}</div> <div>{{itm.itemName}}</div> </van-col> <van-col span="8" class="text-left padding-left"> <div>{{itm.itemModel}}</div> </van-col> <van-col span="3">{{itm.fQty}}</van-col> <van-col span="5" class="blue-text">{{itm.sQty}}</van-col> </van-row> </van-tab> </van-tabs> <%-- <van-button type="primary" @click="SaveBarCodes" >确认</van-button>--%> <van-action-sheet v-model="show" :actions="itemOutNoStr" @select="onSelect" ></van-action-sheet> </div> </asp:Content> <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server"> <comloading v-if="isLoading"></comloading> <comloading v-if="isLoading"></comloading> <%--<comback ></comback>--%> </asp:Content> <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server"> <script src="Js/PurchaseReturn.js?<%=12811111 %>"></script> </asp:Content> </asp:Content> Scripts/config.js
@@ -1,10 +1,9 @@ /*var APIURL = "http://192.168.8.8:8083/api/";//PDA后端发布测试地址(内网)*/ var APIURL = "http://192.168.8.8:83/api/";//PDA后端发布正式地址(内网) /*var APIURL = "http://localhost:5204/api/";//本地调试地址*/ //var APIURL = "http://192.168.8.8:8083/api/";//PDA后端发布测试地址(内网) //var APIURL = "http://192.168.8.8:83/api/";//PDA后端发布正式地址(内网) var APIURL = "http://localhost:5204/api/";//本地调试地址 var APIURL_PC = "http://192.168.8.8:81/"; //PC后端的正式地址(内网) /*var APIURL_PC = "http://192.168.8.8:8081/"; //PC后端的测试地址(内网)*/ /*var APIURL_PC = "http://116.148.211.203:8081/"; //PC后端的测试地址(外网)*/ //var APIURL_PC = "http://192.168.8.8:81/"; //PC后端的正式地址(内网) var APIURL_PC = "http://192.168.8.8:8081/"; //PC后端的测试地址(外网) var APIURL_IMAGE = APIURL_PC+"upload/"; var ISNEEDLOGIN = true; @@ -169,32 +168,102 @@ } // 新增全局打印方法 //// 新增全局打印方法 //Vue.prototype.sendPrintMessage = function (tbBillList) { // const cfDetails = tbBillList.cfBarInfo.map(item => { // return "! 0 200 200 210 1\r\n" + // "PAGE - WIDTH 700 \r\n" + // "GAP-SENSE \r\n" + ///* "BOX 0 0 700 180 0 \r\n" +*/ // `T 16 0 10 10 物料编码:\r\n` + // `T 55 3 120 10 ${item.iteM_NO}\r\n` + // `T 16 0 310 10 ${item.item_name}\r\n` + // "T 55 2 10 42 物料规格:\r\n" + // `T 55 2 110 42 ${item.item_model}\r\n` + // "T 16 0 10 78 数量:\r\n" + // `T 0 5 90 78 ${item.quantity}\r\n` + // `T 16 5 180 78 ${item.barType}\r\n` + // `BARCODE 128 1 25 35 350 130 ${item.iteM_BARCODE}\r\n` + ///* `T 0 1 350 130 ${item.iteM_BARCODE}\r\n` +*/ // "T 55 0 10 125 创建时间:\r\n" + // `T 55 0 120 125 ${item.creatE_DATE}\r\n` + // "T 55 0 10 150 打印时间:\r\n" + // `T 55 0 120 150 ${item.print_date}\r\n` + // "B QR 580 12 M 2 U 4\r\n" + // `MA,${item.iteM_BARCODE}\r\n` + // "ENDQR\r\nFORM\r\nPRINT\r\n"; // }); Vue.prototype.sendPrintMessage = function (tbBillList) { const cfDetails = tbBillList.cfBarInfo.map(item => { return "! 0 200 200 210 1\r\n" + "PAGE - WIDTH 700 \r\n" + "GAP-SENSE \r\n" + /* "BOX 0 0 700 180 0 \r\n" +*/ `T 16 0 10 10 物料编码:\r\n` + `T 55 3 120 10 ${item.iteM_NO}\r\n` + `T 16 0 310 10 ${item.item_name}\r\n` + "T 55 2 10 42 物料规格:\r\n" + `T 55 2 110 42 ${item.item_model}\r\n` + "T 16 0 10 78 数量:\r\n" + `T 0 5 90 78 ${item.quantity}\r\n` + `T 16 5 180 78 ${item.barType}\r\n` + `BARCODE 128 1 25 35 350 130 ${item.iteM_BARCODE}\r\n` + /* `T 0 1 350 130 ${item.iteM_BARCODE}\r\n` +*/ "T 55 0 10 125 创建时间:\r\n" + `T 55 0 120 125 ${item.creatE_DATE}\r\n` + "T 55 0 10 150 打印时间:\r\n" + `T 55 0 120 150 ${item.print_date}\r\n` + "B QR 580 12 M 2 U 4\r\n" + `MA,${item.iteM_BARCODE}\r\n` + "ENDQR\r\nFORM\r\nPRINT\r\n"; return "! 0 195 200 472 1\r\n" + // 基础偏移量左移5像素 "PAGE-WIDTH 545\r\n" + // 页面宽度减少5像素 "GAP-SENSE\r\n" + // 外框 - 整体左移5像素 "BOX -3 2 543 470 2\r\n" + // ==================== 物料条码(第一行)==================== "LINE -3 62 425 62 1\r\n" + "T 55 0 8 27 物料条码:\r\n" + `T 55 3 120 27 ${item.iteM_BARCODE}\r\n` + // 物料条码值 // ==================== 物料编码(第二行)==================== "LINE -3 124 543 124 1\r\n" + "T 55 0 8 89 编码:\r\n" + `T 55 3 120 89 ${item.iteM_NO}\r\n` + // 物料编码值 // ==================== 供应商(第三行)==================== "LINE -3 186 543 186 1\r\n" + // 第3条分隔线(间隔62) "T 55 0 8 151 供应商:\r\n" + `T 55 3 120 151 ${item.supp_name || ''}\r\n` + // 供应商值(假设字段名) // ==================== 物料名称(第四行)==================== "LINE -3 248 543 248 1\r\n" + // 第4条分隔线(间隔62) "T 55 0 8 213 名称:\r\n" + `T 55 3 120 213 ${item.item_name}\r\n` + // 物料名称值 // ==================== 规格型号(第五行)==================== "LINE -3 310 543 310 1\r\n" + // 第5条分隔线(间隔62) "T 55 0 8 275 规格:\r\n" + `T 55 3 120 275 ${item.item_model}\r\n` + // 规格型号值 // ==================== 仓库(第六行)==================== "LINE -3 360 543 360 1\r\n" + // 第6条分隔线(移至竖线顶端Y=360) "T 55 0 8 335 仓库:\r\n" + `T 55 3 120 335 ${item.depot_name || ''}\r\n` + // 仓库值(假设字段名) // ==================== 数量和仓管员(第七行)==================== "LINE -3 430 543 430 1\r\n" + // 底部横线(与竖线底端对齐) "T 55 0 8 380 数量:\r\n" + // 文本位置保持 `T 55 3 120 380 ${item.quantity}\r\n` + // 数量值 "T 55 0 275 380 仓管员:\r\n" + // 文本位置保持 `T 55 3 395 380 ${item.cgy || ''}\r\n` + // 仓管员值(假设字段名) // 中间竖线分隔(范围Y=360-430,与上下横线衔接) "LINE 265 430 265 360 1\r\n" + // 竖线顶端对齐仓库行分隔线 // ==================== 底部时间信息 ==================== "T 55 0 395 440 打印时间\r\n" + // 位置保持 "T 55 0 8 440 " + new Date().toLocaleString('zh-CN', { // 时间格式改为年月日时分秒 year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit', second: '2-digit' }) + "\r\n" + // ==================== 二维码区域(左移5像素)==================== "BOX 425 3 535 113 1\r\n" + // 位置保持 "B QR 430 8 M 2 U 5\r\n" + // 位置保持 `MA,${item.iteM_BARCODE}\r\n` + // 使用物料条码生成二维码 "ENDQR\r\n" + "FORM\r\n" + "PRINT\r\n"; }); let sendData = { Type: 'Bar', Barcode: tbBillList.cfBarInfo[0].iteM_BARCODE,