更新

src/components/orderInfo/index.vue

@@ -260,49 +260,48 @@
             { label: '联系方式', value: data?.customerTel }
         ]
 
-        //经办人信息 
-        agentInfoList = [
-            { label: '经办人人像面', value: data?.agentPosImgUrl, type: 'image', index: 2 },
-            { label: '经办人国徽面', value: data?.agentNegImgUrl, type: 'image', index: 3 },
-            { label: '经办人姓名', value: data?.agentName },
-            { label: '经办人性别', value: data?.agentGender },
-            { label: '经办人身份证号', value: data?.agentIdnum },
-            { label: '经办人证件有效期', value: data?.agentIdVld },
-            { label: '经办人地址', value: data?.agentAddress },
-            { label: '经办人联系方式', value: data?.agentTel }
+       //经办人信息 
+       agentInfoList = [
+            { label: '经办人人像面', value: data?.orderInfoExt?.agentPosImgUrl, type: 'image', index: 2 },
+            { label: '经办人国徽面', value: data?.orderInfoExt?.agentNegImgUrl, type: 'image', index: 3 },
+            { label: '经办人姓名', value: data?.orderInfoExt?.agentName },
+            { label: '经办人性别', value: data?.orderInfoExt?.agentGender },
+            { label: '经办人身份证号', value: data?.orderInfoExt?.agentIdNum },
+            { label: '经办人证件有效期', value: data?.orderInfoExt?.agentIdVld },
+            { label: '经办人地址', value: data?.orderInfoExt?.agentAddress },
+            { label: '经办人联系方式', value: data?.orderInfoExt?.agentTel }
         ]
 
         //单位信息
         unitInformationList = [
-            { label: '营业执照正面照', value: data?.positiveImageUrl, type: 'image', index: 0 },
+            { label: '营业执照正面照', value: data?.orderInfoExt?.positiveImageUrl, type: 'image', index: 0 },
             // { label: '营业执照反面', value: data?.negativeImageUrl, type: 'image', index: 1 },
-            { label: '公司名称', value: data?.customerName },
-            { label: '证件号', value: data?.customerIdnum },
-            { label: '经办人姓名', value: data?.agentName },
-            { label: '经办人身份证号', value: data?.agentIdNum },
-            { label: '经办人联系方式', value: data?.agentTel },
-            { label: '委托书', value: data?.proxyUrl, type: 'image' },
+            { label: '公司名称', value: data?.orderInfoExt?.address },
+            { label: '证件号', value: data?.orderInfoExt?.customerIdnum },
+            { label: '经办人姓名', value: data?.orderInfoExt?.agentName },
+            { label: '经办人身份证号', value: data?.orderInfoExt?.agentIdNum },
+            { label: '经办人联系方式', value: data?.orderInfoExt?.agentTel },
+            { label: '委托书', value: data?.orderInfoExt?.proxyUrl, type: 'image' },
         ]
-
         //车辆信息
         vehicleInfoList = [
             { label: '车牌号', value: data?.vehiclePlate },
             { label: '车牌颜色', value: getDictLabel(VEHICLE_COLOR_TYPE, data?.vehiclePlateColor) },
             { label: '车辆类型', value: getDictLabel(vehicleTypes, data?.vehicleType) },
             { label: '客货类型', value: getDictLabel(VEHICLE_MODEL_TYPE, data?.vehicleClass) },
-            { label: '车辆品牌', value: data?.vehicleModel },
+            { label: '车辆品牌', value: data?.orderInfoExt?.vehicleModel },
             { label: '所有人', value: data?.ownerName },
-            { label: '行驶证主页', value: data?.vehPosImgUrl, type: 'image', index: 4 },
-            { label: '行驶证副页', value: data?.vehNegImgUrl, type: 'image', index: 5 },
-            { label: '车身45°照', value: data?.vehBodyUrl, type: 'image', index: 6 },
-            { label: '经营范围', value: getDictLabel(jyfwList, data?.useUserType) },
-            { label: '车辆识别代号', value: data?.vehicleVin },
-            { label: '发动机号码', value: data?.vehicleEngineNum },
+            { label: '行驶证主页', value: data?.orderInfoExt?.vehPosImgUrl, type: 'image', index: 4 },
+            { label: '行驶证副页', value: data?.orderInfoExt?.vehNegImgUrl, type: 'image', index: 5 },
+            { label: '车身45°照', value: data?.orderInfoExt?.vehBodyUrl, type: 'image', index: 6 },
+            { label: '经营范围', value: getDictLabel(jyfwList, data?.orderInfoExt?.useUserType) },
+            { label: '车辆识别代号', value: data?.orderInfoExt?.vehicleVin },
+            { label: '发动机号码', value: data?.orderInfoExt?.vehicleEngineNum },
             { label: '发证日期', value: data?.issueDate },
-            { label: '核定载人数', value: data?.vehicleApprovedCount ? data?.vehicleApprovedCount + ' 人' : null },
-            { label: '整备质量', value: data?.vehicleMaintenaceMass ? data?.vehicleMaintenaceMass + ' kg' : null },
-            { label: '外廓尺寸', value: data?.vehicleDimensions },
-            { label: '总质量', value: data?.vehicleTotalMass ? data?.vehicleTotalMass + ' kg' : null },
+            { label: '核定载人数', value: data?.orderInfoExt?.vehicleApprovedCount ? data?.orderInfoExt?.vehicleApprovedCount + ' 人' : null },
+            { label: '整备质量', value: data?.orderInfoExt?.vehicleMaintenaceMass ? data?.orderInfoExt?.vehicleMaintenaceMass + ' kg' : null },
+            { label: '外廓尺寸', value: data?.orderInfoExt?.vehicleDimensions },
+            { label: '总质量', value: data?.orderInfoExt?.vehicleTotalMass ? data?.orderInfoExt?.vehicleTotalMass + ' kg' : null },
         ]
         if (data?.type == '2') vehicleInfoList.push({ label: '牵引车标识', value: data?.tractorSign == 1 ? '是' : (data?.tractorSign == 0 ? '否' : '') },
             { label: '道路运输许可证', value: data?.roadTransportPermitPicUrl, type: 'image' })

src/utils/dataUtil.js

@@ -22,11 +22,11 @@ export function compareObjects(obj1, obj2) {
       }
     }
     // 补充obj1没有字段
