PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

BUG修改

branch_ccpg_220107
songnan.zhang 3 years ago
parent
81e13c7139
commit
14b1b29947
9 changed files with 138 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
  2. 2
      vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
  3. 2
      vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
  4. 2
      vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
  5. 2
      vue/src/views/pg-fis/basedate/m100Online/detail.vue
  6. 2
      vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
  7. 2
      vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
  8. 139
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  9. 2
      vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue

2
vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
View File

@ -777,7 +777,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

2
vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
View File

@ -678,7 +678,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

2
vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
View File

@ -721,7 +721,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

2
vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
View File

@ -739,7 +739,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

2
vue/src/views/pg-fis/basedate/m100Online/detail.vue
View File

@ -340,7 +340,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },
}, },

2
vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
View File

@ -735,7 +735,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

2
vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
View File

@ -716,7 +716,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

139
vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
View File

@ -494,7 +494,7 @@ export default {
ProductLine: undefined, ProductLine: undefined,
BillStatus: undefined, BillStatus: undefined,
CanNotPrint: false, CanNotPrint: false,
ZHBBillStatus:undefined, ZHBBillStatus: undefined,
}, },
listExportQuery: { listExportQuery: {
erpAssemblyCode: undefined, erpAssemblyCode: undefined,
@ -1020,7 +1020,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },
@ -1085,6 +1085,7 @@ export default {
//柱护板 //柱护板
this.hostSNQuery.isZhuHuBan = "1"; this.hostSNQuery.isZhuHuBan = "1";
console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery)); console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
this.$axios this.$axios
.gets( .gets(
"/api/newjit/bill-m100/get-print-start-hostsn2", "/api/newjit/bill-m100/get-print-start-hostsn2",
@ -1278,7 +1279,7 @@ export default {
this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
this.hostCheckQuery.productLine = this.listQuery.productLine; this.hostCheckQuery.productLine = this.listQuery.productLine;
console.log("检查柱护板-hostCheckQuery"+JSON.stringify(this.hostCheckQuery));
this.$axios this.$axios
.posts( .posts(
"/api/newjit/bill-m100/check-mb-hostsn-break-num", "/api/newjit/bill-m100/check-mb-hostsn-break-num",
@ -1395,18 +1396,18 @@ export default {
} }
}); });
} else if (this.listQuery.productType === 2) { } else if (this.listQuery.productType === 2) {
//柱护板 //柱门板
this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
this.hostCheckQuery.productLine = this.listQuery.productLine; this.hostCheckQuery.productLine = this.listQuery.productLine;
this.$axios this.$axios
.posts( .posts(
"/api/newjit/bill-m100/check-zhb-hostsn-break-num", "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
this.hostCheckQuery this.hostCheckQuery
) )
.then((response) => { .then((response) => {
console.log("检查柱护板-大众顺序号是否断号"); console.log("检查门板-大众顺序号是否断号");
if (response.item.length > 0) { if (response.item.length > 0) {
//有断号 //有断号
this.$confirm( this.$confirm(
@ -1453,14 +1454,18 @@ export default {
.then((response) => { .then((response) => {
console.log("获取文件base64编码"); console.log("获取文件base64编码");
console.log(response); console.log(response);
this.formLoading = false;
this.printpdf(response); //打印我文件流 this.printpdf(response); //打印我文件流
})
.catch((error) => {
this.formLoading = false;
}); });
} }
}); });
}) })
.catch(() => {}); .catch(() => {});
} //无断号 } else {
else { //无断号
//门板 //门板
//传递大众顺序号起止 //传递大众顺序号起止
this.$axios this.$axios
@ -1494,7 +1499,11 @@ export default {
.then((response) => { .then((response) => {
console.log("获取文件base64编码"); console.log("获取文件base64编码");
console.log(response); console.log(response);
this.formLoading = false;
this.printpdf(response); //打印我文件流 this.printpdf(response); //打印我文件流
})
.catch((error) => {
this.formLoading = false;
}); });
} }
}) })
@ -1507,6 +1516,118 @@ export default {
}); });
} }
}); });
//柱护板
// this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
// this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
// this.hostCheckQuery.productLine = this.listQuery.productLine;
// this.$axios
// .posts(
// "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
// this.hostCheckQuery
// )
// .then((response) => {
// console.log("检查柱护板-大众顺序号是否断号");
// if (response.item.length > 0) {
// //有断号
// this.$confirm(
// "本次打印存在断号是否继续?" + response.item,
// "提示",
// {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning",
// }
// )
// .then(() => {
// //门板
// //传递大众顺序号起止
// this.$axios
// .posts(
// "/api/newjit/bill-m100/print-zhuhuban-packing-list",
// this.hostPrintQuery
// )
// .then((response) => {
// console.log("打印门板装箱单");
// console.log(response);
// console.log(response.status);
// if (response.status === false) {
// this.$message({
// message: response.message,
// type: "error",
// });
// return;
// } else {
// //传给grid++接口json数据，得到返回的文件base64
// //this.fileQuery.report = "menban";
// this.fileQuery.dataname = JSON.stringify(
// response.item
// );
// //this.fileQuery.dataname = "";
// console.log("打印json");
// console.log(this.fileQuery.dataname);
// this.$axios
// .posts(
// "/Handlers/Handler1.ashx?report=menban",
// qs.stringify(this.fileQuery)
// )
// .then((response) => {
// console.log("获取文件base64编码");
// console.log(response);
// this.printpdf(response); //打印我文件流
// });
// }
// });
// })
// .catch(() => {});
// } //无断号
// else {
// //门板
// //传递大众顺序号起止
// this.$axios
// .posts(
// "/api/newjit/bill-m100/print-zhuhuban-packing-list",
// this.hostPrintQuery
// )
// .then((response) => {
// console.log("打印门板装箱单");
// console.log(response);
// if (response.status === false) {
// this.$message({
// message: response.message,
// type: "error",
// });
// return;
// } else {
// //传给grid++接口json数据，得到返回的文件base64
// //this.fileQuery.report = "menban";
// this.fileQuery.dataname = JSON.stringify(
// response.item
// );
// //this.fileQuery.dataname = "";
// console.log("打印json");
// console.log(this.fileQuery.dataname);
// this.$axios
// .posts(
// "/Handlers/Handler1.ashx?report=menban",
// qs.stringify(this.fileQuery)
// )
// .then((response) => {
// console.log("获取文件base64编码");
// console.log(response);
// this.printpdf(response); //打印我文件流
// });
// }
// })
// .catch(() => {
// this.$message({
// message: response.message,
// type: "error",
// });
// return;
// });
// }
// });
} }
} else { } else {
/**接口1获取打印数据，接口2获得grid++模板的base64编码 */ /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
@ -2038,10 +2159,8 @@ export default {
} }
if (this.listQuery.productType === 2) { if (this.listQuery.productType === 2) {
this.listQueryList.ZHBBillStatus = 2; this.listQueryList.ZHBBillStatus = 2;
} else { } else {
this.listQueryList.ZHBBillStatus = 0; this.listQueryList.ZHBBillStatus = 0;
} }
}, },
/*单据状态变更 */ /*单据状态变更 */

2
vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue
View File

@ -940,7 +940,7 @@ export default {
if(this.data2.length !==0) if(this.data2.length !==0)
{ {
this.$message({ this.$message({
message: "还有结算价代码尚未匹配", message: "还有件代码尚未匹配",
type: "error", type: "error",
}); });
return; return;

Write Preview
Loading…
Cancel
Save