Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

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

@@ -72,7 +72,7 @@ export default {
         if (res.code == 200) {
           // this.detailsMessage = res.data.projectTaskVO//分配任务信息
           // this.tableData = res.data.systemFileList//文件
-          for (let i = 0; i < res.data.auditHistoryVOS.length - 1; i++){
+          for (let i = 0; i < res.data.auditHistoryVOS.length ; i++){
             if (res.data.auditHistoryVOS[i].taskHandleResultVO) {
               this.tableData.push(res.data.auditHistoryVOS[i].taskHandleResultVO)
             }

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

@@ -43,7 +43,7 @@ import { personnelLoading, optionsData } from '../mixins/index2'
 export default {
   mixins: [personnelLoading, optionsData],
   components: {},
-  props: ['id'],
+  props: ['id','processId'],
   data() {
     return {
       dialogVisible: false,
@@ -84,6 +84,7 @@ export default {
       } else {//创建分配任务
         this.title = '创建文件分配任务'
         this.form.projectId = this.id//项目id
+        this.form.processId=this.processId
         this.form.type = 6//分配任务
         this.form.handlerType = 0//0内部人员1外部人员
       }

src/views/patentMining/components/handleExamine/detailsPage.vue

@@ -173,7 +173,7 @@ export default {
         if (res.code == 200) {
           this.detailsMessage = res.data.projectTaskVO//分配任务信息
           this.tableData = res.data.systemFileList//文件
-          this.timelineList = res.data.auditHistoryVOS.splice(0, res.data.auditHistoryVOS.length - 1)//审查历史
+          this.timelineList = res.data.auditHistoryVOS//审查历史
         }
       })
     },

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

@@ -18,6 +18,18 @@ export default {
       }
     },
   },
+  data() {
+    return {
+      // 项目的状态
+      statusObj: {
+        0: '开卷审核',
+        1: '处理中',
+        2: '已完成',
+        3: '缺少资料',
+        4: '取消',
+      },
+    }
+  },
   computed: {
 
   },
@@ -28,29 +40,29 @@ export default {
       this.$router.push({
         path: '/details',
         query: {
-          id:row.id
+          id: row.id
         }
       })
     },
     //操作列事件
     handleCommand(option, row) {
       if (option == 'e') {//编辑
-        this.action={
-          type:'2',
-          id:row.id
-        } 
+        this.action = {
+          type: '2',
+          id: row.id
+        }
       }
       var isLast = false
-      if(option == '1'){//删除
-        this.action={
-          type:'1',
-          id:row.id
-        } 
-        if(this.tableData.length == 1){
+      if (option == '1') {//删除
+        this.action = {
+          type: '1',
+          id: row.id
+        }
+        if (this.tableData.length == 1) {
           isLast = true
         }
       }
-      this.$emit('option', { option, row ,isLast:isLast})
+      this.$emit('option', { option, row, isLast: isLast })
     },
   },
 }

src/views/patentMining/components/view/commonTable.vue

@@ -62,12 +62,7 @@ export default {
         false:'否',
         true:'是',
       },
-      statusObj: {
-        0: '审核中',
-        1: '处理中',
-        2: '已完成',
-        3: '审核不通过',
-      },
+
       //正在努力加载中
       isFlag: false,
       //没有更多啦！

src/views/report/components/drawer/reportFileDrawer.vue

@@ -1,15 +1,27 @@
 <template>
   <div>
-
+    <reportFileTable></reportFileTable>
   </div>
 </template>
 
 <script>
-  export default {
+import reportFileTable from '../reportFile/reportFileTable.vue'
+export default {
+  components: {
+    reportFileTable
+  },
+  data() {
+    return {
+
+    }
+  },
+  mounted() {
     
-  }
-</script>
+  },  
+  methods: {
 
-<style lang="scss" scoped>
+  },
+}
+</script>
 
-</style>
+<style lang="scss" scoped></style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="reportFileTable">
+  <div class="reportFileTable height_100">
     <el-container>
       <el-header style="display:flex;justify-content: space-between;">
         <div>
@@ -9,7 +9,7 @@
           <el-button type="primary" size="small" @click="handleAdd()">新增</el-button>
         </div>
       </el-header>
-      <el-main>
+      <el-main class="height_100">
         <el-table v-loading="loading" :data="tableData" style="width: 100%;" border
           header-row-class-name="custom-table-header" @sort-change="sortChange">
           <el-table-column label="#" align="center" width="80px">
@@ -46,26 +46,29 @@
             </template>
           </el-table-column>
         </el-table>
+        
+      </el-main>
+      <el-footer>
         <div class="pagination">
           <el-pagination :current-page.sync="queryParams.current" :page-size="queryParams.size" :total="total"
             @current-change="handleCurrentChange" layout="total, prev, pager, next, jumper" background></el-pagination>
         </div>
-      </el-main>
+      </el-footer>
     </el-container>
 
     <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" append-to-body destroy-on-close
       :close-on-click-modal="false" :before-close="handleClose">
       <el-form :model="form" :rules="rules" ref="form" label-width="80px" label-position="left">
         <el-form-item label="文件名称" prop="name">
-          <el-input v-model="ruleForm.name" placeholder="请输入文件名称"></el-input>
+          <el-input v-model="form.name" placeholder="请输入文件名称"></el-input>
         </el-form-item>
-        <el-form-item label="文件选择" class="margin-bottom_0" required>
+        <el-form-item label="文件选择" class="margin-bottom_0">
           <myUpload :file-list="form.systemFileList" @on-change="onchangeFile" @on-remove="onRemove"
             style="height: 185px;" :autoUpload="true">
           </myUpload>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="ruleForm.remark" placeholder="请输入备注" type="textarea"></el-input>
+          <el-input v-model="form.remark" placeholder="请输入备注" type="textarea"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -132,7 +135,7 @@ export default {
       loading: false,
       // 
       title: '',
-      // 控制弹窗显示
+      // 控制上传弹窗显示
       dialogVisible: false,
       // 表单数据
       form: {
@@ -174,13 +177,11 @@ export default {
       this.form.fileGuids = this.form.systemFileList.map(item => {
         return item.guid
       })
+      
       this.$refs.form.validate((valid) => {
         if (valid) {
-          let params = {
-            
-          }
           if (!this.form.id) {
-            this.$api.add(params).then(res => {
+            this.$api.add(this.form).then(res => {
               if (res.code == 200) {
                 this.$message.success('新增成功')
                 this.getList()
@@ -190,7 +191,7 @@ export default {
 
             })
           } else {
-            this.$api.edit(params).then(res => {
+            this.$api.edit(this.form).then(res => {
               if (res.code == 200) {
                 this.$message.success('编辑成功')
                 this.getList()

src/views/task/components/index.vue

@@ -67,7 +67,7 @@
 
 
     <auditRecords ref="auditRecords"></auditRecords>
-    <createTask ref="createTaskDialog" :id="id" @isCreate="isCreate"></createTask>
+    <createTask ref="createTaskDialog" :id="id" :processId="processId" @isCreate="isCreate"></createTask>
     <handleTask1 ref="handleTask1Dialog" @isSuccess="isSuccess"></handleTask1>
     <handleTask2 ref="handleTask2Dialog" @isSuccess="isSuccess"></handleTask2>
   </div>