feature:完成页面

server/controllers/groupmeal.js

@@ -9,5 +9,45 @@ exports.getOrderList = async ctx => {
         method: "GET"
     };
     ctx.body = await req(ctx, opts);
-  };
+};
 
+// 获取主页配送列表
+exports.getList = async ctx => {
+    const opts = {
+        url: `${GROUPMEAL_URI}/order/deliverer/list_day_deliverer_conf`,
+        method: "POST",
+        json: true,
+        body: ctx.request.body
+    };
+    ctx.body = await req(ctx, opts);
+};
+// 获取配送列表
+exports.getDelivererList = async ctx => {
+    const opts = {
+        url: `${GROUPMEAL_URI}/order/deliverer/list_day_deliverer`,
+        method: "POST",
+        json: true,
+        body: ctx.request.body
+    };
+    ctx.body = await req(ctx, opts);
+};
+// 添加骑手
+exports.getAddDeliverer = async ctx => {
+    const opts = {
+        url: `${GROUPMEAL_URI}/order/deliverer/add_deliverer`,
+        method: "POST",
+        json: true,
+        body: ctx.request.body
+    };
+    ctx.body = await req(ctx, opts);
+};
+// 分配骑手
+exports.getSaveDeliverer = async ctx => {
+    const opts = {
+        url: `${GROUPMEAL_URI}/order/deliverer/save_day_deliverer`,
+        method: "POST",
+        json: true,
+        body: ctx.request.body
+    };
+    ctx.body = await req(ctx, opts);
+};

server/router.js

@@ -62,6 +62,11 @@ router.post(`${API_VERSION}/merchant/lifeinner/life_info`, life.get_life_info)
 router.get(`${API_VERSION}/merchant/lifeinner/life_list`, life.get_life_list)
 //用户
 router.post(`${API_VERSION}/merchant/authority/get_user_info`, user.getUser_detail)
+// 团餐运营--配送
+router.post(`${API_VERSION}/order/deliverer/list_day_deliverer_conf`, groupmeal.getList)
+router.post(`${API_VERSION}/order/deliverer/list_day_deliverer`, groupmeal.getDelivererList)
+router.post(`${API_VERSION}/order/deliverer/add_deliverer`, groupmeal.getAddDeliverer)
+router.post(`${API_VERSION}/order/deliverer/save_day_deliverer`, groupmeal.getSaveDeliverer)
 
 // 订单管理
 router.get(`${API_VERSION}/order/background/order_list`, groupmeal.getOrderList);

src/pages/Groupmeal/Distrib/index.vue

@@ -12,21 +12,21 @@
       <el-table :data="distribList" border stripe style="width: 100%">
         <el-table-column
           align="center"
-          prop="name"
+          prop="activeName"
           label="活动名称"
           width="width"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="number"
+          prop="delivererCount"
           label="配送员数量"
           width="width"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="people"
+          prop="deliverers"
           label="配送人员"
           width="width"
         >
@@ -57,7 +57,7 @@
         <el-form class="dioFor" :model="addDistrib" :rules="rules">
           <el-form-item label="姓名" label-width="100px" prop="name">
             <el-input
-              v-model="addDistrib.name"
+              v-model="deliverer.name"
               maxlength="10"
               type="text"
               show-word-limit
@@ -67,7 +67,7 @@
           </el-form-item>
           <el-form-item label="配送上限" label-width="100px" prop="limit">
             <el-input
-              v-model.number="addDistrib.limit"
+              v-model.number="deliverer.max_capacity"
               onkeyup="value=value.replace(/[^\d]/g,'')"
               clearable
               autocomplete="off"
@@ -75,7 +75,7 @@
           </el-form-item>
           <el-form-item label="最小配送量" label-width="100px" prop="minvolume">
             <el-input
-              v-model.number="addDistrib.minvolume"
+              v-model.number="deliverer.min_capacity"
               onkeyup="value=value.replace(/[^\d]/g,'')"
               clearable
               autocomplete="off"
@@ -83,7 +83,7 @@
           </el-form-item>
           <el-form-item label="配送工具" label-width="100px" prop="tool">
             <el-select
-              v-model="addDistrib.tool"
+              v-model="deliverer.tool_type"
               clearable
               placeholder="请选择活动区域"
             >
@@ -108,9 +108,9 @@
         width="40%"
         :show-close="false"
       >
-        <el-form class="dioFor" :model="assignDistrib">
+        <el-form class="dioFor" :model="deliverer">
           <el-form-item label="活动姓名" label-width="100px">