-    for (let key in obj2) {
-      if (!obj1.hasOwnProperty(key)) {
-        result[key] = obj2[key];
-      }
-    }
+    // for (let key in obj2) {
+    //   if (!obj1.hasOwnProperty(key)) {
+    //     result[key] = obj2[key];
+    //   }
+    // }
   }
   return result;
 }

src/views/onlineBusinessHall/automobileSeroice/afterSaleOperation/index.vue

@@ -19,14 +19,35 @@
                 </el-button>
                 <el-button style="margin: 10px 5px;"
                     v-if="(scope.row.cardStatus == '1') && IsPermission(route, 'LOSS_REPROT') && channelOperationAuthority(scope.row.agencyId)"
-                    type="success" size="small" @click="showData(scope.row, 1)">
-                    挂失
+                    type="success" size="small" @click="showData(scope.row, 1, 1)">
+                    卡挂失
+                </el-button>
+                <el-button style="margin: 10px 5px;"
+                    v-if="(scope.row.obuStatus == '1') && IsPermission(route, 'LOSS_REPROT') && channelOperationAuthority(scope.row.agencyId)"
+                    type="success" size="small" @click="showData(scope.row, 1, 2)">
+                    签挂失
+                </el-button>
+                <el-button style="margin: 10px 5px;"
+                    v-if="(scope.row.cardStatus == '1' && scope.row.obuStatus == '1') && IsPermission(route, 'LOSS_REPROT') && channelOperationAuthority(scope.row.agencyId)"
+                    type="success" size="small" @click="showData(scope.row, 1, 3)">
+                    卡签挂失
                 </el-button>
                 <el-button style="margin: 10px 5px;"
                     v-if="(scope.row.cardStatus == '6') && IsPermission(route, 'CANCEL_REPORT_LOSS') && channelOperationAuthority(scope.row.agencyId)"
-                    type="success" size="small" @click="showData(scope.row, 2)">
-                    解除挂失
+                    type="success" size="small" @click="showData(scope.row, 2, 4)">
+                    卡解除挂失
                 </el-button>
