Merge branch 'lihui/distributionRoute' of...

Merge branch 'lihui/distributionRoute' of https://git.yidian-inc.com:8021/bp/op-web-service into lihui/distributionRoute

src/pages/Activity/Manage/index.vue

@@ -30,6 +30,7 @@
             </el-select>
           </el-form-item>
           <el-form-item style="margin-left: 50px">
+            <el-button @click="reset()">重置</el-button>
             <el-button type="primary" @click="getActivityList">搜索</el-button>
           </el-form-item>
           <el-form-item>
@@ -189,6 +190,13 @@ export default {
     };
   },
   methods: {
+    // 重置
+    reset() {
+      this.activity.activityName = "";
+      this.activity.online_status = "";
+      this.getActivityList();
+    },
+
     /* API */
     // 获取商品列表
     async getActivityList() {

src/pages/Activity/releaseProduc/components/addProduc.vue

@@ -11,13 +11,14 @@
     </div>
     <!-- Tab -->
     <el-table :data="comTableData" border style="width: 100%">
-      <el-table-column label="显示顺序" align="center" width="140">
+      <el-table-column label="" align="center" width="50px">
         <template #default="scope">
-          <i class="el-icon-top" @click="upMove(scope.$index, scope.row)"></i>
-          <i
-            class="el-icon-bottom"
-            @click="upDown(scope.$index, scope.row)"
-          ></i>
+          <i class="el-icon-top" @click="upMove(scope.$index, scope.row)" style="margin-right:15px;"></i>
+        </template>
+      </el-table-column>
+      <el-table-column label="" align="center" width="50px">
+        <template #default="scope">
+          <i class="el-icon-bottom" @click="upDown(scope.$index, scope.row)"></i>
         </template>
       </el-table-column>
       <el-table-column
@@ -87,6 +88,7 @@
         <el-form-item
           label="商品标题："
           prop="goods_name"
+          style="width:90%;"
           :rules="[{ required: true, message: '请输入商品标题' }]"
         >
           <el-input
@@ -181,7 +183,7 @@
         </div>
 
         <el-form-item
-          label="商家"
+          label="商家："
           prop="business1"
           :rules="[{ required: true, message: '请选择商家' }]"
         >

src/pages/Activity/releaseProduc/index.vue

@@ -8,9 +8,9 @@
       space="30%"
       :align-center="true"
     >
-      <el-step title="信息编辑"></el-step>
-      <el-step title="添加商品"></el-step>
-      <el-step title="拼单设置"></el-step>
+      <el-step title="信息编辑" @click="step1"></el-step>
+      <el-step title="添加商品" @click="step2"></el-step>
+      <el-step title="拼单设置" @click="step3"></el-step>
     </el-steps>
     <div class="content">
       <infoEditing
@@ -58,13 +58,13 @@ import spellOrderSet from "./components/spellOrderSet.vue";
 import {
   addMarketing,
   marketingInfo,
-  updateMarketing
+  updateMarketing,
 } from "../../../service/Activity/index";
 export default {
   components: {
     infoEditing,
     addProduc,
-    spellOrderSet
+    spellOrderSet,
   },
   data() {
     return {
@@ -78,11 +78,40 @@ export default {
       takePlaceIDArr: [],
       startTime: "",
       endTime: "",
-      stepTwoTitle: "" // 传给addProduct的title
+      stepTwoTitle: "", // 传给addProduct的title
     };
   },
 
   methods: {
+    // 步骤条点击事件
+    step1() {
+      if (this.$route.query.marketing_id != undefined) {
+        this.active = 1;
+      }
+    },
+    step2() {
+      if (this.$route.query.marketing_id != undefined) {
+        if (this.$refs.infoEdit.infoEditForm.title == "") {
+          ElMessage.error("请填写商品标题");
+          return;
+        }
+        this.active = 2;
+      }
+    },
+    step3() {
+      if (this.$route.query.marketing_id != undefined) {
+        if (this.$refs.infoEdit.infoEditForm.title == "") {
+          ElMessage.error("请填写商品标题");
+          return;
+        }else if (this.$refs.addProduc.comTableData.length == 0) {
+          ElMessage.error("请至少选择一个商品");
+          return;
+        }else{
+           this.active = 3;
+        }
+      }
+    },
+
     // 上一步
     prev() {
       this.active--;
@@ -115,7 +144,7 @@ export default {
       }
       let params = {
         marketing_id: marketingId,
-        marketing_type: "4"
+        marketing_type: "4",
       };
       const res = await marketingInfo(params);
       this.infoEditArr = res.result.marketing_info;
@@ -138,7 +167,7 @@ export default {
         if (reg.test(path)) return unescape(RegExp.$2.replace(/\+/g, " "));
         return "";
       }
-      let list = this.$refs.infoEdit.picSubmitList.map(item => {
+      let list = this.$refs.infoEdit.picSubmitList.map((item) => {
         let rs = getUrlParms(item.url, "url");
         return rs;
       });
@@ -161,14 +190,14 @@ export default {
         end_time: dayJs(this.endDate).format("YYYY-MM-DD HH:mm:ss"),
         pindan_pic: picList,
         pindan_desc: this.$refs.infoEdit.infoEditForm.desc,
-        take_place_ids: this.takePlaceIDArr
+        take_place_ids: this.takePlaceIDArr,
       };
       if (this.$route.query.marketing_id == undefined) {
         const res = await addMarketing(params);
         if (res.code === 0) {
           ElMessage.success({
             message: "添加成功",
-            type: "success"
+            type: "success",
           });
           this.$router.push({ path: "/op/activity/manage" });
         } else {
@@ -179,7 +208,7 @@ export default {
         if (res.code === 0) {
           ElMessage.success({
             message: "修改成功",
-            type: "success"
+            type: "success",
           });
           this.$router.push({ path: "/op/activity/manage" });
         } else {
@@ -189,11 +218,11 @@ export default {
     },
     getTakeTakePlaceListFromChild(val) {
       this.takePlaceIDArr = val;
-    }
+    },
   },
   created() {
     this.marketingInfoMet();
-  }
+  },
 };
 </script>
 
@@ -224,8 +253,13 @@ export default {
   margin: 20px auto;
 }
 .stepsBtn {
-  width: 64%;
+  width: 100%;
+  height: 80px;
+  line-height: 80px;
+  background: white;
+  position: fixed;
+  bottom: 0px;
   text-align: center;
-  margin-top: 50px;
 }
+
 </style>

src/pages/Groupmeal/orderManagement/index.vue

@@ -77,6 +77,39 @@
             ></el-option>
           </el-select>
         </el-form-item>
+
+        <!-- <el-form-item label="详细地址：" prop="detailed_address">
+          <el-select
+            v-model="orderQueryObj.detailed_address"
+            placeholder="请选择"
+            filterable
+          >
+            <el-option
+              v-for="item in selLiftPoinArr"
+              :key="item.sub_shop_id"
+              :label="item.sub_shop_name"
+              :value="item.sub_shop_id"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+
+        <el-form-item label="下单时间：" prop="order_time">
+          <el-date-picker
+            v-model="order_time"
+            type="datetimerange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button size="small" @click="today">今天</el-button>
+          <el-button size="small" @click="yesterday">昨天</el-button>
+        </el-form-item>
+
         <el-form-item>
           <el-button @click="resetOrder('ruleForm')">重置</el-button>
           <el-button type="primary" @click="searchOrder">搜索</el-button>
@@ -374,16 +407,15 @@ import {
   orderItemList,
   orderRefundReject,
   refundOrder,
-  getOrderExportURL
+  getOrderExportURL,
 } from "@/service/Groupmeal/groupmeal";
-// import page from "../../components/Pagination.vue";
 import page from "../components/Pagination/index.vue";
-
+import dayJs from "dayjs";
 export default {
   name: "orderManagement",
   components: {
     Layout,
-    page
+    page,
   },
   data() {
     return {
@@ -391,13 +423,17 @@ export default {
       orderQueryObj: {
         page: 1,
         page_size: 10,
-        marketing_id: "", // 活动名称
+        marketing_id: "0", // 活动名称
         order_status: "0", // 订单状态
         goods_id: "", // 商品名称
         cust_user: "", // 收货人
         order_id: "", // 订单编号
-        sub_shop_id: "" // 自提点
+        sub_shop_id: "", // 自提点
+        // detailed_address: "", // 详细地址
+        create_time_start: "", // 开始时间
+        create_time_end: "", // 结束时间
       },
+      order_time: [], // 下单时间
       // 下拉框数据
       // 活动名称
       activityNameArr: [],
@@ -405,36 +441,36 @@ export default {
       orderStatusArr: [
         {
           value: "0",
-          label: "全部"
+          label: "全部",
         },
         {
           value: "1",
-          label: "未支付"
+          label: "未支付",
         },
         {
           value: "2",
-          label: "已支付"
+          label: "已支付",
         },
         {
           value: "3",
-          label: "待退款"
+          label: "待退款",
         },
         {
           value: "4",
-          label: "已退款"
+          label: "已退款",
         },
         {
           value: "5",
-          label: "退款中"
+          label: "退款中",
         },
         {
           value: "6",
-          label: "已拒绝"
+          label: "已拒绝",
         },
         {
           value: "7",
-          label: "售后"
-        }
+          label: "售后",
+        },
       ],
       // 商品名称
       tradeNameArr: [],
@@ -472,9 +508,9 @@ export default {
           payment: "", // 实付
           refundableQuantity: "",
           refundAmount: "",
-          amountToRefund: ""
-        }
-      ]
+          amountToRefund: "",
+        },
+      ],
     };
   },
 
@@ -487,7 +523,7 @@ export default {
     },
     exportURL3() {
       return getOrderExportURL(this.orderQueryObj.marketing_id, "3");
-    }
+    },
   },
 
   methods: {
@@ -499,7 +535,9 @@ export default {
     async getMarketingListMet() {
       try {
         const res = await getMarketingList();
-        this.activityNameArr = res.result;
+        let allArr = [{ marketing_id: "0", marketing_name: "全部活动" }];
+        let arr = allArr.concat(res.result);
+        this.activityNameArr = arr;
       } catch (error) {
         this.$message.error("发生未知错误,请稍后再试一下吧~~~");
         console.error(error);
@@ -510,7 +548,7 @@ export default {
     async activityNameSel(val) {
       this.orderQueryObj.goods_id = "";
       const params = {
-        marketing_id: val
+        marketing_id: val,
       };
       const res = await getGoodsList(params); // 商品名称
       this.getSubShopListMet(val); //自提点
@@ -534,11 +572,40 @@ export default {
       }
     },
 
+    // 获取今天日期
+    today() {
+      this.order_time[0] = dayJs(
+        new Date(new Date(new Date().toLocaleDateString()).getTime())
+      ).format("YYYY-MM-DD HH:mm:ss");
+      this.order_time[1] = dayJs(
+        new Date(
+          new Date(new Date().toLocaleDateString()).getTime() +
+            24 * 60 * 60 * 1000
+        )
+      ).format("YYYY-MM-DD HH:mm:ss");
+    },
+
+    // 获取昨天日期
+    yesterday() {
+      this.order_time[0] = dayJs(
+        new Date(
+          new Date(new Date().toLocaleDateString()).getTime() -
+            24 * 60 * 60 * 1000
+        )
+      ).format("YYYY-MM-DD HH:mm:ss");
+      this.order_time[1] = dayJs(
+        new Date(new Date(new Date().toLocaleDateString()).getTime())
+      ).format("YYYY-MM-DD HH:mm:ss");
+    },
+
     // 重置
     resetOrder(formName) {
-      this.$refs[formName].resetFields();
+      this.order_time = [];
       this.orderQueryObj.page = 1;
       this.orderQueryObj.page_size = 10;
+      this.orderQueryObj.create_time_start = "";
+      this.orderQueryObj.create_time_end = "";
+      this.$refs[formName].resetFields();
       this.getOrderListMet(this.orderQueryObj);
     },
 
@@ -546,6 +613,8 @@ export default {
     searchOrder() {
       this.orderQueryObj.page = 1;
       this.orderQueryObj.page_size = 10;
+      this.orderQueryObj.create_time_start = this.order_time[0];
+      this.orderQueryObj.create_time_end = this.order_time[1];
       this.getOrderListMet(this.orderQueryObj);
     },
 
@@ -564,7 +633,10 @@ export default {
     },
     // 导出
     exportOrder() {
-      if (this.orderQueryObj.marketing_id === "") {
+      if (
+        this.orderQueryObj.marketing_id === "" ||
+        this.orderQueryObj.marketing_id === "0"
+      ) {
         this.$message.error("请选择活动名称");
         return;
       }
@@ -576,7 +648,7 @@ export default {
       const params = {
         marketing_id: this.orderQueryObj.marketing_id,
         // marketing_id: "1NJETU",
-        force_print: forcePrint ? "1" : ""
+        force_print: forcePrint ? "1" : "",
       };
       const res = await orderPrint(params);
       return res;
@@ -584,7 +656,10 @@ export default {
 
     // 打印
     async printOrder() {
-      if (this.orderQueryObj.marketing_id === "") {
+      if (
+        this.orderQueryObj.marketing_id === "" ||
+        this.orderQueryObj.marketing_id === "0"
+      ) {
         this.$message.error("请选择活动名称");
         return;
       }
@@ -593,7 +668,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: "success",
-          message: "打印成功"
+          message: "打印成功",
         });
         return;
       }
@@ -611,7 +686,7 @@ export default {
         try {
           await this.$confirm(res.reason, "打印", {
             cancelButtonText: "取消",
-            confirmButtonText: "确定"
+            confirmButtonText: "确定",
           });
         } catch (e) {
           // 取消
@@ -652,21 +727,21 @@ export default {
       try {
         await this.$confirm("确定要拒绝退款么?", "拒绝", {
           cancelButtonText: "取消",
-          confirmButtonText: "确定"
+          confirmButtonText: "确定",
         });
       } catch (e) {
         // 取消
         return;
       }
       const params = {
-        order_id: val.order_id
+        order_id: val.order_id,
       };
       const res = await orderRefundReject(params);
 
       if (res.code === 0) {
         this.$message({
           type: "success",
-          message: "订单已驳回"
+          message: "订单已驳回",
         });
       } else {
         this.$message.error(res.reason);
@@ -693,7 +768,7 @@ export default {
       this.checkAll = false;
       this.refundGoods = [];
       const params = {
-        order_id: val.order_id
+        order_id: val.order_id,
       };
       const res = await orderItemList(params);
       this.refundGoods = res.result;
@@ -720,15 +795,15 @@ export default {
         return this.refundGoods.filter(isSelected);
       };
 
-      const convertToNumber = str => {
+      const convertToNumber = (str) => {
         return !Number.isNaN(parseFloat(str)) ? parseFloat(str) : 0;
       };
 
-      const processRefundItem = item => {
+      const processRefundItem = (item) => {
         return {
           order_item_id: item.order_item_id,
           refund_num: item.refundableQuantity || 0,
-          refund_amount: convertToNumber(item.amountToRefund)
+          refund_amount: convertToNumber(item.amountToRefund),
         };
       };
 
@@ -754,13 +829,13 @@ export default {
       }
       // this.refundShow = false;
       this.$message.error(res.reason);
-    }
+    },
   },
   created() {
     this.getMarketingListMet(); // 活动名称
     this.getSubShopListMet(); // 自提点
     this.getOrderListMet(); // table列表
-  }
+  },
 };
 </script>