Browse Source

优化

master
ltlzx 4 years ago
parent
commit
c730f440de
  1. 2
      src/components/page/AssetDetails.vue
  2. 11
      src/components/page/Order/confirmOrder.vue
  3. 16
      src/components/page/Order/index.vue
  4. 6
      src/components/page/Purchaser/wkPurchaser.vue
  5. 6
      src/components/page/Purchaser/wkThird.vue
  6. 6
      src/components/page/Purchaser/wkTrusteeship.vue
  7. 2
      src/components/page/index.vue

2
src/components/page/AssetDetails.vue

@ -134,7 +134,7 @@ export default {
checkBuy(this.query).then(res => { checkBuy(this.query).then(res => {
if(res.code==100){ if(res.code==100){
this.query.count=this.listingList.pay_count 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{ }else{
this.$message.error(res.msg) this.$message.error(res.msg)
} }

11
src/components/page/Order/confirmOrder.vue

@ -33,7 +33,7 @@
</div> </div>
<div class="order_other"> <div class="order_other">
<div class="order_other_item"> <div class="order_other_item">
<div class="order_message"> <div class="order_message " :class="query.type==1?'order_message1':''">
<span>给挂牌方留言</span> <span>给挂牌方留言</span>
<el-input <el-input
type="textarea" type="textarea"
@ -43,7 +43,7 @@
v-model="query.buy_message"> v-model="query.buy_message">
</el-input> </el-input>
</div> </div>
<div class="order_other_item_right"> <div class="order_other_item_right" v-if="query.type==0">
<div> <div>
<span>契税 ¥ {{orderInfo.contract_tax}}</span> <span>契税 ¥ {{orderInfo.contract_tax}}</span>
<span class="order_price">¥ {{orderInfo.contract_tax}}</span> <span class="order_price">¥ {{orderInfo.contract_tax}}</span>
@ -87,7 +87,8 @@ export default {
query:{ query:{
id:'', id:'',
count:'', count:'',
buy_message:'' buy_message:'',
type:''
}, },
orderInfo:{ orderInfo:{
express:{} express:{}
@ -97,6 +98,7 @@ export default {
created(){ created(){
this.query.id=this.$route.query.id this.query.id=this.$route.query.id
this.query.count=this.$route.query.count this.query.count=this.$route.query.count
this.query.type=this.$route.query.orderType
this.getDate() this.getDate()
}, },
methods:{ methods:{
@ -207,6 +209,9 @@ export default {
background: #F2F2F2; background: #F2F2F2;
box-sizing: border-box; box-sizing: border-box;
} }
.order_message1{
width: 100%;
}
.order_message .order_message_input{ .order_message .order_message_input{
width: 455px; width: 455px;
margin-left: 10px; margin-left: 10px;

16
src/components/page/Order/index.vue

@ -4,9 +4,14 @@
<el-steps :active="step" align-center class="step_bar"> <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.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.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> <template v-if="orderType==0">
<el-step title="确认交付" :description="confirmTime.confirm_delivery_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.settlement_time | formatDate" v-if="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-step title="订单关闭" :description="confirmTime.close_time | formatDate" v-if="type==2"></el-step>
</el-steps> </el-steps>
<router-view @confirm="confirm" ></router-view> <router-view @confirm="confirm" ></router-view>
@ -19,13 +24,16 @@ export default{
step:0, step:0,
title:['确认订单','订单付款','线下签约','确认交付'], title:['确认订单','订单付款','线下签约','确认交付'],
confirmTime:'', confirmTime:'',
type:0 type:0,
//01
orderType:0
} }
}, },
created(){ created(){
this.step= parseInt(this.$route.query.step) this.step= parseInt(this.$route.query.step)
console.info(this.$route) console.info(this.$route)
this.type=this.$route.query.type this.type=this.$route.query.type
this.orderType=this.$route.query.orderType
}, },
methods:{ methods:{
confirm(val){ confirm(val){

6
src/components/page/Purchaser/wkPurchaser.vue

@ -41,7 +41,7 @@
<el-input v-model="ruleForm.firm_name" placeholder="请输入"></el-input> <el-input v-model="ruleForm.firm_name" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="统一社会信用代码" prop="credit_code" > <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>
<!-- <el-form-item label="主体类型" prop="main_type" > <!-- <el-form-item label="主体类型" prop="main_type" >
<el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input> <el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input>
@ -69,7 +69,7 @@
<el-form-item label="收货联系人" prop="uname" > <el-form-item label="收货联系人" prop="uname" >
<el-input v-model="ruleForm.uname" placeholder="请输入"></el-input> <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
</el-form-item> </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-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</template> </template>
@ -95,7 +95,7 @@
<el-form-item label="收货联系人" prop="uname" > <el-form-item label="收货联系人" prop="uname" >
<el-input v-model="ruleForm.uname" placeholder="请输入"></el-input> <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
</el-form-item> </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-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</template> </template>

6
src/components/page/Purchaser/wkThird.vue

@ -40,7 +40,7 @@
<el-input v-model="ruleForm.firm_name" placeholder="请输入"></el-input> <el-input v-model="ruleForm.firm_name" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="统一社会信用代码" prop="credit_code" > <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>
<!-- <el-form-item label="主体类型" prop="main_type" > <!-- <el-form-item label="主体类型" prop="main_type" >
<el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input> <el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input>
@ -68,7 +68,7 @@
<el-form-item label="收货联系人" prop="uname" > <el-form-item label="收货联系人" prop="uname" >
<el-input v-model="ruleForm.uname" placeholder="请输入"></el-input> <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
</el-form-item> </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-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</template> </template>
@ -94,7 +94,7 @@
<el-form-item label="收货联系人" prop="uname" > <el-form-item label="收货联系人" prop="uname" >
<el-input v-model="ruleForm.uname" placeholder="请输入"></el-input> <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
</el-form-item> </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-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</template> </template>

6
src/components/page/Purchaser/wkTrusteeship.vue

@ -41,7 +41,7 @@
<el-input v-model="ruleForm.firm_name" placeholder="请输入"></el-input> <el-input v-model="ruleForm.firm_name" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="统一社会信用代码" prop="credit_code" > <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>
<!-- <el-form-item label="主体类型" prop="main_type" > <!-- <el-form-item label="主体类型" prop="main_type" >
<el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input> <el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input>
@ -69,7 +69,7 @@
<el-form-item label="收货联系人" prop="uname" > <el-form-item label="收货联系人" prop="uname" >
<el-input v-model="ruleForm.uname" placeholder="请输入"></el-input> <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
</el-form-item> </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-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</template> </template>
@ -95,7 +95,7 @@
<el-form-item label="收货联系人" prop="uname" > <el-form-item label="收货联系人" prop="uname" >
<el-input v-model="ruleForm.uname" placeholder="请输入"></el-input> <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
</el-form-item> </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-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</template> </template>

2
src/components/page/index.vue

@ -346,7 +346,7 @@ export default {
.asset_left_content{ .asset_left_content{
display: flex; display: flex;
width: 100%; width: 100%;
justify-content: space-between; /* justify-content: space-between; */
flex-wrap: wrap; flex-wrap: wrap;
} }
.asset_title_right{ .asset_title_right{

Loading…
Cancel
Save