1.修复资产评估对象实勘人渲染错误问题

2.评估方法调整为多选且选择其他时填写其他方法
3.优化资产业务下单页面与详情页面布局

src/views/assets/addAssetsOrder.vue

@@ -18,14 +18,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="120px"
+                                        <el-form-item label="客户经理：" prop="clientManager" label-width="140px"
                                             class="postInfo-container-item">
                                             <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="6" :span="6">
-                                        <el-form-item label="分单类型：" prop="clientManager" label-width="120px"
+                                        <el-form-item label="分单类型：" prop="clientManager" label-width="140px"
                                             class="postInfo-container-item">
                                             <el-select v-model="assetsForm.allotType">
                                                 <el-option label="指派" value="指派"></el-option>
@@ -33,8 +33,8 @@
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col v-if="assetsForm.allotType === '指派'" :xs="24" :sm="12" :lg="4" :span="6">
-                                        <el-form-item label="接单部门：" prop="departmentId" label-width="120px"
+                                    <el-col v-if="assetsForm.allotType === '指派'" :xs="24" :sm="12" :lg="6" :span="6">
+                                        <el-form-item label="接单部门：" prop="departmentId" label-width="140px"
                                             class="postInfo-container-item">
                                             <el-select v-model="assetsForm.departmentId">
                                                 <el-option v-for="(d, id) in allotDepartment" :label="d.name"
@@ -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="120px" class="postInfo-container-item"
+                                        <el-form-item prop="name" label-width="140px" class="postInfo-container-item"
                                             label="项目名称：">
                                             <el-input v-model="assetsForm.name" class="filter-item" />
                                         </el-form-item>
@@ -53,7 +53,7 @@
                                 </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="120px"
+                                        <el-form-item label="业务类型：" prop="assetsBusinessGener" label-width="140px"
                                             class="postInfo-container-item">
                                             <el-select v-model="assetsForm.assetsBusinessGener" filterable
                                                 placeholder="业务类型">
@@ -74,7 +74,7 @@
                                 </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="120px"
+                                        <el-form-item label="客户类型：" prop="clienteleType" label-width="140px"
                                             class="postInfo-container-item">
                                             <el-select v-model="assetsForm.clienteleType" placeholder="请选择"
                                                 @change="changeCustomerType(assetsForm.clienteleType)">
@@ -84,7 +84,7 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="客户名称：" prop="clienteleId" label-width="120px"
+                                        <el-form-item label="客户名称：" prop="clienteleId" label-width="140px"
                                             class="postInfo-container-item" v-if="itemHideStatus">
                                             <el-select v-model="assetsForm.clienteleId" placeholder="请选择(可搜索)"
                                                 @change="findSubClientele(0)" clearable filterable>
@@ -94,7 +94,7 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="业务来源：" prop="clienteleSubId" label-width="120px"
+                                        <el-form-item label="业务来源：" prop="clienteleSubId" label-width="140px"
                                             class="postInfo-container-item" v-if="itemHideStatus">
                                             <el-select v-model="assetsForm.clienteleSubId" placeholder="请选择(可搜索)"
                                                 @change="getCustomerContract(), assetsForm.clienteleContactId = null"
@@ -107,38 +107,38 @@
                                 </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="120px"
+                                        <el-form-item label="客户联系人：" prop="clienteleContactId" label-width="140px"
                                             class="postInfo-container-item">
                                             <div>
                                                 <el-select v-model="assetsForm.clienteleContactId" placeholder="请选择(可搜索)"
-                                                    clearable filterable @change="getContactInfo" style="width:60%">
+                                                    clearable filterable @change="getContactInfo">
                                                     <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:5%;color:RGB(64,158,255);cursor:pointer"
+                                                    <span style="margin-left:3%;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="120px"
+                                        <el-form-item label="联系人电话：" prop="mobile" label-width="140px"
                                             class="postInfo-container-item">
                                             <el-input :value="linkmanInfo.mobile" class="filter-item" readonly disabled
                                                 style=" width: 225px" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="联系人部门：" prop="department" label-width="120px"
+                                        <el-form-item label="联系人部门：" prop="department" label-width="140px"
                                             class="postInfo-container-item">
                                             <el-input :value="linkmanInfo.department" class="filter-item" readonly disabled
                                                 style=" width: 225px" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="联系人职务：" prop="duty" label-width="120px"
