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

src/api/modules/financeRealFund.js

@@ -68,6 +68,10 @@ export default {
   },
   personalOverdue(params){
     return request.get(`financeRealFund/overdue/personal`, { params: params })
+  },
+  realClaimed(params){
+    return request.get(`financeRealFund/real/claimed`, { params: params })
+
   }
 
 }

src/api/modules/workNodeTaskRecord.js

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

src/views/finance/fundList.vue

@@ -99,13 +99,17 @@
         <y-page-list-layout :page-list="pageData2" :page-para="listQuery2" :get-page-list="getList2"
           :pageSizes="pageSizes">
           <template slot="left">
-            <el-input v-model="listQuery2.keyword" placeholder="关键字搜索..." clearable
+            <el-input v-model="listQuery2.keyword" placeholder="付款方、认领人、到账金额、认领金额、备注" clearable
               style="margin-left: 20px;width: 300px;float: left;">
             </el-input>
             <el-date-picker style="margin-left: 20px;float: left;" v-model="payDate2" type="daterange" align="center"
               unlink-panels range-separator="至" start-placeholder="到账时日（开始）" end-placeholder="到账时日（结束）"
               :picker-options="pickerOptions" value-format="yyyy-MM-dd">
             </el-date-picker>
+            <el-date-picker style="margin-left: 20px;float: left;" v-model="claimDate2" type="daterange" align="center"
+              unlink-panels range-separator="至" start-placeholder="认领时日（开始）" end-placeholder="认领时日（结束）"
+              :picker-options="pickerOptions" value-format="yyyy-MM-dd">
+            </el-date-picker>
             <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList2"
               v-loading.fullscreen.lock="loading" round>搜索
             </el-button>
