diff --git a/src/views/customer/component/addCustomer.vue b/src/views/customer/component/addCustomer.vue index 4a2f13f..61991c6 100644 --- a/src/views/customer/component/addCustomer.vue +++ b/src/views/customer/component/addCustomer.vue @@ -119,7 +119,7 @@ @@ -37,7 +41,49 @@ export default { total:0, list:[], - table:[] + table:[ + { + label:'姓名', + width:140, + fixed:'left', + prop:'name' + }, + { + label:'明细', + customFn:(row)=>{ + return ( +
+ { + row.data.map(item => { + return ( +
+
{item.date}
+
{item.money}元
+
+ ) + }) + } +
+ ) + } + }, + { + label:'合计', + width: 160, + align:'right', + customFn:(row)=>{ + let total = 0; + row.data.map(item => { + total += item.money + }) + return ( +
+ {total} +
+ ) + } + } + ] } }, methods: { @@ -45,8 +91,8 @@ export default { async getList(){ const res = await getList(this.select) console.log(res) - this.total = res.total - this.list = res.data + this.total = res.length ?? 0 + this.list = res }, }, mounted() { diff --git a/src/views/order/component/addOrder.vue b/src/views/order/component/addOrder.vue index 1580d06..7bcd3dd 100644 --- a/src/views/order/component/addOrder.vue +++ b/src/views/order/component/addOrder.vue @@ -157,7 +157,32 @@ export default { total_money: '', status: '', }, - rules: {} + rules: { + customer_id:[ + {required: true, message: '请选择客户'} + ], + product_id:[ + {required: true, message: '请选择产品'} + ], + date:[ + {required: true, message: '请选择开始结束时间'} + ], + service_times:[ + {required: true, message: '请填写服务次数'} + ], + unit_price:[ + {required: true, message: '请填写单次单价'} + ], + total_time:[ + {required: true, message: '请填写总计时长'} + ], + total_money:[ + {required: true, message: '请填写总计金额'} + ], + status:[ + {required: true, message: '请选择状态'} + ] + } } }, methods: { diff --git a/src/views/product/productComponent/addProduct.vue b/src/views/product/productComponent/addProduct.vue index fb115aa..925f0fe 100644 --- a/src/views/product/productComponent/addProduct.vue +++ b/src/views/product/productComponent/addProduct.vue @@ -188,6 +188,9 @@ export default { async getDetail() { const res = await getForm(this.id) this.$integrateData(this.form, res) + this.form.product_sku_list = res.product_skus.map(item => { + return {sku_id:item.sku_id} + }) }, submit() { diff --git a/src/views/schedule/component/addSchedule.vue b/src/views/schedule/component/addSchedule.vue index 5092225..79276e7 100644 --- a/src/views/schedule/component/addSchedule.vue +++ b/src/views/schedule/component/addSchedule.vue @@ -238,6 +238,12 @@ export default { ], order_id:[ {required:true,message:'请选择订单'} + ], + start_time:[ + {required:true,message:'请选择开始时间'} + ], + end_time:[ + {required:true,message:'请选择结束时间'} ] } } diff --git a/src/views/schedule/schedule.vue b/src/views/schedule/schedule.vue index bb0f0d1..66ea08c 100644 --- a/src/views/schedule/schedule.vue +++ b/src/views/schedule/schedule.vue @@ -157,14 +157,27 @@ export default { label: '应服务次数', width: 120, customFn: (row) => { + let total = 0; + row.orders.map(item => { + total += item.service_times + }) return ( -
{row.orders.length}
+
+ { + total + } +
) } }, { label: '已排班', width: 120 + }, + { + label:'排班状态', + width: 140, + } ] diff --git a/src/views/worker/worker.vue b/src/views/worker/worker.vue index a1b19e3..c0e8896 100644 --- a/src/views/worker/worker.vue +++ b/src/views/worker/worker.vue @@ -91,12 +91,12 @@ export default { width: 180 }, { - prop: '', + prop: 'serve_area_detail.value', label: '服务主区域', width: 200 }, { - prop: '', + prop: 'product_type.name', label: '服务主模块', width: 200 },