From 7a81033bcc75e0d8b84b8fc37a225a0bb84b2a89 Mon Sep 17 00:00:00 2001
From: "LAPTOP-AKBAACR8\\An.Hr" <297504645@qq.com>
Date: Thu, 30 Mar 2023 15:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=20M100=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=EF=BC=8C=E6=97=A5=E5=B8=B8?=
=?UTF-8?q?=E6=89=93=E5=8D=B0M100=E4=BF=A1=E6=81=AF=E5=90=91=E5=AD=90?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=A0=E5=8F=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pg-fis/basedate/m100Online/budaMB.vue | 7 +-
.../pg-fis/basedate/m100Online/budaZHB.vue | 7 +-
.../basedate/m100Online/normalPritIndex.vue | 37 +++++-----
.../views/pg-fis/basedate/select/index.vue | 68 ++++++++++++++++---
4 files changed, 83 insertions(+), 36 deletions(-)
diff --git a/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue b/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
index 869cf912..6196c222 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
@@ -292,13 +292,12 @@ export default {
//this.tableHeight = offsetHei -260
});
},
- created() {
- this.getList();
- },
+ // created() {
+ // this.getList();
+ // },
watch: {
customerInfosMB: {
handler(newVal) {
-
console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
if (newVal == "" || newVal == "undefined") {
//TODO
diff --git a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
index 79bce13c..32402b78 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
@@ -304,7 +304,7 @@ export default {
newVal.forEach((element) => {
this.customerInfo.printType = 2; //2时补打
this.customerInfo.productLine = element.ProductLine;
- this.customerInfo.productGroup = element.productGroup
+ this.customerInfo.Groupname = element.Groupname
});
if (this.customerInfo.productLine != "") {
this.getList();
@@ -472,7 +472,8 @@ export default {
if (this.customerInfo.productLine != "") {
inputParam.productLine = this.customerInfo.productLine;
}
- inputParam.Groupname = this.customerInfo.productGroup;
+ inputParam.Groupname = this.customerInfo.Groupname;
+ console.log(476,inputParam)
console.log('取柱护板补打列表replenish-print-zhb-list方法输入参数：' + JSON.stringify(this.listQuery));
this.$axios
.gets(
@@ -507,7 +508,7 @@ export default {
var params = {
printType: 2,
productLine: this.customerInfo.productLine,
- Groupname: this.customerInfo.productGroup,
+ Groupname: this.customerInfo.Groupname,
beginVin: beginVin1,
endVin: endVin1,
m100IdList: []
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 03ce580c..5ae9103f 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -46,16 +46,16 @@
u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
+ this.listQuery.productLine = this.PLChildList[0].productLineCode;
+ this.listQuery.Groupname = this.listQuery.productType == '1' ? undefined : this.PLChildGroupList[0]
this.changeMainTableHeight()
+ this.valueselectChange()
//变更打印按钮文字
if (this.listQuery.productType === 1) {
this.$refs.btn1.$el.innerText = "打印门板发货排序单";
diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue
index e82a6e73..190875d0 100644
--- a/vue/src/views/pg-fis/basedate/select/index.vue
+++ b/vue/src/views/pg-fis/basedate/select/index.vue
@@ -32,7 +32,7 @@
clearable
placeholder="请选择"
size="medium"
- style="margin-right: 15px"
+ style="margin-right: 10px"
@change="valueselectChange"
>
+
+
+
+
+
+
+
{
- var offsetHei = document.documentElement.clientHeight;
- //console.log(offsetHei);
- let boxH = this.$refs.box.offsetHeight;
- this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
- //this.tableHeight = offsetHei -260
- });
+ let _this = this
+ window.addEventListener('resize',function(){
+ _this.changeMainTableHeight()
+ })
+ this.getPLChildGroupList()
},
created() {
this.billState.forEach((element, index) => {
@@ -663,6 +684,28 @@ export default {
...mapGetters(["userInfo"]), //获取当前用户信息
},
methods: {
+ // 更改主表格高度
+ changeMainTableHeight(){
+ this.$nextTick(()=>{
+ var offsetHei = document.documentElement.clientHeight;
+ //console.log(offsetHei);
+ let boxH = this.$refs.box.offsetHeight;
+ this.tableHeight = offsetHei - boxH - 37 - 79; //57为footer高度，79为页面上部标签高度
+ //this.tableHeight = offsetHei -260
+ })
+ },
+ // 获取PLChildGroupList
+ getPLChildGroupList(){
+ this.$axios
+ .gets(
+ "/api/newjit/print-template-configuration/list",
+ )
+ .then((response) => {
+ if (response.item !== null) {
+ this.PLChildGroupList= response.item;
+ }
+ });
+ },
//抽屉
handleDrawerOpen(param) {
this.drawer = true;
@@ -861,6 +904,8 @@ export default {
.catch(() => {
this.listLoading = false;
});
+
+ this.changeMainTableHeight()
},
getDetialList(partCode) {
@@ -1506,21 +1551,24 @@ export default {
ptypeselectChange() {
this.$forceUpdate();
//console.log(this.listQuery.productType);
- this.listQuery.productLine = "";
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
+ this.listQuery.productLine = this.PLChildList[0].productLineCode;
+ this.changeMainTableHeight()
//console.log(this.PLList)
//变更打印按钮文字
if (this.listQuery.productType === 1) {
+ this.listQuery.Groupname = undefined
this.$refs.btn1.$el.innerText = "打印门板发货排序单";
this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
this.$refs.btn3.$el.innerText = "补打门板发货排序单";
this.listQuery.state.push(this.billState[0].id);
this.isShowState = true;
} else if (this.listQuery.productType === 2) {
+ this.listQuery.Groupname = this.PLChildGroupList[0]
this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";