@@ -126,14 +130,14 @@
                 <span>{{ row.payer }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="付款金额(元)" align="center" prop="amount">
+            <el-table-column label="到账时日" align="center">
               <template slot-scope="{row}">
-                <span>{{ row.amount }}</span>
+                <span>{{ row.payDatetime }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="到账时日" align="center">
+            <el-table-column label="付款金额(元)" align="center" prop="amount">
               <template slot-scope="{row}">
-                <span>{{ row.payDatetime }}</span>
+                <span>{{ row.amount }}</span>
               </template>
             </el-table-column>
             <el-table-column label="已认领(元)" align="center" prop="claimAmount">
@@ -143,7 +147,17 @@
             </el-table-column>
             <el-table-column label="未认领(元)" align="center" prop="notClaimAmount">
               <template slot-scope="{row}">
-                <span style="color:red">{{ row.notClaimAmount }}</span>
+                <span style="color:red">{{ row.amount-row.claimAmount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="认领人" align="center" prop="claimUser">
+              <template slot-scope="{row}">
+                <span>{{ row.claimUser }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="认领时间" align="center" width='170' prop="claimDate">
+              <template slot-scope="{row}">
+                <span>{{ row.claimDate }}</span>
               </template>
             </el-table-column>
             <el-table-column label="录入人" align="center">
@@ -151,9 +165,9 @@
                 <span>{{ row.creator }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="录入时间" align="center" width='170'>
+            <el-table-column label="到账时间" align="center" width='170'>
               <template slot-scope="{row}">
-                <span>{{ row.created }}</span>
+                <span>{{ row.payDatetime }}</span>
               </template>
             </el-table-column>
             <el-table-column label="备注" align="center" width='170'>
@@ -166,7 +180,7 @@
                 <PermissionButton menu-code="_views_real_fund_edit" class-name="filter-item" type="text"
                   :page-jump="false" @click="detail(row.id)" />
                 <PermissionButton menu-code="_views_claim_list" class-name="filter-item" type="text"
-                  :page-jump="false" @click="clamiList(row.id,row.notClaimAmount,row.payer,row.amount)" />
+                  :page-jump="false" @click="clamiList(row.id,row.payer,row.amount)" />
               </template>
             </el-table-column>
           </el-table>
@@ -405,7 +419,6 @@ export default {
         keyword: null,
         startDate: null,
         endDate: null,
-        notFinished: false
       },
       listQuery1: {
         page: 1,
@@ -468,12 +481,15 @@ export default {
       },
       loading: false,
       pageSizes: [10, 20, 30, 50, 100, 200, 500, 1000],
-      claimDate:[]
+      claimDate:[],
+      claimDate2:[]
     }
   },
   created() {
     this.claimDate.push(this.getDefaultStartDate());
     this.claimDate.push(this.getDefaultEndDate());
+    this.claimDate2.push(this.getDefaultStartDate());
+    this.claimDate2.push(this.getDefaultEndDate());
     this.getList();
   },
   methods: {
@@ -520,12 +536,12 @@ export default {
     },
     resetSearch2() {
       this.$router.push({ query: {} });
+      this.claimDate2 = [this.getDefaultStartDate(), this.getDefaultEndDate()];
       this.payDate2 = '';
       this.listQuery2 = {
         current: 1,
         size: 1000,
         descs: 'id',
-        notFinished: false
       }
       this.getList2()
     },
@@ -552,6 +568,11 @@ export default {
         this.listQuery2.endDate = this.payDate2[1];
       }
 
+      if (this.claimDate2){
+        this.listQuery2.xStartDate = this.claimDate2[0];
+        this.listQuery2.xEndDate = this.claimDate2[1];
+      }
+
       this.getList2()
 
     },
@@ -570,8 +591,11 @@ export default {
     },
     getList2() {
       let loadingInstance = this.$loading({ fullscreen: true });
-
-      this.$api.financeRealFund.list(Object.assign({}, this.listQuery2)).then(res => {
+      if (this.claimDate2) {
+          this.listQuery2.xStartDate = this.claimDate2[0] + ' 00:00:00';
+          this.listQuery2.xEndDate = this.claimDate2[1] + ' 23:59:59';
+        }
+      this.$api.financeRealFund.realClaimed(Object.assign({}, this.listQuery2)).then(res => {
         if (res.code === 200) {
           loadingInstance.close();
           this.pageData2 = res.data;
@@ -629,9 +653,8 @@ export default {
         }
       })
     },
-    clamiList(id, notClaimAmount, payer, amount) {
+    clamiList(id, payer, amount) {
       this.claimListDialog = true;
-      this.notClaimAmount = notClaimAmount;
       this.payer = payer;
       this.amount = amount;
       this.$api.financeClaim.getList(id).then(res => {

src/views/personal/todoList.vue

@@ -301,9 +301,15 @@
       </y-page-list-layout>
     </el-dialog>
     <el-dialog :visible.sync="batchInRepDialogVisible" width="90%" center top="10vh" custom-class="doWarehouseClass">
-      <span style="font-size: 20px; font-weight: bold;">待入库任务：{{ inRepTasks.length }}条</span>
-      <el-button type="danger" style="float: right;" @click="doBatchInRep()">点击入库</el-button>
-      <parentTable  :clickRowToPick="true" :data="inRepTasks" style="width: 100%;"
+        <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">
+            <el-option label="意见书入库" value="STATEMENT_IN" />
+            <el-option label="报告入库" value="REPORT_IN" />
+            <el-option label="复评函入库" value="LETTER_IN" />
+        </el-select>
+        <el-button type="danger" style="float: right;" @click="doBatchInRep()">点击入库</el-button>
+      <parentTable  :clickRowToPick="true" :data="inRepTasks" style="width: 100%; margin-top: 10px;"
       :selectionChange="handInRep">
           <el-table-column align="center" type="selection" claimOrders width="100" border="true">
           </el-table-column>
@@ -330,6 +336,12 @@
     </el-dialog>
     <el-dialog :visible.sync="batchOutRepDialogVisible" width="90%" center top="10vh" custom-class="doWarehouseClass">
       <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">
+            <el-option label="意见书出库" value="STATEMENT_OUT" />
+            <el-option label="报告出库" value="REPORT_OUT" />
+            <el-option label="复评函出库" value="LETTER_OUT" />
+        </el-select>
       <el-button type="danger" style="float: right;" @click="doBatchOutRep()">点击出库</el-button>
       <parentTable  :clickRowToPick="true" :data="outRepTasks" style="width: 100%;"
       :selectionChange="handOutRep">
@@ -420,7 +432,9 @@ export default {
       inRepTasks:[],
       outRepTasks:[],
       inRepCommit:[],
-      outRepCommit:[]
+      outRepCommit:[],
+      inRepNodeCode:null,
+      outRepNodeCode:null
     }
 
   },
@@ -654,14 +668,15 @@ export default {
       this.workNodeCommits = pickedCommits;
     },
     personalInRepTask(){
-      this.$api.workNodeTaskRecord.getPersonalInRepTask().then(res=>{
+      console.log(this.inRepNodeCode)
+      this.$api.workNodeTaskRecord.getPersonalInRepTask(this.inRepNodeCode).then(res=>{
         if (res.code===200){
           this.inRepTasks = res.data;
         }
       })
     },
     personalOutRepTask(){
-      this.$api.workNodeTaskRecord.getPersonalOutRepTask().then(res=>{
+      this.$api.workNodeTaskRecord.getPersonalOutRepTask(this.outRepNodeCode).then(res=>{
         if (res.code===200){
           this.outRepTasks = res.data;
         }
@@ -778,7 +793,8 @@ export default {
         pickedCommits.push(commit);
       }
       this.outRepCommit = pickedCommits;
-    }
+    },
+
 
   },