diff --git a/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue b/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
index f8000a3b..bd73a10d 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
@@ -145,14 +145,14 @@
@@ -274,7 +274,7 @@ export default {
isEdit: false,
formLoading: false,
tableHeight: document.documentElement.clientHeight - 335,
- tableHeightMB: document.documentElement.clientHeight - 300,
+ tableHeightMB: document.documentElement.clientHeight - 240,
detailTableHeight: 250,
details: [], //修改子表数据源
PLList: [], //产线下拉
diff --git a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
index e7d9f3ba..f7047efb 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
@@ -145,14 +145,14 @@
@@ -274,7 +274,7 @@ export default {
isEdit: false,
formLoading: false,
tableHeight: document.documentElement.clientHeight - 335,
- tableHeightZHB: document.documentElement.clientHeight - 300,
+ tableHeightZHB: document.documentElement.clientHeight - 240,
detailTableHeight: 250,
details: [], //修改子表数据源
PLList: [], //产线下拉
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 144d5c5d..cfcff47d 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -1,8 +1,8 @@
-
+
-
-
+
+
+ {{ this.getPrintProductName(1) }}
+
+
+
-
-
- {{ this.productName }}
-
-
-
+
+
+ {{ this.getPrintProductName(2) }}
+
+
+
-
-
- {{ this.productName }}
-
-
{
- var offsetHei = document.documentElement.clientHeight;
- let boxH = this.$refs.box.offsetHeight;
- this.tableHeight = offsetHei - boxH - 67 - 79 - 70; //57为footer高度，79为页面上部标签高度
- //this.tableHeight = offsetHei -260
- });
+ let _this = this
+ window.addEventListener('resize',function(){
+ _this.changeMainTableHeight()
+ })
this.getPLChildGroupList()
let timer = setInterval(() => {
this.open();
@@ -757,6 +756,17 @@ export default {
...mapGetters(["userInfo"]), //获取当前用户信息
},
methods: {
+ // 更改主表格高度
+ changeMainTableHeight(){
+ this.$nextTick(()=>{
+ var offsetHei = document.documentElement.clientHeight;
+ // let boxH = this.$refs.box.offsetHeight;
+ let headerH = document.getElementById("normalPritIndex-content-header").clientHeight
+ let footerH = this.totalCount > 0 ? 67 : 0 //footer高度
+ this.tableHeight = offsetHei - headerH - 67 - 79; //79为页面上部标签高度
+ //this.tableHeight = offsetHei -260
+ })
+ },
opens() {
this.getList();
},
@@ -767,10 +777,10 @@ export default {
// });
//let productLineList = { productLineList: [this.listQuery.productLine] };
- this.$refs.sp01.Visible = false;
- this.$refs.sp05.Visible = false;
- this.$refs.sp07.Visible = false;
- this.$refs.sp08.Visible = false;
+ // this.$refs.sp01.Visible = false;
+ // this.$refs.sp05.Visible = false;
+ // this.$refs.sp07.Visible = false;
+ // this.$refs.sp08.Visible = false;
let productLineListMain = { productLineList: [] };
@@ -795,64 +805,78 @@ export default {
console.log("超时提醒-接口传过来的值：" + JSON.stringify(response.item));
if (response.item !== null) {
+ this.tipper = ""
response.item.forEach((JKITEM) => {
- if (JKITEM.productLine == "01") {
- this.$refs.sp01.Visible = true;
- this.content01 =
- "01生产线已经" +
- JKITEM.timeoutMinutes +
- "分钟没收到报文\xa0\xa0\xa0\xa0";
- if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
- //写提示信息
- this.$refs.sp01.style.color = "red";
- this.$refs.sp01.style.fontWeight = "bold";
- } else {
- this.$refs.sp01.style.color = "green";
- }
- }
- if (JKITEM.productLine == "05") {
- this.$refs.sp05.Visible = true;
- this.content05 =
- "05生产线已经" +
- JKITEM.timeoutMinutes +
- "分钟没收到报文\xa0\xa0\xa0\xa0";
- if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
- //写提示信息
- this.$refs.sp05.style.color = "red";
- this.$refs.sp05.style.fontWeight = "bold";
- } else {
- this.$refs.sp05.style.color = "green";
- }
- }
- if (JKITEM.productLine == "07") {
- this.$refs.sp07.Visible = true;
- this.content07 =
- "07生产线已经" +
- JKITEM.timeoutMinutes +
- "分钟没收到报文\xa0\xa0\xa0\xa0";
- if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
- //写提示信息
- this.$refs.sp07.style.color = "red";
- this.$refs.sp07.style.fontWeight = "bold";
- } else {
- this.$refs.sp07.style.color = "green";
- }
- }
- if (JKITEM.productLine == "08") {
- this.$refs.sp08.Visible = true;
- this.content08 =
- JKITEM.productLine +
- "生产线已经" +
- JKITEM.timeoutMinutes +
- "分钟没收到报文";
- if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+ let _item = ""
+ let _style = ""
+ if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//写提示信息
- this.$refs.sp08.style.color = "red";
- this.$refs.sp08.style.fontWeight = "bold";
+ _style = "color:red;font-weight:bold"
+ // this.$refs.sp01.style.color = "red";
+ // this.$refs.sp01.style.fontWeight = "bold";
} else {
- this.$refs.sp08.style.color = "green";
+ _style = "color:green"
+ // this.$refs.sp01.style.color = "green";
}
- }
+ _item = `${JKITEM.productLine}生产线已经${JKITEM.timeoutMinutes}分钟没收到报文\xa0\xa0\xa0\xa0`
+ this.tipper += _item
+ // if (JKITEM.productLine == "01") {
+ // this.$refs.sp01.Visible = true;
+ // this.content01 =
+ // "01生产线已经" +
+ // JKITEM.timeoutMinutes +
+ // "分钟没收到报文\xa0\xa0\xa0\xa0";
+ // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+ // //写提示信息
+ // this.$refs.sp01.style.color = "red";
+ // this.$refs.sp01.style.fontWeight = "bold";
+ // } else {
+ // this.$refs.sp01.style.color = "green";
+ // }
+ // }
+ // if (JKITEM.productLine == "05") {
+ // this.$refs.sp05.Visible = true;
+ // this.content05 =
+ // "05生产线已经" +
+ // JKITEM.timeoutMinutes +
+ // "分钟没收到报文\xa0\xa0\xa0\xa0";
+ // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+ // //写提示信息
+ // this.$refs.sp05.style.color = "red";
+ // this.$refs.sp05.style.fontWeight = "bold";
+ // } else {
+ // this.$refs.sp05.style.color = "green";
+ // }
+ // }
+ // if (JKITEM.productLine == "07") {
+ // this.$refs.sp07.Visible = true;
+ // this.content07 =
+ // "07生产线已经" +
+ // JKITEM.timeoutMinutes +
+ // "分钟没收到报文\xa0\xa0\xa0\xa0";
+ // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+ // //写提示信息
+ // this.$refs.sp07.style.color = "red";
+ // this.$refs.sp07.style.fontWeight = "bold";
+ // } else {
+ // this.$refs.sp07.style.color = "green";
+ // }
+ // }
+ // if (JKITEM.productLine == "08") {
+ // this.$refs.sp08.Visible = true;
+ // this.content08 =
+ // JKITEM.productLine +
+ // "生产线已经" +
+ // JKITEM.timeoutMinutes +
+ // "分钟没收到报文";
+ // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+ // //写提示信息
+ // this.$refs.sp08.style.color = "red";
+ // this.$refs.sp08.style.fontWeight = "bold";
+ // } else {
+ // this.$refs.sp08.style.color = "green";
+ // }
+ // }
});
} else {
this.$message({
@@ -862,6 +886,7 @@ export default {
return;
}
}
+ this.changeMainTableHeight()
});
},
debounceClick() {
@@ -1144,6 +1169,7 @@ export default {
.catch(() => {
this.listLoading = false;
});
+ this.changeMainTableHeight()
},
getDetialList(partCode) {
@@ -1237,6 +1263,25 @@ export default {
},
closeDialog() {},
+ // 获取打印模板弹窗的产线名称
+ getPrintProductName(type){
+ // 门板
+ let _name = ""
+ let _productLineName = ""
+ this.PLChildList.forEach(item=>{
+ if(item.productLineCode == this.listQuery.productLine){
+ _productLineName = item.productLineName
+ }
+ })
+ if(type == 1){
+ _name = this.productTypeList[0].name + ': ' + _productLineName
+ }
+ // 柱护板
+ else if(type == 2){
+ _name = this.productTypeList[1].name + ': ' + _productLineName + ' (' + this.listQuery.productGroup + ')'
+ }
+ return _name
+ },
/**打印 */
print() {
(this.hostPrintQuery = {
@@ -1248,13 +1293,17 @@ export default {
endVin: undefined,
Groupname: undefined,
}),
- (this.hostCheckQuery.printType = 0);
+ (this.hostCheckQuery.printType = 0);
this.hostPrintQuery.printType = 0;
this.vinPrintQuery.printType = 0;
- if (
- this.listQuery.productLine === "" ||
- this.listQuery.productLine === undefined
- ) {
+ if (this.listQuery.productLine === "" ||this.listQuery.productLine === undefined) {
+ this.$message({
+ message: "请选择生产线",
+ type: "warning",
+ });
+ return;
+ }
+ if(this.listQuery.productType == '2' && (this.listQuery.productGroup === "" || this.listQuery.productGroup === undefined)){
this.$message({
message: "请选择生产线",
type: "warning",
@@ -1266,6 +1315,8 @@ export default {
(this.hostSNQuery.productLine = this.listQuery.productLine);
this.hostPrintQuery.productLine = this.listQuery.productLine;
this.hostPrintQuery.Groupname = this.listQuery.productGroup;
+ this.hostSNQuery.Groupname = this.listQuery.productGroup
+
//后端服务更改了 前端跟着更改成以下方式
if (this.listQuery.productType === 1) {
//门板
@@ -1325,30 +1376,29 @@ export default {
});
}
if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") {
- this.productName = "";
- switch (this.listQuery.productLine) {
- case "01":
- this.productName = "总装-01";
- break;
- case "05":
- this.productName = "总装-05";
- break;
- case "07":
- this.productName = "总装-07";
- break;
- case "08":
- this.productName = "总装-08";
- break;
- }
-
+ // this.productName = "";
+ // switch (this.listQuery.productLine) {
+ // case "01":
+ // this.productName = "总装-01";
+ // break;
+ // case "05":
+ // this.productName = "总装-05";
+ // break;
+ // case "07":
+ // this.productName = "总装-07";
+ // break;
+ // case "08":
+ // this.productName = "总装-08";
+ // break;
+ // }
this.formTitle = "打印-门板发货排序单";
} else {
- this.productName = "";
- switch (this.listQuery.productLine) {
- case "08":
- this.productName = "总装-柱护板";
- break;
- }
+ // this.productName = "";
+ // switch (this.listQuery.productLine) {
+ // case "08":
+ // this.productName = "总装-柱护板";
+ // break;
+ // }
this.formTitle = "打印-柱护板发货排序单";
}
//this.formTitle = "打印";
@@ -1383,6 +1433,13 @@ export default {
});
return;
}
+ if(this.listQuery.productType == '2' && (this.listQuery.productGroup === "" || this.listQuery.productGroup === undefined)){
+ this.$message({
+ message: "请选择生产线",
+ type: "warning",
+ });
+ return;
+ }
this.formTitle = "重打";
this.hostPrintQuery.productLine = this.listQuery.productLine;
this.dialogFormVisible = true;
@@ -1416,6 +1473,13 @@ export default {
});
return;
}
+ if(this.listQuery.productType == '2' && (this.listQuery.productGroup === "" || this.listQuery.productGroup === undefined)){
+ this.$message({
+ message: "请选择生产线",
+ type: "warning",
+ });
+ return;
+ }
this.formTitle = "补打";
this.hostPrintQuery.productLine = this.listQuery.productLine;
this.dialogFormVisible = true;
@@ -1670,7 +1734,6 @@ export default {
*/
private_printZhuHuBan(isSelAll = true)
{
- console.log(1702,this.hostPrintQuery)
//门板 /api/newjit/bill-m100/save-zhuhuban-report
//传递大众顺序号起止
this.$axios
@@ -1776,6 +1839,7 @@ export default {
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
+ this.changeMainTableHeight()
//变更打印按钮文字
if (this.listQuery.productType === 1) {
this.$refs.btn1.$el.innerText = "打印门板发货排序单";
@@ -1884,7 +1948,7 @@ export default {
this.PLChildGroupList= response.item;
}
});
- }
+ },
},
};
@@ -1915,6 +1979,13 @@ export default {
margin-left: 5px;
margin-right: 5px;
}
+.tipper{
+ border: solid 1px #ddd;
+ border-radius: 5px;
+ display: inline-block;
+ padding: 10px;
+ line-height: 20px;
+}