ZhaoJing 1 年之前
父節點
當前提交
3857177263
共有 2 個文件被更改,包括 45 次插入27 次删除
  1. 43 26
      src/pages/manage/jcxxgl/xxgl/index_xj.vue
  2. 2 1
      src/pages/manage/jcxxgl/xxgl/xj_detail.vue

+ 43 - 26
src/pages/manage/jcxxgl/xxgl/index_xj.vue

@@ -72,10 +72,7 @@
           <el-input class="rank" v-model="ruleForm.sm_email" />
         </el-form-item>
         <el-form-item label="详细地址" prop="detail_area">
-          <el-input
-            class="rank"
-            v-model="ruleForm.detail_area"
-          />
+          <el-input class="rank" v-model="ruleForm.detail_area" />
         </el-form-item>
       </div>
       <el-form-item label="学校风采" prop="sm_brief">
@@ -111,10 +108,10 @@ let ruleForm = $ref({
   sm_address: [],
   sm_period: "",
   detail_area: "",
-  sm_email:'',
-  sm_brief:''
+  sm_email: "",
+  sm_brief: "",
+  sm_address_detail: '',
 });
-
 request({
   url:'/school/main/detail',
   data:{
@@ -125,9 +122,21 @@ request({
     Object.keys(ruleForm).forEach((key, item)=>{
       ruleForm[key] = res.data.one_info[key]
     })
-    ruleForm.sm_address = [res.data.one_info.sm_area_id1,res.data.one_info.sm_area_id2,res.data.one_info?.sm_area_id3];
+   if (res.data.one_info.sm_area_id1 * 1 >= 32 && res.data.one_info.sm_area_id1 * 1 <= 36) {
+      ruleForm.sm_address = [
+        res.data.one_info.sm_area_id1,
+        res.data.one_info.sm_area_id2
+      ];
+    } else {
+      ruleForm.sm_address = [
+        res.data.one_info.sm_area_id1,
+        res.data.one_info.sm_area_id2,
+        res.data.one_info?.sm_area_id3 == 0 ? '' : res.data.one_info?.sm_area_id3,
+      ];
+    }
     ruleForm.detail_area = res.data.one_info.sm_address;
     ruleForm.sm_brief = res.data.one_info.sm_brief;
+    handleChange(ruleForm.sm_address)
   }
 })
 
@@ -177,18 +186,29 @@ request({
   }
 });
 
-function handleChange(val) {
-  console.log(val);
-  val.forEach((item) => {
-    request({
-      url: "/common/district/search",
+let address_name = [];
+
+async function handleChange(val) {
+  console.log(ruleForm.sm_address, 'rule');
+  console.log(val, 'val');
+  address_name = [];
+  let name = '';
+  for (var key in val) {
+    await request({
+      url: "/common/district/detail",
       data: {
-        id: item,
+        id: val[key],
       },
-    }).then((res) => {});
-  });
+    }).then((res) => {
+      if (res.code == "1") {
+        address_name.push(res.data.one_info.name);
+        console.log(address_name);
+      }
+    }).catch(err => {
+      console.log(err);
+    });
+  }
 }
-
 // 地址级联
 let address = $ref("");
 let props = {
@@ -241,25 +261,25 @@ let props = {
 
 
 let isButton = $ref(false);
-let isEdit;
 // 提交
 function submitForm(formName) {
   if (!formName) return;
   formName.validate((valid) => {
     let data = {
-      id:'10025',
+      id: user.value.sm_id,
+      // id: '10001',
       school_main: {
-        ..._.omit(ruleForm, "sm_address", "detail_area"),
-        sm_ms_lat: latitude,
-        sm_ms_lng: longitude,
+        ..._.omit(ruleForm, "sm_address", "detail_area", 'sm_address_detail'),
         sm_address: ruleForm.detail_area,
         sm_area_id1: ruleForm.sm_address[0],
+        sm_area_id1_name: address_name[0],
         sm_area_id2: ruleForm.sm_address[1],
+        sm_area_id2_name: address_name[1],
         sm_area_id3: ruleForm?.sm_address[2],
+        sm_area_id3_name: address_name[2],
       },
     };
     if (valid) {
-      if (!isEdit) {
         isButton = true;
         request({
           url: "/school/main/edit",
@@ -274,9 +294,6 @@ function submitForm(formName) {
             isButton = false;
           }
         });
-      } else {
-        isButton = false;
-      }
     } else {
       isButton = false;
     }

+ 2 - 1
src/pages/manage/jcxxgl/xxgl/xj_detail.vue

@@ -27,13 +27,14 @@
 </template>
 <script setup>
 import { useRouter } from "vue-router";
+import { user } from '@/store/index'
 const router = useRouter();
 let detailData = $ref({});
 let https = window.GLOBAL_CONFIG.api;
 request({
   url: "/school/main/detail",
   data: {
-    id: "10025",
+    id: user.value.sm_id,
   },
 }).then((res) => {
   if (res.code == "1") {