1.修复个贷下单按钮无效问题，修复个贷联系人信息无法填写的问题

2.修复个贷正在进行跳转详情后返回404
3.资产下单页面修改

src/views/assets/addAssetsOrder.vue

@@ -44,7 +44,7 @@
                                     </el-col>
                                 </el-row>
                                 <el-row class="row-style">
-                                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                                    <el-col :xs="24" :sm="24" :lg="24" :span="24">
                                         <el-form-item prop="name" label-width="120px" class="postInfo-container-item"
                                             label="项目名称：">
                                             <el-input v-model="assetsForm.name" class="filter-item" />
@@ -97,7 +97,8 @@
                                         <el-form-item label="业务来源：" prop="clienteleSubId" label-width="120px"
                                             class="postInfo-container-item" v-if="itemHideStatus">
                                             <el-select v-model="assetsForm.clienteleSubId" placeholder="请选择(可搜索)"
-                                                @change="getCustomerContract" clearable filterable>
+                                                @change="getCustomerContract(), assetsForm.clienteleContactId = null"
+                                                clearable filterable>
                                                 <el-option v-for="(s, id) in subCustomerCompany" :label="s.name"
                                                     :value="s.id"></el-option>
                                             </el-select>
@@ -192,32 +193,30 @@
                                     </el-col>
                                 </el-row>
                                 <el-row class="row-style">
-                                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                                    <el-col :xs="12" :sm="12" :lg="8" :span="8">
                                         <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-input v-model="assetsForm.bailor" class="filter-item" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                                    <el-col :xs="12" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="委托联系人：" prop="bailorContactName" label-width="120px"
                                             class="postInfo-container-item">
                                             <el-input v-model="assetsForm.bailorContactName" class="filter-item"
                                                 style=" width: 225px" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                                    <el-col :xs="12" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="委托人联系人电话：" prop="bailorContactTel" label-width="160px"
                                             class="postInfo-container-item">
                                             <el-input v-model="assetsForm.bailorContactTel" class="filter-item"
                                                 style=" width: 225px" />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                                    <el-col :xs="12" :sm="8" :lg="8" :span="8">
                                         <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-input v-model="assetsForm.bailorAddress" class="filter-item" />
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
@@ -239,7 +238,8 @@
                                             class="postInfo-container-item">
                                             <div v-if="couldEdit">
                                                 <el-select v-model="assetsForm.terminalClienteleId" placeholder="请选择(可搜索)"
-                                                    @change="findSubClientele(1)" clearable filterable style="width:80%">
+                                                    @change="getTerminalContactInfo(1), assetsForm.terminalClienteleContactId = null" clearable filterable
+                                                    style="width:80%">
                                                     <el-option v-for="(c, id) in tCustomerCompany" :label="c.name"
                                                         :value="c.id"></el-option>
                                                 </el-select>
@@ -249,13 +249,11 @@
                                                         @click="createTerminalClient()">新增</span>
                                                 </el-tooltip>
                                             </div>
-                                            <el-input :value="assetsForm.tterminalClienteleName" class="filter-item"
-                                                style=" width: 225px" v-else />
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :xs="24" :sm="12" :lg="6" :span="6"
-                                        v-if="assetsForm.terminalClienteleType === '个人'">
-                                        <el-form-item label="终端联系人：" prop="terminalClienteleContactId" label-width="120px"
+                                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                                        <el-form-item label="终端联系人：" v-if="assetsForm.terminalClienteleType"
+                                            prop="terminalClienteleContactId" label-width="120px"
                                             class="postInfo-container-item">
                                             <div v-if="couldEdit">
                                                 <el-select v-model="assetsForm.terminalClienteleContactId"
@@ -270,13 +268,11 @@
                                                         @click="createTlinkman()">新增</span>
                                                 </el-tooltip>
                                             </div>
-                                            <el-input :value="assetsForm.tterminalClienteleContactName" class="filter-item"
-                                                style=" width: 225px" v-else />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                                        <el-form-item label="终端联系电话：" prop="tmobile" label-width="150px"
-                                            class="postInfo-container-item">
+                                        <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" />
                                         </el-form-item>
@@ -490,17 +486,21 @@
                                 <el-input v-model.trim="terminalClientForm.name" class="filter-item" />
                             </el-form-item>
                         </el-col>
-                        <el-col :xs="24" :sm="12" :lg="8" :span="6">
+                        <el-col :xs="24" :sm="12" :lg="8" :span="8">
                             <el-form-item label="企业类型：" prop="companyType" :rules="terminalClientFormRules.companyType"
                                 label-width="120px" class="postInfo-container-item">
