From 0e9ff425aec6d8671af7a55cbb50b786404da0ed Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Fri, 5 May 2023 11:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8A=A0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/institution/organization/index.js     | 12 +++-
 src/api/sylive/activity/index.js              |  6 +-
 .../components/activity-visit-tag.vue         |  5 ++
 .../sylive/goods/components/goods-edit.vue    | 21 ++++---
 .../components/gro-customer-search.vue        | 59 ++++++++++++++++++-
 .../components/gro-order-search.vue           | 59 ++++++++++++++++++-
 6 files changed, 141 insertions(+), 21 deletions(-)

diff --git a/src/api/institution/organization/index.js b/src/api/institution/organization/index.js
index cec49d3..33a124f 100644
--- a/src/api/institution/organization/index.js
+++ b/src/api/institution/organization/index.js
@@ -71,7 +71,17 @@ export async function updateOrganization(data) {
  * @param id 机构id
  */
 export async function removeOrganization(id) {
-  const res = await request.delete('/institution/organization/' + id);
+  return removeOrganizations([id]);
+}
+
+/**
+ * 批量删除机构
+ * @param data 机构id集合
+ */
+export async function removeOrganizations(ids) {
+  const res = await request.delete('/institution/organization/batch', {
+    data: { ids }
+  });
   if (res.data.code === 0) {
     return res.data.message;
   }
diff --git a/src/api/sylive/activity/index.js b/src/api/sylive/activity/index.js
index 9d52b2e..8f33770 100644
--- a/src/api/sylive/activity/index.js
+++ b/src/api/sylive/activity/index.js
@@ -33,11 +33,7 @@ export async function getActivityInfo(params) {
  * @param id 活动id
  */
 export async function getActivity(id) {
-  const res = await request.get('/sylive/activity/' + id);
-  if (res.data.code === 0) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
+  return getActivityInfo({ activityId: id });
 }
 
 /**
diff --git a/src/views/sylive/activity/components/activity-visit-tag.vue b/src/views/sylive/activity/components/activity-visit-tag.vue
index d29330f..7640e47 100644
--- a/src/views/sylive/activity/components/activity-visit-tag.vue
+++ b/src/views/sylive/activity/components/activity-visit-tag.vue
@@ -102,6 +102,11 @@
             this.$util.assignObject(this.form, {
               ...this.data
             });
+            /* 升序排序 */
+            const visitTag = this.form.visitTag;
+            if (visitTag) {
+              this.form.visitTag = visitTag.sort((a, b) => a.id - b.id);
+            }
             this.isUpdate = true;
           } else {
             this.form.visitTag = [];
diff --git a/src/views/sylive/goods/components/goods-edit.vue b/src/views/sylive/goods/components/goods-edit.vue
index ced4b0e..b589e49 100644
--- a/src/views/sylive/goods/components/goods-edit.vue
+++ b/src/views/sylive/goods/components/goods-edit.vue
@@ -19,19 +19,19 @@
         />
       </el-form-item>
       <el-form-item label="商品价格:" prop="price">
-        <el-input
-          clearable
-          :maxlength="60"
+        <el-input-number
           v-model="form.price"
-          placeholder="请输入商品价格"
+          controls-position="right"
+          :min="0"
+          style="width: 150px; margin-right: 10px"
         />
       </el-form-item>
       <el-form-item label="库存数:" prop="stock">
-        <el-input
-          clearable
-          :maxlength="60"
+        <el-input-number
           v-model="form.stock"
-          placeholder="请输入库存数"
+          controls-position="right"
+          :min="0"
+          style="width: 150px; margin-right: 10px"
         />
       </el-form-item>
       <el-form-item label="商品图片:" prop="banner">
@@ -97,7 +97,6 @@
           v-model="form.sort"
           controls-position="right"
           :min="0"
-          :max="100"
           style="width: 150px; margin-right: 10px"
         />
       </el-form-item>
@@ -140,8 +139,8 @@
         activityId: null,
         type: 0,
         title: '',
-        price: '',
-        stock: '',
+        price: 0,
+        stock: 0,
         banner: [],
         dateRange: '',
         useRange: '',
diff --git a/src/views/sylive/groups-customer/components/gro-customer-search.vue b/src/views/sylive/groups-customer/components/gro-customer-search.vue
index 7ec9ca7..80a6207 100644
--- a/src/views/sylive/groups-customer/components/gro-customer-search.vue
+++ b/src/views/sylive/groups-customer/components/gro-customer-search.vue
@@ -66,6 +66,21 @@
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
+        <el-form-item label="创建时间:">
+          <el-date-picker
+            unlink-panels
+            v-model="dateRange"
+            range-separator="-"
+            type="datetimerange"
+            end-placeholder="结束日期"
+            start-placeholder="开始日期"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            class="ele-fluid"
+          />
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 8 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button
@@ -105,7 +120,41 @@
         // 商品数据
         goodsList: [],
         // 表单数据
-        where: { ...defaultWhere }
+        where: { ...defaultWhere },
+        // 日期范围选择
+        dateRange: [],
+        // 日期时间选择器快捷项
+        pickerOptions: {
+          shortcuts: [
+            {
+              text: '最近一周',
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                picker.$emit('pick', [start, end]);
+              }
+            },
+            {
+              text: '最近一个月',
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                picker.$emit('pick', [start, end]);
+              }
+            },
+            {
+              text: '最近三个月',
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                picker.$emit('pick', [start, end]);
+              }
+            }
+          ]
+        }
       };
     },
     computed: {
@@ -118,11 +167,17 @@
     methods: {
       /* 搜索 */
       search() {
-        this.$emit('search', this.where);
+        const [createTimeStart, createTimeEnd] = this.dateRange;
+        this.$emit('search', {
+          ...this.where,
+          createTimeStart,
+          createTimeEnd
+        });
       },
       /*  重置 */
       reset() {
         this.where = { ...this.defaultWhere };
+        this.dateRange = [];
         this.search();
       },
       /* 查询分组 */
diff --git a/src/views/sylive/groups-order/components/gro-order-search.vue b/src/views/sylive/groups-order/components/gro-order-search.vue
index b3fa5c8..017bde0 100644
--- a/src/views/sylive/groups-order/components/gro-order-search.vue
+++ b/src/views/sylive/groups-order/components/gro-order-search.vue
@@ -88,6 +88,21 @@
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
+        <el-form-item label="创建时间:">
+          <el-date-picker
+            unlink-panels
+            v-model="dateRange"
+            range-separator="-"
+            type="datetimerange"
+            end-placeholder="结束日期"
+            start-placeholder="开始日期"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            class="ele-fluid"
+          />
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 8 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button
@@ -127,7 +142,41 @@
         // 商品数据
         goodsList: [],
         // 表单数据
-        where: { ...defaultWhere }
+        where: { ...defaultWhere },
+        // 日期范围选择
+        dateRange: [],
+        // 日期时间选择器快捷项
+        pickerOptions: {
+          shortcuts: [
+            {
+              text: '最近一周',
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                picker.$emit('pick', [start, end]);
+              }
+            },
+            {
+              text: '最近一个月',
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                picker.$emit('pick', [start, end]);
+              }
+            },
+            {
+              text: '最近三个月',
+              onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                picker.$emit('pick', [start, end]);
+              }
+            }
+          ]
+        }
       };
     },
     computed: {
@@ -140,11 +189,17 @@
     methods: {
       /* 搜索 */
       search() {
-        this.$emit('search', this.where);
+        const [createTimeStart, createTimeEnd] = this.dateRange;
+        this.$emit('search', {
+          ...this.where,
+          createTimeStart,
+          createTimeEnd
+        });
       },
       /*  重置 */
       reset() {
         this.where = { ...this.defaultWhere };
+        this.dateRange = [];
         this.search();
       },
       /* 查询分组 */