Bladeren bron

1.新增资产业务归档列表页面
2.新增资产业务待办列表页面
3.新增资产业务已办列表页面
4.调整修改我的订单列表与全部订单列表页面

GouGengquan 1 jaar geleden
bovenliggende
commit
f482200edc

+ 4 - 0
src/api/modules/assets.js

@@ -133,5 +133,9 @@ export default {
     // 获取资产项目所有参与人信息
     getAssetsBusinessMembers(params){
         return request.get(`assets/getAssetsBusinessMembers`, { params: params })
+    },
+    // 条件查询资产已归档列表
+    selectArchivedPage(params){
+        return request.get(`assets/selectArchivedPage`, { params: params })
     }
 }

+ 4 - 0
src/api/modules/workNodeTaskRecord.js

@@ -28,5 +28,9 @@ export default {
   },
   getTodoTotalNum(){
     return request.get(`workTaskRecord/todoNum`)
+  },
+  // 获取资产业务已办列表
+  getAssetsTaskDoneList(params){
+    return request.get(`workTaskRecord/assets/getAssetsTaskDoneList`,{ params: params })
   }
 }

+ 7 - 1
src/router/urlMap.js

@@ -95,6 +95,9 @@ import _views_assets_all_list from '@/views/assets/allList'
 import _views_assets_my_order_list from '@/views/assets/myOrderList'
 import _views_assets_add_order from '@/views/assets/addAssetsOrder'
 import _views_assets_order_detail from '@/views/assets/orderDetail'
+import _views_assets_todo_list from '@/views/assets/todoList'
+import _views_assets_archived_list from '@/views/assets/archivedList'
+import _views_assets_done_list from '@/views/assets/doneList'
 import _views_personal_to_save_file from '@/views/personal/saveFileTodoList'
 import _views_personal_save_file from '@/views/personal/saveFileDoneList'
 import _views_personal_readonly_detail from '@/views/personal/readonlyDetail'
@@ -190,5 +193,8 @@ export default {
   _views_personal_readonly_detail,
   _views_personal_done,
   _views_complex_index,
-  _views_major_old_list
+  _views_major_old_list,
+  _views_assets_todo_list,
+  _views_assets_archived_list,
+  _views_assets_done_list
 }

+ 11 - 14
src/views/assets/allList.vue

@@ -104,7 +104,7 @@
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="80" fixed="right">
                     <template slot-scope="{row}">
-                        <el-button round type="primary" @click="orderDetail(row)">详情</el-button>
+                        <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
                     </template>
                 </el-table-column>
             </parentTable>
@@ -217,19 +217,16 @@ export default {
             })
         },
         orderDetail(row) {
-            if (row.currentNodeCode === 'REPORT_OUT_DEPARTMENT_CHECK') {
-                this.$router.push(`/out/warehouse/check?todoBusinessId=${row.assetsId}&sNo=${row.statementNo}&rNo=${row.reportNo}&tId=${row.recordId}&cId=${row.currentNodeId}&nCode=${row.currentNodeCode}&businessType=ASSET_BUSINESS`)
-                return;
-            } else {
-                this.$router.push({
-                    path: "/assets/orderDetail",
-                    query: {
-                        row: JSON.stringify(row),
-                        back: '/assets/allList'
-                    }
-                })
-            }
-
+            this.$router.push({
+                path: "/assets/orderDetail",
+                query: {
+                    row: JSON.stringify(row),
+                    back: '/assets/allList',
+                    couldEdit: false,
+                    couldBack: false,
+                    disabledStatus: true
+                }
+            })
         }
     }
 }

+ 276 - 0
src/views/assets/archivedList.vue

