소스 검색

1.新增页面部门待办与部门已办
2.资产查询新增根据接单部门查询

GouGengquan 1 년 전
부모
커밋
d722acce69

+ 5 - 1
src/router/urlMap.js

@@ -127,6 +127,8 @@ import _views_assets_edit_order from '@/views/assets/addAssetsOrder'
 import _views_finance_assets_fund_stats from '@/views/finance/assetsRealFundStat'
 import _views_finance_assets_commission_calculate from '@/views/finance/calculateAssets'
 import _views_finance_settle_assets from '@/views/finance/settleAssets'
+import _views_assets_department_todo_list from '@/views/assets/departmentTodoList'
+import _views_assets_department_done_list from '@/views/assets/departmentDoneList'
 
 export default {
   _views_set_menu,
@@ -242,6 +244,8 @@ export default {
   _views_assets_edit_order,
   _views_finance_assets_fund_stats,
   _views_finance_assets_commission_calculate,
-  _views_finance_settle_assets
+  _views_finance_settle_assets,
+  _views_assets_department_todo_list,
+  _views_assets_department_done_list
 
 }

+ 18 - 1
src/views/assets/allList.vue

@@ -25,6 +25,10 @@
                     <el-option v-for="item in nodes" :label="item.name" :value="item.code">
                     </el-option>
                 </el-select>
+                <el-select v-model="listQuery.departmentId" filterable placeholder="接单部门"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"></el-option>
+                </el-select>
                 <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
                     round>搜索
                 </el-button>
@@ -141,8 +145,11 @@ export default {
                 // 业务类型
                 assetsBusinessGener: null,
                 // 关键字
-                keyWord: null
+                keyWord: null,
+                departmentId: null
             },
+            // 接单部门
+            allotDepartment: [],
             // 用户下拉列表
             allUsers: [],
             // 节点信息下拉列表
@@ -173,6 +180,8 @@ export default {
         this.getAllUser();
         // 获取节点下拉列表
         this.getNodes();
+        // 获取分单部门
+        this.getAllotDepartment();
         // 获取资产业务订单
         this.selectPage();
     },
@@ -227,6 +236,14 @@ export default {
                     disabledStatus: true
                 }
             })
+        },
+        // 获取部门下拉列表
+        getAllotDepartment() {
+            this.$api.department.allot().then(res => {
+                if (res.code === 200) {
+                    this.allotDepartment = res.data;
+                }
+            })
         }
     }
 }

+ 18 - 1
src/views/assets/archivedList.vue

@@ -25,6 +25,10 @@
                     <el-option v-for="item in nodes" :label="item.name" :value="item.code">
                     </el-option>
                 </el-select>
+                <el-select v-model="listQuery.departmentId" filterable placeholder="接单部门"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"></el-option>
+                </el-select>
                 <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
                     round>搜索
                 </el-button>
@@ -176,8 +180,11 @@ export default {
                 // 业务类型
                 assetsBusinessGener: null,
                 // 关键字
-                keyWord: null
+                keyWord: null,
+                departmentId: null
             },
+            // 接单部门
+            allotDepartment: [],
             // 用户下拉列表
             allUsers: [],
             // 节点信息下拉列表
@@ -208,6 +215,8 @@ export default {
         this.getAllUser();
         // 获取节点下拉列表
         this.getNodes();
+        // 获取分单部门
+        this.getAllotDepartment();
         // 获取资产业务订单
         this.selectArchivedPage();
     },
@@ -262,6 +271,14 @@ export default {
                     disabledStatus: true
                 }
             })
+        },
+        // 获取部门下拉列表
+        getAllotDepartment() {
+            this.$api.department.allot().then(res => {
+                if (res.code === 200) {
+                    this.allotDepartment = res.data;
+                }
+            })
         }
     }
 }

+ 196 - 0
src/views/assets/departmentDoneList.vue

