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

测试bug

FoShanPG
lyf 2 years ago
parent
78d3de08f0
commit
f51ad9d22a
12 changed files with 254 additions and 84 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. 7
      vue/src/router/index.js
  2. 25
      vue/src/views/pg-fis/basedate/m100BIll/index.vue
  3. 12
      vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
  4. 9
      vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
  5. 8
      vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
  6. 3
      vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
  7. 3
      vue/src/views/pg-fis/basedate/m100Online/index-old.vue
  8. 3
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  9. 247
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  10. 3
      vue/src/views/pg-fis/basedate/select/detailZHB.vue
  11. 14
      vue/src/views/pg-fis/basedate/select/index.vue
  12. 4
      vue/static/config.js

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

@ -67,8 +67,9 @@ export const constantRoutes = [
//component: () => import('@/views/login/index'), //component: () => import('@/views/login/index'),
//component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one //component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one //component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), //component: () => import('@/views/pg-fis/basedate/unknownAssembly'), //?? one
hidden: true //component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
component: () => import('@/views/pg-fis/basedate/select'), //M100查询
}, },
{ {
path: '/auth-redirect', path: '/auth-redirect',
@ -188,7 +189,7 @@ export const asyncRoutes = [
//wheeldataRouter,//大众看板和备件 //wheeldataRouter,//大众看板和备件
pgfisPrint,//排序单打印 pgfisPrint,//排序单打印
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 }

25
vue/src/views/pg-fis/basedate/m100BIll/index.vue
View File

@ -42,6 +42,24 @@
:value="item.productLineCode"/> :value="item.productLineCode"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="大众工位" prop="fwStation">
<el-select
v-model="listQuery.fwStation"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="ptypeselectChange"
>
<el-option
v-for="item in fwStationList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="版本:" prop="Version"> <el-form-item label="版本:" prop="Version">
<el-input <el-input
@ -638,6 +656,7 @@ export default {
SkipCount: 0, SkipCount: 0,
MaxResultCount: 15, MaxResultCount: 15,
productType: 1, productType: 1,
fwStation : "BA2", //大众工位
ProductLine: undefined, ProductLine: undefined,
version:undefined, version:undefined,
HostSNBegin:undefined, HostSNBegin:undefined,
@ -725,7 +744,11 @@ export default {
dicTypeName:"派格车型", dicTypeName:"派格车型",
}, },
vehicleModelList:[],//车型list vehicleModelList:[],//车型list
productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}], productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
fwStationList: [
{ id: "BA2", name: "BA2" },
{ id: "BA5", name: "BA5" }
],
gettime:"", gettime:"",
KNRlist:null, KNRlist:null,
}; };

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

