更改

src/views/BatchSub/BatchSub.vue

@@ -179,18 +179,18 @@
           :edit-render="{}"
         >
           <template #default="{ row }">
-            {{ row.school ? row.school.map((i) => i.name) : "" }}
+            {{ row.school_details ? row.school_details.map((i) => i.name) : "" }}
           </template>
           <template #edit="{ row }">
             <el-input
               :value="
-                row.school ? row.school.map((i) => i.name).toString() : ''
+                row.school_details ? row.school_details.map((i) => i.name).toString() : ''
               "
               size="small"
               placeholder="点击选择学校"
               @focus="
                 (selectedRow = row),
-                  $refs['SchoolPicker'].setDefaultValue(row.school || []),
+                  $refs['SchoolPicker'].setDefaultValue(row.school_details || []),
                   (isShowSchoolPicker = true)
               "
             ></el-input>
@@ -321,7 +321,7 @@
     <SchoolPicker
       ref="SchoolPicker"
       :is-show.sync="isShowSchoolPicker"
-      @confirm="(e) => (selectedRow.school = e)"
+      @confirm="(e) => (selectedRow.school_details = e)"
     />
   </div>
 </template>
@@ -669,7 +669,16 @@ export default {
           form[key] = row[key];
         }
 
+        let arr = []
+
+        this.selectedRow.school_details.map(item=>{
+          arr.push(item.id)
+        })
+        form.school = arr
+        console.log("form",form)
+        // return
         this.loading = true;
+
         await save(form, false);
         await this.getList();
         this.loading = false;

src/views/BatchSub/components/AddBatchSub.vue

@@ -68,11 +68,11 @@
             </el-form-item>
 
             <el-form-item label="绑定学校" prop="school">
-              <el-input :value="form.school ? form.school.map(i => i.name + '\n').toString() : ''"
+              <el-input :value="form.school_details ? form.school_details.map(i => i.name + '\n').toString() : ''"
                         size="small"
                         type="textarea"
                         placeholder="点击选择学校"
-                        @focus="$refs['SchoolPicker'].setDefaultValue(form.school), isShowSchoolPicker = true"></el-input>
+                        @focus="$refs['SchoolPicker'].setDefaultValue(form.school_details), isShowSchoolPicker = true"></el-input>
             </el-form-item>
 
             <el-form-item label="排序" prop="sort">
@@ -143,7 +143,7 @@
       </section>
     </el-drawer>
 
-    <SchoolPicker ref="SchoolPicker" :is-show.sync="isShowSchoolPicker" @confirm="e => form.school = e"></SchoolPicker>
+    <SchoolPicker ref="SchoolPicker" :is-show.sync="isShowSchoolPicker" @confirm="e=>form.school_details=e"></SchoolPicker>
   </div>
 </template>
 
@@ -182,6 +182,7 @@ export default {
         sort: "",
         show_school_obey: "",
         show_specialty_obey: "",
+        school_details:[]
       },
       rules: {
         name: [
@@ -238,7 +239,6 @@ export default {
         return [];
       }
     },
-
     uploadBefore(file) {
       if (file.size > uploadSize) {
         this.$message({
@@ -300,6 +300,11 @@ export default {
         if (valid) {
           this.loading = true;
           try {
+            let arr =[]
+            this.form.school_details.map(i=>{
+              arr.push(i.id)
+            })
+            this.form.school = arr
             await save(this.form);
             this.$message.success("新增成功");
             this.$emit("refresh");

src/views/BatchSub/components/SchoolPicker.vue

@@ -316,6 +316,7 @@ export default {
       if ($table) {
         console.log(this.uniqueArr($table.getCheckboxReserveRecords(true), $table.getCheckboxRecords(true), this.defaultValue).map(i => ({ id: i.id, code: i.code, name: i.name })))
         this.$emit('confirm', this.uniqueArr($table.getCheckboxReserveRecords(true), $table.getCheckboxRecords(true), this.defaultValue).map(i => ({ id: i.id, code: i.code, name: i.name })))
+
         this.setDefaultValue()
         this.$refs['table']?.clearCheckboxReserve()
         this.$refs['table']?.clearCheckboxRow()

src/views/School/School.vue

@@ -136,10 +136,25 @@
         <vxe-column
           header-align="center"
           field="name"
-          width="160"
+          width="480"
           title="学校名称"
           :edit-render="{ name: 'input', attrs: { type: 'text' } }"
         />
+        <!-- <vxe-column
+          header-align="center"
+          field="id"
+          width="160"
+          title="id"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="from"
+          width="160"
+          title="学校名称"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        /> -->
 
         <vxe-column
           align="center"
@@ -153,7 +168,19 @@
             optionProps: { value: 'id', label: 'name' },
           }"
         />
-
+        <vxe-column
+          v-if="this.select['filter[3][value]']==2"
+          align="center"
+          field="is_area_3"
+          width="180"
+          title="是否市三区"
+          :edit-render="{
+            name: 'VxeSelect',
+            options: [{id:0,name:'否'},{id:1,name:'是'}],
+            props: { multiple: false },
+            optionProps: { value: 'id', label: 'name' },
+          }"
+        />
         <vxe-column
           header-align="center"
           field="code"
@@ -452,6 +479,7 @@ export default {
         id: "",
         name: "",
         area_id: "",
+        is_area_3:'',
         code: "",
         star: "",
         address: "",
@@ -498,6 +526,7 @@ export default {
   },
   created() {
     this.select['filter[3][value]'] = this.$route.meta?.params?.from
+    // this.select['filter[3][value]'] = ''
     this.getArea();
     this.getSchoolType();
     this.getList();