编辑项目时可以编辑事件

src/views/patentMining/components/dialog/addAndEditProject.vue

@@ -75,7 +75,7 @@
 
           </el-row>
           <template>
-            <div v-if="!form.id">
+            <div>
               <el-row>
                 <el-col :span="24">
                   <el-form-item label="事件：">
@@ -427,7 +427,7 @@ export default {
       this.eventList.data = []
       this.eventList.queryParams.current = 1
       this.eventList.name = query
-      this.getEventList()
+      this.getEventList(1)
     },
     //获取事件列表
     async getEventList(type) {
@@ -683,15 +683,52 @@ export default {
         }
         this.title = '编辑专利挖掘项目'
       } else {
-        this.eventList.disabled = false
-        if (this.form.eventId) {
-          this.eventList.disabled = true
-          this.eventList.data.push({
-            id: this.form.eventId,
-            name: this.form.eventName,
+        // this.eventList.disabled = false
+        // if (this.form.eventId) {
+        //   this.eventList.disabled = true
+        //   this.eventList.data.push({
+        //     id: this.form.eventId,
+        //     name: this.form.eventName,
+        //   })
+        // }
+        this.title = '新增专利挖掘项目'
+      }
+      this.eventList.data = []
+      this.eventList.name = ''
+      this.eventList.disabled = false
+      var hasEvent = false
+      if(this.form.eventId){
+        this.eventList.disabled = true
+        hasEvent = true
+      }
+      if(this.form.eventIds){
+        this.form.eventId = this.form.eventIds[0]
+        hasEvent = true
+      }
+      if(hasEvent){
+        if(this.form.eventId){
+          let params = {
+            current:1,
+            size:1,
+            searchQuery:`id=${this.form.eventId}`,//检索条件
+            orderDTOList: [
+              {
+                orderBy: "createTime",
+                orderType: 1
+              },
+            ]//排序
+          }
+          await this.$api.queryEvent(params).then(response => {
+            if(response.code == 200){
+              this.eventList.data.push(...response.data.data)
+              this.eventList.queryParams.total = response.data.total
+            }
           })
+          this.changeEvent(this.form.eventId)
+        }else{
+          this.getEventList()
         }
-        this.title = '新增专利挖掘项目'
+        
       }
       this.getPermissionPersonnel()
       this.dialogVisible = true

src/views/patentMining/components/mixins/index2.js

@@ -172,7 +172,7 @@ export const personnelLoading = {
       this.personnelList.data = []
       this.personnelList.queryParams.current = 1
       this.personnelList.queryParams.name = query
-      this.getPermissionPersonnel()
+      this.getPermissionPersonnel(1)
     },
     // 获取所有人员列表懒加载
     lazyLoadingPerson() {

src/views/project/components/drawer/form.vue

@@ -37,7 +37,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="事件" prop="event" v-if="!ruleForm.id">
+            <el-form-item label="事件" prop="event" >
               <mySelectButton size='large' style="width:100%" @click="addEvent" >
                     <div style="width:100%">
                       <el-select style="width:100%" v-model="ruleForm.eventId" @change="changeEvent" filterable remote :disabled="eventList.disabled" clearable placeholder="请选择"
@@ -51,7 +51,7 @@
                     </span>
                   </mySelectButton>
             </el-form-item>
-            <template v-if="(ruleForm.id && !(ruleForm.eventIds && ruleForm.eventIds.length)) || !ruleForm.id">
+            <template>
               <div>
                 <el-form-item label="应用场景" prop="scenarioIds">
                   <el-checkbox-group v-model="ruleForm.scenarioIds" @change="onChange" :disabled="Boolean(ruleForm.eventId)">
@@ -337,17 +337,20 @@ export default {
         this.ruleForm.scenarioIds = []
         this.show=false
       }
-
-      if(!this.ruleForm.id){
-        this.eventList.data = []
-        this.eventList.name = ''
-        this.eventList.disabled = false
+      this.eventList.data = []
+      this.eventList.name = ''
+      this.eventList.disabled = false
+      var hasEvent = false
+      if(this.ruleForm.eventId){
+        this.eventList.disabled = true
+        hasEvent = true
+      }
+      if(this.ruleForm.eventIds){
+        this.ruleForm.eventId = this.ruleForm.eventIds[0]
+        hasEvent = true
+      }
+      if(hasEvent){
         if(this.ruleForm.eventId){
-          this.eventList.disabled = true
-          // this.eventList.data.push({
-          //   id:this.ruleForm.eventId,
-          //   name:this.ruleForm.eventName,
-          // })
           let params = {
             current:1,
             size:1,
@@ -453,10 +456,10 @@ export default {
       this.eventList.data=[]
       this.eventList.queryParams.current = 1
       this.eventList.name = query
-      this.getEventList()
+      this.getEventList(1)
     },
     //获取事件列表
-    async getEventList(){
+    async getEventList(type){
       this.eventList.loading = true;
       let params = {
         ...this.eventList.queryParams,//分页信息
@@ -471,8 +474,19 @@ export default {
       await this.$api.queryEvent(params).then(response => {
         if(response.code == 200){
           this.eventList.loading = false;
+          if (!type) {
+            if (this.ruleForm.eventId) {
+              var index = response.data.data.findIndex(item => {
+                return item.id == this.ruleForm.eventId
+              })
+              if (index != -1) {
+                response.data.data.splice(index, 1)
+              }
+            }
+            this.eventList.queryParams.total = response.data.total
+          }
           this.eventList.data.push(...response.data.data)
-          this.eventList.queryParams.total = response.data.total
+          // this.eventList.queryParams.total = response.data.total
         }
       })
     },
@@ -508,7 +522,7 @@ export default {
           this.personnelList.data=[]
           this.personnelList.queryParams.current = 1
           this.personnelList.queryParams.name = query
-          this.getPersonnelList()
+          this.getPersonnelList(1)
     },
 
     

src/views/report/components/dialog/addAndEditReport.vue

@@ -173,7 +173,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <template v-if="!form.id">
+        <template >
           <div>
             <el-row>
               <el-col :span="24">
@@ -482,7 +482,7 @@ export default {
       this.personnelList.data = []
       this.personnelList.queryParams.current = 1
       this.personnelList.queryParams.name = query
-      this.getPermissionPersonnel()
+      this.getPermissionPersonnel(1)
     },
     // 获取所有人员列表懒加载
     lazyLoadingPerson() {
@@ -591,7 +591,7 @@ export default {
       this.eventList.data = []
       this.eventList.queryParams.current = 1
       this.eventList.name = query
-      this.getEventList()
+      this.getEventList(1)
     },
     //获取事件列表
     async getEventList(type) {
@@ -642,6 +642,7 @@ export default {
     //调查类型选择切换
     async onChange() {
       if (this.form.scenarioIds.length != 0) {
+        // this.$set(this.form,'matterIds',[])
         await this.$api.getMatter(this.form.scenarioIds).then(response => {
           this.show = true
           this.dictAssociates = response.data.data
@@ -656,8 +657,28 @@ export default {
       this.patentLoading = false
       var a = '编辑'
       this.form = JSON.parse(JSON.stringify(form))
+      this.eventList.data = []
+      this.eventList.name = ''
       if (this.form.id) {
         this.$set(this.form,'signProjectIds',this.form.signPatentNo || this.form.signProjectId)
+        if (this.form.eventIds) {
+          this.form.eventId = this.form.eventIds[0]
+          this.show = true
+          this.eventList.disabled = false
+          let params = {
+            current:1,
+            size:1,
+            searchQuery:`id=${this.form.eventId}`,//检索条件
+            orderDTOList: []//排序
+          }
+          await this.$api.queryEvent(params).then(response => {
+            if(response.code == 200){
+              this.eventList.data.push(...response.data.data)
+              this.eventList.queryParams.total = response.data.total
+            }
+          })
+          this.changeEvent(this.form.eventId)
+        }
       } else {
         this.$set(this.form, 'matterIds', form.matterId)
         this.form.scenarioIds = form.scenarioId
@@ -666,12 +687,19 @@ export default {
         this.eventList.disabled = false
         if (this.form.eventId) {
           this.eventList.disabled = true
-          this.eventList.data.push(
-            {
-              id: form.eventId,
-              name: form.eventName
+          let params = {
+            current:1,
+            size:1,
+            searchQuery:`id=${this.form.eventId}`,//检索条件
+            orderDTOList: []//排序
+          }
+          await this.$api.queryEvent(params).then(response => {
+            if(response.code == 200){
+              this.eventList.data.push(...response.data.data)
+              this.eventList.queryParams.total = response.data.total
             }
-          )
+          })
+          this.changeEvent(this.form.eventId)
         }
         a = '创建'
       }