Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/api/modules/workNodeTaskRecord.js

@@ -40,10 +40,10 @@ export default {
   checkIfReverse(p1,p2){
     return request.get(`workFlowNodeInstance/checkIfReverse/${p1}/${p2}`)
    },
-   getPersonalInRepTask(params){
-    return request.get(`workTaskRecord/personal/inRep/todo?nodeCode=${params}`)
+   getPersonalInRepTask(params,params1){
+    return request.get(`workTaskRecord/personal/inRep/todo?nodeCode=${params}&clientName=${params1}`)
   },
-  getPersonalOutRepTask(params){
-    return request.get(`workTaskRecord/personal/outRep/todo?nodeCode=${params}`)
+  getPersonalOutRepTask(params,params1){
+    return request.get(`workTaskRecord/personal/outRep/todo?nodeCode=${params}&clientName=${params1}`)
   }
 }

src/views/personal/todoList.vue

@@ -229,10 +229,16 @@
     </el-dialog>
     <TransferDialog :transferDialogVisible="visible" @parentFalse="parentFalse()" @getPage="getPage()"
       :recordId="recordId"></TransferDialog>
-    <el-dialog :visible.sync="batchCommitDialog" width="70%">
+    <el-dialog :visible.sync="batchCommitDialog" width="90%">
       <y-page-list-layout :page-list="batchCommitPageData" :page-para="batchCommitListQuery"
         :get-page-list="selectBatchCommitPage">
         <template slot="left">
+          <el-select v-model="batchCommitListQuery.nodeCode" placeholder="产品类型" clearable filterable 
+            class="filter-item" style="float: left;">
+            <el-option label="意见书装订盖章" value="STATEMENT_BOOKBINDING_STAMP" />
+            <el-option label="报告装订盖章" value="REPORT_BOOKBINDING_STAMP" />
+            <el-option label="复评函装订盖章" value="LETTER_BOOKBINDING_STAMP" />
+          </el-select>
           <el-input style="margin-left: 20px;width: 300px;float: left;" class="filter-item"
             v-model="batchCommitListQuery.keyWord" placeholder="项目编号/报告号/项目名称/业务来源" clearable>
           </el-input>
@@ -247,11 +253,16 @@
           slot="table" style="width: 100%;height: 800px;" :selectionChange="handleSelectionChangeBatchCommit">
           <el-table-column align="center" type="selection" claimOrders width="50" border="true">
           </el-table-column>
-          <el-table-column label="坐落" align="center" width="400">
+          <el-table-column label="坐落" align="center" >
             <template slot-scope="{row}">
               <span>{{ row.location }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="节点名称" align="center" width="120">
+            <template slot-scope="{row}">
+              <span>{{ row.nodeName }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="项目编号" align="center">
             <template slot-scope="{row}">
               <span>{{ row.orderId }}</span>
@@ -277,7 +288,7 @@
               <span>{{ row.contactTel }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="委托人1" align="center">
+          <!-- <el-table-column label="委托人1" align="center">
             <template slot-scope="{row}">
               <span>{{ row.bailorA ? row.bailorA : '-' }}</span>
             </template>
@@ -286,7 +297,7 @@
             <template slot-scope="{row}">
               <span>{{ row.bailorB ? row.bailorB : '-' }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="客户经理" align="center">
             <template slot-scope="{row}">
               <span>{{ row.clientManager == null ? '-' : row.clientManager }}</span>
@@ -300,7 +311,7 @@
         </parentTable>
       </y-page-list-layout>
     </el-dialog>
-    <el-dialog :visible.sync="batchInRepDialogVisible" width="90%" center top="10vh" custom-class="doWarehouseClass">
+    <el-dialog :visible.sync="batchInRepDialogVisible" width="90%" center top="10vh" custom-class="doWarehouseClass" @closed="cleanNodeClientName()">
         <span style="font-size: 20px; font-weight: bold;">待入库任务：{{ inRepTasks.length }}条</span>
         <el-select v-model="inRepNodeCode" placeholder="流程节点" clearable filterable style="margin-left: 30px;" @change="personalInRepTask()"
             class="filter-item">
@@ -308,6 +319,7 @@
             <el-option label="报告入库" value="REPORT_IN" />
             <el-option label="复评函入库" value="LETTER_IN" />
         </el-select>
+        <el-input v-model="clientName" placeholder="客户名称" clearable style="width: 15%; margin-left: 30px;"  @change="personalInRepTask()" class="filter-item"></el-input>
         <el-button type="danger" style="float: right;" @click="doBatchInRep()">点击入库</el-button>
       <parentTable  :clickRowToPick="true" :data="inRepTasks" style="width: 100%; margin-top: 10px;"
       :selectionChange="handInRep">
@@ -334,7 +346,7 @@
         </el-table-column>
       </parentTable>
     </el-dialog>
-    <el-dialog :visible.sync="batchOutRepDialogVisible" width="90%" center top="10vh" custom-class="doWarehouseClass">
+    <el-dialog :visible.sync="batchOutRepDialogVisible" width="90%" center top="10vh" custom-class="doWarehouseClass" @closed="cleanNodeClientName()">
       <span style="font-size: 20px; font-weight: bold;">待出库任务：{{ outRepTasks.length }}条</span>
       <el-select v-model="outRepNodeCode" placeholder="流程节点" clearable filterable style="margin-left: 30px;" @change="personalOutRepTask()"
             class="filter-item">
@@ -342,8 +354,9 @@
             <el-option label="报告出库" value="REPORT_OUT" />
             <el-option label="复评函出库" value="LETTER_OUT" />
         </el-select>
+        <el-input v-model="clientName" placeholder="客户名称" clearable style="width: 15%; margin-left: 30px;"  @change="personalOutRepTask()" class="filter-item"></el-input>
       <el-button type="danger" style="float: right;" @click="doBatchOutRep()">点击出库</el-button>
-      <parentTable  :clickRowToPick="true" :data="outRepTasks" style="width: 100%;"
+      <parentTable  :clickRowToPick="true" :data="outRepTasks" style="width: 100%; margin-top: 10px;"
       :selectionChange="handOutRep">
           <el-table-column align="center" type="selection" claimOrders width="100" border="true">
           </el-table-column>
@@ -434,7 +447,9 @@ export default {
       inRepCommit:[],
       outRepCommit:[],
       inRepNodeCode:null,
-      outRepNodeCode:null
+      outRepNodeCode:null,
+      clientName:null,
+      stmpNode:null
     }
 
   },
@@ -668,15 +683,14 @@ export default {
       this.workNodeCommits = pickedCommits;
     },
     personalInRepTask(){
-      console.log(this.inRepNodeCode)
-      this.$api.workNodeTaskRecord.getPersonalInRepTask(this.inRepNodeCode).then(res=>{
+      this.$api.workNodeTaskRecord.getPersonalInRepTask(this.inRepNodeCode,this.clientName).then(res=>{
         if (res.code===200){
           this.inRepTasks = res.data;
         }
       })
     },
     personalOutRepTask(){
-      this.$api.workNodeTaskRecord.getPersonalOutRepTask(this.outRepNodeCode).then(res=>{
+      this.$api.workNodeTaskRecord.getPersonalOutRepTask(this.outRepNodeCode,this.clientName).then(res=>{
         if (res.code===200){
           this.outRepTasks = res.data;
         }
@@ -794,6 +808,11 @@ export default {
       }
       this.outRepCommit = pickedCommits;
     },
+    cleanNodeClientName(){
+      this.clientName = null;
+      this.inRepNodeCode = null;
+      this.outRepNodeCode = null;
+    }
 
 
   },