+                                        <el-form-item label="联系人职务：" prop="duty" label-width="140px"
                                             class="postInfo-container-item">
                                             <el-input :value="linkmanInfo.duty" class="filter-item" readonly disabled
                                                 style=" width: 225px" />
@@ -157,7 +157,7 @@
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="是否资产重组项目：" prop="significantAssetsReorganization"
-                                            label-width="200px" class="postInfo-container-item">
+                                            label-width="170px" class="postInfo-container-item">
                                             <el-radio v-model="assetsForm.significantAssetsReorganization" :label="false"
                                                 border size="medium">否</el-radio>
                                             <el-radio v-model="assetsForm.significantAssetsReorganization" :label="true"
@@ -174,7 +174,7 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="是否涉及境外资产：" prop="foreignAssetsInvolved" label-width="200px"
+                                        <el-form-item label="是否涉及境外资产：" prop="foreignAssetsInvolved" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-radio v-model="assetsForm.foreignAssetsInvolved" :label="false" border
                                                 size="medium">否</el-radio>
@@ -193,35 +193,33 @@
                                     </el-col>
                                 </el-row>
                                 <el-row class="row-style">
-                                    <el-col :xs="12" :sm="12" :lg="8" :span="8">
-                                        <el-form-item label="委托人：" prop="bailor" label-width="120px"
+                                    <el-col :xs="12" :sm="12" :lg="6" :span="6">
+                                        <el-form-item label="委托人：" prop="bailor" label-width="140px"
                                             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="120px"
+                                        <el-form-item label="委托联系人：" prop="bailorContactName" label-width="140px"
                                             class="postInfo-container-item">
-                                            <el-input v-model="assetsForm.bailorContactName" class="filter-item"
-                                                style=" width: 225px" />
+                                            <el-input v-model="assetsForm.bailorContactName" class="filter-item" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="12" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="委托人联系人电话：" prop="bailorContactTel" label-width="160px"
+                                        <el-form-item label="委托联系人电话：" prop="bailorContactTel" label-width="170px"
                                             class="postInfo-container-item">
-                                            <el-input v-model="assetsForm.bailorContactTel" class="filter-item"
-                                                style=" width: 225px" />
+                                            <el-input v-model="assetsForm.bailorContactTel" class="filter-item" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :xs="12" :sm="8" :lg="8" :span="8">
-                                        <el-form-item label="委托人地址：" prop="bailorAddress" label-width="120px"
+                                    <el-col :xs="12" :sm="8" :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>
                                     </el-col>
                                 </el-row>
                                 <el-row class="row-style">
-                                    <el-col :xs="6" :sm="6" :lg="6" :span="6">
+                                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="终端客户类型：" prop="terminalClienteleType" label-width="140px"
                                             class="postInfo-container-item">
                                             <el-select @change="changeTCustomerType(assetsForm.terminalClienteleType)"
@@ -231,55 +229,56 @@
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :xs="8" :sm="8" :lg="8" :span="8"
+                                    <el-col :xs="24" :sm="12" :lg="6" :span="6"
                                         v-if="assetsForm.terminalClienteleType === '企业'">
                                         <el-form-item label="终端客户名称：" prop="terminalClienteleId" label-width="140px"
                                             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:80%">
+                                                    @change="getTerminalContactInfo(1), assetsForm.terminalClienteleContactId = null"
+                                                    clearable filterable style="width:90%">
                                                     <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:5%;color:RGB(64,158,255);cursor:pointer"
+                                                    <span style="margin-left:3%;color:RGB(64,158,255);cursor:pointer"
                                                         @click="createTerminalClient()">新增</span>
                                                 </el-tooltip>
                                             </div>
                                         </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="终端联系人：" v-if="assetsForm.terminalClienteleType"
-                                            prop="terminalClienteleContactId" label-width="120px"
+                                            prop="terminalClienteleContactId" label-width="140px"
                                             class="postInfo-container-item">
                                             <div v-if="couldEdit">
                                                 <el-select v-model="assetsForm.terminalClienteleContactId"
                                                     placeholder="请选择(可搜索)" clearable filterable @change="getTcontactInfo()"
-                                                    style="width:80%">
+                                                    style="width:90%">
                                                     <el-option v-for="(c, id) in tCustomerContract" :label="c.name"
                                                         :value="c.id"></el-option>
                                                 </el-select>
                                                 <el-tooltip class="item" effect="dark" content="没有联系人？点击新增"
                                                     placement="top-end">
