1.新增订单手动退款 2.团购新增抖音团购核销

src/views/group_buy/components/scanGroup.vue

@@ -157,14 +157,20 @@ async function groupOrdergroupScanHandle() {
                 break;
             case 2:
                 {
-                    groupDetailLoading.value = true
-                    let encrypted_codes = douyin_table.value.getSelectionRows().map(item => item.encrypted_code)
-                    console.log(encrypted_codes);
-                    const res = await douyincertificateprepare({
-                        verify_token: groupDetail.value.verify_token,
-                        encrypted_codes: encrypted_codes.join(','),
-                        id: groupDetail.value.id
-                    })
+                    let encrypted_codes = douyin_table.value.getSelectionRows()
+                    if (encrypted_codes.length) {
+                        groupDetailLoading.value = true
+                        let arr = encrypted_codes.map(item => item.encrypted_code)
+                        console.log(encrypted_codes);
+                        const res = await douyincertificateprepare({
+                            verify_token: groupDetail.value.verify_token,
+                            encrypted_codes: arr.join(','),
+                            id: groupDetail.value.id
+                        })
+                    } else {
+                        ElMessage.error('请选择核销项目')
+                        return
+                    }
                 }
                 break;
             default:
@@ -261,7 +267,7 @@ const inputChange = _.debounce(function (e) {
 }, 500);
 
 function show() {
-    global.updateData(true)
+    global.updateData(false)
     dialogVisible.value = true;
     setTimeout(() => {
         inputRef.value.focus();
@@ -269,7 +275,7 @@ function show() {
 }
 
 function close() {
-    global.updateData(false)
+    global.updateData(true)
     dialogVisible.value = false;
 }
 

src/views/group_buy/index.vue

@@ -103,8 +103,9 @@
                 </el-table>
             </div>
             <div class="pagination">
-                <el-pagination @current-change="paginationChange" :current-page="tableData.page"
-                    :page-size="tableData.size" layout="total, prev, pager, next" :total="tableData.total" background>
+                <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.size"
+                    layout="total, prev, pager, next" :total="tableData.total" background
+                    @current-change="paginationChange" @size-change="paginationChange">
                 </el-pagination>
             </div>
         </div>
@@ -231,16 +232,19 @@ function typeChange(e) {
         default:
             break;
     }
+    tableData.status = ''
+    tableData.page = 1
+    tableData.list = []
+    groupOrderlistAjax()
 }
 
 // 状态
 function statusFilter(t) {
-    return statusList.find(item => item.value == t)?.label
+    return originStatus.find(item => item.value == t)?.label
 }
 
 // 分页变化
 function paginationChange(e) {
-    tableData.page = e
     groupOrderlistAjax()
 }
 
@@ -307,7 +311,6 @@ async function groupOrderlistAjax() {
 
 onMounted(() => {
     typeChange(tableData.type)
-    groupOrderlistAjax()
 })
 </script>