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

优化

This commit is contained in:
BianLzhaoMin 2025-03-11 16:20:45 +08:00
parent 125354749e
commit 73e45a720a
3 changed files with 83 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/user/leaseholder/address-manage/index.vue
View File

@ -82,6 +82,7 @@
isRepublish = true isRepublish = true
dialogTitle = '新增收货地址' dialogTitle = '新增收货地址'
addOrEditDialogVisible = true addOrEditDialogVisible = true
delete addOrEditForm?.id
} }
" "
type="primary" type="primary"
@ -294,13 +295,6 @@ const areaCityList = ref<any>([])
const areaCountyList = ref<any>([]) const areaCountyList = ref<any>([])
const searchParams = reactive({ const searchParams = reactive({
leaseName: '',
leaseCode: '',
leaseStatus: '',
finishStartTime: '',
finishEndTime: '',
publishStartTime: '',
publishEndTime: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1,
}) })
@ -321,15 +315,7 @@ const addOrEditFormRules = reactive({
// 获取列表 // 获取列表
const getLeaseListData = async () => { const getLeaseListData = async () => {
if (endTime.value.length > 0) { const res: any = await getAddressListApi(searchParams)
searchParams.finishStartTime = endTime.value[0]
searchParams.finishEndTime = endTime.value[1]
}
if (releaseTime.value.length > 0) {
searchParams.publishStartTime = releaseTime.value[0]
searchParams.publishEndTime = releaseTime.value[1]
}
const res: any = await getAddressListApi({})
console.log(res, '地址--') console.log(res, '地址--')
leaseList.value = res.rows leaseList.value = res.rows
total.value = res.total total.value = res.total
@ -341,18 +327,7 @@ const getAreaData = async () => {
} }
// 重置 // 重置
const onReset = () => { const onReset = () => {}
endTime.value = []
releaseTime.value = []
searchParams.finishStartTime = ''
searchParams.finishEndTime = ''
searchParams.publishStartTime = ''
searchParams.publishEndTime = ''
searchParams.pageNum = 1
searchParams.pageSize = 10
searchFormRef.value.resetFields()
getLeaseListData()
}
// 删除 // 删除
const onDelete = async (id: any) => { const onDelete = async (id: any) => {
const res: any = await deleteLeaseInfoApi({ id }) const res: any = await deleteLeaseInfoApi({ id })
@ -367,12 +342,13 @@ const onDelete = async (id: any) => {
// 重新发布 // 重新发布
const onRepublish = async (row: any) => { const onRepublish = async (row: any) => {
dialogTitle.value = '编辑收货地址' dialogTitle.value = '编辑收货地址'
const { areaCode, address, cityCode, provinceCode } = row const { areaCode, address, cityCode, provinceCode, id } = row
Object.assign(addOrEditForm.value, { Object.assign(addOrEditForm.value, {
areaCode, areaCode,
address, address,
cityCode, cityCode,
provinceCode, provinceCode,
id,
}) })
Promise.all([onProvinceChange(provinceCode), onCityChange(cityCode)]).then(() => { Promise.all([onProvinceChange(provinceCode), onCityChange(cityCode)]).then(() => {

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

@ -290,6 +290,32 @@ const isOrderCompleteTwo = (goods: any) => {
<span> {{ orderDetails.address }} </span> <span> {{ orderDetails.address }} </span>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="padding: 4px 40px; font-size: 14px">
<el-col :span="8">
<span> 接单人： </span>
<span>
{{ orderDetails.receivingUser }}
</span>
</el-col>
<el-col :span="8">
<span> 接单时间： </span>
<span>
{{ orderDetails.receivingTime }}
</span>
</el-col>
</el-row>
<el-row style="padding: 4px 40px; font-size: 14px">
<el-col :span="8">
<span> 出库人： </span>
<span> {{ orderDetails.preOutboundUser }} </span>
</el-col>
<el-col :span="8">
<span> 出库时间： </span>
<span>
{{ orderDetails.preOutboundTime }}
</span>
</el-col>
</el-row>
<el-row <el-row
style=" style="
@ -312,17 +338,18 @@ const isOrderCompleteTwo = (goods: any) => {
" "
style="min-height: 100px" style="min-height: 100px"
> >
<div style="display: flex; flex-direction: column; align-items: center"> <!-- <div style="display: flex; flex-direction: column; align-items: center">
<span style="font-weight: bold; font-size: 13px; padding: 4px 0"> <span style="font-weight: bold; font-size: 13px; padding: 4px 0">
接单人：{{ goods.receivingUser }} 接单人：{{ goods.receivingUser }}
</span> </span>
</div> -->
<el-image <el-image
:src="goods.url" :src="goods.url"
style="width: 110px; height: 80px" style="width: 110px; height: 80px"
alt="#" alt="#"
fit="cover" fit="cover"
/> />
</div>
<div <div
style=" style="
min-height: 100px; min-height: 100px;
@ -337,9 +364,9 @@ const isOrderCompleteTwo = (goods: any) => {
<el-row style="font-weight: bold"> <el-row style="font-weight: bold">
{{ goods.deviceName }} {{ goods.deviceName }}
<span style="padding-left: 10px"> <!-- <span style="padding-left: 10px">
接单时间：{{ goods.receivingTime }} 接单时间：{{ goods.receivingTime }}
</span> </span> -->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3"> 租期:</el-col> <el-col :span="3"> 租期:</el-col>
@ -412,7 +439,7 @@ const isOrderCompleteTwo = (goods: any) => {
flex-direction: column; flex-direction: column;
" "
> >
<div <!-- <div
style=" style="
width: 100%; width: 100%;
display: flex; display: flex;
@ -424,7 +451,7 @@ const isOrderCompleteTwo = (goods: any) => {
> >
<span>出库人：{{ goods.preOutboundUser }}</span> <span>出库人：{{ goods.preOutboundUser }}</span>
<span>出库时间：{{ goods.preOutboundTime }}</span> <span>出库时间：{{ goods.preOutboundTime }}</span>
</div> </div> -->
<div>租期</div> <div>租期</div>
<div <div
style="font-weight: bold; margin-top: 10px" style="font-weight: bold; margin-top: 10px"

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

@ -295,6 +295,32 @@ const isOrderCompleteTwo = (goods: any) => {
<span> {{ orderDetails.address }} </span> <span> {{ orderDetails.address }} </span>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="padding: 4px 40px; font-size: 14px">
<el-col :span="8">
<span> 接单人： </span>
<span>
{{ orderDetails.receivingUser }}
</span>
</el-col>
<el-col :span="8">
<span> 接单时间： </span>
<span>
{{ orderDetails.receivingTime }}
</span>
</el-col>
</el-row>
<el-row style="padding: 4px 40px; font-size: 14px">
<el-col :span="8">
<span> 出库人： </span>
<span> {{ orderDetails.preOutboundUser }} </span>
</el-col>
<el-col :span="8">
<span> 出库时间： </span>
<span>
{{ orderDetails.preOutboundTime }}
</span>
</el-col>
</el-row>
<el-row <el-row
style=" style="
@ -317,17 +343,18 @@ const isOrderCompleteTwo = (goods: any) => {
" "
style="min-height: 100px" style="min-height: 100px"
> >
<div style="display: flex; flex-direction: column; align-items: center"> <!-- <div style="display: flex; flex-direction: column; align-items: center">
<span style="font-weight: bold; font-size: 13px; padding: 4px 0"> <span style="font-weight: bold; font-size: 13px; padding: 4px 0">
接单人：{{ goods.receivingUser }} 接单人：{{ goods.receivingUser }}
</span> </span>
</div> -->
<el-image <el-image
:src="goods.url" :src="goods.url"
style="width: 110px; height: 80px" style="width: 110px; height: 80px"
alt="#" alt="#"
fit="cover" fit="cover"
/> />
</div>
<div <div
style=" style="
min-height: 100px; min-height: 100px;
@ -342,9 +369,9 @@ const isOrderCompleteTwo = (goods: any) => {
<el-row style="font-weight: bold"> <el-row style="font-weight: bold">
{{ goods.deviceName }} {{ goods.deviceName }}
<span style="padding-left: 10px"> <!-- <span style="padding-left: 10px">
接单时间：{{ goods.receivingTime }} 接单时间：{{ goods.receivingTime }}
</span> </span> -->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3"> 租期 :</el-col> <el-col :span="3"> 租期 :</el-col>
@ -416,7 +443,7 @@ const isOrderCompleteTwo = (goods: any) => {
flex-direction: column; flex-direction: column;
" "
> >
<div <!-- <div
style=" style="
width: 100%; width: 100%;
display: flex; display: flex;
@ -428,7 +455,7 @@ const isOrderCompleteTwo = (goods: any) => {
> >
<span>出库人：{{ goods.preOutboundUser }}</span> <span>出库人：{{ goods.preOutboundUser }}</span>
<span>出库时间：{{ goods.preOutboundTime }}</span> <span>出库时间：{{ goods.preOutboundTime }}</span>
</div> </div> -->
<div>租期</div> <div>租期</div>
<div <div
style="font-weight: bold; margin-top: 10px" style="font-weight: bold; margin-top: 10px"