-                                                    <span style="margin-left:5%;color:RGB(64,158,255);cursor:pointer"
+                                                    <span style="margin-left:3%;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="6" :span="6">
+                                    <el-col :xs="24" :sm="12" :lg="4" :span="6">
                                         <el-form-item label="终端联系电话：" v-if="assetsForm.terminalClienteleType" prop="tmobile"
-                                            label-width="150px" class="postInfo-container-item">
-                                            <el-input :value="assetsForm.tmobile" class="filter-item" readonly disabled
-                                                style=" width: 215px" />
+                                            label-width="140px" class="postInfo-container-item">
+                                            <el-input :value="assetsForm.tmobile" class="filter-item" readonly disabled />
                                         </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="120px"
+                                        <el-form-item label="备注：" prop="remark" label-width="140px"
                                             class="postInfo-container-item">
                                             <el-input v-model="assetsForm.remark" :autosize="{ minRows: 4, maxRows: 4 }"
                                                 class="filter-item" type="textarea" />

src/views/assets/orderDetail.vue

@@ -62,13 +62,13 @@
                 </div>
                 <el-row class="row-style">
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="客户经理：" prop="clientManager" label-width="120px" class="postInfo-container-item">
+                    <el-form-item label="客户经理：" prop="clientManager" label-width="140px" class="postInfo-container-item">
                       <el-input :value="assetsForm.clientManagerName" 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" label-width="120px" class="postInfo-container-item">
+                    <el-form-item label="接单部门：" prop="departmentId" label-width="140px" class="postInfo-container-item">
                       <el-select v-model="assetsForm.departmentId" readonly disabled>
                         <el-option v-for="(d, id) in allotDepartment" :label="d.name" :value="d.id"
                           :key="d.id"></el-option>
@@ -77,15 +77,15 @@
                   </el-col>
                 </el-row>
                 <el-row class="row-style">
-                  <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item prop="name" label-width="120px" class="postInfo-container-item" label="项目名称：">
+                  <el-col :xs="24" :sm="24" :lg="24" :span="24">
+                    <el-form-item prop="name" label-width="140px" 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="120px"
+                    <el-form-item label="业务类型：" prop="assetsBusinessGener" label-width="140px"
                       class="postInfo-container-item">
                       <el-select v-model="assetsForm.assetsBusinessGener" filterable placeholder="业务类型">
                         <el-option v-for="(s, index) in assetsBusinessGeners" :label="s.label" :value="s.value"
@@ -102,7 +102,7 @@
                 </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="120px" class="postInfo-container-item">
+                    <el-form-item label="客户类型：" prop="clienteleType" label-width="140px" class="postInfo-container-item">
                       <el-select v-model="assetsForm.clienteleType" placeholder="请选择"
                         @change="changeCustomerType(assetsForm.clienteleType)" readonly disabled>
                         <el-option label="企业" value="企业"></el-option>
@@ -111,7 +111,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="客户名称：" prop="clienteleId" label-width="120px" class="postInfo-container-item"
+                    <el-form-item label="客户名称：" prop="clienteleId" label-width="140px" class="postInfo-container-item"
                       v-if="itemHideStatus">
                       <el-select v-model="assetsForm.clienteleId" placeholder="请选择(可搜索)" @change="findSubClientele(0)"
                         clearable filterable readonly disabled>
@@ -121,7 +121,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="业务来源：" prop="clienteleSubId" label-width="120px" class="postInfo-container-item"
+                    <el-form-item label="业务来源：" prop="clienteleSubId" label-width="140px" class="postInfo-container-item"
                       v-if="itemHideStatus">
                       <el-select v-model="assetsForm.clienteleSubId" placeholder="请选择(可搜索)" @change="getCustomerContract"
                         clearable filterable readonly disabled>
@@ -133,11 +133,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="120px"
+                    <el-form-item label="客户联系人：" prop="clienteleContactId" label-width="140px"
                       class="postInfo-container-item">
                       <div>
                         <el-select v-model="assetsForm.clienteleContactId" placeholder="请选择(可搜索)" clearable filterable
