Commit 5fc7fb153472f1fa4f5b496b37591d520dbc32fb
1 parent
c848c326
页面操作栏
Signed-off-by: TanYibin <5491541@qq.com>
Showing
6 changed files
with
10 additions
and
26 deletions
ant-design-vue-jeecg/src/views/system/config/ReceiptTypeList.vue
| ... | ... | @@ -40,8 +40,7 @@ |
| 40 | 40 | <a-dropdown v-if="selectedRowKeys.length > 0"> |
| 41 | 41 | <a-menu slot="overlay" v-has="'receiptType:deleteBatch'"> |
| 42 | 42 | <a-menu-item key="1" @click="batchDel"> |
| 43 | - <a-icon type="delete"/> | |
| 44 | - 删除 | |
| 43 | + <a-icon type="delete"/>删除 | |
| 45 | 44 | </a-menu-item> |
| 46 | 45 | </a-menu> |
| 47 | 46 | <a-button style="margin-left: 8px"> 批量操作 |
| ... | ... | @@ -71,7 +70,6 @@ |
| 71 | 70 | :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
| 72 | 71 | class="j-table-force-nowrap" |
| 73 | 72 | @change="handleTableChange"> |
| 74 | - | |
| 75 | 73 | <template slot="htmlSlot" slot-scope="text"> |
| 76 | 74 | <div v-html="text"></div> |
| 77 | 75 | </template> |
| ... | ... | @@ -88,15 +86,11 @@ |
| 88 | 86 | type="primary" |
| 89 | 87 | icon="download" |
| 90 | 88 | size="small" |
| 91 | - @click="downloadFile(text)"> | |
| 92 | - 下载 | |
| 89 | + @click="downloadFile(text)">下载 | |
| 93 | 90 | </a-button> |
| 94 | 91 | </template> |
| 95 | - | |
| 96 | 92 | <span slot="action" slot-scope="text, record"> |
| 97 | - <a v-has="'receiptType:edit'" @click="handleEdit(record)">编辑</a> | |
| 98 | - | |
| 99 | - <a-divider type="vertical"/> | |
| 93 | + <a v-has="'receiptType:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a> | |
| 100 | 94 | <a-dropdown> |
| 101 | 95 | <a class="ant-dropdown-link">更多 <a-icon type="down"/></a> |
| 102 | 96 | <a-menu slot="overlay"> |
| ... | ... |
ant-design-vue-jeecg/src/views/system/config/ShipmentTypeList.vue
| ... | ... | @@ -40,8 +40,7 @@ |
| 40 | 40 | <a-dropdown v-if="selectedRowKeys.length > 0"> |
| 41 | 41 | <a-menu slot="overlay" v-has="'shipmentType:deleteBatch'"> |
| 42 | 42 | <a-menu-item key="1" @click="batchDel"> |
| 43 | - <a-icon type="delete"/> | |
| 44 | - 删除 | |
| 43 | + <a-icon type="delete"/>删除 | |
| 45 | 44 | </a-menu-item> |
| 46 | 45 | </a-menu> |
| 47 | 46 | <a-button style="margin-left: 8px"> 批量操作 |
| ... | ... | @@ -88,15 +87,12 @@ |
| 88 | 87 | type="primary" |
| 89 | 88 | icon="download" |
| 90 | 89 | size="small" |
| 91 | - @click="downloadFile(text)"> | |
| 92 | - 下载 | |
| 90 | + @click="downloadFile(text)">下载 | |
| 93 | 91 | </a-button> |
| 94 | 92 | </template> |
| 95 | 93 | |
| 96 | 94 | <span slot="action" slot-scope="text, record"> |
| 97 | - <a v-has="'shipmentType:edit'" @click="handleEdit(record)">编辑</a> | |
| 98 | - | |
| 99 | - <a-divider type="vertical"/> | |
| 95 | + <a v-has="'shipmentType:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a> | |
| 100 | 96 | <a-dropdown> |
| 101 | 97 | <a class="ant-dropdown-link">更多 <a-icon type="down"/></a> |
| 102 | 98 | <a-menu slot="overlay"> |
| ... | ... |
ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue
| ... | ... | @@ -96,9 +96,7 @@ |
| 96 | 96 | </template> |
| 97 | 97 | |
| 98 | 98 | <span slot="action" slot-scope="text, record"> |
| 99 | - <a v-has="'warehouse:edit'" @click="handleEdit(record)">编辑</a> | |
| 100 | - | |
| 101 | - <a-divider type="vertical"/> | |
| 99 | + <a v-has="'warehouse:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a> | |
| 102 | 100 | <a-dropdown> |
| 103 | 101 | <a class="ant-dropdown-link">更多 <a-icon type="down"/></a> |
| 104 | 102 | <a-menu slot="overlay"> |
| ... | ... |
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
| ... | ... | @@ -106,9 +106,7 @@ |
| 106 | 106 | </template> |
| 107 | 107 | |
| 108 | 108 | <span slot="action" slot-scope="text, record"> |
| 109 | - <a v-has="'inventoryHeader:edit'" @click="handleEdit(record)">编辑</a> | |
| 110 | - | |
| 111 | - <a-divider type="vertical"/> | |
| 109 | + <a v-has="'inventoryHeader:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a> | |
| 112 | 110 | <a-dropdown> |
| 113 | 111 | <a class="ant-dropdown-link">更多 <a-icon type="down"/></a> |
| 114 | 112 | <a-menu slot="overlay" v-has="'inventoryHeader:delete'"> |
| ... | ... |
ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | > |
| 37 | 37 | |
| 38 | 38 | <!-- 显示头像 --> |
| 39 | - <template slot="avatarslot" slot-scope="text, record, index"> | |
| 39 | + <template slot="avatarslot" slot-scope="text, record"> | |
| 40 | 40 | <div class="anty-img-wrap"> |
| 41 | 41 | <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/> |
| 42 | 42 | </div> |
| ... | ... |
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
| ... | ... | @@ -186,9 +186,7 @@ |
| 186 | 186 | @confirm="() => hanleBack(record)"> |
| 187 | 187 | <a>回传</a> |
| 188 | 188 | </a-popconfirm> |
| 189 | - <a v-if="record.lastStatus < 800" @click="autoShipmentCombine(record)">自动配盘</a> | |
| 190 | - | |
| 191 | - <a-divider type="vertical"/> | |
| 189 | + <a v-if="record.lastStatus < 800" @click="autoShipmentCombine(record)">自动配盘<a-divider type="vertical"/></a> | |
| 192 | 190 | <a-dropdown> |
| 193 | 191 | <a class="ant-dropdown-link">更多 <a-icon type="down"/></a> |
| 194 | 192 | <a-menu slot="overlay"> |
| ... | ... |