部分bug修改

src/components/Course/CourseEdit.vue

@@ -49,6 +49,13 @@
           :wrapper-col="formItemLayout.wrapperCol"
           label="图片"
         >
+          <div v-if="editData.picUrl" class="d-flex align-end">
+            <img :src="editData.picUrl" style="height:100px;" alt=""> 
+            <div>
+              <a-icon @click="deleteFileList" class="ml-5" type="close-circle" />
+            </div>
+            
+          </div>
           <a-upload
             :action="upload"
             :before-upload="beforeUpload"
@@ -136,9 +143,23 @@ export default {
   watch: {
     editData(val) {
       console.log(val);
+      this.serviceName = val.name
+      this.intro = val.intro
+      this.orders = val.orders
+      this.fileList.push(val.picUrl)
     },
   },
   methods: {
+
+    // 删除fileList
+    deleteFileList(){
+      console.log("进入事件")
+
+      this.fileList = []
+      this.editData.picUrl = ''
+   
+
+    },
     // 上传图片事件
     handleChange(info) {
       // this.fileList = fileList;

src/components/Development/DevelopmentAdd.vue

@@ -302,7 +302,7 @@
                       },
                     ]"
           >
-            <a-checkbox :key="item.id" :value="item.id" v-for="item in typeLists">{{ item.name }}</a-checkbox>
+            <a-checkbox :key="item.id" :value="item.id" v-for="item in typeLists.list">{{ item.name }}</a-checkbox>
           </a-checkbox-group>
         </a-form-item>
         <!-- 专利数 -->
@@ -422,7 +422,7 @@
             <a-select-option
               :key="index"
               :value="type.id"
-              v-for="(type, index) in types"
+              v-for="(type, index) in types.list"
             >{{ type.name }}</a-select-option>
           </a-select>
         </a-form-item>

src/components/Development/DevelopmentDate.vue

@@ -59,6 +59,7 @@
         </a-table>
       </div>
       <a-empty v-else />
+      
 
       <!-- 编辑 -->
       <development-edit

src/components/Development/DevelopmentEdit.vue

@@ -309,7 +309,7 @@
                       },
                     ]"
           >
-            <a-checkbox :key="item.id" :value="item.id" v-for="item in typeLists">{{ item.name }}</a-checkbox>
+            <a-checkbox :key="item.id" :value="item.id" v-for="item in typeLists.list">{{ item.name }}</a-checkbox>
           </a-checkbox-group>
         </a-form-item>
         <!-- 专利数 -->
@@ -427,7 +427,7 @@
             <a-select-option
               :key="index"
               :value="type.id"
-              v-for="(type, index) in types"
+              v-for="(type, index) in types.list"
             >{{ type.name }}</a-select-option>
           </a-select>
         </a-form-item>

src/components/EntityApply/EntityApplyDate.vue

@@ -59,11 +59,23 @@
       </a-table>
     </div>
     <a-empty v-else />
+
+
+    编辑
+    <!-- <institute-edit
+      :editItem="editItem"
+      :editVisible="editVisible"
+      :typeLists="typeLists"
+      @closeModal="closeModal"
+      @getInstituteSearchBack="getInstituteSearchBack"
+    /> -->
+
   </div>
 </template>
 
 <script>
 import EditableCellSelect from 'components/EditableCellSelect/EditableCellSelect.vue';
+// import EntityApplyEdit from 'components/EntityApplyEdit/EntityApplyEdit.vue';
 import Detail from 'components/EntityApply/Detail.vue';
 import { changeStatus,deleteCompany } from 'config/api';
 
