1

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

@@ -195,7 +195,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose">取 消</el-button>
-        <el-button type="primary" v-if="!form.id" @click="handleExamine">提交审核</el-button>
+        <el-button type="primary" v-if="!form.id || form.state>3" @click="handleExamine">提交审核</el-button>
         <el-button type="primary" @click="submit">直接完成</el-button>
       </span>
     </el-dialog>

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

@@ -1115,7 +1115,7 @@ export default {
           this.$set(this.form,'signPatentNo',this.form.signPatentNo.trim())
           let formData = this.form
           if (!this.form.id) {//新增报告
-            this.$confirm('是否需要进行审核?', '提示', {
+            this.$confirm('是否需要提交审核?', '提示', {
               confirmButtonText: '是',
               cancelButtonText: '否',
               closeOnClickModal: false,
@@ -1131,18 +1131,37 @@ export default {
             });
 
           } else {//编辑报告
-            this.$api.updateReportProject(formData).then(response => {
-              if (response.code == 200) {
-                this.files = []
-                this.$message.success('报告更新成功')
-                this.$emit('getList', '更新成功')
-                this.handleClose()
-              }
-            })
+            if(this.form.status>3){
+              this.$confirm('是否需要提交审核?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                closeOnClickModal: false,
+                distinguishCancelAndClose: true,
+              }).then(() => {//审核打开审核弹窗
+                this.showTask = true
+                this.$set(this.taskForm, 'name', this.form.name + '审核')
+              }).catch(action => {//不审核直接更新报告
+                // 调用更新报告公用，接口
+                this.updateReportProject(formData)
+              });
+              return
+            }
+            this.updateReportProject(formData)
           }
         }
       })
     },
