1.新增查询已终止任务列表页面

2.修改已办任务列表页面
3.新增已终止订单重新下单

src/api/modules/assets.js

@@ -137,5 +137,9 @@ export default {
     // 条件查询资产已归档列表
     selectArchivedPage(params){
         return request.get(`assets/selectArchivedPage`, { params: params })
+    },
+    // 条件查询资产已终止列表
+    selectTerminatedPage(params){
+        return request.get(`assets/selectTerminatedPage`, { params: params })
     }
 }

src/router/urlMap.js

@@ -98,6 +98,7 @@ 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_assets_terminate_list from '@/views/assets/TerminateList'
 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'
@@ -196,5 +197,6 @@ export default {
   _views_major_old_list,
   _views_assets_todo_list,
   _views_assets_archived_list,
-  _views_assets_done_list
+  _views_assets_done_list,
+  _views_assets_terminate_list
 }

src/views/assets/TerminateList.vue

@@ -0,0 +1,239 @@
+<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="selectTerminatedPage">
+            <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-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.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="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.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.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="200">
+                    <template slot-scope="{row}">
+                        <span>{{ row.created }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="终止原因" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <span>{{ row.comment }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" width="200" fixed="right">
+                    <template slot-scope="{row}">
+                        <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
+                        <el-button type="danger" size="mini" @click="toAddAssetsOrder(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: [],
+            // 业务类型下拉列表
+            assetsBusinessGeners: [
+                {
+                    value: '单项资产',
+                    label: '单项资产'
+                }, {
+                    value: '整体资产',
+                    label: '整体资产'
+                }, {
+                    value: '无形资产',
+                    label: '无形资产'
+                }, {
+                    value: '债权',
+                    label: '债权'
+                }, {
+                    value: '其他',
+                    label: '其他'
+                }
+            ]
+        }
+    },
+    created() {
+        // 获取用户下拉列表
+        this.getAllUser();
+        // 获取资产业务订单
+        this.selectTerminatedPage();
+    },
+    methods: {
+        // 无条件分页查询
+        selectTerminatedPage() {
+            this.$api.assets.selectTerminatedPage(this.listQuery).then(res => {
+                if (res.code === 200) {
+                    this.pageData = res.data;
+                }
+            })
+        },
+        // 条件查询
+        searchList() {
+            // 重置分页
+            this.listQuery.page = 1
+            this.listQuery.size = 10
+            this.selectTerminatedPage()
+        },
+        // 重置搜索条件
+        resetParams() {
+            this.$router.push({ query: {} });
+            this.listQuery = {
+                current: 1,
+                size: 10,
+            }
+            this.selectTerminatedPage();
+        },
+        // 获取所有用户下拉列表
+        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: false,
+                    couldBack: false,
+                    disabledStatus: true
+                }
+            })
+        },
+        toAddAssetsOrder(row){
+            this.$router.push({
+                path: "/assets/addOrder",
+                query: {
+                    row: JSON.stringify(row),
+                    back: '/assets/terminateList',
+                    couldEdit: true,
+                    couldBack: true,
+                    disabledStatus: false
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/assets/addAssetsOrder.vue

@@ -5,7 +5,7 @@
             <div class="form-container">
                 <y-detail-page-layout ref="addAssetsOrder" @save="handleCreate" :editStatus="couldEdit" @doRecall="doRecall"
                     :couldBack="couldBack">
-                    <el-form ref="assetsFrom" :model="assetsFrom" :rules="assetsFromRules">
+                    <el-form ref="assetsForm" :model="assetsForm" :rules="assetsFormRules">
                         <div class="createMajor-main-container">
                             <div class="postInfo-container">
                                 <div>
@@ -19,17 +19,17 @@
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="客户经理：" prop="clientManager"
-                                            :rules="assetsFromRules.clientManager" label-width="120px"
+                                            :rules="assetsFormRules.clientManager" label-width="120px"
                                             class="postInfo-container-item">
-                                            <el-input :value="assetsFrom.clientManager" class="filter-item" readonly
+                                            <el-input :value="assetsForm.clientManager" class="filter-item" readonly
                                                 disabled style=" width: 225px" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="4" :span="6">
                                         <el-form-item label="接单部门：" prop="departmentId"
-                                            :rules="assetsFromRules.departmentId" label-width="120px"
+                                            :rules="assetsFormRules.departmentId" label-width="120px"
                                             class="postInfo-container-item">
-                                            <el-select v-model="assetsFrom.departmentId">
+                                            <el-select v-model="assetsForm.departmentId">
                                                 <el-option v-for="(d, id) in allotDepartment" :label="d.name"
                                                     :value="d.id"></el-option>
                                             </el-select>
@@ -38,18 +38,18 @@
                                 </el-row>
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item prop="name" :rules="assetsFromRules.name" label-width="120px"
+                                        <el-form-item prop="name" :rules="assetsFormRules.name" label-width="120px"
                                             class="postInfo-container-item" label="项目名称：">
-                                            <el-input v-model="assetsFrom.name" class="filter-item" />
+                                            <el-input v-model="assetsForm.name" class="filter-item" />
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="业务类型：" prop="assetsBusinessGener"
-                                            :rules="assetsFromRules.assetsBusinessGener" label-width="120px"
+                                            :rules="assetsFormRules.assetsBusinessGener" label-width="120px"
                                             class="postInfo-container-item">
-                                            <el-select v-model="assetsFrom.assetsBusinessGener" filterable
+                                            <el-select v-model="assetsForm.assetsBusinessGener" filterable
                                                 placeholder="业务类型">
                                                 <el-option v-for="(s, value) in assetsBusinessGeners" :label="s.label"
                                                     :value="s.value"></el-option>
@@ -58,11 +58,11 @@
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="客户再次委托：" prop="entrustAgain"
-                                            :rules="assetsFromRules.entrustAgain" label-width="140px"
+                                            :rules="assetsFormRules.entrustAgain" label-width="140px"
                                             class="postInfo-container-item">
-                                            <el-radio v-model="assetsFrom.entrustAgain" :label="false" border
+                                            <el-radio v-model="assetsForm.entrustAgain" :label="false" border
                                                 size="medium">否</el-radio>
-                                            <el-radio v-model="assetsFrom.entrustAgain" :label="true" border
+                                            <el-radio v-model="assetsForm.entrustAgain" :label="true" border
                                                 size="medium">是</el-radio>
                                         </el-form-item>
                                     </el-col>
@@ -70,10 +70,10 @@
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="客户类型：" prop="clienteleType"
-                                            :rules="assetsFromRules.clienteleType" label-width="120px"
+                                            :rules="assetsFormRules.clienteleType" label-width="120px"
                                             class="postInfo-container-item">
-                                            <el-select v-model="assetsFrom.clienteleType" placeholder="请选择"
-                                                @change="changeCustomerType(assetsFrom.clienteleType)">
+                                            <el-select v-model="assetsForm.clienteleType" placeholder="请选择"
+                                                @change="changeCustomerType(assetsForm.clienteleType)">
                                                 <el-option label="企业" value="企业"></el-option>
                                                 <el-option label="个人" value="个人"></el-option>
                                             </el-select>
@@ -81,9 +81,9 @@
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="客户名称：" prop="clienteleId" label-width="120px"
-                                            :rules="assetsFromRules.clienteleId" class="postInfo-container-item"
+                                            :rules="assetsFormRules.clienteleId" class="postInfo-container-item"
                                             v-if="itemHideStatus">
-                                            <el-select v-model="assetsFrom.clienteleId" placeholder="请选择(可搜索)"
+                                            <el-select v-model="assetsForm.clienteleId" placeholder="请选择(可搜索)"
                                                 @change="findSubClientele(0)" clearable filterable>
                                                 <el-option v-for="(c, id) in customerCompany" :label="c.name"
                                                     :value="c.id"></el-option>
@@ -92,9 +92,9 @@
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="业务来源：" prop="clienteleSubId" label-width="120px"
-                                            :rules="assetsFromRules.clienteleSubId" class="postInfo-container-item"
+                                            :rules="assetsFormRules.clienteleSubId" class="postInfo-container-item"
                                             v-if="itemHideStatus">
-                                            <el-select v-model="assetsFrom.clienteleSubId" placeholder="请选择(可搜索)"
+                                            <el-select v-model="assetsForm.clienteleSubId" placeholder="请选择(可搜索)"
                                                 @change="getCustomerContract" clearable filterable>
                                                 <el-option v-for="(s, id) in subCustomerCompany" :label="s.name"
                                                     :value="s.id"></el-option>
@@ -105,10 +105,10 @@
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="客户联系人：" prop="clienteleContactId"
-                                            :rules="assetsFromRules.clienteleContactId" label-width="120px"
+                                            :rules="assetsFormRules.clienteleContactId" label-width="120px"
                                             class="postInfo-container-item">
                                             <div>
-                                                <el-select v-model="assetsFrom.clienteleContactId" placeholder="请选择(可搜索)"
+                                                <el-select v-model="assetsForm.clienteleContactId" placeholder="请选择(可搜索)"
                                                     clearable filterable @change="getContactInfo" style="width:60%">
                                                     <el-option v-for="(c, id) in customerContract" :label="c.name"
                                                         :value="c.id"></el-option>
@@ -145,51 +145,51 @@
                                 </el-row>
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="是否证券项目：" prop="security" :rules="assetsFromRules.security"
+                                        <el-form-item label="是否证券项目：" prop="security" :rules="assetsFormRules.security"
                                             label-width="140px" class="postInfo-container-item">
-                                            <el-radio v-model="assetsFrom.security" :label="false" border
+                                            <el-radio v-model="assetsForm.security" :label="false" border
                                                 size="medium">否</el-radio>
-                                            <el-radio v-model="assetsFrom.security" :label="true" border
+                                            <el-radio v-model="assetsForm.security" :label="true" border
                                                 size="medium">是</el-radio>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="是否资产重组项目：" prop="significantAssetsReorganization"
-                                            :rules="assetsFromRules.significantAssetsReorganization" label-width="200px"
+                                            :rules="assetsFormRules.significantAssetsReorganization" label-width="200px"
                                             class="postInfo-container-item">
-                                            <el-radio v-model="assetsFrom.significantAssetsReorganization" :label="false"
+                                            <el-radio v-model="assetsForm.significantAssetsReorganization" :label="false"
                                                 border size="medium">否</el-radio>
-                                            <el-radio v-model="assetsFrom.significantAssetsReorganization" :label="true"
+                                            <el-radio v-model="assetsForm.significantAssetsReorganization" :label="true"
                                                 border size="medium">是</el-radio>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label=" 是否国资项目：" prop="stateAssets"
-                                            :rules="assetsFromRules.stateAssets" label-width="140px"
+                                            :rules="assetsFormRules.stateAssets" label-width="140px"
                                             class="postInfo-container-item">
-                                            <el-radio v-model="assetsFrom.stateAssets" :label="false" border
+                                            <el-radio v-model="assetsForm.stateAssets" :label="false" border
                                                 size="medium">否</el-radio>
-                                            <el-radio v-model="assetsFrom.stateAssets" :label="true" border
+                                            <el-radio v-model="assetsForm.stateAssets" :label="true" border
                                                 size="medium">是</el-radio>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="是否涉及境外资产：" prop="foreignAssetsInvolved"
-                                            :rules="assetsFromRules.foreignAssetsInvolved" label-width="200px"
+                                            :rules="assetsFormRules.foreignAssetsInvolved" label-width="200px"
                                             class="postInfo-container-item">
-                                            <el-radio v-model="assetsFrom.foreignAssetsInvolved" :label="false" border
+                                            <el-radio v-model="assetsForm.foreignAssetsInvolved" :label="false" border
                                                 size="medium">否</el-radio>
-                                            <el-radio v-model="assetsFrom.foreignAssetsInvolved" :label="true" border
+                                            <el-radio v-model="assetsForm.foreignAssetsInvolved" :label="true" border
                                                 size="medium">是</el-radio>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="是否分配产值：" prop="dispenseBenefit"
-                                            :rules="assetsFromRules.dispenseBenefit" label-width="140px"
+                                            :rules="assetsFormRules.dispenseBenefit" label-width="140px"
                                             class="postInfo-container-item">
-                                            <el-radio v-model="assetsFrom.dispenseBenefit" :label="false" border
+                                            <el-radio v-model="assetsForm.dispenseBenefit" :label="false" border
                                                 size="medium">否</el-radio>
-                                            <el-radio v-model="assetsFrom.dispenseBenefit" :label="true" border
+                                            <el-radio v-model="assetsForm.dispenseBenefit" :label="true" border
                                                 size="medium">是</el-radio>
                                         </el-form-item>
                                     </el-col>
@@ -198,28 +198,28 @@
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="委托人：" prop="bailor" label-width="120px"
                                             class="postInfo-container-item">
-                                            <el-input v-model="assetsFrom.bailor" class="filter-item"
+                                            <el-input v-model="assetsForm.bailor" class="filter-item"
                                                 style=" width: 225px" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="委托联系人：" prop="bailorContactName" label-width="120px"
                                             class="postInfo-container-item">
-                                            <el-input v-model="assetsFrom.bailorContactName" class="filter-item"
+                                            <el-input v-model="assetsForm.bailorContactName" class="filter-item"
                                                 style=" width: 225px" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="委托人联系人电话：" prop="bailorContactTel" label-width="160px"
                                             class="postInfo-container-item">
-                                            <el-input v-model="assetsFrom.bailorContactTel" class="filter-item"
+                                            <el-input v-model="assetsForm.bailorContactTel" class="filter-item"
                                                 style=" width: 225px" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="委托人地址：" prop="bailorAddress" label-width="120px"
                                             class="postInfo-container-item">
-                                            <el-input v-model="assetsFrom.bailorAddress" class="filter-item"
+                                            <el-input v-model="assetsForm.bailorAddress" class="filter-item"
                                                 style=" width: 225px" />
                                         </el-form-item>
                                     </el-col>
@@ -227,9 +227,9 @@
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="终端客户类型：" prop="terminalClienteleType"
-                                            :rules="assetsFromRules.terminalClienteleType" label-width="140px"
+                                            :rules="assetsFormRules.terminalClienteleType" label-width="140px"
                                             class="postInfo-container-item">
-                                            <el-select v-model="assetsFrom.terminalClienteleType" placeholder="请选择"
+                                            <el-select v-model="assetsForm.terminalClienteleType" placeholder="请选择"
                                                 style="width:205px">
                                                 <el-option label="企业" value="企业"></el-option>
                                                 <el-option label="个人" value="个人"></el-option>
@@ -237,11 +237,11 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6"
-                                        v-if="assetsFrom.terminalClienteleType === '企业'">
+                                        v-if="assetsForm.terminalClienteleType === '企业'">
                                         <el-form-item label="终端客户名称：" prop="terminalClienteleId" label-width="140px"
-                                            :rules="assetsFromRules.terminalClienteleId" class="postInfo-container-item">
+                                            :rules="assetsFormRules.terminalClienteleId" class="postInfo-container-item">
                                             <div v-if="couldEdit">
-                                                <el-select v-model="assetsFrom.terminalClienteleId" placeholder="请选择(可搜索)"
+                                                <el-select v-model="assetsForm.terminalClienteleId" placeholder="请选择(可搜索)"
                                                     @change="findSubClientele(1)" clearable filterable style="width:80%">
                                                     <el-option v-for="(c, id) in tCustomerCompany" :label="c.name"
                                                         :value="c.id"></el-option>
@@ -252,17 +252,17 @@
                                                         @click="createTerminalClient()">新增</span>
                                                 </el-tooltip>
                                             </div>
-                                            <el-input :value="assetsFrom.tterminalClienteleName" class="filter-item"
+                                            <el-input :value="assetsForm.tterminalClienteleName" class="filter-item"
                                                 style=" width: 225px" v-else />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6"
-                                        v-if="assetsFrom.terminalClienteleType === '个人'">
+                                        v-if="assetsForm.terminalClienteleType === '个人'">
                                         <el-form-item label="终端联系人：" prop="terminalClienteleContactId" label-width="120px"
-                                            :rules="assetsFromRules.terminalClienteleContactId"
+                                            :rules="assetsFormRules.terminalClienteleContactId"
                                             class="postInfo-container-item">
                                             <div v-if="couldEdit">
-                                                <el-select v-model="assetsFrom.terminalClienteleContactId"
+                                                <el-select v-model="assetsForm.terminalClienteleContactId"
                                                     placeholder="请选择(可搜索)" clearable filterable @change="getTcontactInfo"
                                                     style="width:80%">
                                                     <el-option v-for="(c, id) in tCustomerContract" :label="c.name"
@@ -274,14 +274,14 @@
                                                         @click="createTlinkman()">新增</span>
                                                 </el-tooltip>
                                             </div>
-                                            <el-input :value="assetsFrom.tterminalClienteleContactName" class="filter-item"
+                                            <el-input :value="assetsForm.tterminalClienteleContactName" class="filter-item"
                                                 style=" width: 225px" v-else />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="终端联系电话：" prop="clienteleType" label-width="150px"
                                             class="postInfo-container-item">
-                                            <el-input :value="assetsFrom.tmobile" class="filter-item" readonly disabled
+                                            <el-input :value="assetsForm.tmobile" class="filter-item" readonly disabled
                                                 style=" width: 215px" />
                                         </el-form-item>
                                     </el-col>
@@ -290,7 +290,7 @@
                                     <el-col :xs="24" :sm="12" :lg="23" :span="12">
                                         <el-form-item label="备注：" prop="remark" label-width="120px"
                                             class="postInfo-container-item">
-                                            <el-input v-model="assetsFrom.remark" :autosize="{ minRows: 4, maxRows: 4 }"
+                                            <el-input v-model="assetsForm.remark" :autosize="{ minRows: 4, maxRows: 4 }"
                                                 class="filter-item" type="textarea" />
                                         </el-form-item>
                                     </el-col>
@@ -303,30 +303,30 @@
             <!-- 新增客户联系人 -->
             <el-dialog :visible.sync="createLinkmanVisible" width="70%" custom-class="createLinkman">
                 <el-divider content-position="left">新增客户联系人</el-divider>
-                <el-form ref="linkmanFrom" :model="linkmanFrom" :rules="linkmanRules">
+                <el-form ref="linkmanForm" :model="linkmanForm" :rules="linkmanRules">
                     <el-row>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="客户类型：" prop="clienteleType" :rules="linkmanRules.clienteleType"
                                 label-width="120px" class="postInfo-container-item">
-                                <el-select v-model="linkmanFrom.clienteleType">
+                                <el-select v-model="linkmanForm.clienteleType">
                                     <el-option label="企业" value="企业"></el-option>
                                     <el-option label="个人" value="个人"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
-                        <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="assetsFrom.clienteleType === '企业'">
+                        <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="assetsForm.clienteleType === '企业'">
                             <el-form-item label="客户名称：" prop="clienteleId" :rules="linkmanRules.clienteleId"
                                 label-width="120px" class="postInfo-container-item">
-                                <el-select v-model="linkmanFrom.clienteleId">
+                                <el-select v-model="linkmanForm.clienteleId">
                                     <el-option v-for="(c, id) in customerCompany" :label="c.name" :value="c.id"></el-option>
                                 </el-select>
 
                             </el-form-item>
                         </el-col>
-                        <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="assetsFrom.clienteleType === '企业'">
+                        <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="assetsForm.clienteleType === '企业'">
                             <el-form-item label="业务来源：" prop="clienteleSubId" :rules="linkmanRules.clienteleSubId"
                                 label-width="120px" class="postInfo-container-item">
-                                <el-select v-model="linkmanFrom.clienteleSubId">
+                                <el-select v-model="linkmanForm.clienteleSubId">
                                     <el-option v-for="(s, id) in subCustomerCompany" :label="s.name"
                                         :value="s.id"></el-option>
                                 </el-select>
@@ -337,17 +337,17 @@
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="联系人姓名：" prop="name" :rules="linkmanRules.name" label-width="120px"
                                 class="postInfo-container-item">
-                                <el-input v-model.trim="linkmanFrom.name" class="filter-item" />
+                                <el-input v-model.trim="linkmanForm.name" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="联系电话：" prop="mobile" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="linkmanFrom.mobile" class="filter-item" />
+                                <el-input v-model.trim="linkmanForm.mobile" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="性别：" prop="sex" label-width="120px" class="postInfo-container-item">
-                                <el-select v-model=linkmanFrom.sex>
+                                <el-select v-model=linkmanForm.sex>
                                     <el-option label="男" value="男">男</el-option>
                                     <el-option label="女" value="女">女</el-option>
                                 </el-select>
@@ -355,29 +355,29 @@
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="身份证号：" prop="idNo" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="linkmanFrom.idNo" class="filter-item" />
+                                <el-input v-model.trim="linkmanForm.idNo" class="filter-item" />
                             </el-form-item>
                         </el-col>
                     </el-row>
                     <el-row>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="微信号：" prop="wechatNo" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="linkmanFrom.wechatNo" class="filter-item" />
+                                <el-input v-model.trim="linkmanForm.wechatNo" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="QQ号：" prop="qqNo" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="linkmanFrom.qqNo" class="filter-item" />
+                                <el-input v-model.trim="linkmanForm.qqNo" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="毕业院校：" prop="school" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="linkmanFrom.school" class="filter-item" />
+                                <el-input v-model.trim="linkmanForm.school" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="毕业专业：" prop="industry" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="linkmanFrom.industry" class="filter-item" />
+                                <el-input v-model.trim="linkmanForm.industry" class="filter-item" />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -385,12 +385,12 @@
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="所在部门：" prop="department" label-width="120px"
                                 class="postInfo-container-item">
-                                <el-input v-model.trim="linkmanFrom.department" class="filter-item" />
+                                <el-input v-model.trim="linkmanForm.department" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="职位：" prop="duty" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="linkmanFrom.duty" class="filter-item" />
+                                <el-input v-model.trim="linkmanForm.duty" class="filter-item" />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -398,7 +398,7 @@
                         <el-col :xs="24" :sm="12" :lg="24" :span="6">
                             <el-form-item label="备注：" prop="description" label-width="120px"
                                 class="postInfo-container-item">
-                                <el-input v-model.trim="linkmanFrom.description" class="filter-item" type="textarea" />
+                                <el-input v-model.trim="linkmanForm.description" class="filter-item" type="textarea" />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -409,22 +409,22 @@
             <!-- 新增终端客户联系人 -->
             <el-dialog :visible.sync="createTlinkmanVisible" width="70%" custom-class="createLinkman">
                 <el-divider content-position="left">新增终端客户联系人</el-divider>
-                <el-form ref="tLinkmanFrom" :model="tLinkmanFrom" :rules="tLinkmanFromRules">
+                <el-form ref="tLinkmanForm" :model="tLinkmanForm" :rules="tLinkmanFormRules">
                     <el-row>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                            <el-form-item label="联系人姓名：" prop="name" :rules="tLinkmanFromRules.name" label-width="120px"
+                            <el-form-item label="联系人姓名：" prop="name" :rules="tLinkmanFormRules.name" label-width="120px"
                                 class="postInfo-container-item">
-                                <el-input v-model.trim="tLinkmanFrom.name" class="filter-item" />
+                                <el-input v-model.trim="tLinkmanForm.name" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="联系电话：" prop="mobile" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="tLinkmanFrom.mobile" class="filter-item" />
+                                <el-input v-model.trim="tLinkmanForm.mobile" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="性别：" prop="sex" label-width="120px" class="postInfo-container-item">
-                                <el-select v-model=tLinkmanFrom.sex>
+                                <el-select v-model=tLinkmanForm.sex>
                                     <el-option label="男" value="男">男</el-option>
                                     <el-option label="女" value="女">女</el-option>
                                 </el-select>
@@ -432,29 +432,29 @@
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="身份证号：" prop="idNo" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="tLinkmanFrom.idNo" class="filter-item" />
+                                <el-input v-model.trim="tLinkmanForm.idNo" class="filter-item" />
                             </el-form-item>
                         </el-col>
                     </el-row>
                     <el-row>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="微信号：" prop="wechatNo" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="tLinkmanFrom.wechatNo" class="filter-item" />
+                                <el-input v-model.trim="tLinkmanForm.wechatNo" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="QQ号：" prop="qqNo" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="tLinkmanFrom.qqNo" class="filter-item" />
+                                <el-input v-model.trim="tLinkmanForm.qqNo" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="毕业院校：" prop="school" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="tLinkmanFrom.school" class="filter-item" />
+                                <el-input v-model.trim="tLinkmanForm.school" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="毕业专业：" prop="industry" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="tLinkmanFrom.industry" class="filter-item" />
+                                <el-input v-model.trim="tLinkmanForm.industry" class="filter-item" />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -462,12 +462,12 @@
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="所在部门：" prop="department" label-width="120px"
                                 class="postInfo-container-item">
-                                <el-input v-model.trim="tLinkmanFrom.department" class="filter-item" />
+                                <el-input v-model.trim="tLinkmanForm.department" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="6" :span="6">
                             <el-form-item label="职位：" prop="duty" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="tLinkmanFrom.duty" class="filter-item" />
+                                <el-input v-model.trim="tLinkmanForm.duty" class="filter-item" />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -475,7 +475,7 @@
                         <el-col :xs="24" :sm="12" :lg="24" :span="6">
                             <el-form-item label="备注：" prop="description" label-width="120px"
                                 class="postInfo-container-item">
-                                <el-input v-model.trim="tLinkmanFrom.description" class="filter-item" type="textarea" />
+                                <el-input v-model.trim="tLinkmanForm.description" class="filter-item" type="textarea" />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -486,30 +486,30 @@
             <!-- 新增终端客户 -->
             <el-dialog :visible.sync="createTerminalClientVisible" width="70%" custom-class="createLinkman">
                 <el-divider content-position="left">新增终端客户</el-divider>
-                <el-form ref="terminalClientFrom" :model="terminalClientFrom" :rules="terminalClientFromRules">
+                <el-form ref="terminalClientForm" :model="terminalClientForm" :rules="terminalClientFormRules">
                     <el-row>
                         <el-col :xs="24" :sm="12" :lg="8" :span="6">
-                            <el-form-item label="客户名称：" prop="name" :rules="terminalClientFromRules.name"
+                            <el-form-item label="客户名称：" prop="name" :rules="terminalClientFormRules.name"
                                 label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="terminalClientFrom.name" class="filter-item" />
+                                <el-input v-model.trim="terminalClientForm.name" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="8" :span="6">
-                            <el-form-item label="企业类型：" prop="companyType" :rules="terminalClientFromRules.companyType"
+                            <el-form-item label="企业类型：" prop="companyType" :rules="terminalClientFormRules.companyType"
                                 label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="terminalClientFrom.companyType" class="filter-item" />
+                                <el-input v-model.trim="terminalClientForm.companyType" class="filter-item" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="12" :lg="8" :span="6">
                             <el-form-item label="联系电话：" prop="phone" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="terminalClientFrom.phone" class="filter-item" />
+                                <el-input v-model.trim="terminalClientForm.phone" class="filter-item" />
                             </el-form-item>
                         </el-col>
                     </el-row>
                     <el-row>
                         <el-col :xs="24" :sm="12" :lg="24" :span="6">
                             <el-form-item label="客户地址：" prop="address" label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="terminalClientFrom.address" class="filter-item" />
+                                <el-input v-model.trim="terminalClientForm.address" class="filter-item" />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -541,11 +541,16 @@ export default {
         return {
             couldEdit: null,
             couldBack: null,
+            // 页面传参
+            pageParams: {
+                back: null,
+                row: null
+            },
             // 表单项目隐藏字段
             itemHideStatus: false,
             createLinkmanVisible: false,
             // 资产业务下单表单校验规则
-            assetsFromRules: {
+            assetsFormRules: {
                 clientManager: [
                     { required: true, message: '客户经理不能为空', trigger: 'blur' }
                 ],
@@ -614,13 +619,13 @@ export default {
                 ]
             },
             // 新增终端客户联系人表单校验规则
-            tLinkmanFromRules: {
+            tLinkmanFormRules: {
                 name: [
                     { required: true, message: '联系人姓名不能为空', trigger: 'blur' }
                 ]
             },
             // 新增终端客户表单校验规则
-            terminalClientFromRules: {
+            terminalClientFormRules: {
                 name: [
                     { required: true, message: '联系人姓名不能为空', trigger: 'blur' }
                 ],
@@ -660,7 +665,7 @@ export default {
             // 终端联系人下拉列表
             tCustomerContract: [],
             // 资产业务订单
-            assetsFrom: {
+            assetsForm: {
                 // 项目名
                 name: null,
                 // 客户经理id
@@ -713,7 +718,7 @@ export default {
                 allotType: "指派"
             },
             // 新增客户联系人表单
-            linkmanFrom: {
+            linkmanForm: {
                 clienteleType: null,
                 clienteleSubId: null,
                 clienteleId: null,
@@ -734,7 +739,7 @@ export default {
             },
             createTlinkmanVisible: false,
             // 新增终端联系人表单
-            tLinkmanFrom: {
+            tLinkmanForm: {
                 ccId: null,
                 name: null,
                 mobile: null,
@@ -752,7 +757,7 @@ export default {
             },
             createTerminalClientVisible: false,
             // 终端客户联系人信息
-            terminalClientFrom: {
+            terminalClientForm: {
                 name: null,
                 companyType: null,
                 address: null,
@@ -768,15 +773,20 @@ export default {
     created() {
         this.couldEdit = this.$route.query.couldEdit === 'true';
         this.couldBack = this.$route.query.couldBack === 'true';
+        this.pageParams.back = this.$route.query.back;
+        this.pageParams.row = JSON.parse(this.$route.query.row);
         this.getAllotDepartment();
         this.getCustomerCompany(0);
         this.getCustomerCompany(1);
+        if (this.pageParams.row.assetsId !== null && this.pageParams.row.assetsId !== undefined && this.pageParams.row.assetsId !== '') {
+            this.getAssetsDetailById(this.pageParams.row.assetsId);
+        }
     },
     methods: {
         handleCreate() {
-            this.$refs.assetsFrom.validate(valid => {
+            this.$refs.assetsForm.validate(valid => {
                 if (valid) {
-                    this.$api.assets.add(this.assetsFrom).then(res => {
+                    this.$api.assets.add(this.assetsForm).then(res => {
                         if (res.code === 200) {
                             if (res.data && res.data.instanceNodeId && res.data.state) {
                                 this.$api.workflow.commit(res.data).then(result => {
@@ -801,7 +811,6 @@ export default {
                             if (back) {
                                 this.$router.push(back)
                             }
-                            this.initData();
                         } else {
                             this.$notify({
                                 title: '失败',
@@ -830,8 +839,8 @@ export default {
                 type: 'warning',
                 center: true
             }).then(() => {
-                if (this.assetsFrom.id) {
-                    this.$api.assetsFrom.doRecall(this.assetsFrom.id).then(res => {
+                if (this.assetsForm.id) {
+                    this.$api.assetsForm.doRecall(this.assetsForm.id).then(res => {
                         if (res.code === 200 && res.data) {
                             this.$notify({
                                 title: '成功',
@@ -857,8 +866,8 @@ export default {
         // 改变客户类型时进行值重置的操作
         changeCustomerType(val) {
             // 清空联系人下拉列表
-            this.assetsFrom.clienteleContactId = null;
-            this.assetsFrom.clienteleSubId = null;
+            this.assetsForm.clienteleContactId = null;
+            this.assetsForm.clienteleSubId = null;
             this.customerContract = [];
             if (val === "企业") {
                 this.getCustomerCompany(0);
@@ -891,31 +900,31 @@ export default {
         // 获取二级客户信息(业务来源)
         findSubClientele(val) {
             if (val === 0) {
-                if (this.assetsFrom.clienteleId) {
+                if (this.assetsForm.clienteleId) {
                     let simpleAll = new Object();
                     simpleAll.terminal = val;
-                    simpleAll.parentId = this.assetsFrom.clienteleId;
+                    simpleAll.parentId = this.assetsForm.clienteleId;
                     this.$api.customerCompany.simpleAll(simpleAll).then(res => {
                         if (res.code === 200) {
                             this.subCustomerCompany = res.data;
-                            if (this.assetsFrom.clienteleSubId) {
-                                this.assetsFrom.clienteleSubId = null
+                            if (this.assetsForm.clienteleSubId) {
+                                this.assetsForm.clienteleSubId = null
                             }
-                            if (this.assetsFrom.clienteleContactId) {
-                                this.assetsFrom.clienteleContactId = null
+                            if (this.assetsForm.clienteleContactId) {
+                                this.assetsForm.clienteleContactId = null
                                 this.customerContract = [];
                             }
                         }
                     })
                 }
             } else {
-                if (this.assetsFrom.terminalClienteleId) {
+                if (this.assetsForm.terminalClienteleId) {
                     let simpleAll = new Object();
                     simpleAll.terminal = val;
-                    simpleAll.ccId = this.assetsFrom.terminalClienteleId;
-                    this.$api.customerCompany.detail(this.assetsFrom.terminalClienteleId).then(res => {
+                    simpleAll.ccId = this.assetsForm.terminalClienteleId;
+                    this.$api.customerCompany.detail(this.assetsForm.terminalClienteleId).then(res => {
                         if (res.code === 200) {
-                            this.assetsFrom.tmobile = res.data.phone;
+                            this.assetsForm.tmobile = res.data.phone;
                         }
                     })
                 }
@@ -923,19 +932,19 @@ export default {
         },
         // 获取客户联系人列表
         getCustomerContract(val) {
-            // if (this.assetsFrom.clienteleSubId) {
+            // if (this.assetsForm.clienteleSubId) {
             let simpleAll = new Object();
             simpleAll.terminal = 0;
             if (val === 1) {
                 simpleAll.ccId = val;
             } else {
-                simpleAll.ccId = this.assetsFrom.clienteleSubId;
+                simpleAll.ccId = this.assetsForm.clienteleSubId;
             }
             this.$api.customerLinkman.simpleAll(simpleAll).then(res => {
                 if (res.code === 200) {
                     this.customerContract = res.data;
-                    if (this.assetsFrom.clienteleContactId) {
-                        this.assetsFrom.clienteleContactId = null
+                    if (this.assetsForm.clienteleContactId) {
+                        this.assetsForm.clienteleContactId = null
                     }
                 }
             })
@@ -944,17 +953,17 @@ export default {
         // 打开新建客户联系人弹窗
         createLinkman(val) {
             // 打开前判断是否已经选择客户信息
-            if (this.assetsFrom.clienteleType === "个人" || this.assetsFrom.clienteleType != null && this.assetsFrom.clienteleId != null && this.assetsFrom.clienteleSubId != null) {
+            if (this.assetsForm.clienteleType === "个人" || this.assetsForm.clienteleType != null && this.assetsForm.clienteleId != null && this.assetsForm.clienteleSubId != null) {
                 this.createLinkmanVisible = true;
-                this.linkmanFrom.terminal = val;
-                this.linkmanFrom.clienteleType = this.assetsFrom.clienteleType;
-                this.linkmanFrom.clienteleId = this.assetsFrom.clienteleId;
-                this.linkmanFrom.clienteleSubId = this.assetsFrom.clienteleSubId;
-                if (this.assetsFrom.clienteleType === '企业') {
-                    this.linkmanFrom.ccId = this.assetsFrom.clienteleSubId
+                this.linkmanForm.terminal = val;
+                this.linkmanForm.clienteleType = this.assetsForm.clienteleType;
+                this.linkmanForm.clienteleId = this.assetsForm.clienteleId;
+                this.linkmanForm.clienteleSubId = this.assetsForm.clienteleSubId;
+                if (this.assetsForm.clienteleType === '企业') {
+                    this.linkmanForm.ccId = this.assetsForm.clienteleSubId
                 } else {
-                    this.assetsFrom.clienteleSubId = 1;
-                    this.linkmanFrom.ccId = this.assetsFrom.clienteleSubId;
+                    this.assetsForm.clienteleSubId = 1;
+                    this.linkmanForm.ccId = this.assetsForm.clienteleSubId;
                 }
             } else {
                 this.$notify({
@@ -968,9 +977,9 @@ export default {
         },
         // 保存客户联系人信息
         saveLinkman() {
-            this.$refs.linkmanFrom.validate(valid => {
+            this.$refs.linkmanForm.validate(valid => {
                 if (valid) {
-                    this.$api.customerLinkman.add(this.linkmanFrom).then(res => {
+                    this.$api.customerLinkman.add(this.linkmanForm).then(res => {
                         if (res.code === 200) {
                             this.$notify({
                                 title: '成功',
@@ -981,7 +990,7 @@ export default {
                         }
                         this.getCustomerContract();
                         setTimeout(() => {
-                            this.assetsFrom.clienteleContactId = this.customerContract[0].id;
+                            this.assetsForm.clienteleContactId = this.customerContract[0].id;
                             this.getContactInfo();
                         }, 2000)
                         this.createLinkmanVisible = false;
@@ -991,8 +1000,8 @@ export default {
         },
         // 获取联系信息
         getContactInfo() {
-            if (this.assetsFrom.clienteleContactId) {
-                this.$api.customerLinkman.detail(this.assetsFrom.clienteleContactId).then(res => {
+            if (this.assetsForm.clienteleContactId) {
+                this.$api.customerLinkman.detail(this.assetsForm.clienteleContactId).then(res => {
                     if (res.code === 200) {
                         console.log(res.data)
                         this.linkmanInfo = res.data;
@@ -1002,10 +1011,10 @@ export default {
         },
         // 获取终端联系人信息
         getTcontactInfo() {
-            if (this.assetsFrom.terminalClienteleContactId) {
-                this.$api.customerLinkman.detail(this.assetsFrom.terminalClienteleContactId).then(res => {
+            if (this.assetsForm.terminalClienteleContactId) {
+                this.$api.customerLinkman.detail(this.assetsForm.terminalClienteleContactId).then(res => {
                     if (res.code === 200) {
-                        this.assetsFrom.tmobile = res.data.mobile;
+                        this.assetsForm.tmobile = res.data.mobile;
                     }
                 })
             }
@@ -1013,9 +1022,9 @@ export default {
         // 打开新增终端联系人弹窗
         createTlinkman() {
             this.createTlinkmanVisible = true;
-            this.tLinkmanFrom.terminal = 1;
-            this.assetsFrom.clienteleSubId = 1;
-            this.tLinkmanFrom.ccId = this.assetsFrom.clienteleSubId;
+            this.tLinkmanForm.terminal = 1;
+            this.assetsForm.clienteleSubId = 1;
+            this.tLinkmanForm.ccId = this.assetsForm.clienteleSubId;
         },
         // 打开新增终端客户弹窗
         createTerminalClient() {
@@ -1023,9 +1032,9 @@ export default {
         },
         // 保存终端联系信息
         saveClient() {
-            this.$refs.terminalClientFrom.validate(valid => {
+            this.$refs.terminalClientForm.validate(valid => {
                 if (valid) {
-                    this.$api.customerCompany.add(this.terminalClientFrom).then(res => {
+                    this.$api.customerCompany.add(this.terminalClientForm).then(res => {
                         if (res.code === 200) {
                             this.$notify({
                                 title: '成功',
@@ -1036,7 +1045,7 @@ export default {
                         }
                         this.getCustomerCompany(1);
                         setTimeout(() => {
-                            this.assetsFrom.terminalClienteleId = this.tCustomerCompany[0].id;
+                            this.assetsForm.terminalClienteleId = this.tCustomerCompany[0].id;
                             this.findSubClientele(1);
                         }, 2000)
                         this.createTerminalClientVisible = false;
@@ -1046,9 +1055,9 @@ export default {
         },
         // 新增终端联系人
         saveTlinkman() {
-            this.$refs.tLinkmanFrom.validate(valid => {
+            this.$refs.tLinkmanForm.validate(valid => {
                 if (valid) {
-                    this.$api.customerLinkman.add(this.tLinkmanFrom).then(res => {
+                    this.$api.customerLinkman.add(this.tLinkmanForm).then(res => {
                         if (res.code === 200) {
                             this.$notify({
                                 title: '成功',
@@ -1066,14 +1075,68 @@ export default {
                             }
                         })
                         setTimeout(() => {
-                            this.assetsFrom.terminalClienteleContactId = this.tCustomerContract[0].id;
+                            this.assetsForm.terminalClienteleContactId = this.tCustomerContract[0].id;
                             this.getTcontactInfo();
                         }, 2000)
                         this.createTlinkmanVisible = false;
                     })
                 }
             })
+        },
+        // 根据id查询资产订单信息
+        getAssetsDetailById(id) {
+            this.$api.assets.getAssetsDetailById(id).then(res => {
+                if (res.code === 200) {
+                    this.assetsForm.clientManagerId = this.$store.getters.userInfo.id;
+                    this.assetsForm.clientManager = this.$store.getters.userInfo.name;
+                    this.assetsForm.name = res.data.name;
+                    this.assetsForm.departmentId = res.data.departmentId;
+                    this.assetsForm.assetsBusinessGener = res.data.assetsBusinessGener;
+                    this.assetsForm.entrustAgain = res.data.entrustAgain;
+                    this.assetsForm.security = res.data.security;
+                    this.assetsForm.significantAssetsReorganization = res.data.significantAssetsReorganization;
+                    this.assetsForm.stateAssets = res.data.stateAssets;
+                    this.assetsForm.foreignAssetsInvolved = res.data.foreignAssetsInvolved;
+                    this.assetsForm.dispenseBenefit = res.data.dispenseBenefit;
+                    this.assetsForm.remark = res.data.remark;
+                    this.initCustomerSelect(this.assetsForm.clienteleType);
+                    this.getPrincipalByAllotDepartment();
+                    this.getAllUser();
+                    this.getCustomerCompany(1);
+                }
+            })
+            console.log(this.assetsForm);
+        },
+        initCustomerSelect(val) {
+            if (val === "企业") {
+                this.getCustomerCompany(0);
+                this.getCustomerContract();
+                this.itemHideStatus = true;
+            } else {
+                this.getCustomerContract(1);
+                this.itemHideStatus = false;
+            }
+        },
+        // 根据部门id获取项目负责人列表
+        getPrincipalByAllotDepartment() {
+            let departmentId = this.assetsForm.departmentId;
+            if (departmentId) {
+                this.$api.user.usersByDepartmentId(departmentId).then(res => {
+                    if (res.code === 200) {
+                        this.principals = res.data;
+                    }
+                })
+            }
+        },
+        // 获取用户下拉列表
+        getAllUser() {
+            this.$api.user.simpleAll().then(res => {
+                if (res.code === 200) {
+                    this.allUsers = res.data;
+                }
+            })
         }
+
     }
 }
 </script>
@@ -1106,4 +1169,5 @@ export default {
 
 /deep/.doWarehouseClass {
     border-radius: 10px;
-}</style>
+}
+</style>

src/views/assets/doneList.vue

@@ -25,17 +25,17 @@
                         <span>{{ row.orderId }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="项目名称" align="center" width="200">
+                <el-table-column label="项目名称" align="center" width="300">
                     <template slot-scope="{row}">
                         <span>{{ row.assetsName }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="意见书号" align="center" width="200">
+                <el-table-column label="意见书号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.statementtNo }}</span>
+                        <span>{{ row.statementNo }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="报告号" align="center" width="200">
+                <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
                         <span>{{ row.reportNo }}</span>
                     </template>
@@ -45,6 +45,16 @@
                         <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>
@@ -60,27 +70,18 @@
                         <span>{{ row.finishTime }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="处理时长" align="center" width="150">
+                <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}">
-                        <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">
+                <el-table-column label="节点完成状态" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.instanceState }}</span>
+                        <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="80" fixed="right">
+                <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>

src/views/assets/myOrderList.vue

@@ -305,7 +305,10 @@ export default {
                 path: "/assets/orderDetail",
                 query: {
                     row: JSON.stringify(row),
-                    back: '/assets/allList'
+                    back: '/assets/allList',
+                    couldEdit: false,
+                    couldBack: false,
+                    disabledStatus: true
                 }
             })
         },