订单换货，退货调整

src/components/orderInfo/index.vue

@@ -565,20 +565,17 @@ function init(data) {
   ];
   //图片放大位置
   srcList = [
-    data?.orderInfoExt?.customerPositiveImageUrl,
-    data?.orderInfoExt?.customerNegativeImageUrl,
-    data?.orderInfoExt?.positiveImageUrl,
-    data?.negativeImageUrl,
-    data?.orderInfoExt?.agentPosImgUrl,
-    data?.orderInfoExt?.agentNegImgUrl,
-    data?.orderInfoExt?.proxyUrl,
+    data?.unitInfo?.proxyUrl,
+    data?.unitInfo?.unitImageUrl,
+    data?.agentInfo?.agentNegImgUrl,
+    data?.agentInfo?.agentPosImgUrl,
+    data?.carInfo?.vehBodyUrl,
+    data?.carInfo?.vehNegImgUrl,
+    data?.carInfo?.vehPosImgUrl,
     data?.carOwnerInfo?.ownerPosImgUrl,
     data?.carOwnerInfo?.ownerNegImgUrl,
     data?.carOwnerInfo?.proxyUrl,
-    data?.orderInfoExt?.vehPosImgUrl,
-    data?.orderInfoExt?.vehNegImgUrl,
-    data?.orderInfoExt?.vehBodyUrl,
-    data?.roadTransportPermitPicUrl,
+    // data?.roadTransportPermitPicUrl,
   ].filter((item) => {
     return item;
   });

src/views/onlineBusinessHall/orderManagement/index.vue

@@ -942,8 +942,8 @@
       >
         <!-- 申请信息 -->
         <el-descriptions-item label="订单编号">{{ changeQueryInfo.orderNo }}</el-descriptions-item>
-        <el-descriptions-item label="签号">{{ changeQueryInfo.obuId }}</el-descriptions-item>
-        <el-descriptions-item label="卡号">{{ changeQueryInfo.cardId }}</el-descriptions-item>
+        <el-descriptions-item label="发出签号">{{ changeQueryInfo.obuId }}</el-descriptions-item>
+        <el-descriptions-item label="发出卡号">{{ changeQueryInfo.cardId }}</el-descriptions-item>
         <el-descriptions-item label="申请时间">{{ changeQueryInfo.applyTime }}</el-descriptions-item>
         <el-descriptions-item label="换货原因">{{ changeQueryInfo.reason }}</el-descriptions-item>
         <el-descriptions-item label="退换方式">{{ changeQueryInfo.rechangeMode === 1 ? '线上' : '线下' }}</el-descriptions-item>
@@ -984,7 +984,7 @@
         <el-descriptions-item label="物流单号">{{ changeQueryInfo.logisticsNumber }}</el-descriptions-item>
 
       </el-descriptions>
-
+      <div style="color:red;margin-top: 10pxc; " >注意核对退回设备是否与发出设备一致!</div>
       <el-form ref="changeQueryRef" :model="changeQueryForm" :rules="changeQueryRules" label-width="140px">
         <h3>发货信息</h3>
         <el-form-item v-if="changeQueryInfo.rechangeMode === 1" label="收件人姓名" prop="consignee">
@@ -1097,8 +1097,8 @@
       >
         <!-- 退货信息 -->
         <el-descriptions-item label="订单编号">{{ orderReturnInfo.orderNo }}</el-descriptions-item>
-        <el-descriptions-item label="签号">{{ orderReturnInfo.obuId }}</el-descriptions-item>
-        <el-descriptions-item label="卡号">{{ orderReturnInfo.cardId }}</el-descriptions-item>
+        <el-descriptions-item label="发出签号">{{ orderReturnInfo.obuId }}</el-descriptions-item>
+        <el-descriptions-item label="发出卡号">{{ orderReturnInfo.cardId }}</el-descriptions-item>
         <el-descriptions-item label="申请时间">{{ orderReturnInfo.applyTime }}</el-descriptions-item>
         <el-descriptions-item label="退货原因">{{ orderReturnInfo.reason }}</el-descriptions-item>
         <el-descriptions-item label="退货方式">{{ orderReturnInfo.rechangeMode === 1 ? '线上' : '线下' }}</el-descriptions-item>
@@ -1110,10 +1110,11 @@
         <el-descriptions-item label="状态">{{ orderReturnInfo.rechangeStatus === 'NEW' ? '新申请' : orderReturnInfo.rechangeStatus === 'SUCCESS' ? '审核通过' : '审核失败' }}</el-descriptions-item>
       </el-descriptions>
 
+      <div style="color:red;margin-top: 10pxc;" >注意核对退回设备是否与发出设备一致!</div>
 
       <el-form ref="orderReturnRef" :model="orderReturnForm" :rules="orderReturnRules" label-width="140px">
         <h3>审核信息</h3>