-                          @change="getContactInfo();" style="width:60%" readonly disabled>
+                          @change="getContactInfo();" readonly disabled>
                           <!-- <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,19 +150,19 @@
                     </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-form-item label="联系人电话：" prop="mobile" label-width="140px" class="postInfo-container-item">
                       <el-input :value="assetsForm.linkmanMobile" class="filter-item" readonly disabled
                         style=" width: 225px" />
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="联系人部门：" prop="department" label-width="120px" class="postInfo-container-item">
+                    <el-form-item label="联系人部门：" prop="department" label-width="140px" class="postInfo-container-item">
                       <el-input :value="assetsForm.linkmanDepartment" class="filter-item" readonly disabled
                         style=" width: 225px" />
                     </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-form-item label="联系人职务：" prop="duty" label-width="140px" class="postInfo-container-item">
                       <el-input :value="assetsForm.linkmanDuty" class="filter-item" readonly disabled
                         style=" width: 225px" />
                     </el-form-item>
@@ -176,7 +176,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="是否资产重组项目：" prop="significantAssetsReorganization" label-width="200px"
+                    <el-form-item label="是否资产重组项目：" prop="significantAssetsReorganization" label-width="170px"
                       class="postInfo-container-item">
                       <el-radio v-model="assetsForm.significantAssetsReorganization" :label="false" border
                         size="medium">否</el-radio>
@@ -191,7 +191,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="是否涉及境外资产：" prop="foreignAssetsInvolved" label-width="200px"
+                    <el-form-item label="是否涉及境外资产：" prop="foreignAssetsInvolved" label-width="170px"
                       class="postInfo-container-item">
                       <el-radio v-model="assetsForm.foreignAssetsInvolved" :label="false" border
                         size="medium">否</el-radio>
@@ -208,25 +208,25 @@
                 </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="120px" class="postInfo-container-item">
-                      <el-input v-model="assetsForm.bailor" class="filter-item" style=" width: 225px" />
+                    <el-form-item label="委托人：" prop="bailor" label-width="140px" 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="120px"
+                    <el-form-item label="委托联系人：" prop="bailorContactName" label-width="140px"
                       class="postInfo-container-item">
-                      <el-input v-model="assetsForm.bailorContactName" class="filter-item" style=" width: 225px" />
+                      <el-input v-model="assetsForm.bailorContactName" class="filter-item" />
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="委托人联系人电话：" prop="bailorContactTel" label-width="160px"
+                    <el-form-item label="委托人联系人电话：" prop="bailorContactTel" label-width="170px"
                       class="postInfo-container-item">
-                      <el-input v-model="assetsForm.bailorContactTel" class="filter-item" style=" width: 225px" />
+                      <el-input v-model="assetsForm.bailorContactTel" class="filter-item" />
                     </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="assetsForm.bailorAddress" class="filter-item" style=" width: 225px" />
+                    <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>
                   </el-col>
                 </el-row>
@@ -234,8 +234,7 @@
                   <el-col :xs="24" :sm="12" :lg="6" :span="6">
                     <el-form-item label="终端客户类型：" prop="terminalClienteleType" label-width="140px"
                       class="postInfo-container-item">
-                      <el-select v-model="assetsForm.terminalClienteleType" placeholder="请选择" style="width:205px" readonly
-                        disabled>
+                      <el-select v-model="assetsForm.terminalClienteleType" placeholder="请选择" readonly disabled>
                         <el-option label="企业" value="企业"></el-option>
                         <el-option label="个人" value="个人"></el-option>
                       </el-select>
@@ -246,7 +245,7 @@
                       class="postInfo-container-item">
                       <!-- <div v-if="couldEdit"> -->
                       <el-select v-model="assetsForm.terminalClienteleId" placeholder="请选择(可搜索)"
-                        @change="findSubClientele(1)" clearable filterable style="width:80%" readonly disabled>
+                        @change="findSubClientele(1)" clearable filterable readonly disabled style="width:100%">
                         <!-- <el-option v-for="(c, id) in tCustomerCompany" :label="c.name" :value="c.id"
                             :key="c.id"></el-option> -->
                         <el-option :label="tCustomerInfo.name" :value="tCustomerInfo.id"
@@ -261,32 +260,33 @@
                         v-else /> -->
                     </el-form-item>
                   </el-col>
+                </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="120px"
+                    <el-form-item label="终端联系人：" prop="terminalClienteleContactId" label-width="140px"
                       class="postInfo-container-item">
