订单

src/components/orderInfo/index.vue

@@ -27,7 +27,7 @@
           </el-col>
           <el-col :span="24">
             <el-descriptions
-              v-if="item.foldStart && !item.othervalue"
+              v-if="item.foldStart && !item.othervalue && !item.pay"
               direction="vertical"
               border
               :column="3"
@@ -67,7 +67,7 @@
             </el-descriptions>
             <div v-else-if="item.foldStart && item.othervalue">
               <div style="margin-left: 20px">
-                签署时间：{{ tableData ? [0].insertTime : "" }}
+                签署时间：{{ agreeTime }}
               </div>
               <crud-template
                 ref="crudRef"
@@ -86,6 +86,19 @@
                 </template>
               </crud-template>
             </div>
+            <div v-else-if="item.foldStart && item.pay">
+              <el-table :data="payTableData" size="small" border stripe style="width: 100%">
+                <el-table-column header-align="center" align="center" prop="payOrderNo" label="商户号" width="130"/>
+                <el-table-column header-align="center" align="center" prop="payStatus" label="支付状态" width="65"/>
+                <el-table-column header-align="center" align="center" prop="payTime" label="支付时间" width="90"/>
+                <el-table-column header-align="center" align="center" prop="fee" label="支付金额" width="65"/>
+                <el-table-column header-align="center" align="center" prop="payType" label="支付类型" width="65"/>
+                <el-table-column header-align="center" align="center" prop="externalOrderNo" label="交易号" />
+                <el-table-column header-align="center" align="center" prop="refundOrderNo" label="退款商户号" />
+                <el-table-column header-align="center" align="center" prop="refundAmount" label="退款金额" width="65"/>
+                <el-table-column header-align="center" align="center" prop="refundTime" label="退款时间" width="90"/>
+              </el-table>
+            </div>
           </el-col>
           <!-- <el-col :span="7" v-show="item.foldStart" v-for="(value, index) in item.data" :key="index">
                         <strong style="min-width: 95px;">{{ value.label }}</strong>
@@ -175,6 +188,8 @@ let orderPickupInformation: any = [];
 
 const listData: any = ref([]);
 const tableData = ref([]);
+const payTableData = ref([]);
+const agreeTime = ref();
 
 // 添加全局ref声明
 const IsUnit = ref(false);
@@ -219,8 +234,12 @@ const ORDER_FEE = computed(() => {
   return $storeinitData.state.dictData["ORDER_FEE"] || [];
 });
 // 支付状态
