Jelajahi Sumber

1.优化资产下单-新增终端客户信息功能
2.优化新增资产评估对象
3.修复资产添加评估对象超过两个以上时重置表单失效
4.修复非撰写报告节点时编辑与查看报告时不显示签字人
5.修复修改流程节点时,节点名称不更新
6.资产业务页面布局优化

GouGengquan 1 tahun lalu
induk
melakukan
7fd14fa5fc

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

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

+ 57 - 57
src/views/assets/addAssetsOrder.vue

@@ -18,25 +18,25 @@
                                 </div>
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="客户经理:" prop="clientManager" label-width="140px"
+                                        <el-form-item label="客户经理:" prop="clientManager" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-input :value="assetsForm.clientManager" class="filter-item" readonly
-                                                disabled style=" width: 225px" />
+                                                disabled style=" width: 100%" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="分单类型:" prop="clientManager" label-width="140px"
+                                        <el-form-item label="分单类型:" prop="clientManager" label-width="170px"
                                             class="postInfo-container-item">
-                                            <el-select v-model="assetsForm.allotType">
+                                            <el-select v-model="assetsForm.allotType" style=" width: 100%">
                                                 <el-option label="指派" value="指派"></el-option>
                                                 <el-option label="轮单" value="轮单"></el-option>
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
                                     <el-col v-if="assetsForm.allotType === '指派'" :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="接单部门:" prop="departmentId" label-width="140px"
+                                        <el-form-item label="接单部门:" prop="departmentId" label-width="170px"
                                             class="postInfo-container-item">
-                                            <el-select v-model="assetsForm.departmentId">
+                                            <el-select v-model="assetsForm.departmentId" style=" width: 100%">
                                                 <el-option v-for="(d, id) in allotDepartment" :label="d.name"
                                                     :value="d.id"></el-option>
                                             </el-select>
@@ -45,7 +45,7 @@
                                 </el-row>
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="24" :lg="24" :span="24">
-                                        <el-form-item prop="name" label-width="140px" class="postInfo-container-item"
+                                        <el-form-item prop="name" label-width="170px" class="postInfo-container-item"
                                             label="项目名称:">
                                             <el-input v-model="assetsForm.name" class="filter-item" />
                                         </el-form-item>
@@ -53,17 +53,17 @@
                                 </el-row>
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="业务类型:" prop="assetsBusinessGener" label-width="140px"
+                                        <el-form-item label="业务类型:" prop="assetsBusinessGener" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-select v-model="assetsForm.assetsBusinessGener" filterable
-                                                placeholder="业务类型">
+                                                placeholder="业务类型" style=" width: 100%">
                                                 <el-option v-for="(s, value) in assetsBusinessGeners" :label="s.label"
                                                     :value="s.value"></el-option>
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="客户再次委托:" prop="entrustAgain" label-width="140px"
+                                        <el-form-item label="客户再次委托:" prop="entrustAgain" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-radio v-model="assetsForm.entrustAgain" :label="false" border
                                                 size="medium">否</el-radio>
@@ -74,28 +74,28 @@
                                 </el-row>
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="客户类型:" prop="clienteleType" label-width="140px"
+                                        <el-form-item label="客户类型:" prop="clienteleType" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-select v-model="assetsForm.clienteleType" placeholder="请选择"
-                                                @change="changeCustomerType(assetsForm.clienteleType)">
+                                                @change="changeCustomerType(assetsForm.clienteleType)" style=" width: 100%">
                                                 <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">
-                                        <el-form-item label="客户名称:" prop="clienteleId" label-width="140px"
+                                        <el-form-item label="客户名称:" prop="clienteleId" label-width="170px"
                                             class="postInfo-container-item" v-if="itemHideStatus">
                                             <el-select v-model="assetsForm.clienteleId" placeholder="请选择(可搜索)"
-                                                @change="findSubClientele(0)" clearable filterable>
+                                                @change="findSubClientele(0)" clearable filterable style=" width: 100%">
                                                 <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">
-                                        <el-form-item label="业务来源:" prop="clienteleSubId" label-width="140px"
-                                            class="postInfo-container-item" v-if="itemHideStatus">
+                                        <el-form-item label="业务来源:" prop="clienteleSubId" label-width="170px"
+                                            class="postInfo-container-item" v-if="itemHideStatus" style=" width: 100%">
                                             <el-select v-model="assetsForm.clienteleSubId" placeholder="请选择(可搜索)"
                                                 @change="getCustomerContract(), assetsForm.clienteleContactId = null"
                                                 clearable filterable>
@@ -107,47 +107,47 @@
                                 </el-row>
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="客户联系人:" prop="clienteleContactId" label-width="140px"
+                                        <el-form-item label="客户联系人:" prop="clienteleContactId" label-width="170px"
                                             class="postInfo-container-item">
                                             <div>
                                                 <el-select v-model="assetsForm.clienteleContactId" placeholder="请选择(可搜索)"
-                                                    clearable filterable @change="getContactInfo">
+                                                    clearable filterable @change="getContactInfo"style=" width: 80%">
                                                     <el-option v-for="(c, id) in customerContract" :label="c.name"
                                                         :value="c.id"></el-option>
                                                 </el-select>
                                                 <el-tooltip class="item" effect="dark" content="没有联系人?点击新增"
                                                     placement="top-end">
-                                                    <span style="margin-left:3%;color:RGB(64,158,255);cursor:pointer"
+                                                    <span style="margin-left:5%;color:RGB(64,158,255);cursor:pointer"
                                                         @click="createLinkman(false)">新增</span>
                                                 </el-tooltip>
                                             </div>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="联系人电话:" prop="mobile" label-width="140px"
+                                        <el-form-item label="联系人电话:" prop="mobile" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-input :value="linkmanInfo.mobile" class="filter-item" readonly disabled
-                                                style=" width: 225px" />
+                                            style=" width: 100%" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="联系人部门:" prop="department" label-width="140px"
+                                        <el-form-item label="联系人部门:" prop="department" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-input :value="linkmanInfo.department" class="filter-item" readonly disabled
-                                                style=" width: 225px" />
+                                            style=" width: 100%" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="联系人职务:" prop="duty" label-width="140px"
+                                        <el-form-item label="联系人职务:" prop="duty" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-input :value="linkmanInfo.duty" class="filter-item" readonly disabled
-                                                style=" width: 225px" />
+                                            style=" width: 100%" />
                                         </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="security" label-width="140px"
