From c730f440ded21f17aae726afbc0766de547f3ace Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Sun, 17 Oct 2021 18:43:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/AssetDetails.vue            |  2 +-
 src/components/page/Order/confirmOrder.vue      | 11 ++++++++---
 src/components/page/Order/index.vue             | 16 ++++++++++++----
 src/components/page/Purchaser/wkPurchaser.vue   |  6 +++---
 src/components/page/Purchaser/wkThird.vue       |  6 +++---
 src/components/page/Purchaser/wkTrusteeship.vue |  6 +++---
 src/components/page/index.vue                   |  2 +-
 7 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/components/page/AssetDetails.vue b/src/components/page/AssetDetails.vue
index 76bae9a..c841d6d 100644
--- a/src/components/page/AssetDetails.vue
+++ b/src/components/page/AssetDetails.vue
@@ -134,7 +134,7 @@ export default {
       checkBuy(this.query).then(res => {
         if(res.code==100){
           this.query.count=this.listingList.pay_count
-          this.$router.push({path:'/order/confirmOrder',query:{step:0,id:this.query.id,count:this.query.count,type:0}})
+          this.$router.push({path:'/order/confirmOrder',query:{step:0,id:this.query.id,count:this.query.count,type:0,orderType:type}})
         }else{
           this.$message.error(res.msg)
         }
diff --git a/src/components/page/Order/confirmOrder.vue b/src/components/page/Order/confirmOrder.vue
index d52b05e..169e058 100644
--- a/src/components/page/Order/confirmOrder.vue
+++ b/src/components/page/Order/confirmOrder.vue
@@ -33,7 +33,7 @@
     </div>
     <div class="order_other">
       <div class="order_other_item">
-        <div class="order_message">
+        <div class="order_message " :class="query.type==1?'order_message1':''">
           <span>给挂牌方留言：</span>
           <el-input
             type="textarea"
@@ -43,7 +43,7 @@
             v-model="query.buy_message">
           </el-input>
         </div>
-        <div class="order_other_item_right">
+        <div class="order_other_item_right" v-if="query.type==0">
           <div>
             <span>契税： ¥ {{orderInfo.contract_tax}}</span>
             <span class="order_price">¥ {{orderInfo.contract_tax}}</span>
@@ -87,7 +87,8 @@ export default {
       query:{
         id:'',
         count:'',
-        buy_message:''
+        buy_message:'',
+        type:''
       },
       orderInfo:{
         express:{}
@@ -97,6 +98,7 @@ export default {
   created(){
     this.query.id=this.$route.query.id
     this.query.count=this.$route.query.count
+    this.query.type=this.$route.query.orderType
     this.getDate()
   },
   methods:{
@@ -207,6 +209,9 @@ export default {
     background: #F2F2F2;
     box-sizing: border-box;
   }
+  .order_message1{
+    width: 100%;
+  }
   .order_message .order_message_input{
     width: 455px;
     margin-left: 10px;
diff --git a/src/components/page/Order/index.vue b/src/components/page/Order/index.vue
index d1bc50a..67822e8 100644
--- a/src/components/page/Order/index.vue
+++ b/src/components/page/Order/index.vue
@@ -4,9 +4,14 @@
     <el-steps :active="step" align-center class="step_bar">
       <el-step title="确认订单" :description="confirmTime.confirm_order_time | formatDate" ></el-step>
       <el-step title="订单付款" :description="confirmTime.pay_time | formatDate" v-if="type==0 || type==1"></el-step>
-      <el-step title="线下签约" :description="confirmTime.confirm_contract_time | formatDate" v-if="type==0 || type==1"></el-step>
-      <el-step title="确认交付" :description="confirmTime.confirm_delivery_time | formatDate" v-if="type==0 || type==1"></el-step>
-      <el-step title="订单结算" :description="confirmTime.settlement_time | formatDate" v-if="type==1"></el-step>
+      <template v-if="orderType==0">
+        <el-step title="线下签约" :description="confirmTime.confirm_contract_time | formatDate" v-if="type==0 || type==1"></el-step>
+        <el-step title="确认交付" :description="confirmTime.confirm_delivery_time | formatDate" v-if="type==0 || type==1"></el-step>
+        <el-step title="订单结算" :description="confirmTime.settlement_time | formatDate" v-if="type==1"></el-step>
+      </template>
+      <template v-else>
+        <el-step title="订单完成" :description="confirmTime.close_time | formatDate"></el-step>
+      </template>
       <el-step title="订单关闭" :description="confirmTime.close_time | formatDate" v-if="type==2"></el-step>
     </el-steps>
     <router-view @confirm="confirm" ></router-view>
@@ -19,13 +24,16 @@ export  default{
       step:0,
       title:['确认订单','订单付款','线下签约','确认交付'],
       confirmTime:'',
-      type:0
+      type:0,
+      //0是资产购买，1是资产评估购买
+      orderType:0
     }
   },
   created(){
     this.step= parseInt(this.$route.query.step)
     console.info(this.$route)
     this.type=this.$route.query.type
+    this.orderType=this.$route.query.orderType
   },
   methods:{
     confirm(val){
diff --git a/src/components/page/Purchaser/wkPurchaser.vue b/src/components/page/Purchaser/wkPurchaser.vue
index 7773340..dc70207 100644
--- a/src/components/page/Purchaser/wkPurchaser.vue
+++ b/src/components/page/Purchaser/wkPurchaser.vue
@@ -41,7 +41,7 @@
                   <el-input v-model="ruleForm.firm_name" placeholder="请输入"></el-input>
                 </el-form-item>
                 <el-form-item label="统一社会信用代码" prop="credit_code" >
-                  <el-input v-model="ruleForm.credit_code" placeholder="请输入" type="number"></el-input>
+                  <el-input v-model="ruleForm.credit_code" placeholder="请输入" type="number" maxlength="15"></el-input>
                 </el-form-item>
                 <!-- <el-form-item label="主体类型" prop="main_type" >
                   <el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input>
@@ -69,7 +69,7 @@
                 <el-form-item label="收货联系人" prop="uname" >
                   <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="收货联系电话" prop="phone" >
+                <el-form-item label="收货联系电话" prop="phone" maxlength="11">
                   <el-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
                 </el-form-item>
               </template>
@@ -95,7 +95,7 @@
                 <el-form-item label="收货联系人" prop="uname" >
                   <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="收货联系电话" prop="phone" >
+                <el-form-item label="收货联系电话" prop="phone" maxlength="11">
                   <el-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
                 </el-form-item>
               </template>
diff --git a/src/components/page/Purchaser/wkThird.vue b/src/components/page/Purchaser/wkThird.vue
index 3fcfce5..b255cbb 100644
--- a/src/components/page/Purchaser/wkThird.vue
+++ b/src/components/page/Purchaser/wkThird.vue
@@ -40,7 +40,7 @@
                   <el-input v-model="ruleForm.firm_name" placeholder="请输入"></el-input>
                 </el-form-item>
                 <el-form-item label="统一社会信用代码" prop="credit_code" >
-                  <el-input v-model="ruleForm.credit_code" placeholder="请输入" type="number"></el-input>
+                  <el-input v-model="ruleForm.credit_code" placeholder="请输入" type="number" maxlength="15"></el-input>
                 </el-form-item>
                 <!-- <el-form-item label="主体类型" prop="main_type" >
                   <el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input>
@@ -68,7 +68,7 @@
                 <el-form-item label="收货联系人" prop="uname" >
                   <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="收货联系电话" prop="phone" >
+                <el-form-item label="收货联系电话" prop="phone" maxlength="11">
                   <el-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
                 </el-form-item>
               </template>
@@ -94,7 +94,7 @@
                 <el-form-item label="收货联系人" prop="uname" >
                   <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="收货联系电话" prop="phone" >
+                <el-form-item label="收货联系电话" prop="phone" maxlength="11">
                   <el-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
                 </el-form-item>
               </template>
diff --git a/src/components/page/Purchaser/wkTrusteeship.vue b/src/components/page/Purchaser/wkTrusteeship.vue
index bd8cc63..dd94f24 100644
--- a/src/components/page/Purchaser/wkTrusteeship.vue
+++ b/src/components/page/Purchaser/wkTrusteeship.vue
@@ -41,7 +41,7 @@
                   <el-input v-model="ruleForm.firm_name" placeholder="请输入"></el-input>
                 </el-form-item>
                 <el-form-item label="统一社会信用代码" prop="credit_code" >
-                  <el-input v-model="ruleForm.credit_code" placeholder="请输入" type="number"></el-input>
+                  <el-input v-model="ruleForm.credit_code" placeholder="请输入" type="number" maxlength="15"></el-input>
                 </el-form-item>
                 <!-- <el-form-item label="主体类型" prop="main_type" >
                   <el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input>
@@ -69,7 +69,7 @@
                 <el-form-item label="收货联系人" prop="uname" >
                   <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="收货联系电话" prop="phone" >
+                <el-form-item label="收货联系电话" prop="phone" maxlength="11">
                   <el-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
                 </el-form-item>
               </template>
@@ -95,7 +95,7 @@
                 <el-form-item label="收货联系人" prop="uname" >
                   <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="收货联系电话" prop="phone" >
+                <el-form-item label="收货联系电话" prop="phone" maxlength="11">
                   <el-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
                 </el-form-item>
               </template>
diff --git a/src/components/page/index.vue b/src/components/page/index.vue
index 7f6fa75..c668c17 100644
--- a/src/components/page/index.vue
+++ b/src/components/page/index.vue
@@ -346,7 +346,7 @@ export default {
   .asset_left_content{
     display: flex;
     width: 100%;
-    justify-content: space-between;
+    /* justify-content: space-between; */
     flex-wrap: wrap;
   }
   .asset_title_right{