冲突提交

页面优化
合并代码
2023-12-08 17:41:16 +08:00 · 2023-12-08 17:37:49 +08:00 · 2023-12-08 17:36:39 +08:00 · 2023-12-08 17:33:41 +08:00 · 2023-12-08 17:31:40 +08:00 · 2023-12-08 17:09:20 +08:00
14 changed files with 325 additions and 144 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,7 +13,7 @@ dist
 dist-ssr
 coverage
 *.local
-components.d.ts
+/components.d.ts

 /cypress/videos/
 /cypress/screenshots/
@ -27,6 +27,4 @@ components.d.ts
 *.njsproj
 *.sln
 *.sw?
-components.d.ts
 .prettierrc.js
-components.d.ts
--- a/components.d.ts
+++ b/components.d.ts
@ -8,15 +8,21 @@ export {}
 declare module 'vue' {
  export interface GlobalComponents {
    ElButton: typeof import('element-plus/es')['ElButton']
+<<<<<<< HEAD
+=======
    ElCarousel: typeof import('element-plus/es')['ElCarousel']
    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+>>>>>>> dev-songyang
    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
    ElCol: typeof import('element-plus/es')['ElCol']
    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
    ElDialog: typeof import('element-plus/es')['ElDialog']
+<<<<<<< HEAD
+=======
    ElDivider: typeof import('element-plus/es')['ElDivider']
    ElEmpty: typeof import('element-plus/es')['ElEmpty']
+>>>>>>> dev-songyang
    ElForm: typeof import('element-plus/es')['ElForm']
    ElFormItem: typeof import('element-plus/es')['ElFormItem']
    ElIcon: typeof import('element-plus/es')['ElIcon']
--- a/env/.env.sit
+++ b/env/.env.sit
@ -3,4 +3,4 @@ VITE_ENV = 'production'
 VITE_BUILD_MODE = 'sit'

 # 线上环境接口地址
-VITE_API_URL = 'https://testSit.com'
+VITE_API_URL = 'http://192.168.1.3:10086'
--- a/package.json
+++ b/package.json
@ -1,14 +1,14 @@
 {
-  "name": "vue3pctemplate",
+  "name": "zrpt_front",
  "version": "0.0.0",
  "private": true,
  "scripts": {
    "dev": "vite --mode dev",
    "serve1": "vite --mode serve1",
    "build": "npm run build:pro",
-    "build:sit": "vue-tsc && vite build --mode sit",
-    "build:uat": "vue-tsc && vite build --mode uat",
-    "build:pro": "vue-tsc && vite build --mode production",
+    "build:sit": "vite build --mode sit",
+    "build:uat": "vite build --mode uat",
+    "build:pro": "vite build --mode production",
    "preview": "vite preview",
    "build-only": "vite build",
    "type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false"
--- a/src/components/uploadComponent/index.vue
+++ b/src/components/uploadComponent/index.vue
@ -5,7 +5,7 @@
            :action="props.actionUrl"
            :auto-upload="props.autoUpload"
            style="width: 100%"
-            :on-success="(response, file) => successUpload(response, file)"
+            :on-success="(response:any, file:any) => successUpload(response, file)"
            :on-error="errorUpload"
            :accept="props.acceptTypeList.join(',')"
            :before-upload="beforeUpload"
@ -15,9 +15,9 @@
            :file-list="props.fileList"
            :disabled="props.disabledFlag"
            :on-change="changeFileFn"
-            :on-remove="(file, fileList) => removeFile(file, fileList)"
-            :on-preview="(file) => preview(file)"
-            :on-progress="(event, file, fileList) => onProgressFn(event, file, fileList)"
+            :on-remove="(file:any, fileList:any) => removeFile(file, fileList)"
+            :on-preview="(file:any) => preview(file)"
+            :on-progress="(event:any, file:any, fileList:any) => onProgressFn(event, file, fileList)"
            :list-type="props.listType">
            <!-- 上传的按钮 或者 icon 通过具名插槽的方式 -->
            <slot name="default"></slot>
@ -164,7 +164,7 @@
            message: '上传失败请重试！'
        })
    }
-    const beforeUpload = (file) => {
+    const beforeUpload = (file:any) => {
        const { name = '', size } = file
        if (size > props.maxSize * 1024 * 1000) {
            ElMessage({
@ -182,7 +182,7 @@
            return false
        }
    }
-    const handleExceed = (files, fileList) => {
+    const handleExceed = (files:any, fileList:any) => {
        ElMessage({
            type: 'warning',
            message: `当前限制选择 10 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
@ -191,12 +191,12 @@
        })
    }
    // 移除文件
-    const removeFile = (file, data) => {
+    const removeFile = (file:any, data:any) => {
        console.log(file, data)
-        props.fileList = data
+        // props.fileList = data
    }
    // 预览
-    const preview = (data) => {
+    const preview = (data:any) => {
        const { url, response = {} } = data || {}
        let name = data.name
        const downLoadTypeList = props.downLoadTypeList
@ -229,7 +229,7 @@
        }
    }

-    const onProgressFn = (event, file, fileList) => {
+    const onProgressFn = (event:any, file:any, fileList:any) => {
        processFlag.value = true
        loadProcess.value = event.percent.toFixed(2)
        if (loadProcess.value >= 100) {
--- a/src/utils/elementCom.ts
+++ b/src/utils/elementCom.ts
@ -33,7 +33,7 @@ export const ElMessageBoxOpert = (title = '', text = "", onfirmText = "", cancel
    inputErrorMessage: inputErrorMessage,
    confirmButtonClass:confirmButtonClass
  })
-    .then(({ value }) => {
+    .then(( value ) => {
      callBack(row,value)
    })
    .catch(() => {
--- a/src/utils/time.ts
+++ b/src/utils/time.ts
@ -117,3 +117,24 @@ export function formatDate(timestamp: any) {
    }
    return '刚刚'
 }
+
+
+
+export const getNewDay = (dateTemp: any, days: any) => {
+    console.log("dateTemp",dateTemp,days)
+    if(!dateTemp ){
+        return ""
+    }
+    dateTemp = dateTemp.split(".");
+    //转换为MM-DD-YYYY格式
+    let  nDate: any = new Date(dateTemp[1] + "-" + dateTemp[2] + "-" + dateTemp[0]);
+    let  millSeconds: any = Math.abs(nDate) + days * 24 * 60 * 60 * 1000;
+    let  rDate: any = new Date(millSeconds);
+    let  year: any = rDate.getFullYear();
+    let  month: any = rDate.getMonth() + 1;
+    if (month < 10) month = "0" + month;
+    let date = rDate.getDate();
+    if (date < 10) date = "0" + date;
+    return year + "." + month + "." + date;
+ 
+}
--- a/src/views/equip/list.vue
+++ b/src/views/equip/list.vue
@ -309,7 +309,7 @@ const changeOption = (val) => {
        val.sort = val.sort == 'asc' ? 'desc' : 'asc'
    }
    optionActive.value = val.id
-
+    getData()
 }

 //选中后添加到 大类中的select字段
@ -416,7 +416,8 @@ const getData = async (text = '') => {
        ageMin: '',
        ageMax: '',
        workingHoursMin: '',
-        workingHoursMax: ''
+        workingHoursMax: '',
+        level:type ? type.level : ''
    }

    if (optionActive.value == '2') {
@ -437,7 +438,6 @@ const getData = async (text = '') => {
        params.workingHoursMin = time.value[0]
        params.workingHoursMax = time.value[1]
    }
-    console.log('getList =============',params)

    const res = await getList(params)

--- a/src/views/user/orderManagement/index.vue
+++ b/src/views/user/orderManagement/index.vue
@ -115,24 +115,36 @@
        <el-table-column align="center" prop="deviceName" label="装备名称" />
        <el-table-column align="center" label="订单状态">
            <template #default="{ row }">
-                <el-tag effect="dark" type="info" v-if="row.orderStatus == 31">待确认</el-tag>
-                <el-tag effect="dark" type="warning" v-if="row.orderStatus == 32">
-                    待合同上传
-                </el-tag>
-                <el-tag effect="dark" type="success" v-if="row.orderStatus == 35">待收货</el-tag>
-                <el-tag effect="dark" v-if="row.orderStatus == 36">进行中</el-tag>
+                <el-tag v-if="row.orderStatus == 31">待确认</el-tag>
+                <el-tag v-if="row.orderStatus == 32">待合同上传</el-tag>
+                <el-tag v-if="row.orderStatus == 35">待收货</el-tag>
+                <el-tag v-if="row.orderStatus == 36">进行中</el-tag>
            </template>
        </el-table-column>
        <el-table-column align="center" prop="name" label="操作" width="320px">
            <template #default="scope">
-                <el-button size="small" type="primary" @click="clickPreviewDetails">查看</el-button>
-                <el-button size="small" type="danger" @click="clickRentingTermination">
+                <el-button size="small" type="primary" @click="clickPreviewDetails(scope.row)">
+                    查看
+                </el-button>
+                <el-button
+                    size="small"
+                    type="danger"
+                    @click="clickRentingTermination"
+                    v-if="scope.row.orderStatus == 36">
                    退租
                </el-button>
-                <el-button size="small" type="warning" @click="clickRenewalOfLease(scope)">
+                <el-button
+                    size="small"
+                    type="warning"
+                    @click="clickRenewalOfLease"
+                    v-if="scope.row.orderStatus == 36">
                    续租
                </el-button>
-                <el-button size="small" type="success" @click="clickConfirmReceipt">
+                <el-button
+                    size="small"
+                    type="success"
+                    @click="clickConfirmReceipt(scope.row)"
+                    v-if="scope.row.orderStatus == 35">
                    确认收货
                </el-button>
            </template>
--- a/src/views/user/orderManagement/orderCom/json/details.json
+++ b/src/views/user/orderManagement/orderCom/json/details.json
@ -4,8 +4,32 @@
    "updateBy": null,
    "updateTime": null,
    "remark": null,
-    "id": 1,
    "orderId": 1,
+    "code": "订单编号202311001",
+    "time": "2023-12-1",
+    "endTime": null,
+    "deposit": null,
+    "cost": null,
+    "payType": null,
+    "supplier": null,
+    "orderStatus": "36",
+    "orderUser": null,
+    "orderCompany": null,
+    "typeName": "装备类别：\    ",
+    "groupName": "装备组别：
+    ",
+    "deviceName": "220E星牌挖掘机",
+    "deviceCode": 装备编号,
+    "devicePicUrl": "https://imgproduct.cehome.com/g2/o/00/39/a57044cc230ac7c9.JPG",
+    "deviceBrand": "品牌 ",
+    "deviceSpecification": "设备规格：
+    ",
+    "deviceLocation": "设备位置：
+    ",
+    "deviceMonthLeasePrice": "2000 /",
+    "maId": 1,
+    "orderPhone": null,
+    "supplierCompany": null,
    "needCompany": "夏普公司",
    "planStartTime": "2023.12.2",
    "isMachinist": "1",
@ -14,23 +38,17 @@
    "duration": "工期时长20天",
    "invoiceType": "发票类型",
    "description": "项目说明",
-    "maId": 1,
    "leaseType": 1,
    "leasePrice": "20000",
    "machinistPrice": "3600",
-    "orderContract": "https://hzgyp-prod-1259451974.cos.ap-guangzhou.myqcloud.com/enterprise/serviceAgreement.pdf",
-    "machinistName": "机手姓名",
-    "phone": "联系电话13899995555",
-    "logisticsPhone": "物流司机电话13899995555",
+    "orderContract": "",
+    "machinistName": "213123",
+    "phone": "321321",
+    "logisticsPhone": "21321",
    "realStartTime": "设备实际进场时间",
    "renterName": null,
    "tenantName": null,
    "entryAttachment": null,
-    "typeName": null,
-    "groupName": null,
-    "deviceName": null,
-    "code": "订单编号202311001",
-    "orderTime": "2023-12-1",
-    "orderStatus": "订单状态",
-    "contractUrl": null
+    "contractUrl": null,
+    "pid": null
 }
--- a/src/views/user/orderManagement/orderCom/orderConfirm.vue
+++ b/src/views/user/orderManagement/orderCom/orderConfirm.vue
@ -1,5 +1,5 @@
 <template>
-    <el-page-header @back="goBack" @click="$router.go(-1)">
+    <el-page-header @click="$router.go(-1)">
        <template #content>

        </template>
@ -17,18 +17,19 @@
            detailsInfo.phone
        }}</el-form-item>
        <el-form-item label="租赁时长" class="table_item">
-
-            <!-- {{  detailsInfo.}} -->
-            <!-- 暂无 --></el-form-item>
+            <div style="white-space: nowrap;">
+                {{ detailsInfo.planStartTime }}- {{ getTimeByPoint(detailsInfo.planStartTime, detailsInfo.duration) }}
+            </div>
+        </el-form-item>
        <el-form-item label="设备进场地址：" class="table_item">{{
            detailsInfo.addressId
        }}</el-form-item>
        <el-form-item label="进场时间：" class="table_item">{{
            detailsInfo.realStartTime
        }}</el-form-item>
-        <el-form-item label="是否需求机手：" class="table_item">{{
-            detailsInfo.isMachinist
-        }}</el-form-item>
+        <el-form-item label="是否需求机手：" class="table_item">
+            {{ detailsInfo.isMachinist == 0 ? '否' : '是' }}
+        </el-form-item>
        <el-form-item label="详细地址：" class="table_item">{{
            detailsInfo.address
        }}</el-form-item>
@ -45,26 +46,49 @@
            xxxx-xx-xx ~ xxxx-xx-xx
        </el-form-item> -->
        <!-- 表格 -->
-        <orderTable :tableInfo="tableInfo" style="width: 760px">
-            <!-- <template v-slot:rentMoney>
-               <h1>6666</h1>
-            </template> -->
+        <orderTable :tableInfo="tableInfo">
            <template v-slot:rentMoney>
-                <div style="margin-left: 80px">
+                <!-- <div>
                    <div>
-                        <span>装备</span>
-                        <span style="color: #f00">¥{{ tableInfo.money }}</span>
-                        /{{ tableInfo.unit }}
+                        <span>
+                            装备
+                        </span>
+                        <span style="color: #f00">¥
+                            {{ tableInfo.devicePrice }}
+                        </span> /月
                    </div>
-                    <div>
-                        <span>手</span>
-                        <span style="color: #f00">¥{{ tableInfo.money }}</span>
-                        /{{ tableInfo.unit }}
+                    <div v-if="detailsInfo.isMachinist != 0">
+                        <span>
+                            机手
+                        </span>
+                        <span style="color: #f00">¥
+                            {{ tableInfo.machinistPrice }}
+                        </span> /月
+                    </div>
+                </div> -->
+                <div>
+                    <div class="equipMoneyClass">
+                        <span>
+                            装备
+                        </span>
+                        <span style="color: #f00">¥
+                        </span>
+                        <el-input v-model.trim="equipMoneyInfo.equipMoney" placeholder="请输入企业类型" clearable maxlength="30" />
+                        /月
+                    </div>
+                    <div v-if="detailsInfo.isMachinist != 0" class="equipMoneyClass">
+                        <span>
+                            机手
+                        </span>
+                        <span style="color: #f00">¥
+                        </span>
+                        <el-input v-model.trim="equipMoneyInfo.phoneMoney" placeholder="请输入企业类型" clearable
+                            maxlength="30" />/月
                    </div>
                </div>
            </template>
        </orderTable>
-        <div class="total_money">合计：234234元</div>
+        <div class="total_money">合计：{{ totalMoneyFn() }}</div>
        <!-- <el-form-item label="订单合同：" style="width: 800px;margin-top:12px;">
            xxxxxxxxxxxx.pdf
        </el-form-item>
@ -79,13 +103,14 @@
        </el-form-item> -->
        <el-form-item label="订单合同：" style="width: 800px" v-if="stepVal == '1'">
            <div>
-                <uploadComponent :maxLimit="1" listType="text" :acceptTypeList="['.pdf']" :scuccesCallback="scuccesCallback" height="32px" width="360px">
+                <uploadComponent :maxLimit="1" listType="text" :acceptTypeList="['.pdf']" :scuccesCallback="scuccesCallback"
+                    height="32px" width="360px">
                    <template v-slot:default>
                        <el-button type="primary">上传文件</el-button>
                    </template>
                </uploadComponent>

-                <div class="error_tip_c" v-show="errorTipFlag==2">请上传文件</div>
+                <div class="error_tip_c" v-show="errorTipFlag == 2">请上传文件</div>
            </div>
        </el-form-item>
        <div v-else-if="stepVal == '2'">
@ -141,30 +166,37 @@
 <script setup lang="ts">
 import orderTable from './orderTable.vue'
 import { reactive } from 'vue'
- 
+
 import timeLineHorizontal from './timeLineHorizontal.vue'
 import uploadComponent from 'components/uploadComponent/index.vue'
 import { ElMessageBoxOpert } from 'utils/elementCom'
 import { ElMessage } from 'element-plus'
 import { apiOrderInfoDetails, apiUpdateOrderInfo, apiOrderReject } from 'http/api/usercenter/order'
+import { getNewDay } from "utils/time"
+
 const router = useRouter()
 const route = useRoute()
 const ruleFormRef = ref()
 const tableInfo = reactive({
-    v_equipment_title: '220E履带挖掘机',
-    v_equipment_code: '88888',
-    v_equipment_group_type: '挖掘机械',
-    v_equipment_brand: '挖掘机',
-    v_equipment_weight: '22吨',
-    v_equipment_volume: '1立方米',
-    v_equipment_address: '广东省广州市',
-    money: '2000',
-    unit: '月',
+    v_equipment_title: '',
+    v_equipment_code: '',
+    typeName: '',
+    v_equipment_group_type: '',
+    v_equipment_brand: '',
+    v_equipment_size: '',
+    v_equipment_volume: '',
+    v_equipment_address: '',
+    devicePrice: '',
+    machinistPrice: '',
    imgUrl: ''
 })

-const errorTipFlag= ref(0)
+const errorTipFlag = ref(0)

+const equipMoneyInfo = reactive({
+    equipMoney: '',
+    phoneMoney: ''
+})

 const stepVal = ref('0')

@ -188,18 +220,18 @@ const timeLineList = reactive({
    ]
 })

-const driverInfo = reactive({
-    list: [
-        {
-            value: 'Option1',
-            label: 'Option1'
-        },
-        {
-            value: 'Option2',
-            label: 'Option2'
-        }
-    ]
-})
+// const driverInfo = reactive({
+//     list: [
+//         {
+//             value: 'Option1',
+//             label: 'Option1'
+//         },
+//         {
+//             value: 'Option2',
+//             label: 'Option2'
+//         }
+//     ]
+// })
 const submitInfo = reactive({
    driver: '',
    driverPhone: '',
@ -219,19 +251,39 @@ const formConfirmRules = reactive<FormRules<any>>({

 })

-let  fileItem:any=null
+let fileItem: any = null
 const demandConfirmFn = () => {
+    if (!equipMoneyInfo.equipMoney) {
+        return ElMessage({
+            type: 'warning',
+            message: '请输入装备租金'
+        })
+    }
+    if (!equipMoneyInfo.phoneMoney) {
+        return ElMessage({
+            type: 'warning',
+            message: '请输入机手租金'
+        })
+    }
    stepVal.value = '1'
    timeLineList.list[1].done = true
 }
 const rejectCallBack = async (row: any, value: any) => {
    console.log('editCallBack', row, value)
    let params = {
-
+        rejectReason: value.value,
+        orderId: detailsInfo.orderId
+    }
+    const res: any = await apiOrderReject(params)
+    if (res.code == 200) {
+        ElMessage({
+            type: 'success',
+            message: '驳回成功'
+        })
    }
-    const res = await apiOrderReject(params)
 }
-const demandRejectFn = (row: any) => {
+const demandRejectFn = (row = "") => {
+
    ElMessageBoxOpert(
        '驳回原因',
        '填写驳回原因',
@ -251,11 +303,11 @@ const demandRejectFn = (row: any) => {
 }

 const nextFn = () => {
- 
-    if(!fileItem){
-        errorTipFlag.value=2
-     
-    }else{
+
+    if (!fileItem) {
+        errorTipFlag.value = 2
+
+    } else {
        stepVal.value = '2'
    }

@ -263,24 +315,38 @@ const nextFn = () => {
 }
 const detailsInfo: any = reactive({})
 const initApiOrderDetails = async () => {
-    let id = route.query.id||'1'
+    let id = route.query.id || '1'
    const res: any = await apiOrderInfoDetails(id)
    // const res:any =  dataJson
    console.log('res-apiOrderDetails', res)
    Object.assign(detailsInfo, res.data)
+    const deviceInfo = res.data
+    tableInfo.v_equipment_title = deviceInfo.deviceName
+    tableInfo.v_equipment_code = deviceInfo.deviceCode
+    tableInfo.typeName = deviceInfo.typeName
+    tableInfo.v_equipment_group_type = deviceInfo.groupName
+    tableInfo.v_equipment_brand = deviceInfo.deviceBrand
+    tableInfo.v_equipment_size = deviceInfo.deviceSpecification
+    tableInfo.v_equipment_address = deviceInfo.deviceLocation
+    tableInfo.devicePrice = deviceInfo.deviceMonthLeasePrice
+    tableInfo.machinistPrice = deviceInfo.machinistPrice
+    tableInfo.imgUrl = deviceInfo.devicePicUrl
+
 }


-const confirmSendFn =  () => {
+const confirmSendFn = () => {
    if (!ruleFormRef) return
-    ruleFormRef.value.validate(async(valid: any) => {
+    ruleFormRef.value.validate(async (valid: any) => {
        if (valid) {
            let params = {
                orderId: detailsInfo.orderId,
                contractUrl: 'https://hzgyp-prod-1259451974.cos.ap-guangzhou.myqcloud.com/enterprise/serviceAgreement.pdf',//合同地址 写死
                machinistName: submitInfo.driver,//机手姓名
                logisticsPhone: submitInfo.deliverPhone,//物流电话
-                phone: submitInfo.driverPhone//机首电话
+                phone: submitInfo.driverPhone,//机首电话
+                leasePrice: equipMoneyInfo.equipMoney,
+                machinistPrice: equipMoneyInfo.phoneMoney
            }
            const res = await apiUpdateOrderInfo(params)
            console.log("resapiUpdateOrderInfo", res)
@ -303,10 +369,19 @@ const backFn = () => {
    router.go(-1)
 }

-const scuccesCallback =(ev:any)=>{
-    console.log("list0000",ev)
-    fileItem=ev
-    errorTipFlag.value=1
+const scuccesCallback = (ev: any) => {
+    console.log("list0000", ev)
+    fileItem = ev
+    errorTipFlag.value = 1
+}
+
+const getTimeByPoint = (start: any, duration: any) => {
+    return getNewDay(start, duration)
+}
+
+const totalMoneyFn = () => {
+    return Number(equipMoneyInfo.equipMoney) + Number(equipMoneyInfo.phoneMoney) + '元'
+
 }
 onBeforeMount(() => {
    initApiOrderDetails()
@ -350,15 +425,27 @@ onBeforeMount(() => {
    display: flex;
    justify-content: flex-start;
 }
-.error_tip_c{
+
+.error_tip_c {
    color: #ff0000;
 }

+:deep(.equipMoneyClass) {
+    display: flex;
+    justify-content: flex-start;
+    margin-top: 6px;
+
+    .el-input {
+        display: inline-block;
+        width: 160px;
+        padding: 0 12px;
+    }
+
+}
 </style>
 <style>
- .dangerC{
-    background-color: #F56C6C!important;
-    border: #F56C6C     ;
+.dangerC {
+    background-color: #F56C6C !important;
+    border: #F56C6C;
 }
-
 </style>
--- a/src/views/user/orderManagement/orderCom/orderDetails.vue
+++ b/src/views/user/orderManagement/orderCom/orderDetails.vue
@ -14,8 +14,9 @@
            {{ detailsInfo.phone }}
        </el-form-item>
        <el-form-item label="租赁时长" class="table_item">
-            <!-- {{  detailsInfo.}} -->
-            <!-- 暂无 -->
+            <div style="white-space: nowrap;">
+                {{ detailsInfo.planStartTime }}- {{ getTimeByPoint(detailsInfo.planStartTime,detailsInfo.duration)  }}
+            </div>
        </el-form-item>
        <el-form-item label="设备进场地址：" class="table_item">
            {{ detailsInfo.addressId }}
@ -24,7 +25,7 @@
            {{ detailsInfo.realStartTime }}
        </el-form-item>
        <el-form-item label="是否需求机手：" class="table_item">
-            {{ detailsInfo.isMachinist }}
+            {{ detailsInfo.isMachinist == 0 ? '否' : '是' }}
            <!-- 枚举值 待确认-->
        </el-form-item>
        <el-form-item label="详细地址：" class="table_item">
@ -47,8 +48,20 @@
        <orderTable :tableInfo="tableInfo">
            <template v-slot:rentMoney>
                <div>
-                    <span style="color: #f00">{{ tableInfo.money }}</span>
-                    /{{ tableInfo.unit }}
+                    <span>
+                        装备
+                    </span>
+                    <span style="color: #f00">¥
+                        {{ tableInfo.devicePrice }}
+                    </span> /月
+                </div>
+                <div v-if="detailsInfo.isMachinist != 0">
+                    <span>
+                        机手
+                    </span>
+                    <span style="color: #f00">¥ 
+                   {{ tableInfo.machinistPrice }}
+                </span> /月
                </div>
            </template>
        </orderTable>
@ -90,18 +103,20 @@ import { reactive } from 'vue'
 import orderTable from './orderTable.vue'
 import { apiOrderInfoDetails, apiOrderInfoList, apiUpdateOrderInfo } from 'http/api/usercenter/order'
 import { ElMessage } from 'element-plus'
+import {getNewDay} from "utils/time"
 const router = useRouter()
 const route = useRoute()
 const tableInfo = reactive({
-    v_equipment_title: '220E履带挖掘机',
-    v_equipment_code: '88888',
-    v_equipment_group_type: '挖掘机械',
-    v_equipment_brand: '挖掘机',
-    v_equipment_weight: '22吨',
-    v_equipment_volume: '1立方米',
-    v_equipment_address: '广东省广州市',
-    money: '2000',
-    unit: '月',
+    v_equipment_title: '',
+    v_equipment_code: '',
+    typeName: '',
+    v_equipment_group_type: '',
+    v_equipment_brand: '',
+    v_equipment_size: '',
+    v_equipment_volume: '',
+    v_equipment_address: '',
+    devicePrice: '',
+    machinistPrice: '',
    imgUrl: ''
 })
 const stepListOrder: any = reactive({
@ -116,6 +131,18 @@ const initApiOrderDetails = async () => {
    // const res:any =  dataJson
    console.log('res-apiOrderDetails', res)
    Object.assign(detailsInfo, res.data)
+    const deviceInfo = res.data
+    tableInfo.v_equipment_title = deviceInfo.deviceName
+    tableInfo.v_equipment_code = deviceInfo.deviceCode
+    tableInfo.typeName = deviceInfo.typeName
+    tableInfo.v_equipment_group_type = deviceInfo.groupName
+    tableInfo.v_equipment_brand = deviceInfo.deviceBrand
+    tableInfo.v_equipment_size = deviceInfo.deviceSpecification
+    tableInfo.v_equipment_address = deviceInfo.deviceLocation
+    tableInfo.devicePrice = deviceInfo.deviceMonthLeasePrice
+    tableInfo.machinistPrice = deviceInfo.machinistPrice
+    tableInfo.imgUrl = deviceInfo.devicePicUrl
+
 }

 const initApiOrderInfoList = async () => {
@ -181,6 +208,11 @@ const initPage = () => {
    confimFlag.value = route.query.confirm

 }
+
+const getTimeByPoint =(start:any,duration:any)=>{
+   return getNewDay(start,duration)
+}
+
 onBeforeMount(() => {
    initPage()
    initApiOrderDetails()
--- a/src/views/user/orderManagement/orderCom/orderTable.vue
+++ b/src/views/user/orderManagement/orderCom/orderTable.vue
@ -45,13 +45,13 @@
                                    {{ props.tableInfo.v_equipment_brand }}
                                </div>
                            </div>
-                            <div class="item item_sub_out">
+                            <div class="item">
                                <div class="label">
                                    设备规格：
                                </div>
                                <div class="value">
-
-                                    <div class="sub_item">
+                                        {{ props.tableInfo.v_equipment_size }}
+                                    <!-- <div class="sub_item">
                                        <div class="sub_label">
                                            操作重量：
                                        </div>
@ -66,7 +66,7 @@
                                        <div class="sub_value">
                                            {{ props.tableInfo.v_equipment_volume }}
                                        </div>
-                                    </div>
+                                    </div> -->
                                </div>
                            </div>
                            <div class="item">
--- a/src/views/user/orderManagementCz/index.vue
+++ b/src/views/user/orderManagementCz/index.vue
@ -98,24 +98,31 @@
        <el-table-column align="center" prop="orderPhone" label="联系方式" />
        <el-table-column align="center" prop="typeName" label="装备类型" />
        <el-table-column align="center" prop="deviceName" label="装备名称" />
-        <el-table-column align="center" label="订单状态">
-            <template #default="{ row }">
-                <el-tag effect="dark" type="info" v-if="row.orderStatus == 31">待确认</el-tag>
-                <el-tag effect="dark" type="warning" v-if="row.orderStatus == 32">
-                    待合同上传
-                </el-tag>
-                <el-tag effect="dark" type="success" v-if="row.orderStatus == 35">待收货</el-tag>
-                <el-tag effect="dark" v-if="row.orderStatus == 36">进行中</el-tag>
-            </template>
-        </el-table-column>
+        <el-table-column align="center" prop="orderStatus" label="订单状态" />
        <el-table-column align="center" prop="name" label="操作" width="260px">
            <template #default="{ row }">
-                <el-button size="small" type="primary" @click="confirmBtn(row)">确认</el-button>
-                <el-button size="small" type="warning" @click="clickPreviewDetails(row)">
+                <el-button
+                    size="small"
+                    type="primary"
+                    @click="confirmBtn(row)"
+                    v-if="row.orderStatus == 31">
+                    确认
+                </el-button>
+                <el-button
+                    size="small"
+                    type="warning"
+                    @click="clickPreviewDetails(row)"
+                    v-if="row.orderStatus != 31">
                    查看
                </el-button>
-                <el-button size="small" type="danger">删除</el-button>
-                <el-button size="small" type="success" @click="settlementBtn">结算</el-button>
+                <el-button size="small" type="danger" v-if="(row.orderStatus = 39)">删除</el-button>
+                <el-button
+                    size="small"
+                    type="success"
+                    @click="settlementBtn"
+                    v-if="(row.orderStatus = 34)">
+                    结算
+                </el-button>
            </template>
        </el-table-column>
    </el-table>
Author	SHA1	Message	Date
songyang	9b644b01e9	冲突提交	2023-12-08 17:41:16 +08:00
13218645326	61a041c474	页面优化	2023-12-08 17:37:49 +08:00
13218645326	c00958a1f8	合并代码	2023-12-08 17:36:39 +08:00
13218645326	eb07ba7eab	函数优化	2023-12-08 17:33:41 +08:00
13218645326	d9cd44e4a9	状态值修改	2023-12-08 17:31:40 +08:00
wlikett	0e42dbf6c1	打包前修改	2023-12-08 17:09:20 +08:00
wlikett	211c6eed0e	Merge branch 'main' into dev-wangyiming	2023-12-08 17:08:31 +08:00
wlikett	56f7748f3b	打包前修改	2023-12-08 17:04:34 +08:00
13218645326	ab3d43f629	接口调用，打包配置	2023-12-08 17:03:26 +08:00