+                                        <el-form-item label="是否证券项目:" prop="security" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-radio v-model="assetsForm.security" :label="false" border
                                                 size="medium">否</el-radio>
@@ -165,7 +165,7 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label=" 是否国资项目:" prop="stateAssets" label-width="140px"
+                                        <el-form-item label=" 是否国资项目:" prop="stateAssets" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-radio v-model="assetsForm.stateAssets" :label="false" border
                                                 size="medium">否</el-radio>
@@ -183,7 +183,7 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="是否分配产值:" prop="dispenseBenefit" label-width="140px"
+                                        <el-form-item label="是否分配产值:" prop="dispenseBenefit" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-radio v-model="assetsForm.dispenseBenefit" :label="false" border
                                                 size="medium">否</el-radio>
@@ -193,14 +193,14 @@
                                     </el-col>
                                 </el-row>
                                 <el-row class="row-style">
-                                    <el-col :xs="12" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="委托人:" prop="bailor" label-width="140px"
+                                    <el-col :xs="12" :sm="12" :lg="12" :span="6">
+                                        <el-form-item label="委托人:" prop="bailor" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-input v-model="assetsForm.bailor" class="filter-item" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :xs="12" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="委托联系人:" prop="bailorContactName" label-width="140px"
+                                    <el-col :xs="12" :sm="12" :lg="12" :span="6">
+                                        <el-form-item label="委托联系人:" prop="bailorContactName" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-input v-model="assetsForm.bailorContactName" class="filter-item" />
                                         </el-form-item>
@@ -208,41 +208,41 @@
                                     <el-col :xs="12" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="委托联系人电话:" prop="bailorContactTel" label-width="170px"
                                             class="postInfo-container-item">
-                                            <el-input v-model="assetsForm.bailorContactTel" class="filter-item" />
+                                            <el-input v-model="assetsForm.bailorContactTel" class="filter-item" style=" width: 100%"/>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="12" :sm="8" :lg="6" :span="6">
-                                        <el-form-item label="委托人地址:" prop="bailorAddress" label-width="140px"
+                                        <el-form-item label="委托人地址:" prop="bailorAddress" label-width="170px"
                                             class="postInfo-container-item">
-                                            <el-input v-model="assetsForm.bailorAddress" class="filter-item" />
+                                            <el-input v-model="assetsForm.bailorAddress" class="filter-item" style=" width: 100%"/>
                                         </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="terminalClienteleType" label-width="140px"
+                                        <el-form-item label="终端客户类型:" prop="terminalClienteleType" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-select @change="changeTCustomerType(assetsForm.terminalClienteleType)"
-                                                v-model="assetsForm.terminalClienteleType" placeholder="请选择">
+                                                v-model="assetsForm.terminalClienteleType" placeholder="请选择" style=" width: 100%">
                                                 <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"
+                                    <el-col :xs="24" :sm="12" :lg="12" :span="6"
                                         v-if="assetsForm.terminalClienteleType === '企业'">
-                                        <el-form-item label="终端客户名称:" prop="terminalClienteleId" label-width="140px"
+                                        <el-form-item label="终端客户名称:" prop="terminalClienteleId" label-width="170px"
                                             class="postInfo-container-item">
                                             <div v-if="couldEdit">
                                                 <el-select v-model="assetsForm.terminalClienteleId" placeholder="请选择(可搜索)"
                                                     @change="getTerminalContactInfo(1), assetsForm.terminalClienteleContactId = null"
-                                                    clearable filterable style="width:90%">
+                                                    clearable filterable style="width:80%">
                                                     <el-option v-for="(c, id) in tCustomerCompany" :label="c.name"
                                                         :value="c.id"></el-option>
                                                 </el-select>
                                                 <el-tooltip class="item" effect="dark" content="没有终端客户?点击新增"
                                                     placement="top-end">
-                                                    <span style="margin-left:3%;color:RGB(64,158,255);cursor:pointer"
+                                                    <span style="margin-left:5%;color:RGB(64,158,255);cursor:pointer"
                                                         @click="createTerminalClient()">新增</span>
                                                 </el-tooltip>
                                             </div>
@@ -252,33 +252,33 @@
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="终端联系人:" v-if="assetsForm.terminalClienteleType"
-                                            prop="terminalClienteleContactId" label-width="140px"
+                                            prop="terminalClienteleContactId" label-width="170px"
                                             class="postInfo-container-item">
                                             <div v-if="couldEdit">
                                                 <el-select v-model="assetsForm.terminalClienteleContactId"
                                                     placeholder="请选择(可搜索)" clearable filterable @change="getTcontactInfo()"
-                                                    style="width:90%">
+                                                    style=" width: 80%">
                                                     <el-option v-for="(c, id) in tCustomerContract" :label="c.name"
-                                                        :value="c.id"></el-option>
+                                                        :value="c.id" ></el-option>
                                                 </el-select>
                                                 <el-tooltip class="item" effect="dark" content="没有联系人?点击新增"
                                                     placement="top-end">
-                                                    <span style="margin-left:3%;color:RGB(64,158,255);cursor:pointer"
+                                                    <span style="margin-left:5%;color:RGB(64,158,255);cursor:pointer"
                                                         @click="createTlinkman()">新增</span>
                                                 </el-tooltip>
                                             </div>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :xs="24" :sm="12" :lg="4" :span="6">
+                                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="终端联系电话:" v-if="assetsForm.terminalClienteleType" prop="tmobile"
-                                            label-width="140px" class="postInfo-container-item">
-                                            <el-input :value="assetsForm.tmobile" class="filter-item" readonly disabled />
+                                            label-width="170px" class="postInfo-container-item">
+                                            <el-input :value="assetsForm.tmobile" class="filter-item" readonly disabled style=" width: 100%"/>
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
                                 <el-row class="row-style">
                                     <el-col :xs="24" :sm="12" :lg="23" :span="12">
-                                        <el-form-item label="备注:" prop="remark" label-width="140px"
+                                        <el-form-item label="备注:" prop="remark" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-input v-model="assetsForm.remark" :autosize="{ minRows: 4, maxRows: 4 }"
                                                 class="filter-item" type="textarea" />
@@ -590,9 +590,9 @@ export default {
                 dispenseBenefit: [
                     { required: true, message: '请选择是否是否分配产值', trigger: 'change' }
                 ],
-                terminalClienteleType: [
-                    { required: true, message: '请选择终端客户类型', trigger: 'change' }
-                ],
+                // terminalClienteleType: [
+                //     { required: true, message: '请选择终端客户类型', trigger: 'change' }
+                // ],
                 terminalClienteleId: [
                     { required: true, message: '终端客户名称不能为空', trigger: 'blur' }
                 ],
@@ -1138,11 +1138,11 @@ export default {
                                 duration: 2000
                             });
                         }
