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

修改客户端bug

FoShanPG
刘云峰 4 months ago
parent
9c9d3801af
commit
877d687b7a
6 changed files with 163 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
  2. 16
      vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
  3. 2
      vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
  4. 3
      vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
  5. 2
      vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
  6. 210
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue

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

@ -92,13 +92,15 @@
<el-table-column prop="knr" label="KNR订单号"></el-table-column>
<el-table-column prop="vin" label="底盘号"></el-table-column>
<el-table-column prop="hostSN" label="大众顺序号"></el-table-column>
<el-table-column prop="vehicleModel_DoorPlankCode" label="车型门板代码"></el-table-column>
<el-table-column prop="topBoxPositionNum" label="上箱位号"></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 prop="lineNum" label="序号"></el-table-column>
<el-table-column prop="partCode" label="零件号"></el-table-column>
<el-table-column prop="materialDescription" label="零件名称"></el-table-column>
<el-table-column prop="color" label="颜色"></el-table-column>
<el-table-column prop="vehicleModel" label="车型"></el-table-column>
<el-table-column prop="vehicleConfig" label="配置"></el-table-column>
<el-table-column prop="partQty " label="数量"></el-table-column>
</el-table>
</template>
</el-table-column>
@ -187,8 +189,8 @@
versionValue: "",
searchContent: "", // 输入内容
showExcelImport: false,
form: {},
drawer: false,
// form: {},
// drawer: false,
list: null,
totalCount: 0,
listLoading: true,

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

@ -51,7 +51,7 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
<el-button class="filter-item" type="danger" icon="el-icon-delete" size="mini" @click="print()">作废(支持批量)</el-button>
<el-button class="filter-item" type="danger" icon="el-icon-delete" size="mini" @click="print()">作废</el-button>
</el-form-item>
</el-form>
</flexbox>
@ -66,13 +66,13 @@
<el-table-column prop="knr" label="KNR订单号"></el-table-column>
<el-table-column prop="vin" label="底盘号"></el-table-column>
<el-table-column prop="hostSN" label="大众顺序号"></el-table-column>
<el-table-column prop="vehicleModel_DoorPlankCode" label="车型门板代码"></el-table-column>
<el-table-column prop="topBoxPositionNum" label="上箱位号"></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 prop="lineNum" label="序号"></el-table-column>
<el-table-column prop="partCode" label="零件号"></el-table-column>
<el-table-column prop="materialDescription" label="零件名称"></el-table-column>
<el-table-column prop="color" label="颜色"></el-table-column>
<el-table-column prop="vehicleModel" label="车型"></el-table-column>
<el-table-column prop="vehicleConfig" label="配置"></el-table-column>
<el-table-column prop="partQty " label="数量"></el-table-column>
</el-table>
</template>
</el-table-column>

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

@ -63,7 +63,7 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
<el-button class="filter-item" type="danger" icon="el-icon-delete" size="mini" @click=" print()">作废(支持批量)</el-button>
<el-button class="filter-item" type="danger" icon="el-icon-delete" size="mini" @click=" print()">作废</el-button>
</el-form-item>
</el-form>
</flexbox>

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

