订单查询bug修复

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

@@ -11,7 +11,7 @@
       <template #search>
         <el-input maxlength="60" v-trim clearable v-model="searchForm.orderNo" style="width: 200px"
           placeholder="请输入单号" />
-        <el-input maxlength="60" v-trim clearable v-model="searchForm.customerIdnum" style="width: 200px"
+        <el-input maxlength="60" v-trim clearable v-model="searchForm.customerIdNum" style="width: 200px"
           placeholder="请输入证件号" />
         <el-input maxlength="60" v-trim clearable v-model="searchForm.customerTel" style="width: 200px"
           placeholder="请输入用户手机号" />
@@ -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: '楷体', 'KaiTi', serif;">批量领取订单</span>
+          <span style="font-family: '微软雅黑', 'KaiTi', serif;">批量领取订单</span>
         </el-button>
       </template>
       <template #tableOperation>
@@ -67,7 +67,7 @@
         <el-button :loading="scope.row.btnLoading"
           v-if="pass=='1' && IsPermission(route, 'GET_ORDER_LIST')"
           type="primary" size="small" @click="getOrderFn(2, scope.row)">
-          <span style="font-family: '楷体', 'KaiTi', serif;">领取订单</span>
+          <span style="font-family: '微软雅黑', 'KaiTi', serif;">领取订单</span>
         </el-button>
       </template>
     </crud-template>
@@ -108,7 +108,7 @@
           审核
         </el-button>
       </el-affix>
-      <orderInfo :infoData="visiinfoDatable"></orderInfo>
+      <orderInfo :infoData="rowData"></orderInfo>
     </div>
   </el-dialog>
 </template>
@@ -144,7 +144,7 @@
     time: '',
     vehiclePlateColor: '',
     promotionModes: '',
-    customerIdnum: '',
+    customerIdNum: '',
     customerTel: ''
   })
 
@@ -170,7 +170,7 @@
   ]
   //订单阶段
   const ORDER_STAGE_TYPE = computed(() => {
-    return $storeinitData.state.dictData['ORDER_STAGE_TYPE'] || []
+    return $storeinitData.state.dictData['ISSUE_ORDER_STEP'] || []
   })
 
   //订单状态
@@ -187,11 +187,6 @@
     return $storeinitData.state.dictData['VAN_TYPE'] || []
   })
 