-                        this.getCustomerCompany(1);
-                        setTimeout(() => {
-                            this.assetsForm.terminalClienteleId = this.tCustomerCompany[0].id;
-                            this.findSubClientele(1);
-                        }, 2000)
+                        // this.getCustomerCompany(1);
+                        // setTimeout(() => {
+                        //     this.assetsForm.terminalClienteleId = this.tCustomerCompany[0].id;
+                        //     this.findSubClientele(1);
+                        // }, 2000)
                         this.createTerminalClientVisible = false;
                     })
                 }

+ 149 - 113
src/views/assets/orderDetail.vue

@@ -62,14 +62,14 @@
                 </div>
                 <el-row class="row-style">
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="客户经理:" prop="clientManager" label-width="140px" class="postInfo-container-item">
+                    <el-form-item label="客户经理:" prop="clientManager" label-width="170px" class="postInfo-container-item">
                       <el-input :value="assetsForm.clientManagerName" class="filter-item" readonly disabled
-                        style=" width: 225px" />
+                        style=" width: 100%" />
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="4" :span="6">
-                    <el-form-item label="接单部门:" prop="departmentId" label-width="140px" class="postInfo-container-item">
-                      <el-select v-model="assetsForm.departmentId" readonly disabled>
+                    <el-form-item label="接单部门:" prop="departmentId" label-width="170px" class="postInfo-container-item">
+                      <el-select v-model="assetsForm.departmentId" readonly disabled style=" width: 100%">
                         <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"
                           :key="d.id"></el-option>
                       </el-select>
@@ -78,23 +78,24 @@
                 </el-row>
                 <el-row class="row-style">
                   <el-col :xs="24" :sm="24" :lg="24" :span="24">
-                    <el-form-item prop="name" label-width="140px" class="postInfo-container-item" label="项目名称:">
+                    <el-form-item prop="name" label-width="170px" class="postInfo-container-item" label="项目名称:">
                       <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" label-width="140px"
+                    <el-form-item label="业务类型:" prop="assetsBusinessGener" label-width="170px"
                       class="postInfo-container-item">
-                      <el-select v-model="assetsForm.assetsBusinessGener" filterable placeholder="业务类型">
+                      <el-select v-model="assetsForm.assetsBusinessGener" filterable placeholder="业务类型"
+                        style=" width: 100%">
                         <el-option v-for="(s, index) in assetsBusinessGeners" :label="s.label" :value="s.value"
                           :key="s.id"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="客户再次委托:" prop="entrustAgain" label-width="140px" class="postInfo-container-item">
+                    <el-form-item label="客户再次委托:" prop="entrustAgain" label-width="170px" class="postInfo-container-item">
                       <el-radio v-model="assetsForm.entrustAgain" :label="false" border size="medium">否</el-radio>
                       <el-radio v-model="assetsForm.entrustAgain" :label="true" border size="medium">是</el-radio>
                     </el-form-item>
@@ -102,29 +103,29 @@
                 </el-row>
                 <el-row class="row-style">
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="客户类型:" prop="clienteleType" label-width="140px" class="postInfo-container-item">
+                    <el-form-item label="客户类型:" prop="clienteleType" label-width="170px" class="postInfo-container-item">
                       <el-select v-model="assetsForm.clienteleType" placeholder="请选择"
-                        @change="changeCustomerType(assetsForm.clienteleType)" readonly disabled>
+                        @change="changeCustomerType(assetsForm.clienteleType)" readonly disabled style=" width: 100%">
                         <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">
-                    <el-form-item label="客户名称:" prop="clienteleId" label-width="140px" class="postInfo-container-item"
+                    <el-form-item label="客户名称:" prop="clienteleId" label-width="170px" class="postInfo-container-item"
                       v-if="itemHideStatus">
                       <el-select v-model="assetsForm.clienteleId" placeholder="请选择(可搜索)" @change="findSubClientele(0)"
-                        clearable filterable readonly disabled>
+                        clearable filterable readonly disabled style=" width: 100%">
                         <el-option v-for="(c, id) in customerCompany" :label="c.name" :value="c.id"
                           :key="c.id"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="业务来源:" prop="clienteleSubId" label-width="140px" class="postInfo-container-item"
+                    <el-form-item label="业务来源:" prop="clienteleSubId" label-width="170px" class="postInfo-container-item"
                       v-if="itemHideStatus">
                       <el-select v-model="assetsForm.clienteleSubId" placeholder="请选择(可搜索)" @change="getCustomerContract"
-                        clearable filterable readonly disabled>
+                        clearable filterable readonly disabled style=" width: 100%">
                         <el-option v-for="(s, id) in subCustomerCompany" :label="s.name" :value="s.id"
                           :key="s.id"></el-option>
                       </el-select>
@@ -133,11 +134,11 @@
                 </el-row>
                 <el-row class="row-style">
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="客户联系人:" prop="clienteleContactId" label-width="140px"
+                    <el-form-item label="客户联系人:" prop="clienteleContactId" label-width="170px"
                       class="postInfo-container-item">
                       <div>
                         <el-select v-model="assetsForm.clienteleContactId" placeholder="请选择(可搜索)" clearable filterable
-                          @change="getContactInfo();" readonly disabled>
+                          @change="getContactInfo();" readonly disabled style=" width: 100%">
                           <!-- <el-option v-for="(c, id) in customerContract" :label="c.name" :value="c.id"
                             :key="c.id"></el-option> -->
                           <el-option :label="linkmanInfo.name" :value="linkmanInfo.id" :key="linkmanInfo.id"></el-option>
@@ -150,27 +151,27 @@
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="联系人电话:" prop="mobile" label-width="140px" class="postInfo-container-item">
+                    <el-form-item label="联系人电话:" prop="mobile" label-width="170px" class="postInfo-container-item">
                       <el-input :value="assetsForm.linkmanMobile" class="filter-item" readonly disabled
-                        style=" width: 225px" />
+                        style=" width: 100%" />
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="联系人部门:" prop="department" label-width="140px" class="postInfo-container-item">
+                    <el-form-item label="联系人部门:" prop="department" label-width="170px" class="postInfo-container-item">
                       <el-input :value="assetsForm.linkmanDepartment" class="filter-item" readonly disabled