@@ -121,6 +133,7 @@ export default {
   components: {
     EditableCellSelect,
     Detail,
+    // EntityApplyEdit
   },
 
   props: { lists: { type: Array, default: () => [] }, pagination: { type: Object, default: () => {} } },
@@ -147,6 +160,8 @@ export default {
   },
 
   methods: {
+
+    
     // 删除
     async deleteEditModal(id) {
       try {

src/components/Institute/InstituteAdd.vue

@@ -61,7 +61,7 @@
                       },
                     ]"
           >
-            <a-checkbox :key="item.id" :value="item.id" v-for="item in typeLists">{{ item.name }}</a-checkbox>
+            <a-checkbox :key="item.id" :value="item.id" v-for="item in typeLists.list">{{ item.name }}</a-checkbox>
           </a-checkbox-group>
         </a-form-item>
         <!-- 项目分类 -->

src/components/Institute/InstituteDate.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="main flex-1">
+    <!-- <div>{{ typeLists}}</div> -->
     <div style="width:100%" v-if="lists && lists.length > 0">
       <a-table
         :columns="columns"

src/components/Institute/InstituteSearch.vue

@@ -12,7 +12,7 @@
     <div class="flex-1"></div>
 
     <a-button @click="showModal" class="editable-add-btn" type="primary">增加</a-button>
-
+    <!-- <div>{{ typeLists }}</div> -->
     <!-- 添加 -->
     <institute-add
       :typeLists="typeLists"
@@ -42,6 +42,7 @@ export default {
 
   methods: {
     showModal() {
+      console.log("=========showModal")
       this.visible = true;
     },
 

src/components/innovativeService/innovativeServiceDate.vue

@@ -144,6 +144,7 @@ export default {
   },
   methods: {
     showEditModal(data) {
+      console.log(data)
       this.editData = data;
       this.contents = this.getselContent(data.id);
       this.editVisible = true;

src/components/innovativeService/innovativeServiceEdit.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="d-flex flex-wrap pb-3">
     <!-- 编辑 -->
+    
     <a-modal
       :mask-closable="false"
       @cancel="$emit('closeModal')"
@@ -10,6 +11,7 @@
       v-model="editVisible"
       width="700px"
     >
+      <!-- <div>{{ editData }}</div> -->
       <a-form :form="form" @submit="handleSubmit">
         <!-- 服务名称 -->
         <a-form-item
@@ -17,7 +19,7 @@
           :wrapper-col="formItemLayout.wrapperCol"
           label="服务名称"
         >
-          <a-input class="ml-3" placeholder="服务名称" v-model="serviceName" />
+          <a-input class="ml-3" placeholder="服务名称" v-model="editData.name" />
         </a-form-item>
         <!-- 服务简介 -->
         <a-form-item
@@ -25,7 +27,7 @@
           :wrapper-col="formItemLayout.wrapperCol"
           label="服务简介"
         >
-          <a-textarea class="ml-3" placeholder="服务简介" v-model="intro" />
+          <a-textarea class="ml-3" placeholder="服务简介" v-model="editData.intro" />
         </a-form-item>
         <!-- 服务内容 -->
         <a-form-item
@@ -41,14 +43,21 @@
           :wrapper-col="formItemLayout.wrapperCol"
           label="服务排序"
         >
-          <a-input-number class="ml-3" v-model="orders" />
+          <a-input-number class="ml-3" v-model="editData.orders" />
         </a-form-item>
         <!-- 图片 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
           label="图片"
-        >
+        > 
+          <div v-if="editData.picUrl" class="d-flex align-end">
+            <img :src="editData.picUrl" style="height:100px;" alt=""> 
+            <div>
+              <a-icon @click="deleteFileList" class="ml-5" type="close-circle" />
+            </div>
+            
+          </div>
           <a-upload
             :action="upload"
             :before-upload="beforeUpload"
@@ -136,9 +145,24 @@ export default {
   watch: {
     editData(val) {
       console.log(val);
+      this.serviceName = val.name
+      this.intro = val.intro
+      this.orders = val.orders
+      this.fileList.push(val.picUrl)
     },
   },
   methods: {
+
+    // 删除fileList
+    deleteFileList(){
+      console.log("进入事件")
+
+      this.fileList = []
+      this.editData.picUrl = ''
+   
+
+    },
+    
     // 上传图片事件
     handleChange(info) {
       // this.fileList = fileList;

src/views/InnovativeLab/InnovativeLab.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="pa-3 white fill-height d-flex flex-column">
+    <!-- <div>{{ typeLists}}</div> -->
     <institute-search :type-lists="typeLists" @getInstituteSearchBack="getInstituteSearchBack" />
     <institute-date :lists="lists" :pagination="pagination" :type-lists="typeLists" @getInstituteSearchBack="getInstituteSearchBack" />
   </div>
@@ -52,7 +53,7 @@ export default {
         }
       }
       const data = await this.getSelModelSearch(params);
-      this.typeLists = data;
+      this.typeLists = data.list;
     },
 
     /**