up

src/api/finance/index.js

@@ -39,3 +39,12 @@ export function fine(data){
     data
   })
 }
+
+export function changeremark(data){
+  return request({
+    method:'post',
+    url:'/api/admin/finance/modify-remark',
+    data
+  })
+}
+

src/views/activity/activityList.vue

@@ -8,7 +8,11 @@
             <Select clearable v-model="select.active_type_id" style="width: 200px;margin-right: 10px;" placeholder="选择活动分类">
               <Option v-for="item in activeTypeList" :value="item.id">{{item.name}}</Option>
             </Select>
-            <Button type="primary" @click="getActivities">查询</Button>
+            <el-date-picker style='height:30px' @change="changeActiveDate" v-model="select.activeDate" type="daterange"
+              :picker-options="pickerOptions" value-format="yyyy-MM-dd" range-separator="至"
+              start-placeholder="活动开始日期" end-placeholder="活动结束日期" align="right">
+            </el-date-picker>
+            <Button type="primary" style="margin-left: 10px;" @click="getActivities">查询</Button>
             <Button icon="ios-add" type="primary" style="margin-left: 10px;" @click="$refs['addActivity'].isShow = true,$refs['addActivity'].type = 'add'">添加</Button>
           </div>
         </slot>
@@ -65,9 +69,38 @@ export default {
         pageSize:10,
         pageIndex:1,
         keyword:"",
-        active_type_id:''
+        active_type_id:'',
+        activeDate:[],
+        start_date:'',
+        end_date:""
+      },
+      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]);
+          }
+        }]
       },
-
       total:0,
       list:[],
       isShowOrder:false,
@@ -281,12 +314,23 @@ export default {
     }
   },
   methods: {
+    changeActiveDate(e){
+      if(e){
+        this.select.start_date = e[0];
+        this.select.end_date = e[1];
+      }else{
+        this.select.start_date = "";
+        this.select.end_date = "";
+      }
+    },
     async getActivities(){
       const res = await index({
         page_size:this.select.pageSize,
         page:this.select.pageIndex,
         keyword:this.select.keyword,
-        active_type_id:this.select.active_type_id
+        active_type_id:this.select.active_type_id,
+        start_date:this.select.start_date,
+        end_date:this.select.end_date,
       })
       this.list = res.data
       this.total = res.total
@@ -349,5 +393,11 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
+<style scoped>
+  /deep/ .el-date-editor .el-range__icon{
+    line-height: 25px!important;
+  }
+  /deep/ .el-date-editor .el-range-separator{
+    line-height: 25px!important;
+  } 
 </style>

src/views/course/component/addCourse.vue

@@ -68,7 +68,7 @@
         rules: {
           title: [{
             required: true,
-            message: '请输入课程名称'
+            message: '请选择主题'
           }]
         },
         activeList: [],
@@ -86,10 +86,10 @@
             },
           },
           {
-            label: "课程名称",
+            label: "关联活动",
             width: 240,
             customFn: (row) => {
-              return ( <el-select placeholder = "请选择课程"
+              return ( <el-select placeholder = "请选择关联活动"
                 style = "width: 240px"
                 v-model = {
                   row.name
@@ -110,15 +110,29 @@
                     )
 
                   })
-                } </el-select>
+                } </el-select>
+
               );
             },