-                        style=" width: 225px" />
+                        style=" width: 100%" />
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="联系人职务:" prop="duty" label-width="140px" class="postInfo-container-item">
+                    <el-form-item label="联系人职务:" prop="duty" label-width="170px" class="postInfo-container-item">
                       <el-input :value="assetsForm.linkmanDuty" class="filter-item" readonly disabled
-                        style=" width: 225px" />
+                        style=" width: 100%" />
                     </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="security" label-width="140px" class="postInfo-container-item">
+                    <el-form-item label="是否证券项目:" prop="security" label-width="170px" class="postInfo-container-item">
                       <el-radio v-model="assetsForm.security" :label="false" border size="medium">否</el-radio>
                       <el-radio v-model="assetsForm.security" :label="true" border size="medium">是</el-radio>
                     </el-form-item>
@@ -185,7 +186,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label=" 是否国资项目:" prop="stateAssets" label-width="140px" class="postInfo-container-item">
+                    <el-form-item label=" 是否国资项目:" prop="stateAssets" label-width="170px" class="postInfo-container-item">
                       <el-radio v-model="assetsForm.stateAssets" :label="false" border size="medium">否</el-radio>
                       <el-radio v-model="assetsForm.stateAssets" :label="true" border size="medium">是</el-radio>
                     </el-form-item>
@@ -199,7 +200,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="是否分配产值:" prop="dispenseBenefit" label-width="140px"
+                    <el-form-item label="是否分配产值:" prop="dispenseBenefit" label-width="170px"
                       class="postInfo-container-item">
                       <el-radio v-model="assetsForm.dispenseBenefit" :label="false" border size="medium">否</el-radio>
                       <el-radio v-model="assetsForm.dispenseBenefit" :label="true" border size="medium">是</el-radio>
@@ -207,13 +208,13 @@
                   </el-col>
                 </el-row>
                 <el-row class="row-style">
-                  <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="委托人:" prop="bailor" label-width="140px" class="postInfo-container-item">
+                  <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                    <el-form-item label="委托人:" prop="bailor" label-width="170px" class="postInfo-container-item">
                       <el-input v-model="assetsForm.bailor" class="filter-item" />
                     </el-form-item>
                   </el-col>
-                  <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="委托联系人:" prop="bailorContactName" label-width="140px"
+                  <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                    <el-form-item label="委托联系人:" prop="bailorContactName" label-width="170px"
                       class="postInfo-container-item">
                       <el-input v-model="assetsForm.bailorContactName" class="filter-item" />
                     </el-form-item>
@@ -221,27 +222,28 @@
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
                     <el-form-item label="委托人联系人电话:" prop="bailorContactTel" label-width="170px"
                       class="postInfo-container-item">
-                      <el-input v-model="assetsForm.bailorContactTel" class="filter-item" />
+                      <el-input v-model="assetsForm.bailorContactTel" class="filter-item" style=" width: 100%" />
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="委托人地址:" prop="bailorAddress" label-width="140px" class="postInfo-container-item">
-                      <el-input v-model="assetsForm.bailorAddress" class="filter-item" />
+                    <el-form-item label="委托人地址:" prop="bailorAddress" label-width="170px" class="postInfo-container-item">
+                      <el-input v-model="assetsForm.bailorAddress" class="filter-item" style=" width: 100%" />
                     </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="terminalClienteleType" label-width="140px"
+                    <el-form-item label="终端客户类型:" prop="terminalClienteleType" label-width="170px"
                       class="postInfo-container-item">
-                      <el-select v-model="assetsForm.terminalClienteleType" placeholder="请选择" readonly disabled>
+                      <el-select v-model="assetsForm.terminalClienteleType" placeholder="请选择" readonly disabled
+                        style=" width: 100%">
                         <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="assetsForm.terminalClienteleType === '企业'">
-                    <el-form-item label="终端客户名称:" prop="terminalClienteleId" label-width="140px"
+                  <el-col :xs="24" :sm="12" :lg="12" :span="6" v-if="assetsForm.terminalClienteleType === '企业'">
+                    <el-form-item label="终端客户名称:" prop="terminalClienteleId" label-width="170px"
                       class="postInfo-container-item">
                       <!-- <div v-if="couldEdit"> -->
                       <el-select v-model="assetsForm.terminalClienteleId" placeholder="请选择(可搜索)"
@@ -263,10 +265,10 @@
                 </el-row>
                 <el-row class="row-style">
                   <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="assetsForm.terminalClienteleType">
-                    <el-form-item label="终端联系人:" prop="terminalClienteleContactId" label-width="140px"
+                    <el-form-item label="终端联系人:" prop="terminalClienteleContactId" label-width="170px"
                       class="postInfo-container-item">
                       <el-select v-model="assetsForm.terminalClienteleContactId" placeholder="请选择(可搜索)" clearable
-                        filterable readonly disabled style="width:90%">
+                        filterable readonly disabled style=" width: 100%">
                         <!-- <el-option v-for="(c, id) in tCustomerContract" :label="c.name" :value="c.id"
                             :key="c.id"></el-option> -->
                         <el-option :label="tLinkmanInfo.name" :value="tLinkmanInfo.id" :key="tLinkmanInfo.id"></el-option>
@@ -277,16 +279,16 @@
                         </el-tooltip> -->
                     </el-form-item>
                   </el-col>
-                  <el-col :xs="24" :sm="12" :lg="4" :span="6">
-                    <el-form-item label="终端联系电话:" prop="clienteleType" label-width="140px"
+                  <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="assetsForm.terminalClienteleType">
+                    <el-form-item label="终端联系电话:" prop="clienteleType" label-width="170px"
                       class="postInfo-container-item">
-                      <el-input :value="assetsForm.tmobile" class="filter-item" readonly disabled />
+                      <el-input :value="assetsForm.tmobile" class="filter-item" readonly disabled style=" width: 100%" />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row class="row-style">
                   <el-col :xs="24" :sm="12" :lg="23" :span="12">
-                    <el-form-item label="备注:" prop="remark" label-width="140px" class="postInfo-container-item">
+                    <el-form-item label="备注:" prop="remark" label-width="170px" class="postInfo-container-item">
                       <el-input v-model="assetsForm.remark" :autosize="{ minRows: 4, maxRows: 4 }" class="filter-item"
                         type="textarea" />
                     </el-form-item>
@@ -411,11 +413,21 @@
               :header-row-style="{ color: '#333333' }" border takeNumberItems style="width: 100%; margin-top:20px">
               <el-table-column type="selection" width="55" :selectable="selectable">
               </el-table-column>
