bug修改

src/views/onlineBusinessHall/orderManagement/index.vue

@@ -8,6 +8,7 @@
       @btnSearch="btnSearch"
       @CurrentChange="handleCurrentChange"
       @refreshLeft="refreshLeft"
+      v-loading="formLoding"
       @pageSizeChange="
         (val) => {
           field.paging.currentPage = 1;
@@ -947,9 +948,9 @@
         <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>
-        <el-descriptions-item label="退货网点ID">{{ changeQueryInfo.serviceHallId }}</el-descriptions-item>
+        <el-descriptions-item label="退货网点">{{ changeQueryInfo.serviceHallId }}</el-descriptions-item>
         <el-descriptions-item label="来源">{{ getLabel1(SOURCE_TYPE,orderReturnInfo.sourceType) }}</el-descriptions-item>
-        <el-descriptions-item label="发货表ID">{{ changeQueryInfo.id }}</el-descriptions-item>
+<!--        <el-descriptions-item label="发货表ID">{{ changeQueryInfo.id }}</el-descriptions-item>-->
       </el-descriptions>
 
       <el-descriptions
@@ -984,104 +985,54 @@
         <el-descriptions-item label="物流单号">{{ changeQueryInfo.logisticsNumber }}</el-descriptions-item>
 
       </el-descriptions>
-      <div style="color:red;margin-top: 10pxc; " >注意核对退回设备是否与发出设备一致!</div>
+      <div style="color:red;margin-top: 10px; " >注意核对退回设备是否与发出设备一致!</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">
-          <el-input
-              clearable
-              disabled
-              v-model="changeQueryForm.consignee"
-              placeholder="请输入收件人姓名"
-          ></el-input>
+          <el-input clearable disabled v-model="changeQueryForm.consignee" placeholder="请输入收件人姓名"/>
         </el-form-item>
         <el-form-item v-if="changeQueryInfo.rechangeMode === 1" label="收件人电话" prop="consigneeTel">
-          <el-input
-              clearable
-              disabled
-              v-model="changeQueryForm.consigneeTel"
-              placeholder="请输入收件人电话"
-          ></el-input>
+          <el-input clearable disabled v-model="changeQueryForm.consigneeTel" placeholder="请输入收件人电话"/>
         </el-form-item>
         <el-form-item v-if="changeQueryInfo.rechangeMode === 1" label="收货地区" prop="region">
-          <el-input
-              clearable
-              disabled
-              v-model="changeQueryForm.region"
-              placeholder="请输入收货地址"
-          ></el-input>
+          <el-input clearable disabled v-model="changeQueryForm.region" placeholder="请输入收货地址"/>
         </el-form-item>
         <el-form-item v-if="changeQueryInfo.rechangeMode === 1" label="详细地址" prop="address">
-          <el-input
-              clearable
-              disabled
-              v-model="changeQueryForm.address"
-              placeholder="请输入详细地址"
-          ></el-input>
+          <el-input clearable disabled v-model="changeQueryForm.address" placeholder="请输入详细地址"/>
         </el-form-item>
         <el-form-item v-if="changeQueryInfo.rechangeMode === 1" label="邮政编码" prop="postCode">
-          <el-input
-              clearable
-              v-model="changeQueryForm.postCode"
-              placeholder="请输入邮政编码"
-          ></el-input>
+          <el-input clearable v-model="changeQueryForm.postCode" placeholder="请输入邮政编码"/>
         </el-form-item>
-        <el-form-item label="卡号" prop="newCardId">
-          <el-input
-              clearable
-              maxlength="20"
-              minlength="20"
-              v-model="changeQueryForm.newCardId"
-              placeholder="卡号"
-          ></el-input>
+        <el-form-item label="审核状态" prop="rechangeStatus">
+          <el-radio-group v-model="changeQueryForm.rechangeStatus">
+            <el-radio value="SUCCESS">同意</el-radio>
+            <el-radio value="FAIL">拒绝</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label="OBU号" prop="newObuId">
-          <el-input
-              maxlength="16"
-              minlength="16"
-              clearable
-              v-model="changeQueryForm.newObuId"
-              placeholder="OBU号"
-          ></el-input>
+        <el-form-item v-if="changeQueryForm.rechangeStatus==='SUCCESS'" label="卡号" prop="newCardId">
+          <el-input clearable maxlength="20" minlength="20" v-model="changeQueryForm.newCardId" placeholder="卡号"/>
         </el-form-item>
-        <el-form-item v-if="changeQueryInfo.rechangeMode === 1" label="物流公司" prop="logisticsCompanySend">
-          <el-select
-              clearable
-              v-model="changeQueryForm.logisticsCompanySend"
-              placeholder="请选择物流公司"
-          >
-            <el-option
-                :label="item.label"
-                :key="item.value"
-                :value="item.value"
-                v-for="item in EXPRESS_DELIVERY_COMPANY"
-            />
+        <el-form-item v-if="changeQueryForm.rechangeStatus==='SUCCESS'" label="OBU号" prop="newObuId">
+          <el-input maxlength="16" minlength="16" clearable v-model="changeQueryForm.newObuId" placeholder="OBU号"/>
+        </el-form-item>
+        <el-form-item v-if="changeQueryInfo.rechangeMode === 1 && changeQueryForm.rechangeStatus==='SUCCESS'" label="物流公司" prop="logisticsCompanySend">
+          <el-select clearable v-model="changeQueryForm.logisticsCompanySend" 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 v-if="changeQueryInfo.rechangeMode === 1" label="物流单号" prop="logisticsNumberSend">
-          <el-input
-              v-trim
-              clearable
-              maxlength="60"
-              v-model="changeQueryForm.logisticsNumberSend"
-              placeholder="物流单号"
-          ></el-input>
+        <el-form-item v-if="changeQueryInfo.rechangeMode === 1 && changeQueryForm.rechangeStatus==='SUCCESS'" label="物流单号" prop="logisticsNumberSend">
+          <el-input v-trim clearable maxlength="60" v-model="changeQueryForm.logisticsNumberSend" placeholder="物流单号"/>
         </el-form-item>
 
         <!-- 备注 -->
         <el-form-item label="备注" prop="info">
-          <el-input
-              v-model="changeQueryForm.info"
-              type="textarea"
-              placeholder="请输入备注信息"
-              clearable
-          />
+          <el-input maxlength="100" v-model="changeQueryForm.info" type="textarea" placeholder="请输入备注信息" clearable/>
         </el-form-item>
       </el-form>
       <template #footer>
-        <el-button v-if="changeQueryInfo.rechangeMode === 1" type="danger" @click="changeQuerySubmit(changeQueryRef,false)">拒绝换货</el-button>
+        <el-button v-if="changeQueryInfo.rechangeMode === 1 && changeQueryForm.rechangeStatus==='FAIL'" type="danger" @click="changeQuerySubmit(changeQueryRef,false)">拒绝换货</el-button>
         <el-button @click="changeQueryDialog = false">取 消</el-button>
-        <el-button type="primary" @click="changeQuerySubmit(changeQueryRef,true)">确 定</el-button>
+        <el-button v-if="changeQueryForm.rechangeStatus==='SUCCESS'" type="primary" @click="changeQuerySubmit(changeQueryRef,true)">确 定</el-button>
       </template>
     </el-dialog>
 
@@ -1102,15 +1053,15 @@
         <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>
-        <el-descriptions-item label="退货网点ID">{{ orderReturnInfo.serviceHallId }}</el-descriptions-item>
+        <el-descriptions-item label="退货网点">{{ orderReturnInfo.serviceHallId }}</el-descriptions-item>
         <el-descriptions-item label="来源">{{ getLabel1(SOURCE_TYPE,orderReturnInfo.sourceType) }}</el-descriptions-item>
-        <el-descriptions-item label="退货表ID">{{ orderReturnInfo.id }}</el-descriptions-item>
+<!--        <el-descriptions-item label="退货表ID">{{ orderReturnInfo.id }}</el-descriptions-item>-->
         <el-descriptions-item label="物流公司">{{ orderReturnInfo.logisticsCompany }}</el-descriptions-item>
         <el-descriptions-item label="物流单号">{{ orderReturnInfo.logisticsNumber }}</el-descriptions-item>
         <el-descriptions-item label="状态">{{ orderReturnInfo.rechangeStatus === 'NEW' ? '新申请' : orderReturnInfo.rechangeStatus === 'SUCCESS' ? '审核通过' : '审核失败' }}</el-descriptions-item>
       </el-descriptions>
 
-      <div style="color:red;margin-top: 10pxc;" >注意核对退回设备是否与发出设备一致!</div>
+      <div style="color:red;margin-top: 10px;" >注意核对退回设备是否与发出设备一致!</div>
 
       <el-form ref="orderReturnRef" :model="orderReturnForm" :rules="orderReturnRules" label-width="140px">
         <h3>审核信息</h3>
@@ -1215,6 +1166,7 @@ let openId = cacheAccessToken["openId"];
 let visible = ref(false);
 let dialogVisible = ref(false);
 let deliverGoods = ref(false);
+let formLoding = ref(false);
 let check = ref(false); //审核弹窗
 let orderStep = ref(null);
 const orderStatus = ref(null);
@@ -1789,6 +1741,7 @@ function checkForm(formEl) {
 //审核弹窗
 const autdisButton = ref(false);
 function audit(idx: number, data: any, type) {
+  formLoding.value = true;
   beanData = data;
   if (type !== 0) {
     detailDialogTitle.value = "订单详情";
@@ -1800,24 +1753,32 @@ function audit(idx: number, data: any, type) {
   }).then((res: any) => {
     if (res && res.code === 0) {
       try {
+        formLoding.value = false;
         visiinfoDatable.value = res.data;
       } catch (e) {
         ElMessage.error("未知错误");
       } //渲详情数据
       if (visiinfoDatable) {
         if (type !== 0) {
+          formLoding.value = false;
           // autdis.orderId = visiinfoDatable.orderInfo.orderNo;
           visible.value = true;
         } else {
+          formLoding.value = false;
           CompleteTeturnDialog.value = true;
         }
       } else {
+        formLoding.value = false;
         ElMessage.error("没有查到详情数据");
       }
     } else {
+      formLoding.value = false;
       ElMessage.error(res.message);
     }
+  }).catch(()=>{
+    formLoding.value = false;
   });
+  // formLoding.value = false;
 }
 const biddingProcessInfoData = ref([]);
 const biddingProcessDialog = ref(false);
@@ -1861,6 +1822,7 @@ const cardIdDisabled = ref(false);
 const obuIdDisabled = ref(false);
 //显示内容 1 取消订
 function showData(data: any, start: number) {
+  formLoding.value = true;
   beanData = data;
   operationStart = start;
   content.value = ""; //进入清空
@@ -1868,6 +1830,7 @@ function showData(data: any, start: number) {
     //取消订单
     dialogVisible.value = true;
     startTitle.value = "取消订单";
+    formLoding.value = false;
   } else if (start == 2) {
     //审核
     autdisReasonType.value = "";
@@ -1875,6 +1838,7 @@ function showData(data: any, start: number) {
     autdis.reason = "";
     autdis.reason1 = "";
     check.value = true;
+    formLoding.value = false;
   } else if (start == 3) {
     //订单发货
     //数据内容赋值（先查详情）
@@ -1890,20 +1854,26 @@ function showData(data: any, start: number) {
         // sizeForm.value.courierCompany = "";
         // sizeForm.value.trackingNumber = "";
         // sizeForm.value.orderId = data.orderNo;
+        formLoding.value = false;
         deliverGoods.value = true;
       } else {
+        formLoding.value = false;
         ElMessage.error(res.message);
       }
-    });
+    }).catch(()=>{
+      formLoding.value = false;
+    })
   } else if (start == 4) {
     //退货
     dialogVisible.value = true;
     startTitle.value = "订单退货";
     exchangeInformationForm.orderNo = data.orderNo;
+    formLoding.value = false;
   } else if (start == 5) {
     //换货
     exchangeInformationDialog.value = true;
     exchangeInformationForm.orderNo = data.orderNo;
+    formLoding.value = false;
   } else if (start == 6) {
     detailDialogTitle.value = "保证金详情";
     BaseService.post("/managew/query/userdeposit", {
@@ -1916,16 +1886,21 @@ function showData(data: any, start: number) {
         } else {
           ElMessage.error("没有查到数据");
         }
+        formLoding.value = false;
       } else {
         ElMessage.error(res.message);
+        formLoding.value = false;
       }
-    });
+    }).catch(()=>{
+      formLoding.value = false;
+    })
   } else if (start == 7) {
     // 申办记录
     dialogVisible.value = true;
     startTitle.value = "申办记录";
     biddingProcessLoading.value = true;
     getBiddingProcess(data);
+    formLoding.value = false;
   } else if (start == 8) {
     // 确认收货
     ElMessageBox.confirm("确认收货吗?", "提示", {
@@ -1940,10 +1915,13 @@ function showData(data: any, start: number) {
         }).then((res: any) => {
           dialogVisible.value = false;
           ElMessage.success(res.message);
+          formLoding.value = false;
           getList();
         });
       })