+                <el-button style="margin: 10px 5px;"
+                    v-if="(scope.row.obuStatus == '6') && IsPermission(route, 'CANCEL_REPORT_LOSS') && channelOperationAuthority(scope.row.agencyId)"
+                    type="success" size="small" @click="showData(scope.row, 2, 5)">
+                    签解除挂失
+                </el-button>
+                <el-button style="margin: 10px 5px;"
+                    v-if="(scope.row.cardStatus == '6' && scope.row.obuStatus == '6') && IsPermission(route, 'CANCEL_REPORT_LOSS') && channelOperationAuthority(scope.row.agencyId)"
+                    type="success" size="small" @click="showData(scope.row, 2, 6)">
+                    卡签解除挂失
+                </el-button>
+
                 <el-button style="margin: 10px 5px;"
                     v-if="(scope.row.cardStatus == '1' && scope.row.obuStatus == '1') && IsPermission(route, 'LOGOUT') && channelOperationAuthority(scope.row.agencyId)"
                     type="success" size="small" @click="showData(scope.row, 3)">
@@ -220,17 +241,19 @@
     }
 
     //操作栏
-    function showData(row, index) {
+    function showData(row, index, type?) {
         let ifCode = ''
         let mssage = ''
         if (index == '1') { //挂失
             ifCode = 'iaw/api/afterSale/cardObuLoss/loss';
             row.operation = 3
-            mssage = '卡签挂失'
+            row.businessType = type
+            mssage = '挂失'
         } else if (index == '2') { //解挂
             ifCode = 'iaw/api/afterSale/cardObuLoss/loss';
             row.operation = 6
-            mssage = '卡签解挂'
+            row.businessType = type
+            mssage = '解挂'
         } else if (index == '3') { //注销
             writeOff.value = true
             writeOffData.value = Object.assign(JSON.parse(JSON.stringify(row)), JSON.parse(JSON.stringify(writeOffDataObj)));
@@ -351,6 +374,7 @@
                 params[key] = searchFormList[key]
             }
         }
+        // TODO 待重新换接口
         BaseService.post('/iaw/issue/order/queryPage', params).then((res: any) => {
             if (res && res.statusCode === 0) {
                 //数据转换

src/views/onlineBusinessHall/automobileSeroice/businessAudit/index.vue

@@ -57,6 +57,9 @@
           " type="warning" size="small" @click="handleAudit(scope.row)">
           <span style="font-family: `楷体`">审核</span>
         </el-button>
+        <el-button style="margin: 10px 5px;" v-if="(scope.row.orderType == 'EXCHANGE_CARD' || scope.row.orderType == 'EXCHANGE_OBU' || scope.row.orderType == 'EXCHANGE_ALL') && scope.row.orderStep == 'WAIT_DELIVER'" type="primary" size="small" @click="fahuo(scope.row)">
+          订单发货
+        </el-button>
         <el-button :loading="scope.row.btnLoading"
           v-if="scope.row.orderType === 'SIGNOUT' && scope.row.status === 'COMPLETE' && channelOperationAuthority(scope.row.agencyId)"
           type="primary" size="small" @click="licensePlatevVerification(scope.row)">
@@ -104,6 +107,57 @@
         </el-button>
       </template>
     </el-dialog>
+    <!-- 订单发货 -->
+    <el-dialog v-model="deliverGoods" width="40%" title="订单发货" @close="deliverClose">
+      <el-form ref="form" :rules="{
+    cardId: [{ required: false, message: '不能为空且卡号为20位', trigger: 'blur', min: 20, max: 20 }],
+    obuId: [{ required: false, message: '不能为空且OBU号为16位', trigger: 'blur', min: 16, max: 16 }],
+    trackingCompany: [{ required: true, message: '不能为空', trigger: 'blur' }],
+    trackingNumber: [{ required: true, message: '不能为空', trigger: 'blur' }],
+  }" :model="sizeForm" label-width="120px">
+        <!-- <el-form-item label="收件人姓名">
+          <el-input v-trim clearable disabled v-model="sizeForm.orderInfoExt.consignee"
+            placeholder="请输入收件人姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="收件人电话">
+          <el-input v-trim clearable disabled v-model="sizeForm.orderInfoExt.consigneeTel"
+            placeholder="请输入收件人电话"></el-input>
+        </el-form-item>
+        <el-form-item label="收货地区">
+          <el-input v-trim clearable disabled v-model="sizeForm.orderInfoExt.region" placeholder="请输入收货地址"></el-input>
+        </el-form-item>
+        <el-form-item label="详细地址">
+          <el-input v-trim clearable disabled v-model="sizeForm.orderInfoExt.address" placeholder="请输入详细地址"></el-input>
+        </el-form-item>
+        <el-form-item label="邮政编码">
+          <el-input v-trim clearable disabled v-model="sizeForm.orderInfoExt.postalCode"
+            placeholder="请输入邮政编码"></el-input>
+        </el-form-item> -->
+        <el-form-item label="卡号" prop="cardId">
+          <el-input v-trim clearable :disabled="cardIdDisabled" type="number"
+            oninput="if(value.length>20)value=value.slice(0,20)" v-model="sizeForm.cardId" placeholder="卡号"></el-input>
+        </el-form-item>
+        <el-form-item label="OBU号" prop="obuId">
+          <el-input v-trim clearable :disabled="obuIdDisabled" type="number"
+            oninput="if(value.length>16)value=value.slice(0,16)" v-model="sizeForm.obuId" placeholder="OBU号"></el-input>
+        </el-form-item>
+        <el-form-item label="物流公司" prop="trackingCompany">
+          <el-select @change="courierCompanyChange" clearable v-model="sizeForm.trackingCompany" placeholder="请选择物流公司">
+            <el-option :label="item.label" :key="item.value" :value="item.value"
+              v-for="item in EXPRESS_DELIVERY_COMPANY" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物流单号" prop="trackingNumber">
+          <el-input v-trim clearable maxlength="60" :disabled="trackingNumberDisabled" v-model="trackingNumber"
+            placeholder="物流单号"></el-input>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <el-button @click="deliverGoods = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm(form)">确 定</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -206,6 +260,9 @@
   const NATURE_VEHICLE_USE = computed(() => {
     return $storeinitData.state.dictData["NATURE_VEHICLE_USE"] || [];
   }); // 车辆签约
+  const EXPRESS_DELIVERY_COMPANY = computed(() => {
+    return $storeinitData.state.dictData['EXPRESS_DELIVERY_COMPANY'] || []
+  })
 
   const OFF_SITE_AFTER_SALES_ORDER_TYPE = computed(() => {
     return $storeinitData.state.dictData["OFF_SITE_AFTER_SALES_ORDER_TYPE"] || [];
@@ -707,7 +764,7 @@
     },
     {
       label: '物流公司',
-      prop: 'courierCompany',
+      prop: 'trackingCompany',
       form: {
         width: '45%',
         formLabelWidth: formLabelWidth,
@@ -961,7 +1018,7 @@
     },
     {
       label: '物流公司',
-      prop: 'courierCompany',
+      prop: 'trackingCompany',
       form: {
         width: '45%',
         formLabelWidth: formLabelWidth,
@@ -1836,7 +1893,7 @@
     },
     {
       label: '快递公司',
-      prop: 'courierCompany',
+      prop: 'trackingCompany',
       form: {
         width: '45%',
         formLabelWidth: formLabelWidth,
@@ -2151,7 +2208,76 @@
       }
     })
   }
-
+    // 订单发货*****************************
+    let form = ref()
+    const deliverGoods = ref()
+    const cardIdDisabled = ref(false)
+    const obuIdDisabled = ref(false)
+    function deliverClose() {
+        if (form.value) form.value.resetFields()
+    }
+    const trackingNumberDisabled = ref(false)
+    const trackingNumber = ref()
+    function courierCompanyChange(value) {
+    if (value == '99') {
+      trackingNumber.value = '000000'
+      trackingNumberDisabled.value = true
+    } else {
+      trackingNumber.value = ''
+      trackingNumberDisabled.value = false
+    }
+    sizeForm.value.trackingNumber = trackingNumber.value
+  }
+    let sizeForm: any = ref({ orderInfoExt: {} }) //发货对象
+    function fahuo(data) {
+    //订单发货
+      //数据内容赋值（先查详情）
+      sizeForm.value = { orderInfoExt: {} }
+      sizeForm.value.id = data.id
+      // BaseService.postN('/iaw/issue/order/orderDetailQuery', { id: data.id }).then((res: any) => {
+      //   if (res && res.code === 0) {
+          // const data = res.data.data
+          // cardIdDisabled.value = data.cardId ? true : false
+          // obuIdDisabled.value = data.obuId ? true : false
+          // sizeForm.value = Object.assign(sizeForm.value, data)
+          // sizeForm.value.trackingCompany = ''
+          // sizeForm.value.trackingNumber = ''
+          // sizeForm.value.orderId = data.orderNo
+          // trackingNumber.value = ''
+          deliverGoods.value = true
+      //   } else {
+      //     ElMessage.error(res.message)
+      //   }
+      // })
+  }
+  let timer1: any = null
+  function submitForm(formEl) {
+    if (timer1) return
+    timer1 = setTimeout(() => {
+      sizeForm.value.trackingNumber = trackingNumber.value
+      formEl.validate((valid: any, fields: any) => {
+        if (valid) {
+          delete sizeForm.value.type
+          // sizeForm.value.opId = openId
+          console.log(sizeForm.value)
+          //订单发货
+          BaseService.postN('/iaw/api/afterSale/order/orderDeliverGoods', sizeForm.value).then((res: any) => {
+            if (res && res.code === 0) {
+              deliverGoods.value = false
+              ElMessage.success(res.message)
+              getList() //页面数据刷新
+            } else {
+              ElMessage.error(res.message)
+            }
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+      timer1 = null
+    }, 1000)
+  }
   // 审核
   const check = ref()
   const checkDialog = ref()

src/views/onlineBusinessHall/orderManagement/index.vue

@@ -70,7 +70,7 @@
       <template #operation="{ scope }">
         <!-- 审核转移到订单领取审核 -->
         <el-button style="margin: 10px 5px;"
-          v-if="'6' == scope.row.orderStep && scope.row.orderStatus != 'SEAL' && IsPermission(route, 'AUDIT_LIST') && channelOperationAuthority(scope.row.agencyId)"
+          v-if="'6' == scope.row.orderStep && scope.row.orderStatus != 99999 && IsPermission(route, 'AUDIT_LIST') && channelOperationAuthority(scope.row.agencyId)"
           type="success" size="small" @click="audit(scope.$index, scope.row, true)">
           审核
         </el-button>
@@ -82,22 +82,22 @@
       " type="danger" size="small" @click="showData(scope.row, 1)">
           取消订单
         </el-button>
-        <el-button style="margin: 10px 5px;" v-if="scope.row.orderStep == 8 && scope.row.orderStatus == 'NORMAL' &&
+        <el-button style="margin: 10px 5px;" v-if="scope.row.orderStep == 8 && scope.row.orderStatus == 0 &&
       IsPermission(route, 'DELIVER_GOODS_LIST') && channelOperationAuthority(scope.row.agencyId)
       " type="primary" size="small" @click="showData(scope.row, 3)">
           订单发货
         </el-button>
-        <el-button style="margin: 10px 5px;" v-if="(scope.row.orderStep == 9 || scope.row.orderStep == 10) && scope.row.orderStatus != 'SEAL' &&
+        <el-button style="margin: 10px 5px;" v-if="(scope.row.orderStep == 9 || scope.row.orderStep == 10) && scope.row.orderStatus != 99999 &&
       IsPermission(route, 'RETURN_GOODS_LIST') && channelOperationAuthority(scope.row.agencyId)
       " type="danger" size="small" @click="showData(scope.row, 4)">
           退货
         </el-button>
-        <el-button style="margin: 10px 5px;" v-if="(scope.row.orderStep == 9 || scope.row.orderStep == 10) && scope.row.orderStatus != 'SEAL' &&
+        <el-button style="margin: 10px 5px;" v-if="(scope.row.orderStep == 9 || scope.row.orderStep == 10) && scope.row.orderStatus != 99999 &&
       IsPermission(route, 'CHANGE_GOODS_LIST') && channelOperationAuthority(scope.row.agencyId)
       " type="danger" size="small" @click="showData(scope.row, 5)">
           换货
         </el-button>
-        <el-button style="margin: 10px 5px;" v-if="(scope.row.orderStep == 32 || scope.row.orderStep == 34) && scope.row.orderStatus != 'SEAL' && channelOperationAuthority(scope.row.agencyId)
+        <el-button style="margin: 10px 5px;" v-if="(scope.row.orderStep == 32 || scope.row.orderStep == 34) && scope.row.orderStatus != 99999 && channelOperationAuthority(scope.row.agencyId)
       " type="primary" size="small" @click="showData(scope.row, 8)">
           确认收货
         </el-button>
@@ -110,10 +110,10 @@
           申办记录
         </el-button>
         <!-- <el-button
-          v-if="((scope.row.orderStep == 13) && scope.row.orderStatus != 'SEAL') && IsPermission(route, 'COMPLETE_RETURN')"
+          v-if="((scope.row.orderStep == 13) && scope.row.orderStatus != 99999) && IsPermission(route, 'COMPLETE_RETURN')"
           size="small" type="success" @click="audit(scope.$index, scope.row, 0)">完成退货</el-button> -->
         <el-popover
-          v-if="(scope.row.orderStep == 14 && scope.row.orderStatus != 'SEAL' && scope.row.updateTime && -timesDiff((scope.row.updateTime).replaceAll('T', ' ')).days <= 30) && IsPermission(route, 'REUSE_LIST') && channelOperationAuthority(scope.row.agencyId)"
+          v-if="(scope.row.orderStep == 14 && scope.row.orderStatus != 99999 && scope.row.updateTime && -timesDiff((scope.row.updateTime).replaceAll('T', ' ')).days <= 30) && IsPermission(route, 'REUSE_LIST') && channelOperationAuthority(scope.row.agencyId)"
           style="margin: 10px 5px;" trigger="click" :visible="scope.row.visible2" placement="top" :width="160">
           <div>
             <div style="margin-bottom: 10px">
@@ -130,7 +130,7 @@
           </template>
         </el-popover>
         <el-popover
-          v-if="((scope.row.orderStep == 10 || scope.row.orderStep == 9) && scope.row.orderStatus != 'SEAL' && scope.row.insertTime && -timesDiff((scope.row.insertTime).replaceAll('T', ' ')).days > 30) && IsPermission(route, 'CLOSE_ORDER_LIST') && channelOperationAuthority(scope.row.agencyId)"
+          v-if="((scope.row.orderStep == 10 || scope.row.orderStep == 9) && scope.row.orderStatus != 99999 && scope.row.insertTime && -timesDiff((scope.row.insertTime).replaceAll('T', ' ')).days > 30) && IsPermission(route, 'CLOSE_ORDER_LIST') && channelOperationAuthority(scope.row.agencyId)"
           style="margin: 10px 5px;" trigger="click" :visible="scope.row.visible3" placement="top" :width="160">
           <div>
             <div style="margin-bottom: 10px">
@@ -595,6 +595,7 @@
     }
     return selectedLabel
   }
+
   // 物流单号
   const trackingNumberDisabled = ref(false)
   const trackingNumber = ref()

src/views/onlineBusinessHall/orderManagement/orderReview/orderInfo.vue

@@ -158,7 +158,7 @@
         return $storeinitData.state.dictData['NEW_CSMSN_APPLY_REASON'] || []
     })
 
-
+ 
     init(data.value)
     function init(data) {
         if (data && data.userType) IsUnit.value = data.userType != 'PERSONAL_USER'
@@ -230,26 +230,26 @@
 
         //经办人信息 
         agentInfoList = [
-            { label: '经办人人像面', value: data?.agentPosImgUrl, type: 'image', index: 2 },
-            { label: '经办人国徽面', value: data?.agentNegImgUrl, type: 'image', index: 3 },
-            { label: '经办人姓名', value: data?.agentName },
-            { label: '经办人性别', value: data?.agentGender },
-            { label: '经办人身份证号', value: data?.agentIdNum },
-            { label: '经办人证件有效期', value: data?.agentIdVld },
-            { label: '经办人地址', value: data?.agentAddress },
-            { label: '经办人联系方式', value: data?.agentTel }
+            { label: '经办人人像面', value: data?.orderInfoExt?.agentPosImgUrl, type: 'image', index: 2 },
+            { label: '经办人国徽面', value: data?.orderInfoExt?.agentNegImgUrl, type: 'image', index: 3 },
+            { label: '经办人姓名', value: data?.orderInfoExt?.agentName },
+            { label: '经办人性别', value: data?.orderInfoExt?.agentGender },
+            { label: '经办人身份证号', value: data?.orderInfoExt?.agentIdNum },
+            { label: '经办人证件有效期', value: data?.orderInfoExt?.agentIdVld },
+            { label: '经办人地址', value: data?.orderInfoExt?.agentAddress },
+            { label: '经办人联系方式', value: data?.orderInfoExt?.agentTel }
         ]
 
         //单位信息
         unitInformationList = [
-            { label: '营业执照正面照', value: data?.positiveImageUrl, type: 'image', index: 0 },
+            { label: '营业执照正面照', value: data?.orderInfoExt?.positiveImageUrl, type: 'image', index: 0 },
             // { label: '营业执照反面', value: data?.negativeImageUrl, type: 'image', index: 1 },
-            { label: '公司名称', value: data?.address },
-            { label: '证件号', value: data?.customerIdnum },
-            { label: '经办人姓名', value: data?.agentName },
-            { label: '经办人身份证号', value: data?.agentIdNum },
-            { label: '经办人联系方式', value: data?.agentTel },
-            { label: '委托书', value: data?.proxyUrl, type: 'image' },
+            { label: '公司名称', value: data?.orderInfoExt?.address },
+            { label: '证件号', value: data?.orderInfoExt?.customerIdnum },
+            { label: '经办人姓名', value: data?.orderInfoExt?.agentName },
+            { label: '经办人身份证号', value: data?.orderInfoExt?.agentIdNum },
+            { label: '经办人联系方式', value: data?.orderInfoExt?.agentTel },
+            { label: '委托书', value: data?.orderInfoExt?.proxyUrl, type: 'image' },
         ]
 
         //车辆信息
@@ -258,19 +258,19 @@
             { label: '车牌颜色', value: getDictLabel(VEHICLE_COLOR_TYPE, data?.vehiclePlateColor) },
             { label: '车辆类型', value: getDictLabel(vehicleTypes, data?.vehicleType) },
             { label: '客货类型', value: getDictLabel(VEHICLE_MODEL_TYPE, data?.vehicleClass) },
-            { label: '车辆品牌', value: data?.vehicleModel },
+            { label: '车辆品牌', value: data?.orderInfoExt?.vehicleModel },
             { label: '所有人', value: data?.ownerName },
-            { label: '行驶证主页', value: data?.vehPosImgUrl, type: 'image', index: 4 },
-            { label: '行驶证副页', value: data?.vehNegImgUrl, type: 'image', index: 5 },
-            { label: '车身45°照', value: data?.vehBodyUrl, type: 'image', index: 6 },
-            // { label: '使用性质', value: data?.function },
-            { label: '车辆识别代号', value: data?.vehicleVin },
-            { label: '发动机号码', value: data?.vehicleEngineNum },
+            { label: '行驶证主页', value: data?.orderInfoExt?.vehPosImgUrl, type: 'image', index: 4 },
+            { label: '行驶证副页', value: data?.orderInfoExt?.vehNegImgUrl, type: 'image', index: 5 },
+            { label: '车身45°照', value: data?.orderInfoExt?.vehBodyUrl, type: 'image', index: 6 },
+            { label: '经营范围', value: getDictLabel(jyfwList, data?.orderInfoExt?.useUserType) },
+            { label: '车辆识别代号', value: data?.orderInfoExt?.vehicleVin },
+            { label: '发动机号码', value: data?.orderInfoExt?.vehicleEngineNum },
             { label: '发证日期', value: data?.issueDate },
-            { label: '核定载人数', value: data?.vehicleApprovedCount ? data?.vehicleApprovedCount + ' 人' : null },
-            { label: '整备质量', value: data?.vehicleMaintenaceMass ? data?.vehicleMaintenaceMass + ' kg' : null },
-            { label: '外廓尺寸', value: data?.vehicleDimensions },
-            { label: '总质量', value: data?.vehicleTotalMass ? data?.vehicleTotalMass + ' kg' : null },
+            { label: '核定载人数', value: data?.orderInfoExt?.vehicleApprovedCount ? data?.orderInfoExt?.vehicleApprovedCount + ' 人' : null },
+            { label: '整备质量', value: data?.orderInfoExt?.vehicleMaintenaceMass ? data?.orderInfoExt?.vehicleMaintenaceMass + ' kg' : null },
+            { label: '外廓尺寸', value: data?.orderInfoExt?.vehicleDimensions },
+            { label: '总质量', value: data?.orderInfoExt?.vehicleTotalMass ? data?.orderInfoExt?.vehicleTotalMass + ' kg' : null },
         ]
         if (data?.type == '2') vehicleInfoList.push({ label: '牵引车标识', value: data?.tractorSign == 1 ? '是' : (data?.tractorSign == 0 ? '否' : '') },
             { label: '道路运输许可证', value: data?.roadTransportPermitPicUrl, type: 'image' })