-              <el-table-column prop="id" label="id" width="80" align="center">
-              </el-table-column>
+              <!-- <el-table-column prop="id" label="id" width="80" align="center">
+              </el-table-column> -->
               <el-table-column width="220" prop="statementNo" label="意见书号" align="center" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <el-tag type='danger'>
+                    {{ scope.row.statementNo == null ? '未取号' : scope.row.statementNo }}
+                  </el-tag>
+                </template>
               </el-table-column>
               <el-table-column width="220" prop="reportNo" label="报告号" align="center" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <el-tag type='danger'>
+                    {{ scope.row.reportNo == null ? '未取号' : scope.row.reportNo }}
+                  </el-tag>
+                </template>
               </el-table-column>
               <el-table-column prop="statementCreateProductionDate" label="意见书出具状态" align="center" show-overflow-tooltip>
                 <template slot-scope="{row}">
@@ -731,7 +743,9 @@
                     @click="openWriteProductionDialog(true, 'detail'), getAssetsProductionDetail(scope.row.id)">
                     查看
                   </el-button>
-                  <el-button v-if="currentNode.nodeCode === 'REVIEW_STATEMENT'" type="text" size="small"
+                  <el-button
+                    v-if="currentNode.nodeCode === 'REVIEW_STATEMENT' || (currentNode.nodeCode === 'GENERATE_STATEMENT' && scope.row.productionType === 'STATEMENT') || (currentNode.nodeCode === 'WRITE_REPORT' && scope.row.productionType !== 'STATEMENT')"
+                    type="text" size="small"
                     @click="openWriteProductionDialog(false, 'edit'), getAssetsProductionDetail(scope.row.id)">
                     编辑
                   </el-button>
@@ -851,8 +865,8 @@
           <el-divider content-position="left">【资产】评估对象</el-divider>
           <el-row class="row-style">
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
-              <el-form-item label="评估目的:" prop="evaluationPurposeId" label-width="120px" class="postInfo-container-item">
-                <el-select v-model="targetForm.evaluationPurposeId">
+              <el-form-item label="评估目的:" prop="evaluationPurposeId" label-width="200px" class="postInfo-container-item">
+                <el-select v-model="targetForm.evaluationPurposeId" style="width: 100%">
                   <el-option v-for="(p, id) in assetsEvaluationTargetPurpose" :label="p.purposeName"
                     :value="p.id"></el-option>
                 </el-select>
@@ -860,18 +874,19 @@
             </el-col>
           </el-row>
           <el-row class="row-style">
-            <el-col :xs="24" :sm="12" :lg="12" :span="6" style="width: 350px;">
-              <el-form-item label="评估对象:" prop="evaluationTypeId" label-width="120px" class="postInfo-container-item">
+            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+              <el-form-item label="评估对象:" prop="evaluationTypeId" label-width="200px" class="postInfo-container-item">
                 <el-select v-model="targetForm.evaluationTypeId"
-                  @change="getTypeList(targetForm.evaluationTypeId, 2), targetForm.evaluationTypeSecId = null">
+                  @change="getTypeList(targetForm.evaluationTypeId, 2), targetForm.evaluationTypeSecId = null"
+                  style="width: 100%">
                   <el-option v-for="(t, id) in assetsEvaluationTargetType" :label="t.typeName" :value="t.id"
                     :key="t.id"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="4" :sm="12" :lg="12" :span="6">
+            <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item prop="evaluationTypeSecId" label-width="10px" class="postInfo-container-item">
-                <el-select v-model="targetForm.evaluationTypeSecId">
+                <el-select v-model="targetForm.evaluationTypeSecId" style="width: 70%">
                   <el-option v-for="(t, id) in assetsSecEvaluationTargetType" :label="t.typeName" :value="t.id"
                     :key="t.id"></el-option>
                 </el-select>
@@ -879,40 +894,40 @@
             </el-col>
           </el-row>
           <el-row class="row-style">
-            <el-col :xs="24" :sm="12" :lg="12" :span="6" style="width: 345px;">
-              <el-form-item label="产权持有人:" prop="theHolder" label-width="120px" class="postInfo-container-item">
-                <el-input v-model="targetForm.theHolder" class="filter-item" />
+            <el-col :xs="24" :sm="12" :lg="12" :span="6"">
+                <el-form-item label=" 产权持有人:" prop="theHolder" label-width="200px" class="postInfo-container-item">
+              <el-input v-model="targetForm.theHolder" class="filter-item" style="width: 100%" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row class="row-style">
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
-              <el-form-item label="价值类型:" prop="assetsValueId" label-width="120px" class="postInfo-container-item">
-                <el-select v-model="targetForm.assetsValueId">
+              <el-form-item label="价值类型:" prop="assetsValueId" label-width="200px" class="postInfo-container-item">
+                <el-select v-model="targetForm.assetsValueId" style="width: 100%">
                   <el-option v-for="(t, id) in assetsValueType" :label="t.typeName" :value="t.id" :key="t.id"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row class="row-style">
-            <el-col :xs="24" :sm="12" :lg="12" :span="6" style="width: 400px;">
-              <el-form-item label="项目负责人:" label-width="120px" class="postInfo-container-item">
-                <el-select v-model="targetForm.principalId" placeholder="请选择" readonly disabled>
+            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+              <el-form-item label="项目负责人:" label-width="200px" class="postInfo-container-item">
+                <el-select v-model="targetForm.principalId" placeholder="请选择" readonly disabled style="width: 100%">
                   <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id" :key="u.id"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
-              <el-form-item label="实勘人:" prop="siteIds" label-width="120px" class="postInfo-container-item">
-                <el-select v-model="targetForm.siteIds" placeholder="请选择" multiple>
+              <el-form-item label="实勘人:" prop="siteIds" label-width="200px" class="postInfo-container-item">
+                <el-select v-model="targetForm.siteIds" placeholder="请选择" multiple style="width: 100%">
                   <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id" :key="u.id"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row class="row-style">
-            <el-col :xs="24" :sm="12" :lg="7" :span="6">
-              <el-form-item prop="valuationBasisDate" label-width="120px" label="估价基准日:" class="postInfo-container-item">
+            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+              <el-form-item prop="valuationBasisDate" label-width="200px" label="估价基准日:" class="postInfo-container-item">
                 <el-date-picker v-model="targetForm.valuationBasisDate" type="date" placeholder="选择日期" style="width:100%">
                 </el-date-picker>
               </el-form-item>
