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

商城

This commit is contained in:
13218645326 2023-12-07 13:34:05 +08:00
parent 37b1bca405 99f52f3500
commit 85cc3f6649
7 changed files with 68 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components.d.ts vendored
View File

@ -12,6 +12,11 @@ declare module 'vue' {
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol']
<<<<<<< HEAD
=======
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
>>>>>>> dev-sjf-2023-12-5
ElDialog: typeof import('element-plus/es')['ElDialog']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
@ -23,11 +28,21 @@ declare module 'vue' {
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElProgress: typeof import('element-plus/es')['ElProgress']
<<<<<<< HEAD
=======
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
>>>>>>> dev-sjf-2023-12-5
ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElTag: typeof import('element-plus/es')['ElTag']
<<<<<<< HEAD
=======
ElTimeline: typeof import('element-plus/es')['ElTimeline']
ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
>>>>>>> dev-sjf-2023-12-5
ElUpload: typeof import('element-plus/es')['ElUpload']
EquipCard: typeof import('./src/components/equipCard.vue')['default']
EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']

5
src/http/api/usercenter/order.ts
View File

@ -7,4 +7,9 @@ export const apiOrderDetails = (id: any) => {
let urlStr = `/details/${id}`
return get(urlStr, {})
}
export const apiOrderInfoList = (params: any) => {
let urlStr = `/info/list/`
return get(urlStr, params)
}

0
src/style/scss/common.module.scss → src/style/scss/common.scss
View File

2
src/style/scss/index.scss
View File

@ -1,4 +1,4 @@
@import './variable.scss';
@import './mixin.scss';
@import './common.module.scss';
@import './common.scss';
@import './nprogress.scss';

12
src/views/user/orderManagement/orderCom/json/details.json
View File

@ -16,19 +16,19 @@
"description": "项目说明",
"maId": 1,
"leaseType": 1,
"leasePrice": "租赁单价",
"machinistPrice": null,
"leasePrice": "20000",
"machinistPrice": "3600",
"orderContract": "https://hzgyp-prod-1259451974.cos.ap-guangzhou.myqcloud.com/enterprise/serviceAgreement.pdf",
"machinistName": "机手姓名张三",
"phone": "13866169999",
"logisticsPhone": "物流司机电话139",
"machinistName": "机手姓名",
"phone": "联系电话13899995555",
"logisticsPhone": "物流司机电话13899995555",
"realStartTime": "设备实际进场时间",
"renterName": null,
"tenantName": null,
"entryAttachment": null,
"typeName": null,
"groupName": null,
"deviceName": "null挖掘机械",
"deviceName": null,
"code": "订单编号202311001",
"orderTime": "2023-12-1",
"orderStatus": "订单状态",

2
src/views/user/orderManagement/orderCom/orderConfirm.vue
View File

@ -119,7 +119,7 @@
下一步
</el-button>
<el-button type="primary" @click="confirmSendFn" v-else-if="stepVal == '3'">
确认发
确认发货
</el-button>
</div>
</el-form-item>

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

@ -6,40 +6,44 @@
</el-page-header>
<el-form label-width="130px" inline="true" style="padding: 0 20px 0px 20px;width: 865px;" size="small">
<el-form-item label="订单编号" style="width: 600px;">
{xxxxx}
{{ detailsInfo.code}}
</el-form-item>
<el-form-item label="需求单位" class="table_item">
xxxxx
{{ detailsInfo.needCompany}}
</el-form-item>
<el-form-item label="联系电话" class="table_item">
xxxxx
{{ detailsInfo.phone}}
</el-form-item>
<el-form-item label="租赁时长" class="table_item">
xxxxx
<!-- {{ detailsInfo.}} -->
<!-- 暂无 -->
</el-form-item>
<el-form-item label="设备进场地址：" class="table_item">
xxxxx
{{ detailsInfo.addressId}}
</el-form-item>
<el-form-item label="进场时间：" class="table_item">
xxxxx
{{ detailsInfo.realStartTime}}
</el-form-item>
<el-form-item label="是否需求机手：" class="table_item">
xxxxx
{{ detailsInfo.isMachinist}}
<!-- 枚举值 待确认-->
</el-form-item>
<el-form-item label="详细地址：" class="table_item">
xxxxx
{{ detailsInfo.address}}
</el-form-item>
<el-form-item label="工期时长：" class="table_item">
xxxxx
{{ detailsInfo.duration}}
</el-form-item>
<el-form-item label="发票类型：" class="table_item">
xxxxx
{{ detailsInfo.invoiceType}}
</el-form-item>
<el-form-item label="项目说明：" style="width: 800px;">
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
{{ detailsInfo.description}}
</el-form-item>
<el-form-item label="订单起止时间：" style="width: 800px;">
xxxx-xx-xx ~ xxxx-xx-xx
{{ detailsInfo.realStartTime}}-{{ detailsInfo.duration }}
<!-- 枚举值 待确认-->
</el-form-item>
<!-- 表格 -->
<orderTable :tableInfo="tableInfo">
@ -54,16 +58,16 @@
</orderTable>
<el-form-item label="订单合同：" style="width: 800px;margin-top:12px;">
xxxxxxxxxxxx.pdf
<el-button type="text" @click="pdfPreview(detailsInfo.orderContract)">pdf文件</el-button>
</el-form-item>
<el-form-item label="机手姓名：" class="table_item_sub">
xxxxx
{{ detailsInfo.machinistName}}
</el-form-item>
<el-form-item label="联系电话：" class="table_item_sub">
xxxxx
{{ detailsInfo.phone}}
</el-form-item>
<el-form-item label="物流司机电话：" style="width: 800px;">
xxxxx
{{ detailsInfo.logisticsPhone}}
</el-form-item>
<el-timeline style="margin-left:20px;width:560px;">
@ -87,8 +91,8 @@
import { reactive } from "vue"
import orderTable from "./orderTable.vue"
import { MoreFilled } from '@element-plus/icons-vue'
import { apiOrderDetails } from "http/api/usercenter/order"
import { apiOrderDetails,apiOrderInfoList } from "http/api/usercenter/order"
import dataJson from "./json/details.json"
const tableInfo = reactive({
v_equipment_title: "220E履带挖掘机",
v_equipment_code: "88888",
@ -132,18 +136,35 @@ const activities = [
},
]
const detailsInfo =reactive({
const detailsInfo:any =reactive({
})
const initApiOrderDetails = async () => {
let id = '1'
const res:any = await apiOrderDetails(id)
// const res:any = dataJson
console.log("res-apiOrderDetails", res)
Object.assign(detailsInfo,res.data)
}
const initApiOrderInfoList = async () => {
let params = {
orderId:'1'
}
const res:any = await apiOrderInfoList(params)
// const res:any = dataJson
console.log("res-apiOrderInfoList", res)
}
const pdfPreview=(url:any)=>{
window.open(url,"_blank")
}
onBeforeMount(()=>{
initApiOrderDetails()
initApiOrderInfoList()
})
</script>