From 64b0e164027a978ce6d0b2c5e1645a58c5fa514a Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Tue, 25 Oct 2022 14:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=9B=A2=E9=98=9F2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/components/activity-item.vue     | 16 ++++++++++++++
 .../order/components/order-search.vue         | 22 +++++++++++++------
 src/views/sylive/activity/order/index.vue     |  8 +++++++
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/views/sylive/activity/components/activity-item.vue b/src/views/sylive/activity/components/activity-item.vue
index dfcf9c7..b7010ee 100644
--- a/src/views/sylive/activity/components/activity-item.vue
+++ b/src/views/sylive/activity/components/activity-item.vue
@@ -26,6 +26,14 @@
           placeholder="请输入商品价格"
         />
       </el-form-item>
+      <el-form-item label="库存数:" prop="stock">
+        <el-input
+          clearable
+          :maxlength="60"
+          v-model="form.stock"
+          placeholder="请输入库存数"
+        />
+      </el-form-item>
       <el-form-item label="商品图片:" prop="itemImg" v-show="false">
         <ele-image-upload
           v-model="form.itemImg"
@@ -99,6 +107,7 @@
         activityId: null,
         title: '',
         price: '',
+        stock: '',
         itemImg: [],
         dateRange: '',
         dateUseRange: '',
@@ -132,6 +141,13 @@
               trigger: 'blur'
             }
           ],
+          stock: [
+            {
+              required: true,
+              message: '请输入库存数',
+              trigger: 'blur'
+            }
+          ],
           dateUseRange: [
             {
               required: true,
diff --git a/src/views/sylive/activity/order/components/order-search.vue b/src/views/sylive/activity/order/components/order-search.vue
index 27b18d3..8f2a562 100644
--- a/src/views/sylive/activity/order/components/order-search.vue
+++ b/src/views/sylive/activity/order/components/order-search.vue
@@ -7,22 +7,30 @@
     @submit.native.prevent
   >
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 8, md: 16 } : { span: 8 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="姓名:">
           <el-input clearable v-model="where.uname" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 8, md: 16 } : { span: 8 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="手机号:">
           <el-input clearable v-model="where.mobile" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 8, md: 16 } : { span: 8 }">
-        <el-form-item label="商品标题:">
-          <el-input clearable v-model="where.item_title" placeholder="请输入" />
+      <el-col v-bind="styleResponsive ? { lg: 4, md: 8 } : { span: 4 }">
+        <el-form-item label="来源:">
+          <el-select
+            clearable
+            v-model="where.cfrom"
+            placeholder="请选择"
+            class="ele-fluid"
+          >
+            <el-option label="门店" :value="0" />
+            <el-option label="团队" :value="1" />
+          </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 4, md: 8 } : { span: 4 }">
         <el-form-item label="状态:">
           <el-select
             clearable
@@ -60,7 +68,7 @@
         status: 1,
         uname: '',
         mobile: '',
-        item_title: ''
+        cfrom: ''
       };
       return {
         // 表单数据
diff --git a/src/views/sylive/activity/order/index.vue b/src/views/sylive/activity/order/index.vue
index 5d5cbb2..71e5d73 100644
--- a/src/views/sylive/activity/order/index.vue
+++ b/src/views/sylive/activity/order/index.vue
@@ -116,6 +116,12 @@
             showOverflowTooltip: true,
             minWidth: 60
           },
+          {
+            prop: 'cfromName',
+            label: '来源',
+            showOverflowTooltip: true,
+            minWidth: 60
+          },
           {
             prop: 'statusName',
             label: '状态',
@@ -170,6 +176,7 @@
             '区域',
             '门店',
             '顾问',
+            '来源',
             '状态'
           ]
         ];
@@ -191,6 +198,7 @@
                   d.area,
                   d.stores,
                   d.consultant,
+                  d.cfromName,
                   d.statusName
                 ]);
               });