diff --git a/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue b/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue index fad25f00..ab16bbcc 100644 --- a/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue +++ b/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue @@ -468,14 +468,10 @@ export default { } */ if(column.property === "partType") { - if(row[column.property] === "1") + var pl = this.partType1List.filter(u => u.dicItemCode === row[column.property]); + if(pl.length !== 0) { - var vname = '门板'; - return vname; - } - else if(row[column.property] === '2') - { - var vname = '柱护板'; + var vname = pl[0].dicItemName; return vname; } else diff --git a/vue/src/views/pg-fis/basedate/m100BIll/detail.vue b/vue/src/views/pg-fis/basedate/m100BIll/detail.vue index 25108fdd..35119046 100644 --- a/vue/src/views/pg-fis/basedate/m100BIll/detail.vue +++ b/vue/src/views/pg-fis/basedate/m100BIll/detail.vue @@ -184,15 +184,15 @@ export default { formTitle: "", drawer: false, showExcelImport: false, - tableHeight: document.documentElement.clientHeight - 260, - isEdit: false, + tableHeight: document.documentElement.clientHeight -30 , + isEdit: false }; }, mounted() { var self = this; window.onresize = function () { var offsetHei = document.documentElement.clientHeight; - self.tableHeight = offsetHei - 190; + self.tableHeight = offsetHei - 30; }; }, created() { diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue index 26d182b4..d71b3e2d 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/index.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue @@ -197,25 +197,28 @@ >导出(Excel) 打印发货排序单 + >打印门板发货排序单 重新打印发货排序单 + >重新打印门板发货排序单 补打发货排序单 + >补打门板发货排序单 @@ -276,6 +279,81 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +