From af909e37af5adc9d32b25f36ee0a69aa5016b1d3 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Mon, 25 Oct 2021 18:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                              |   8 +
 src/components/common/Header.vue              |  13 +
 src/components/common/countDown.vue           |  13 +-
 src/components/page/AssetDetails.vue          |   9 +-
 src/components/page/DelistingNotice.vue       | 272 ++++++++++++++++++
 src/components/page/Hoster/Listing.vue        |   3 +-
 src/components/page/Hoster/myAssets.vue       | 261 +++++++++++++++--
 src/components/page/Listing.vue               |   2 +-
 src/components/page/Order/orderDetails.vue    |  23 +-
 src/components/page/Order/orderPendingPay.vue |   9 +-
 .../page/Order/sellOrderPendingPay.vue        |   8 +-
 src/components/page/Purchaser/wkPurchaser.vue |   8 +-
 src/components/page/Purchaser/wkThird.vue     |  10 +-
 .../page/Purchaser/wkTrusteeship.vue          |  12 +-
 src/router/index.js                           |   5 +
 15 files changed, 597 insertions(+), 59 deletions(-)
 create mode 100644 src/components/page/DelistingNotice.vue

diff --git a/src/api/index.js b/src/api/index.js
index b8fef5a..eb7d36a 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -200,6 +200,14 @@ export const delist = query => {
       params: query
   });
 };
+// // 摘牌公告列表
+// export const delist = query => {
+//   return request({
+//       url: '/api/user.Order/delist',
+//       method: 'get',
+//       params: query
+//   });
+// };
 // 收藏资产
 export const collectAsset = query => {
   return request({
diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue
index 41b26dd..4b23185 100644
--- a/src/components/common/Header.vue
+++ b/src/components/common/Header.vue
@@ -53,6 +53,9 @@
         <div class="login-btn">
           <el-button type="primary" @click="submitForm()">登录</el-button>
         </div>
+        <div class="reg">
+          <a href="https://www.szcaee.cn">用户注册</a>
+        </div>
       </el-form>
     </el-dialog>
   </div>
@@ -75,6 +78,7 @@ export default {
         {name:'资产分类',url:'/ClassificationDetails'},
         {name:'挂牌公告',url:'/Listing'},
         {name:'成交公告',url:'/Deal'},
+        {name:'摘牌公告',url:'/DelistingNotice'},
         {name:'站内通知',url:'/StationNotice'},
       ],
       isshowLogin:false,
@@ -227,6 +231,7 @@ export default {
           {name:'资产分类',url:'/ClassificationDetails'},
           {name:'挂牌公告',url:'/Listing'},
           {name:'成交公告',url:'/Deal'},
+          {name:'摘牌公告',url:'/DelistingNotice'},
           {name:'站内通知',url:'/StationNotice'},
         ]
         if(goType==0){
@@ -285,6 +290,14 @@ export default {
     flex-direction: column;
     align-items: center;
   }
+  .reg {
+    text-align: right;
+    /* margin-top: -10px; */
+  }
+  .reg a{
+    font-size: 13px;
+    color: #7F7F7F;
+  }
   .header_login{
     font-size: 12px;
     color: #F6D79D;
diff --git a/src/components/common/countDown.vue b/src/components/common/countDown.vue
index 572d482..b701bf6 100644
--- a/src/components/common/countDown.vue
+++ b/src/components/common/countDown.vue
@@ -30,8 +30,7 @@
         this.countdowm(this.endTime)
       },
       methods: {
-          countdowm(timestamp){
-          console.info(timestamp)
+        countdowm(timestamp){
           let self = this;
           let timer = setInterval(function(){
               let nowTime = new Date();
@@ -62,11 +61,11 @@
                     self._callback();
                   }
                 },1000);
-              },
-              _callback(){
-              if(this.callback && this.callback instanceof Function){
-                    this.callback(...this);
-                }
+            },
+          _callback(){
+            if(this.callback && this.callback instanceof Function){
+              this.callback(...this);
+            }
           }
       }
   }
diff --git a/src/components/page/AssetDetails.vue b/src/components/page/AssetDetails.vue
index c841d6d..513e975 100644
--- a/src/components/page/AssetDetails.vue
+++ b/src/components/page/AssetDetails.vue
@@ -24,7 +24,7 @@
         </p>
         <p class="asset_info_p">
           <span>所在地：</span>
-          <span class="asset_info_span1">{{listingList.address_name}}</span>
+          <span class="asset_info_span1">{{listingList.province_name}} {{listingList.city_name}} {{listingList.area_name}}</span>
         </p>
         <p class="asset_info_p">
           <span>交易方式：</span>
@@ -42,8 +42,8 @@
         <p class="asset_info_p1">浏览记录 {{listingList.views}}次</p>
         <div class="asset_info_button">
           <div class="purchase" @click="checkBuy(0)">
-            <span>{{listingList.surplus_count==0?'正在交易':'立即购买' }}</span>
-            <countDown :endTime="listingList.pay_overdue_time"   endText="已经结束了" class="countDown" v-if="listingList.surplus_count==0"></countDown>
+            <span>{{listingList.surplus_count==0&&listingList.order_start==1?'正在交易':'立即购买' }}</span>
+            <countDown :endTime="listingList.pay_overdue_time" :callback="callback"  endText="已经结束了" class="countDown" v-if="listingList.surplus_count==0"></countDown>
           </div>
           <!-- <button class="purchase" @click="checkBuy(0)">{{listingList.surplus_count==0?'正在交易':'立即购买' }}</button> -->
           <button class="assessment" @click="checkBuy(1)">资产评估</button>
@@ -104,6 +104,9 @@ export default {
     this.getData()
   },
   methods:{
+    callback(){
+
+    },
     cancelCollectAsset(){
       cancelCollectAsset(this.query).then(res=>{
         console.info(res)
diff --git a/src/components/page/DelistingNotice.vue b/src/components/page/DelistingNotice.vue
new file mode 100644
index 0000000..d432aae
--- /dev/null
+++ b/src/components/page/DelistingNotice.vue
@@ -0,0 +1,272 @@
+<template>
+  <div class="body">
+    <div class="seach">
+      <div class="seach1">
+        <div class="seach1_item">
+          <span>
+            全部资产 （
+            <span class="seach1_item_span">{{pageTotal}}</span>
+            ）
+          </span>
+        </div>
+        <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 class="seach1_item">
+          <el-date-picker
+            v-model="query.create_time"
+            type="date"
+            placeholder="选择日期"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
+            @change="getData">
+          </el-date-picker>
+        </div>
+        <div class="seach1_item">
+          <span>价格</span>
+          <el-input
+            class="seach_input"
+            v-model="query.min_price">
+            <span slot="prefix" class="el-input__icon ">￥</span>
+          </el-input>
+          <span>-</span>
+          <el-input
+            class="seach_input"
+            v-model="query.max_price">
+            <span slot="prefix" class="el-input__icon ">￥</span>
+          </el-input>
+          <button @click="getData" class="seach_button">确定</button>
+        </div>
+      </div>
+
+      <div class="seach1">
+        <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 class="seach1_item">
+          <span>挂牌方名称</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入挂牌方关键字"
+            v-model="query.sell_name">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <span>挂牌编号</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入挂牌编号"
+            v-model="query.cartellino_id">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <span>标的名称</span>
+          <el-input
+            class="seach1_select"
+            placeholder="请输入标的名称关键字"
+            v-model="query.asset_name">
+          </el-input>
+        </div>
+        <div class="seach1_item">
+          <button @click="getData" class="seach_button">确定</button>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="tabs">
+      <el-table
+        :data="listData"
+        header-cell-class-name="theader"
+        :header-cell-style="{background:'#F3F3F3 !important',color:'#333333',height:'60px',fontSize:'14px'}"
+        style="width: 100%">
+        <el-table-column
+          prop="asset_id"
+          align="center"
+          label="挂牌代码">
+        </el-table-column>
+        <el-table-column
+          prop="firm_name"
+          align="center"
+          label="托管方名称">
+        </el-table-column>
+        <el-table-column
+          prop="serial_name"
+          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"
+          label="挂牌类型">
+          <template slot-scope="scope">
+            <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
+          prop="create_time"
+          align="center"
+          :formatter="formatDate"
+          label="挂牌日期">
+        </el-table-column>
+        <el-table-column
+          prop="confirm_delivery_time"
+          :formatter="formatDate"
+          align="center"
+          label="成交日期">
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="pagination">
+      <el-pagination
+        background
+        layout="total, prev, pager, next"
+        :current-page="query.page"
+        :page-size="query.limit"
+        :total="pageTotal"
+        @current-change="handlePageChange"
+      ></el-pagination>
+    </div>
+
+  </div>
+</template>
+<script>
+import {delist} from '../../api/index'
+import moment from 'moment'
+export default {
+  data(){
+    return{
+      query:{
+        page:1,
+        limit:10,
+        sort:1,
+        create_time:'',
+        min_price:'',
+        max_price:'',
+        cartellino_type:'',
+        sell_name:'',
+        cartellino_id:'',
+        asset_name:'',
+      },
+      pageTotal:0,
+      listData:[]
+    }
+  },
+  created(){
+    this.getData()
+  },
+  methods:{
+    //时间戳转换时间
+    formatDate(row,colnum){
+      return moment(row[colnum.property]*1000).format('YYYY-MM-DD HH:mm:ss')
+    },
+    getData(){
+      delist(this.query).then(res => {
+        console.info(res)
+        if(res.code==100){
+          this.listData=res.data.list;
+          this.pageTotal=res.data.count
+        }else{
+          this.$message.error(res.msg)
+        }
+      })
+    },
+    // 分页导航
+    handlePageChange(val) {
+      this.$set(this.query, 'page', val);
+      this.getData();
+    }
+  }
+}
+</script>
+<style scoped>
+  .body{
+    width: 1200px;
+    margin: 0 auto;
+  }
+  .seach{
+    margin: 20px 0;
+  }
+  .seach1_select{
+    margin-left: 10px;
+    width: 170px;
+  }
+  .seach_button{
+    width: 60px;
+    height: 30px;
+    font-size: 12px;
+    color: #333333;
+    background-color: transparent;
+    border:1px solid #D7D7D7;
+    cursor: pointer;
+  }
+  .seach_input{
+    width: 100px;
+    margin: 0 15px;
+  }
+  .seach1{
+    width: 100%;
+    height: 50px;
+    background: #F2F2F2;
+    border: 1px solid #D7D7D7;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+  }
+  .seach1:last-child{
+    border-top: none;
+  }
+  .seach1_item{
+    padding: 0 20px;
+    display: flex;
+    align-items: center;
+    border-right: 1px solid #D7D7D7;
+    font-size: 12px;
+    height: 100%;
+  }
+  .seach1_item_span{
+    color: #C94C4C;
+  }
+  .seach1_item:last-child{
+    border-right: none;
+  }
+  .select_city{
+    margin: 0 15px;
+  }
+  .el-dropdown-link{
+    color: #EAB1B1;
+    cursor: pointer;
+  }
+  .tabs{
+    margin-top: 20px;
+  }
+  .tabs>>> .el-table tr{
+    border:1px solid #E9B7B7 !important
+  }
+  .tabs>>>.el-table td, .el-table th.is-leaf{
+    border-bottom: none;
+  }
+  .tabs>>>.el-table::before{
+    height: 0;
+  }
+</style>
diff --git a/src/components/page/Hoster/Listing.vue b/src/components/page/Hoster/Listing.vue
index 2da2830..2dceb58 100644
--- a/src/components/page/Hoster/Listing.vue
+++ b/src/components/page/Hoster/Listing.vue
@@ -2,7 +2,7 @@
   <div class="body" >
     <p class="title">资产挂牌</p>
     <div class="listing_title">基础信息</div>
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm1" label-width="150px" class="ruleForm"  label-position="left">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm1" label-width="150px" class="ruleForm"  label-position="left" @submit.native.prevent>
       <el-form-item label="上传资产图片" prop="serial_img" >
         <p class="listing_tips">上传高清质量资产正面图，有助快速通过审核，方便购买方了解资产，图片尺寸建议为800px * 800px</p>
         <div class="listing_upload">
@@ -335,6 +335,7 @@ export default {
           res.data.province=parseInt(res.data.province)
           res.data.city=parseInt(res.data.city)
           res.data.area=parseInt(res.data.area)
+          res.data.pay_type=[parseInt(res.data.pay_type)]
           this.ruleForm=res.data
           this.getCity()
           this.getArea()
diff --git a/src/components/page/Hoster/myAssets.vue b/src/components/page/Hoster/myAssets.vue
index 13aa136..7f6ecb6 100644
--- a/src/components/page/Hoster/myAssets.vue
+++ b/src/components/page/Hoster/myAssets.vue
@@ -6,7 +6,7 @@
       </div>
       <div class="header_right">
         <button class="hedaer_button" @click="goDetails('',1)">资产挂牌</button>
-        <a class="hedaer_button"  :href="host+'/upload/doc/2021/10/163461522339789618.doc'">资产摘牌模板</a>
+        <!-- <a class="hedaer_button"  :href="host+'/upload/doc/2021/10/163461522339789618.doc'">资产摘牌模板</a> -->
       </div>
     </div>
     <div class="seach">
@@ -63,7 +63,7 @@
               <img :src="scope.row.serial_img" alt="" class="order_item_img">
               <div class="table_div">
                 <p class="table_p1">{{scope.row.serial_name}}</p>
-                <p class="table_p">托管方：东莞市芳华沉香园林景观有限公司</p>
+                <p class="table_p">托管方：{{scope.row.firm_name}}</p>
               </div>
             </dir>
           </template>
@@ -83,22 +83,25 @@
           <template slot-scope="scope">
             <template  v-if="scope.row.asset_status==0 || scope.row.asset_status==4 ||scope.row.asset_status==3">
               <p  class="table_p2" @click="goDetails(scope.row.id,0)">查看资产</p>
+              <p  class="table_p2" @click="showDialog(scope.row,1)" v-if="scope.row.asset_check_status==0&&scope.row.asset_status==3 ">
+                摘牌审核
+              </p>
             </template>
             <template v-else-if="scope.row.asset_status==1">
               <p  class="table_p2" @click="goDetails(scope.row.id,2)">编辑资产</p>
             </template>
             <template v-else-if="scope.row.asset_status==2">
               <p  class="table_p2" @click="goDetails(scope.row.id,0)">查看资产</p>
-              <el-upload
+              <!-- <el-upload
               class="upload-demo"
               :action="action1"
               :show-file-list="false"
               :on-error="handleAvatarError"
               list-type="picture"
               :on-success="(res,file,id)=>{handleAvatarSuccess1(res,file,scope.row.id)}"
-              >
-              <p  class="table_p2" >申请摘牌</p>
-            </el-upload>
+              > -->
+              <p  class="table_p2" @click="showDialog(scope.row,0)">申请摘牌</p>
+            <!-- </el-upload> -->
             </template>
           </template>
         </el-table-column>
@@ -114,6 +117,106 @@
         @current-change="handlePageChange"
       ></el-pagination>
     </div>
+    <el-dialog title="" :visible.sync="editVisible1" :width="dialogType==0?'70%':''">
+      <template v-if="dialogType==0">
+        <p style="text-align: center; margin-top: 0; margin-bottom: 0;"><span style="font-family: '华文中宋'; font-size: 18pt;">人才产权摘牌申请书</span></p>
+        <p>&nbsp;</p>
+        <p style="text-align: right; margin-top: 0; margin-bottom: 0;"><span style="font-family: '仿宋'; font-size: 12pt;">金额单位：万元</span></p>
+        <table class="10">
+        <tr>
+        <td>
+        <p style="text-align: center; margin-top: 0; margin-bottom: 0;"><span style="font-family: '仿宋'; font-size: 12pt; font-weight: bold;">意向摘牌方名称</span></p>
+        </td>
+        <td colspan="3">
+        <p>
+          <el-input v-model="query1.delist_firm_name" class="table_input"></el-input>
+        </p>
+        </td>
+        </tr>
+        <tr>
+        <td>
+        <p style="text-align: center; margin-top: 0; margin-bottom: 0;"><span style="font-family: '仿宋'; font-size: 12pt; font-weight: bold;">拟</span><span style="font-family: '仿宋'; font-size: 12pt; font-weight: bold;">摘牌</span><span style="font-family: '仿宋'; font-size: 12pt; font-weight: bold;">标的名称</span></p>
+        </td>
+        <td>
+        <p>
+          <el-input v-model="query1.delist_asset_name" class="table_input"></el-input>
+        </p>
+        </td>
+        <td style="width:20%">
+        <p style="text-align: center; margin-top: 0; margin-bottom: 0;"><span style="font-family: '仿宋'; font-size: 12pt; font-weight: bold;">标的代码</span></p>
+        </td>
+        <td>
+        <p>
+          <el-input v-model="query1.delist_id" class="table_input"></el-input>
+        </p>
+        </td>
+        </tr>
+        <tr>
+        <td>
+        <p style="text-align: center; margin-top: 0; margin-bottom: 0;"><span style="font-family: '仿宋'; font-size: 12pt; font-weight: bold;">拟摘牌标的类型</span></p>
+        </td>
+        <td colspan="3">
+          <el-radio-group v-model="query1.delist_type" class="table_radio_group">
+            <el-radio  label="1" class="table_radio">知识产权（著作权、专利权、专有技术、商标专有权）</el-radio>
+            <el-radio  label="2" class="table_radio">销售网络及客户关系</el-radio>
+            <el-radio  label="3" class="table_radio">特许经营权</el-radio>
+            <el-radio  label="4" class="table_radio">合同权益</el-radio>
+            <el-radio  label="5" class="table_radio">域名</el-radio>
+            <el-radio  label="6" class="table_radio">商誉</el-radio>
+            <el-radio  label="7" class="table_radio">时间和档期</el-radio>
+            <div class="table_radio_group_div">
+              <el-radio  label="8" class="table_radio">其它</el-radio>
+              <el-input v-model="query1.delist_else_type" class="table_input table_input1" ></el-input>
+            </div>
+          </el-radio-group>
+        </td>
+        </tr>
+        <tr>
+        <td>
+        <p style="text-align: center; margin-top: 0; margin-bottom: 0;"><span style="font-family: '仿宋'; font-size: 12pt; font-weight: bold;">摘牌价格（万元）</span></p>
+        </td>
+        <td colspan="3">
+        <p>
+          <el-input v-model="query1.delist_money" class="table_input"></el-input>
+        </p>
+        </td>
+        </tr>
+        <tr>
+        <td>
+        <p style="text-align: center; margin-top: 0; margin-bottom: 0;"><span style="font-family: '仿宋'; font-size: 12pt; font-weight: bold;">摘牌资格条件说明</span></p>
+        </td>
+        <td colspan="3">
+        <p>
+          <el-input v-model="query1.delist_explain" class="table_input"></el-input>
+        </p>
+        </td>
+        </tr>
+        <tr>
+        <td>
+        <p style="text-align: center; margin-top: 0; margin-bottom: 0;"><span style="font-family: '仿宋'; font-size: 12pt; font-weight: bold;">其他</span></p>
+        </td>
+        <td colspan="3">
+        <p>
+          <el-input v-model="query1.delist_else_explain" class="table_input"></el-input>
+        </p>
+        </td>
+        </tr>
+        </table>
+        <p>&nbsp;</p>
+      </template>
+      <template v-else-if="dialogType==1">
+        <div class="examine_content">
+          <img src="../../../assets/img/examine_img.png" alt="" class="examine_img" >
+          <p class="examine_tips">
+            <span >资料已经提交，请耐心等待审核</span>
+          </p>
+        </div>
+      </template>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="editVisible1 = false">取 消</el-button>
+            <el-button type="primary" @click="soldOut">确 定</el-button>
+        </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -131,6 +234,7 @@ export default {
         asset_type_id:'',
         serial_name:''
       },
+      dialogType:0,
       host:'http://wenhua.xingtongworld.com',
       action1:'http://wenhua.xingtongworld.com/api/Index/uploadFile',
       assetLists:[],
@@ -144,7 +248,19 @@ export default {
         {name:'已转让',url:''},
       ],
       header_active:0,
-      AssetClass:[]
+      AssetClass:[],
+      editVisible1:false,
+      query1:{
+        id:'',
+        delist_firm_name:'',
+        delist_asset_name:'',
+        delist_id:'',
+        delist_type:'',
+        delist_else_type:'',
+        delist_money:'',
+        delist_explain:'',
+        delist_else_explain:'',
+      }
     }
   },
   created(){
@@ -152,19 +268,48 @@ export default {
     this.getTopAssetClass()
   },
   methods:{
-    soldOut(file,id){
-      let data={
-        id:id,
-        delist:file
+    showDialog(data,type){
+      if (type==0) {
+        this.query1.id=data.id;
+        this.query1.delist_id=data.serial
+        this.query1.delist_money=data.price/10000
+        this.query1.delist_firm_name=data.firm_name
+        this.query1.delist_asset_name=data.serial_name
       }
-      soldOut(data).then(res => {
-        console.info(res)
-        if(res.code==100){
-          this.$message.success('申请成功，请等待审核~')
+      this.dialogType=type
+      this.editVisible1=true
+    },
+    soldOut(file,id){
+      if (this.dialogType==0) {
+        if (this.query1. delist_firm_name=='') {
+          this.$message.error('意向摘牌方名称不能为空~')
+        }else if (this.query1.delist_asset_name=='') {
+          this.$message.error('拟摘牌标的名称不能为空~')
+        }else if (this.query1.delist_id=='') {
+          this.$message.error('标的代码不能为空~')
+        }else if (this.query1.delist_type=='') {
+          this.$message.error('请选择拟摘牌标的类型~')
+        }else if (this.query1.delist_type==8 && this.query1.delist_else_type=='') {
+          this.$message.error('请填写其他类型~')
+        }else if (this.query1.delist_money=='') {
+          this.$message.error('摘牌价格不能为空~')
+        }else if (this.query1.delist_explain=='') {
+          this.$message.error('摘牌资格条件说明不能为空~')
         }else{
-          this.$message.error(res.msg)
+          this.$confirm('申请摘牌并且审核通过后，该资产状态为已下架并且不可恢复，请问是否确定申请摘牌？', '提示').then(_ => {
+            soldOut(this.query1).then(res => {
+              console.info(res)
+              if(res.code==100){
+                this.$message.success('申请成功，请等待审核~')
+              }else{
+                this.$message.error(res.msg)
+              }
+            })
+          }).catch(_ => {});
         }
-      })
+      }else{
+        this.editVisible1=false
+      }
     },
     handleAvatarError(){
       this.$message.error('文件上传失败！');
@@ -180,7 +325,7 @@ export default {
     },
     getTopAssetClass(){
       getTopAssetClass(this.query).then(res => {
-        console.info(res)
+        // console.info(res)
         if(res.code==100){
           this.AssetClass=res.data;
         }else{
@@ -409,4 +554,84 @@ export default {
     color: #294CC6;
     cursor: pointer;
   }
+
+
+  a.NoteRef {text-decoration: none;}
+  hr {height: 1px; padding: 0; margin: 1em 0; border: 0; border-top: 1px solid #CCC;}
+  table {border: 1px solid black; border-spacing: 0px; width : 100%; height: 500px;}
+  td {border: 1px solid black;}
+  .Normal {font-size: 10.5pt;}
+  h1 {font-size: 22pt; font-weight: bold;}
+  .Document Map {margin-top: 0; margin-bottom: 0;}
+  .Body Text {font-size: 42pt;}
+  .Body Text Indent {font-size: 12pt; font-weight: bold;}
+  .Body Text Indent  {margin-bottom: 6pt;}
+  .Balloon Text {font-size: 9pt;}
+  .footer {font-size: 9pt;}
+  .header {font-size: 9pt;}
+  .Hyperlink {color: #0000FF; text-decoration: underline ;}
+
+  .table_input >>> .el-input__inner{
+    border: none;
+    font-family: 仿宋;
+    font-size: 12pt;
+    font-weight: bold;
+  }
+  .table_radio{
+    font-family: 仿宋;
+    font-size: 12pt;
+    margin-bottom: 10px;
+  }
+  .table_radio_group{
+    display: flex;
+    flex-direction: column;
+    margin-left: 20px;
+  }
+  .table_input1>>> .el-input__inner{
+    border-bottom: 1px solid black;
+    width: 70%;
+    border-radius:0
+  }
+  .table_radio_group_div{
+    display: flex;
+    align-items: center;
+  }
+  .table_radio_group_div .table_radio{
+    margin-bottom: 0;
+  }
+
+
+
+
+  .examine_img{
+    width: 144px;
+    height: 129px;
+  }
+  .error_msg{
+    margin-top: 60px;
+    text-align: left;
+  }
+  .error_msg> p{
+    color: #555555;
+    font-size: 14px;
+    margin-bottom: 10px;
+  }
+  .examine_tips_span{
+    display: inline-block;
+    color: #C94C4C;
+    text-decoration: underline;
+    margin-left: 10px;
+    cursor: pointer;
+  }
+  .examine_tips{
+    margin-top: 20px;
+  }
+  .examine_content{
+    width: 100%;
+    text-align: center;
+    padding-top: 40px;
+    color: #C3CBD6;
+    font-size: 14px;
+    box-sizing: border-box;
+  }
 </style>
diff --git a/src/components/page/Listing.vue b/src/components/page/Listing.vue
index effb7ff..3ee517a 100644
--- a/src/components/page/Listing.vue
+++ b/src/components/page/Listing.vue
@@ -88,7 +88,7 @@
       <div class="tabs_item" v-for="(item,index) in listingList" :key="index">
         <img :src="item.serial_img[0]" alt="" class="tabs_item_img">
         <div class="tabs_item_right">
-          <p class="tabs_item_right_p">{{item.cartellino_id}}</p>
+          <p class="tabs_item_right_p">{{item.serial}}</p>
           <p class="tabs_item_right_p">{{item.serial_name}}</p>
           <div class="tabs_item_right_div">
             本次托管资产为：沉香树采集权的财产权。现代香结评定，依品质优劣可分司登记。最低品为白木香。此为香门除开，第一….
diff --git a/src/components/page/Order/orderDetails.vue b/src/components/page/Order/orderDetails.vue
index 5c9ab85..43dbc9e 100644
--- a/src/components/page/Order/orderDetails.vue
+++ b/src/components/page/Order/orderDetails.vue
@@ -41,8 +41,8 @@
         <p class="order_info_right_tips" v-else-if="type==2">交易订单已关闭！详情请咨询客服人员。</p>
         <div class="order_info_right_tips" v-if="type!=2">
           <span>您可以点击</span>
-          <button class="pay_button">交易凭证</button>
-          <span>下载资产交易凭证</span>
+          <a class="pay_button" :href="orderInfos.asset_report">{{orderInfos.type==1?'资产评估报告':'交易凭证'}}</a>
+          <span>下载{{orderInfos.type==1?'资产评估报告':'交易凭证'}}</span>
         </div>
       </div>
     </div>
@@ -60,7 +60,9 @@
         <span class="order_content_item_span">{{orderInfos.serial_name}}</span>
       </div>
       <div class="order_content_item">
-        <span>GM-BZ-165254{{orderInfos.serial_name}}</span>
+        <span>GM-BZ-165254
+          <!-- {{orderInfos.serial_name}} -->
+        </span>
       </div>
       <div class="order_content_item">
         <span>{{orderInfos.asset_type_name}}</span>
@@ -77,11 +79,11 @@
     </div>
     <div class="order_other">
       <div class="order_other_item">
-        <div class="order_message">
+        <div class="order_message" :class="orderInfos.type==1?'order_message1':''">
           <span>给挂牌方留言：</span>
           <span>{{orderInfos.buy_message}}</span>
         </div>
-        <div class="order_other_item_right">
+        <div class="order_other_item_right" v-if="orderInfos.type==0">
           <div>
             <span>契税： ¥ {{orderInfos.contract_tax}}</span>
             <span class="order_price">¥ {{orderInfos.contract_tax}}</span>
@@ -94,7 +96,7 @@
       </div>
       <div class="order_other_item order_other_item1">
         <span>金额合计  </span>
-        <span class="all_price"> ¥ 33,000.00{{orderInfos.serial_name}}</span>
+        <span class="all_price"> ¥ {{orderInfos.total_price}}</span>
       </div>
     </div>
   </div>
@@ -174,13 +176,17 @@ export default {
     color: #89201F;
   }
   .pay_button{
-    width: 80px;
+    width: 90px;
     font-size: 12px;
     color: #555555;
     height: 30px;
     border: 1px solid #D7D7D7;
     margin: 0 20px;
     cursor: pointer;
+    background: #EFEFEF;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
 
   .order_info_left{
@@ -298,6 +304,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/orderPendingPay.vue b/src/components/page/Order/orderPendingPay.vue
index 7c658f4..851c85b 100644
--- a/src/components/page/Order/orderPendingPay.vue
+++ b/src/components/page/Order/orderPendingPay.vue
@@ -45,17 +45,17 @@
         </div>
         <p class="order_info_right_tips" v-if="orderInfos.status==0 && orderInfos.check_status==0 || orderInfos.status==1 && orderInfos.check_status==2">
           您还有
-          <countDown :endTime="orderInfos.pay_overdue_time"   endText="已经结束了"></countDown>
+          <countDown :endTime="orderInfos.pay_overdue_time"  :callback="callback"   endText="已经结束了"></countDown>
           来付款，超时订单自动关闭。订单关闭后3天内不能再重复购买同一个资产，为避免不便之处，请尽快付款！
         </p>
         <p class="order_info_right_tips" v-if="orderInfos.status==4">
           您还有
-          <countDown :endTime="orderInfos.pay_overdue_time"   endText="已经结束了"></countDown>
+          <countDown :endTime="orderInfos.pay_overdue_time"  :callback="callback"  endText="已经结束了"></countDown>
           来确认，超时订单自动确认。订单确认后交易所将会出具双方交易凭证，确认资产交易成功，请尽快确认！
         </p>
         <p class="order_info_right_tips" v-else-if="orderInfos.status==1 && orderInfos.check_status==0">
           已上传转账记录，还有
-          <countDown :endTime="orderInfos.pay_overdue_time"   endText="已经结束了"></countDown>
+          <countDown :endTime="orderInfos.pay_overdue_time" :callback="callback"   endText="已经结束了"></countDown>
           由交易所确认，请耐心等候！
         </p>
         <p class="order_info_right_tips" v-else-if="orderInfos.status==2 && orderInfos.check_status==0 || orderInfos.status==3 && orderInfos.check_status==2">
@@ -203,6 +203,9 @@ export default {
     this.getData()
   },
   methods:{
+    callback(e){
+      console.info(e)
+    },
     confirmDelivery(){
       confirmDelivery(this.query).then(res=>{
         console.info(res)
diff --git a/src/components/page/Order/sellOrderPendingPay.vue b/src/components/page/Order/sellOrderPendingPay.vue
index a43b0c5..6299d32 100644
--- a/src/components/page/Order/sellOrderPendingPay.vue
+++ b/src/components/page/Order/sellOrderPendingPay.vue
@@ -66,7 +66,7 @@
         <p class="order_info_right_tips" v-if="orderInfos.status==4">
           摘牌方还有
           <countDown :endTime="orderInfos.pay_overdue_time"   endText="已经结束了"></countDown>
-          来确认，超时订单自动确认。订单确认后交易所将会出具双方交易凭证，确认资产交易成功！
+          来确认，超时订单自动确认。订单确认后交易所将会出具双方资产评估报告，确认资产交易成功！
         </p>
         <template v-if="orderInfos.status==2 && orderInfos.check_status==0 ||orderInfos.status==3 && orderInfos.check_status==0||orderInfos.status==3 && orderInfos.check_status==2">
           <div class="order_info_right_tips">
@@ -91,8 +91,8 @@
         </template>
         <div class="order_info_right_tips" v-if="orderInfos.status==6 ">
           <span>您可以点击</span>
-          <button class="pay_button" @click="imgDetils()">交易凭证</button>
-          <span>下载资产交易凭证</span>
+          <button class="pay_button" @click="imgDetils()">{{orderInfos.type==1?'资产评估报告':'交易凭证'}}</button>
+          <span>下载{{orderInfos.type==1?'资产评估报告':'交易凭证'}}</span>
         </div>
         <div class="order_info_right_tips" v-if=" orderInfos.status==1">
           <span>您可以</span>
@@ -166,7 +166,7 @@
       </div>
       <div class="order_other_item order_other_item1">
         <span>金额合计  </span>
-        <span class="all_price"> ¥ 33,000.00{{orderInfos.serial_name}}</span>
+        <span class="all_price"> ¥ {{orderInfos.total_price}}</span>
       </div>
     </div>
     <el-image-viewer
diff --git a/src/components/page/Purchaser/wkPurchaser.vue b/src/components/page/Purchaser/wkPurchaser.vue
index fde8c7d..dcebb16 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" maxlength="15"></el-input>
+                  <el-input v-model="ruleForm.credit_code" placeholder="请输入" type="number"  oninput="if(value.length > 18)value = value.slice(0, 18)"></el-input>
                 </el-form-item>
                 <!-- <el-form-item label="主体类型" prop="main_type" >
                   <el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input>
@@ -69,8 +69,8 @@
                 <el-form-item label="收货联系人" prop="uname" >
                   <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="收货联系电话" prop="phone" maxlength="11">
-                  <el-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
+                <el-form-item label="收货联系电话" prop="phone"   >
+                  <el-input v-model.number="ruleForm.phone" placeholder="请输入"  oninput="if(value.length > 11)value = value.slice(0, 11)"></el-input>
                 </el-form-item>
               </template>
               <template v-else>
@@ -81,7 +81,7 @@
                   <el-input v-model="ruleForm.id_card" placeholder="请输入"></el-input>
                 </el-form-item>
                 <el-form-item label="手机号码" prop="userphone" >
-                  <el-input v-model.number="ruleForm.userphone" placeholder="请输入"></el-input>
+                  <el-input v-model.number="ruleForm.userphone" placeholder="请输入"  oninput="if(value.length > 11)value = value.slice(0, 11)"></el-input>
                 </el-form-item>
                 <el-form-item label="开户行名称" prop="bank_name" >
                   <el-input v-model="ruleForm.bank_name" placeholder="请输入"></el-input>
diff --git a/src/components/page/Purchaser/wkThird.vue b/src/components/page/Purchaser/wkThird.vue
index b255cbb..b37d6ba 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" maxlength="15"></el-input>
+                  <el-input v-model="ruleForm.credit_code" placeholder="请输入" type="number"   oninput="if(value.length > 18)value = value.slice(0, 18)"></el-input>
                 </el-form-item>
                 <!-- <el-form-item label="主体类型" prop="main_type" >
                   <el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input>
@@ -68,8 +68,8 @@
                 <el-form-item label="收货联系人" prop="uname" >
                   <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="收货联系电话" prop="phone" maxlength="11">
-                  <el-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
+                <el-form-item label="收货联系电话" prop="phone" >
+                  <el-input v-model.number="ruleForm.phone" placeholder="请输入"  oninput="if(value.length > 11)value = value.slice(0, 11)"></el-input>
                 </el-form-item>
               </template>
               <template v-else>
@@ -80,7 +80,7 @@
                   <el-input v-model="ruleForm.id_card" placeholder="请输入"></el-input>
                 </el-form-item>
                 <el-form-item label="手机号码" prop="userphone" >
-                  <el-input v-model.number="ruleForm.userphone" placeholder="请输入"></el-input>
+                  <el-input v-model.number="ruleForm.userphone" placeholder="请输入"  oninput="if(value.length > 11)value = value.slice(0, 11)"></el-input>
                 </el-form-item>
                 <el-form-item label="开户行名称" prop="bank_name" >
                   <el-input v-model="ruleForm.bank_name" placeholder="请输入"></el-input>
@@ -333,7 +333,7 @@ export default {
       this.ruleForm.else_file=[];
     },
     //删除图片
-    deleteUrl(item,index){
+    deleteUrl(item,index,index1){
       if(item.key=="else_file"){
         this.ruleForm.else_file.splice(index1,1)
         this.upList[index].url.splice(index1,1)
diff --git a/src/components/page/Purchaser/wkTrusteeship.vue b/src/components/page/Purchaser/wkTrusteeship.vue
index dd94f24..49dcce7 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" maxlength="15"></el-input>
+                  <el-input v-model="ruleForm.credit_code" placeholder="请输入" type="number"  oninput="if(value.length > 18)value = value.slice(0, 18)"></el-input>
                 </el-form-item>
                 <!-- <el-form-item label="主体类型" prop="main_type" >
                   <el-input v-model="ruleForm.main_type" placeholder="请输入"></el-input>
@@ -69,8 +69,8 @@
                 <el-form-item label="收货联系人" prop="uname" >
                   <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="收货联系电话" prop="phone" maxlength="11">
-                  <el-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
+                <el-form-item label="收货联系电话" prop="phone" >
+                  <el-input v-model.number="ruleForm.phone" placeholder="请输入"  oninput="if(value.length > 11)value = value.slice(0, 11)"></el-input>
                 </el-form-item>
               </template>
               <template v-else>
@@ -95,8 +95,8 @@
                 <el-form-item label="收货联系人" prop="uname" >
                   <el-input v-model="ruleForm.uname" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="收货联系电话" prop="phone" maxlength="11">
-                  <el-input v-model.number="ruleForm.phone" placeholder="请输入"></el-input>
+                <el-form-item label="收货联系电话" prop="phone" >
+                  <el-input v-model.number="ruleForm.phone" placeholder="请输入"  oninput="if(value.length > 11)value = value.slice(0, 11)"></el-input>
                 </el-form-item>
               </template>
             </el-form>
@@ -345,7 +345,7 @@ export default {
       this.ruleForm.else_file=[];
     },
     //删除图片
-    deleteUrl(item,index){
+    deleteUrl(item,index,index1){
       if(item.key=="else_file"){
         this.ruleForm.else_file.splice(index1,1)
         this.upList[index].url.splice(index1,1)
diff --git a/src/router/index.js b/src/router/index.js
index d61fb48..ba44c55 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,6 +34,11 @@ export default new Router({
             component: () => import(/* webpackChunkName: "dashboard" */ '../components/page/Deal.vue'),
             meta: { title: '成交公告' }
           },
+          {
+            path: '/DelistingNotice',
+            component: () => import(/* webpackChunkName: "dashboard" */ '../components/page/DelistingNotice.vue'),
+            meta: { title: '摘牌公告' }
+          },
           {
             path: '/StationNotice',
             component: () => import(/* webpackChunkName: "dashboard" */ '../components/page/StationNotice.vue'),