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:41:16 +08:00
parent 61a041c474 852539478b
commit 9b644b01e9
9 changed files with 213 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components.d.ts vendored
View File

@ -8,11 +8,21 @@ export {}
declare module 'vue' {
export interface GlobalComponents {
ElButton: typeof import('element-plus/es')['ElButton']
<<<<<<< HEAD
=======
ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
>>>>>>> dev-songyang
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']
<<<<<<< HEAD
=======
ElDivider: typeof import('element-plus/es')['ElDivider']
ElEmpty: typeof import('element-plus/es')['ElEmpty']
>>>>>>> dev-songyang
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']

3
env.d.ts vendored
View File

@ -1,2 +1,3 @@
/// <reference types="vite/client" />
declare module "nprogress"
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>

2
src/router/index.ts
View File

@ -80,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: ''
}

6
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>

37
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,7 +113,7 @@
<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>
@ -118,12 +123,28 @@
</el-table-column>
<el-table-column align="center" prop="name" label="操作" width="320px">
<template #default="scope">
<el-button size="small" type="primary" @click="clickPreviewDetails(scope.row)">查看</el-button>
<el-button size="small" type="danger" @click="clickRentingTermination" v-if="scope.row.orderStatus == 36">
<el-button size="small" type="primary" @click="clickPreviewDetails(scope.row)">
查看
</el-button>
<el-button
size="small"
type="danger"
@click="clickRentingTermination"
v-if="scope.row.orderStatus == 36">
退租
</el-button>
<el-button size="small" type="warning" @click="clickRenewalOfLease" v-if="scope.row.orderStatus == 36">续租</el-button>
<el-button size="small" type="success" @click="clickConfirmReceipt(scope.row)" v-if="scope.row.orderStatus == 35">
<el-button
size="small"
type="warning"
@click="clickRenewalOfLease"
v-if="scope.row.orderStatus == 36">
续租
</el-button>
<el-button
size="small"
type="success"
@click="clickConfirmReceipt(scope.row)"
v-if="scope.row.orderStatus == 35">
确认收货
</el-button>
</template>

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>

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

@ -3,9 +3,13 @@
<div class="title">工程进度</div>
<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 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">
<div>
{{ item.title }}
</div>
@ -15,86 +19,84 @@
</div>
</template>
<script lang="ts" setup>
const props = defineProps({
themeColor:{
type:String,
default:'#2282fe'
},
timeLineList: {
type: Array,
default: () => {
return []
const props: any = defineProps({
themeColor: {
type: String,
default: '#2282fe'
},
timeLineList: {
type: Array,
default: () => {
return []
}
}
}
})
})
</script>
<style lang="scss" scoped>
.processBox {
background-color: #fff;
height: 210px;
.processBox {
background-color: #fff;
height: 210px;
.title {
font-size: 16px;
font-weight: 600;
padding-left: 32px;
padding-top: 16px;
}
.title {
font-size: 16px;
font-weight: 600;
padding-left: 32px;
padding-top: 16px;
}
.timelineProcessBox {
.timeline {
display: flex;
width: 95%;
margin: 40px auto;
.timelineProcessBox {
.timeline {
display: flex;
width: 95%;
margin: 40px auto;
.lineitem {
transform: translateX(50%);
width: 25%;
.lineitem {
transform: translateX(50%);
width: 25%;
}
}
}
}
}
:deep(.el-timeline-item__tail) {
border-left: none;
border-top: 2px solid #e4e7ed;
width: 100%;
position: absolute;
top: 6px;
}
:deep(.el-timeline-item__wrapper) {
padding-left: 0;
position: absolute;
top: 20px;
transform: translateX(-50%);
text-align: center;
}
:deep(.el-timeline-item__timestamp) {
font-size: 14px;
font-weight: normal;
}
.active {
border: none !important;
:deep(.el-timeline-item__node) {
// background-color: $main-color;
background-color: v-bind('props.themeColor');
}
:deep(.el-timeline-item__tail) {
// border-color: $main-color;
// background-color: v-bind('props.themeColor');
border-left: none;
border-top: 2px solid #e4e7ed;
width: 100%;
position: absolute;
top: 6px;
}
}
// 有active样式的下一个li
.active+li {
:deep(.el-timeline-item__node) {
background-color: v-bind('props.themeColor');
:deep(.el-timeline-item__wrapper) {
padding-left: 0;
position: absolute;
top: 20px;
transform: translateX(-50%);
text-align: center;
}
}
</style>
:deep(.el-timeline-item__timestamp) {
font-size: 14px;
font-weight: normal;
}
.active {
border: none !important;
:deep(.el-timeline-item__node) {
// background-color: $main-color;
background-color: v-bind('props.themeColor');
}
:deep(.el-timeline-item__tail) {
// border-color: $main-color;
// background-color: v-bind('props.themeColor');
}
}
// 有active样式的下一个li
.active + li {
:deep(.el-timeline-item__node) {
background-color: v-bind('props.themeColor');
}
}
</style>

165
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)
// 获取数据列表
@ -27,19 +27,24 @@
}
/* 确认按钮 */
const confirmBtn = (row:any) => {
router.push({ name: 'orderConfirm',query:{
orderId:row.orderId
} })
const confirmBtn = (row: any) => {
router.push({
name: 'orderConfirm',
query: {
orderId: row.orderId
}
})
}
/* 查看按钮 */
const clickPreviewDetails = (row:any) => {
const clickPreviewDetails = (row: any) => {
console.log('查看')
router.push({ name: 'orderDetails',query:{
orderId:row.orderId
} })
router.push({
name: 'orderDetails',
query: {
orderId: row.orderId
}
})
}
const tableData: any = ref([{ address: '客户单位' }])
@ -50,69 +55,83 @@
<template>
<!-- 订单管理(承租方) -->
<el-config-provider :locale="zhCn">
<el-form :model="queryParams" :inline="true" size="small">
<el-form-item label="订单编号：" prop="menuName">
<el-input />
</el-form-item>
<el-form-item label="创建时间：" prop="menuName">
<el-date-picker
v-model="time"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
style="width: 180px" />
</el-form-item>
<el-form-item label="状态：" prop="menuName">
<el-input />
</el-form-item>
<el-form-item label="装备类型：" prop="menuName">
<el-input />
</el-form-item>
<el-form-item label="装备名称：" prop="menuName">
<el-input />
</el-form-item>
<el-form-item>
<el-button type="primary">查询</el-button>
<el-button type="success">重置</el-button>
</el-form-item>
</el-form>
<el-form :model="queryParams" :inline="true" size="small">
<el-form-item label="订单编号：" prop="menuName">
<el-input />
</el-form-item>
<el-form-item label="创建时间：" prop="menuName">
<el-date-picker
v-model="time"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
style="width: 180px" />
</el-form-item>
<el-form-item label="状态：" prop="menuName">
<el-input />
</el-form-item>
<el-form-item label="装备类型：" prop="menuName">
<el-input />
</el-form-item>
<el-form-item label="装备名称：" prop="menuName">
<el-input />
</el-form-item>
<el-form-item>
<el-button type="primary">查询</el-button>
<el-button type="success">重置</el-button>
</el-form-item>
</el-form>
<!-- 表格 -->
<el-table
:data="tableData"
:header-cell-style="{
background: '#3E98FF',
color: '#fff'
}"
fit>
<el-table-column align="center" prop="code" label="订单编号" />
<el-table-column align="center" prop="supplierCompany" label="客户单位" />
<el-table-column align="center" prop="time" label="订单创建日期" />
<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" prop="name" label="操作" width="260px">
<template #default="{ row }">
<el-button size="small" type="primary" @click="confirmBtn(row)" v-if="row.orderStatus==31">确认</el-button>
<el-button size="small" type="warning" @click="clickPreviewDetails(row)" v-if="row.orderStatus!=31">
查看
</el-button>
<el-button size="small" type="danger" v-if="row.orderStatus=39">删除</el-button>
<el-button size="small" type="success" @click="settlementBtn" v-if="row.orderStatus=34">结算</el-button>
</template>
</el-table-column>
</el-table>
<!-- 表格 -->
<el-table
:data="tableData"
:header-cell-style="{
background: '#3E98FF',
color: '#fff'
}"
fit>
<el-table-column align="center" prop="code" label="订单编号" />
<el-table-column align="center" prop="supplierCompany" label="客户单位" />
<el-table-column align="center" prop="time" label="订单创建日期" />
<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" prop="name" label="操作" width="260px">
<template #default="{ row }">
<el-button
size="small"
type="primary"
@click="confirmBtn(row)"
v-if="row.orderStatus == 31">
确认
</el-button>
<el-button
size="small"
type="warning"
@click="clickPreviewDetails(row)"
v-if="row.orderStatus != 31">
查看
</el-button>
<el-button size="small" type="danger" v-if="(row.orderStatus = 39)">删除</el-button>
<el-button
size="small"
type="success"
@click="settlementBtn"
v-if="(row.orderStatus = 34)">
结算
</el-button>
</template>
</el-table-column>
</el-table>
<PagingComponent
@getList="getList"
:pageSize="pageSize"
:pageNumber="pageNumber"
:total="total" />
</el-config-provider>
<PagingComponent
@getList="getList"
:pageSize="pageSize"
:pageNumber="pageNumber"
:total="total" />
</template>
<style>