-                        <el-select v-model="assetsForm.terminalClienteleContactId" placeholder="请选择(可搜索)" clearable
-                          filterable style="width:80%" readonly disabled>
-                          <!-- <el-option v-for="(c, id) in tCustomerContract" :label="c.name" :value="c.id"
+                      <el-select v-model="assetsForm.terminalClienteleContactId" placeholder="请选择(可搜索)" clearable
+                        filterable readonly disabled style="width:90%">
+                        <!-- <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>
-                        </el-select>
-                        <!-- <el-tooltip class="item" effect="dark" content="没有联系人？点击新增" placement="top-end">
+                        <el-option :label="tLinkmanInfo.name" :value="tLinkmanInfo.id" :key="tLinkmanInfo.id"></el-option>
+                      </el-select>
+                      <!-- <el-tooltip class="item" effect="dark" content="没有联系人？点击新增" placement="top-end">
                           <span style="margin-left:5%;color:RGB(64,158,255);cursor:pointer"
                             @click="createTlinkman()">新增</span>
                         </el-tooltip> -->
                     </el-form-item>
                   </el-col>
-                  <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                    <el-form-item label="终端联系电话：" prop="clienteleType" label-width="150px"
+                  <el-col :xs="24" :sm="12" :lg="4" :span="6">
+                    <el-form-item label="终端联系电话：" prop="clienteleType" label-width="140px"
                       class="postInfo-container-item">
-                      <el-input :value="assetsForm.tmobile" class="filter-item" readonly disabled style=" width: 215px" />
+                      <el-input :value="assetsForm.tmobile" class="filter-item" readonly disabled />
                     </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="120px" class="postInfo-container-item">
+                    <el-form-item label="备注：" prop="remark" label-width="140px" class="postInfo-container-item">
                       <el-input v-model="assetsForm.remark" :autosize="{ minRows: 4, maxRows: 4 }" class="filter-item"
                         type="textarea" />
                     </el-form-item>
@@ -919,25 +919,37 @@
             </el-col>
           </el-row>
           <el-row class="row-style">
