Commit a2de0bd49b976f226331f0d2649e72db5d21c38d
1 parent
14cb8959
修改样式
Showing
2 changed files
with
32 additions
and
6 deletions
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
| @@ -217,13 +217,13 @@ export default { | @@ -217,13 +217,13 @@ export default { | ||
| 217 | supplierList:[], | 217 | supplierList:[], |
| 218 | // 表头 | 218 | // 表头 |
| 219 | columns: [ | 219 | columns: [ |
| 220 | + // { | ||
| 221 | + // title: '单据ID', | ||
| 222 | + // align: 'center', | ||
| 223 | + // dataIndex: 'id' | ||
| 224 | + // }, | ||
| 220 | { | 225 | { |
| 221 | - title: '单据ID', | ||
| 222 | - align: 'center', | ||
| 223 | - dataIndex: 'id' | ||
| 224 | - }, | ||
| 225 | - { | ||
| 226 | - title: '编码', | 226 | + title: '入库单编码', |
| 227 | align: 'center', | 227 | align: 'center', |
| 228 | dataIndex: 'code' | 228 | dataIndex: 'code' |
| 229 | }, | 229 | }, |
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
| @@ -125,6 +125,24 @@ | @@ -125,6 +125,24 @@ | ||
| 125 | :customRow="clickThenSelect" | 125 | :customRow="clickThenSelect" |
| 126 | @change="handleTableChange"> | 126 | @change="handleTableChange"> |
| 127 | 127 | ||
| 128 | + <span slot="companyCode" slot-scope="companyCode"> | ||
| 129 | + <a-tag :key="companyCode" color=blue> | ||
| 130 | + {{ solutionCompany(companyCode) }} | ||
| 131 | + </a-tag> | ||
| 132 | + </span> | ||
| 133 | + | ||
| 134 | + <span slot="type" slot-scope="type"> | ||
| 135 | + <a-tag :key="type" color=pink> | ||
| 136 | + {{ solutionShipmentType(type) }} | ||
| 137 | + </a-tag> | ||
| 138 | + </span> | ||
| 139 | + | ||
| 140 | + <span slot="customerCode" slot-scope="customerCode"> | ||
| 141 | + <a-tag :key="customerCode" color=pink> | ||
| 142 | + {{ solutionCustomer(customerCode) }} | ||
| 143 | + </a-tag> | ||
| 144 | + </span> | ||
| 145 | + | ||
| 128 | <template slot="htmlSlot" slot-scope="text"> | 146 | <template slot="htmlSlot" slot-scope="text"> |
| 129 | <div v-html="text"></div> | 147 | <div v-html="text"></div> |
| 130 | </template> | 148 | </template> |
| @@ -194,8 +212,16 @@ | @@ -194,8 +212,16 @@ | ||
| 194 | data () { | 212 | data () { |
| 195 | return { | 213 | return { |
| 196 | description: '历史出库单管理页面', | 214 | description: '历史出库单管理页面', |
| 215 | + companyList:[], | ||
| 216 | + shipmentTypeList:[], | ||
| 217 | + customerList:[], | ||
| 197 | // 表头 | 218 | // 表头 |
| 198 | columns: [ | 219 | columns: [ |
| 220 | + // { | ||
| 221 | + // title: '单据ID', | ||
| 222 | + // align: 'center', | ||
| 223 | + // dataIndex: 'id' | ||
| 224 | + // }, | ||
| 199 | { | 225 | { |
| 200 | title:'出库单编码', | 226 | title:'出库单编码', |
| 201 | align:"center", | 227 | align:"center", |