-                                <el-input v-model.trim="terminalClientForm.companyType" class="filter-item" />
+                                <el-select v-model.trim="terminalClientForm.companyType" class="filter-item"
+                                    style="width: 100%;">
+                                    <el-option v-for="(s, value) in terminalCustomerType" :label="s.label"
+                                        :value="s.value"></el-option>
+                                </el-select>
                             </el-form-item>
                         </el-col>
-                        <el-col :xs="24" :sm="12" :lg="8" :span="6">
+                        <!-- <el-col :xs="24" :sm="12" :lg="8" :span="6">
                             <el-form-item label="联系电话：" prop="phone" label-width="120px" class="postInfo-container-item">
                                 <el-input v-model.trim="terminalClientForm.phone" class="filter-item" />
                             </el-form-item>
-                        </el-col>
+                        </el-col> -->
                     </el-row>
                     <el-row>
                         <el-col :xs="24" :sm="12" :lg="24" :span="6">
@@ -600,6 +600,9 @@ export default {
                 ],
                 terminalClienteleContactId: [
                     { required: true, message: '终端联系人不能为空', trigger: 'blur' }
+                ],
+                bailorContactTel: [
+                    { required: false, validator: phoneNumber, trigger: 'blur' }
                 ]
             },
             // 新增客户联系人表单校验规则 
@@ -615,21 +618,31 @@ export default {
                 ],
                 name: [
                     { required: true, message: '联系人姓名不能为空', trigger: 'blur' }
+                ],
+                mobile: [
+                    { required: true, validator: phoneNumber, trigger: 'blur' }
                 ]
+
             },
             // 新增终端客户联系人表单校验规则
             tLinkmanFormRules: {
                 name: [
                     { required: true, message: '联系人姓名不能为空', trigger: 'blur' }
+                ],
+                mobile: [
+                    { required: true, validator: phoneNumber, trigger: 'blur' }
                 ]
             },
             // 新增终端客户表单校验规则
             terminalClientFormRules: {
                 name: [
-                    { required: true, message: '联系人姓名不能为空', trigger: 'blur' }
+                    { required: true, message: '客户名称不能为空', trigger: 'blur' }
                 ],
                 companyType: [
-                    { required: true, message: '联系电话不能为空', trigger: 'blur' }, { validator: phoneNumber, trigger: 'blur' }
+                    { required: true, message: '企业类型不能为空', trigger: 'blur' }
+                ],
+                phone: [
+                    { required: true, validator: phoneNumber, trigger: 'blur' }
                 ]
             },
             // 业务类型下拉列表
@@ -651,6 +664,117 @@ export default {
                     label: '其他'
                 }
             ],
+            // 客户类型
+            terminalCustomerType: [
+                {
+                    value: '银行业',
+                    label: '银行业',
+                },
+                {
+                    value: '券商、基金、信托、保险业',
+                    label: '券商、基金、信托、保险业',
+                },
+                {
+                    value: '其他金融业',
+                    label: '其他金融业',
+                },
+                {
+                    value: '房地产业',
+                    label: '房地产业',
+                },
+                {
+                    value: '交通运输、仓储、邮政业',
+                    label: '交通运输、仓储、邮政业',
+                },
+                {
+                    value: '快递业',
+                    label: '快递业',
+                },
+                {
+                    value: '信息传输、软件和信息技术服务业',
+                    label: '信息传输、软件和信息技术服务业',
+                },
+                {
+                    value: '大数据、AI、云计算',
+                    label: '大数据、AI、云计算',
+                },
+                {
+                    value: '电子商务',
+                    label: '电子商务',
+                },
+                {
+                    value: '通信行业',
+                    label: '通信行业',
+                },
+                {
+                    value: '竞技游戏、电子游戏、动漫',
+                    label: '竞技游戏、电子游戏、动漫',
+                },
+                {
+                    value: '传媒业、新媒体',
+                    label: '传媒业、新媒体',
+                },
+                {
+                    value: '卫生、医疗、制药、生物科技',
+                    label: '卫生、医疗、制药、生物科技',
+                },
+                {
+                    value: '文化、体育和娱乐、旅游业',
+                    label: '文化、体育和娱乐、旅游业',
+                },
+                {
+                    value: '电力、热力、燃气及水生产和供应业，水利、环境和公共设施服务业',
+                    label: '电力、热力、燃气及水生产和供应业，水利、环境和公共设施服务业',
+                },
+                {
+                    value: '教育',
+                    label: '教育',
+                },
+                {
+                    value: '住宿和餐饮业',
+                    label: '住宿和餐饮业',
+                },
+                {
+                    value: '批发和零售业',
+                    label: '批发和零售业',
+                },
+                {
+                    value: '租赁和商务服务业',
+                    label: '租赁和商务服务业',
+                },
+                {
+                    value: '建筑业',
+                    label: '建筑业',
+                },
+                {
+                    value: '制造业',
+                    label: '制造业',
+                },
+                {
+                    value: '新能源汽车及相关行业',
+                    label: '新能源汽车及相关行业',
+                },
+                {
+                    value: '新材料、集成电路',
+                    label: '新材料、集成电路',
+                },
+                {
+                    value: '科学研究和技术服务业',
+                    label: '科学研究和技术服务业',
+                },
+                {
+                    value: '农、林、牧、渔',
+                    label: '农、林、牧、渔',
+                },
+                {
+                    value: '采矿业',
+                    label: '采矿业',
+                },
+                {
+                    value: '其他',
+                    label: '其他',
+                }
+            ],
             // 接单部门
             allotDepartment: [],
             // 客户信息
