ylong преди 7 месеца
родител
ревизия
a24ecbde28
променени са 3 файла, в които са добавени 21 реда и са изтрити 29 реда
  1. 20 2
      src/views/data/universities/components/universities-edit.vue
  2. 0 27
      src/views/data/universities/index.vue
  3. 1 0
      src/views/marketing/ipMrakup/index.vue

+ 20 - 2
src/views/data/universities/components/universities-edit.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script setup>
-  import { reactive, ref, defineEmits, getCurrentInstance } from 'vue';
+  import { reactive, ref, defineEmits, getCurrentInstance, computed } from 'vue';
   import { useFormData } from '@/utils/use-form-data';
   import SimpleFormModal from '@/components/CommonPage/SimpleFormModal.vue';
   const { proxy } = getCurrentInstance();
@@ -80,20 +80,38 @@
     update: '/baseinfo/schoolInfo/edit'
   });
   const formData = ref({ schoolTag: '1' });
+  const defaultFormData = { schoolTag: '1' };
 
   const editRef = ref(null);
 
   function handleOpen(data = {}) {
     title.value = data && data.id ? '编辑高校' : '新增高校';
-    formData.value = Object.assign(formData.value, data || {});
+    
+    // 重置表单数据
+    formData.value = JSON.parse(JSON.stringify(defaultFormData));
+    
+    // 如果是编辑模式,才合并数据
+    if (data && data.id) {
+      formData.value = Object.assign({}, formData.value, data);
+      formData.value.schoolTag = formData.value.schoolTag + '';
+      formData.value.schoolLevel = formData.value.schoolLevel + '';
+    }
+    
+    // 获取省份列表
     getProviceList().then((res) => {
       provinceList.value = res.data.data;
     });
+    
+    // 如果有省份ID,获取城市列表
     if (data && data.provinceId) {
       getProviceList(data.provinceId).then((res) => {
         cityList.value = res.data.data;
       });
+    } else {
+      cityList.value = [];
     }
+    
+    // 确保表单组件也重置
     editRef.value?.handleOpen(formData.value);
   }
 

+ 0 - 27
src/views/data/universities/index.vue

@@ -32,34 +32,7 @@
           导出EXCEL
         </el-button>
       </template>
-      <template #picture="{ row }">
-        <el-image
-          style="width: 80px; height: 100px"
-          fit="cover"
-          src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
-        />
-      </template>
 
-      <template #baseInfo="{ row }">
-        <div class="base-info flex flex-col items-start">
-          <div class="common-text">
-            <el-text>书 名:</el-text>
-            <el-text type="success">行政法与行政诉讼法(第六版)</el-text>
-          </div>
-          <div class="common-text">
-            <el-text>条 码:</el-text>
-            <el-text>9787301257975</el-text>
-          </div>
-          <div class="common-text">
-            <el-text>作 者:</el-text>
-            <el-text>姜明安</el-text>
-          </div>
-          <div class="common-text">
-            <el-text>出版社:</el-text>
-            <el-text>北京大学出版社</el-text>
-          </div>
-        </div>
-      </template>
       <template #schoolTag="{ row }">
         <dict-data code="school_tag" type="tag" :model-value="row.schoolTag" />
       </template>

+ 1 - 0
src/views/marketing/ipMrakup/index.vue

@@ -63,6 +63,7 @@
                 height: 100%;
                 display: flex;
                 flex-direction: column;
+                overflow: auto;
             }
             :deep(.el-tabs__header) {
                 margin-bottom: 0;