zhouhui.jiang / test_cursor

Go to a project
Toggle navigation Toggle navigation pinning
zhouhui.jiang
81c6bb8a 1 parent fae0b688

update

Expand all
Inline Side-by-side
Showing 4 changed files with 1 additions and 20 deletions
...@@ -9,32 +9,18 @@ declare module 'vue' { ...@@ -9,32 +9,18 @@ declare module 'vue' {
9 export interface GlobalComponents { 9 export interface GlobalComponents {
10 ElButton: typeof import('element-plus/es')['ElButton'] 10 ElButton: typeof import('element-plus/es')['ElButton']
11 ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] 11 ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
12 - ElCard: typeof import('element-plus/es')['ElCard']
13 - ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
14 - ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
15 - ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
16 ElDialog: typeof import('element-plus/es')['ElDialog'] 12 ElDialog: typeof import('element-plus/es')['ElDialog']
17 ElForm: typeof import('element-plus/es')['ElForm'] 13 ElForm: typeof import('element-plus/es')['ElForm']
18 ElFormItem: typeof import('element-plus/es')['ElFormItem'] 14 ElFormItem: typeof import('element-plus/es')['ElFormItem']
19 ElInput: typeof import('element-plus/es')['ElInput'] 15 ElInput: typeof import('element-plus/es')['ElInput']
20 - ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
21 ElOption: typeof import('element-plus/es')['ElOption'] 16 ElOption: typeof import('element-plus/es')['ElOption']
22 - ElPagination: typeof import('element-plus/es')['ElPagination']
23 - ElRadio: typeof import('element-plus/es')['ElRadio']
24 - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
25 ElSelect: typeof import('element-plus/es')['ElSelect'] 17 ElSelect: typeof import('element-plus/es')['ElSelect']
26 ElTable: typeof import('element-plus/es')['ElTable'] 18 ElTable: typeof import('element-plus/es')['ElTable']
27 ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] 19 ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
28 - ElSelect: typeof import('element-plus/es')['ElSelect']
29 - ElTag: typeof import('element-plus/es')['ElTag']
30 - ElText: typeof import('element-plus/es')['ElText']
31 Header: typeof import('./src/components/layout/Header.vue')['default'] 20 Header: typeof import('./src/components/layout/Header.vue')['default']
32 RouterLink: typeof import('vue-router')['RouterLink'] 21 RouterLink: typeof import('vue-router')['RouterLink']
33 RouterView: typeof import('vue-router')['RouterView'] 22 RouterView: typeof import('vue-router')['RouterView']
34 Sidebar: typeof import('./src/components/layout/Sidebar.vue')['default'] 23 Sidebar: typeof import('./src/components/layout/Sidebar.vue')['default']
35 SidebarItem: typeof import('./src/components/layout/SidebarItem.vue')['default'] 24 SidebarItem: typeof import('./src/components/layout/SidebarItem.vue')['default']
36 } 25 }
37 - export interface ComponentCustomProperties {
38 - vLoading: typeof import('element-plus/es')['ElLoadingDirective']
39 - }
40 } 26 }
......
...@@ -244,13 +244,8 @@ ...@@ -244,13 +244,8 @@
244 </tr> 244 </tr>
245 </thead> 245 </thead>
246 <tbody> 246 <tbody>
247 -<<<<<<< .mine
248 - <tr v-for="item in deliveryDetail.deliveryItems" :key="item.deliveryItemId">
249 - <td>{{ item.productName }}</td>
250 -=======
251 <tr v-for="item in deliveryDetail.deliveryItems" :key="item.itemId || item.deliveryId"> 247 <tr v-for="item in deliveryDetail.deliveryItems" :key="item.itemId || item.deliveryId">
252 - 248 + <td>{{ item.productName }}</td>
253 ->>>>>>> .theirs
254 <td>{{ item.productCode }}</td> 249 <td>{{ item.productCode }}</td>
255 <td>{{ item.deliveryQty }}</td> 250 <td>{{ item.deliveryQty }}</td>
256 <td>{{ formatCurrency(item.deliveryPrice) }}</td> 251 <td>{{ formatCurrency(item.deliveryPrice) }}</td>
......
This diff is collapsed. Click to expand it.