From 00ed7e51cecfc5e97e88bf2c9838c87362ea396d Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 07 四月 2026 15:36:11 +0800
Subject: [PATCH] 添加 配置 开启 socket.io 以启动客户端静默打印功能
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue | 92 +++++++++++++++++----------------------------
1 files changed, 35 insertions(+), 57 deletions(-)
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
index bf76aab..64df014 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
@@ -83,7 +83,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏍囧噯鍖呰鏁�">
+ <el-form-item label="鏁伴噺/绠�">
<el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
</el-form-item>
</el-col>
@@ -164,7 +164,7 @@
</el-tab-pane>
</el-tabs>
</el-form>
-
+
<!-- 鎵撳嵃寮圭獥 -->
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
<PrintList :linterid="rowSel.toString()" :MyMsg="rowSel.toString()" Type="HGy_BarCodeBill"
@@ -188,7 +188,7 @@
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛璁块棶鍓嶇紑
HModName: "Gy_BarCodeBill_JinLong", //妯″潡鍚嶇О
- disabledFlag_BarCodeProduce:false, //绂佺敤鏍囪-鐢熸垚 鎸夐挳
+ disabledFlag_BarCodeProduce:false, //绂佺敤鏍囪-鐢熸垚 鎸夐挳 // iframe URL
rules:{ //琛ㄥごform 鏍¢獙
},
@@ -321,26 +321,22 @@
}
},
//#endregion
-
- //#region 鏉$爜琛屽彿鏌ヨ鎸夐挳鐐瑰嚮浜嬩欢
+ //#region涓嬫帹鐢熸垚鏉$爜
async get_BarCodeBillHSEQ() {
- var params = this.get_UrlVars();
- var HSourceInterID = params[params[1]];
- var HSourceEntryID = params[params[2]];
- var res2 = await this.getPushSource_POInStockBillInit1(HSourceInterID);
- var res1 = await this.getPushSource_POInStockBillInit2(HSourceEntryID);
- var temp = res1.data.data[0];
- var dataArray = [temp];
- var temp1 = res2.data.data[0];
- var dataArray1 = [temp1];
- sessionStorage["HAutoLogin"] = "2";
- sessionStorage["HMainSourceBillNo"] = dataArray1[0].HBillNo;
- sessionStorage["HSourceBillSEQ"] = dataArray[0].HSEQ;
- this.$router.push({
- path: "/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin"
- }).catch(() => { });
+ var params = this.get_UrlVars();
+ var HSourceInterID = params[params[1]];
+ var HSourceEntryID = params[params[2]];
+ var res1 = await this.getPushSource_POInStockBillInit1(HSourceInterID,HSourceEntryID);
+ var temp = res1.data.data[0];
+ var dataArray = [temp];
+ var HSEQ = dataArray[0].HSEQ;
+ this.$router.push({
+ path: `/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin?OperationType=4&HSourceInterID=${HSourceInterID}&HSourceEntryID=${HSourceEntryID}&HSEQ=${HSEQ}`
+ }).catch(() => { });
+
},
- //#endregion
+
+ //#endregion
//#region 鑾峰彇缁勭粐涓嬫媺鍒楄〃鏁版嵁
async get_OrganizationList() {
axios.get(this.$baseUrl + '/Web/GetOrganizations',{async:false}).then(response => {
@@ -617,32 +613,21 @@
})
},
//#endregion
- //#region 鏍规嵁琛ㄧ殑涓昏〃鍐呯爜鏌ヨ琛ㄤ腑鏁版嵁
- async getPushSource_POInStockBillInit1(HSourceInterID) {
- var res = "none";
- var sql = "select * from Cg_POInStockBillMain where 1=1 and hinterid = " + HSourceInterID ;
+
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曟暟鎹�
+ async getPushSource_POInStockBillInit1(HSourceInterID, HSourceEntryID) {
+ var sql = `SELECT m.*, s.*
+ FROM Cg_POInStockBillMain m
+ INNER JOIN Cg_POInStockBillSub s ON m.hinterid = s.HInterID
+ WHERE 1=1`;
+ sql += ` AND m.hinterid = ${HSourceInterID}`;
+ sql += ` AND s.HEntryID = ${HSourceEntryID}`;
var ModRightNameCheck = "";
return axios.get(this.$baseUrl + '/CommonModel/searchMethod', {
- async:false,
params: {
- "sql": sql
- , "user": sessionStorage["HUserName"]
- , "ModRightNameCheck": ModRightNameCheck
- },
- })
- },
- //#endregion
- //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曟暟鎹�
- async getPushSource_POInStockBillInit2(HSourceEntryID) {
- var res = "none";
- var sql = "select * from Cg_POInStockBillSub where 1=1 and HEntryID = " + HSourceEntryID;
- var ModRightNameCheck = "";
- return axios.get(this.$baseUrl + '/CommonModel/searchMethod', {
- async:false,
- params: {
- "sql": sql
- , "user": sessionStorage["HUserName"]
- , "ModRightNameCheck": ModRightNameCheck
+ "sql": sql,
+ "user": sessionStorage["HUserName"],
+ "ModRightNameCheck": ModRightNameCheck
},
})
},
@@ -662,21 +647,14 @@
var res = "none"
try{
res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
- var res2 = await this.getPushSource_POInStockBillInit1(HSourceInterID);
- var temp1 = res2.data.data[0];
- var dataArray1 = [temp1];
if(res.data.code=="1"){
- if(dataArray1[0].HBillStatus!=2){
- res = "none";
- this.$modal.msgError("鍗曟嵁鏈鏍革紝璇峰鏍�");
+ res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
+ if(res.data.data.length>0){
+ res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
}else{
- if(res.data.data.length>0){
- res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
- }else{
- res = "none";
- this.$modal.msgError("鍗曟嵁宸茬粡鍏ㄩ儴涓嬫帹锛屽鏋滄兂缁х画涓嬫帹锛屽幓鏉$爜妗f浣滃簾瀵瑰簲鏉$爜");
- }
- }
+ res = "none";
+ this.$modal.msgError("鍗曟嵁宸茬粡鍏ㄩ儴涓嬫帹锛屽鏋滄兂缁х画涓嬫帹锛屽幓鏉$爜妗f浣滃簾瀵瑰簲鏉$爜");
+ }
}
else{
res = "none";
--
Gitblit v1.9.1