diff --git a/src/views/BatchSub/BatchSub.vue b/src/views/BatchSub/BatchSub.vue
index 31a1ff6..e22cfbd 100644
--- a/src/views/BatchSub/BatchSub.vue
+++ b/src/views/BatchSub/BatchSub.vue
@@ -670,11 +670,13 @@ export default {
}
let arr = []
+ if(this.selectedRow.school_details && this.selectedRow.school_details.length>0){
+ this.selectedRow.school_details.map(item=>{
+ arr.push(item.id)
+ })
+ form.school = arr
+ }
- this.selectedRow.school_details.map(item=>{
- arr.push(item.id)
- })
- form.school = arr
console.log("form",form)
// return
this.loading = true;
@@ -684,6 +686,7 @@ export default {
this.loading = false;
} catch (err) {
this.loading = false;
+ console.log("err",err)
}
},
async destroyRowEvent(row) {
diff --git a/src/views/BatchSub/components/SchoolPicker.vue b/src/views/BatchSub/components/SchoolPicker.vue
index 36594f1..49a90d7 100644
--- a/src/views/BatchSub/components/SchoolPicker.vue
+++ b/src/views/BatchSub/components/SchoolPicker.vue
@@ -119,6 +119,12 @@
optionProps: { value: 'value', label: 'label' },
}"
/>
+
{
const tableColumns = this.$refs['table'].getFullColumns()
+
let export_fields = {}
+
Object.keys(this.form).forEach(key => {
- export_fields[key] = tableColumns.find(col => col.field === key)?.title || key
+ if(key=='area_id'){
+ export_fields['area_id_text'] = tableColumns.find(col => col.field === key)?.title || key
+ }else if(key=='from'){
+ export_fields['from_text'] = '类型'
+ }else if(key=='nature'){
+ export_fields['nature_text'] = tableColumns.find(col => col.field === key)?.title || key
+ }else if(key=='type'){
+ export_fields['type_text'] = tableColumns.find(col => col.field === key)?.title || key
+ }else if(key=='is_area_3'||key=='id'){
+
+ }else{
+ export_fields[key] = tableColumns.find(col => col.field === key)?.title || key
+ }
})
+ console.log("tableColumns",tableColumns,export_fields)
+ // return
download("/api/admin/school/index", "get", {
...this.select,
page: 1,
diff --git a/src/views/Score/Score.vue b/src/views/Score/Score.vue
index 0f17393..8fabcc8 100644
--- a/src/views/Score/Score.vue
+++ b/src/views/Score/Score.vue
@@ -17,7 +17,7 @@
-