@@ -920,7 +935,7 @@
           </el-row>
           <el-row class="row-style">
             <el-col :xs="12" :sm="12" :lg="12" :span="12">
-              <el-form-item label="评估方法:" prop="evaluationMethodId" label-width="120px" class="postInfo-container-item">
+              <el-form-item label="评估方法:" prop="evaluationMethodId" label-width="200px" class="postInfo-container-item">
                 <el-select v-model="targetForm.evaluationMethodId" multiple style="width: 100%;">
                   <el-option v-for="(m, id) in assetsEvaluationMethod" :label="m.methodName" :value="m.id"
                     :key="m.id"></el-option>
@@ -953,7 +968,7 @@
           </el-row>
           <el-row class="row-style">
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
-              <el-form-item label="总资产账面值:" prop="totalAssetCarryingAmount" label-width="140px"
+              <el-form-item label="总资产账面值:" prop="totalAssetCarryingAmount" label-width="200px"
                 class="postInfo-container-item">
                 <el-input-number v-model="targetForm.totalAssetCarryingAmount" controls-position="right" :precision="2"
                   :step="0.1"></el-input-number>
@@ -961,7 +976,7 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
-              <el-form-item label="总负债账面值:" prop="totalLiabilitiesCarryingAmount" label-width="140px"
+              <el-form-item label="总负债账面值:" prop="totalLiabilitiesCarryingAmount" label-width="200px"
                 class="postInfo-container-item">
                 <el-input-number v-model="targetForm.totalLiabilitiesCarryingAmount" controls-position="right"
                   :precision="2" :step="0.1"></el-input-number>
@@ -969,7 +984,7 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
-              <el-form-item label="净资产账面值:" prop="carryingAmountOfNetAssets" label-width="140px"
+              <el-form-item label="净资产账面值:" prop="carryingAmountOfNetAssets" label-width="200px"
                 class="postInfo-container-item">
                 <el-input-number v-model="targetForm.carryingAmountOfNetAssets" controls-position="right" :precision="2"
                   :step="0.1"></el-input-number>
@@ -995,7 +1010,7 @@
           </el-row>
           <el-row class="row-style">
             <el-col :xs="24" :sm="12" :lg="18" :span="6">
-              <el-form-item prop="filePath" label="资料附件:" label-width="120px" class="postInfo-container-item">
+              <el-form-item prop="filePath" label="资料附件:" label-width="200px" class="postInfo-container-item">
                 <el-upload action="/api/upload" :limit="3" :on-success="changeresTarget" :on-exceed="handleExceed"
                   :on-preview="handleAttachmentPreview" :before-remove="beforeRemove" :file-list="fileList">
                   <el-button plain type="info" round style="width: 100%">上传附件<i
@@ -1005,16 +1020,18 @@
             </el-col>
           </el-row>
           <el-row class="row-style">
-            <el-col :xs="24" :sm="12" :lg="23" :span="12">
-              <el-form-item label="备注:" prop="remark" label-width="120px" class="postInfo-container-item">
+            <el-col :xs="24" :sm="12" :lg="24" :span="12">
+              <el-form-item label="备注:" prop="remark" label-width="200px" class="postInfo-container-item">
                 <el-input v-model="targetForm.remark" :autosize="{ minRows: 4, maxRows: 4 }" class="filter-item"
                   type="textarea" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row class="row-style">
-            <el-button v-if="saveButtonStatus" @click="assetsTargetSave" style="width:100%;">保存</el-button>
-            <el-button v-if="updateButtonStatus" @click="assetsTargetUpdate" style="width:100%;">更新</el-button>
+            <el-button type="success" v-if="saveButtonStatus" @click="assetsTargetSave"
+              style="width:20%;float:right">保存</el-button>
+            <el-button type="success" v-if="updateButtonStatus" @click="assetsTargetUpdate"
+              style="width:20%;float:right">更新</el-button>
           </el-row>
         </el-form>
       </div>
@@ -1103,7 +1120,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row class="row-style" v-if="currentNode.nodeCode === 'WRITE_REPORT'">
+            <el-row class="row-style" v-if="assetsProductionForm.productionType !== 'STATEMENT'">
               <el-col>
                 <el-form-item label="签字人:" prop="signatory" label-width="120px" class="postInfo-container-item">
                   <el-select v-model="assetsProductionForm.signatory" placeholder="请选择" multiple>
@@ -1223,31 +1240,43 @@
         <div class="createMajor-main-container">
           <div class="postInfo-container">
             <el-row>
-              <el-col>
+              <el-col :xs="12" :sm="12" :lg="12" :span="12">
                 <el-form-item label="评估方法:" prop="evaluationMethodId" label-width="120px" class="postInfo-container-item">
-                  <el-select v-model="targetForm.evaluationMethodId">
+                  <el-select v-model="targetForm.evaluationMethodId" multiple style="width: 100%;">
                     <el-option v-for="(m, id) in assetsEvaluationMethod" :label="m.methodName" :value="m.id"
                       :key="m.id"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :xs="12" :sm="12" :lg="12" :span="12" v-if="targetForm.evaluationMethodId.includes(7)">
+                <el-form-item prop="definedEvaluationMethod" label-width="20px" class="postInfo-container-item">
+                  <el-input v-model="targetForm.definedEvaluationMethod" multiple style="width: 50%;">
+                  </el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
-            <el-row>
-              <el-col>
+            <el-row class="row-style">
+              <el-col :xs="12" :sm="12" :lg="12" :span="12">
                 <el-form-item label="最终选择的评估方法:" prop="choiceEvaluationMethodId" label-width="200px"
                   class="postInfo-container-item">
-                  <el-select v-model="targetForm.choiceEvaluationMethodId">
+                  <el-select v-model="targetForm.choiceEvaluationMethodId" multiple style="width: 100%;">
                     <el-option v-for="(m, id) in assetsEvaluationMethod" :label="m.methodName" :value="m.id"
                       :key="m.id"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :xs="12" :sm="12" :lg="12" :span="12" v-if="targetForm.choiceEvaluationMethodId.includes(7)">
+                <el-form-item prop="choiceDefinedEvaluationMethod" label-width="20px" class="postInfo-container-item">
+                  <el-input v-model="targetForm.choiceDefinedEvaluationMethod" multiple style="width: 50%;">
+                  </el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col>
                 <el-form-item label="审核价格:" prop="checkValue" label-width="140px" class="postInfo-container-item">