@@ -0,0 +1,196 @@
+<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-select v-model="listQuery.departmentId" filterable placeholder="接单部门"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"></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="300">
+                    <template slot-scope="{row}">
+                        <span>{{ row.reportName || row.statementName || row.name }}</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.handlerName }}</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.comments }}</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="180">
+                    <template slot-scope="{row}">
+                        <span>{{ row.handingTime }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="节点完成状态" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <el-tag v-if="row.instanceState === 'FINISHED'" type="success">已完成</el-tag>
+                        <el-tag v-if="row.instanceState === 'PENDING'" type="warning">进行中</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" width="120" 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: 'AssetsDepartmentDoneList',
+    components: {
+        Breadcrumb,
+        YPageListLayout,
+        PermissionButton,
+    },
+    data() {
+        return {
+            pageData: { records: [] },
+            listLoading: false,
+            listQuery: {
+                page: 1,
+                size: 10,
+                current: 1,
+                // 节点code
+                nodeCode: null,
+                // 关键字
+                keyWord: null,
+                //是否以部门id查询
+                selectByDepartment: true,
+                departmentId: null
+            },
+            // 接单部门
+            allotDepartment: [],
+            nodes: []
+        }
+    },
+    created() {
+        // 获取节点下拉列表
+        this.getNodes();
+        // 获取分单部门
+        this.getAllotDepartment();
+        // 获取资产业务订单
+        this.getAssetsTaskDoneList();
+    },
+    methods: {
+        // 无条件分页查询
+        getAssetsTaskDoneList() {
+            this.listQuery.selectByDepartment = true;
+            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
+                }
+            })
+        },
+        // 获取部门下拉列表
+        getAllotDepartment() {
+            this.$api.department.allot().then(res => {
+                if (res.code === 200) {
+                    this.allotDepartment = res.data;
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped></style>

+ 300 - 0
src/views/assets/departmentTodoList.vue

@@ -0,0 +1,300 @@
+<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-select v-model="listQuery.departmentId" filterable placeholder="接单部门"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"></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="250">
+                    <template slot-scope="{row}">
+                        <span>{{ row.reportName || row.statementName || 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="success" size="mini" @click="orderViewDetail(row)">查看</el-button>
+                        <el-button v-if="row.handlerId === $store.getters.userInfo.id" 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: 'AssetsDepartmentToDoList',
+    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: null,
+                //是否以部门id查询
+                selectByDepartment: true,
+                departmentId: null
+            },
+            // 接单部门
+            allotDepartment: [],
+            // 用户下拉列表
+            allUsers: [],
+            // 节点信息下拉列表
+            nodes: [],
+            // 业务类型下拉列表
+            assetsBusinessGeners: [
+                {
+                    value: '单项资产',
+                    label: '单项资产'
+                }, {
+                    value: '整体资产',
+                    label: '整体资产'
+                }, {
+                    value: '无形资产',
+                    label: '无形资产'
+                }, {
+                    value: '债权',
+                    label: '债权'
+                }, {
+                    value: '其他',
+                    label: '其他'
+                }
+            ]
+        }
+    },
+    created() {
+        // 获取用户下拉列表
+        this.getAllUser();
+        // 获取节点下拉列表
+        this.getNodes();
+        // 获取分单部门
+        this.getAllotDepartment();
+        // 获取资产业务订单
+        this.selectPage();
+    },
+    methods: {
+        // 当前用户所属部门的待办分页查询
+        selectPage() {
+            this.listQuery.selectByDepartment = true;
+            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) {
+            if (row.currentNodeCode === 'REPORT_OUT_APPLY') {
+                this.$router.push(`/assets/myOrderList`)
+                return;
+            } else 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 {
+                // 根据节点预设需要激活的tab页面
+                let activeTabName = 'baseInfo';
+                if (row.currentNodeCode === 'DEPARTMENT_ALLOCATION') {
+                    activeTabName = 'members';
+                } else if (row.currentNodeCode === 'SPOT_RECONNAISSANCE_DETERMINE_PRICE'
+                    || row.currentNodeCode === 'ASSET_REPORT_TAKE_NO'
+                    || row.currentNodeCode === 'GENERATE_STATEMENT'
+                    || row.currentNodeCode === 'WRITE_REPORT'
+                    || row.currentNodeCode === 'REVIEW_STATEMENT'
+                    || row.currentNodeCode === 'CHECK_REPORT') {
+                    activeTabName = 'target';
+                } else if (row.currentNodeCode === 'REEXAMINE_STATEMENT'
+                    || row.currentNodeCode === 'RECHECK_REPORT'
+                    || row.currentNodeCode === 'FOURTH_CHECK_REPORT'
+                    || row.currentNodeCode === 'STATEMENT_IN'
+                    || row.currentNodeCode === 'STATEMENT_OUT'
+                    || row.currentNodeCode === 'REPORT_IN'
+                    || row.currentNodeCode === 'REPORT_OUT') {
+                    activeTabName = 'production';
+                }
+                this.$router.push({
+                    path: "/assets/orderDetail",
+                    query: {
+                        row: JSON.stringify(row),
+                        back: '/assets/department/todoList',
+                        couldEdit: true,
+                        couldBack: true,
+                        disabledStatus: false,
+                        activeTabName: activeTabName
+                    }
+                })
+            }
+        },
+        orderViewDetail(row) {
+            this.$router.push({
+                path: "/assets/orderDetail",
+                query: {
+                    row: JSON.stringify(row),
+                    back: '/assets/department/todoList',
+                    couldEdit: false,
+                    couldBack: false,
+                    disabledStatus: true
+                }
+            })
+        },
+        // 获取部门下拉列表
+        getAllotDepartment() {
+            this.$api.department.allot().then(res => {
+                if (res.code === 200) {
+                    this.allotDepartment = res.data;
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped></style>

+ 18 - 1
src/views/assets/myOrderList.vue

@@ -19,6 +19,10 @@
                     style=" width: 200px;margin-left: 10px;float: left;">
                     <el-option v-for="(s, value) in deliverys" :label="s.label" :value="s.value"></el-option>
                 </el-select>
+                <el-select v-model="listQuery.departmentId" filterable placeholder="接单部门"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"></el-option>
+                </el-select>
                 <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
                     round>搜索
                 </el-button>
@@ -528,8 +532,11 @@ export default {
                 // 关键字
                 keyWord: null,
                 // 送达状态
-                delivery: null
+                delivery: null,
+                departmentId: null
             },
+            // 接单部门
+            allotDepartment: [],
             // 用户下拉列表
             allUsers: [],
             // 送达状态下拉列表
@@ -619,6 +626,8 @@ export default {
     created() {
         // 获取用户下拉列表
         this.getAllUser();
+        // 获取分单部门
+        this.getAllotDepartment();
         // 获取我的资产业务订单
         this.selectMyOrderPage();
     },
@@ -1138,6 +1147,14 @@ export default {
         },
         cleanFinanceInvoiceForm() {
             
+        },
+        // 获取部门下拉列表
+        getAllotDepartment() {
+            this.$api.department.allot().then(res => {
+                if (res.code === 200) {
+                    this.allotDepartment = res.data;
+                }
+            })
         }
     }
 }

+ 18 - 1
src/views/assets/repertoryList.vue

@@ -12,6 +12,10 @@
                     :picker-options="pickerOptions" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" range-separator="至"
                     start-placeholder="开始日期" end-placeholder="结束日期" align="right">
                 </el-date-picker>
+                <el-select v-model="listQuery.departmentId" filterable placeholder="接单部门"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"></el-option>
+                </el-select>
                 <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
                     round>搜索
                 </el-button>
@@ -187,8 +191,11 @@ export default {
                 // 开始时间
                 startTime: null,
                 // 结束时间
-                endTime: null
+                endTime: null,
+                departmentId: null
             },
+            // 接单部门
+            allotDepartment: [],
             // 用户下拉列表
             allUsers: [],
             // 业务类型下拉列表
@@ -241,6 +248,8 @@ export default {
         }
     },
     created() {
+        // 获取分单部门
+        this.getAllotDepartment();
         // 获取资产业务订单
         this.selectRepertoryPage();
     },
@@ -286,6 +295,14 @@ export default {
                 "/assets/repertoryExport", this.listQuery,
                 "导出"
             );
+        },
+        // 获取部门下拉列表
+        getAllotDepartment() {
+            this.$api.department.allot().then(res => {
+                if (res.code === 200) {
+                    this.allotDepartment = res.data;
+                }
+            })
         }
     }
 }

+ 18 - 1
src/views/assets/terminateList.vue

@@ -20,6 +20,10 @@
                     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.departmentId" filterable placeholder="接单部门"
+                    style=" width: 200px;margin-left: 10px;float: left;">
+                    <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"></el-option>
+                </el-select>
                 <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList"
                     round>搜索
                 </el-button>
@@ -137,8 +141,11 @@ export default {
                 // 业务类型
                 assetsBusinessGener: null,
                 // 关键字
-                keyWord: null
+                keyWord: null,
+                departmentId: null
             },
+            // 接单部门
+            allotDepartment: [],
             // 用户下拉列表
             allUsers: [],
             // 业务类型下拉列表
@@ -165,6 +172,8 @@ export default {
     created() {
         // 获取用户下拉列表
         this.getAllUser();
+        // 获取分单部门
+        this.getAllotDepartment();
         // 获取资产业务订单
         this.selectTerminatedPage();
     },
@@ -231,6 +240,14 @@ export default {
                     disabledStatus: false
                 }
             })
+        },
+        // 获取部门下拉列表
+        getAllotDepartment() {
+            this.$api.department.allot().then(res => {
+                if (res.code === 200) {
+                    this.allotDepartment = res.data;
+                }
+            })
         }
     }
 }