Commit dc3bde7c2f6c2bc877c92d3092a5184e0a88fb71

Authored by 谭毅彬
1 parent 10cf3ed2

样式修正

Signed-off-by: TanYibin <5491541@qq.com>
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/JSelectBizComponentModal.vue
... ... @@ -27,37 +27,38 @@
27 27 <a-icon :type="showMoreQueryItems ? 'up' : 'down'"/>
28 28 </a>
29 29 </a-form>
30   - <a-table
31   - size="middle"
32   - bordered
33   - :rowKey="rowKey"
34   - :columns="columns"
35   - :dataSource="dataSource"
36   - :pagination="ipagination"
37   - :loading="loading"
38   - :scroll="{ y: 240 }"
39   - :customRow="customRowFn"
40   - :rowSelection="{selectedRowKeys, onChange: onSelectChange, type: multiple ? 'checkbox':'radio'}"
41   - class="j-table-force-nowrap"
42   - @change="handleTableChange">
43   - <span slot="zoneCode" slot-scope="zoneCode">
44   - <a-tag :key="zoneCode" color=blue>
45   - {{ solutionZoneCode(zoneCode) }}
46   - </a-tag>
47   - </span>
  30 + <div style="height: 340px">
  31 + <a-table
  32 + size="middle"
  33 + bordered
  34 + :rowKey="rowKey"
  35 + :columns="columns"
  36 + :dataSource="dataSource"
  37 + :pagination="ipagination"
  38 + :loading="loading"
  39 + :scroll="{ x:true }"
  40 + :customRow="customRowFn"
  41 + :rowSelection="{selectedRowKeys, onChange: onSelectChange, type: multiple ? 'checkbox':'radio'}"
  42 + class="j-table-force-nowrap"
  43 + @change="handleTableChange">
  44 + <span slot="zoneCode" slot-scope="zoneCode">
  45 + <a-tag :key="zoneCode" color=blue>
  46 + {{ solutionZoneCode(zoneCode) }}
  47 + </a-tag>
  48 + </span>
48 49  
49   - <span slot="fillStatus" slot-scope="fillStatus">
50   - <a-tag :key="fillStatus" :color="getStatusColor(fillStatus)">
51   - {{ fillStatus_dictText(fillStatus) }}
52   - </a-tag>
53   - </span>
54   -
55   - </a-table>
  50 + <span slot="fillStatus" slot-scope="fillStatus">
  51 + <a-tag :key="fillStatus" :color="getStatusColor(fillStatus)">
  52 + {{ fillStatus_dictText(fillStatus) }}
  53 + </a-tag>
  54 + </span>
56 55  
  56 + </a-table>
  57 + </div>
57 58 </a-col>
58 59 <a-col :span="8">
59 60 <a-card :title="'已选' + name" :bordered="false" :head-style="{padding:0}" :body-style="{padding:0}">
60   - <a-table size="middle" :rowKey="rowKey" bordered v-bind="selectedTable">
  61 + <a-table size="middle" :rowKey="rowKey" bordered :scroll="{ x:true }" v-bind="selectedTable">
61 62 <span slot="action" slot-scope="text, record, index">
62 63 <a @click="handleDeleteSelected(record, index)">删除</a>
63 64 </span>
... ...
ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountDetailModal.vue
... ... @@ -50,7 +50,7 @@
50 50 :dataSource="dataSource"
51 51 :pagination="ipagination"
52 52 :loading="loading"
53   - :scroll="{ y: 235 }"
  53 + :scroll="{ x: true }"
54 54 :customRow="customRowFn"
55 55 :rowSelection="{selectedRowKeys, onChange: onSelectChange, type: 'checkbox'}"
56 56 class="j-table-force-nowrap"
... ... @@ -67,7 +67,7 @@
67 67 </a-col>
68 68 <a-col :span="8">
69 69 <a-card :title="'已选' + title" :bordered="false" :body-style="{padding:0}">
70   - <a-table size="middle" bordered :rowKey="rowKey" v-bind="selectedTable" class="j-table-force-nowrap">
  70 + <a-table size="middle" bordered :rowKey="rowKey" v-bind="selectedTable" :scroll="{ x: true }" class="j-table-force-nowrap">
71 71 <span slot="action" slot-scope="text, record, index">
72 72 <a @click="handleDeleteSelected(record, index)">删除</a>
73 73 </span>
... ...