-const PAYMENT_STATE = computed(() => {
-  return $storeinitData.state.dictData["PAYMENT_STATE"] || [];
+const ORDER_PAYSTATUS = computed(() => {
+  return $storeinitData.state.dictData["ORDER_PAYSTATUS"] || [];
+});
+// 支付类型
+const ORDER_PAYTYPE = computed(() => {
+  return $storeinitData.state.dictData["ORDER_PAYTYPE"] || [];
 });
 const VEHICLE_MODEL_TYPE = computed(() => {
   return $storeinitData.state.dictData["VAN_TYPE"] || [];
@@ -262,10 +281,27 @@ function init(data) {
   
   console.log(data, "datadatadata");
   tableData.value = data?.agreementsList ?? [];
+  payTableData.value = data?.payInfo ?? [];
+  //将payTableData的属性空值为'---'
+  payTableData.value.forEach((item) => {
+    item.payOrderNo = item.payOrderNo ?? '---'
+    item.payStatus = item.payStatus ? getDictLabel(ORDER_PAYSTATUS, item.payStatus) : '---'
+    item.payTime = item.payTime ?? '---'
+    item.fee = item.fee ?? '---'
+    item.payType = item.payType ? getDictLabel(ORDER_PAYTYPE, item.payType) : '---'
+    item.externalOrderNo = item.externalOrderNo ?? '---'
+    item.refundOrderNo = item.refundOrderNo ?? '---'
+    item.refundAmount = item.refundAmount ?? '---'
+    item.refundTime = item.refundTime ?? '---'
+
+  })
+  agreeTime.value = data?.agreeTime ?? '---';
   // if (!data) return
   //订单基础信息
   orderList = [
-    { label: "单号", value: data.orderInfo?.orderNo },
+    { label: "办理时间", value: data.orderInfo?.insertTime },
+    { label: "订单号", value: data.orderInfo?.orderNo },
+    { label: "渠道订单号", value: data.orderInfo?.qdOrderNo },
     { label: "订单车牌号", value: data.orderInfo?.vehiclePlate },
     {
       label: "车牌颜色",
@@ -274,17 +310,17 @@ function init(data) {
         data.orderInfo?.vehiclePlateColor
       ),
     },
-    { label: "(新)卡号", value: data.orderInfo?.cardId },
-    { label: "(新)签号", value: data.orderInfo?.obuId },
+    // { 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: data.orderInfo?.isMigrateData == "0" ? "新系统订单" : "老系统订单",
+    // },
     // { label: '订单类型', value: getDictLabel(ORDER_TYPE, data?.orderType) },
     {
       label: "订单状态",
@@ -304,15 +340,16 @@ function init(data) {
     },
     { label: "办理渠道", value: data.orderInfo?.agencyName },
     { label: "办理网点", value: data.orderInfo?.channelName },
+    { label: "员工工号", value: data.orderInfo?.staffId },
     { label: "员工姓名", value: data.orderInfo?.staffName },
   ];
   if (data?.reason)
     orderList.push({ label: "推送订单失败原因", value: data?.reason });
-  if (data?.auditFailureCase)
-    orderList.push({
-      label: "审核失败原因(老系统)",
-      value: data?.auditFailureCase,
-    });
+  // if (data?.auditFailureCase)
+    // orderList.push({
+    //   label: "审核失败原因(老系统)",
+    //   value: data?.auditFailureCase,
+    // });
 
   machineAudit = [{ label: "机审不通过原因", value: data?.auditMsg }];
 
@@ -343,7 +380,7 @@ function init(data) {
         label:
           getDictLabel(ORDER_FEE.value, item.payType) +
           "(" +
-          getDictLabel(PAYMENT_STATE.value, item.payStatus) +
+          getDictLabel(ORDER_PAYSTATUS, item.payStatus) +
           ")",
         value: handleAmount(item.fee) + "元",
       });
@@ -374,8 +411,8 @@ function init(data) {
         ? moment(data.customerInfo?.customerIdVld).format("YYYY-MM-DD")
         : "---",
     },
-    { label: "地址", value: data.customerInfo?.customerAddress },
     { label: "联系方式", value: data.customerInfo?.customerTel },
+    { label: "地址", value: data.customerInfo?.customerAddress },
   ];
   //车主信息
   carOwnerInfoList = [
@@ -391,16 +428,16 @@ function init(data) {
       type: "image",
       index: 8,
     },
-    { label: "车主名称", value: data.carOwnerInfo?.ownerName },
-    { label: "车主证件号", value: data.carOwnerInfo?.ownerIdNum },
-    { label: "车主地址", value: data.carOwnerInfo?.ownerAddress },
-    { label: "车主电话", value: data.carOwnerInfo?.ownerTel },
     {
       label: "委托书",
       value: data.carOwnerInfo?.proxyUrl,
       type: "image",
       index: 9,
     },
+    { label: "车主名称", value: data.carOwnerInfo?.ownerName },
+    { label: "车主证件号", value: data.carOwnerInfo?.ownerIdNum },
+    { label: "车主电话", value: data.carOwnerInfo?.ownerTel },
+    { label: "车主地址", value: data.carOwnerInfo?.ownerAddress },
   ];
   //单位信息
   unitInformationList = [
@@ -628,6 +665,13 @@ function init(data) {
       data: orderList,
       visible: true,
     },
+    {
+      title: "协议列表",
+      visible: true,
+      foldIs: true, //是否需要折叠
+      foldStart: true, //折叠状态默认打开
+      othervalue: true,
+    },
     {
       title: "产品信息",
       foldIs: true, //是否需要折叠
@@ -706,19 +750,19 @@ function init(data) {
       data: signInfo,
     },
     {
-      title: "激活信息",
-      visible: data.activeInfo ? true : false,
+      title: "支付信息",
+      visible: true,
       foldIs: true, //是否需要折叠
       foldStart: true, //折叠状态默认打开
-      data: activeInfo,
+      pay: true,
     },
     {
-      title: "协议列表",
-      visible: true,
+      title: "激活信息",
+      visible: data.activeInfo ? true : false,
       foldIs: true, //是否需要折叠
       foldStart: true, //折叠状态默认打开
-      othervalue: true,
-    },
+      data: activeInfo,
+    }
   ];
 }
 // 查看协议*******************

src/views/onlineBusinessHall/informationManagement/userChange/index.vue

@@ -31,7 +31,7 @@
         :before-close="handleClose"
     >
       <div>
-        <el-button type="primary" @click="auditDialog = false">提 交</el-button>
+        <el-button type="primary" @click="auditSubmit()">提 交</el-button>
         <el-button @click="auditDialog = false">关 闭</el-button>
       </div>
       <div class="audit-tip-box">
@@ -45,15 +45,15 @@
       </div>
       <div>
         <h4>审核信息</h4>
-        <el-form :model="auditForm" label-width="auto">
+        <el-form ref="auditFormRef" :model="auditForm" label-width="auto">
           <el-row :gutter="15">
             <el-col :span="8">
-              <el-form-item label="审核人">
+              <el-form-item label="审核人" prop="auditName" :error="formErrors.auditName">
                 <el-input readonly disabled v-model="auditForm.auditName"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="审核结果">
+              <el-form-item label="审核结果" prop="auditStatus" :error="formErrors.auditStatus">
                 <el-select v-model="auditForm.auditStatus" placeholder="请选择审核结果">
                   <el-option label="通过" value="1"/>
                   <el-option label="不通过" value="2"/>
@@ -61,12 +61,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="审核时间">
+              <el-form-item label="审核时间" prop="auditTime" :error="formErrors.auditTime">
                 <el-date-picker readonly disabled v-model="auditForm.auditTime" style="width: 100%" type="datetime" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="审核意见">
+              <el-form-item label="审核意见" prop="auditReason" :error="formErrors.auditReason">
                 <el-input v-model="auditForm.auditReason" maxlength="30" show-word-limit type="textarea" rows="3"
                           placeholder="请输入审核意见"/>
               </el-form-item>
@@ -165,6 +165,13 @@ const searchForm = ref({
 let tableData: any = ref([]);
 const typeOption = ref("");
 const auditDialog = ref(false);
+const auditFormRef = ref();
+const formErrors = ref({
+  auditReason: '',
+  auditStatus: '',
+  auditTime: '',
+  auditName: '',
+});
 const auditForm = ref(
     {
       auditName:'',
@@ -193,6 +200,31 @@ function audit(row:any){
     crudRef.value.tableLoding = false;
   });
 }
+function auditSubmit(){
+  formErrors.value = Object.keys(formErrors.value).reduce((acc, key) => {
+    acc[key] = '';
+    return acc;
+  }, {} as Record<string, string>);
+  auditFormRef.value.validate((valid: any) => {
+    if (valid) {
+      BaseService.postN('/managew/CustomerInfoChange/audit', {}).then((res: any) => {
+      }).catch((error) => {
+        console.log("error", error)
+        //匹配错误提示
+        // 遍历后端返回的所有错误字段
+        Object.keys(error).forEach((key) => {
+          if (formErrors.value[key] !== undefined) {
+            // 动态更新对应字段的错误信息
+            formErrors.value[key] = error[key];
+          }
+        });
+      });
+    }
+  })
+}
+
+
+
 
 const handleClose = (done: () => void) => {
   ElMessageBox.confirm('Are you sure to close this dialog?')