@@ -677,7 +801,7 @@ export default {
                 // 资产业务类型
                 assetsBusinessGener: null,
                 // 客户再次委托
-                entrustAgain: null,
+                entrustAgain: false,
                 // 客户类型（企业，个人）
                 clienteleType: null,
                 // 客户id
@@ -687,15 +811,15 @@ export default {
                 // 客户联系人id
                 clienteleContactId: null,
                 // 是否证券项目
-                security: null,
+                security: false,
                 // 是否资产重组项目
-                significantAssetsReorganization: null,
+                significantAssetsReorganization: false,
                 // 是否国资项目
-                stateAssets: null,
+                stateAssets: false,
                 // 是否涉及境外资产
-                foreignAssetsInvolved: null,
+                foreignAssetsInvolved: false,
                 // 是否分配产值
-                dispenseBenefit: null,
+                dispenseBenefit: false,
                 // 委托人
                 bailor: null,
                 // 委托人地址
@@ -777,9 +901,6 @@ export default {
         if (this.$route.query.row != null || this.$route.query.row != undefined) {
             this.pageParams.row = JSON.parse(this.$route.query.row);
         }
-        this.getAllotDepartment();
-        // this.getCustomerCompany(0);
-        // this.getCustomerCompany(1);
         if (this.pageParams.row !== null) {
             if (this.pageParams.row.assetsId !== null && this.pageParams.row.assetsId !== undefined && this.pageParams.row.assetsId !== '') {
                 this.getAssetsDetailById(this.pageParams.row.assetsId);
@@ -809,6 +930,7 @@ export default {
         // 改变客户类型时进行值重置的操作
         changeCustomerType(val) {
             // 清空联系人下拉列表
+            this.assetsForm.clienteleId = null;
             this.assetsForm.clienteleContactId = null;
             this.assetsForm.clienteleSubId = null;
             this.customerContract = [];
@@ -823,8 +945,8 @@ export default {
         // 改变客户类型时进行值重置的操作
         changeTCustomerType(val) {
             // 清空联系人下拉列表
-            // this.assetsForm.terminalClienteleContactId = null;
-            // this.assetsForm.terminalClienteleId = null;
+            this.assetsForm.terminalClienteleId = null;
+            this.assetsForm.terminalClienteleContactId = null;
             this.assetsForm.tmobile = null;
             this.customerContract = [];
             if (val === "企业") {
@@ -856,6 +978,11 @@ export default {
         // 获取二级客户信息(业务来源)
         findSubClientele(val) {
             if (val === 0) {
+                this.assetsForm.clienteleSubId = null;
+                this.assetsForm.clienteleContactId = null;
+                this.linkmanInfo.mobile = null;
+                this.linkmanInfo.department = null;
+                this.linkmanInfo.duty = null;
                 if (this.assetsForm.clienteleId) {
                     let simpleAll = new Object();
                     simpleAll.terminal = val;
@@ -880,7 +1007,7 @@ export default {
                     // simpleAll.ccId = this.assetsForm.terminalClienteleId;
                     this.$api.customerCompany.detail(this.assetsForm.terminalClienteleId).then(res => {
                         if (res.code === 200) {
-                            this.assetsForm.tmobile = res.data.phone;
+                            this.assetsForm.tmobile = res.data.mobile;
                         }
                     })
                 }
@@ -970,16 +1097,30 @@ export default {
                 this.$api.customerLinkman.detail(this.assetsForm.terminalClienteleContactId).then(res => {
                     if (res.code === 200) {
                         this.assetsForm.tmobile = res.data.mobile;
+                        this.$forceUpdate();
                     }
                 })
             }
         },
         // 打开新增终端联系人弹窗
         createTlinkman() {
-            this.createTlinkmanVisible = true;
             this.tLinkmanForm.terminal = 1;
-            this.assetsForm.clienteleSubId = 1;
-            this.tLinkmanForm.ccId = this.assetsForm.clienteleSubId;
+            if (this.assetsForm.terminalClienteleType === '企业') {
+                if (this.tLinkmanForm.ccId = this.assetsForm.terminalClienteleId) {
+                    this.tLinkmanForm.ccId = this.assetsForm.terminalClienteleId;
+                    this.createTlinkmanVisible = true;
+                } else {
+                    this.$notify({
+                        title: '警告',
+                        message: '请先选择终端客户！',
+                        type: 'warning',
+                        duration: 2000
+                    });
+                }
+            } else {
+                this.tLinkmanForm.ccId = 1;
+                this.createTlinkmanVisible = true;
+            }
         },
         // 打开新增终端客户弹窗
         createTerminalClient() {
@@ -1010,6 +1151,11 @@ export default {
         },
         // 新增终端联系人
         saveTlinkman() {
+            if (this.assetsForm.terminalClienteleType === '企业') {
+                this.tLinkmanForm.ccId = this.assetsForm.terminalClienteleId;
+            } else {
+                this.tLinkmanForm.ccId = 1;
+            }
             this.$refs.tLinkmanForm.validate(valid => {
                 if (valid) {
                     this.$api.customerLinkman.add(this.tLinkmanForm).then(res => {
@@ -1057,20 +1203,13 @@ export default {
                         })
                     }
                     this.getContactInfo();
-                    this.changeTCustomerType(this.assetsForm.terminalClienteleType);
-                    if (this.assetsForm.terminalClienteleId) {
-                        this.$api.customerCompany.detail(this.assetsForm.terminalClienteleId).then(res => {
-                            if (res.code === 200) {
-                                this.assetsForm.tmobile = res.data.phone;
-                            }
-                        })
-                    }
-                    if (this.assetsForm.terminalClienteleContactId) {
-                        this.$api.customerLinkman.detail(this.assetsForm.terminalClienteleContactId).then(res => {
-                            if (res.code === 200) {
-                                this.assetsForm.tmobile = res.data.mobile;
-                            }
-                        })
+                    if (this.assetsForm.terminalClienteleType === "企业") {
+                        this.getCustomerCompany(1);
+                        this.getTerminalContactInfo(1);
+                        this.getTcontactInfo();
+                    } else {
+                        this.getTerminalContactInfo(1);
+                        this.getTcontactInfo();
                     }
                 }
             })
@@ -1108,6 +1247,9 @@ export default {
         getTerminalContactInfo() {
             let simpleAll = new Object();
             simpleAll.ccId = 1;
+            if (this.assetsForm.terminalClienteleId) {
+                simpleAll.ccId = this.assetsForm.terminalClienteleId;
+            }
             simpleAll.terminal = 1;
             this.$api.customerLinkman.simpleAll(simpleAll).then(res => {
                 if (res.code === 200) {

src/views/personal/myOrder.vue

@@ -7,7 +7,7 @@
       <template slot="left">
         <el-col :xs="24" :sm="12" :lg="2" :span="6">
           <PermissionButton menu-code="_views_personal_order" class-name="filter-item" type="danger" icon="el-icon-circle-plus-outline"
-          :page-jump="true" round style="float: left" :page-query="{'couldEdit':true,'saveOrderBtn':'保存订单','showBtn':true ,'couldBack':true}" />
+          :page-jump="true" round style="position: absolute;right: 30px;z-index:9" :page-query="{'couldEdit':true,'saveOrderBtn':'保存订单','showBtn':true ,'couldBack':true}" />
         </el-col>
           <MoreSearchBar business="PERSONAL_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery" 
               :nodeCode="false" :clientManager="false" :outwardStaffName="false" :inwardStaffName="false" :pricingStaffName="false" :handlerName="false"></MoreSearchBar>

src/views/personal/order.vue

@@ -1015,8 +1015,8 @@
               this.$api.customerLinkman.detail(this.personal.clienteleContactId).then(res=>{
                 if (res.code === 200){
                   this.personal.cmobile = res.data.mobile;
-                  this.personal.cDepartment = res.data.department
-                  this.personal.cDuty = res.data.duty
+                  this.personal.cdepartment = res.data.department
+                  this.personal.cduty = res.data.duty
                 }
                   
               })

src/views/personal/pendingList.vue

@@ -190,7 +190,7 @@ export default {
     },
 
     orderDetail(row){
-      this.$router.push(`/personal/readonly/detail?id=${row.id}&currentNodeName=${row.currentNodeName}&orderId=${row.orderId}&back=${'/personal/saveFile'}`)
+      this.$router.push(`/personal/readonly/detail?id=${row.id}&currentNodeName=${row.currentNodeName}&orderId=${row.orderId}&back=${'/personal/pending/list'}`)
     },
   },