-                  <el-input-number v-model="targetForm.checkValue" controls-position="right" :precision="2"
-                    :step="0.1"></el-input-number>
+                  <el-input-number v-model="targetForm.checkValue" controls-position="right" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                   <span>(万)</span>
                 </el-form-item>
               </el-col>
@@ -1496,9 +1525,9 @@ export default {
         dispenseBenefit: [
           { required: true, message: '请选择是否是否分配产值', trigger: 'change' }
         ],
-        terminalClienteleType: [
-          { required: true, message: '请选择终端客户类型', trigger: 'change' }
-        ],
+        // terminalClienteleType: [
+        //   { required: true, message: '请选择终端客户类型', trigger: 'change' }
+        // ],
         terminalClienteleId: [
           { required: true, message: '终端客户名称不能为空', trigger: 'blur' }
         ],
@@ -1700,27 +1729,6 @@ export default {
         //最终选择的自定义其他评估方法
         choiceDefinedEvaluationMethod: null
       },
-      targetFormBack: {
-        evaluationPurposeId: null,
-        evaluationTypeId: null,
-        evaluationTypeSecId: null,
-        theHolder: null,
-        assetsValueId: null,
-        principalId: null,
-        siteIds: [],
-        valuationBasisDate: null,
-        evaluationMethodId: [],
-        choiceEvaluationMethodId: [],
-        totalAssetCarryingAmount: null,
-        totalLiabilitiesCarryingAmount: null,
-        carryingAmountOfNetAssets: null,
-        estimatedValue: null,
-        checkValue: null,
-        filePath: [],
-        assetsId: null,
-        definedEvaluationMethod: null,
-        choiceDefinedEvaluationMethod: null
-      },
       // 资产评估对象评估目的
       assetsEvaluationTargetPurpose: [],
       // 资产评估方法
@@ -2489,7 +2497,28 @@ export default {
       });
     },
     resettargetForm() {
-      this.targetForm = this.targetFormBack;
+      this.targetForm = {
+        id: null,
+        evaluationPurposeId: null,
+        evaluationTypeId: null,
+        evaluationTypeSecId: null,
+        theHolder: null,
+        assetsValueId: null,
+        principalId: null,
+        siteIds: [],
+        valuationBasisDate: null,
+        evaluationMethodId: [],
+        choiceEvaluationMethodId: [],
+        totalAssetCarryingAmount: null,
+        totalLiabilitiesCarryingAmount: null,
+        carryingAmountOfNetAssets: null,
+        estimatedValue: null,
+        checkValue: null,
+        filePath: [],
+        assetsId: null,
+        definedEvaluationMethod: null,
+        choiceDefinedEvaluationMethod: null
+      }
       this.fileList = [];
     },
     clear() {
@@ -2516,11 +2545,14 @@ export default {
                 type: 'success',
                 duration: 2000
               });
-              setTimeout(() => {
-                this.targetDialogVisible = false;
-                //获取评估对象列表
-                this.getAETargetListByAssetsId();
-              }, 1000);
+              this.targetDialogVisible = false;
+              //获取评估对象列表
+              this.getAETargetListByAssetsId();
+              // setTimeout(() => {
+              //   this.targetDialogVisible = false;
+              //   //获取评估对象列表
+              //   this.getAETargetListByAssetsId();
+              // }, 1000);
 
             }
           })