-      .catch(() => {});
+      .catch(() => {
+        formLoding.value = false;
+      });
   }else if (start == 9) {
     BaseService.postN("/managew/api/issue/orderQuery/changeQuery", {
       orderNo: data.orderNo,
@@ -1952,9 +1930,13 @@ function showData(data: any, start: number) {
         const data = res.data;
         changeQueryInfo.value = data
         changeQueryForm.value = data
+        changeQueryForm.value.rechangeStatus = 'SUCCESS'
         changeQueryDialog.value = true;
+        formLoding.value = false;
       }
-    });
+    }).catch(()=>{
+      formLoding.value = false;
+    })
   }else if (start == 10) {
     BaseService.postN("/managew/api/issue/orderQuery/orderReturn", {
       orderNo: data.orderNo,
@@ -1965,8 +1947,11 @@ function showData(data: any, start: number) {
         orderReturnForm.value.id = data.id
         orderReturnForm.value.orderNo = data.orderNo
         orderReturnDialog.value = true;
+        formLoding.value = false;
       }
-    });
+    }).catch(()=>{
+      formLoding.value = false;
+    })
   }
 }
 //
@@ -2009,10 +1994,10 @@ function changeQuerySubmit(form,flag: boolean) {
           BaseService.postN("/managew/api/issue/orderQuery/changeSend", params).then((res: any) => {
             if (res && res.statusCode === 0) {
               ElMessage.success(res.message);
+              getList();
+              changeQueryDialog.value = false;
             }
           })
-          getList();
-          changeQueryDialog.value = false;
           timer = null;
         }
       })
@@ -2027,14 +2012,13 @@ function changeQuerySubmit(form,flag: boolean) {
             rechangeStatus: "FAIL",
 
           };
-          ElMessage.success(params);
-          BaseService.postN("/managew/api/issue/orderQuery/changeCancel", params).then((res: any) => {
+          BaseService.postN("/managew/api/issue/orderQuery/changeSend", params).then((res: any) => {
             if (res && res.statusCode === 0) {
               ElMessage.success(res.message);
+              getList();
+              changeQueryDialog.value = false;
             }
           })
-          getList();
-          changeQueryDialog.value = false;
           timer = null;
         }
       })