@@ -0,0 +1,276 @@
+<template>
+    <div class="app-container">
+        <div class="title-container">
+            <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+        </div>
+        <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="selectArchivedPage">
+            <template slot="left">
+                <el-input style="margin-left: 20px;width: 300px;float: left;" class="filter-item"
+                    v-model="listQuery.keyWord" placeholder="项目编号/报告号/项目名称/业务来源" clearable>
+                </el-input>
+                <el-select v-model="listQuery.principalId" filterable placeholder="项目负责人(可搜索)"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id"></el-option>
+                </el-select>
+                <el-select v-model="listQuery.clientManagerId" filterable placeholder="客户经理(可搜索)"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id"></el-option>
+                </el-select>
+                <el-select v-model="listQuery.assetsBusinessGener" filterable placeholder="业务类型"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(s, value) in assetsBusinessGeners" :label="s.label" :value="s.value"></el-option>
+                </el-select>
+                <el-select v-model="listQuery.nodeCode" filterable placeholder="流程节点(可搜索)"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="item in nodes" :label="item.name" :value="item.code">
+                    </el-option>
+                </el-select>
+                <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
+                    round>搜索
+                </el-button>
+                <el-button class="filter-item" style="float: left;" round type="success" @click="resetParams()">重置
+                </el-button>
+            </template>
+            <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
+                <el-table-column label="项目编号" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.orderId }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="分单类型" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.allotType }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="意见书号" align="center" width="250">
+                    <template slot-scope="{row}">
+                        <span>{{ row.statementNo }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="报告号" align="center" width="250">
+                    <template slot-scope="{row}">
+                        <span>{{ row.reportNo }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="项目名称" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.name }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="业务类型" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.assetsBusinessGener }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="客户名称" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.customerName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="业务来源" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.customerSubName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="委托人" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.bailor }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="委托人联系电话" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.bailorContactTel }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前节点" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.currentNodeName }}</span>
+                    </template>
+                </el-table-column>
+                <!-- <el-table-column label="当前节点负责人" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.handlerName }}</span>
+                    </template>
+                </el-table-column> -->
+                <el-table-column label="项目负责人" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.principalName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="客户经理" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.clientManagerName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="下单时间" align="center" width="180">
+                    <template slot-scope="{row}">
+                        <span>{{ row.created }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="评估结论对应的评估值(万)" align="center" width="200">
+                    <template slot-scope="{row}">
+                        <span>{{ row.estimatedValue }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="订单应收款(元)" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.shouldAmount }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="订单实收款(元)" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.realAmount }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="标准收费(元)" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.standardAmount }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="折扣比例" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.discount }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="实际开票金额" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.invoiceRealAmount }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" width="80" fixed="right">
+                    <template slot-scope="{row}">
+                        <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </parentTable>
+        </y-page-list-layout>
+    </div>
+</template>
+
+<script>
+import YPageListLayout from '@/components/YPageListLayout'
+import Breadcrumb from '@/components/Breadcrumb'
+import PermissionButton from '@/components/PermissionButton/PermissionButton'
+
+export default {
+    name: 'AssetsAllList',
+    components: {
+        Breadcrumb,
+        YPageListLayout,
+        PermissionButton,
+    },
+    data() {
+        return {
+            pageData: { records: [] },
+            listLoading: false,
+            listQuery: {
+                page: 1,
+                size: 10,
+                current: 1,
+                // 节点code
+                nodeCode: null,
+                // 客户经理id
+                clientManagerId: null,
+                // 项目负责人id
+                principalId: null,
+                // 业务类型
+                assetsBusinessGener: null,
+                // 关键字
+                keyWord: null
+            },
+            // 用户下拉列表
+            allUsers: [],
+            // 节点信息下拉列表
+            nodes: [],
+            // 业务类型下拉列表
+            assetsBusinessGeners: [
+                {
+                    value: '单项资产',
+                    label: '单项资产'
+                }, {
+                    value: '整体资产',
+                    label: '整体资产'
+                }, {
+                    value: '无形资产',
+                    label: '无形资产'
+                }, {
+                    value: '债权',
+                    label: '债权'
+                }, {
+                    value: '其他',
+                    label: '其他'
+                }
+            ]
+        }
+    },
+    created() {
+        // 获取用户下拉列表
+        this.getAllUser();
+        // 获取节点下拉列表
+        this.getNodes();
+        // 获取资产业务订单
+        this.selectArchivedPage();
+    },
+    methods: {
+        // 无条件分页查询
+        selectArchivedPage() {
+            this.$api.assets.selectArchivedPage(this.listQuery).then(res => {
+                if (res.code === 200) {
+                    this.pageData = res.data;
+                }
+            })
+        },
+        // 条件查询
+        searchList() {
+            // 重置分页
+            this.listQuery.page = 1
+            this.listQuery.size = 10
+            this.selectArchivedPage()
+        },
+        // 重置搜索条件
+        resetParams() {
+            this.$router.push({ query: {} });
+            this.listQuery = {
+                current: 1,
+                size: 10,
+            }
+            this.selectArchivedPage();
+        },
+        // 获取所有用户下拉列表
+        getAllUser() {
+            this.$api.user.simpleAll().then(res => {
+                if (res.code === 200) {
+                    this.allUsers = res.data;
+                }
+            })
+        },
+        getNodes() {
+            this.$api.workNode.enum().then(res => {
+                if (res.code === 200) {
+                    this.nodes = res.data
+                }
+            })
+        },
+        orderDetail(row) {
+            if (row.currentNodeCode === 'REPORT_OUT_DEPARTMENT_CHECK') {
+                this.$router.push(`/out/warehouse/check?todoBusinessId=${row.assetsId}&sNo=${row.statementNo}&rNo=${row.reportNo}&tId=${row.recordId}&cId=${row.currentNodeId}&nCode=${row.currentNodeCode}&businessType=ASSET_BUSINESS`)
+                return;
+            } else {
+                this.$router.push({
+                    path: "/assets/orderDetail",
+                    query: {
+                        row: JSON.stringify(row),
+                        back: '/assets/archivedList',
+                        couldEdit: false,
+                        couldBack: false,
+                        disabledStatus: true
+                    }
+                })
+            }
+
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped></style>

+ 175 - 0
src/views/assets/doneList.vue

@@ -0,0 +1,175 @@
+<template>
+    <div class="app-container">
+        <div class="title-container">
+            <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+        </div>
+        <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getAssetsTaskDoneList">
+            <template slot="left">
+                <el-input style="margin-left: 20px;width: 300px;float: left;" class="filter-item"
+                    v-model="listQuery.keyWord" placeholder="项目编号/报告号/项目名称/业务来源" clearable>
+                </el-input>
+                <el-select v-model="listQuery.nodeCode" filterable placeholder="流程节点(可搜索)"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="item in nodes" :label="item.name" :value="item.code">
+                    </el-option>
+                </el-select>
+                <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
+                    round>搜索
+                </el-button>
+                <el-button class="filter-item" style="float: left;" round type="success" @click="resetParams()">重置
+                </el-button>
+            </template>
+            <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
+                <el-table-column label="项目编号" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.orderId }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="项目名称" align="center" width="200">
+                    <template slot-scope="{row}">
+                        <span>{{ row.assetsName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="意见书号" align="center" width="200">
+                    <template slot-scope="{row}">
+                        <span>{{ row.statementtNo }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="报告号" align="center" width="200">
+                    <template slot-scope="{row}">
+                        <span>{{ row.reportNo }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="处理人" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.handlerName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作状态" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.state }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="开始时间" align="center" width="200">
+                    <template slot-scope="{row}">
+                        <span>{{ row.startDate }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="完成时间" align="center" width="200">
+                    <template slot-scope="{row}">
+                        <span>{{ row.finishTime }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="处理时长" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.handingTime }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="处理意见" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.comments }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="节点名称" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.nodeName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="节点实例状态" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.instanceState }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" width="80" fixed="right">
+                    <template slot-scope="{row}">
+                        <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </parentTable>
+        </y-page-list-layout>
+    </div>
+</template>
+
+<script>
+import YPageListLayout from '@/components/YPageListLayout'
+import Breadcrumb from '@/components/Breadcrumb'
+import PermissionButton from '@/components/PermissionButton/PermissionButton'
+
+export default {
+    name: 'AssetsAllList',
+    components: {
+        Breadcrumb,
+        YPageListLayout,
+        PermissionButton,
+    },
+    data() {
+        return {
+            pageData: { records: [] },
+            listLoading: false,
+            listQuery: {
+                page: 1,
+                size: 10,
+                current: 1,
+                // 节点code
+                nodeCode: null,
+                // 关键字
+                keyWord: null
+            },
+            nodes: []
+        }
+    },
+    created() {
+        // 获取节点下拉列表
+        this.getNodes();
+        // 获取资产业务订单
+        this.getAssetsTaskDoneList();
+    },
+    methods: {
+        // 无条件分页查询
+        getAssetsTaskDoneList() {
+            this.$api.workNodeTaskRecord.getAssetsTaskDoneList(this.listQuery).then(res => {
+                if (res.code === 200) {
+                    this.pageData = res.data;
+                }
+            })
+        },
+        // 条件查询
+        searchList() {
+            // 重置分页
+            this.listQuery.page = 1
+            this.listQuery.size = 10
+            this.getAssetsTaskDoneList()
+        },
+        // 重置搜索条件
+        resetParams() {
+            this.$router.push({ query: {} });
+            this.listQuery = {
+                current: 1,
+                size: 10,
+            }
+            this.getAssetsTaskDoneList();
+        },
+        getNodes() {
+            this.$api.workNode.enum().then(res => {
+                if (res.code === 200) {
+                    this.nodes = res.data
+                }
+            })
+        },
+        orderDetail(row) {
+            this.$router.push({
+                path: "/assets/orderDetail",
+                query: {
+                    row: JSON.stringify(row),
+                    back: '/assets/archivedList',
+                    couldEdit: false,
+                    couldBack: false,
+                    disabledStatus: true
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped></style>

+ 2 - 2
src/views/assets/myOrderList.vue

@@ -128,8 +128,8 @@
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="200" fixed="right">
                     <template slot-scope="{row}">
-                        <el-button type="text" @click="orderDetail(row)">详情</el-button>
-                        <el-button type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
+                        <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
+                        <el-button type="primary" size="mini" @click="openShouldAmountDialog(row)">填写应收款</el-button>
                         <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="text"
                             @click="openRepertoryOutWarehouse(row)">
                             申请提前出库

+ 16 - 14
src/views/assets/orderDetail.vue

@@ -5,7 +5,7 @@
         <template slot="title">
           <span style="font-size:20px; margin-left:20px;letter-spacing:2px;color:red">
             <i class="el-icon-warning"></i>
-            <span> 当前节点:{{ currentNode == null ? '???' : currentNode.nodeName }}</span>
+            <span> 当前节点:{{currentNode==null ?'???':currentNode.nodeName?currentNode.nodeName:'结束'}}</span>
             <!-- <span v-if = "currentNode.tasks.length>0" style="margin-left:30px">任务:</span>  -->
             <!-- <span v-for="( t,index) in currentNode.tasks" :key=index  >{{t.info}}</span> -->
             <!-- <span style="margin-left:30px" v-if="statementNo || reportNo">该流程已取:<el-tag type="success" v-if="statementNo">{{statementNo}}</el-tag> <el-tag type="danger" v-if="reportNo">{{reportNo}}</el-tag></span> -->
@@ -18,7 +18,7 @@
           @getPreviousNode="getPreviousNode" />
       </el-collapse-item>
     </el-collapse>
-    <div class="button-area">
+    <div class="button-area" v-if="couldEdit">
       <el-button @click="openProductionDialog"
         v-if="currentNode.nodeCode === 'PRODUCT_CHOICE' || currentNode.nodeCode === 'REPORT_CHOICE'" type="danger" round>
         选择产品
@@ -43,7 +43,7 @@
     <el-tabs v-model="activeTagName" @tab-click="handleClick" type="border-card">
       <el-tab-pane name="baseInfo" class="pane-class" :lazy=true>
         <span slot="label"><i class="el-icon-document"></i>基本信息</span>
-        <y-detail-page-layout ref="addAssetsOrder" name="assets" :editStatus="editStatus">
+        <y-detail-page-layout ref="addAssetsOrder" name="assets">
           <el-form ref="assetsForm" :model="assetsForm" :rules="assetsFormRules" :disabled="disabledStatus">
             <div class="createMajor-main-container">
               <div class="postInfo-container">
@@ -365,21 +365,21 @@
                 </div>
               </el-col>
               <el-col :span="2">
-                <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE_DETERMINE_PRICE'" type="danger"
+                <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE_DETERMINE_PRICE' && couldEdit" type="danger"
                   @click="openTargetDialog(), changeStatus('add')" round>添加评估对象</el-button>
               </el-col>
-              <el-col :span="2" v-if="currentNode.nodeCode === 'GENERATE_STATEMENT'">
+              <el-col :span="2" v-if="currentNode.nodeCode === 'GENERATE_STATEMENT' && couldEdit">
                 <el-tooltip class="item" effect="dark" content="全选取主号,多次取号(主号-子号)" placement="right">
                   <el-button type="success" @click="takeAssetsStatementProductionNo" round>意见书取号</el-button>
                 </el-tooltip>
               </el-col>
-              <el-col :span="2" v-if="currentNode.nodeCode === 'ASSET_REPORT_TAKE_NO'">
+              <el-col :span="2" v-if="currentNode.nodeCode === 'ASSET_REPORT_TAKE_NO' && couldEdit">
                 <el-tooltip class="item" effect="dark" content="全选取主号,多次取号(主号-子号)" placement="right">
                   <el-button type="success" @click="takeAssetsReportProductionNo" round>报告取号</el-button>
                 </el-tooltip>
               </el-col>
               <el-col :span="2"
-                v-if="currentNode.nodeCode === 'GENERATE_STATEMENT' || currentNode.nodeCode === 'WRITE_REPORT'">
+                v-if="(currentNode.nodeCode === 'GENERATE_STATEMENT' || currentNode.nodeCode === 'WRITE_REPORT') && couldEdit">
                 <el-tooltip class="item" effect="dark" content="请仔细确认产品内容" placement="right">
                   <el-button type="success" @click="openWriteProductionDialog(false, 'add')" round>撰写产品信息</el-button>
                 </el-tooltip>
@@ -463,7 +463,7 @@
                 </h3>
               </el-divider>
             </div>
-            <span v-if="currentNode.nodeCode === 'GENERATE_STATEMENT'">
+            <span style="margin-top: 5px;" v-if="currentNode.nodeCode === 'GENERATE_STATEMENT' && couldEdit ">
               选择要提交的意见书:
               <el-select v-model="commitProductionNo" @change="pushProductionNo()" placeholder="请选择要提交的产品"
                 style="width: 300px;">
@@ -471,7 +471,7 @@
                   :label="pro.productionNo" :value="pro.productionNo" :key="pro.id"></el-option>
               </el-select>
             </span>
-            <span v-if="currentNode.nodeCode === 'WRITE_REPORT'">
+            <span v-if="currentNode.nodeCode === 'WRITE_REPORT' && couldEdit ">
               选择要提交的报告:
               <el-select v-model="commitProductionNo" @change="pushProductionNo()" placeholder="请选择要提交的产品"
                 style="width: 300px;">
@@ -1706,14 +1706,16 @@ export default {
 
   },
   created() {
-    this.couldEdit = true;
-    this.couldBack = true;
+    this.disabledStatus = this.$route.query.disabledStatus ==='true';
+    this.couldEdit = this.$route.query.couldEdit ==='true';
+    this.couldBack = this.$route.query.couldBack ==='true';
     this.nodeBusinessInfo.doWorkflow = true;
     // 获取页面参数
     this.pageParams.back = this.$route.query.back;
     this.pageParams.row = JSON.parse(this.$route.query.row);
     this.getProductionTypes(this.pageParams.row.assetsId);
     this.nodeBusinessInfo.mainBusiness = 'ASSET_BUSINESS';
+    this.nodeBusinessInfo.businessId = this.pageParams.row.assetsId;
     this.nodeBusinessInfo.businessSubId = this.pageParams.row.statementNo;
     this.nodeBusinessInfo.businessMinId = this.pageParams.row.reportNo;
     this.getCurrentNodeInfo();
@@ -2019,7 +2021,7 @@ export default {
               this.nodeBusinessInfo.currentNodePermission.reversible = res.data.reversible;
               this.nodeBusinessInfo.currentNodePermission.skippable = res.data.skippable;
               this.nodeBusinessInfo.currentNodePermission.terminable = res.data.terminable;
-              this.nodeBusinessInfo.businessId = this.pageParams.row.assetsId;
+              // this.nodeBusinessInfo.businessId = this.pageParams.row.assetsId;
 
               if (this.currentNode.nodeCode === 'REPORT_IN') {
                 this.getProductionRealAmount(this.pageParams.row.reportNo);
@@ -2929,7 +2931,7 @@ export default {
               type: 'success',
               duration: 3000
             });
-            if(this.currentNode.nodeCode === 'CHECK_ARCHIVING'){
+            if (this.currentNode.nodeCode === 'CHECK_ARCHIVING') {
               this.updateProductionFileInfo();
             }
             this.resetBusinessPerformanceDistributionForm();
@@ -3004,7 +3006,7 @@ export default {
               type: 'success',
               duration: 3000
             });
-            if(this.currentNode.nodeCode === 'CHECK_ARCHIVING'){
+            if (this.currentNode.nodeCode === 'CHECK_ARCHIVING') {
               this.updateProductionFileInfo();
             }
             this.resetBusinessPerformanceDistributionForm();

+ 237 - 0
src/views/assets/todoList.vue

@@ -0,0 +1,237 @@
+<template>
+    <div class="app-container">
+        <div class="title-container">
+            <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+        </div>
+        <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="selectPage">
+            <template slot="left">
+                <el-input style="margin-left: 20px;width: 300px;float: left;" class="filter-item"
+                    v-model="listQuery.keyWord" placeholder="项目编号/报告号/项目名称/业务来源" clearable>
+                </el-input>
+                <el-select v-model="listQuery.principalId" filterable placeholder="项目负责人(可搜索)"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id"></el-option>
+                </el-select>
+                <el-select v-model="listQuery.clientManagerId" filterable placeholder="客户经理(可搜索)"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id"></el-option>
+                </el-select>
+                <el-select v-model="listQuery.assetsBusinessGener" filterable placeholder="业务类型"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(s, value) in assetsBusinessGeners" :label="s.label" :value="s.value"></el-option>
+                </el-select>
+                <el-select v-model="listQuery.nodeCode" filterable placeholder="流程节点(可搜索)"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="item in nodes" :label="item.name" :value="item.code">
+                    </el-option>
+                </el-select>
+                <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
+                    round>搜索
+                </el-button>
+                <el-button class="filter-item" style="float: left;" round type="success" @click="resetParams()">重置
+                </el-button>
+            </template>
+            <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
+                <el-table-column label="项目编号" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.orderId }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="分单类型" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.allotType }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="意见书号" align="center" width="250">
+                    <template slot-scope="{row}">
+                        <span>{{ row.statementNo }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="报告号" align="center" width="250">
+                    <template slot-scope="{row}">
+                        <span>{{ row.reportNo }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="项目名称" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.name }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="业务类型" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.assetsBusinessGener }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="客户名称" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.customerName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="业务来源" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.customerSubName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="委托人" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.bailor }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="委托人联系电话" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.bailorContactTel }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前节点" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.currentNodeName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前节点负责人" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.handlerName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="项目负责人" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.principalName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="客户经理" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.clientManagerName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" width="100" fixed="right">
+                    <template slot-scope="{row}">
+                        <el-button type="danger" size="mini" @click="orderDetail(row)">任务处理</el-button>
+                    </template>
+                </el-table-column>
+            </parentTable>
+        </y-page-list-layout>
+    </div>
+</template>
+
+<script>
+import YPageListLayout from '@/components/YPageListLayout'
+import Breadcrumb from '@/components/Breadcrumb'
+import PermissionButton from '@/components/PermissionButton/PermissionButton'
+
+export default {
+    name: 'AssetsToDoList',
+    components: {
+        Breadcrumb,
+        YPageListLayout,
+        PermissionButton,
+    },
+    data() {
+        return {
+            pageData: { records: [] },
+            listLoading: false,
+            listQuery: {
+                page: 1,
+                size: 10,
+                current: 1,
+                // 节点code
+                nodeCode: null,
+                // 客户经理id
+                clientManagerId: null,
+                // 项目负责人id
+                principalId: null,
+                // 业务类型
+                assetsBusinessGener: null,
+                // 关键字
+                keyWord: null,
+                // 处理人id
+                handlerId: this.$store.getters.userInfo.id
+            },
+            // 用户下拉列表
+            allUsers: [],
+            // 节点信息下拉列表
+            nodes: [],
+            // 业务类型下拉列表
+            assetsBusinessGeners: [
+                {
+                    value: '单项资产',
+                    label: '单项资产'
+                }, {
+                    value: '整体资产',
+                    label: '整体资产'
+                }, {
+                    value: '无形资产',
+                    label: '无形资产'
+                }, {
+                    value: '债权',
+                    label: '债权'
+                }, {
+                    value: '其他',
+                    label: '其他'
+                }
+            ]
+        }
+    },
+    created() {
+        // 获取用户下拉列表
+        this.getAllUser();
+        // 获取节点下拉列表
+        this.getNodes();
+        // 获取资产业务订单
+        this.selectPage();
+    },
+    methods: {
+        // 当前用户待办分页查询
+        selectPage() {
+            this.$api.assets.selectPage(this.listQuery).then(res => {
+                if (res.code === 200) {
+                    this.pageData = res.data;
+                }
+            })
+        },
+        // 条件查询
+        searchList() {
+            // 重置分页
+            this.listQuery.page = 1
+            this.listQuery.size = 10
+            this.selectPage()
+        },
+        // 重置搜索条件
+        resetParams() {
+            this.$router.push({ query: {} });
+            this.listQuery = {
+                current: 1,
+                size: 10,
+            }
+            this.selectPage();
+        },
+        // 获取所有用户下拉列表
+        getAllUser() {
+            this.$api.user.simpleAll().then(res => {
+                if (res.code === 200) {
+                    this.allUsers = res.data;
+                }
+            })
+        },
+        getNodes() {
+            this.$api.workNode.enum().then(res => {
+                if (res.code === 200) {
+                    this.nodes = res.data
+                }
+            })
+        },
+        orderDetail(row) {
+            this.$router.push({
+                path: "/assets/orderDetail",
+                query: {
+                    row: JSON.stringify(row),
+                    back: '/assets/allList',
+                    couldEdit: true,
+                    couldBack: true,
+                    disabledStatus: true
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped></style>