diff --git a/components.d.ts b/components.d.ts index 587d2ec..f818db3 100644 --- a/components.d.ts +++ b/components.d.ts @@ -24,6 +24,7 @@ declare module 'vue' { ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] + ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] @@ -31,6 +32,7 @@ declare module 'vue' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] @@ -38,6 +40,8 @@ declare module 'vue' { ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElSelect: typeof import('element-plus/es')['ElSelect'] + ElStep: typeof import('element-plus/es')['ElStep'] + ElSteps: typeof import('element-plus/es')['ElSteps'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] diff --git a/src/components/PagingComponent/index.vue b/src/components/PagingComponent/index.vue index c6c3026..a008d9c 100644 --- a/src/components/PagingComponent/index.vue +++ b/src/components/PagingComponent/index.vue @@ -63,7 +63,7 @@ const pageSize = computed({ { + return get(`/material-mall/lease-repair/list`, data) +} \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index d92eb0f..def5f75 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -235,6 +235,28 @@ const routes: Array = [ isLogin: true }, }, + { + path: '/rent-termination', + name: 'rent-termination', + component: () => import('views/user/lessor/rent-termination/index.vue'), + meta: { + title: '退租管理', + keepAlive: true, + AuthFlag: false, + isLogin: true + }, + }, + { + path: '/settlement-manage', + name: 'settlement-manage', + component: () => import('views/user/lessor/settlement/index.vue'), + meta: { + title: '结算管理', + keepAlive: true, + AuthFlag: false, + isLogin: true + }, + }, { path: '/sourcingNeed', name: 'sourcingNeed', diff --git a/src/views/user/accept-orders/index.vue b/src/views/user/accept-orders/index.vue index 31826ee..83f1f02 100644 --- a/src/views/user/accept-orders/index.vue +++ b/src/views/user/accept-orders/index.vue @@ -95,8 +95,8 @@ :data="leaseList" show-overflow-tooltip :header-cell-style="{ - background: '#fafafa', - color: '#333', + background: '#00a288', + color: '#fff', }" > @@ -159,17 +159,11 @@ v-if="total > 0" /> --> - @@ -382,6 +376,7 @@ + + diff --git a/src/views/user/lessor/settlement/index.vue b/src/views/user/lessor/settlement/index.vue new file mode 100644 index 0000000..83f1f02 --- /dev/null +++ b/src/views/user/lessor/settlement/index.vue @@ -0,0 +1,689 @@ + + + + + diff --git a/src/views/user/sourcingNeed/index.vue b/src/views/user/sourcingNeed/index.vue index 7a21d65..35afa66 100644 --- a/src/views/user/sourcingNeed/index.vue +++ b/src/views/user/sourcingNeed/index.vue @@ -171,10 +171,10 @@ v-if="total > 0" /> --> - --> + + @@ -401,6 +408,7 @@