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

bug修复

This commit is contained in:
hongchao 2024-12-20 08:47:20 +08:00
parent d614f87355
commit 460bc81aaf
12 changed files with 150 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/equipCardNew/index.vue
View File

@ -2,7 +2,7 @@
<div class="equipCard" @click="cardClick">
<img :src="url" alt="" />
<div class="title">{{ name }}</div>
<div class="title">{{ name+"("+ typeName +")" }}</div>
<ul class="item-details">
<li class="address">
@ -50,6 +50,10 @@ const props: any = defineProps({
type: String,
default: '测试装备',
},
typeName: {
type: String,
default: '装备型号',
},
publishUser: {
type: String,
default: '',
@ -102,7 +106,7 @@ const onHandelLessee = () => {
// path: `/orderConfirm/${props.id}`,
// })
// console.log('立即租赁')
ElMessageBox.confirm('是否确定立即承租该装备?', '温馨提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

12
src/http/api/personalCenter/index.ts Normal file
View File

@ -0,0 +1,12 @@
import { get, post } from '../../index'
// 获取用户消息
export const getUserInfo = (data: any = {}) => {
return get('/material-mall/userManage/userInfo', data)
}
// 快捷消息编辑
export const editMessageApi = (data: any = {}) => {
return post('/material-mall/reply/edit', data)
}

11
src/router/index.ts
View File

@ -270,6 +270,17 @@ const routes: Array<RouteRecordRaw> = [
isLogin: true
},
},
{
path: '/personalCenter',
name: 'personalCenter',
component: () => import('views/user/personalCenter/index.vue'),
meta: {
title: '个人中心',
keepAlive: true,
AuthFlag: false,
isLogin: true
},
},
{
path: '/rent-termination',
name: 'rent-termination',

2
src/views/cart/index.vue
View File

@ -543,7 +543,7 @@ const onCartSubmit = async () => {
maId: e.maId,
id: e.id,
rentBeginTime: e.rentBeginTime + ' ' + '00:00:00',
rentEndTime: e.rentEndTime + ' ' + '00:00:00',
rentEndTime: e.rentEndTime + ' ' + '23:59:59',
manageType: e.manageType,
days: e.days,
num: e.num,

10
src/views/equip/detail.vue
View File

@ -252,7 +252,7 @@
<el-table-column align="center" prop="leaseName" label="租赁方" />
<el-table-column align="center" prop="leaseStartTime" label="租赁开始时间" />
<el-table-column align="center" prop="leaseEndTime" label="租赁结束时间" />
<el-table-column align="center" prop="leasePrice" label="租赁费用" />
<!-- <el-table-column align="center" prop="leasePrice" label="租赁费用" /> -->
</el-table>
</div>
</div>
@ -581,10 +581,10 @@ const equipBaseInfoList = reactive([
label: '所属公司',
key: 'companyName',
},
{
label: '发布时间',
key: 'createTime',
},
// {
// label: '发布时间',
// key: 'createTime',
// },
{
label: '更新时间',
key: 'updateTime',

1
src/views/home/index.vue
View File

@ -312,6 +312,7 @@ const onSelectItem = (type: number) => {
:company="g.companyName"
:operateAddress="g.operateAddress"
:name="g.deviceName"
:typeName="g.typeName"
:price="g.dayLeasePrice"
:url="g.picUrl"
/>

2
src/views/order/index.vue
View File

@ -418,7 +418,7 @@ const onCartSubmit = async () => {
maId: orderInfo.maId,
id: orderInfo.id,
rentBeginTime: orderInfo.rentBeginTime + ' ' + '00:00:00',
rentEndTime: orderInfo.rentEndTime + ' ' + '00:00:00',
rentEndTime: orderInfo.rentEndTime + ' ' + '23:59:59',
manageType: orderInfo.manageType,
days: orderInfo.days,
num: orderInfo.num,

6
src/views/user/goodsManagement/index.vue
View File

@ -1505,11 +1505,12 @@ const chunkedItems = computed(() => {
>
<img :src="j.fileUrl" alt="" />
<div class="mask-img" v-if="!isViewForm">
<div class="mask-img" >
<div>
<el-icon
class="delete-icon"
@click="onDeleteImgInMain(i)"
v-if="!isViewForm"
>
<DeleteFilled />
</el-icon>
@ -1570,11 +1571,12 @@ const chunkedItems = computed(() => {
>
<img :src="j.fileUrl" alt="" />
<div class="mask-img" v-if="!isViewForm">
<div class="mask-img" >
<div>
<el-icon
class="delete-icon"
@click="onDeleteImgInMain(i)"
v-if="!isViewForm"
>
<DeleteFilled />
</el-icon>

2
src/views/user/index.vue
View File

@ -36,6 +36,8 @@ const allList = [
{ title: '收货地址管理', name: 'address-manage', permission: ['2'] },
{ title: '合同管理', name: 'contract-manage', permission: ['1'] },
{ title: '快捷消息设置', name: 'quickMessage', permission: ['1'] },
{ title: '个人中心', name: 'personalCenter', permission: ['1'] },
{ title: '个人中心', name: 'personalCenter', permission: ['2'] },
]
const menuList: any = computed(() => {
return allList.filter((e) => e.permission.includes(isType.value))

8
src/views/user/orderManagement/components/order-details.vue
View File

@ -251,8 +251,8 @@ const isOrderComplete = computed(() => {
</span>
</el-col>
<el-col :span="8">
<span> 租赁协议： </span>
<span> ** </span>
<span> 收货地址 </span>
<span> {{orderDetails.address}} </span>
</el-col>
</el-row>
@ -299,7 +299,7 @@ const isOrderComplete = computed(() => {
</el-row>
<el-row>
<el-col :span="3"> 租期 :</el-col>
<el-col :span="18">
<el-col :span="8">
<span style="margin-right: 10px" :style="isOrderComplete">
{{ goods.days }}{{ ' ' + '天' }}
</span>
@ -317,6 +317,8 @@ const isOrderComplete = computed(() => {
}}{{ ' ' + '天' }}
</span>
</el-col>
<el-col :span="3"> 编号 </el-col>
<el-col :span="8"> {{ goods.code }} </el-col>
</el-row>
<el-row>
<el-col :span="3"> 租金 ：</el-col>

8
src/views/user/orderManagementCz/components/order-details.vue
View File

@ -251,8 +251,8 @@ const isOrderComplete = computed(() => {
</span>
</el-col>
<el-col :span="8">
<span> 租赁协议： </span>
<span> ** </span>
<span> 收货地址 </span>
<span> {{orderDetails.address}} </span>
</el-col>
</el-row>
@ -299,7 +299,7 @@ const isOrderComplete = computed(() => {
</el-row>
<el-row>
<el-col :span="3"> 租期 :</el-col>
<el-col :span="18">
<el-col :span="8">
<span style="margin-right: 10px" :style="isOrderComplete">
{{ goods.days }}{{ ' ' + '天' }}
</span>
@ -317,6 +317,8 @@ const isOrderComplete = computed(() => {
}}{{ ' ' + '天' }}
</span>
</el-col>
<el-col :span="3"> 编号 </el-col>
<el-col :span="8"> {{ goods.code }} </el-col>
</el-row>
<el-row>
<el-col :span="3"> 租金 ：</el-col>

97
src/views/user/personalCenter/index.vue Normal file
View File

@ -0,0 +1,97 @@
<template>
<el-card class="box-card">
<div slot="header" class="clearfix" style="margin-bottom: 20px;">
<span>个人信息</span>
</div>
<el-form :model="form" label-width="120px">
<el-form-item label="姓名" >
<el-input v-model="form.nickName" style="width:30%" disabled></el-input>
</el-form-item>
<el-form-item label="登录账号">
<el-input v-model="form.userName" style="width:30%" disabled></el-input>
</el-form-item>
<el-form-item label="密码">
<el-input v-model="form.password" show-password style="width:30%"></el-input>
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="form.phonenumber" style="width:30%"></el-input>
</el-form-item>
<el-form-item label="关联公司" prop="deptId">
</el-form-item>
<el-form-item>
<div style="margin-left: 25%;">
<el-button type="primary" @click="submitForm" >修改</el-button>
</div>
</el-form-item>
</el-form>
</el-card>
</template>
<script setup lang="ts">
import { ElMessage, ElMessageBox } from 'element-plus'
import type { FormInstance } from 'element-plus'
import { ref } from 'vue'
import { useStore } from 'store/user'
const store = useStore()
import { mainStore } from 'store/main'
const store2 = mainStore()
const isViewForm = ref(false)
const isDisabled = ref(false)
const uploadUrl = import.meta.env.VITE_API_URL + '/file/upload'
const qualityLis = ref<any>([])
const queryFormRef = ref<any>(null)
const deptOptions = ref<any>([])
import {
getUserInfo, //用户信息
editMessageApi, //修改
} from 'http/api/personalCenter'
import { InfoFilled, UploadFilled } from '@element-plus/icons-vue'
const form:any = ref({
name: '',
nickName: '',
userName: '',
password: '6',
phonenumber: '',
deptId: '',
});
const editField = (field: string) => {
// 这里可以添加编辑字段的逻辑，例如弹出编辑框
console.log(`编辑字段: ${field}`);
};
const submitForm = () => {
// 这里可以添加保存表单的逻辑
console.log('提交表单:', form.value);
};
const getUserListData = async () => {
let res = await getUserInfo()
form.value = res.data
}
onMounted(() => {
getUserListData()
})
</script>
<style lang="scss" scoped>
.box-card {
width: 100%;
height: 100%;
}
</style>