Browse Source

优化

master
ltlzx 4 years ago
parent
commit
a9800e9202
  1. 14
      src/api/index.js
  2. 52
      src/components/page/DelistingNotice.vue
  3. 4
      src/components/page/Order/index.vue

14
src/api/index.js

@ -201,13 +201,13 @@ export const delist = query => {
});
};
// // 摘牌公告列表
// export const delist = query => {
// return request({
// url: '/api/user.Order/delist',
// method: 'get',
// params: query
// });
// };
export const end_list = query => {
return request({
url: '/api/user.Order/end_list',
method: 'get',
params: query
});
};
// 收藏资产
export const collectAsset = query => {
return request({

52
src/components/page/DelistingNotice.vue

@ -9,17 +9,17 @@
</span>
</div>
<div class="seach1_item">
<!-- <div class="seach1_item">
<el-select v-model="query.sort" @change="getData">
<el-option :key="0" label="资产价格升序" :value="1"></el-option>
<el-option :key="1" label="资产价格降序" :value="2"></el-option>
<el-option :key="2" label="挂牌时间升序" :value="3"></el-option>
<el-option :key="3" label="挂牌时间降序" :value="4"></el-option>
</el-select>
</div>
</div> -->
<div class="seach1_item">
<el-date-picker
v-model="query.create_time"
v-model="query.remove_time"
type="date"
placeholder="选择日期"
format="yyyy 年 MM 月 dd 日"
@ -27,7 +27,7 @@
@change="getData">
</el-date-picker>
</div>
<div class="seach1_item">
<!-- <div class="seach1_item">
<span>价格</span>
<el-input
class="seach_input"
@ -41,24 +41,24 @@
<span slot="prefix" class="el-input__icon "></span>
</el-input>
<button @click="getData" class="seach_button">确定</button>
</div>
</div> -->
</div>
<div class="seach1">
<div class="seach1_item">
<!-- <div class="seach1_item">
<span>挂牌类型</span>
<el-select v-model="query.cartellino_type" @change="getData" class="seach1_select">
<el-option :key="0" label="全部" value=""></el-option>
<el-option :key="1" label="协议" :value="1"></el-option>
<el-option :key="2" label="拍卖" :value="2"></el-option>
</el-select>
</div>
</div> -->
<div class="seach1_item">
<span>挂牌方名称</span>
<el-input
class="seach1_select"
placeholder="请输入挂牌方关键字"
v-model="query.sell_name">
v-model="query.seller">
</el-input>
</div>
<div class="seach1_item">
@ -66,7 +66,7 @@
<el-input
class="seach1_select"
placeholder="请输入挂牌编号"
v-model="query.cartellino_id">
v-model="query.id">
</el-input>
</div>
<div class="seach1_item">
@ -91,7 +91,7 @@
:header-cell-style="{background:'#F3F3F3 !important',color:'#333333',height:'60px',fontSize:'14px'}"
style="width: 100%">
<el-table-column
prop="asset_id"
prop="id"
align="center"
label="挂牌代码">
</el-table-column>
@ -105,11 +105,6 @@
align="center"
label="标的名称">
</el-table-column>
<el-table-column
prop="username"
align="center"
label="购买方名称">
</el-table-column>
<el-table-column
prop="pay_mode"
align="center"
@ -118,22 +113,16 @@
<span>{{scope.row.pay_mode==1?'协议':'拍卖'}}</span>
</template>
</el-table-column>
<el-table-column
prop="total_price"
align="center"
label="交易总额">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="create_time"
align="center"
:formatter="formatDate"
label="挂牌日期">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="confirm_delivery_time"
:formatter="formatDate"
prop="remove_time"
align="center"
label="成交日期">
label="摘牌日期">
</el-table-column>
</el-table>
</div>
@ -151,7 +140,7 @@
</div>
</template>
<script>
import {delist} from '../../api/index'
import {end_list} from '../../api/index'
import moment from 'moment'
export default {
data(){
@ -160,12 +149,9 @@ export default {
page:1,
limit:10,
sort:1,
create_time:'',
min_price:'',
max_price:'',
cartellino_type:'',
sell_name:'',
cartellino_id:'',
remove_time:'',
seller:'',
id:'',
asset_name:'',
},
pageTotal:0,
@ -181,7 +167,7 @@ export default {
return moment(row[colnum.property]*1000).format('YYYY-MM-DD HH:mm:ss')
},
getData(){
delist(this.query).then(res => {
end_list(this.query).then(res => {
console.info(res)
if(res.code==100){
this.listData=res.data.list;

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

@ -33,7 +33,9 @@ export default{
this.step= parseInt(this.$route.query.step)
console.info(this.$route)
this.type=this.$route.query.type
this.orderType=this.$route.query.orderType
if (this.$route.query.orderType) {
this.orderType=this.$route.query.orderType
}
},
methods:{
confirm(val){

Loading…
Cancel
Save