init

src/api/xq/groupOrder.js

@@ -17,20 +17,11 @@ export function getGroupOrder(id) {
   })
 }
 
-// 新增入群订单
-export function addGroupOrder(data) {
-  return request({
-    url: '/xq/groupOrder',
-    method: 'post',
-    data: data
-  })
-}
-
 // 修改入群订单
-export function updateGroupOrder(data) {
+export function commitGroupOrder(data) {
   return request({
-    url: '/xq/groupOrder',
-    method: 'put',
+    url: '/xq/groupOrder/dealStatus/commit',
+    method: 'post',
     data: data
   })
 }

src/constant/statusMap.js

@@ -513,6 +513,11 @@ export const payStatusList = [
   { value: 10, label: '无需支付',listClass: listClass.info},
 ]
 
+export const dealStatusList = [
+  { value: 0, label: '待处理',listClass: listClass.danger},
+  { value: 1, label: '已处理',listClass: listClass.primary},
+]
+
 export const platformTypeList = [
   { value: "ADMIN", label: '后台操作',listClass: listClass.danger},
   { value: "WX", label: '微信',listClass: listClass.success},

src/views/xq/groupOrder/index.vue

@@ -41,6 +41,28 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="支付状态" prop="payStatus">
+        <el-select v-model="queryParams.payStatus" clearable size="small">
+          <el-option
+            v-for="dict in payStatusList"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="处理状态" prop="dealStatus">
+        <el-select v-model="queryParams.dealStatus" clearable size="small">
+          <el-option
+            v-for="dict in dealStatusList"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -77,22 +99,29 @@
           <cai-dict-tag :options="payStatusList" :value="scope.row.payStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="后台新增" align="center" prop="admin" >
+      <el-table-column label="处理状态" align="center" prop="dealStatus">
         <template v-slot="scope">
-          <cai-dict-tag :options="booleanList" :value="scope.row.admin" />
+          <cai-dict-tag :options="dealStatusList" :value="scope.row.dealStatus" />
         </template>
       </el-table-column>
       <el-table-column label="支付时间" align="center" prop="payTime" width="160" />
-      <el-table-column label="下单时间" align="center" prop="payTime" width="160" />
+      <el-table-column label="下单时间" align="center" prop="createTime" width="160" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+<!--          <el-button
             size="mini"
             type="text"
             icon="el-icon-info"
             @click="handleInfo(scope.row)"
             v-hasPermi="['xq:groupOrder:remove']"
-          >详情</el-button>
+          >详情</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.dealStatus === 0 && scope.row.payStatus === 1"
+            @click="handleCommitDealStatus(scope.row)"
+            v-hasPermi="['xq:groupOrder:edit']"
+          >处理</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -108,14 +137,14 @@
 </template>
 
 <script>
-import { listGroupOrder } from '@/api/xq/groupOrder'
-import { booleanList, payStatusList, platformTypeList } from '@/constant/statusMap'
+import { commitGroupOrder, listGroupOrder } from '@/api/xq/groupOrder'
+import { booleanList, dealStatusList, payStatusList, platformTypeList } from '@/constant/statusMap'
 
 export default {
   name: "GroupOrder",
   data() {
     return {
-      payStatusList,booleanList,platformTypeList,
+      payStatusList,booleanList,platformTypeList,dealStatusList,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -130,10 +159,6 @@ export default {
       total: 0,
       // 入群订单表格数据
       groupOrderList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -143,6 +168,8 @@ export default {
         groupName: undefined,
         joinMobile: undefined,
         orderNo: undefined,
+        dealStatus: undefined,
+        payStatus: 1,
       },
     };
   },
@@ -175,6 +202,19 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    handleCommitDealStatus(row){
+      this.$modal.confirm('是否确认完成用户的入群标记？').then(() => {
+        this.loading = true;
+        return commitGroupOrder({id: row.id});
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("操作成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    }
   }
 };
 </script>