bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单管理优化

This commit is contained in:
songyang 2023-12-08 17:38:59 +08:00
parent 3ee01f9594
commit 852539478b
9 changed files with 188 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components.d.ts vendored
View File

@ -10,13 +10,13 @@ declare module 'vue' {
ElButton: typeof import('element-plus/es')['ElButton']
ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
ElCascader: typeof import('element-plus/es')['ElCascader']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElDivider: typeof import('element-plus/es')['ElDivider']
ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']

1
env.d.ts vendored
View File

@ -1,2 +1,3 @@
/// <reference types="vite/client" />
declare module "nprogress"

2
src/components/Navmenu/index.vue
View File

@ -11,7 +11,7 @@
{ name: '企业专区', routerName: '/home' }
]
const navMenuClick = (name) => {
const navMenuClick = (name: any) => {
router.push({ name })
}
</script>

3
src/router/index.ts
View File

@ -1,5 +1,4 @@
import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
import test from './module/test'
import myInfo from './module/myInfo'
@ -81,7 +80,7 @@ const routes: Array<RouteRecordRaw> = [
{
path: '/equipList',
name: 'equipList',
component: () => import('@/views/equip/list.vue'),
component: () => import('views/equip/list.vue'),
meta: {
title: ''
}

10
src/views/EnterpriseCertification.vue
View File

@ -327,7 +327,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="被授权人邮箱">
<el-input></el-input>
<el-input placeholder="请输入被授权人邮箱" clearable>></el-input>
</el-form-item>
</el-col>
</el-row>
@ -405,14 +405,14 @@
</div>
<div class="bankInfo card">
<div class="top">
<!-- <div class="top">
<div class="title">
银行账号信息
<span class="tip">开户行许可示例</span>
</div>
</div>
<!-- <el-table border :data="bankTableList">
<el-table border :data="bankTableList">
<el-table-column align="center" label="开户行">
<template #default="{ row }">
<el-input v-model="row.v_kaihu"></el-input>
@ -451,8 +451,8 @@
</a>
</template>
</el-table-column>
</el-table>
</div> -->
</el-table> -->
</div>
<el-row style="padding-top: 15px">
<el-form-item>
<el-button type="success" @click="handlerSubmitBtn">提 交</el-button>

27
src/views/user/orderManagement/index.vue
View File

@ -44,9 +44,14 @@
}
/* 续租按钮 */
const clickRenewalOfLease = () => {
console.log('续租')
router.push({ name: 'renewalOfLease' })
const clickRenewalOfLease = ({ row }: any) => {
console.log('续租', row)
router.push({
name: 'renewalOfLease',
query: {
orderId: row.orderId
}
})
}
/* 确认收货 */
@ -108,12 +113,14 @@
<el-table-column align="center" prop="time" label="订单创建日期" />
<el-table-column align="center" prop="payType" label="装备类型" />
<el-table-column align="center" prop="deviceName" label="装备名称" />
<el-table-column align="center" prop="orderStatus" label="订单状态">
<el-table-column align="center" label="订单状态">
<template #default="{ row }">
<el-tag v-if="row.orderStatus === 31">待确认</el-tag>
<el-tag v-if="row.orderStatus === 32">待合同上传</el-tag>
<el-tag v-if="row.orderStatus === 35">待收货</el-tag>
<el-tag v-if="row.orderStatus === 36">进行中</el-tag>
<el-tag effect="dark" type="info" v-if="row.orderStatus == 31">待确认</el-tag>
<el-tag effect="dark" type="warning" v-if="row.orderStatus == 32">
待合同上传
</el-tag>
<el-tag effect="dark" type="success" v-if="row.orderStatus == 35">待收货</el-tag>
<el-tag effect="dark" v-if="row.orderStatus == 36">进行中</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="name" label="操作" width="320px">
@ -122,7 +129,9 @@
<el-button size="small" type="danger" @click="clickRentingTermination">
退租
</el-button>
<el-button size="small" type="warning" @click="clickRenewalOfLease">续租</el-button>
<el-button size="small" type="warning" @click="clickRenewalOfLease(scope)">
续租
</el-button>
<el-button size="small" type="success" @click="clickConfirmReceipt">
确认收货
</el-button>

2
src/views/user/orderManagement/orderCom/renewalOfLease.vue
View File

@ -19,7 +19,7 @@
<!-- 退租页面 -->
<el-page-header @back="goBack" @click="$router.go(-1)">
<template #content>
<span>退租</span>
<span>续租</span>
</template>
</el-page-header>

12
src/views/user/orderManagement/orderCom/timeLineHorizontal.vue
View File

@ -4,8 +4,12 @@
<el-divider />
<div class="timelineProcessBox">
<el-timeline class="timeline" :color="props.themeColor">
<el-timeline-item class="lineitem" :class="item.done ? 'active' : 'inactive'"
v-for="(item, index) in props.timeLineList" :key="index" :timestamp="item.content">
<el-timeline-item
class="lineitem"
:class="item.done ? 'active' : 'inactive'"
v-for="(item, index) in props.timeLineList"
:key="index"
:timestamp="item.content">
<div>
{{ item.title }}
</div>
@ -15,8 +19,7 @@
</div>
</template>
<script lang="ts" setup>
const props = defineProps({
const props: any = defineProps({
themeColor: {
type: String,
default: '#2282fe'
@ -28,7 +31,6 @@ const props = defineProps({
}
}
})
</script>
<style lang="scss" scoped>
.processBox {

34
src/views/user/orderManagementCz/index.vue
View File

@ -3,12 +3,12 @@
const queryParams = ref({})
import PagingComponent from 'components/PagingComponent/index.vue'
import { getOrderListApi } from 'http/api/usercenter/seekorder'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
// import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
const router = useRouter()
const pageSize = ref(20)
const pageNumber = ref(1)
const pageSize: any = ref(20)
const pageNumber: any = ref(1)
const total: any = ref(0)
// 获取数据列表
@ -28,18 +28,23 @@
/* 确认按钮 */
const confirmBtn = (row: any) => {
router.push({ name: 'orderConfirm',query:{
router.push({
name: 'orderConfirm',
query: {
orderId: row.orderId
} })
}
})
}
/* 查看按钮 */
const clickPreviewDetails = (row: any) => {
console.log('查看')
router.push({ name: 'orderDetails',query:{
router.push({
name: 'orderDetails',
query: {
orderId: row.orderId
} })
}
})
}
const tableData: any = ref([{ address: '客户单位' }])
@ -50,7 +55,6 @@
<template>
<!-- 订单管理(承租方) -->
<el-config-provider :locale="zhCn">
<el-form :model="queryParams" :inline="true" size="small">
<el-form-item label="订单编号：" prop="menuName">
<el-input />
@ -94,7 +98,16 @@
<el-table-column align="center" prop="orderPhone" label="联系方式" />
<el-table-column align="center" prop="typeName" label="装备类型" />
<el-table-column align="center" prop="deviceName" label="装备名称" />
<el-table-column align="center" prop="orderStatus" label="订单状态" />
<el-table-column align="center" label="订单状态">
<template #default="{ row }">
<el-tag effect="dark" type="info" v-if="row.orderStatus == 31">待确认</el-tag>
<el-tag effect="dark" type="warning" v-if="row.orderStatus == 32">
待合同上传
</el-tag>
<el-tag effect="dark" type="success" v-if="row.orderStatus == 35">待收货</el-tag>
<el-tag effect="dark" v-if="row.orderStatus == 36">进行中</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="name" label="操作" width="260px">
<template #default="{ row }">
<el-button size="small" type="primary" @click="confirmBtn(row)">确认</el-button>
@ -112,7 +125,6 @@
:pageSize="pageSize"
:pageNumber="pageNumber"
:total="total" />
</el-config-provider>
</template>
<style>