+    //更新报告信息
+    updateReportProject(formData){
+      this.$api.updateReportProject(formData).then(response => {
+        if (response.code == 200) {
+          this.files = []
+          this.$message.success('报告更新成功')
+          this.$emit('getList', '更新成功')
+          this.handleClose()
+        }
+      })
+    },
     //关闭弹窗
     handleClose(val) {
       if (this.form.reportType == 7 && val) {

src/views/report/components/reportFile/reportFileTable.vue

@@ -381,16 +381,16 @@ export default {
     examineSubmit(row){
         var title = row.referencesName
         var taskName = ''
-        if(title.endsWith('.'+row.fileType)){
-            title = title.slice(0, -(row.fileType.length+1))
+        if(title.endsWith('.'+row.type)){
+            title = title.slice(0, -(row.type.length+1))
         }
         taskName = title + '-' + row.createName + '-' + '文件审核'
-        title = title + '-' + row.createName + '.' + row.fileType
+        title = title + '-' + row.createName + '.' + row.type
         var form = {
             referencesName:title,
             guid:row.fileGuid,
             projectId:this.projectId,
-            fileType:row.fileType
+            fileType:row.type
         }
         var taskForm = {
             name:taskName

src/views/task/components/examine/components/examine.vue

@@ -92,10 +92,17 @@ const defaultMenu = [
     },
     {
         icon:'所属项目',
+        label:'所属任务信息',
+        value:2,
+        id:'projectMessage',
+        taskType:[5],
+    },
+    {
+        icon:'所属项目',
         label:'所属项目信息',
         value:2,
         id:'projectMessage',
-        taskType:[5,7],
+        taskType:[7],
     },
     {
         icon:'审核信息',

src/views/task/components/examine/components/projectMessage.vue

@@ -1,25 +1,33 @@
 <template>
   <div>
-    <el-row :gutter="15" v-for="(item) in (columnList.length/col | 1)" :key="item+'q'">
-        <template v-for="fieldIndex in 3" v-if="columnList[getFileProperty(item,fieldIndex)]" >
-            <el-col :key="fieldIndex+'a'"><div>{{columnList[getFileProperty(item,fieldIndex)].name}}：</div></el-col>
-            <el-col :key="fieldIndex+'b'">
-               <div v-html="$commonJS.getColumnData(projectMessage,columnList[getFileProperty(item,fieldIndex)])"></div>
-            </el-col>
-        </template>
-    </el-row>
-    <el-row :gutter="15" v-if="projectMessage.systemFileList && projectMessage.systemFileList.length>0">
-        <el-col>附件：</el-col>
-        <el-col class="value">
-            <div v-for="file in projectMessage.systemFileList" :key="file.guid" class="cursor_pointer file">
-                {{ file.originalName }} 
-                <div class="btns"> 
-                    <el-button type="text" @click="review(file)">预览</el-button>
-                    <el-button type="text" @click="downLoad(file)">下载</el-button>
+    <template v-if="taskType == 5">
+        <div>
+            <taskMessageVue :taskId="taskId" :taskMessage="belongingTask" :taskType="taskType"></taskMessageVue>
+        </div>
+    </template>
+    <template v-else>
+        <el-row :gutter="15" v-for="(item) in (columnList.length/col | 1)" :key="item+'q'">
+            <template v-for="fieldIndex in 3" v-if="columnList[getFileProperty(item,fieldIndex)]" >
+                <el-col :key="fieldIndex+'a'"><div>{{columnList[getFileProperty(item,fieldIndex)].name}}：</div></el-col>
+                <el-col :key="fieldIndex+'b'">
+                <div v-html="$commonJS.getColumnData(projectMessage,columnList[getFileProperty(item,fieldIndex)])"></div>
+                </el-col>
+            </template>
+        </el-row>
+        <el-row :gutter="15" v-if="projectMessage.systemFileList && projectMessage.systemFileList.length>0">
+            <el-col>附件：</el-col>
+            <el-col class="value">
+                <div v-for="file in projectMessage.systemFileList" :key="file.guid" class="cursor_pointer file">
+                    {{ file.originalName }} 
+                    <div class="btns"> 
+                        <el-button type="text" @click="review(file)">预览</el-button>
+                        <el-button type="text" @click="downLoad(file)">下载</el-button>
+                    </div>
                 </div>
-            </div>
-        </el-col>
-    </el-row>
+            </el-col>
+        </el-row>
+    </template>
+    
   </div>
 </template>
 
@@ -56,14 +64,19 @@ const defaultColumnList = [
         projectType:[1,2,3]
     },
     {
+        name:'发明点',
+        field:'inventionPoint',
+        projectType:[4]
+    },
+    {
         name:'创建人',
         field:'createName',
-        projectType:[1,2,3]
+        projectType:[1,2,3,4]
     },
     {
         name:'创建时间',
         field:'createTime',
-        projectType:[1,2,3]
+        projectType:[1,2,3,4]
     },
     {
         name:'备注',
@@ -73,8 +86,11 @@ const defaultColumnList = [
     
 ]
 import mixins from './mixins/index'
+import taskMessageVue from './taskMessage.vue';
 export default {
-  components: {},
+  components: {
+    taskMessageVue
+  },
   mixins:[mixins],
   props: {
     allMessage:{
@@ -86,7 +102,8 @@ export default {
     return {
         columnList:[],
         col:3,
-        projectMessage:{}
+        projectMessage:{},
+        belongingTask:{},
     };
   },
   watch: {
@@ -103,15 +120,39 @@ export default {
   },
   methods: {
     async init(){
+        if(this.taskType == 5){
+            this.getBelongingTask()
+            return
+        }
         await this.getColumnData()
         this.getProjectMessage()
     },
+    //获取任务信息
+    getBelongingTask(){
+        if(!this.taskMessage.assoTaskId){
+            return
+        }
+        let params = {
+            current:1,
+            size:10,
+            searchQuery: `id=${this.taskMessage.assoTaskId}`,//检索条件
+            orderDTOList:[],//排序信息
+        }
+        this.$api.queryProjectTask(params).then(response => {
+            if (response.code == 200) {
+                if(response.data.data && response.data.data.length>0){
+                    this.belongingTask =  response.data.data[0]
+                }
+            }
+        }).catch(error => {
+        })
+    },
     //获取栏位信息
     async getColumnData(){
         if(!this.taskMessage.projectType){
             return
         }
-        if(!this.allMessage){
+        if(!this.allMessage || this.taskMessage.projectType == 4){
             this.columnList = defaultColumnList.filter(item=>{
                 return item.projectType.indexOf(Number(this.taskMessage.projectType)) != -1
             })
@@ -164,6 +205,17 @@ export default {
                 }).catch(error => {
                 })
                 break;
+            case 4://查询查新检索项目信息
+                params.searchQuery = `projectId=${this.taskMessage.projectId}`
+                this.$api.queryNoveltyProject(params).then(response=>{
+                    if(response.code == 200){
+                        if(response.data.data && response.data.data.length>0){
+                            this.projectMessage =  response.data.data[0]
+                        }
+                    }
+                }).catch(error=>{
+                })
+                break;
         }
         
     },

src/views/task/components/examine/components/taskMessage.vue

@@ -6,6 +6,10 @@
             <el-col :key="fieldIndex+'b'">
                 <div v-if="['type'].includes(columnList[getFileProperty(item,fieldIndex)].value)" v-html="$commonJS.getColumnData(taskMessage, columnList[getFileProperty(item,fieldIndex)], null, { data: taskTypeList })"></div>
                 <div v-else-if="['status'].includes(columnList[getFileProperty(item,fieldIndex)].value)" v-html="$commonJS.getColumnData(taskMessage, columnList[getFileProperty(item,fieldIndex)], null, { data: taskStatusList })"></div>
+                <div v-else-if="['projectName'].includes(columnList[getFileProperty(item,fieldIndex)].value)">
+                  <div v-if="taskMessage.projectType == 4">查新检索项目</div>
+                  <div v-else v-html="$commonJS.getColumnData(taskMessage, columnList[getFileProperty(item,fieldIndex)])"></div>
+                </div>
                 <div v-else v-html="$commonJS.getColumnData(taskMessage, columnList[getFileProperty(item,fieldIndex)])"></div>
             </el-col>
         </template>
@@ -28,13 +32,22 @@ export default {
   watch: {},
   computed: {},
   created() {},
-  async mounted() {
-    var columnList = await this.$commonJS.getCustomField('projectTask')
-    this.columnList = columnList.filter(item=>{
-      return item.field != 'processName'
-    })
+  mounted() {
+    this.getColumn()
+  },
+  methods: {
+    async getColumn(){
+      var columnList = await this.$commonJS.getCustomField('projectTask')
+      if(this.taskType != 5){
+        this.columnList = columnList.filter(item=>{
+          return item.field != 'processName'
+        })
+      }else{
+        this.columnList = columnList
+      }
+      
+    }
   },
-  methods: {},
 };
 </script>
 <style lang="scss" scoped>