更改

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) {

src/views/BatchSub/components/SchoolPicker.vue

@@ -119,6 +119,12 @@
             optionProps: { value: 'value', label: 'label' },
           }"
           />
+          <vxe-column
+            align="center"
+            field="from_text"
+            width="180"
+            title="类别"
+          />
 
           <vxe-column
             align="center"

src/views/School/School.vue

@@ -557,10 +557,26 @@ export default {
       })
         .then((_) => {
           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,

src/views/Score/Score.vue

@@ -17,7 +17,7 @@
                 </el-select>
                 <el-date-picker v-model="select['filter[1][value]']" size="small" style="width: 110px;" type="year"
                   value-format="yyyy" placeholder="年份.."></el-date-picker>
-                <el-cascader size="small" v-model="select['filter[0][value]']" :options="school" :props="{
+                <el-cascader size="small" clearable filterable v-model="select['filter[0][value]']" :options="school" :props="{
                     emitPath: false,
                     value: 'id',
                     label: 'name',
@@ -403,7 +403,12 @@
         try {
           const res = await schoolIndex({
               page: 1,
-              page_size: 999,
+              page_size: 999,
+              filter:[{
+                key:'from',
+                op:'eq',
+                value:1
+              }]
             },
             false
           );