diff --git a/src/components/XyDialog/index.vue b/src/components/XyDialog/index.vue
index 6b7fd35..625d0e5 100644
--- a/src/components/XyDialog/index.vue
+++ b/src/components/XyDialog/index.vue
@@ -191,7 +191,7 @@ export default {
}
::v-deep .el-input__clear{
position: relative;
- right: 30px;
+ right: 46px;
z-index: 2;
}
}
diff --git a/src/views/finance/component/addcollectMoney.vue b/src/views/finance/component/addcollectMoney.vue
index f73542b..f85b0c0 100644
--- a/src/views/finance/component/addcollectMoney.vue
+++ b/src/views/finance/component/addcollectMoney.vue
@@ -240,7 +240,7 @@ export default {
setSchedule(array){
this.form.schedule_links = array
- this.form.account_id = array[0]?.orders.account_id
+ this.form.account_id = Number(array[0]?.orders.account_id)
array.forEach(item => {
this.form.money += Number(item.orders.unit_price)
})
diff --git a/src/views/order/component/addOrder.vue b/src/views/order/component/addOrder.vue
index 20bae79..f3d20cd 100644
--- a/src/views/order/component/addOrder.vue
+++ b/src/views/order/component/addOrder.vue
@@ -82,8 +82,8 @@
*服务次数:
-
+
@@ -94,8 +94,8 @@
*单次单价:
-
+
@@ -105,8 +105,8 @@
*总计时长:
-
-
+
@@ -118,7 +118,7 @@
*总计金额:
-
@@ -289,6 +289,13 @@ export default {
this.customSelect.page++
this.getCustomers()
},
+
+ totalComputed(){
+ if(this.form.service_times && this.form.unit_price){
+ this.form.total_money = this.form.service_times * this.form.unit_price
+ }
+ },
+
async getCustomers() {
const res = await customList(this.customSelect, false)
if (res.data.data.length === 0) {
diff --git a/src/views/product/productManage.vue b/src/views/product/productManage.vue
index b673eab..622c6d6 100644
--- a/src/views/product/productManage.vue
+++ b/src/views/product/productManage.vue
@@ -67,7 +67,25 @@ export default {
{
prop:'cycle',
label:'服务周期',
- width: 160
+ width: 160,
+ formatter:(cell,data,value)=>{
+ switch (value){
+ case 1:
+ return '年'
+ break;
+ case 2:
+ return '月'
+ break;
+ case 3:
+ return '周'
+ break;
+ case 4:
+ return '次'
+ break;
+ default:
+ return value
+ }
+ }
},
{
prop:'purchase_price',
diff --git a/src/views/schedule/component/addSchedule.vue b/src/views/schedule/component/addSchedule.vue
index 3465798..9442bf9 100644
--- a/src/views/schedule/component/addSchedule.vue
+++ b/src/views/schedule/component/addSchedule.vue
@@ -113,6 +113,7 @@
+
+
diff --git a/src/views/statistics/components/doughnutChart.vue b/src/views/statistics/components/doughnutChart.vue
new file mode 100644
index 0000000..5d0327b
--- /dev/null
+++ b/src/views/statistics/components/doughnutChart.vue
@@ -0,0 +1,156 @@
+
+
+
+
+ 板块收入统计
+
+
+
+
+
+
+ 长护险: 10000
+
+
+ 80岁+老人照护: 10000
+
+
+ 自营商业: 10000
+
+
+ 总计: 30000
+
+
+
+
+
+
+
+
+
diff --git a/src/views/statistics/income.vue b/src/views/statistics/income.vue
new file mode 100644
index 0000000..34b8e70
--- /dev/null
+++ b/src/views/statistics/income.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff --git a/src/views/statistics/people.vue b/src/views/statistics/people.vue
new file mode 100644
index 0000000..0310d13
--- /dev/null
+++ b/src/views/statistics/people.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+