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

需求修改

This commit is contained in:
wlikett 2023-12-10 02:44:01 +08:00
parent ed526ece95
commit b617b8bd00
8 changed files with 89 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/equipDetailTable.vue
View File

@ -179,7 +179,6 @@
flex: 1; flex: 1;
.item{ .item{
display: flex; display: flex;
align-items: center;
.label{ .label{
width: 80px; width: 80px;
text-align: right; text-align: right;
@ -187,6 +186,8 @@
} }
.value{ .value{
color: black; color: black;
flex: 1;
font-family: 'fangsong';
} }
} }
} }

4
src/router/index.ts
View File

@ -152,7 +152,7 @@ const routes: Array<RouteRecordRaw> = [
{ {
path: 'orderManagement', path: 'orderManagement',
name: 'orderManagement', name: 'orderManagement',
component: () => import('views/user/orderManagement/index.vue'), component: () => import('@/views/user/orderManagement/index.vue'),
meta: { meta: {
title: '订单管理（求租）', title: '订单管理（求租）',
keepAlive: true, keepAlive: true,
@ -265,7 +265,7 @@ const routes: Array<RouteRecordRaw> = [
{ {
path: 'orderDetails', path: 'orderDetails',
name: 'orderDetails', name: 'orderDetails',
component: () => import('views/user/orderManagement/orderCom/orderDetails.vue'), component: () => import('@/views/user/orderManagement/orderCom/orderDetails.vue'),
meta: { meta: {
title: '订单详情', title: '订单详情',
keepAlive: true, keepAlive: true,

18
src/utils/time.ts
View File

@ -1,17 +1,17 @@
import moment from 'moment' import moment from 'moment'
/* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-explicit-any */
/* /*
参考博客 参考博客
https://blog.csdn.net/qq_36228377/article/details/125196997 https://blog.csdn.net/qq_36228377/article/details/125196997
*/ */
export function formatTime(curTime: string, formatVal: string) { export function formatTime(curTime: string, formatVal: string) {
/* /*
格式化时间 格式化时间
curTIme:要格式化的时间 curTIme:要格式化的时间
formatVal:格式化时间的格式 formatVal:格式化时间的格式
*/ */
// 例如 curTime 2021-02-03 12-21-22 formatVal YYYY年MM月DD日 HH时mm分ss秒 // 例如 curTime 2021-02-03 12-21-22 formatVal YYYY年MM月DD日 HH时mm分ss秒
return moment(curTime).format(formatVal) return moment(curTime).format(formatVal)
@ -44,8 +44,8 @@ ss 有前导零的描述 01到59
X Unix时间戳 1411572969 */ X Unix时间戳 1411572969 */
export function getDiffTime(start: string, end: string, unit: any) { export function getDiffTime(start: string, end: string, unit: any) {
/* /*
start 开始时间 start 开始时间
end 结束时间 end 结束时间
unit 时间单位 unit 时间单位
@ -120,12 +120,12 @@ export function formatDate(timestamp: any) {
export const getNewDay = (dateTemp: any, days: any) => { export const getNewDay = (dateTemp: any, days: any,separator:any = '.') => {
console.log("dateTemp",dateTemp,days) console.log("dateTemp",dateTemp,days)
if(!dateTemp ){ if(!dateTemp ){
return "" return ""
} }
dateTemp = dateTemp.split("."); dateTemp = dateTemp.split(separator);
//转换为MM-DD-YYYY格式 //转换为MM-DD-YYYY格式
let nDate: any = new Date(dateTemp[1] + "-" + dateTemp[2] + "-" + dateTemp[0]); let nDate: any = new Date(dateTemp[1] + "-" + dateTemp[2] + "-" + dateTemp[0]);
let millSeconds: any = Math.abs(nDate) + days * 24 * 60 * 60 * 1000; let millSeconds: any = Math.abs(nDate) + days * 24 * 60 * 60 * 1000;
@ -136,5 +136,5 @@ export const getNewDay = (dateTemp: any, days: any) => {
let date = rDate.getDate(); let date = rDate.getDate();
if (date < 10) date = "0" + date; if (date < 10) date = "0" + date;
return year + "." + month + "." + date; return year + "." + month + "." + date;
} }

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

@ -11,8 +11,8 @@
<div class="title"> <div class="title">
<div class="name">{{ pageData.modelName }}{{ pageData.deviceName }}</div> <div class="name">{{ pageData.modelName }}{{ pageData.deviceName }}</div>
<div class="tag"> <div class="tag">
<div class="item">{{ pageData.maStatusStr }}</div> <div class="item otherItem">{{ pageData.maStatusStr }}</div>
<div class="item otherItem">已审核</div> <div class="item ">已审核</div>
</div> </div>
</div> </div>
<div class="viewNnum">浏览{{ pageData.searchNum }}</div> <div class="viewNnum">浏览{{ pageData.searchNum }}</div>
@ -218,7 +218,7 @@
:brand="pageData.brand" :brand="pageData.brand"
:code="pageData.code" :code="pageData.code"
:group="pageData.groupName" :group="pageData.groupName"
:position="pageData.location" :position="`${pageData.provinceStr}${pageData.cityStr || ''}${pageData.areaStr || ''}`"
:specifications="pageData.specification" :specifications="pageData.specification"
:type="pageData.typeName" :type="pageData.typeName"
:unit="ruleForm.durationUnit == '1' ? '月' : '天'" :unit="ruleForm.durationUnit == '1' ? '月' : '天'"
@ -228,7 +228,7 @@
</div> </div>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button type="primary" @click="submit"> <el-button type="primary" @click="submit(ruleFormRef)">
提交 提交
</el-button> </el-button>
</span> </span>
@ -264,9 +264,14 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import equipDetailTable from '@/components/equipDetailTable.vue' import equipDetailTable from '@/components/equipDetailTable.vue'
import {ElMessage} from "element-plus"; import {ElMessage} from "element-plus";
import {mainStore} from '@/store/main'
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
const ruleFormRef = ref()
const store = mainStore()
const pageParams = route.params const pageParams = route.params
//设备简略基本信息 //设备简略基本信息
@ -439,7 +444,7 @@ const rules = reactive({
{required: true, message: '请输入进场地址', trigger: 'blur'} {required: true, message: '请输入进场地址', trigger: 'blur'}
], ],
invoiceType: [ invoiceType: [
{required: true, message: '请输入进场地址', trigger: 'blur'}
], ],
projectDescription: [ projectDescription: [
{required: true, message: '请输入项目说明', trigger: 'blur'} {required: true, message: '请输入项目说明', trigger: 'blur'}
@ -494,7 +499,7 @@ const priceChange = computed(() => {
count = unitPrice * duration + jsPrice * duration count = unitPrice * duration + jsPrice * duration
return Math.round(count * 100) / 100 return Math.round(count * 100) / 100 || 0
}) })
//打开商家电话弹窗 //打开商家电话弹窗
@ -517,7 +522,7 @@ const that = {
const addressCascader = { const addressCascader = {
lazy: true, lazy: true,
label: 'name', label: 'name',
value: 'id', value: 'code',
lazyLoad: async (node, resolve) => { lazyLoad: async (node, resolve) => {
const {level, data} = node const {level, data} = node
let nodes = [] let nodes = []
@ -601,30 +606,44 @@ const goDetail = (val) => {
} }
//提交申请 //提交申请
const submit = async () => { const submit = async (Ref) => {
const params = { if(!Ref){
addressId: ruleForm.value.address[2], return
address: ruleForm.value.detailAddress,
realStartTime: ruleForm.value.entryTime,
duration: ruleForm.value.duration,
isMachinist: ruleForm.value.machinist,
invoiceType: ruleForm.value.invoiceType,
description: ruleForm.value.projectDescription,
durationType: ruleForm.value.durationUnit,
cost: priceChange.value,
maId: pageData.value.maId
} }
await Ref.validate( async(valid, fields) => {
if(valid){
const params = {
provinceId: ruleForm.value.address[0],
cityId: ruleForm.value.address[1],
areaId: ruleForm.value.address[2],
address: ruleForm.value.detailAddress,
realStartTime: ruleForm.value.entryTime,
duration: ruleForm.value.duration,
isMachinist: ruleForm.value.machinist,
invoiceType: ruleForm.value.invoiceType,
description: ruleForm.value.projectDescription,
durationType: ruleForm.value.durationUnit,
cost: priceChange.value,
maId: pageData.value.maId,
orderCompany:store.userInfo.companyId
}
const res = await apiSubmitLease(params)
if (res.code == '200') {
ElMessage({
message: '提交租赁申请成功',
type: 'success',
duration: 1500
})
}
dialoglease.value = false
}else {
}
})
const res = await apiSubmitLease(params)
if (res.code == '200') {
ElMessage({
message: '提交租赁申请成功',
type: 'success',
duration: 1500
})
}
dialoglease.value = false
} }
const init = async () => { const init = async () => {

8
src/views/equip/list.vue
View File

@ -68,7 +68,7 @@
:key="i" :key="i"
:url="v.picUrl" :url="v.picUrl"
:company="v.companyName" :company="v.companyName"
:tags="[v.maStatusStr,v.city || '合肥市']" :tags="[v.maStatusStr,v.cityStr || '合肥市']"
:name="`${v.modelName}${v.deviceName}`" :name="`${v.modelName}${v.deviceName}`"
:price="v.monthLeasePrice" :price="v.monthLeasePrice"
:id="v.maId" :id="v.maId"
@ -414,9 +414,9 @@ const getData = async (text = '') => {
pageNum: pageData.pageNum, pageNum: pageData.pageNum,
updateTimeOrderBy: '', updateTimeOrderBy: '',
monthLeasePriceOrderBy: '', monthLeasePriceOrderBy: '',
provinceId:address[0]?.id || '', provinceId:address[0]?.code || '',
cityId:address[1]?.id || '', cityId:address[1]?.code || '',
areaId:address[2]?.id || '', areaId:address[2]?.code || '',
typeId: type ? type.typeId : '', typeId: type ? type.typeId : '',
monthLeasePriceMin: '', monthLeasePriceMin: '',
monthLeasePriceMax: '', monthLeasePriceMax: '',

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

@ -112,7 +112,7 @@
<el-table-column align="center" prop="code" label="订单编号" /> <el-table-column align="center" prop="code" label="订单编号" />
<el-table-column align="center" prop="supplierCompany" label="供应商" /> <el-table-column align="center" prop="supplierCompany" label="供应商" />
<el-table-column align="center" prop="time" label="订单创建日期" /> <el-table-column align="center" prop="time" label="订单创建日期" />
<el-table-column align="center" prop="payType" label="装备类型" /> <el-table-column align="center" prop="typeName" label="装备类型" />
<el-table-column align="center" prop="deviceName" label="装备名称" /> <el-table-column align="center" prop="deviceName" label="装备名称" />
<el-table-column align="center" label="订单状态"> <el-table-column align="center" label="订单状态">
<template #default="{ row }"> <template #default="{ row }">

35
src/views/user/orderManagement/orderCom/orderDetails.vue
View File

@ -13,13 +13,15 @@
<el-form-item label="联系电话" class="table_item"> <el-form-item label="联系电话" class="table_item">
{{ detailsInfo.phone }} {{ detailsInfo.phone }}
</el-form-item> </el-form-item>
<el-form-item label="租赁时长" class="table_item"> <el-form-item label="租赁起止时间:" class="table_item">
<div style="white-space: nowrap;"> <div style="white-space: nowrap;">
{{ detailsInfo.planStartTime }}- {{ getTimeByPoint(detailsInfo.planStartTime,detailsInfo.duration) }} {{ detailsInfo.realStartTime }} / {{ getTimeByPoint(detailsInfo.realStartTime,detailsInfo.duration) }}
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="设备进场地址：" class="table_item"> <el-form-item label="设备进场地址：" class="table_item">
{{ detailsInfo.addressId }} {{ detailsInfo.provinceStr || '' }}
{{ detailsInfo.cityStr || '' }}
{{ detailsInfo.areaStr || '' }}
</el-form-item> </el-form-item>
<el-form-item label="进场时间：" class="table_item"> <el-form-item label="进场时间：" class="table_item">
{{ detailsInfo.realStartTime }} {{ detailsInfo.realStartTime }}
@ -32,10 +34,10 @@
{{ detailsInfo.address }} {{ detailsInfo.address }}
</el-form-item> </el-form-item>
<el-form-item label="工期时长：" class="table_item"> <el-form-item label="工期时长：" class="table_item">
{{ detailsInfo.duration }} {{ detailsInfo.duration }}{{ detailsInfo.durationType == '0' ? '天' :'月' }}
</el-form-item> </el-form-item>
<el-form-item label="发票类型：" class="table_item"> <el-form-item label="发票类型：" class="table_item">
{{ detailsInfo.invoiceType }} {{ detailsInfo.invoiceType == "" ? '不需要' : ( detailsInfo.invoiceType == "1" ? '增值税普票' : '增值税专票' ) }}
</el-form-item> </el-form-item>
<el-form-item label="项目说明：" style="width: 800px"> <el-form-item label="项目说明：" style="width: 800px">
{{ detailsInfo.description }} {{ detailsInfo.description }}
@ -48,18 +50,17 @@
<orderTable :tableInfo="tableInfo"> <orderTable :tableInfo="tableInfo">
<template v-slot:rentMoney> <template v-slot:rentMoney>
<div> <div>
<span>
装备
</span>
<span style="color: #f00">¥ <span style="color: #f00">¥
{{ tableInfo.devicePrice }} {{ tableInfo.devicePrice }}
</span> /月 </span> / {{ detailsInfo.durationType == '0' ? '天' :'月' }}
</div> </div>
<div v-if="detailsInfo.isMachinist != 0"> <!-- detailsInfo.isMachinist != 0-->
<div v-if="false">
<span> <span>
机手 机手
</span> </span>
<span style="color: #f00">¥ <span style="color: #f00">¥
{{ tableInfo.machinistPrice }} {{ tableInfo.machinistPrice }}
</span> /月 </span> /月
</div> </div>
@ -101,7 +102,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { reactive } from 'vue' import { reactive } from 'vue'
import orderTable from './orderTable.vue' import orderTable from './orderTable.vue'
import { apiOrderInfoDetails, apiOrderInfoList, apiUpdateOrderInfo } from 'http/api/usercenter/order' import { apiOrderInfoDetails, apiOrderInfoList, apiUpdateOrderInfo } from '@/http/api/usercenter/order'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import {getNewDay} from "utils/time" import {getNewDay} from "utils/time"
const router = useRouter() const router = useRouter()
@ -126,7 +127,7 @@ const stepListOrder: any = reactive({
}) })
const detailsInfo: any = reactive({}) const detailsInfo: any = reactive({})
const initApiOrderDetails = async () => { const initApiOrderDetails = async () => {
let id = route.query.id || '1' let id = route.query.orderId || '1'
const res: any = await apiOrderInfoDetails(id) const res: any = await apiOrderInfoDetails(id)
// const res:any = dataJson // const res:any = dataJson
console.log('res-apiOrderDetails', res) console.log('res-apiOrderDetails', res)
@ -138,8 +139,8 @@ const initApiOrderDetails = async () => {
tableInfo.v_equipment_group_type = deviceInfo.groupName tableInfo.v_equipment_group_type = deviceInfo.groupName
tableInfo.v_equipment_brand = deviceInfo.deviceBrand tableInfo.v_equipment_brand = deviceInfo.deviceBrand
tableInfo.v_equipment_size = deviceInfo.deviceSpecification tableInfo.v_equipment_size = deviceInfo.deviceSpecification
tableInfo.v_equipment_address = deviceInfo.deviceLocation tableInfo.v_equipment_address = `${deviceInfo.provinceStr}${deviceInfo.cityStr}${deviceInfo.areaStr}`
tableInfo.devicePrice = deviceInfo.deviceMonthLeasePrice tableInfo.devicePrice = detailsInfo.durationType == '0' ? deviceInfo.deviceDayLeasePrice : deviceInfo.deviceMonthLeasePrice
tableInfo.machinistPrice = deviceInfo.machinistPrice tableInfo.machinistPrice = deviceInfo.machinistPrice
tableInfo.imgUrl = deviceInfo.devicePicUrl tableInfo.imgUrl = deviceInfo.devicePicUrl
@ -209,8 +210,8 @@ const initPage = () => {
} }
const getTimeByPoint =(start:any,duration:any)=>{ const getTimeByPoint =(start:any,duration:any,)=>{
return getNewDay(start,duration) return getNewDay(start,duration,'-')
} }
onBeforeMount(() => { onBeforeMount(() => {

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

@ -2,7 +2,7 @@
import { ref } from 'vue' import { ref } from 'vue'
const queryParams = ref({}) const queryParams = ref({})
import PagingComponent from 'components/PagingComponent/index.vue' import PagingComponent from 'components/PagingComponent/index.vue'
import { getOrderListApi } from 'http/api/usercenter/seekorder' 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 router = useRouter()
@ -10,12 +10,13 @@
const pageSize: any = ref(20) const pageSize: any = ref(20)
const pageNumber: any = ref(1) const pageNumber: any = ref(1)
const total: any = ref(0) const total: any = ref(0)
const tableData: any = ref([])
// 获取数据列表 // 获取数据列表
const getList = async () => { const getList = async () => {
const res: any = await getOrderListApi() const res = await getOrderListApi()
console.log('获取数据列表***', res) console.log('获取数据列表***', res)
tableData.value = res.rows tableData.value = res.rows || []
total.value = res.total total.value = res.total
} }
@ -47,7 +48,6 @@
}) })
} }
const tableData: any = ref([])
const time = ref([]) const time = ref([])
</script> </script>
@ -122,12 +122,12 @@
v-if="row.orderStatus != 31"> v-if="row.orderStatus != 31">
查看 查看
</el-button> </el-button>
<el-button size="small" type="danger" v-if="(row.orderStatus = 39)">删除</el-button> <el-button size="small" type="danger" v-if="(row.orderStatus == 39)">删除</el-button>
<el-button <el-button
size="small" size="small"
type="success" type="success"
@click="settlementBtn" @click="settlementBtn"
v-if="(row.orderStatus = 34)"> v-if="(row.orderStatus == 34)">
结算 结算
</el-button> </el-button>
</template> </template>