diff --git a/src/api/schedule/index.js b/src/api/schedule/index.js index 46edc1a..229cf5b 100644 --- a/src/api/schedule/index.js +++ b/src/api/schedule/index.js @@ -66,6 +66,14 @@ export function scheduleIndex(params){ }) } +export function scheduleIndexSimple(params) { + return request({ + method:'get', + url:'/api/admin/schedule/schedule-index-simple', + params + }) +} + export function nurseSchedule(params){ return request( { diff --git a/src/components/villagePick/index.vue b/src/components/villagePick/index.vue index 1584f8b..40257f8 100644 --- a/src/components/villagePick/index.vue +++ b/src/components/villagePick/index.vue @@ -25,7 +25,11 @@ export default { type: Number, default: 5 }, - value: [Number,String] + value: [Number,String], + propsValue: { + type: String, + default: 'code' + } }, data() { return { @@ -60,6 +64,14 @@ export default { computed: { ...mapGetters(['village_codes']), }, + watch: { + propsValue: { + handler: function(newVal) { + this.props.value = newVal + }, + immediate: true + } + } } diff --git a/src/views/customer/component/addCustomer.vue b/src/views/customer/component/addCustomer.vue index 1ad742e..3fd1022 100644 --- a/src/views/customer/component/addCustomer.vue +++ b/src/views/customer/component/addCustomer.vue @@ -198,7 +198,6 @@ @@ -524,7 +523,7 @@ export default { ageTemp:false, productSelect: { page: 1, - page_size: 10 + page_size: 999 }, pickerOptions: { shortcuts: [{ diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue index dee40f0..35de40e 100644 --- a/src/views/customer/customer.vue +++ b/src/views/customer/customer.vue @@ -90,7 +90,7 @@ - + diff --git a/src/views/customer/map.vue b/src/views/customer/map.vue index 1f02ef5..bd95ba7 100644 --- a/src/views/customer/map.vue +++ b/src/views/customer/map.vue @@ -130,7 +130,6 @@ export default { } this.areas = city.detail - console.log(1111,this.areas) this.areas.forEach(item1 => { //this.areaMap.set(item1.id,item1.remark) diff --git a/src/views/schedule/map.vue b/src/views/schedule/map.vue index 711cab1..98ddb33 100644 --- a/src/views/schedule/map.vue +++ b/src/views/schedule/map.vue @@ -24,7 +24,7 @@ size="small" style="width: 234px; margin-right: 10px" type="daterange" - @change="e => { if(e[0]&&e[1]){selected.start_date = e[0];selected.end_date = e[1]}else{selected.start_date = '';selected.end_date = ''} }"> + @input="e => {if(e[0]&&e[1]) {selected.start_date = e[0];selected.end_date = e[1]}else{selected.start_date = '';selected.end_date = ''} }"> @@ -76,7 +76,7 @@
- {{ select.address.address }} + {{ select.info.customer_address ? select.info.customer_address.address : '' }}
@@ -87,7 +87,7 @@