@@ -212,8 +261,9 @@
.boxcontent {
display: flex;
//justify-content: space-around;
- align-items: center;
-
+ align-items: center;
+ justify-content: center;
+ min-height:120px;
.boxline {
width: 1px;
height: 4.0625rem;
@@ -275,6 +325,9 @@
height: 0.125rem;
margin-top: 1.25rem;
margin-bottom: 1.25rem;
+ }
+ .boxcontent{
+ min-height:auto
}
}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index c432169..9f8ad4f 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -83,23 +83,29 @@
},
lineArr: {
xArr: [],
- legendArr: ["客户", "订单", "成交额"],
+ legendArr: ["客户", "订单", "活动", "成交额"],
series: [{
name: '客户',
type: 'line',
- stack: 'Total',
+ // stack: 'Total',
data: []
},
{
name: '订单',
type: 'line',
- stack: 'Total',
+ // stack: 'Total',
data: []
+ },
+ {
+ name: '活动',
+ type: 'line',
+ // stack: 'Total',
+ data: []
},
{
name: '成交额',
type: 'line',
- stack: 'Total',
+ // stack: 'Total',
data: []
}
]
@@ -167,8 +173,9 @@
getorderitemData().then((res) => {
for (var m of res) {
- that.lineArr.series[1].data.push(m.order_total);
- that.lineArr.series[2].data.push(m.paid_money_total);
+ that.lineArr.series[1].data.push(m.order_total);
+ that.lineArr.series[2].data.push(m.active_total);
+ that.lineArr.series[3].data.push(m.paid_money_total);
}
}).catch((res) => {})
diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue
index 2ef2a56..c47e65a 100644
--- a/src/views/order/orderList.vue
+++ b/src/views/order/orderList.vue
@@ -6,7 +6,7 @@
@@ -652,7 +655,7 @@
this.select.is_merchant = is_merchant ? 1 : 0;
let is_next_follow_time = this.select.next_follow_time
- this.select.next_follow_time = is_next_follow_time ? 1 : 0;
+ this.select.next_follow_time = is_next_follow_time ? 1 : '';
let order_paid = this.select.order_paid
this.select.order_paid = order_paid ? 1 : '';
diff --git a/src/views/reports/typeOrder.vue b/src/views/reports/typeOrder.vue
index bcae48c..db00aea 100644
--- a/src/views/reports/typeOrder.vue
+++ b/src/views/reports/typeOrder.vue
@@ -72,7 +72,19 @@
const result = Array.from(new Set(_data))
this.select.product_type_list = result
},
- removeType(e) {},
+ removeType(e) {
+ this.$nextTick(()=>{
+ let _arr = this.$refs.typeCas.getCheckedNodes()
+ console.log("_arr",_arr)
+ let _data = []
+ for(var k of _arr){
+ _data.push(k.value)
+ }
+ const result = Array.from(new Set(_data))
+ this.select.product_type_list = result
+ })
+
+ },
async initTotal() {
const res = await typeCount({
start_date: '2000-01-01',
@@ -80,7 +92,9 @@
})
this.list = res.return_list.total
},
- async getTotal() {
+ async getTotal() {
+ console.log("this.select.product_type_list111",this.select.product_type_list)
+
const res = await typeCount({
start_date: this.select.start_date,
end_date: this.select.end_date,
diff --git a/src/views/reports/userOrder.vue b/src/views/reports/userOrder.vue
index d75a5f5..ca25bdf 100644
--- a/src/views/reports/userOrder.vue
+++ b/src/views/reports/userOrder.vue
@@ -12,13 +12,13 @@
区域：
建卡医院：
@@ -70,6 +70,12 @@
下单数
及以上
+
@@ -97,7 +103,8 @@
import {
index,
destroy
- } from '@/api/member'
+ } from '@/api/member'
+ import {getparameteritem} from '@/api/system/dictionary.js'
import {
parseTime
} from "@/utils"
@@ -131,16 +138,37 @@
start_date:'',
end_date:'',
product_pid:'',
- product_type_list:[]
+ product_type_list:[],
+ active_member:''
},
- arrHospital: ["市立医院", "苏大附一院", "苏大附二院","附二浒关院区", "中医院", "第五人民医院", "苏州市第七人民医院", "明基医院", "九龙医院", "娄葑医院",
- "吴中人民医院", "甪直人民医院", "相城人民医院", "相城区第二人民医院", "吴江第一人民医院", "吴江第二人民医院", "盛泽医院", "其他"
- ],
+ arrHospital: [],
+ activeStatus:[{
+ id:'',
+ label:'全部'
+ },{
+ id:1,
+ label:'活动下单'
+ },{
+ id:2,
+ label:'产品、活动下单'
+ }],
dateRange:[],
dateRangeCancel:[],
dateRangeReg:[],
- areas: ["吴中区", "吴江区", "姑苏区", "工业园区", "高新区", "相城区", "昆山", "常熟", "张家港", "太仓"],
-
+ areas: [],
+ statusNames:[{
+ id:0,
+ name:'申请取消'
+ },{
+ id:1,
+ name:'待核销'
+ },{
+ id:2,
+ name:'已取消'
+ },{
+ id:3,
+ name:'已核销'
+ }],
total: 0,
list: [],
table: [{
@@ -233,6 +261,30 @@
})
}
+ }
+ },
+ {
+ prop: 'active',
+ label: '活动详情',
+ width: 480,
+ align:"left",
+ customFn:(row)=>{
+ if(row.order.length>0){
+ return row.active.map((k,index)=> {
+ for(let s of this.statusNames){
+ if(s.id===k.state){
+ k.state_name = s.name
+ }
+ }
+ return (
+
+ {index+1}、{k.state_name}-
+ { k.active_name}
+
+
)
+ })
+ }
+
}
},
{
@@ -281,6 +333,7 @@
}
},
methods: {
+
dateChange(e){
if(e){
this.select.create_time = this.dateRange[0]
@@ -321,6 +374,14 @@
this.select.pageIndex = e
this.getMembers()
},
+ async getArea(){
+ const res = await getparameteritem('area')
+ this.areas = res.detail
+ },
+ async getHospital(){
+ const res = await getparameteritem('hospital')
+ this.arrHospital = res.detail
+ },
async getMembers() {
const res = await index({
@@ -342,7 +403,8 @@
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
+ product_type_list:this.select.product_type_list,
+ active_member:this.select.active_member
})
this.total = res.total
this.list = res.data
@@ -367,7 +429,8 @@
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
+ product_type_list:this.select.product_type_list,
+ active_member:this.select.active_member
}, '用户列表.xlsx')
},
@@ -395,6 +458,8 @@
},
mounted() {
+ this.getArea()
+ this.getHospital()
this.reloadUser()
},
watch:{
diff --git a/src/views/reports/userView.vue b/src/views/reports/userView.vue
new file mode 100644
index 0000000..c8e6d31
--- /dev/null
+++ b/src/views/reports/userView.vue
@@ -0,0 +1,322 @@
+
+
+
+
+
+
+
+
+
+
+
+
活动分类：
+
+
+
+
+ 多次浏览产品
+
+
+ 多次浏览活动
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/userManage/memberManage.vue b/src/views/userManage/memberManage.vue
index 743290a..402c7b4 100644
--- a/src/views/userManage/memberManage.vue
+++ b/src/views/userManage/memberManage.vue
@@ -12,13 +12,13 @@
区域：
建卡医院：
@@ -55,7 +55,8 @@
import {
index,
destroy
- } from '@/api/member'
+ } from '@/api/member'
+ import {getparameteritem} from '@/api/system/dictionary.js'
import {
parseTime
} from "@/utils"
@@ -81,10 +82,8 @@
hospital: "",
is_phone: true
},
- areas: ["吴中区", "吴江区", "姑苏区", "工业园区", "高新区", "相城区", "昆山", "常熟", "张家港", "太仓"],
- arrHospital: ["市立医院", "苏大附一院", "苏大附二院","附二浒关院区", "中医院", "第五人民医院", "苏州市第七人民医院", "明基医院", "九龙医院", "娄葑医院",
- "吴中人民医院", "甪直人民医院", "相城人民医院", "相城区第二人民医院", "吴江第一人民医院", "吴江第二人民医院", "盛泽医院", "其他"
- ],
+ areas: [],
+ arrHospital: [],
total: 0,
list: [],
table: [{
@@ -125,11 +124,11 @@
label: '推广人员',
width: 140,
customFn: (row) => {
- return ( < Tag color = {
+ return (
{
row.promotion == 1 ? '是' : '否'
- } < /Tag>)
+ } )
}
},
{
@@ -157,7 +156,14 @@
this.select.pageIndex = e
this.getMembers()
},
-
+ async getArea(){
+ const res = await getparameteritem('area')
+ this.areas = res.detail
+ },
+ async getHospital(){
+ const res = await getparameteritem('hospital')
+ this.arrHospital = res.detail
+ },
async getMembers() {
const res = await index({
page_size: this.select.pageSize,
@@ -198,7 +204,9 @@
}, '用户列表.xlsx')
}
},
- mounted() {
+ mounted() {
+ this.getArea()
+ this.getHospital()
this.getMembers()
}