@@ -131,6 +148,12 @@ import {getList as customList} from '@/api/customer'
import {getList as productList} from '@/api/product'
import {save,getForm} from '@/api/order'
export default {
+ props:{
+ accounts:{
+ type:Array,
+ default:()=>[]
+ }
+ },
data() {
return {
id: '',
@@ -191,6 +214,7 @@ export default {
unit_price: '',
total_time: '',
total_money: '',
+ account_id:'',
status: '',
},
rules: {
@@ -217,6 +241,9 @@ export default {
],
status:[
{required: true, message: '请选择状态'}
+ ],
+ account_id:[
+ {required: true, message: '请选择结算对象'}
]
}
}
@@ -231,6 +258,7 @@ export default {
unit_price: '',
total_time: '',
total_money: '',
+ account_id: '',
status: '',
}
},
diff --git a/src/views/order/order.vue b/src/views/order/order.vue
index 31d7325..5bd88ae 100644
--- a/src/views/order/order.vue
+++ b/src/views/order/order.vue
@@ -25,12 +25,13 @@
@pageSizeChange="e => select.page_size = e"
@pageIndexChange="e => {select.page = e;getOrder()}">
-
+
+
+
diff --git a/src/views/schedule/schedule.vue b/src/views/schedule/schedule.vue
index b753b16..76f49c2 100644
--- a/src/views/schedule/schedule.vue
+++ b/src/views/schedule/schedule.vue
@@ -7,7 +7,7 @@
应排客户
已排客户
-
+
@@ -38,7 +38,7 @@
:nurses="nurses"
:levels="levels"
:orders="orders"
- :skus="skus" :accounts="accounts">
+ :skus="skus">
@@ -61,6 +61,7 @@ export default {
select: {
page: 1,
page_size: 10,
+ keyword:''
},
customers:[],
products:[],
@@ -139,11 +140,6 @@ export default {
}
},
methods: {
- async getAccounts(){
- const res = await getparameter({number:'account'})
- this.accounts = res.detail
- },
-
async getSkus(){
const res = await skuIndex({page_size:9999,page:1})
this.skus = res.data
@@ -174,7 +170,6 @@ export default {
schedule(row){
this.$refs['addSchedule'].detail = row
- this.$refs['addSchedule'].form.customer_id = row.id
this.orders = row.orders
this.$refs['addSchedule'].isShow = true
}
@@ -186,7 +181,6 @@ export default {
this.getLevels()
this.getCustomerList()
this.getSkus()
- this.getAccounts()
}
}