diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index 7548c9b6..58775bf9 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -67,8 +67,9 @@ export const constantRoutes = [
//component: () => import('@/views/login/index'),
//component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
- component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
- hidden: true
+ //component: () => import('@/views/pg-fis/basedate/unknownAssembly'), //?? one
+ //component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
+ component: () => import('@/views/pg-fis/basedate/select'), //M100查询
},
{
path: '/auth-redirect',
@@ -188,7 +189,7 @@ export const asyncRoutes = [
//wheeldataRouter,//大众看板和备件
pgfisPrint,//排序单打印
pgfis,//派格fis
- JobTimeDataRouter,//后台作业监控
+ //JobTimeDataRouter,//后台作业监控
// 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true }
diff --git a/vue/src/views/pg-fis/basedate/m100BIll/index.vue b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
index b95db229..d245c470 100644
--- a/vue/src/views/pg-fis/basedate/m100BIll/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
@@ -42,6 +42,24 @@
:value="item.productLineCode"/>
+
+
+
+
+
+
打印当前页
{
this.customerInfo.printType = "1";
this.customerInfo.productLine = element.ProductLine;
+ this.customerInfo.fwStation = element.fwStation;
});
console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
if (this.customerInfo.productLine != "") {
@@ -488,6 +491,10 @@ export default {
if (this.customerInfo.productLine != "") {
this.listQuery.ProductLine = this.customerInfo.productLine;
}
+ if (this.customerInfo.fwStation != "") {
+ this.listQuery.fwStation = this.customerInfo.fwStation;
+ }
+
console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
this.$axios
@@ -533,6 +540,7 @@ export default {
var params = {
printType: "1",
productLine: this.customerInfo.productLine,
+ fwStation: this.customerInfo.fwStation,
reportIdList: ZHBId,
partType: this.multipleSelection[0].partType,
dataResultType: "2",
@@ -615,11 +623,13 @@ export default {
var params = {
printType: "1",
productLine: this.customerInfo.productLine,
+ fwStation: this.customerInfo.fwStation,
reportIdList: ZHBId,
//partType: this.multipleSelection[0].partType,
dataResultType: "1",
};
console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+ let _this = this;
this.$axios
//.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.posts("/api/newjit/bill-m100/load-zhuhuban-report", params)
@@ -640,7 +650,7 @@ export default {
);
this.$axios
.posts(
- "/Handlers/Handler1.ashx?report=zhuhuban",
+ "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {
diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
index db653a40..6459dbc1 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
@@ -312,6 +312,7 @@ export default {
customerInfo: {
printType: "1",
productLine: "",
+ fwStation: ""
},
// 高级搜索
filterObj: {
@@ -401,6 +402,7 @@ export default {
newVal.forEach((element) => {
this.customerInfo.printType = "1";
this.customerInfo.productLine = element.ProductLine;
+ this.customerInfo.fwStation = element.fwStation;
});
console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
if (this.customerInfo.productLine != "") {
@@ -552,6 +554,9 @@ export default {
if (this.customerInfo.productLine != "") {
this.listQuery.ProductLine = this.customerInfo.productLine;
}
+ if (this.customerInfo.fwStation != "") {
+ this.listQuery.fwStation = this.customerInfo.fwStation;
+ }
console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
this.$axios
@@ -597,10 +602,12 @@ export default {
var params = {
printType: "1",
productLine: this.customerInfo.productLine,
+ fwStation: this.customerInfo.fwStation,
beginVin: beginVin1,
endVin: endVin1,
};
console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+ let _this = this;
this.$axios
.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.then((response) => {
@@ -620,7 +627,7 @@ export default {
);
this.$axios
.posts(
- "/Handlers/Handler1.ashx?report=zhuhuban",
+ "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {
diff --git a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
index 4b72b6c9..45ca8fcc 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
@@ -218,6 +218,7 @@ export default {
customerInfo: {
printType: "",
productLine: "",
+ fwStation: ""
},
// 高级搜索
filterObj: {
@@ -306,6 +307,7 @@ export default {
newVal.forEach((element) => {
this.customerInfo.printType = 2; //2时补打
this.customerInfo.productLine = element.ProductLine;
+ this.customerInfo.fwStation = element.fwStation;
});
if (this.customerInfo.productLine != "") {
this.getList();
@@ -474,6 +476,9 @@ export default {
if (this.customerInfo.productLine != "") {
inputParam.productLine = this.customerInfo.productLine;
}
+ if (this.customerInfo.fwStation != "") {
+ inputParam.fwStation = this.customerInfo.fwStation;
+ }
console.log('取柱护板补打列表replenish-print-zhb-list方法输入参数：' + JSON.stringify(this.listQuery));
this.$axios
@@ -510,6 +515,7 @@ export default {
var params = {
printType: 2,
productLine: this.customerInfo.productLine,
+ fwStation: this.customerInfo.fwStation,
beginVin: beginVin1,
endVin: endVin1,
m100IdList: []
@@ -539,7 +545,7 @@ export default {
// this.$axios
// .posts(
- // "/Handlers/Handler1.ashx?report=zhuhuban",
+ // "/Handlers/Handler1.ashx?report=zhuhuban_" + this.customerInfo.productLine + '-' + this.customerInfo.fwStation,
// qs.stringify(this.fileQuery)
// )
// .then((response) => {
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
index 081d894e..824d06c1 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
@@ -553,6 +553,7 @@ export default {
endVin: endVin1,
};
console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+ let _this = this;
this.$axios
.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.then((response) => {
@@ -572,7 +573,7 @@ export default {
);
this.$axios
.posts(
- "/Handlers/Handler1.ashx?report=zhuhuban",
+ "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index-old.vue b/vue/src/views/pg-fis/basedate/m100Online/index-old.vue
index 91ba2d5f..7e87de62 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index-old.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index-old.vue
@@ -1249,6 +1249,7 @@ export default {
} else if (this.listQuery.productType === 2) {
//柱护板
//传递大众顺序号起止
+ let _this = this;
this.$axios
.posts(
"/api/newjit/bill-m100/print-zhuhuban-packing-list",
@@ -1274,7 +1275,7 @@ export default {
console.log(this.fileQuery.dataname);
this.$axios
.posts(
- "/Handlers/Handler1.ashx?report=zhuhuban",
+ "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index a9c56bcb..0a94c4ed 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -1290,6 +1290,7 @@ export default {
} else if (this.listQuery.productType === 2) {
//柱护板
//传递大众顺序号起止
+ let _this = this;
this.$axios
.posts(
"/api/newjit/bill-m100/print-zhuhuban-packing-list",
@@ -1315,7 +1316,7 @@ export default {
console.log(this.fileQuery.dataname);
this.$axios
.posts(
- "/Handlers/Handler1.ashx?report=zhuhuban",
+ "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 7c63f6b6..2f70a7cf 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -44,6 +44,24 @@
/>
+
+
+
+
+
+
打印门板发货排序单
+
重新打印门板
门板补打
-
- 柱护板补打
+
+ 柱护板补打
{
// element=this.listQuery.productLine;
// });
-
+
//let productLineList = { productLineList: [this.listQuery.productLine] };
this.$refs.sp01.Visible = false;
this.$refs.sp05.Visible = false;
@@ -803,10 +827,10 @@ export default {
this.$refs.sp01.style.color = "green";
}
}
- if (JKITEM.productLine == "05") {
+ if (JKITEM.productLine == "02") {
this.$refs.sp05.Visible = true;
this.content05 =
- "05生产线已经" +
+ "02生产线已经" +
JKITEM.timeoutMinutes +
"分钟没收到报文\xa0\xa0\xa0\xa0";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
@@ -820,41 +844,58 @@ export default {
this.$refs.sp05.style.color = "green";
}
}
- if (JKITEM.productLine == "07") {
- this.$refs.sp07.Visible = true;
- this.content07 =
- "07生产线已经" +
- JKITEM.timeoutMinutes +
- "分钟没收到报文\xa0\xa0\xa0\xa0";
- if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
- //写提示信息
- console.log(
- "222222222222222222222222222222222222222222222222"
- );
- this.$refs.sp07.style.color = "red";
- this.$refs.sp07.style.fontWeight = "bold";
- } else {
- this.$refs.sp07.style.color = "green";
- }
- }
- if (JKITEM.productLine == "08") {
- this.$refs.sp08.Visible = true;
- this.content08 =
- JKITEM.productLine +
- "生产线已经" +
- JKITEM.timeoutMinutes +
- "分钟没收到报文";
- if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
- //写提示信息
- console.log(
- "222222222222222222222222222222222222222222222222"
- );
- this.$refs.sp08.style.color = "red";
- this.$refs.sp08.style.fontWeight = "bold";
- } else {
- this.$refs.sp08.style.color = "green";
- }
- }
+ // if (JKITEM.productLine == "05") {
+ // this.$refs.sp05.Visible = true;
+ // this.content05 =
+ // "05生产线已经" +
+ // JKITEM.timeoutMinutes +
+ // "分钟没收到报文\xa0\xa0\xa0\xa0";
+ // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+ // //写提示信息
+ // console.log(
+ // "222222222222222222222222222222222222222222222222"
+ // );
+ // this.$refs.sp05.style.color = "red";
+ // this.$refs.sp05.style.fontWeight = "bold";
+ // } else {
+ // this.$refs.sp05.style.color = "green";
+ // }
+ // }
+ // if (JKITEM.productLine == "07") {
+ // this.$refs.sp07.Visible = true;
+ // this.content07 =
+ // "07生产线已经" +
+ // JKITEM.timeoutMinutes +
+ // "分钟没收到报文\xa0\xa0\xa0\xa0";
+ // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+ // //写提示信息
+ // console.log(
+ // "222222222222222222222222222222222222222222222222"
+ // );
+ // this.$refs.sp07.style.color = "red";
+ // this.$refs.sp07.style.fontWeight = "bold";
+ // } else {
+ // this.$refs.sp07.style.color = "green";
+ // }
+ // }
+ // if (JKITEM.productLine == "08") {
+ // this.$refs.sp08.Visible = true;
+ // this.content08 =
+ // JKITEM.productLine +
+ // "生产线已经" +
+ // JKITEM.timeoutMinutes +
+ // "分钟没收到报文";
+ // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+ // //写提示信息
+ // console.log(
+ // "222222222222222222222222222222222222222222222222"
+ // );
+ // this.$refs.sp08.style.color = "red";
+ // this.$refs.sp08.style.fontWeight = "bold";
+ // } else {
+ // this.$refs.sp08.style.color = "green";
+ // }
+ // }
});
} else {
this.$message({
@@ -1119,6 +1160,7 @@ export default {
return projectTypeKeyValue[type];
},
getList(data) {
+
this.listLoading = true;
if (data != undefined) {
this.listQueryList.SkipCount = (this.page - 1) * data.limit;
@@ -1138,6 +1180,7 @@ export default {
this.listQueryList.BillStatus = 2; //状态
this.listQueryList.ProductLine = this.listQuery.productLine; //产线
this.listQueryList.CanNotPrint = false; //不可打印
+ this.listQueryList.fwStation = this.listQuery.fwStation; //BA2 BA5
console.log(
"日常打印M100查询条件：" + JSON.stringify(this.listQueryList)
);
@@ -1185,6 +1228,7 @@ export default {
},
valueselectChange(val) {
+ debugger
this.$forceUpdate();
this.customerInfosMB = [];
this.customerInfosZHB = [];
@@ -1194,6 +1238,7 @@ export default {
{
PrintType: 1,
ProductLine: val,
+ fwStation: this.listQuery.fwStation
},
];
}
@@ -1203,10 +1248,37 @@ export default {
{
PrintType: 1,
ProductLine: val,
+ fwStation: this.listQuery.fwStation
},
];
}
},
+ fwStation_selectChange(val) {
+ debugger
+ this.$forceUpdate();
+ if (this.listQuery.productType === 1) {
+ //把产线值传到子组件
+ this.customerInfosMB = [
+ {
+ PrintType: 1,
+ ProductLine: this.listQuery.productLine,
+ fwStation: val
+ },
+ ];
+ }
+ if (this.listQuery.productType === 2) {
+ //把产线值传到子组件
+ this.customerInfosZHB = [
+ {
+ PrintType: 1,
+ ProductLine: this.listQuery.productLine,
+ fwStation: val
+ }
+ ];
+ }
+ },
+
+
handleImportSAP() {},
handleFilter() {
@@ -1260,6 +1332,7 @@ export default {
(this.hostCheckQuery.printType = 0);
this.hostPrintQuery.printType = 0;
this.vinPrintQuery.printType = 0;
+
if (
this.listQuery.productLine === "" ||
this.listQuery.productLine === undefined
@@ -1272,8 +1345,13 @@ export default {
}
(this.printNum = "12"),
(this.printNumZHB = "24"),
- (this.hostSNQuery.productLine = this.listQuery.productLine);
+
+
+ this.hostSNQuery.productLine = this.listQuery.productLine;
+ this.hostSNQuery.fwStation = this.listQuery.fwStation
this.hostPrintQuery.productLine = this.listQuery.productLine;
+ this.hostPrintQuery.fwStation = this.listQuery.fwStation;
+
//后端服务更改了 前端跟着更改成以下方式
if (this.listQuery.productType === 1) {
//门板
@@ -1307,6 +1385,28 @@ export default {
//柱护板
this.hostSNQuery.isZhuHuBan = "1";
console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
+
+ //调用 get-zhuhuban-vin-num 服务 赋值给 this.printNumZHB---------------------------------
+ this.$axios
+ .gets(
+ "/api/newjit/bill-m100/get-zhuhuban-vin-num",
+ this.hostSNQuery
+ )
+ .then((response) => {
+ console.log("获取柱护板打印数量");
+ console.log(response.item);
+ if (response.item !== null) {
+ this.printNumZHB = parseInt(response.item);
+ } else {
+ this.$message({
+ message: "获取柱护板打印数量失败，返回空",
+ type: "warning",
+ });
+ return;
+ }
+ });
+ //---------------------------------------------------------------------------------------
+
this.$axios
.gets(
@@ -1337,17 +1437,8 @@ export default {
if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") {
this.productName = "";
switch (this.listQuery.productLine) {
- case "01":
- this.productName = "总装-01";
- break;
- case "05":
- this.productName = "总装-05";
- break;
- case "07":
- this.productName = "总装-07";
- break;
- case "08":
- this.productName = "总装-08";
+ case "00":
+ this.productName = "全部门板";
break;
}
@@ -1355,8 +1446,11 @@ export default {
} else {
this.productName = "";
switch (this.listQuery.productLine) {
- case "08":
- this.productName = "总装-柱护板";
+ case "01":
+ this.productName = "大众一厂";
+ break;
+ case "02":
+ this.productName = "大众二厂";
break;
}
this.formTitle = "打印-柱护板发货排序单";
@@ -1395,6 +1489,7 @@ export default {
}
this.formTitle = "重打";
this.hostPrintQuery.productLine = this.listQuery.productLine;
+ this.hostPrintQuery.fwStation = this.listQuery.fwStation;
this.dialogFormVisible = true;
this.form = {
beginVin: "",
@@ -1428,6 +1523,7 @@ export default {
}
this.formTitle = "补打";
this.hostPrintQuery.productLine = this.listQuery.productLine;
+ this.hostPrintQuery.fwStation = this.listQuery.fwStation;
this.dialogFormVisible = true;
this.form = {
beginVin: "",
@@ -1550,6 +1646,7 @@ export default {
this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
this.hostCheckQuery.productLine = this.listQuery.productLine;
+ this.hostCheckQuery.fwStation = this.listQuery.fwStation;
this.isDisable = true;
this.$axios
.posts(
@@ -1736,9 +1833,12 @@ export default {
//this.fileQuery.dataname = "";
console.log("打印json");
console.log(this.fileQuery.dataname);
+
+ let reporturl = "/Handlers/Handler1.ashx?report=zhuhuban_" + this.hostPrintQuery.productLine + '-' + this.hostPrintQuery.fwStation; //zhuhuban_01-BA2
+
this.$axios
.posts(
- "/Handlers/Handler1.ashx?report=zhuhuban",
+ reporturl, //"/Handlers/Handler1.ashx?report=zhuhuban",
qs.stringify(this.fileQuery)
)
.then((response) => {
@@ -1761,16 +1861,25 @@ export default {
//获取所有产线
getProductLine() {
- this.listPLQuery.UserId = this.userInfo.userId;
+
+ if (this.userInfo == null || this.userInfo.userId == null) //设置默认值，调试时使用
+ {
+ this.listPLQuery.UserId = 'AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA';
+ }
+ else
+ {
+ this.listPLQuery.UserId = this.userInfo.userId;
+ }
+
console.log(
- "this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" +
- this.listPLQuery.UserId
+ "this.listPLQuery.UserId::" + this.listPLQuery.UserId
);
this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => {
//console.log(response);
this.PLList = response.item;
+ debugger
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
@@ -1809,6 +1918,7 @@ export default {
this.$refs.btn3.$el.innerText = "补打门板发货排序单";
this.listQuery.state.push(this.billState[0].id);
this.isShowState = true;
+
} else if (this.listQuery.productType === 2) {
this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
@@ -1822,6 +1932,7 @@ export default {
this.listQueryList.ZHBBillStatus = 0;
}
},
+
/*单据状态变更 */
checkedListChange(index) {
if (this.listQuery.state.length <= 1) {
diff --git a/vue/src/views/pg-fis/basedate/select/detailZHB.vue b/vue/src/views/pg-fis/basedate/select/detailZHB.vue
index 2445bb4b..e0a83af6 100644
--- a/vue/src/views/pg-fis/basedate/select/detailZHB.vue
+++ b/vue/src/views/pg-fis/basedate/select/detailZHB.vue
@@ -553,6 +553,7 @@ export default {
endVin: endVin1,
};
console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+ let _this = this;
this.$axios
.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.then((response) => {
@@ -572,7 +573,7 @@ export default {
);
this.$axios
.posts(
- "/Handlers/Handler1.ashx?report=zhuhuban",
+ "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {
diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue
index e82a6e73..ab69e812 100644
--- a/vue/src/views/pg-fis/basedate/select/index.vue
+++ b/vue/src/views/pg-fis/basedate/select/index.vue
@@ -634,8 +634,13 @@ export default {
width: 120,
});
tempsTabs.push({
- label: "柱护板状态",
- prop: "printBillNum",
+ label: "柱护板状态BA2",
+ prop: "BA2",
+ width: 120,
+ });
+ tempsTabs.push({
+ label: "柱护板状态BA5",
+ prop: "BA5",
width: 120,
});
tempsTabs.push({
@@ -1199,7 +1204,7 @@ export default {
console.log("检查hostsn大众顺序号是否断号");
console.log(response);
if (response.item.length > 0) {
- this.$confirm("本次打印存在断号是否继续?", "提示", {
+ this.$confirm("本次打印存在断号，是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@@ -1248,6 +1253,7 @@ export default {
} else if (this.listQuery.productType === 2) {
//柱护板
//传递大众顺序号起止
+ let _this = this;
this.$axios
.posts(
"/api/newjit/bill-m100/print-zhuhuban-packing-list",
@@ -1273,7 +1279,7 @@ export default {
console.log(this.fileQuery.dataname);
this.$axios
.posts(
- "/Handlers/Handler1.ashx?report=zhuhuban",
+ "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {
diff --git a/vue/static/config.js b/vue/static/config.js
index 201c5495..f46b6f51 100644
--- a/vue/static/config.js
+++ b/vue/static/config.js
@@ -39,7 +39,9 @@ if (process.env.NODE_ENV === 'development') {
//ip: 'http://192.168.0.67',
//ip: 'http://192.168.0.140',
- ip: 'http://192.168.0.63',
+ //ip: 'http://192.168.0.63',
+ ip: 'http://192.168.7.21',
+
//ip: 'http://149.223.116.5',
//ip: 'http://114.116.225.148',
//ip: 'http://10.123.148.162',