-  //产品类型
-  const PRODUCT_TYPE = computed(() => {
-    return $storeinitData.state.dictData['PRODUCT_TYPE_NEW'] || []
-  })
-
   //办理模式
   const PATTERN_TYPE = computed(() => {
     return $storeinitData.state.dictData['PATTERN_TYPE'] || []
@@ -199,11 +194,11 @@
 
   //订单状态
   const ORDER_STATUS = computed(() => {
-    return $storeinitData.state.dictData['ORDER_STATUS'] || []
+    return $storeinitData.state.dictData['ISSUE_ORDER_STATUS'] || []
   })
 
-  const CERTIFICATE_TYPE = computed(() => {
-    return $storeinitData.state.dictData["CERTIFICATE_TYPE"] ?? [];
+  const ID_TYPE = computed(() => {
+    return $storeinitData.state.dictData["ID_TYPE"] ?? [];
   }); //用户证件类型
 
   const NEW_CSMSN_APPLY_REASON = computed(() => {
@@ -277,7 +272,7 @@
       //   type: 'selection',
       // },
       {
-        prop: 'orderId',
+        prop: 'orderNo',
         label: '单号',
       },
       {
@@ -285,13 +280,16 @@
         label: '产品名称',
       },
       {
-        prop: 'productType',
+        prop: 'productTypes',
         label: '产品类型',
-        listData: PRODUCT_TYPE
+        funRuleStarts: true,
+        funRule: (value: any) => {
+          return value == "1" ? "自营产品" : value == "0" ? "非自营产品" : "---";
+        },      
       },
       {
         prop: 'promotionModes',
-        label: '办理方式',
+        label: '办理方式', 
         listData: PATTERN_TYPE
       },
       {
@@ -304,9 +302,9 @@
         },
       },
       {
-        prop: 'type',
+        prop: 'vehicleType',
         label: '车辆类型',
-        listData: vehicleTypes
+        // listData: vehicleTypes
       },
       {
         prop: 'userType',
@@ -321,12 +319,12 @@
         label: '手机号',
       },
       {
-        prop: 'customerIdtype',
+        prop: 'customerIdType',
         label: '证件类型',
-        listData: CERTIFICATE_TYPE,
+        listData: ID_TYPE,
       },
       {
-        prop: 'cusotmerIdnum',
+        prop: 'customerIdNum',
         label: '证件号',
       },
       {
@@ -372,22 +370,19 @@
         // },
       },
       {
-        width: '180px',
-        prop: 'orderStep', //
-        label: '订单阶段',
+        width: "180px",
+        prop: "orderStep", //
+        label: "订单阶段",
         funRuleStarts: true,
         funRule: (money: any) => {
-          return getLabel(ORDER_STAGE_TYPE, money)
+          return getLabel(ORDER_STAGE_TYPE, money);
         },
       },
       {
         width: '180px',
         prop: 'orderType', //
         label: '订单类型',
-        funRuleStarts: true,
-        funRule: (money: any) => {
-          return getLabel(ORDER_TYPE, money)
-        },
+        listData: ORDER_TYPE
       },
       // {
       //   width: '180px',
@@ -494,7 +489,7 @@
       time: '',
       vehiclePlateColor: '',
       promotionModes: '',
-      customerIdnum: '',
+      customerIdNum: '',
       customerTel: ''
     }
     value1.value = null
@@ -660,24 +655,23 @@
   const autdisButton = ref(false)
   const offset = ref(150)
   let visible = ref(false)
-  let visiinfoDatable: any = reactive({})
+  const rowData = ref()
   function audit(idx: number, data: any, type) {
     // console.log(type, 'type')
     beanData = data
     detailDialogTitle.value = '订单详情'
     autdisButton.value = type
-    visiinfoDatable = {}
     BaseService.postN('/managew/api/issue/orderQuery/detail', { orderNo: data.orderNo }).then((res: any) => {
       if (res && res.code === 0) {
         try {
-          visiinfoDatable = res.data
+          rowData.value = res.data
         } catch (e) {
           console.log(e)
           ElMessage.error('未知错误')
         } //渲详情数据
-        if (visiinfoDatable) {
+        if (rowData) {
           // if (type) {
-            autdis.orderNo = visiinfoDatable.orderInfo.orderNo
+            // autdis.orderNo = rowData.orderInfo.orderNo
             visible.value = true
           // }
         } else {

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

@@ -64,9 +64,7 @@
         infoData: {
             //表单配置
             type: Object,
-            default: function () {
-                return {};
-            }
+            default: {}
         }
     });
 
@@ -182,7 +180,6 @@
     function init(data) {
         if (data && data.userType) IsUnit.value = data.userType != 'PERSONAL_USER'
         if (data) IsSelf.value = data.agentName ? true : false
-        console.log(data, 'datadatadata')
         // if (!data) return
         //订单基础信息
         orderList = [
@@ -237,14 +234,14 @@
         //用户信息
         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.orderInfoExt?.customerName },
+           { label: '身份证人像面', value: data.customerInfo?.customerPositiveImageUrl, type: 'image', index: 0 },
+            { label: '身份证国徽面', value: data.customerInfo?.customerNegativeImageUrl, type: 'image', index: 1 },
+            { label: '姓名', value: data.customerInfo?.customerName },
             // { label: '性别', value: data?.customerGender },
-            { 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 }
+            { label: '身份证号', value: data.customerInfo?.customerIdNum },
+            { label: '证件有效期', value: data.customerInfo?.customerIdVld ? moment(data.customerInfo?.customerIdVld).format('YYYY-MM-DD') : '---' },
+            { label: '地址', value: data.customerInfo?.customerAddress },
+            { label: '联系方式', value: data.customerInfo?.customerTel }
         ]
 
         //经办人信息