Merge branch 'dev'

src/views/order/CancelOrder/index.vue

@@ -25,7 +25,7 @@
 
 
     <Status v-model:modelValue="showAudit" @submit="intData()" />
-    <<Detaile v-model:modelValue="showDetail" @submit="intData()" :FormDataList="FormDataList" />
+    <Detaile v-model:modelValue="showDetail" @submit="intData()" :FormDataList="FormDataList" />
   </div>
 </template>
 

src/views/order/RenewalOrder/index.vue

@@ -6,7 +6,7 @@
       <Search />
     </div>
     <!-- 数据表格 -->
-    <a-table :columns="columns" :data="tableData" :pagination="pagination" :scroll="{ x: '100%', y: '400px' }">
+    <a-table :columns="columns" :data="tableData" :pagination="pagination" :scroll="{ x: 'auto'}" @page-change="onPageChange">
       <template #detail="{ record }">
         <a-button @click="openDetail(record)" type="text">订单详情</a-button>
       </template>
@@ -20,7 +20,7 @@
 
 
     <Status v-model:modelValue="showAudit" @submit="intData()" />
-    <<Detaile v-model:modelValue="showDetail" @submit="intData()" :FormDataList="FormDataList" />
+    <Detaile v-model:modelValue="showDetail" @submit="intData()" :FormDataList="FormDataList" />
   </div>
 </template>
 
@@ -88,8 +88,6 @@ const intData = async () => {
   }
   const one = await Getdictionary('source')
   const two = await Getdictionary('cardType')
-  const tree = await Getdictionary('subscriptionRelationshipStatus')
-  const tive = await Getdictionary('orderAuditStatus')
   RenewalOrderInformation(param).then(res => {
     tableData.value = (res.data.records || []).map(item => {
       const sourceName = one.find(val => item.source == val.value)?.label
@@ -102,7 +100,11 @@ const intData = async () => {
     });
     pagination.value.total = res.data.total;
   })
+}
 
+const onPageChange = (e)=>{
+  pagination.value.current = e
+  intData();
 }
 onMounted(() => {
   intData();