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

10点啦晚上

branch_ccpg_220107
44673626 4 years ago
parent
2607828836
commit
0dbc3f5448
4 changed files with 111 additions and 71 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. 10
      vue/src/router/index.js
  2. 12
      vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
  3. 43
      vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
  4. 117
      vue/src/views/pg-fis/basedate/m100Online/index.vue

10
vue/src/router/index.js
View File

@ -168,13 +168,13 @@ export const asyncRoutes = [
/** when your routing map is too long, you can split it into small modules **/ /** when your routing map is too long, you can split it into small modules **/
managerRouter,//系统首页 managerRouter,//系统首页
personRouter,//系统管理 personRouter,//系统管理
basedataRouter,//基础数据维护 //basedataRouter,//基础数据维护
vwFisDataRouter,//结算与开票数据导入 //vwFisDataRouter,//结算与开票数据导入
billdataRouter,//销售结算与开票报表 //billdataRouter,//销售结算与开票报表
//businessdataRouter, //businessdataRouter,
wheeldataRouter,//大众看板和备件 //wheeldataRouter,//大众看板和备件
pgfis,//派格fis pgfis,//派格fis
JobTimeDataRouter,//后台作业监控 //JobTimeDataRouter,//后台作业监控
// 404 page must be placed at the end !!! // 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true } { path: '*', redirect: '/404', hidden: true }

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

@ -378,7 +378,7 @@ export default {
watch: { watch: {
customerInfosMB: { customerInfosMB: {
handler(newVal) { handler(newVal) {
//alert(JSON.stringify(newVal)) console.log("门板-接收的父组件的值："+JSON.stringify(newVal))
if (newVal == "" || newVal == "undefined") { if (newVal == "" || newVal == "undefined") {
//TODO //TODO
} else { } else {
@ -535,10 +535,10 @@ export default {
this.listQuery.ProductLine = this.customerInfo.productLine; this.listQuery.ProductLine = this.customerInfo.productLine;
} }
alert(JSON.stringify(this.listQuery)); console.log(JSON.stringify(this.listQuery));
this.$axios this.$axios
.posts( .posts(
"/api/newjit1/MenBanPackingList/MenBanPackingList-List", "/api/newjit/MenBanPackingList/MenBanPackingList-List",
this.listQuery this.listQuery
) )
.then((response) => { .then((response) => {
@ -577,7 +577,7 @@ export default {
this.$axios this.$axios
.posts("/api/newjit/bill-m100/print-menban-packing-list", params) .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
.then((response) => { .then((response) => {
alert(response.status); //alert(response.status);
const index = this.list.indexOf(row); const index = this.list.indexOf(row);
if (response.status === false) { if (response.status === false) {
this.$message({ this.$message({
@ -587,6 +587,7 @@ export default {
return; return;
} else { } else {
let dataname = JSON.stringify(response.item); let dataname = JSON.stringify(response.item);
console.log("门板-调用Handlers/Handler1.ashx?report=menban传的值："+dataname)
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=menban", "/Handlers/Handler1.ashx?report=menban",
@ -617,7 +618,6 @@ export default {
}); });
myalert = "选中项"; myalert = "选中项";
} }
alert(params);
this.$confirm("是否作废" + myalert + "?", "提示", { this.$confirm("是否作废" + myalert + "?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -625,7 +625,7 @@ export default {
}) })
.then(() => { .then(() => {
this.$axios this.$axios
.posts("/api/newjit1/MenBanPackingList/delete", params) .posts("/api/newjit/MenBanPackingList/delete", params)
.then((response) => { .then((response) => {
const index = this.list.indexOf(row); const index = this.list.indexOf(row);
this.$notify({ this.$notify({

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

@ -169,32 +169,12 @@
label="大众顺序号" label="大众顺序号"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="vehicleModel_DoorPlankCode" prop="partCode"
label="车型门板代码" label="柱护板零件号"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="topBoxPositionNum" prop="partCode2"
label="上箱位号" label="柱护板零件号2"
></el-table-column>
<el-table-column
prop="topSAPMaterialNum"
label="上箱位 SAP物料号"
></el-table-column>
<el-table-column
prop="topMaterialDescription"
label="上箱位 物料描述"
></el-table-column>
<el-table-column
prop="belowBoxPositionNum"
label="下箱位号"
></el-table-column>
<el-table-column
prop="belowSAPMaterialNum"
label="下箱位 SAP物料号"
></el-table-column>
<el-table-column
prop="belowMaterialDescription "
label="下箱位 物料描述"
></el-table-column> ></el-table-column>
</el-table> </el-table>
</template> </template>
@ -378,14 +358,15 @@ export default {
watch: { watch: {
customerInfosZHB: { customerInfosZHB: {
handler(newVal) { handler(newVal) {
//alert(JSON.stringify(newVal)) console.log("柱护板-接收的父组件的值："+JSON.stringify(newVal))
if (newVal == "" || newVal == "undefined") { if (newVal == "" || newVal == "undefined") {
//TODO //TODO
} else { } else {
newVal.forEach((element) => { newVal.forEach((element) => {
this.customerInfo.printType = element.PrintType; this.customerInfo.printType = element.PrintType;
this.customerInfo.productLine = element.ProductLine; this.customerInfo.productLine = element.ProductLine;
});alert(JSON.stringify(this.customerInfo)) });
console.log("柱护板监控传值："+JSON.stringify(this.customerInfo))
if ( if (
this.customerInfo.productLine != "" this.customerInfo.productLine != ""
) { ) {
@ -535,10 +516,10 @@ export default {
this.listQuery.ProductLine = this.customerInfo.productLine; this.listQuery.ProductLine = this.customerInfo.productLine;
} }
alert(JSON.stringify(this.listQuery)); console.log("柱护板-列表查询条件："+JSON.stringify(this.listQuery));
this.$axios this.$axios
.posts( .posts(
"/api/newjit1/ZhuHuBanPackingList/ZhuHuBanPackingList-List", "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
this.listQuery this.listQuery
) )
.then((response) => { .then((response) => {
@ -577,7 +558,7 @@ export default {
this.$axios this.$axios
.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params) .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.then((response) => { .then((response) => {
alert(response.status); console.log("柱护版-打印返回的状态："+response.status);
const index = this.list.indexOf(row); const index = this.list.indexOf(row);
if (response.status === false) { if (response.status === false) {
this.$message({ this.$message({
@ -587,6 +568,7 @@ export default {
return; return;
} else { } else {
let dataname = JSON.stringify(response.item); let dataname = JSON.stringify(response.item);
console.log("柱板-调用Handlers/Handler1.ashx?report=menban传的值："+dataname)
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=menban", "/Handlers/Handler1.ashx?report=menban",
@ -617,7 +599,6 @@ export default {
}); });
myalert = "选中项"; myalert = "选中项";
} }
alert(params);
this.$confirm("是否作废" + myalert + "?", "提示", { this.$confirm("是否作废" + myalert + "?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -625,7 +606,7 @@ export default {
}) })
.then(() => { .then(() => {
this.$axios this.$axios
.posts("/api/newjit1/ZhuHuBanPackingList/delete", params) .posts("/api/newjit/ZhuHuBanPackingList/delete", params)
.then((response) => { .then((response) => {
const index = this.list.indexOf(row); const index = this.list.indexOf(row);
this.$notify({ this.$notify({

117
vue/src/views/pg-fis/basedate/m100Online/index.vue
View File

@ -255,8 +255,7 @@
direction="rtl" direction="rtl"
size="65%" size="65%"
> >
<MBDetail <MBDetail v-bind:customerInfosMB="customerInfosMB"></MBDetail>
v-bind:customerInfosMB="customerInfosMB"></MBDetail>
</el-drawer> </el-drawer>
<!--柱护板重打和作废--> <!--柱护板重打和作废-->
<el-drawer <el-drawer
@ -265,8 +264,7 @@
direction="rtl" direction="rtl"
size="65%" size="65%"
> >
<ZHBDetail <ZHBDetail v-bind:customerInfosZHB="customerInfosZHB"></ZHBDetail>
v-bind:customerInfosZHB="customerInfosZHB"></ZHBDetail>
</el-drawer> </el-drawer>
<div class="l-table" style="margin-top: -30px"> <div class="l-table" style="margin-top: -30px">
@ -900,11 +898,10 @@ export default {
]; ];
} }
if (this.listQuery.productType === 2) { if (this.listQuery.productType === 2) {
alert(val);
//把产线值传到子组件 //把产线值传到子组件
this.customerInfosZHB = [ this.customerInfosZHB = [
{ {
PrintType: 2, PrintType: 1,
ProductLine: val, ProductLine: val,
}, },
]; ];
@ -975,29 +972,90 @@ export default {
} }
this.hostSNQuery.productLine = this.listQuery.productLine; this.hostSNQuery.productLine = this.listQuery.productLine;
this.hostPrintQuery.productLine = this.listQuery.productLine; this.hostPrintQuery.productLine = this.listQuery.productLine;
this.$axios //后端服务更改了 前端跟着更改成以下方式
.gets("/api/newjit/bill-m100/get-print-start-hostsn", this.hostSNQuery) if (this.listQuery.productType === 1) {
.then((response) => { //门板
console.log("获取hostsn大众顺序号起始"); this.hostSNQuery.isZhuHuBan = "0";
console.log(response.item); console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
if (response.item !== null) { this.$axios
this.form.beginHostSN = parseInt(response.item); .gets(
if (this.listQuery.productType === 1) { "/api/newjit/bill-m100/get-print-start-hostsn2",
//门板 this.hostSNQuery
this.form.endHostSN = parseInt(response.item) + 11; )
} else if (this.listQuery.productType === 2) { .then((response) => {
//柱护板 console.log("获取hostsn大众顺序号起始");
this.form.endHostSN = parseInt(response.item) + 23; 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({ } else if (this.listQuery.productType === 2) {
message: "获取不到大众顺序号", //柱护板
type: "warning", this.hostSNQuery.isZhuHuBan = "1";
}); console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
return; this.$axios
} .gets(
}) "/api/newjit/bill-m100/get-print-start-hostsn2",
.catch(() => {}); 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.formTitle = "打印";
this.dialogFormVisible = true; this.dialogFormVisible = true;
this.form = { this.form = {
@ -1328,7 +1386,7 @@ export default {
this.hostPrintQuery this.hostPrintQuery
) )
.then((response) => { .then((response) => {
console.log("重新或补打打印门板装箱单"); console.log("重新或补打打印门板装箱单"+JSON.stringify(this.hostPrintQuery));
console.log(response); console.log(response);
if (response.status === false) { if (response.status === false) {
this.$message({ this.$message({
@ -1517,6 +1575,7 @@ export default {
document.body.appendChild(ifr); document.body.appendChild(ifr);
this.doPrint("printPdf" + date); this.doPrint("printPdf" + date);
window.URL.revokeObjectURL(ifr.src); // 释放URL 对象 window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
alert()
this.dialogFormVisible = false; this.dialogFormVisible = false;
}, },
httpPost(URL, PARAMS) { httpPost(URL, PARAMS) {

Write Preview
Loading…
Cancel
Save