-            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <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 class="row-style">
-            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <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 class="row-style">
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
@@ -1666,9 +1678,9 @@ export default {
         // 估价基准日
         valuationBasisDate: null,
         // 评估方法id
-        evaluationMethodId: null,
+        evaluationMethodId: [],
         // 最终选择的评估方法id
-        choiceEvaluationMethodId: null,
+        choiceEvaluationMethodId: [],
         // 总资产账面值(万)
         totalAssetCarryingAmount: null,
         // 总负债账面值(万)
@@ -1682,7 +1694,11 @@ export default {
         // 资料路由信息
         filePath: [],
         // 资产业务id
-        assetsId: null
+        assetsId: null,
+        //自定义其他评估方法
+        definedEvaluationMethod: null,
+        //最终选择的自定义其他评估方法
+        choiceDefinedEvaluationMethod: null
       },
       targetFormBack: {
         evaluationPurposeId: null,
@@ -1693,15 +1709,17 @@ export default {
         principalId: null,
         siteIds: [],
         valuationBasisDate: null,
-        evaluationMethodId: null,
-        choiceEvaluationMethodId: null,
+        evaluationMethodId: [],
+        choiceEvaluationMethodId: [],
         totalAssetCarryingAmount: null,
         totalLiabilitiesCarryingAmount: null,
         carryingAmountOfNetAssets: null,
         estimatedValue: null,
         checkValue: null,
         filePath: [],
-        assetsId: null
+        assetsId: null,
+        definedEvaluationMethod: null,
+        choiceDefinedEvaluationMethod: null
       },
       // 资产评估对象评估目的
       assetsEvaluationTargetPurpose: [],
@@ -1744,9 +1762,15 @@ export default {
         evaluationMethodId: [
           { required: true, message: '请选择评估方法', trigger: 'change' }
         ],
+        definedEvaluationMethod: [
+          { required: true, message: '请填写其他评估方法', trigger: 'blur' }
+        ],
         choiceEvaluationMethodId: [
           { required: true, message: '请选择最终选择的评估方法', trigger: 'change' }
         ],
+        choiceDefinedEvaluationMethod: [
+          { required: true, message: '请填写其他评估方法', trigger: 'blur' }
+        ],
         totalAssetCarryingAmount: [
           { required: true, message: '请填写总资产账面值', trigger: 'blur' }
         ],
@@ -2233,7 +2257,15 @@ export default {
     getAllUser() {
       this.$api.user.simpleAll().then(res => {
         if (res.code === 200) {
-          this.allUsers = res.data;
+          let principals = this.principals;
+          let all = res.data;
+          let arr = principals.concat(all);
+          let obj = {}
+          arr = arr.reduce((pre, next) => {
+            obj[next.id] ? null : (obj[next.id] = true && pre.push(next))
+            return pre;
+          }, [])
+          this.allUsers = arr;
         }
       })
     },
@@ -2337,6 +2369,8 @@ export default {
           this.flowDoFourthCheck();
           // 获取资产产品列表
           this.getProductionList();
+          // 计算所有评估对象评估总价
+          this.totalEvaluateValue = this.assetsEvaluationTarget.reduce((sum, target) => sum + target.estimatedValue, 0);
         }
       })
     },
@@ -2388,7 +2422,9 @@ export default {
       this.targetDialogVisible = true;
       // 初始表单所需信息
       this.targetForm.principalId = this.assetsForm.principalId;
-      this.targetForm.siteIds = this.assetsForm.members;
+      if (!this.targetForm.siteIds || !this.targetForm.siteIds.length > 0) {
+        this.targetForm.siteIds = this.assetsForm.members;
+      }
       if (this.assetsEvaluationTargetPurpose.length == 0 || this.assetsEvaluationMethod.length == 0 || this.assetsValueType.length == 0 || this.assetsEvaluationTargetType.length == 0) {
         this.getPurpose();
         this.getAssetsEvaluationMethod();
@@ -2467,6 +2503,8 @@ export default {
         if (valid) {
           this.targetForm.assetsId = this.assetsForm.id;
           this.targetForm.siteIds = JSON.stringify(this.targetForm.siteIds);
+          this.targetForm.evaluationMethodId = JSON.stringify(this.targetForm.evaluationMethodId);
+          this.targetForm.choiceEvaluationMethodId = JSON.stringify(this.targetForm.choiceEvaluationMethodId);
           this.targetForm.filePath = JSON.stringify(this.targetForm.filePath);
           this.taskRecordDTO.recordId = this.currentNode.tasks[0].recordId;
           this.taskRecordDTO.taskData = this.targetForm;
@@ -2495,6 +2533,8 @@ export default {
         if (res.code === 200) {
           this.targetForm = res.data;
           this.targetForm.siteIds = JSON.parse(res.data.siteIds);
+          this.targetForm.evaluationMethodId = JSON.parse(res.data.evaluationMethodId);
+          this.targetForm.choiceEvaluationMethodId = JSON.parse(res.data.choiceEvaluationMethodId);
           this.targetForm.filePath = JSON.parse(res.data.filePath);
           this.fileList = this.targetForm.filePath
           this.getTypeList(this.targetForm.evaluationTypeId, 2);
@@ -2508,6 +2548,8 @@ export default {
         if (valid) {
           this.targetForm.assetsId = this.assetsForm.id;
           this.targetForm.siteIds = JSON.stringify(this.targetForm.siteIds);
+          this.targetForm.evaluationMethodId = JSON.stringify(this.targetForm.evaluationMethodId);
+          this.targetForm.choiceEvaluationMethodId = JSON.stringify(this.targetForm.choiceEvaluationMethodId);
           this.targetForm.filePath = JSON.stringify(this.targetForm.filePath);
           this.$api.assets.assetsTargetUpdate(this.targetForm).then(res => {
             if (res.code === 200) {
@@ -2517,11 +2559,9 @@ export default {
                 type: 'success',
                 duration: 2000
               });
-              setTimeout(() => {
-                this.targetDialogVisible = false;
-                //获取评估对象列表
-                this.getAETargetListByAssetsId();
-              }, 1000);
+              this.targetDialogVisible = false;
+              //获取评估对象列表
+              this.getAETargetListByAssetsId();
             }
           })
         }
@@ -3392,7 +3432,6 @@ export default {
             this.tLinkmanInfo = res.data;
             this.$forceUpdate();
             this.assetsForm.tmobile = this.tLinkmanInfo.mobile;
-            console.log(this.tLinkmanInfo)
           }
         })
       }