+          },
+          {
+            label: "主题",
+            minWidth: 240,
+            customFn: (row, scope) => {
+              return ( <el-input placeholder = "请填写主题"
+                type = "text"
+                v-model = {
+                  row.theme
+                } >
+                </el-input>
+              );
+            },
           },
           {
-            label: "课程时间",
+            label: "时间",
             minWidth: 180,
             customFn: (row, scope) => {
-              return ( <el-input placeholder = "请填写课程时间"
+              return ( <el-input placeholder = "请填写时间"
                 type = "text"
                 v-model = {
                   row.time
@@ -128,10 +142,10 @@
             },
           },
           {
-            label: "课程地址",
+            label: "上课地址",
             minWidth: 240,
             customFn: (row, scope) => {
-              return ( <el-input placeholder = "请填写课程地址"
+              return ( <el-input placeholder = "请填写上课地址"
                 type = "text"
                 v-model = {
                   row.address
@@ -141,10 +155,10 @@
             },
           },
           {
-            label: "主讲人",
+            label: "主讲",
             minWidth: 180,
             customFn: (row, scope) => {
-              return ( <el-input placeholder = "请填写主讲人"
+              return ( <el-input placeholder = "请填写主讲"
                 type = "text"
                 v-model = {
                   row.speaker
@@ -184,7 +198,7 @@
             })
             this.form.course_list.splice(index, 1)
           })
-          
+
         } else {
           this.form.course_list.splice(index, 1)
         }
@@ -198,13 +212,13 @@
       },
       changeActive(e, row) {
         row.name = e.active_name
-
+        row.theme = e.active_name
         row.time = e.start_date + ' ' + e.start_time
         //
         row.address = e.address
         row.speaker = ''
         row.link = '/pages/active/detail?id=' + e.id
-        console.log("e", e)
+
       },
       returnDate(date, time) {
         let str = ''

src/views/finance/component/editRemark.vue

@@ -0,0 +1,66 @@
+<!---->
+<template>
+  <div>
+    <xy-dialog :form="form" :rules="rules" ref="dialog" type="form" :is-show.sync="isShow" title="修改备注" @submit="submit">
+      <template v-slot:comment>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            备注：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input type="textarea" :autosize="{minRows:2}" placeholder="请输入备注" clearable v-model="form.comment" style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+import {changeremark} from "@/api/finance"
+import { Message } from 'element-ui'
+export default {
+  data() {
+    return {
+      isShow:false,
+      id:'',
+      form:{
+        comment:''
+      },
+      rules:{
+      }
+    }
+  },
+  methods: {
+    submit(){
+        changeremark({
+          id:this.id,
+          comment:this.form.comment
+        }).then(res => {
+          Message({
+            type:'success',
+            message:'修改成功'
+          })
+          this.isShow = false
+          this.$emit('refresh')
+        })
+        return
+
+    }
+  },
+  watch:{
+    isShow(val){
+      if(val){
+
+      }else{
+        this.$refs['dialog'].reset()
+        this.id=''
+      }
+    }
+  }
+
+}
+</script>
+
+<style scoped lang="scss">
+</style>

src/views/finance/flow.vue

@@ -28,16 +28,17 @@
               <Input v-model="select.money_min" style="width: 90px;" clearable placeholder="开始金额" />
               <span>~</span>
               <Input v-model="select.money_max" style="width: 90px;margin-right: 10px;" clearable placeholder="结束金额" />
-            </div>
-              <div class="select-content-item">
-                <!-- <div class="select-content-item-label">日期</div> -->
-                <div>
-                  <el-date-picker style="width: 260px;margin-right: 10px;height:32px;line-height:32px" @change="changeCreatedDate" v-model="createdDate" type="daterange"
-                    :picker-options="pickerOptions" value-format="yyyy-MM-dd" range-separator="至"
-                    start-placeholder="开始日期" end-placeholder="结束日期" align="right">
-                  </el-date-picker>
-                </div>
+            </div>
+            <div class="select-content-item">
+              <!-- <div class="select-content-item-label">日期</div> -->
+              <div>
+                <el-date-picker style="width: 260px;margin-right: 10px;height:32px;line-height:32px"
+                  @change="changeCreatedDate" v-model="createdDate" type="daterange" :picker-options="pickerOptions"
+                  value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                  align="right">
+                </el-date-picker>
               </div>
+            </div>
 
             <Button icon="ios-search" type="primary" style="margin-right: 10px;" @click="getFlow">搜索</Button>
             <Button icon="ios-repeat" type="primary" style="margin-right: 10px;"
@@ -52,11 +53,17 @@
     <xy-table :total="total" @pageSizeChange="e => select.pageSize = e" @pageIndexChange="pageChange" :list="list"
       :table-item="table">
       <template v-slot:btns>
-        <div></div>
+        <el-table-column fixed="right" label="操作" width="100" header-align="center">
+          <template slot-scope="scope">
+            <Button type="primary" size="small" ghost style="margin-left: 10px;"
+              @click="changeRemark(scope.row.id)">修改备注</Button>
+          </template>
+        </el-table-column>
       </template>
     </xy-table>
 
-    <rechargeFine ref="rechargeFine" :merchants="merchants" @refresh="getFlow"></rechargeFine>
+    <rechargeFine ref="rechargeFine" :merchants="merchants" @refresh="getFlow"></rechargeFine>
+    <editRemark ref="editRemark" @refresh="getFlow"></editRemark>
   </div>
 </template>
 
@@ -72,11 +79,13 @@
     download
   } from '@/utils/downloadRequest'
 
-  import rechargeFine from '@/views/finance/component/rechargeFine'
+  import rechargeFine from '@/views/finance/component/rechargeFine'
+  import editRemark from '@/views/finance/component/editRemark'
 
   export default {
     components: {
-      rechargeFine
+      rechargeFine,
+      editRemark
     },
     data() {
       return {
@@ -87,13 +96,13 @@
           type: '',
           serial: '',
           money_min: '',
-          money_max: '',
-          start_date:"",
-          end_date:""
+          money_max: '',
+          start_date: "",
+          end_date: ""
         },
-createdDate:['',''],
+        createdDate: ['', ''],
         merchants: [],
-pickerOptions: {
+        pickerOptions: {
           shortcuts: [{
             text: '最近一周',
             onClick(picker) {
@@ -185,20 +194,24 @@ pickerOptions: {
             merchant_id: this.select.merchantId,
             type: this.select.type,
             serial: this.select.serial,
-            is_export: 1,
-            start_date:this.select.start_date,
-            end_date:this.select.end_date
+            is_export: 1,
+            start_date: this.select.start_date,
+            end_date: this.select.end_date
           },
           '财务流水.xlsx')
       },
-
+      changeRemark(id){
+        console.log(id)
+        this.$refs['editRemark'].isShow = true
+        this.$refs['editRemark'].id = id
+      },
       pageChange(e) {
         this.select.pageIndex = e
         this.getFlow()
-      },
-      changeCreatedDate(e) {
-        this.select.start_date = e[0];
-        this.select.end_date = e[1];
+      },
+      changeCreatedDate(e) {
+        this.select.start_date = e[0];
+        this.select.end_date = e[1];
       },
 
       async getMerchant() {
@@ -225,27 +238,29 @@ pickerOptions: {
 
   }
 </script>
-<style scoped>
-  /deep/ .el-date-editor .el-range__icon{
-      line-height: 25px;
-    }
-  /deep/ .el-date-editor .el-range-separator{
-    line-height: 25px;
-  }
-  /deep/ .el-date-editor .el-range__close-icon{
-    line-height: 25px;
-  }
+<style scoped>
+  /deep/ .el-date-editor .el-range__icon {
+    line-height: 25px;
+  }
+
+  /deep/ .el-date-editor .el-range-separator {
+    line-height: 25px;
+  }
+
+  /deep/ .el-date-editor .el-range__close-icon {
+    line-height: 25px;
+  }
 </style>
 <style scoped lang="scss">
   @media screen and (max-width: 1190px) {
     .select {
       margin-bottom: 6px;
     }
-  }
-  // .select-content-item{
-  //   v::deep .el-date-editor .el-range__icon{
-  //     line-height: 25px;
-  //   }
-  // }
+  }
 
+  // .select-content-item{
+  //   v::deep .el-date-editor .el-range__icon{
+  //     line-height: 25px;
+  //   }
+  // }
 </style>

src/views/marketing/ad.vue

@@ -223,6 +223,8 @@ export default {
         create_over:this.select.createDate[1],
         page:this.select.pageIndex,
         valid_time:this.select.isEffect,
+        sort:'sort',
+        sort_type:'ASC'
       })
       this.list = res.data
       this.total = res.total

src/views/notice/index.vue

@@ -81,6 +81,18 @@ export default {
       },{
         id:"OrderItemMerchantReturn",
         value:"商家退回订单"
+      },{
+        id:"HalfMonthNoticeb",
+        value:"预产期半个月通知"
+      },{
+        id:"NextFollowTime",
+        value:"下次通知时间通知"
+      },{
+        id:"OffShelfTime",
+        value:"产品一个月下架通知"
+      },{
+        id:"ThreeDayNotice",
+        value:"预产期3天通知"
       }],
       total:0,
       list:[],

src/views/order/component/orderLog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Modal :width="60" title="订单日志" :value.sync="isShow" @on-visible-change="$emit('update:isShow',$event)" 
+    <Modal draggable :width="60" title="订单日志" :value.sync="isShow" @on-visible-change="$emit('update:isShow',$event)" 
        >
       <xy-table :is-page="false" :list="list" :table-item="table" :height="300">
         <template v-slot:btns>

src/views/order/orderList.vue

@@ -83,8 +83,9 @@
                     <div class="select-content-item">
                       <div class="select-content-item-label">预产期</div>
                       <div>
-                        <el-date-picker v-model="select.due_date" type="date" value-format="yyyy-MM-dd"
-                          placeholder="预产期" align="right">
+                        <el-date-picker @change="changeDueDate" v-model="select.dueDate" type="daterange"
+                          :picker-options="pickerOptions" value-format="yyyy-MM-dd" range-separator="至"
+                          start-placeholder="开始日期" end-placeholder="结束日期" align="right">
                         </el-date-picker>
                       </div>
                     </div>
@@ -128,7 +129,7 @@
     <xy-table :list="list" :table-item="table" :total="total" @pageSizeChange="e => {select.pageSize = e;searchOrder()}"
       @pageIndexChange="pageChange">
       <template v-slot:btns>
-        <el-table-column fixed="right" label="操作" width="400" header-align="center">
+        <el-table-column fixed="right" label="操作" width="320" header-align="center">
           <template slot-scope="scope">
             <actions :row="scope.row" @log="showLog(scope.row)" @refresh="getOrders"></actions>
             <!--            <Button icon="ios-chatbubbles-outline" type="primary" style="margin-left: 10px;margin-bottom: 6px;" size="small" ghost>跟进</Button>-->
@@ -194,11 +195,14 @@
           is_merchant: false,
           createdDate: [],
           payDate: [],
-          updateDate: [],
+          updateDate: [],
+          dueDate:[],
           start_created: "",
           end_created: "",
           start_paid: "",
-          end_paid: "",
+          end_paid: "",
+          due_date_state : '',
+          due_date_end : '',
           start_updated: "",
           end_updated: "",
           order_paid: false,
@@ -536,7 +540,9 @@
             this.select.start_created = "";
             this.select.end_created = '';
             this.select.start_paid = '';
-            this.select.end_paid = '';
+            this.select.end_paid = '';
+            this.select.due_date_state = ''
+            this.select.due_date_end = ''
             this.select.start_updated = '';
             this.select.end_updated = '';
             this.select.order_item_id=""
@@ -561,6 +567,15 @@
               this.select.end_paid = "";
             }
 
+          },
+          changeDueDate(e){
+            if(e){
+              this.select.due_date_state = e[0]+' 00:00:00';
+              this.select.due_date_end = e[1]+' 23:59:59';
+            }else{
+              this.select.due_date_state = "";
+              this.select.due_date_end = "";
+            }
           },
           changeCreatedDate(e) {
             console.log("date",e)

src/views/reports/typeOrder.vue

@@ -16,11 +16,11 @@
       <el-button style="margin-left:10px" type="primary" @click="getTotal">查询</el-button>
     </div>
     <div class="totals">
-      <p><span>下单人数：</span><span>{{list.add_total_members}}</span></p>
+      <p><span>下单人数：</span><span style=' color:#bf617c;cursor:pointer;text-decoration: underline;' @click='toReturnUser(6)'>{{list.add_total_members}}</span></p>
       <p><span>下单订单数：</span><span>{{list.add_total_order}}</span></p>
       <p><span>下单取消数：</span><span>{{list.add_total_order_canceled}}</span></p>
       <p><span>下单完成数：</span><span>{{list.add_total_order_finished}}</span></p>
-      <p><span>多板块下单人数：</span><span style=' color:#bf617c;cursor:pointer;text-decoration: underline;' @click='toReturnUser(4)'>{{list.total_order_more_type_person}}</span></p>
+      <p><span>多板块下单人数(不包含取消)：</span><span style=' color:#bf617c;cursor:pointer;text-decoration: underline;' @click='toReturnUser(4)'>{{list.total_order_more_type_person}}</span></p>
     </div>
 
   </div>

src/views/reports/userOrder.vue

@@ -26,7 +26,7 @@
               <el-checkbox v-model="select.is_phone">存在手机号</el-checkbox>
             </div>
             <div class="selector-item">
-              <div class="selector-item__label">下单查询：</div>
+              <div class="selector-item__label">支付查询：</div>
               <el-date-picker
                     v-model="dateRange"
                     @change='dateChange'
@@ -94,7 +94,7 @@
           keywords: "",
           area: "",
           hospital: "",
-          is_phone: true,
+          is_phone: false,
           create_time:'',
           over_time:'',
           order_count:'',
@@ -302,7 +302,17 @@
               keyword: this.select.keywords,
               hospital: this.select.hospital,
               area: this.select.area,
-              is_phone: this.select.is_phone ? 1 : ""
+              is_phone: this.select.is_phone ? 1 : "",
+              create_time:this.select.create_time,
+              over_time:this.select.over_time,
+              write_off:this.select.write_off,
+              order_count:this.select.order_count,
+              total_related_person:this.select.total_related_person,
+              start_date:this.select.start_date,
+              end_date:this.select.end_date,
+              product_pid:this.select.product_pid,
+              product_type_list:this.select.product_type_list
+              
             }, '用户列表.xlsx')
           },
           reloadUser(){