diff --git a/vol.uniapp/components/view-grid/view-grid.vue b/vol.uniapp/components/view-grid/view-grid.vue index 47f1bbf7a..9c2ec9d50 100644 --- a/vol.uniapp/components/view-grid/view-grid.vue +++ b/vol.uniapp/components/view-grid/view-grid.vue @@ -649,6 +649,7 @@ } }) }) + this.dicInited && this.dicInited(result); }) }, initSearchFormDateRange() { @@ -966,4 +967,4 @@ border-radius: 50%; } } - --> \ No newline at end of file + --> diff --git a/vol.uniapp/components/vol-table/vol-table.vue b/vol.uniapp/components/vol-table/vol-table.vue index 97a79776f..a84a97b78 100644 --- a/vol.uniapp/components/vol-table/vol-table.vue +++ b/vol.uniapp/components/vol-table/vol-table.vue @@ -111,40 +111,54 @@ - - {{column.title}} - - - - - - {{row[column.field]}} - - - - - - - - - {{rowFormatterValue(row,column)}} - - - - - - + + + + + {{column.title}} + + + + + + + + + {{row[column.field]}} + + + + + + + + + {{rowFormatterValue(row,column)}} + + + + + + + + + + + {{(row[column.field]||'').substr(0,10)}} + + {{row[column.field]==null?'':row[column.field]}} - - {{(row[column.field]||'').substr(0,10)}} - - {{row[column.field]==null?'':row[column.field]}} + + + + + @@ -363,7 +377,7 @@ } let _val = row[column.field] + ''; - if (!column.bind.data.length) { + if (!column.bind.data || !column.bind.data.length) { return _val; } //if (column.type == "selectList" || column.type == 'checkbox') { @@ -467,7 +481,6 @@ this.$emit('rowButtons', index, row, (buttons) => { _buttons = buttons; }) - console.log(_buttons) return (_buttons || []) //.reverse(); }, rowBtnClick(btn, rowindex, row) { @@ -729,10 +742,24 @@ .vol-table-list-item { margin: 8rpx 16rpx; background: #FFFFFF; - box-shadow: 1px 1px 14px rgb(246 246 246); + box-shadow: 1px 1px 14px rgb(246 246 246); border: 1px solid #f3f3f3; border-radius: 10rpx; - + .vol-table-list-item-content { + display: flex; + .vol-table-list-item-content-left { + flex: 1; + } + .vol-table-list-item-content-ck { + width: 52rpx; + flex: none; + padding: 0 8rpx; + min-height: 55rpx; + display: flex; + justify-content: center; + align-items: center; + } + } .vol-table-list-item-cell { display: flex; padding: 20rpx 28rpx;