@ -99,6 +99,7 @@
type="success" type="success"
icon="el-icon-s-shop" icon="el-icon-s-shop"
@click="handleUpdate()" @click="handleUpdate()"
style="visibility: collapse;"
>打印当前页</el-button >打印当前页</el-button
> >
<el-button <el-button
@ -252,6 +253,7 @@ export default {
printType: "1", printType: "1",
productLine: "", productLine: "",
partType: "", partType: "",
fwStation: ""
}, },
// 高级搜索 // 高级搜索
filterObj: { filterObj: {
@ -337,6 +339,7 @@ export default {
newVal.forEach((element) => { newVal.forEach((element) => {
this.customerInfo.printType = "1"; this.customerInfo.printType = "1";
this.customerInfo.productLine = element.ProductLine; this.customerInfo.productLine = element.ProductLine;
this.customerInfo.fwStation = element.fwStation;
}); });
console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo)); console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
if (this.customerInfo.productLine != "") { if (this.customerInfo.productLine != "") {
@ -488,6 +491,10 @@ export default {
if (this.customerInfo.productLine != "") { if (this.customerInfo.productLine != "") {
this.listQuery.ProductLine = 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)); console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
this.$axios this.$axios
@ -533,6 +540,7 @@ export default {
var params = { var params = {
printType: "1", printType: "1",
productLine: this.customerInfo.productLine, productLine: this.customerInfo.productLine,
fwStation: this.customerInfo.fwStation,
reportIdList: ZHBId, reportIdList: ZHBId,
partType: this.multipleSelection[0].partType, partType: this.multipleSelection[0].partType,
dataResultType: "2", dataResultType: "2",
@ -615,11 +623,13 @@ export default {
var params = { var params = {
printType: "1", printType: "1",
productLine: this.customerInfo.productLine, productLine: this.customerInfo.productLine,
fwStation: this.customerInfo.fwStation,
reportIdList: ZHBId, reportIdList: ZHBId,
//partType: this.multipleSelection[0].partType, //partType: this.multipleSelection[0].partType,
dataResultType: "1", dataResultType: "1",
}; };
console.log("柱护版-主界面传过来的值：" + JSON.stringify(params)); console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
let _this = this;
this.$axios this.$axios
//.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params) //.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.posts("/api/newjit/bill-m100/load-zhuhuban-report", params) .posts("/api/newjit/bill-m100/load-zhuhuban-report", params)
@ -640,7 +650,7 @@ export default {
); );
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=zhuhuban", "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery) qs.stringify(this.fileQuery)
) )
.then((response) => { .then((response) => {

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

@ -312,6 +312,7 @@ export default {
customerInfo: { customerInfo: {
printType: "1", printType: "1",
productLine: "", productLine: "",
fwStation: ""
}, },
// 高级搜索 // 高级搜索
filterObj: { filterObj: {
@ -401,6 +402,7 @@ export default {
newVal.forEach((element) => { newVal.forEach((element) => {
this.customerInfo.printType = "1"; this.customerInfo.printType = "1";
this.customerInfo.productLine = element.ProductLine; this.customerInfo.productLine = element.ProductLine;
this.customerInfo.fwStation = element.fwStation;
}); });
console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo)); console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
if (this.customerInfo.productLine != "") { if (this.customerInfo.productLine != "") {
@ -552,6 +554,9 @@ export default {
if (this.customerInfo.productLine != "") { if (this.customerInfo.productLine != "") {
this.listQuery.ProductLine = 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)); console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
this.$axios this.$axios
@ -597,10 +602,12 @@ export default {
var params = { var params = {
printType: "1", printType: "1",
productLine: this.customerInfo.productLine, productLine: this.customerInfo.productLine,
fwStation: this.customerInfo.fwStation,
beginVin: beginVin1, beginVin: beginVin1,
endVin: endVin1, endVin: endVin1,
}; };
console.log("柱护版-主界面传过来的值：" + JSON.stringify(params)); console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
let _this = this;
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) => {
@ -620,7 +627,7 @@ export default {
); );
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=zhuhuban", "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery) qs.stringify(this.fileQuery)
) )
.then((response) => { .then((response) => {

8
vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
View File

@ -218,6 +218,7 @@ export default {
customerInfo: { customerInfo: {
printType: "", printType: "",
productLine: "", productLine: "",
fwStation: ""
}, },
// 高级搜索 // 高级搜索
filterObj: { filterObj: {
@ -306,6 +307,7 @@ export default {
newVal.forEach((element) => { newVal.forEach((element) => {
this.customerInfo.printType = 2; //2时补打 this.customerInfo.printType = 2; //2时补打
this.customerInfo.productLine = element.ProductLine; this.customerInfo.productLine = element.ProductLine;
this.customerInfo.fwStation = element.fwStation;
}); });
if (this.customerInfo.productLine != "") { if (this.customerInfo.productLine != "") {
this.getList(); this.getList();
@ -474,6 +476,9 @@ export default {
if (this.customerInfo.productLine != "") { if (this.customerInfo.productLine != "") {
inputParam.productLine = 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)); console.log('取柱护板补打列表replenish-print-zhb-list方法输入参数：' + JSON.stringify(this.listQuery));
this.$axios this.$axios
@ -510,6 +515,7 @@ export default {
var params = { var params = {
printType: 2, printType: 2,
productLine: this.customerInfo.productLine, productLine: this.customerInfo.productLine,
fwStation: this.customerInfo.fwStation,
beginVin: beginVin1, beginVin: beginVin1,
endVin: endVin1, endVin: endVin1,
m100IdList: [] m100IdList: []
@ -539,7 +545,7 @@ export default {
// this.$axios // this.$axios
// .posts( // .posts(
// "/Handlers/Handler1.ashx?report=zhuhuban", // "/Handlers/Handler1.ashx?report=zhuhuban_" + this.customerInfo.productLine + '-' + this.customerInfo.fwStation,
// qs.stringify(this.fileQuery) // qs.stringify(this.fileQuery)
// ) // )
// .then((response) => { // .then((response) => {

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

@ -553,6 +553,7 @@ export default {
endVin: endVin1, endVin: endVin1,
}; };
console.log("柱护版-主界面传过来的值：" + JSON.stringify(params)); console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
let _this = this;
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) => {
@ -572,7 +573,7 @@ export default {
); );
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=zhuhuban", "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery) qs.stringify(this.fileQuery)
) )
.then((response) => { .then((response) => {

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

@ -1249,6 +1249,7 @@ export default {
} else if (this.listQuery.productType === 2) { } else if (this.listQuery.productType === 2) {
//柱护板 //柱护板
//传递大众顺序号起止 //传递大众顺序号起止
let _this = this;
this.$axios this.$axios
.posts( .posts(
"/api/newjit/bill-m100/print-zhuhuban-packing-list", "/api/newjit/bill-m100/print-zhuhuban-packing-list",
@ -1274,7 +1275,7 @@ export default {
console.log(this.fileQuery.dataname); console.log(this.fileQuery.dataname);
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=zhuhuban", "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery) qs.stringify(this.fileQuery)
) )
.then((response) => { .then((response) => {

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

@ -1290,6 +1290,7 @@ export default {
} else if (this.listQuery.productType === 2) { } else if (this.listQuery.productType === 2) {
//柱护板 //柱护板
//传递大众顺序号起止 //传递大众顺序号起止
let _this = this;
this.$axios this.$axios
.posts( .posts(
"/api/newjit/bill-m100/print-zhuhuban-packing-list", "/api/newjit/bill-m100/print-zhuhuban-packing-list",
@ -1315,7 +1316,7 @@ export default {
console.log(this.fileQuery.dataname); console.log(this.fileQuery.dataname);
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=zhuhuban", "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery) qs.stringify(this.fileQuery)
) )
.then((response) => { .then((response) => {

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

@ -44,6 +44,24 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="大众工位" prop="fwStation" v-show="this.listQuery.productType === 2">
<el-select
v-model="listQuery.fwStation"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="fwStation_selectChange"
>
<el-option
v-for="item in fwStationList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
@ -76,8 +94,9 @@
@click="print()" @click="print()"
>打印门板发货排序单 >打印门板发货排序单
</el-button> </el-button>
<el-button <el-button
v-show="this.listQuery.productType === 1" v-show="false"
@click="drawerMBPrint = true" @click="drawerMBPrint = true"
size="mini" size="mini"
type="warning" type="warning"
@ -86,7 +105,7 @@
<strong>重新打印门板</strong></el-button <strong>重新打印门板</strong></el-button
> >
<el-button <el-button
v-show="this.listQuery.productType === 1" v-show="false"
@click="drawerbudaMBPrint = true" @click="drawerbudaMBPrint = true"
size="mini" size="mini"
type="warning" type="warning"
@ -95,7 +114,7 @@
<strong>门板补打</strong></el-button <strong>门板补打</strong></el-button
> >
<el-button <el-button
v-show="this.listQuery.productType === 1" v-show="false"
@click="drawerMBDelete = true" @click="drawerMBDelete = true"
size="mini" size="mini"
type="danger" type="danger"
@ -114,15 +133,15 @@
> >
<el-button <el-button
v-show="this.listQuery.productType === 2" v-show="this.listQuery.productType === 2"
@click="drawerbudaZHBPrint = true" @click="drawerbudaZHBPrint = true"
size="mini" size="mini"
type="warning" type="warning"
plain plain
> >
<strong>柱护板补打</strong></el-button <strong>柱护板补打</strong></el-button
> >
<el-button <el-button
@ -557,6 +576,7 @@ export default {
SkipCount: 0, SkipCount: 0,
MaxResultCount: 15, MaxResultCount: 15,
productType: 1, //1:门板；2:柱护板 productType: 1, //1:门板；2:柱护板
fwStation : "BA2", //大众工位
ProductLine: undefined, ProductLine: undefined,
Version: undefined, Version: undefined,
printBillNum: undefined, printBillNum: undefined,
@ -643,6 +663,10 @@ export default {
{ id: 1, name: "门板" }, { id: 1, name: "门板" },
{ id: 2, name: "柱护板" }, { id: 2, name: "柱护板" },
], ],
fwStationList: [
{ id: "BA2", name: "BA2" },
{ id: "BA5", name: "BA5" }
],
isShowHostSN: false, isShowHostSN: false,
isShowVin: false, isShowVin: false,
isShowState: true, isShowState: true,
@ -751,7 +775,7 @@ export default {
// productLineList.forEach(element => { // productLineList.forEach(element => {
// element=this.listQuery.productLine; // element=this.listQuery.productLine;
// }); // });
//let productLineList = { productLineList: [this.listQuery.productLine] }; //let productLineList = { productLineList: [this.listQuery.productLine] };
this.$refs.sp01.Visible = false; this.$refs.sp01.Visible = false;
this.$refs.sp05.Visible = false; this.$refs.sp05.Visible = false;
@ -803,10 +827,10 @@ export default {
this.$refs.sp01.style.color = "green"; this.$refs.sp01.style.color = "green";
} }
} }
if (JKITEM.productLine == "05") { if (JKITEM.productLine == "02") {
this.$refs.sp05.Visible = true; this.$refs.sp05.Visible = true;
this.content05 = this.content05 =
"05生产线已经" + "02生产线已经" +
JKITEM.timeoutMinutes + JKITEM.timeoutMinutes +
"分钟没收到报文\xa0\xa0\xa0\xa0"; "分钟没收到报文\xa0\xa0\xa0\xa0";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
@ -820,41 +844,58 @@ export default {
this.$refs.sp05.style.color = "green"; this.$refs.sp05.style.color = "green";
} }
} }
if (JKITEM.productLine == "07") { // if (JKITEM.productLine == "05") {
this.$refs.sp07.Visible = true; // this.$refs.sp05.Visible = true;
this.content07 = // this.content05 =
"07生产线已经" + // "05生产线已经" +
JKITEM.timeoutMinutes + // JKITEM.timeoutMinutes +
"分钟没收到报文\xa0\xa0\xa0\xa0"; // "分钟没收到报文\xa0\xa0\xa0\xa0";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//写提示信息 // //写提示信息
console.log( // console.log(
"222222222222222222222222222222222222222222222222" // "222222222222222222222222222222222222222222222222"
); // );
this.$refs.sp07.style.color = "red"; // this.$refs.sp05.style.color = "red";
this.$refs.sp07.style.fontWeight = "bold"; // this.$refs.sp05.style.fontWeight = "bold";
} else { // } else {
this.$refs.sp07.style.color = "green"; // this.$refs.sp05.style.color = "green";
} // }
} // }
if (JKITEM.productLine == "08") { // if (JKITEM.productLine == "07") {
this.$refs.sp08.Visible = true; // this.$refs.sp07.Visible = true;
this.content08 = // this.content07 =
JKITEM.productLine + // "07生产线已经" +
"生产线已经" + // JKITEM.timeoutMinutes +
JKITEM.timeoutMinutes + // "分钟没收到报文\xa0\xa0\xa0\xa0";
"分钟没收到报文"; // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { // //写提示信息
//写提示信息 // console.log(
console.log( // "222222222222222222222222222222222222222222222222"
"222222222222222222222222222222222222222222222222" // );
); // this.$refs.sp07.style.color = "red";
this.$refs.sp08.style.color = "red"; // this.$refs.sp07.style.fontWeight = "bold";
this.$refs.sp08.style.fontWeight = "bold"; // } else {
} else { // this.$refs.sp07.style.color = "green";
this.$refs.sp08.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 { } else {
this.$message({ this.$message({
@ -1119,6 +1160,7 @@ export default {
return projectTypeKeyValue[type]; return projectTypeKeyValue[type];
}, },
getList(data) { getList(data) {
this.listLoading = true; this.listLoading = true;
if (data != undefined) { if (data != undefined) {
this.listQueryList.SkipCount = (this.page - 1) * data.limit; this.listQueryList.SkipCount = (this.page - 1) * data.limit;
@ -1138,6 +1180,7 @@ export default {
this.listQueryList.BillStatus = 2; //状态 this.listQueryList.BillStatus = 2; //状态
this.listQueryList.ProductLine = this.listQuery.productLine; //产线 this.listQueryList.ProductLine = this.listQuery.productLine; //产线
this.listQueryList.CanNotPrint = false; //不可打印 this.listQueryList.CanNotPrint = false; //不可打印
this.listQueryList.fwStation = this.listQuery.fwStation; //BA2 BA5
console.log( console.log(
"日常打印M100查询条件：" + JSON.stringify(this.listQueryList) "日常打印M100查询条件：" + JSON.stringify(this.listQueryList)
); );
@ -1185,6 +1228,7 @@ export default {
}, },
valueselectChange(val) { valueselectChange(val) {
debugger
this.$forceUpdate(); this.$forceUpdate();
this.customerInfosMB = []; this.customerInfosMB = [];
this.customerInfosZHB = []; this.customerInfosZHB = [];
@ -1194,6 +1238,7 @@ export default {
{ {
PrintType: 1, PrintType: 1,
ProductLine: val, ProductLine: val,
fwStation: this.listQuery.fwStation
}, },
]; ];
} }
@ -1203,10 +1248,37 @@ export default {
{ {
PrintType: 1, PrintType: 1,
ProductLine: val, 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() {}, handleImportSAP() {},
handleFilter() { handleFilter() {
@ -1260,6 +1332,7 @@ export default {
(this.hostCheckQuery.printType = 0); (this.hostCheckQuery.printType = 0);
this.hostPrintQuery.printType = 0; this.hostPrintQuery.printType = 0;
this.vinPrintQuery.printType = 0; this.vinPrintQuery.printType = 0;
if ( if (
this.listQuery.productLine === "" || this.listQuery.productLine === "" ||
this.listQuery.productLine === undefined this.listQuery.productLine === undefined
@ -1272,8 +1345,13 @@ export default {
} }
(this.printNum = "12"), (this.printNum = "12"),
(this.printNumZHB = "24"), (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.productLine = this.listQuery.productLine;
this.hostPrintQuery.fwStation = this.listQuery.fwStation;
//后端服务更改了 前端跟着更改成以下方式 //后端服务更改了 前端跟着更改成以下方式
if (this.listQuery.productType === 1) { if (this.listQuery.productType === 1) {
//门板 //门板
@ -1307,6 +1385,28 @@ export default {
//柱护板 //柱护板
this.hostSNQuery.isZhuHuBan = "1"; this.hostSNQuery.isZhuHuBan = "1";
console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery)); 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 this.$axios
.gets( .gets(
@ -1337,17 +1437,8 @@ export default {
if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") { if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") {
this.productName = ""; this.productName = "";
switch (this.listQuery.productLine) { switch (this.listQuery.productLine) {
case "01": case "00":
this.productName = "总装-01"; this.productName = "全部门板";
break;
case "05":
this.productName = "总装-05";
break;
case "07":
this.productName = "总装-07";
break;
case "08":
this.productName = "总装-08";
break; break;
} }
@ -1355,8 +1446,11 @@ export default {
} else { } else {
this.productName = ""; this.productName = "";
switch (this.listQuery.productLine) { switch (this.listQuery.productLine) {
case "08": case "01":
this.productName = "总装-柱护板"; this.productName = "大众一厂";
break;
case "02":
this.productName = "大众二厂";
break; break;
} }
this.formTitle = "打印-柱护板发货排序单"; this.formTitle = "打印-柱护板发货排序单";
@ -1395,6 +1489,7 @@ export default {
} }
this.formTitle = "重打"; this.formTitle = "重打";
this.hostPrintQuery.productLine = this.listQuery.productLine; this.hostPrintQuery.productLine = this.listQuery.productLine;
this.hostPrintQuery.fwStation = this.listQuery.fwStation;
this.dialogFormVisible = true; this.dialogFormVisible = true;
this.form = { this.form = {
beginVin: "", beginVin: "",
@ -1428,6 +1523,7 @@ export default {
} }
this.formTitle = "补打"; this.formTitle = "补打";
this.hostPrintQuery.productLine = this.listQuery.productLine; this.hostPrintQuery.productLine = this.listQuery.productLine;
this.hostPrintQuery.fwStation = this.listQuery.fwStation;
this.dialogFormVisible = true; this.dialogFormVisible = true;
this.form = { this.form = {
beginVin: "", beginVin: "",
@ -1550,6 +1646,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;
this.hostCheckQuery.fwStation = this.listQuery.fwStation;
this.isDisable = true; this.isDisable = true;
this.$axios this.$axios
.posts( .posts(
@ -1736,9 +1833,12 @@ export default {
//this.fileQuery.dataname = ""; //this.fileQuery.dataname = "";
console.log("打印json"); console.log("打印json");
console.log(this.fileQuery.dataname); console.log(this.fileQuery.dataname);
let reporturl = "/Handlers/Handler1.ashx?report=zhuhuban_" + this.hostPrintQuery.productLine + '-' + this.hostPrintQuery.fwStation; //zhuhuban_01-BA2
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=zhuhuban", reporturl, //"/Handlers/Handler1.ashx?report=zhuhuban",
qs.stringify(this.fileQuery) qs.stringify(this.fileQuery)
) )
.then((response) => { .then((response) => {
@ -1761,16 +1861,25 @@ export default {
//获取所有产线 //获取所有产线
getProductLine() { 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( console.log(
"this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" + "this.listPLQuery.UserId::" + this.listPLQuery.UserId
this.listPLQuery.UserId
); );
this.$axios this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery) .gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => { .then((response) => {
//console.log(response); //console.log(response);
this.PLList = response.item; this.PLList = response.item;
debugger
this.PLChildList = this.PLList.filter( this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType) (u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => { ).sort((a, b) => {
@ -1809,6 +1918,7 @@ export default {
this.$refs.btn3.$el.innerText = "补打门板发货排序单"; this.$refs.btn3.$el.innerText = "补打门板发货排序单";
this.listQuery.state.push(this.billState[0].id); this.listQuery.state.push(this.billState[0].id);
this.isShowState = true; this.isShowState = true;
} else if (this.listQuery.productType === 2) { } else if (this.listQuery.productType === 2) {
this.$refs.btn1.$el.innerText = "打印柱护板发货排序单"; this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单"; this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
@ -1822,6 +1932,7 @@ export default {
this.listQueryList.ZHBBillStatus = 0; this.listQueryList.ZHBBillStatus = 0;
} }
}, },
/*单据状态变更 */ /*单据状态变更 */
checkedListChange(index) { checkedListChange(index) {
if (this.listQuery.state.length <= 1) { if (this.listQuery.state.length <= 1) {

3
vue/src/views/pg-fis/basedate/select/detailZHB.vue
View File

@ -553,6 +553,7 @@ export default {
endVin: endVin1, endVin: endVin1,
}; };
console.log("柱护版-主界面传过来的值：" + JSON.stringify(params)); console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
let _this = this;
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) => {
@ -572,7 +573,7 @@ export default {
); );
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=zhuhuban", "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery) qs.stringify(this.fileQuery)
) )
.then((response) => { .then((response) => {

14
vue/src/views/pg-fis/basedate/select/index.vue
View File

@ -634,8 +634,13 @@ export default {
width: 120, width: 120,
}); });
tempsTabs.push({ tempsTabs.push({
label: "柱护板状态", label: "柱护板状态BA2",
prop: "printBillNum", prop: "BA2",
width: 120,
});
tempsTabs.push({
label: "柱护板状态BA5",
prop: "BA5",
width: 120, width: 120,
}); });
tempsTabs.push({ tempsTabs.push({
@ -1199,7 +1204,7 @@ export default {
console.log("检查hostsn大众顺序号是否断号"); console.log("检查hostsn大众顺序号是否断号");
console.log(response); console.log(response);
if (response.item.length > 0) { if (response.item.length > 0) {
this.$confirm("本次打印存在断号是否继续?", "提示", { this.$confirm("本次打印存在断号，是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
@ -1248,6 +1253,7 @@ export default {
} else if (this.listQuery.productType === 2) { } else if (this.listQuery.productType === 2) {
//柱护板 //柱护板
//传递大众顺序号起止 //传递大众顺序号起止
let _this = this;
this.$axios this.$axios
.posts( .posts(
"/api/newjit/bill-m100/print-zhuhuban-packing-list", "/api/newjit/bill-m100/print-zhuhuban-packing-list",
@ -1273,7 +1279,7 @@ export default {
console.log(this.fileQuery.dataname); console.log(this.fileQuery.dataname);
this.$axios this.$axios
.posts( .posts(
"/Handlers/Handler1.ashx?report=zhuhuban", "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery) qs.stringify(this.fileQuery)
) )
.then((response) => { .then((response) => {

4
vue/static/config.js
View File

@ -39,7 +39,9 @@ if (process.env.NODE_ENV === 'development') {
//ip: 'http://192.168.0.67', //ip: 'http://192.168.0.67',
//ip: 'http://192.168.0.140', //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://149.223.116.5',
//ip: 'http://114.116.225.148', //ip: 'http://114.116.225.148',
//ip: 'http://10.123.148.162', //ip: 'http://10.123.148.162',

Write Preview
Loading…
Cancel
Save