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

bug修复

This commit is contained in:
bb_pan 2025-02-13 14:48:15 +08:00
parent 5f3b7da5b4
commit ffd872a113
8 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
env/.env.dev vendored
View File

@ -7,10 +7,10 @@ VITE_API_URL = '/proxyApi'
# 开发环境接口地址
# VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭
# VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅
VITE_proxyTarget = 'http://192.168.2.226:28080' # 马帅
# VITE_proxyTarget = 'http://192.168.2.122:28080' # 梁超
# VITE_proxyTarget = 'http://36.33.26.201:17788/proxyApi' # 测试服务
VITE_proxyTarget = 'http://192.168.0.244:28580' # 测试服务
# VITE_proxyTarget = 'http://192.168.0.244:28580' # 测试服务
# VITE_proxyTarget = 'http://192.168.2.75:28080' # 盛旭
# VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型)

2
src/views/user/accept-orders/index.vue
View File

@ -503,7 +503,7 @@ const getLeaseListData = async () => {
}
const getAreaData = async () => {
const res: any = await getAreaApi()
const res: any = await getAreaApi(0)
areaList.value = res.data
}

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

@ -26,7 +26,7 @@ const allList = [
{ title: '订单管理', name: 'orderManagementCz', permission: ['1'] },
{ title: '接单管理', name: 'accept-orders', permission: ['1'] },
// { title: '退租管理', name: 'rent-termination', permission: ['1'] },
// { title: '结算管理', name: 'settlement-manage', permission: ['1'] },
{ title: '结算管理', name: 'settlement-manage', permission: ['1'] },
{ title: '质检管理', name: 'quality-manage', permission: ['1'] },
{ title: '安全证书管理', name: 'security-certificate', permission: ['1'] },
{ title: '标签管理', name: 'tag-manage', permission: ['1'] },

19
src/views/user/lessor/rent-termination/index.vue
View File

@ -1001,14 +1001,21 @@ const onReset = () => {
// 重新发布
const onRepublish = async (type: any, orderId: any) => {
type == 1 ? (dialogTitle.value = '退租检修') : (dialogTitle.value = '检修明细')
console.log('🚀 ~ onRepublish ~ type:', type)
if (type === 1) {
const { data: res }: any = await getOrderDetailsByIdApi(orderId)
orderDetails.value = res
repairSelect.value = JSON.parse(JSON.stringify(res.detailsList))
lossSelect.value = JSON.parse(JSON.stringify(res.detailsList))
scrapSelect.value = JSON.parse(JSON.stringify(res.detailsList))
orderDetails.value.orderId = orderId
try {
console.log('🚀 ~ onRepublish ~ orderId:', orderId)
const { data: res }: any = await getOrderDetailsByIdApi(orderId)
console.log('🚀 ~ onRepublish ~ res:', res)
orderDetails.value = res
repairSelect.value = JSON.parse(JSON.stringify(res.detailsList))
lossSelect.value = JSON.parse(JSON.stringify(res.detailsList))
scrapSelect.value = JSON.parse(JSON.stringify(res.detailsList))
orderDetails.value.orderId = orderId
} catch (error) {
console.log('🚀 ~ onRepublish ~ error:', error)
}
} else {
const { data: res }: any = await getOverhaulApi(orderId)
repairRecordList.value = res.repairRecordList

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

@ -364,8 +364,8 @@ const isOrderComplete = computed(() => {
style="font-weight: bold; margin-top: 10px"
v-if="props.orderStatus == 20"
>
{{ goods.takeOverTime.slice(0, 10) }}至{{
goods.rentOverTime.slice(0, 10)
{{ goods.takeOverTime?.slice(0, 10) }}至{{
goods.rentOverTime?.slice(0, 10)
}}
</div>
</div>

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

@ -741,16 +741,16 @@ const costSubmit = () => {
: ''
"
>
{{ goods.rentBeginTime.slice(0, 10) }}至{{
goods.rentEndTime.slice(0, 10)
{{ goods.rentBeginTime?.slice(0, 10) }}至{{
goods.rentEndTime?.slice(0, 10)
}}
</div>
<div
style="font-weight: bold; margin-top: 10px; font-size: 13px"
v-if="item.orderStatus == 20"
>
{{ goods.takeOverTime.slice(0, 10) }}至{{
goods.rentOverTime.slice(0, 10)
{{ goods.takeOverTime?.slice(0, 10) }}至{{
goods.rentOverTime?.slice(0, 10)
}}
</div>
</div>

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

@ -364,8 +364,8 @@ const isOrderComplete = computed(() => {
style="font-weight: bold; margin-top: 10px"
v-if="props.orderStatus == 20"
>
{{ goods.takeOverTime.slice(0, 10) }}至{{
goods.rentOverTime.slice(0, 10)
{{ goods.takeOverTime?.slice(0, 10) }}至{{
goods.rentOverTime?.slice(0, 10)
}}
</div>
</div>

12
src/views/user/orderManagementCz/components/order-home.vue
View File

@ -72,7 +72,9 @@ const statusList: any = [
]
const orderText = (status: any) => {
return statusList.filter((e: any) => e.id == status)[0].name
// return statusList.filter((e: any) => e.id == status)[0].name
const statusItem = statusList.find((e: any) => e.id == status)
return statusItem ? statusItem.name : ''
}
const orderType = (status: any) => {
if (status == 1 || status == 2 || status == 3 || status == 5) return 'primary'
@ -1003,8 +1005,8 @@ const wordUrl = ref('')
: ''
"
>
{{ goods.rentBeginTime.slice(0, 10) }}至{{
goods.rentEndTime.slice(0, 10)
{{ goods.rentBeginTime?.slice(0, 10) }}至{{
goods.rentEndTime?.slice(0, 10)
}}
</div>
@ -1012,8 +1014,8 @@ const wordUrl = ref('')
style="font-weight: bold; margin-top: 10px; font-size: 13px"
v-if="item.orderStatus == 20"
>
{{ goods.takeOverTime.slice(0, 10) }}至{{
goods.rentOverTime.slice(0, 10)
{{ goods.takeOverTime?.slice(0, 10) }}至{{
goods.rentOverTime?.slice(0, 10)
}}
</div>
</div>