-            <el-select v-model="assignDistrib.name" clearable filterable>
+            <el-select v-model="deliverer.code" clearable filterable>
               <el-option label="电动车" value="electric"></el-option>
               <el-option label="摩托车" value="motorcycle"></el-option>
             </el-select>
@@ -119,7 +119,7 @@
           <el-table
             class="diotab"
             align="center"
-            :data="data"
+            :data="deliverer"
             max-height="200"
             border
             size="small"
@@ -140,28 +140,28 @@
             </el-table-column>
             <el-table-column
               align="center"
-              prop=""
+              prop="deliverer_name"
               label="配送员姓名"
               width="100"
             >
             </el-table-column>
             <el-table-column
               align="center"
-              prop=""
+              prop="deliverer_max_capacity"
               label="配送上限"
               width="100"
             >
             </el-table-column>
             <el-table-column
               align="center"
-              prop=""
+              prop="deliverer_min_capacity"
               label="最少配送量"
               width="100"
             >
             </el-table-column>
             <el-table-column
               align="center"
-              prop=""
+              prop="deliverer_tool_type"
               label="配送工具"
               width="100"
             >
@@ -182,7 +182,7 @@
 </template>
 <script>
 import Layout from "../layout/index.vue";
-// import { getActivity } from "../../../service/Groupmeal/groupmeal";
+import { getDelivererList, getList } from "../../../service/Groupmeal/groupmeal";
 export default {
   name: "Distrib",
   components: {
@@ -204,18 +204,21 @@ export default {
     //   列表
     distribList: [],
       // 添加配送员弹框
-      addDistrib: {
+      addDeliverer: [{
         name: "",
-        limit: "", //配送上限
-        minvolume: "", //最小配送量
-        tool: [], //配送工具
-      },
+        max_capacity: "", //配送上限
+        min_capacity: "", //最小配送量
+        tool_type: [], //配送工具
+      }],
       //分配配送员弹框
       dialogFormAssign: false,
-      assignDistrib: {
-          name:"",
-          people:""
-      },
+      deliverer: [{
+        code:"",
+        deliverer_name: "",
+        deliverer_max_capacity: "", //配送上限
+        deliverer_min_capacity: "", //最小配送量
+        deliverer_tool_type: [], //配送工具
+      }],
       courier:[],//配送员
     };
   },
@@ -224,15 +227,15 @@ export default {
       //   this.ruleForm.goods_spu_id = e.map((item) => item.goods_sku_id);
     },
     // 获取主页列表
-    async getDistribList() {
+    async getList() {
         try {
-        //   const res = await getDistribList()
-        //   this.distribList = res.result
-        this.distribList =[{
-            name: "你大哥",
-            number: "5",
-            people: [{id:"2",name:"张三"},{id:"2",name:"张ba"}]
-        }]
+          const res = await getList(this.distribList)
+          this.distribList = res.response
+        // this.distribList =[{
+        //     name: "你大哥",
+        //     number: "5",
+        //     people: [{id:"2",name:"张三"},{id:"2",name:"张ba"}]
+        // }]
         } catch (error) {
             console.log(error);
         }
@@ -249,18 +252,19 @@ export default {
         console.log(row)
     },
     // 活动名称列表
-    async getActivity() {
-    //   try {
-    //     const res = await getActivity();
-    //     this.addDistrib.name = res.result;
-    //   } catch (error) {
-    //     console.log(error);
-    //   }
+    async getDelivererList() {
+      try {
+        const res = await getDelivererList(this.deliverer);
+        // this.deliverer.code = res.response.code;
+        this.deliverer.deliverer_name = res.response;
+      } catch (error) {
+        console.log(error);
+      }
     },
   },
   created() {
-    this.getDistribList()
-    this.getActivity()
+    this.getDelivererList()
+    this.getList()
 }
 };
 </script>

src/service/Groupmeal/groupmeal.js

 import axios from "@/utils/request";
 
-// 获取配送员列表
-export async function getDistribList () {
-    const res = await axios.get("/api/v1/get_goods_category_list");
+// 获取主页配送员列表
+export async function getList (params) {
+    const res = await axios.post("/api/v1/order/deliverer/list_day_deliverer_conf",{params});
     return res;
   }
+// 获取分配配送员列表
+export async function getDelivererList (params) {
+    const res = await axios.post("/api/v1/order/deliverer/list_day_deliverer",{params});
+    return res;
+  }
+//   添加配送员
+export async function getAddDeliverer (params) {
+    const res = await axios.post("/api/v1/order/deliverer/add_deliverer",{params});
+    return res;
+}
+//   分配配送员
+export async function getSaveDeliverer (params) {
+    const res = await axios.post("/api/v1/order/deliverer/save_day_deliverer",{params});
+    return res;
+}
\ No newline at end of file