From 0dbc3f54484b944cf7a371c9fcde7c1be7f26304 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Sat, 18 Dec 2021 22:03:01 +0800
Subject: [PATCH] =?UTF-8?q?10=E7=82=B9=E5=95=A6=E6=99=9A=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vue/src/router/index.js | 10 +-
.../pg-fis/basedate/m100Online/detailMB.vue | 12 +-
.../pg-fis/basedate/m100Online/detailZHB.vue | 43 ++-----
.../pg-fis/basedate/m100Online/index.vue | 117 +++++++++++++-----
4 files changed, 111 insertions(+), 71 deletions(-)
diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index 08ed61be..a9e99552 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -168,13 +168,13 @@ export const asyncRoutes = [
/** when your routing map is too long, you can split it into small modules **/
managerRouter,//系统首页
personRouter,//系统管理
- basedataRouter,//基础数据维护
- vwFisDataRouter,//结算与开票数据导入
- billdataRouter,//销售结算与开票报表
+ //basedataRouter,//基础数据维护
+ //vwFisDataRouter,//结算与开票数据导入
+ //billdataRouter,//销售结算与开票报表
//businessdataRouter,
- wheeldataRouter,//大众看板和备件
+ //wheeldataRouter,//大众看板和备件
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/m100Online/detailMB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
index 27f3c849..98c390cb 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
@@ -378,7 +378,7 @@ export default {
watch: {
customerInfosMB: {
handler(newVal) {
- //alert(JSON.stringify(newVal))
+ console.log("门板-接收的父组件的值："+JSON.stringify(newVal))
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
@@ -535,10 +535,10 @@ export default {
this.listQuery.ProductLine = this.customerInfo.productLine;
}
- alert(JSON.stringify(this.listQuery));
+ console.log(JSON.stringify(this.listQuery));
this.$axios
.posts(
- "/api/newjit1/MenBanPackingList/MenBanPackingList-List",
+ "/api/newjit/MenBanPackingList/MenBanPackingList-List",
this.listQuery
)
.then((response) => {
@@ -577,7 +577,7 @@ export default {
this.$axios
.posts("/api/newjit/bill-m100/print-menban-packing-list", params)
.then((response) => {
- alert(response.status);
+ //alert(response.status);
const index = this.list.indexOf(row);
if (response.status === false) {
this.$message({
@@ -587,6 +587,7 @@ export default {
return;
} else {
let dataname = JSON.stringify(response.item);
+ console.log("门板-调用Handlers/Handler1.ashx?report=menban传的值："+dataname)
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=menban",
@@ -617,7 +618,6 @@ export default {
});
myalert = "选中项";
}
- alert(params);
this.$confirm("是否作废" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -625,7 +625,7 @@ export default {
})
.then(() => {
this.$axios
- .posts("/api/newjit1/MenBanPackingList/delete", params)
+ .posts("/api/newjit/MenBanPackingList/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
index c4d12799..c1a10e33 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
@@ -169,32 +169,12 @@
label="大众顺序号"
>
-
-
-
-
-
@@ -378,14 +358,15 @@ export default {
watch: {
customerInfosZHB: {
handler(newVal) {
- //alert(JSON.stringify(newVal))
+ console.log("柱护板-接收的父组件的值："+JSON.stringify(newVal))
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.printType = element.PrintType;
this.customerInfo.productLine = element.ProductLine;
- });alert(JSON.stringify(this.customerInfo))
+ });
+ console.log("柱护板监控传值："+JSON.stringify(this.customerInfo))
if (
this.customerInfo.productLine != ""
) {
@@ -535,10 +516,10 @@ export default {
this.listQuery.ProductLine = this.customerInfo.productLine;
}
- alert(JSON.stringify(this.listQuery));
+ console.log("柱护板-列表查询条件："+JSON.stringify(this.listQuery));
this.$axios
.posts(
- "/api/newjit1/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
+ "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
this.listQuery
)
.then((response) => {
@@ -577,7 +558,7 @@ export default {
this.$axios
.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.then((response) => {
- alert(response.status);
+ console.log("柱护版-打印返回的状态："+response.status);
const index = this.list.indexOf(row);
if (response.status === false) {
this.$message({
@@ -587,6 +568,7 @@ export default {
return;
} else {
let dataname = JSON.stringify(response.item);
+ console.log("柱板-调用Handlers/Handler1.ashx?report=menban传的值："+dataname)
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=menban",
@@ -617,7 +599,6 @@ export default {
});
myalert = "选中项";
}
- alert(params);
this.$confirm("是否作废" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -625,7 +606,7 @@ export default {
})
.then(() => {
this.$axios
- .posts("/api/newjit1/ZhuHuBanPackingList/delete", params)
+ .posts("/api/newjit/ZhuHuBanPackingList/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index 32e1f6ba..77969bf5 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -255,8 +255,7 @@
direction="rtl"
size="65%"
>
-
+
-
+
@@ -900,11 +898,10 @@ export default {
];
}
if (this.listQuery.productType === 2) {
- alert(val);
//把产线值传到子组件
this.customerInfosZHB = [
{
- PrintType: 2,
+ PrintType: 1,
ProductLine: val,
},
];
@@ -975,29 +972,90 @@ export default {
}
this.hostSNQuery.productLine = this.listQuery.productLine;
this.hostPrintQuery.productLine = this.listQuery.productLine;
- this.$axios
- .gets("/api/newjit/bill-m100/get-print-start-hostsn", this.hostSNQuery)
- .then((response) => {
- console.log("获取hostsn大众顺序号起始");
- console.log(response.item);
- if (response.item !== null) {
- this.form.beginHostSN = parseInt(response.item);
- if (this.listQuery.productType === 1) {
- //门板
- this.form.endHostSN = parseInt(response.item) + 11;
- } else if (this.listQuery.productType === 2) {
- //柱护板
- this.form.endHostSN = parseInt(response.item) + 23;
+ //后端服务更改了 前端跟着更改成以下方式
+ if (this.listQuery.productType === 1) {
+ //门板
+ this.hostSNQuery.isZhuHuBan = "0";
+ console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
+ this.$axios
+ .gets(
+ "/api/newjit/bill-m100/get-print-start-hostsn2",
+ this.hostSNQuery
+ )
+ .then((response) => {
+ console.log("获取hostsn大众顺序号起始");
+ console.log(response.item);
+ if (response.item !== null) {
+ this.form.beginHostSN = parseInt(response.item);
+ if (this.listQuery.productType === 1) {
+ //门板
+ this.form.endHostSN = parseInt(response.item) + 11;
+ } else if (this.listQuery.productType === 2) {
+ //柱护板
+ this.form.endHostSN = parseInt(response.item) + 23;
+ }
+ } else {
+ this.$message({
+ message: "获取不到大众顺序号",
+ type: "warning",
+ });
+ return;
}
- } else {
- this.$message({
- message: "获取不到大众顺序号",
- type: "warning",
- });
- return;
- }
- })
- .catch(() => {});
+ });
+ } else if (this.listQuery.productType === 2) {
+ //柱护板
+ this.hostSNQuery.isZhuHuBan = "1";
+ console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
+ this.$axios
+ .gets(
+ "/api/newjit/bill-m100/get-print-start-hostsn2",
+ this.hostSNQuery
+ )
+ .then((response) => {
+ console.log("获取hostsn大众顺序号起始");
+ console.log(response.item);
+ if (response.item !== null) {
+ this.form.beginHostSN = parseInt(response.item);
+ if (this.listQuery.productType === 1) {
+ //门板
+ this.form.endHostSN = parseInt(response.item) + 11;
+ } else if (this.listQuery.productType === 2) {
+ //柱护板
+ this.form.endHostSN = parseInt(response.item) + 23;
+ }
+ } else {
+ this.$message({
+ message: "获取不到大众顺序号",
+ type: "warning",
+ });
+ return;
+ }
+ });
+ }
+
+ // this.$axios
+ // .gets("/api/newjit/bill-m100/get-print-start-hostsn", this.hostSNQuery)
+ // .then((response) => {
+ // console.log("获取hostsn大众顺序号起始");
+ // console.log(response.item);
+ // if (response.item !== null) {
+ // this.form.beginHostSN = parseInt(response.item);
+ // if (this.listQuery.productType === 1) {
+ // //门板
+ // this.form.endHostSN = parseInt(response.item) + 11;
+ // } else if (this.listQuery.productType === 2) {
+ // //柱护板
+ // this.form.endHostSN = parseInt(response.item) + 23;
+ // }
+ // } else {
+ // this.$message({
+ // message: "获取不到大众顺序号",
+ // type: "warning",
+ // });
+ // return;
+ // }
+ // })
+ // .catch(() => {});
this.formTitle = "打印";
this.dialogFormVisible = true;
this.form = {
@@ -1328,7 +1386,7 @@ export default {
this.hostPrintQuery
)
.then((response) => {
- console.log("重新或补打打印门板装箱单");
+ console.log("重新或补打打印门板装箱单"+JSON.stringify(this.hostPrintQuery));
console.log(response);
if (response.status === false) {
this.$message({
@@ -1517,6 +1575,7 @@ export default {
document.body.appendChild(ifr);
this.doPrint("printPdf" + date);
window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+ alert()
this.dialogFormVisible = false;
},
httpPost(URL, PARAMS) {