diff --git a/src/views/jhzx/sygdWH.vue b/src/views/jhzx/sygdWH.vue index 342b5d0..a7547b9 100644 --- a/src/views/jhzx/sygdWH.vue +++ b/src/views/jhzx/sygdWH.vue @@ -86,6 +86,7 @@ :cell-style="cellStyle2" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" + :scroll-y="{ enabled: true }" > @@ -347,9 +348,9 @@ export default { { field: 'sjlyCh', title: '数据来源船',width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - { field: 'id', title: '流水号(禁止修改)',width: 100, + /*{ field: 'id', title: '流水号(禁止修改)',width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, + filterRender: { name: 'FilterCombination', }},*/ ], checkedList: [], diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue index fefe24e..7d7d1bc 100644 --- a/src/views/jhzx/symxCX.vue +++ b/src/views/jhzx/symxCX.vue @@ -53,6 +53,7 @@ highlight-current-row highlight-hover-row show-overflow + :scroll-y="{enabled: true}" > @@ -2565,9 +2566,9 @@ export default { this.$message.warning(res.message) }else{ this.list = res.data - if (this.$refs.xGrid) { - this.$refs.xGrid.loadData(this.list) - } + // if (this.$refs.xGrid) { + // this.$refs.xGrid.loadData(this.list) + // } } // if (res.data.no_tlt) { // this.selectMbch = res.data diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue index fd1f058..a9fe61e 100644 --- a/src/views/jhzx/ydjhzxGL.vue +++ b/src/views/jhzx/ydjhzxGL.vue @@ -48,6 +48,7 @@ highlight-current-row highlight-hover-row show-overflow + :scroll-y="{enabled: true}" > @@ -69,6 +70,7 @@ highlight-current-row highlight-hover-row show-overflow + :scroll-y="{enabled: true}" > @@ -92,6 +94,7 @@ highlight-current-row highlight-hover-row show-overflow + :scroll-y="{enabled: true}" > @@ -116,6 +119,7 @@ highlight-hover-row show-overflow show-header-overflow + :scroll-y="{enabled: true}" > @@ -139,6 +143,7 @@ highlight-hover-row show-overflow show-header-overflow + :scroll-y="{enabled: true}" > @@ -162,6 +167,7 @@ highlight-hover-row show-overflow show-header-overflow + :scroll-y="{enabled: true}" > @@ -418,7 +424,10 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - + { field: '', title: '规格(备注:需要从pb里面查看生成规则)', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, { field: 'hd', title: '厚度', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -1008,7 +1017,6 @@ export default { var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1)+ "/"; var D = date.getDate()<10? "0" +date.getDate():date.getDate(); this.queryParam.yf = Y + M + D; - }, //初始化表1 数据 initList() { diff --git a/src/views/jhzx/ydjhzxXF.vue b/src/views/jhzx/ydjhzxXF.vue index f2994a2..c333716 100644 --- a/src/views/jhzx/ydjhzxXF.vue +++ b/src/views/jhzx/ydjhzxXF.vue @@ -45,6 +45,7 @@ highlight-current-row highlight-hover-row show-overflow + :scroll-y="{enabled: true}" > @@ -949,12 +950,10 @@ export default { }, methods: { ydjhxf(){ - let obj=this.$refs.xGrid.getCheckboxRecords() - - if(obj.length<=0){ + if(this.checkedList.length<=0){ return } - ydjhxf(obj).then(res=> { + ydjhxf(this.checkedList).then(res=> { if (res.success) { this.initList() } diff --git a/src/views/jhzxgl/components/YppTq.vue b/src/views/jhzxgl/components/YppTq.vue index 4a86a74..a4a5a9a 100644 --- a/src/views/jhzxgl/components/YppTq.vue +++ b/src/views/jhzxgl/components/YppTq.vue @@ -99,7 +99,7 @@ export default { dcCh:'', dcPl:'', dcFd:'', - zt:'0' + zt:'2' }, projectData:[], monthList:[],