diff --git a/src/views/business/component/addBusiness.vue b/src/views/business/component/addBusiness.vue
index ab99d74..8a36456 100644
--- a/src/views/business/component/addBusiness.vue
+++ b/src/views/business/component/addBusiness.vue
@@ -123,6 +123,27 @@ export default {
}
},
data() {
+ let validateCategory = (rule, value, callback) => {
+ if(value.length > 0){
+ let flag = true
+ value.forEach(item => {
+ if(item.name){
+
+ }else{
+ flag = false
+ }
+ })
+
+ if(flag){
+ callback()
+ }else{
+ callback('请输入分类名称')
+ }
+ }else{
+ callback('请添加绑定服务分类')
+ }
+
+ }
return {
id: '',
isShow: false,
@@ -154,6 +175,9 @@ export default {
],
cycle: [
{required: true, message: '请填写结算周期'}
+ ],
+ product_sku_category_list:[
+ {validator: validateCategory}
]
},
diff --git a/src/views/customer/component/addOrder.vue b/src/views/customer/component/addOrder.vue
index 8c69974..6fa2ff9 100644
--- a/src/views/customer/component/addOrder.vue
+++ b/src/views/customer/component/addOrder.vue
@@ -270,7 +270,7 @@ export default {
unit_price: '',
total_time: '',
total_money: '',
- account_id: '',
+ account_id:'',
status: 0,
customer_id: '',
}
@@ -415,8 +415,8 @@ export default {
this.pickedProduct = {}
this.ageTemp = false
this.products = []
- this.$refs['dialog'].reset()
- //this.initForm()
+ //this.$refs['dialog'].reset()
+ this.initForm()
}
}
},
diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue
index 0e5e50a..35b78ac 100644
--- a/src/views/customer/customer.vue
+++ b/src/views/customer/customer.vue
@@ -45,7 +45,7 @@
-
+
diff --git a/src/views/schedule/component/timeSelect.vue b/src/views/schedule/component/timeSelect.vue
index 4f4905f..757d4ba 100644
--- a/src/views/schedule/component/timeSelect.vue
+++ b/src/views/schedule/component/timeSelect.vue
@@ -67,13 +67,15 @@
-
-
-
+
+
+
+
+
@@ -176,6 +178,20 @@ export default {
}
},
methods: {
+ initForm(){
+ this.form = {
+ id:'',
+ customer_id: '',
+ product_id: '',
+ order_id: '',
+ nurse_id: '',
+ address_id:'',
+ start_time: '',
+ end_time: '',
+ schedule_list_skus: []
+ }
+ },
+
nurseLoad(){
this.nurseSelect.page ++
this.getNurses()
@@ -202,11 +218,9 @@ export default {
startTimePick(e){
this.form.start_time = `${this.date} ${e}`
- console.log(this.form)
},
endTimePick(e){
this.form.end_time = `${this.date} ${e}`
- console.log(this.form)
},
// handleCheckAllChange(val){
@@ -246,8 +260,8 @@ export default {
})
this.form.schedule_list_skus = temp
this.$refs['elForm'].validate().then(valid => {
- console.log(valid)
if (valid) {
+ console.log(1111,this.form)
scheduleSave(this.form).then(res => {
this.$successMessage('add', '排班')
this.$emit('update:isShow', false)
@@ -283,9 +297,8 @@ export default {
} else {
this.$emit('update:date','')
- this.$refs['elForm'].resetFields()
this.$refs['table'].clearSelection()
- console.log(this.form)
+ this.initForm()
}
}
},