@ -222,7 +222,7 @@
watch: {
customerInfosMB: {
handler(newVal) {
console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
if (newVal == "" || newVal == "undefined") {
//TODO
@ -540,6 +540,7 @@
this.formLoading = false;
this.isDisable = false;
this.printpdf(response); //打印我文件流
this.getList();
})
.catch((error) => {
this.formLoading = false;

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

@ -557,6 +557,8 @@
this.formLoading = false;
this.isDisable = false;
this.printpdf(response); //打印我文件流
debugger
this.getList();
})
.catch((error) => {
this.formLoading = false;

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

@ -1,5 +1,4 @@
<!--日常打印M100信息模块-->
<!--日常打印M100信息模块-->
<template>
<div class="cr-body-content">
<div ref="box">
@ -34,25 +33,20 @@
<el-button ref="btn1" type="primary" size="mini" style="margin-left: 15px" @click="print()">打印门板发货排序单
</el-button>
<el-button v-show="this.listQuery.productType !== 2" @click="drawerMBReprint = true" size="mini" type="warning" plain>
<el-button v-show="this.listQuery.productType !== 2" @click="openDrawer(1)" size="mini" type="warning" plain>
<strong>重新打印门板</strong></el-button>
<el-button v-show="this.listQuery.productType !== 2" @click="drawerbudaMBPrint = true" size="mini" type="warning" plain>
<el-button v-show="this.listQuery.productType !== 2" @click="openDrawer(2)" size="mini" type="warning" plain>
<strong>门板补打</strong></el-button>
<el-button v-show="this.listQuery.productType !== 2" @click="drawerMBDelete = true" size="mini" type="danger" plain>
<el-button v-show="this.listQuery.productType !== 2" @click="openDrawer(3)" size="mini" type="danger" plain>
<strong>门板作废</strong></el-button>
<el-button v-show="this.listQuery.productType === 2" @click="drawerZHBReprint = true" size="mini" type="warning"
plain>
<el-button v-show="this.listQuery.productType === 2" @click="openDrawer(4)" size="mini" type="warning" plain>
<strong>重新打印柱护板</strong></el-button>
<el-button v-show="this.listQuery.productType === 2" @click="drawerbudaZHBPrint = true" size="mini" type="warning"
plain>
<el-button v-show="this.listQuery.productType === 2" @click="openDrawer(5)" size="mini" type="warning" plain>
<strong>柱护板补打</strong></el-button>
<el-button v-show="this.listQuery.productType === 2" @click="drawerZHBDelete = true" size="mini" type="danger"
plain><strong>柱护板作废</strong></el-button>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="open()"
>测试</el-button
>2Z
<el-button plain @click="open"> 不会自动关闭 </el-button> -->
<el-button v-show="this.listQuery.productType === 2" @click="openDrawer(6)" size="mini" type="danger" plain>
<strong>柱护板作废</strong></el-button>
</el-form-item>
<el-form-item>
<div id="app">
@ -96,11 +90,11 @@
</el-drawer>
<!--门板作废-->
<el-drawer title="门板作废" :visible.sync="drawerMBDelete" direction="rtl" @open="opens()" size="65%">
<el-drawer title="门板作废" :visible.sync="drawerMBDelete" direction="rtl" size="65%" @closed="drawerMBDelete_closed">
<ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
</el-drawer>
<!--柱护板作废-->
<el-drawer title="柱护板作废" :visible.sync="drawerZHBDelete" direction="rtl" size="65%">
<el-drawer title="柱护板作废" :visible.sync="drawerZHBDelete" direction="rtl" size="65%" @closed="drawerZHBDelete_closed">
<ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB>
</el-drawer>
@ -133,7 +127,7 @@
<el-row>
<el-col :md="10" :xs="24">
<el-form-item label="要打印数量:" prop="printNum" v-show="this.listQuery.productType === 1">
<el-input-number v-model="printNum" :min="1" :step="1" @change="valueNumChange"></el-input-number>
<el-input-number v-model="printNum" :min="1" :step="1" @change="valueNumChange" :disabled="true"></el-input-number>
</el-form-item>
</el-col>
<el-col :md="10" :xs="24">
@ -146,7 +140,7 @@
<el-row>
<el-col :md="10" :xs="24">
<el-form-item label="要打印数量:" prop="printNumZHB" v-show="this.listQuery.productType === 2">
<el-input-number v-model="printNumZHB" :min="1" :step="1" @change="valueNumChangeZHB"></el-input-number>
<el-input-number v-model="printNumZHB" :min="1" :step="1" @change="valueNumChangeZHB" :disabled="true"></el-input-number>
</el-form-item>
</el-col>
<el-col :md="10" :xs="24">
@ -158,7 +152,7 @@
</el-row>
<el-form-item label="大众顺序号:" prop="beginHostSN" v-show="isShowHostSN">
<el-input v-model.number="form.beginHostSN" placeholder="" clearable type="number" size="small" style="width: 240px"
@change="beginHostSNChange" />
@change="beginHostSNChange" :disabled="true"/>
<label class="label1">-</label>
<el-input v-show="this.listQuery.productType === 2" v-model="form.endHostSN" placeholder="" clearable :disabled="true" size="small" style="width: 240px;" />
</el-form-item>
@ -173,6 +167,14 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item>
<div style="color: red">{{unknowAssemblyMessage}}</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@ -316,8 +318,8 @@
versionValue: "",
searchContent: "", // 输入内容
showExcelImport: false,
form: {},
drawer: false,
// form: {},
// drawer: false,
list: null,
totalCount: 0,
listLoading: false,
@ -440,7 +442,8 @@
isShowHostSN: false,
isShowVin: false,
isShowState: true,
};
unknowAssemblyMessage: "",
}; //data return
},
mounted() {
this.setTableHeight()
@ -538,6 +541,48 @@
...mapGetters(["userInfo"]), //获取当前用户信息
},
methods: {
//按钮事件
openDrawer(val) {
switch (val) {
case 1:
this.drawerMBReprint = true;
break;
case 2:
this.drawerbudaMBPrint = true;
break;
case 3:
this.drawerMBDelete = true;
break;
case 4:
this.drawerZHBReprint = true;
break;
case 5:
this.drawerbudaZHBPrint = true;
break;
case 6:
this.drawerZHBDelete = true;
break;
};
this.customerInfosMB = [];
this.customerInfosZHB = [];
if (this.listQuery.productType === 1) {
//把产线值传到子组件
this.customerInfosMB = [{
PrintType: 1,
ProductLine: this.listQuery.productLine,
fwStation: this.listQuery.fwStation
}, ];
}
if (this.listQuery.productType === 2) {
//把产线值传到子组件
this.customerInfosZHB = [{
PrintType: 1,
ProductLine: this.listQuery.productLine,
fwStation: this.listQuery.fwStation
}];
}
},
setTableHeight() {
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
@ -547,10 +592,8 @@
//this.tableHeight = offsetHei -260
});
},
opens() {
this.getList();
},
//xx分钟没收到报文 提醒
open(self) {
// let productLineList = [];
// //console.log("门版-主界面传过来的值：11111111111111111111111111111111111111111" );
@ -559,7 +602,7 @@
// });
//let productLineList = { productLineList: [this.listQuery.productLine] };
if (this.$refs && this.$refs.sp01) {
if (this && this.$refs && this.$refs.sp01) {
this.$refs.sp01.Visible = false;
this.$refs.sp05.Visible = false;
this.$refs.sp07.Visible = false;
@ -599,7 +642,7 @@
response.item.forEach((JKITEM) => {
if (JKITEM.productLine == "01") {
if (self.$refs && self.$refs.sp01) {
if (self && self.$refs && self.$refs.sp01) {
self.$refs.sp01.Visible = true;
}
@ -612,14 +655,21 @@
// console.log(
// "222222222222222222222222222222222222222222222222-1"
// );
this.$refs.sp01.style.color = "red";
this.$refs.sp01.style.fontWeight = "bold";
if (this && this.$refs && this.$refs.sp01) {
this.$refs.sp01.style.color = "red";
this.$refs.sp01.style.fontWeight = "bold";
}
} else {
this.$refs.sp01.style.color = "green";
if (this && this.$refs && this.$refs.sp01) {
this.$refs.sp01.style.color = "green";
}
}
}
if (JKITEM.productLine == "02") {
this.$refs.sp05.Visible = true;
if (this && this.$refs && this.$refs.sp05) {
this.$refs.sp05.Visible = true;
}
this.content05 =
"大众二厂已经" +
JKITEM.timeoutMinutes +
@ -630,10 +680,15 @@
// "222222222222222222222222222222222222222222222222-2"
// );
this.setTableHeight()
this.$refs.sp05.style.color = "red";
this.$refs.sp05.style.fontWeight = "bold";
if (this && this.$refs && this.$refs.sp05) {
this.$refs.sp05.style.color = "red";
this.$refs.sp05.style.fontWeight = "bold";
}
} else {
this.$refs.sp05.style.color = "green";
if (this && this.$refs && this.$refs.sp05) {
this.$refs.sp05.style.color = "green";
}
}
}
// if (JKITEM.productLine == "05") {
@ -1032,46 +1087,47 @@
this.listLoading = false;
});
},
//生产线改变事件
valueselectChange(val) {
this.$forceUpdate();
this.customerInfosMB = [];
this.customerInfosZHB = [];
if (this.listQuery.productType === 1) {
//把产线值传到子组件
this.customerInfosMB = [{
PrintType: 1,
ProductLine: val,
fwStation: this.listQuery.fwStation
}, ];
}
if (this.listQuery.productType === 2) {
//把产线值传到子组件
this.customerInfosZHB = [{
PrintType: 1,
ProductLine: val,
fwStation: this.listQuery.fwStation
}, ];
}
// this.customerInfosMB = [];
// this.customerInfosZHB = [];
// if (this.listQuery.productType === 1) {
// //把产线值传到子组件
// this.customerInfosMB = [{
// PrintType: 1,
// ProductLine: val,
// fwStation: this.listQuery.fwStation
// }, ];
// }
// if (this.listQuery.productType === 2) {
// //把产线值传到子组件
// this.customerInfosZHB = [{
// PrintType: 1,
// ProductLine: val,
// fwStation: this.listQuery.fwStation
// }, ];
// }
},
//ba2、ba5改变事件
fwStation_selectChange(val) {
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
}];
}
// 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
// }];
// }
},
@ -1184,6 +1240,10 @@
.then((response) => {
console.log("获取hostsn大众顺序号起始");
console.log(response.item);
if (response.status == true && response.message != null) {
this.unknowAssemblyMessage = response.message; //显示未知总成信息
}
if (response.item !== null) {
this.form.beginHostSN = parseInt(response.item.beginHostSN);
this.printNum = parseInt(response.item.count); //从数据库中取未打印订单数
@ -1845,7 +1905,15 @@
return temp;
},
},
drawerMBDelete_closed() {
debugger
this.getList();
},
drawerZHBDelete_closed() {
this.getList();
}
}, //methods
};
</script>

Write Preview
Loading…
Cancel
Save