订单审核&订单查询

src/components/orderInfo/index.vue

@@ -153,18 +153,18 @@
     })
     //订单状态
     const ORDER_STATUS = computed(() => {
-        return $storeinitData.state.dictData['ORDER_STATUS'] || []
+        return $storeinitData.state.dictData['ISSUE_ORDER_STATUS'] || []
     })
     //订单阶段
     const ORDER_STAGE_TYPE = computed(() => {
-        return $storeinitData.state.dictData['ORDER_STAGE_TYPE'] || []
+        return $storeinitData.state.dictData['ISSUE_ORDER_STEP'] || []
     })
     //办理模式
     const PATTERN_TYPE = computed(() => {
         return $storeinitData.state.dictData['PATTERN_TYPE'] || []
     })
     const SYSTEM_SORT = computed(() => {
-        return $storeinitData.state.dictData['SYSTEM_SORT'] || []
+        return $storeinitData.state.dictData['SOURCE_TYPE'] || []
     })
     const ORDER_FEE = computed(() => {
         return $storeinitData.state.dictData['ORDER_FEE'] || []
@@ -174,7 +174,7 @@
         return $storeinitData.state.dictData['PAYMENT_STATE'] || []
     })
     const VEHICLE_MODEL_TYPE = computed(() => {
-        return $storeinitData.state.dictData['VEHICLE_MODEL_TYPE'] || []
+        return $storeinitData.state.dictData['VAN_TYPE'] || []
     })
 
     const NEW_CSMSN_APPLY_REASON = computed(() => {
@@ -209,35 +209,35 @@
         // if (!data) return
         //订单基础信息
         orderList = [
-            { label: '单号', value: data?.orderNo },
-            { label: '订单车牌号', value: data?.vehiclePlate },
-            { label: '车牌颜色', value: getDictLabel(VEHICLE_COLOR_TYPE, data?.vehiclePlateColor) },
-            { label: '(新)卡号', value: data?.cardId },
-            { label: '(新)签号', value: data?.obuId },
-            { label: '用户类型', value: data?.userType === 'PERSONAL_USER' ? '个人用户' : '单位用户' },
-            { label: '系统来源', value: data?.isMigrateData == '0' ? '新系统订单' : '老系统订单' },
+            { label: '单号', value: data.orderInfo?.orderNo },
+            { label: '订单车牌号', value: data.orderInfo?.vehiclePlate },
+            { label: '车牌颜色', value: getDictLabel(VEHICLE_COLOR_TYPE, data.orderInfo?.vehiclePlateColor) },
+            { label: '(新)卡号', value: data.orderInfo?.cardId },
+            { label: '(新)签号', value: data.orderInfo?.obuId },
+            { label: '用户类型', value: data.orderInfo?.userType === 'PERSONAL_USER' ? '个人用户' : '单位用户' },
+            { label: '系统来源', value: data.orderInfo?.isMigrateData == '0' ? '新系统订单' : '老系统订单' },
             // { label: '订单类型', value: getDictLabel(ORDER_TYPE, data?.orderType) },
-            { label: '订单状态', value: getDictLabel(ORDER_STATUS, data?.orderStatus) },
-            { label: '订单来源', value: getDictLabel(SYSTEM_SORT, data?.orderSource) },
-            { label: '办理方式', value: getDictLabel(PATTERN_TYPE, data?.promotionModes) },
-            { label: '订单阶段', value: getDictLabel(ORDER_STAGE_TYPE, data?.orderStep) },
-            { label: '办理渠道', value: data?.agencyName },
-            { label: '办理网点', value: data?.channelName },
-            { label: '员工姓名', value: data?.staffName },
+            { label: '订单状态', value: getDictLabel(ORDER_STATUS, data.orderInfo?.orderStatus) },
+            { label: '订单来源', value: getDictLabel(SYSTEM_SORT, data.orderInfo?.orderSource) },
+            { label: '办理方式', value: getDictLabel(PATTERN_TYPE, data.orderInfo?.promotionModes) },
+            { label: '订单阶段', value: getDictLabel(ORDER_STAGE_TYPE, data.orderInfo?.orderStep) },
+            { label: '办理渠道', value: data.orderInfo?.agencyName },
+            { label: '办理网点', value: data.orderInfo?.channelName },
+            { label: '员工姓名', value: data.orderInfo?.staffName },
         ]
         if (data?.reason) orderList.push({ label: '推送订单失败原因', value: data?.reason })
         if (data?.auditFailureCase) orderList.push({ label: '审核失败原因(老系统)', value: data?.auditFailureCase })
 
         machineAudit = [
-            { label: '机审不通过原因', value: data?.orderInfoExt?.auditReason },
+            { label: '机审不通过原因', value: data?.auditMsg },
         ]
 
         //产品信息
         productList = [
-            { label: '产品名称', value: data?.productName },
-            { label: '权益名称', value: data?.equityName },
-            { label: '权益信息', value: data?.equityIsActivate },
-            { label: '领取时间', value: data?.receiveTime },
+            { label: '产品名称', value: data.productInfo?.productName },
+            { label: '权益名称', value: data.productInfo?.equityName },
+            { label: '权益信息', value: data.productInfo?.equityMsg },
+            { label: '领取时间', value: data.productInfo?.getTime },
             // { label: '协议列表', othervalue: true },
             // { label: '付款时间', value: data?.test1 },
             // { label: '办理费', value: handleAmount(data?.releaseProduct?.suggestedSellingPrice) ? handleAmount(data?.releaseProduct?.suggestedSellingPrice) + ' 元' : null },
@@ -263,59 +263,59 @@
             // { label: '是否本人车辆', value: data?.test1 },
             { label: '身份证人像面', value: data?.orderInfoExt?.customerPositiveImageUrl, type: 'image', index: 0 },
             { label: '身份证国徽面', value: data?.orderInfoExt?.customerNegativeImageUrl, type: 'image', index: 1 },
-            { label: '姓名', value: data?.customerName },
+            { label: '姓名', value: data.orderInfoExt?.customerName },
             // { label: '性别', value: data?.customerGender },
-            { label: '身份证号', value: data?.customerIdNum },
-            { label: '证件有效期', value: data?.customerIdVld ? moment(data?.customerIdVld).format('YYYY-MM-DD') : '---' },
-            { label: '地址', value: data?.orderInfoExt?.customerAddress },
-            { label: '联系方式', value: data?.customerTel }
+            { label: '身份证号', value: data.orderInfoExt?.customerIdNum },
+            { label: '证件有效期', value: data.orderInfoExt?.customerIdVld ? moment(data.orderInfoExt?.customerIdVld).format('YYYY-MM-DD') : '---' },
+            { label: '地址', value: data.orderInfoExt?.customerAddress },
+            { label: '联系方式', value: data.orderInfoExt?.customerTel }
         ]
 
        //经办人信息 
        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 ? moment(data?.orderInfoExt?.agentIdVld).format('YYYY-MM-DD') : '' },
-            { label: '经办人地址', value: data?.orderInfoExt?.agentAddress },
-            { label: '经办人联系方式', value: data?.orderInfoExt?.agentTel }
+            { label: '经办人人像面', value: data.agentInfo?.agentPosImgUrl, type: 'image', index: 2 },
+            { label: '经办人国徽面', value: data.agentInfo?.agentNegImgUrl, type: 'image', index: 3 },
+            { label: '经办人姓名', value: data.agentInfo?.agentName },
+            { label: '经办人性别', value: data.agentInfo?.agentGender },
+            { label: '经办人身份证号', value: data.agentInfo?.agentIdNum },
+            { label: '经办人证件有效期', value: data.agentInfo?.agentIdVld ? moment(data.agentInfo?.agentIdVld).format('YYYY-MM-DD') : '' },
+            { label: '经办人地址', value: data.agentInfo?.agentAddress },
+            { label: '经办人联系方式', value: data.agentInfo?.agentTel }
         ]
 
         //单位信息
         unitInformationList = [
-            { label: '营业执照正面照', value: data?.orderInfoExt?.positiveImageUrl, type: 'image', index: 0 },
+            { label: '营业执照正面照', value: data.unitInfo?.positiveImageUrl, type: 'image', index: 0 },
             // { label: '营业执照反面', value: data?.negativeImageUrl, type: 'image', index: 1 },
-            { 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' },
+            { label: '公司名称', value: data.unitInfo?.address },
+            { label: '证件号', value: data.unitInfo?.customerIdnum },
+            { label: '经办人姓名', value: data.unitInfo?.agentName },
+            { label: '经办人身份证号', value: data.unitInfo?.agentIdNum },
+            { label: '经办人联系方式', value: data.unitInfo?.agentTel },
+            { label: '委托书', value: data.unitInfo?.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?.orderInfoExt?.vehicleModel },
-            { label: '所有人', value: data?.ownerName },
-            { 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?.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 },
+            { label: '车牌号', value: data.carInfo?.vehiclePlate },
+            { label: '车牌颜色', value: getDictLabel(VEHICLE_COLOR_TYPE, data.carInfo?.vehiclePlateColor) },
+            { label: '车辆类型', value: getDictLabel(vehicleTypes, data.carInfo?.vehicleType) },
+            { label: '客货类型', value: getDictLabel(VEHICLE_MODEL_TYPE, data.carInfo?.vehicleClass) },
+            { label: '车辆品牌', value: data.carInfo?.vehicleModel },
+            { label: '所有人', value: data.carInfo?.ownerName },
+            { label: '行驶证主页', value: data.carInfo?.vehPosImgUrl, type: 'image', index: 4 },
+            { label: '行驶证副页', value: data.carInfo?.vehNegImgUrl, type: 'image', index: 5 },
+            { label: '车身45°照', value: data.carInfo?.vehBodyUrl, type: 'image', index: 6 },
+            { label: '经营范围', value: getDictLabel(jyfwList, data.carInfo?.useUserType) },
+            { label: '车辆识别代号', value: data.carInfo?.vehicleVin },
+            { label: '发动机号码', value: data.carInfo?.vehicleEngineNum },
+            { label: '发证日期', value: data.carInfo?.issueDate },
+            { label: '核定载人数', value: data.carInfo?.vehicleApprovedCount ? data.carInfo?.vehicleApprovedCount + ' 人' : null },
+            { label: '整备质量', value: data.carInfo?.vehicleMaintenaceMass ? data.carInfo?.vehicleMaintenaceMass + ' kg' : null },
+            { label: '外廓尺寸', value: data.carInfo?.vehicleDimensions },
+            { label: '总质量', value: data.carInfo?.vehicleTotalMass ? data.carInfo?.vehicleTotalMass + ' kg' : null },
         ]
-        if (data?.type == '2') vehicleInfoList.push({ label: '牵引车标识', value: data?.tractorSign == 1 ? '是' : (data?.tractorSign == 0 ? '否' : '') },
-            { label: '道路运输许可证', value: data?.roadTransportPermitPicUrl, type: 'image' })
+        if (data?.type == '2') vehicleInfoList.push({ label: '牵引车标识', value: data.carInfo?.tractorSign == 1 ? '是' : (data.carInfo?.tractorSign == 0 ? '否' : '') },
+            { label: '道路运输许可证', value: data.carInfo?.roadTransportPermitPicUrl, type: 'image' })
 
         //审核信息 
         checkInformationList = [

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

@@ -45,7 +45,7 @@
       </template>
       <template #CustomButton>
         <el-button v-if="IsPermission(route, 'GET_ORDER_LIST')" type="primary" @click="getOrderFn(1)">
-          <span style="font-family: `楷体`">批量领取订单</span>
+          <span style="font-family: '楷体', 'KaiTi', serif;">批量领取订单</span>
         </el-button>
       </template>
       <template #tableOperation>
@@ -60,14 +60,14 @@
           详情
         </el-button>
         <el-button style="margin: 10px 5px;"
-          v-if="'6' == scope.row.orderStep && scope.row.receiveId && scope.row.orderStatus != 99999 && IsPermission(route, 'AUDIT_LIST')"
+          v-if="pass=='2'&&IsPermission(route, 'AUDIT_LIST')"
           type="success" size="small" @click="audit(scope.$index, scope.row, true)">
           审核
         </el-button>
         <el-button :loading="scope.row.btnLoading"
-          v-if="'6' == scope.row.orderStep && !scope.row.receiveId && IsPermission(route, 'GET_ORDER_LIST')"
+          v-if="pass=='1' && IsPermission(route, 'GET_ORDER_LIST')"
           type="primary" size="small" @click="getOrderFn(2, scope.row)">
-          <span style="font-family: `楷体`">领取订单</span>
+          <span style="font-family: '楷体', 'KaiTi', serif;">领取订单</span>
         </el-button>
       </template>
     </crud-template>
@@ -81,10 +81,12 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="autdis.auditStatus != 'true'" label="审核原因" prop="reason">
-          <el-select clearable @change="autdisReasonChange" v-model="autdis.reason" placeholder="请选择审核原因类型">
+          <!-- <el-select clearable @change="autdisReasonChange" v-model="autdis.reason" placeholder="请选择审核原因类型">
             <el-option :label="item.label" :key="item.value" :value="item.value"
               v-for="item in NEW_CSMSN_APPLY_REASON" />
-          </el-select>
+          </el-select> -->
+          <el-input v-trim clearable type="textarea"  v-model="autdis.reason" :placeholder="`审核不通过原因`"
+            maxlength="200" show-word-limit></el-input>
         </el-form-item>
         <el-form-item v-if="autdisReasonType == '8' && autdis.auditStatus != 'true'" label="其他原因" prop="reason1">
           <el-input v-trim clearable type="textarea"  v-model="autdis.reason1" :placeholder="`审核不通过原因`"
@@ -100,7 +102,7 @@
   <!-- 详情弹窗 -->
   <el-dialog class="detail-dialog" :title="detailDialogTitle" v-model="visible">
     <div v-if="detailDialogTitle == '订单详情'">
-      <el-affix style="position: absolute; top: 0; right: 80px" v-if="6 == visiinfoDatable.orderStep && autdisButton"
+      <el-affix style="position: absolute; top: 0; right: 80px" v-if="pass=='2'&& autdisButton"
         :offset="offset + 50">
         <el-button type="danger" size="small" @click="handleAudit">
           审核
@@ -268,12 +270,12 @@
       },
     ],
     field: [
-      {
-        label: '',
-        prop: '',
-        hide: !IsPermission(route, 'GET_ORDER_LIST'),
-        type: 'selection',
-      },
+      // {
+      //   label: '',
+      //   prop: '',
+      //   hide: !IsPermission(route, 'GET_ORDER_LIST'),
+      //   type: 'selection',
+      // },
       {
         prop: 'orderId',
         label: '单号',
@@ -443,7 +445,7 @@
     field.value.paging.currentPage = 1
     getList()
   }
-  const activeName = ref('3')
+  const activeName = ref('1')
   let tageList = [
     // {
     //   label: '全部',
@@ -452,23 +454,23 @@
     // },
     {
       label: '待领取',
-      name: '3',
+      name: '1',
     },
     {
       label: '待审核',
-      name: '4',
-    },
-    {
-      label: '审核通过',
       name: '2',
     },
+    // {
+    //   label: '审核通过',
+    //   name: '2',
+    // },
     {
       label: '审核不通过',
-      name: '1',
+      name: '3',
     },
   ]
   //标签分页
-  const pass = ref('3')
+  const pass = ref('1')
   function handleClick(tab, event) {
     pass.value = tab.props.name
     if (pass.value == '3') {
@@ -534,11 +536,11 @@
   }
   function getList() {
     crudRef.value.tableLoding = true
-    BaseService.postN('/iaw/issue/order/orderAuditPage', getParams()).then((res: any) => {
+    BaseService.postN('/managew/api/issue/orderExamine/page', getParams()).then((res: any) => {
       if (res && res.code === 0) {
         //数据转换
         let bizContent = res.data
-        let data = bizContent.data || []
+        let data = bizContent.result || []
         console.log(data, 'tableData')
         //数据渲染
         tableData.value = data
@@ -562,16 +564,17 @@
     selectList.value = val.map(item => item.orderId)
   }
   function getOrderFn(type, row?) {
-    if (type == 1 && selectList.value.length == 0) {
-      ElMessage.warning('请至少选择一条订单领取')
-      return
-    }
+    // if (type == 1 && selectList.value.length == 0) {
+    //   ElMessage.warning('请至少选择一条订单领取')
+    //   return
+    // }
     let orderId: any = []
-    if (type == 1) {
-      orderId = selectList.value
-    } else {
-      orderId = [row.orderId]
-    }
+    // if (type == 1) {
+    //   orderId = selectList.value
+    // } else {
+    //   orderId = [row.orderNo]
+    // }
+    orderId = row.orderNo
     ElMessageBox.confirm('确认领取订单吗?', '领取提示', {
       confirmButtonText: '确认领取',
       cancelButtonText: '取消',
@@ -580,11 +583,11 @@
     })
       .then(() => {
         let params = {
-          orderIds: orderId,
-          operatorId: cacheAccessToken.openId
+          orderNo: orderId,
+          // operatorId: cacheAccessToken.openId
         }
         console.log(params, 'paramsparams')
-        BaseService.postN('/iaw/issue/order/orderReceive', params).then(
+        BaseService.postN('/managew/api/issue/orderExamine/receive', params).then(
           (res: any) => {
             if (res && res.code === 0) {
               ElMessage.success('领取成功')
@@ -607,7 +610,8 @@
   function autdisReasonChange(value) {
     autdisReasonType.value = value
   }
-  const autdis = reactive<any>({ auditStatus: 'true', reason: '', reason1: '' }) //审核对象
+  // const autdis = reactive<any>({ auditStatus: 'true', reason: '', reason1: '' }) //审核对象
+  const autdis = reactive<any>({ auditStatus: 'true', reason: '' }) //审核对象
   let timer2: any = null
   const form = ref()
   //审核提交
@@ -616,15 +620,15 @@
     timer2 = setTimeout(() => {
       formEl.validate((valid: any, fields: any) => {
         if (valid) {
-          if (autdisReasonType.value == '8' && autdis.reason1) {
-            autdis.reason = autdis.reason1
-          }
+          // if (autdisReasonType.value == '8' && autdis.reason1) {
+          //   autdis.reason = autdis.reason1
+          // }
           if (autdis.auditStatus == 'true') {
             autdisReasonType.value = ''
             autdis.reason = ''
-            autdis.reason1 = ''
+            // autdis.reason1 = ''
           }
-          BaseService.postN('/iaw/issue/order/orderManualVerify', autdis).then((res: any) => {
+          BaseService.postN('/managew/api/issue/orderExamine/examine', autdis).then((res: any) => {
             if (res && res.code === 0) {
               ElMessage.success(res.message)
               check.value = false
@@ -646,7 +650,7 @@
     autdisReasonType.value = ''
     autdis.auditStatus = 'true'
     autdis.reason = ''
-    autdis.reason1 = ''
+    // autdis.reason1 = ''
     check.value = true
   }
 
@@ -658,21 +662,22 @@
   let visible = ref(false)
   let visiinfoDatable: any = reactive({})
   function audit(idx: number, data: any, type) {
+    console.log(type, 'type')
     beanData = data
     detailDialogTitle.value = '订单详情'
     autdisButton.value = type
     visiinfoDatable = {}
-    BaseService.postN('/iaw/issue/order/orderDetailQuery', { id: data.id }).then((res: any) => {
+    BaseService.postN('/managew/api/issue/orderQuery/detail', { orderNo: data.orderNo }).then((res: any) => {
       if (res && res.code === 0) {
         try {
-          visiinfoDatable = res.data.data
+          visiinfoDatable = res.data
         } catch (e) {
           console.log(e)
           ElMessage.error('未知错误')
         } //渲详情数据
         if (visiinfoDatable) {
-          if (type !== 0) {
-            autdis.orderId = visiinfoDatable.orderNo
+          if (type) {
+            autdis.orderId = visiinfoDatable.orderInfo.orderNo
             visible.value = true
           }
         } else {

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

@@ -130,7 +130,7 @@
 
     //车辆类型
     const vehicleTypes = computed(() => {
-        return $storeinitData.state.dictData['VAN_TYPE'] || []
+        return $storeinitData.state.dictData['USE_USER_TYPE'] || []
     })
     const EXPRESS_DELIVERY_COMPANY = computed(() => {
         return $storeinitData.state.dictData['EXPRESS_DELIVERY_COMPANY'] || []
@@ -149,18 +149,18 @@
     })
     //订单状态
     const ORDER_STATUS = computed(() => {
-        return $storeinitData.state.dictData['ORDER_STATUS'] || []
+        return $storeinitData.state.dictData['ISSUE_ORDER_STATUS'] || []
     })
     //订单阶段
     const ORDER_STAGE_TYPE = computed(() => {
-        return $storeinitData.state.dictData['ORDER_STAGE_TYPE'] || []
+        return $storeinitData.state.dictData['ISSUE_ORDER_STEP'] || []
     })
     //办理模式
     const PATTERN_TYPE = computed(() => {
         return $storeinitData.state.dictData['PATTERN_TYPE'] || []
     })
     const SYSTEM_SORT = computed(() => {
-        return $storeinitData.state.dictData['SYSTEM_SORT'] || []
+        return $storeinitData.state.dictData['SOURCE_TYPE'] || []
     })
     const ORDER_FEE = computed(() => {
         return $storeinitData.state.dictData['ORDER_FEE'] || []
@@ -170,7 +170,7 @@
         return $storeinitData.state.dictData['PAYMENT_STATE'] || []
     })
     const VEHICLE_MODEL_TYPE = computed(() => {
-        return $storeinitData.state.dictData['VEHICLE_MODEL_TYPE'] || []
+        return $storeinitData.state.dictData['VAN_TYPE'] || []
     })
 
     const NEW_CSMSN_APPLY_REASON = computed(() => {
@@ -186,35 +186,35 @@
         // if (!data) return
         //订单基础信息
         orderList = [
-            { label: '单号', value: data?.orderNo },
-            { label: '订单车牌号', value: data?.vehiclePlate },
-            { label: '车牌颜色', value: getDictLabel(VEHICLE_COLOR_TYPE, data?.vehiclePlateColor) },
-            { label: '卡号', value: data?.cardId },
-            { label: '签号', value: data?.obuId },
-            { label: '用户类型', value: data?.userType === 'PERSONAL_USER' ? '个人用户' : '单位用户' },
-            { label: '系统来源', value: data?.isMigrateData == '0' ? '新系统订单' : '老系统订单' },
+            { label: '单号', value: data.orderInfo?.orderNo },
+            { label: '订单车牌号', value: data.orderInfo?.vehiclePlate },
+            { label: '车牌颜色', value: getDictLabel(VEHICLE_COLOR_TYPE, data.orderInfo?.vehiclePlateColor) },
+            { label: '卡号', value: data.orderInfo?.cardId },
+            { label: '签号', value: data.orderInfo?.obuId },
+            { label: '用户类型', value: data.orderInfo?.userType === 'PERSONAL_USER' ? '个人用户' : '单位用户' },
+            { label: '系统来源', value: data.orderInfo?.isMigrateData == '0' ? '新系统订单' : '老系统订单' },
             // { label: '订单类型', value: getDictLabel(ORDER_TYPE, data?.orderType) },
-            { label: '订单状态', value: getDictLabel(ORDER_STATUS, data?.orderStatus) },
-            { label: '订单来源', value: getDictLabel(SYSTEM_SORT, data?.orderSource) },
-            { label: '办理方式', value: getDictLabel(PATTERN_TYPE, data?.promotionModes) },
-            { label: '订单阶段', value: getDictLabel(ORDER_STAGE_TYPE, data?.orderStep) },
-            { label: '办理渠道', value: data?.agencyName },
-            { label: '办理网点', value: data?.channelName },
-            { label: '员工姓名', value: data?.staffName },
+            { label: '订单状态', value: getDictLabel(ORDER_STATUS, data.orderInfo?.orderStatus) },
+            { label: '订单来源', value: getDictLabel(SYSTEM_SORT, data.orderInfo?.orderSource) },
+            { label: '办理方式', value: getDictLabel(PATTERN_TYPE, data.orderInfo?.promotionModes) },
+            { label: '订单阶段', value: getDictLabel(ORDER_STAGE_TYPE, data.orderInfo?.orderStep) },
+            { label: '办理渠道', value: data.orderInfo?.agencyName },
+            { label: '办理网点', value: data.orderInfo?.channelName },
+            { label: '员工姓名', value: data.orderInfo?.staffName },
         ]
         if (data?.reason) orderList.push({ label: '推送订单失败原因', value: data?.reason })
         if (data?.auditFailureCase) orderList.push({ label: '审核失败原因(老系统)', value: data?.auditFailureCase })
 
         machineAudit = [
-            { label: '机审不通过原因', value: data?.orderInfoExt?.auditReason },
+            { label: '机审不通过原因', value: data?.auditMsg },
         ]
 
         //产品信息
         productList = [
-            { label: '产品名称', value: data?.productName },
-            { label: '权益名称', value: data?.equityName },
-            { label: '权益信息', value: data?.equityIsActivate },
-            { label: '领取时间', value: data?.receiveTime },
+            { label: '产品名称', value: data.productInfo?.productName },
+            { label: '权益名称', value: data.productInfo?.equityName },
+            { label: '权益信息', value: data.productInfo?.equityMsg },
+            { label: '领取时间', value: data.productInfo?.getTime },
             // { label: '付款时间', value: data?.test1 },
             // { label: '办理费', value: handleAmount(data?.releaseProduct?.suggestedSellingPrice) ? handleAmount(data?.releaseProduct?.suggestedSellingPrice) + ' 元' : null },
             // { label: '保证金', value: handleAmount(data?.productStandardsData?.radFee) ? handleAmount(data?.productStandardsData?.radFee) + ' 元' : null },
@@ -237,59 +237,59 @@
         //用户信息
         userInfoList = [
            // { label: '是否本人车辆', value: data?.test1 },
-           { label: '身份证人像面', value: data?.orderInfoExt?.customerPositiveImageUrl, type: 'image', index: 0 },
-            { label: '身份证国徽面', value: data?.orderInfoExt?.customerNegativeImageUrl, type: 'image', index: 1 },
-            { label: '姓名', value: data?.customerName },
+           { label: '身份证人像面', value: data.orderInfoExt?.customerPositiveImageUrl, type: 'image', index: 0 },
+            { label: '身份证国徽面', value: data.orderInfoExt?.customerNegativeImageUrl, type: 'image', index: 1 },
+            { label: '姓名', value: data.orderInfoExt?.customerName },
             // { label: '性别', value: data?.customerGender },
-            { label: '身份证号', value: data?.customerIdNum },
-            { label: '证件有效期', value: data?.customerIdVld ? moment(data?.customerIdVld).format('YYYY-MM-DD') : '---' },
-            { label: '地址', value: data?.orderInfoExt?.customerAddress },
-            { label: '联系方式', value: data?.customerTel }
+            { label: '身份证号', value: data.orderInfoExt?.customerIdNum },
+            { label: '证件有效期', value: data.orderInfoExt?.customerIdVld ? moment(data.orderInfoExt?.customerIdVld).format('YYYY-MM-DD') : '---' },
+            { label: '地址', value: data.orderInfoExt?.customerAddress },
+            { label: '联系方式', value: data.orderInfoExt?.customerTel }
         ]
 
         //经办人信息 
         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 ? moment(data?.orderInfoExt?.agentIdVld).format('YYYY-MM-DD') : '' },
-            { label: '经办人地址', value: data?.orderInfoExt?.agentAddress },
-            { label: '经办人联系方式', value: data?.orderInfoExt?.agentTel }
+            { label: '经办人人像面', value: data.agentInfo?.agentPosImgUrl, type: 'image', index: 2 },
+            { label: '经办人国徽面', value: data.agentInfo?.agentNegImgUrl, type: 'image', index: 3 },
+            { label: '经办人姓名', value: data.agentInfo?.agentName },
+            { label: '经办人性别', value: data.agentInfo?.agentGender },
+            { label: '经办人身份证号', value: data.agentInfo?.agentIdNum },
+            { label: '经办人证件有效期', value: data.agentInfo?.agentIdVld ? moment(data.agentInfo?.agentIdVld).format('YYYY-MM-DD') : '' },
+            { label: '经办人地址', value: data.agentInfo?.agentAddress },
+            { label: '经办人联系方式', value: data.agentInfo?.agentTel }
         ]
 
         //单位信息
         unitInformationList = [
-            { label: '营业执照正面照', value: data?.orderInfoExt?.positiveImageUrl, type: 'image', index: 0 },
+            { label: '营业执照正面照', value: data.unitInfo?.positiveImageUrl, type: 'image', index: 0 },
             // { label: '营业执照反面', value: data?.negativeImageUrl, type: 'image', index: 1 },
-            { 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' },
+            { label: '公司名称', value: data.unitInfo?.address },
+            { label: '证件号', value: data.unitInfo?.customerIdnum },
+            { label: '经办人姓名', value: data.unitInfo?.agentName },
+            { label: '经办人身份证号', value: data.unitInfo?.agentIdNum },
+            { label: '经办人联系方式', value: data.unitInfo?.agentTel },
+            { label: '委托书', value: data.unitInfo?.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?.orderInfoExt?.vehicleModel },
-            { label: '所有人', value: data?.ownerName },
-            { 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?.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 },
+            { label: '车牌号', value: data.carInfo?.vehiclePlate },
+            { label: '车牌颜色', value: getDictLabel(VEHICLE_COLOR_TYPE, data.carInfo?.vehiclePlateColor) },
+            { label: '车辆类型', value: getDictLabel(vehicleTypes, data.carInfo?.vehicleType) },
+            { label: '客货类型', value: getDictLabel(VEHICLE_MODEL_TYPE, data.carInfo?.vehicleClass) },
+            { label: '车辆品牌', value: data.carInfo?.vehicleModel },
+            { label: '所有人', value: data.carInfo?.ownerName },
+            { label: '行驶证主页', value: data.carInfo?.vehPosImgUrl, type: 'image', index: 4 },
+            { label: '行驶证副页', value: data.carInfo?.vehNegImgUrl, type: 'image', index: 5 },
+            { label: '车身45°照', value: data.carInfo?.vehBodyUrl, type: 'image', index: 6 },
+            { label: '经营范围', value: getDictLabel(jyfwList, data.carInfo?.useUserType) },
+            { label: '车辆识别代号', value: data.carInfo?.vehicleVin },
+            { label: '发动机号码', value: data.carInfo?.vehicleEngineNum },
+            { label: '发证日期', value: data.carInfo?.issueDate },
+            { label: '核定载人数', value: data.carInfo?.vehicleApprovedCount ? data.carInfo?.vehicleApprovedCount + ' 人' : null },
+            { label: '整备质量', value: data.carInfo?.vehicleMaintenaceMass ? data.carInfo?.vehicleMaintenaceMass + ' kg' : null },
+            { label: '外廓尺寸', value: data.carInfo?.vehicleDimensions },
+            { label: '总质量', value: data.carInfo?.vehicleTotalMass ? data.carInfo?.vehicleTotalMass + ' kg' : null },
         ]
         if (data?.type == '2') vehicleInfoList.push({ label: '牵引车标识', value: data?.tractorSign == 1 ? '是' : (data?.tractorSign == 0 ? '否' : '') },
             { label: '道路运输许可证', value: data?.roadTransportPermitPicUrl, type: 'image' })