temp save

src/views/house/components/popup/IndexEdit.vue

@@ -11,7 +11,7 @@
       custom-class="xl-drawer"
       direction="rtl"
     >
-      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[23,24]">
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[23,25]">
         <div slot="OI23" class="scoped-product">
           <div class="sp-item" v-for="(product, one) in productData" :key="one">
             <div class="sp-title">{{product.product_type_name}}
@@ -79,7 +79,7 @@
             </div>
           </div>
         </div>
-        <div slot="OI24" class="scoped-other-form">
+        <div slot="OI25" class="scoped-other-form">
           <el-form-item label="点位坐标" class="scoped-item-two item">
             纬度N<el-input v-model="cObj.latitude" disabled />
             经度E<el-input v-model="cObj.longitude" disabled />
@@ -187,8 +187,6 @@ export default {
       }
     },
     openPtPopup (row, index) {
-      // console.log(row)
-      // console.log(index)
       this.isPtShow = true
       this.ptObj = {
         row,
@@ -291,14 +289,23 @@ export default {
       })
       let disabled = false
       if (params.id) disabled = true
-      const remoteOptionsSchoolList = []
-      if (params.school_list) {
-        params.school_id_list = params.school_list.map(item => {
-          remoteOptionsSchoolList.push({ keyRO: item.school_name, valRO: item.id })
+      let remoteOptionsDkSchoolList = []
+      if (params.school_list && params.school_list.duikou && params.school_list.duikou.length > 0) {
+        params.school_dk_list = params.school_list.duikou.map(item => {
+          remoteOptionsDkSchoolList.push({ keyRO: item.school_name, valRO: item.id })
           return item.id
         })
       } else {
-        params.school_id_list = []
+        params.school_dk_list = []
+      }
+      let remoteOptionsGhSchoolList = []
+      if (params.school_list && params.school_list.guihua && params.school_list.guihua.length > 0) {
+        params.school_gh_list = params.school_list.guihua.map(item => {
+          remoteOptionsGhSchoolList.push({ keyRO: item.school_name, valRO: item.id })
+          return item.id
+        })
+      } else {
+        params.school_gh_list = []
       }
       this.formData = [
         { label: '楼盘名称', key: 'estate_name', rules: 1 },
@@ -340,9 +347,13 @@ export default {
         // { label: '面积', label2: '多个面积英文逗号,分开(如:100,120)', key: 'house_area', type: 'inputFont', appendFont: '㎡'},
         // { label: '均价范围1', key: 'price_min', class: 'c-3', type: 'inputFont', appendFont: '元(最小)'},
         // { label: '均价范围2', key: 'price_max', class: 'c-3', type: 'inputFont', appendFont: '元(最大)'},
-        { label: '对口学校', key: 'school_id_list', type: 'selectRemote', multiple: true,
+        { label: '对口学校', key: 'school_dk_list', type: 'selectRemote', multiple: true,
+          remoteParams: { skey: 'school_name', api: `school.admschoollist`, opKey: 'school_name', opVal: 'id' },
+          remoteOptions: remoteOptionsDkSchoolList
+        },
+        { label: '规划就读', key: 'school_gh_list', type: 'selectRemote', multiple: true,
           remoteParams: { skey: 'school_name', api: `school.admschoollist`, opKey: 'school_name', opVal: 'id' },
-          remoteOptions: remoteOptionsSchoolList
+          remoteOptions: remoteOptionsGhSchoolList
         },
         { label: '楼盘地址', key: 'address', rules: 1 },
         // { label: '是否新房', key: 'is_new', type: 'select', class: 'c-3', options: this.$dictData.sys_yesno, rules: 1 },
@@ -360,10 +371,20 @@ export default {
             const oldform = this.$refs.ruleForm.baseForm
             const newForm = { ...oldform }
             if (this.curObj.id) newForm.id = this.curObj.id
-            if (newForm.school_id_list && newForm.school_id_list.length > 0) {
-              newForm.school_id_list = newForm.school_id_list.join(',')
+            if (newForm.school_dk_list && newForm.school_dk_list.length > 0) {
+              newForm.school_dk_list = newForm.school_dk_list.join(',')
+            } else {
+              newForm.school_dk_list = ''
+            }
+            if (newForm.school_dk_list && newForm.school_dk_list.length > 0) {
+              newForm.school_dk_list = newForm.school_dk_list.join(',')
+            } else {
+              newForm.school_dk_list = ''
+            }
+            if (newForm.school_gh_list && newForm.school_gh_list.length > 0) {
+              newForm.school_gh_list = newForm.school_gh_list.join(',')
             } else {
-              newForm.school_id_list = ''
+              newForm.school_gh_list = ''
             }
             newForm.longitude = this.cObj.longitude
             newForm.latitude = this.cObj.latitude

src/views/school/components/popup/IndexEdit.vue

@@ -11,8 +11,8 @@
       custom-class="xl-dialog"
       center
     >
-      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[9]">
-        <div slot="OI9" class="scoped-other-form">
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[10]">
+        <div slot="OI10" class="scoped-other-form">
           <el-form-item label="点位坐标" class="scoped-item-two item">
             纬度N<el-input v-model="cObj.latitude" disabled />
             经度E<el-input v-model="cObj.longitude" disabled />
@@ -73,13 +73,21 @@ export default {
       const disabled = false
       if (!params.pri_image) params.pri_image = 'http://img.honglounews.com/20210429034015-4091.png'
       let remoteOptionsHouse = []
-      if (params.estate_list && params.estate_list.length > 0) {
-        params.estate_id_list = params.estate_list.map(item => {
+      if (params.estate_list && params.estate_list.duikou && params.estate_list.duikou.length > 0) {
+        params.estate_dk_list = params.estate_list.duikou.map(item => {
           remoteOptionsHouse.push({ keyRO: item.estate_name, valRO: item.id })
           return item.id
         })
       } else {
-        params.estate_list = []
+        params.estate_dk_list = []
+      }
+      if (params.estate_list && params.estate_list.guihua && params.estate_list.guihua.length > 0) {
+        params.estate_gh_list = params.estate_list.guihua.map(item => {
+          remoteOptionsHouse.push({ keyRO: item.estate_name, valRO: item.id })
+          return item.id
+        })
+      } else {
+        params.estate_gh_list = []
       }
       if (params.school_type === '2') {
         this.formData = [
@@ -92,7 +100,11 @@ export default {
           { label: '主图', key: 'pri_image', type: 'upload', class: 'c-2' },
           { label: '学区范围图', key: 'district_img', type: 'upload', class: 'c-2' },
           { label: '学区范围', key: 'district',type: 'textarea' },
-          { label: '对口楼盘', key: 'estate_id_list', multiple: true, type: 'selectRemote',
+          { label: '对口楼盘', key: 'estate_dk_list', multiple: true, type: 'selectRemote',
+            remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
+            remoteOptions: remoteOptionsHouse
+          },
+          { label: '规划楼盘', key: 'estate_gh_list', multiple: true, type: 'selectRemote',
             remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
             remoteOptions: remoteOptionsHouse
           },
@@ -112,7 +124,11 @@ export default {
           { label: '主图', key: 'pri_image', type: 'upload', class: 'c-2' },
           { label: '学区范围图', key: 'district_img', type: 'upload', class: 'c-2' },
           { label: '学区范围', key: 'district',type: 'textarea' },
-          { label: '对口楼盘', key: 'estate_id_list', multiple: true, type: 'selectRemote',
+          { label: '对口楼盘', key: 'estate_dk_list', multiple: true, type: 'selectRemote',
+            remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
+            remoteOptions: remoteOptionsHouse
+          },
+          { label: '规划楼盘', key: 'estate_gh_list', multiple: true, type: 'selectRemote',
             remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
             remoteOptions: remoteOptionsHouse
           },
@@ -132,10 +148,15 @@ export default {
             const oldform = this.$refs.ruleForm.baseForm
             const newForm = { ...oldform }
             if (this.curObj.id) newForm.id = this.curObj.id
-            if (newForm.estate_id_list && newForm.estate_id_list.length > 0) {
-              newForm.estate_id_list = newForm.estate_id_list.join(',')
+            if (newForm.estate_dk_list && newForm.estate_dk_list.length > 0) {
+              newForm.estate_dk_list = newForm.estate_dk_list.join(',')
+            } else {
+              newForm.estate_dk_list = ''
+            }
+            if (newForm.estate_gh_list && newForm.estate_gh_list.length > 0) {
+              newForm.estate_gh_list = newForm.estate_gh_list.join(',')
             } else {
-              newForm.estate_id_list = ''
+              newForm.estate_gh_list = ''
             }
             newForm.longitude = this.cObj.longitude
             newForm.latitude = this.cObj.latitude