@@ -3002,6 +3034,8 @@ export default {
       this.$api.assets.getAssetsTargetDetail(id).then(res => {
         if (res.code === 200) {
           this.targetForm = res.data;
+          this.targetForm.evaluationMethodId = JSON.parse(res.data.evaluationMethodId);
+          this.targetForm.choiceEvaluationMethodId = JSON.parse(res.data.choiceEvaluationMethodId);
         }
       })
       this.getAssetsEvaluationMethod()
@@ -3010,6 +3044,8 @@ export default {
     checkValue() {
       this.$refs.targetForm.validate(valid => {
         if (valid) {
+          this.targetForm.evaluationMethodId = JSON.stringify(this.targetForm.evaluationMethodId);
+          this.targetForm.choiceEvaluationMethodId = JSON.stringify(this.targetForm.choiceEvaluationMethodId);
           this.$api.assets.checkValue(this.targetForm).then(res => {
             if (res.code == 200) {
               this.$notify({
@@ -3031,6 +3067,7 @@ export default {
       this.$api.assets.getAssetsProductionDetail(id).then(res => {
         if (res.code == 200) {
           this.assetsProductionForm = res.data;
+          this.assetsProductionForm.signatory = JSON.parse(res.data.signatory);
           this.assetsProductionForm.filePath = JSON.parse(res.data.filePath);
           this.fileList = this.assetsProductionForm.filePath;
           this.productionWriteDialogVisible = true;
@@ -3574,5 +3611,4 @@ export default {
   z-index: 999;
   position: relative;
   top: 10px;
-}
-</style>
+}</style>

+ 6 - 1
src/views/assets/todoList.vue

@@ -244,10 +244,15 @@ export default {
                     || row.currentNodeCode === 'REPORT_OUT') {
                     activeTabName = 'production';
                 }
+                const newRow = {
+                    assetsId: row.assetsId,
+                    statementNo: row.statementNo,
+                    reportNo: row.reportNo,
+                }
                 this.$router.push({
                     path: "/assets/orderDetail",
                     query: {
-                        row: JSON.stringify(row),
+                        row: JSON.stringify(newRow),
                         back: '/assets/todoList',
                         couldEdit: true,
                         couldBack: true,

+ 149 - 22
src/views/complex/index.vue

@@ -365,7 +365,8 @@
                     class="el-icon-arrow-right el-icon--right"></i></el-button>
               </div>
               <div class="left-content">
-                <parentTable v-loading="listLoading" :data="personalTodoList" stripe  border :isBoard=450 style="width: 100%">
+                <parentTable v-loading="listLoading" :data="personalTodoList" stripe border :isBoard=450
+                  style="width: 100%">
                   <el-table-column label="坐落" align="center" width="200" show-overflow-tooltip>
                     <template slot-scope="{row}">
                       <span>{{ row.location }}</span>
@@ -476,7 +477,7 @@
           </el-tab-pane>
           <el-tab-pane name="assets" v-if="meunNames.includes('资产业务')">
             <span slot="label">资产待办({{ assetsTodoTotal }})</span>
-            <div v-if="assetsTodoList.length > 0">
+            <div v-if="assetsTodoList.records">
               <div style="margin-top: 1%; margin-bottom: 2%;">
                 <svg t="1713513294985" class="icon" viewBox="0 0 1024 1024" version="1.1"
                   xmlns="http://www.w3.org/2000/svg" p-id="11577" id="mx_n_1713513294986" width="15" height="15">
@@ -486,25 +487,88 @@
                 </svg>
                 <span style="color: #e16531;margin-left: 3px;">您有{{ assetsTodoTotal }}条待处理任务</span>
                 <el-button type="text" style="position: absolute; right:0.5%; top: 0;"
-                  @click="goToTodoPage('/personal/todo/list')">查看更多<i
+                  @click="goToTodoPage('/assets/todoList')">查看更多<i
                     class="el-icon-arrow-right el-icon--right"></i></el-button>
               </div>
               <div class="left-content">
-                <el-card class="content-card" shadow="never" v-for="(a, id) in assetsTodoList" @click.native="">
-                  <div>
-                    <el-tag effect="dark" type="danger">{{ a.nodeName }}</el-tag>
-                  </div>
-                  <hr class="item-hr">
-                  <div class="content-card-item">
-                    <div class="item-num">{{ a.orderId }}</div>
-                    <div class="item-name">
-                      {{ a.location }}
-                    </div>
-                    <div class="item-time">
-                      <i class=" el-icon-time"></i>{{ a.instanceCreated }}
-                    </div>
-                  </div>
-                </el-card>
+                <parentTable ref="table" v-loading="listLoading" :data="assetsTodoList.records" slot="table" stripe border
+                  :isBoard=450 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="120" fixed="right">
+                    <template slot-scope="{row}">
+                      <el-button type="text" @click="assetsToDo(row)">办理</el-button>
+                    </template>
+                  </el-table-column>
+                </parentTable>
               </div>
             </div>
             <div v-else>
@@ -619,7 +683,7 @@
                     class="el-icon-arrow-right el-icon--right"></i></el-button>
               </div>
               <div class="left-content">
-                <parentTable :data="assetsDeclareCheckList" stripe  :isBoard=450 style="width: 100%">
+                <parentTable :data="assetsDeclareCheckList" stripe :isBoard=450 style="width: 100%">
                   <el-table-column label="审批类型" width="150" align="center">
                     <template slot-scope="{row}">
                       <span style="color:red">{{ row.businessType === 'COMMISSION_DECLARE_ASSET_MARKET' ? '市场人员提成申报' :
@@ -683,8 +747,7 @@
                   </el-table-column>
                   <el-table-column label="操作" align="center">
                     <template slot-scope="{row}">
-                      <el-button type="text" size="small"
-                        @click="assetsDeclareCheck(row)">审核</el-button>
+                      <el-button type="text" size="small" @click="assetsDeclareCheck(row)">审核</el-button>
                     </template>
                   </el-table-column>
                 </parentTable>
@@ -792,6 +855,7 @@ export default {
   created() {
     this.getMajorTodoList();
     this.getPersonalTodoList();
+    this.getAssetsTodoList();
     this.getBusinessTotalNum();
     this.majorDeclareTodoList();
     this.assetsDeclareTodoList();
@@ -818,6 +882,19 @@ export default {
         }
       })
     },
+    getAssetsTodoList() {
+      let listQuery = {
+        page: 1,
+        size: 10,
+        handlerId: this.$store.getters.userInfo.id
+      }
+      this.$api.assets.selectPage(listQuery).then(res => {
+        if (res.code === 200) {
+          this.assetsTodoList = res.data;
+          console.log(res.data);
+        }
+      })
+    },
     majorDeclareTodoList() {
       this.$api.commissonDeclare.majorDeclareTodoList().then(res => {
         if (res.code === 200) {
@@ -880,6 +957,52 @@ export default {
         this.$router.push(`/personal/todo?id=${row.businessId}&currentNodeCode=${row.nodeCode}&orderId=${row.orderId}&doWorkflow=${true}&back=${'/personal/todo/list'}`)
       }
     },
+    assetsToDo(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';
+        }
+        const newRow = {
+          assetsId: row.assetsId,
+          statementNo: row.statementNo,
+          reportNo: row.reportNo,
+        }
+        this.$router.push({
+          path: "/assets/orderDetail",
+          query: {
+            row: JSON.stringify(row),
+            back: '/assets/todoList',
+            couldEdit: true,
+            couldBack: true,
+            disabledStatus: false,
+            activeTabName: activeTabName
+          }
+        })
+      }
+    },
     getBusinessTotalNum() {
       this.$api.workNodeTaskRecord.getTodoTotalNum().then(res => {
         if (res.code === 200) {
@@ -892,6 +1015,9 @@ export default {
             if (element.businessType === 'PERSONAL_BUSINESS') {
               this.personalTodoTotal = element.totalNum;
             }
+            if (element.businessType === 'ASSET_BUSINESS') {
+              this.assetsTodoTotal = element.totalNum;
+            }
 
             //大中型提成申报审批(包含市场和评估)
             if (element.businessType === 'COMMISSION_DECLARE_MAJOR_MARKET' || element.businessType === 'COMMISSION_DECLARE_MAJOR_EVALUATE') {
@@ -1290,4 +1416,5 @@ option {
 
 .cleanInputIcon:hover {
   cursor: pointer
-}</style>
+}
+</style>

+ 1 - 1
src/views/income/assets/evaluate.vue

@@ -123,7 +123,7 @@
             </parentTable>
         </y-page-list-layout>
         <el-dialog :visible.sync="assetsAchievementRatioDialogVisible" @closed="resetBusinessPerformanceDistributionForm()"
-            width="25%">
+            width="40%">
             <div v-if="businessPerformanceDistributionForm.distributionList !== null" class="createMajor-main-container">
                 <div class="postInfo-container">
                     <div>

+ 4 - 1
src/views/set/workflow/detail.vue

@@ -319,7 +319,8 @@
           deadlineType:"MINUTE",
           deadline:null,
           taskItems:[],
-          info:null
+          info:null,
+          name: null
 
         },
         taksEnums:[
@@ -450,6 +451,8 @@
       saveNode(){
          if ( this.workflow.id && this.workflow.code){
           this.editNode.flowId = this.workflow.id;
+          const node = this.allNodes.find(node => node.code === this.editNode.code);
+          this.editNode.name = node.name;
           this.editNode.businessType =  this.workflow.code;
             if (this.editNode.deadlineNumber && this.editNode.deadlineType==="HOUR"){
                 this.editNode.deadline = this.editNode.deadlineNumber * 60 *60 *1000;