-        <el-form-item label="审核状态" prop="rechangeStatus">
+        <!-- <el-form-item label="审核状态" prop="rechangeStatus">
           <el-select
               clearable
               v-model="orderReturnForm.rechangeStatus"
@@ -1122,7 +1123,7 @@
             <el-option label="审核通过" key="SUCCESS" value="SUCCESS"/>
             <el-option label="审核失败" key="FAIL" value="FAIL"/>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <!-- 备注 -->
         <el-form-item label="审核信息" prop="auditInfo">
@@ -1135,9 +1136,9 @@
         </el-form-item>
       </el-form>
       <template #footer>
-        <el-button type="danger" @click="orderReturnSubmit(orderReturnRef)">拒绝退货</el-button>
+        <el-button type="danger" @click="orderReturnSubmit(orderReturnRef,false)">拒绝退货</el-button>
         <el-button @click="orderReturnDialog = false">取 消</el-button>
-        <el-button type="primary" @click="orderReturnSubmit(orderReturnRef)">确 定</el-button>
+        <el-button type="primary" @click="orderReturnSubmit(orderReturnRef,true)">确 定</el-button>
       </template>
     </el-dialog>
     <!-- 完成退货，已加入业务审核该地方不使用 -->
@@ -2043,8 +2044,14 @@ function changeQuerySubmit(form,flag: boolean) {
 }
 
 //退货
-function orderReturnSubmit(form) {
+function orderReturnSubmit(form,flag) {
   if (timer) return;
+
+  if(flag){
+    orderReturnForm.value.rechangeStatus = "SUCCESS"
+  }else{
+    orderReturnForm.value.rechangeStatus = "FAIL"
+  }  
   timer = setTimeout(() => {
     form.validate((valid: any) => {
       if (valid) {
@@ -2061,6 +2068,7 @@ function orderReturnSubmit(form) {
         timer = null;
       }
     })
+
     timer = null;
   }, 1000);
 }

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

@@ -43,11 +43,11 @@
           start-placeholder="订单创建开始日期" end-placeholder="订单创建结束日期" format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss" />
       </template>
-      <template #CustomButton>
+      <!-- <template #CustomButton>
         <el-button v-if="IsPermission(route, 'GET_ORDER_LIST')" type="primary" @click="getOrderFn(1)">
           <span style="font-family: '微软雅黑', 'KaiTi', serif;">批量领取订单</span>
         </el-button>
-      </template>
+      </template> -->
       <template #tableOperation>
         <el-tabs @tab-click="handleClick" v-model="activeName">
           <el-tab-pane v-for="(item, index) in tageList" :key="index" :label="item.label"
@@ -126,7 +126,8 @@
   import moment from 'moment'
   import { getCache } from '@/utils/cache'
   import { getAudit, getOrderInfo } from '@/api/onlineBusinessHall/orderManagement'
-  import orderInfo from './orderInfo.vue'
+  // import orderInfo from './orderInfo.vue'
+  import orderInfo from "@/components/orderInfo/index.vue";
 
   //或取路由传入过来的对象数据
   const route = useRoute()
@@ -378,21 +379,21 @@
           return getLabel(ORDER_STAGE_TYPE, money);
         },
       },
-      {
-        width: '180px',
-        prop: 'orderType', //
-        label: '订单类型',
-        listData: ORDER_TYPE
-      },
       // {
       //   width: '180px',
-      //   prop: 'artificialStatus', //
-      //   label: '审核类型',
-      //   funRuleStarts: true,
-      //   funRule: (value: any) => {
-      //     return value == '1' ? '人工审核' : '系统审核'
-      //   },
+      //   prop: 'orderType', //
+      //   label: '订单类型',
+      //   listData: ORDER_TYPE
       // },
+      {
+        width: '180px',
+        prop: 'artificialStatus', //
+        label: '审核类型',
+        funRuleStarts: true,
+        funRule: (value: any) => {
+          return value == '1' ? '人工审核' : '系统审核'
+        },
+      },
       {
         width: '180px',
         prop: 'auditPerson', //

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

@@ -178,6 +178,8 @@
  
     init(data.value)
     function init(data) {
+        console.log("详情数据：" ,data);
+
         if (data && data.userType) IsUnit.value = data.userType != 'PERSONAL_USER'
         if (data) IsSelf.value = data.agentName ? true : false
         // if (!data) return
@@ -358,7 +360,7 @@
                 data: userInfoList
             }, {
                 title: '经办人信息',
-                visible: IsUnit.value && IsSelf.value,
+                visible: IsUnit.value,
                 foldIs: true, //是否需要折叠
                 foldStart: true, //折叠状态默认打开
                 data: agentInfoList