diff --git a/src/api/index.js b/src/api/index.js
index 11e51da..b4347b8 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -63,3 +63,39 @@ export const blackList = query => {
     });
 };
 
+/* 资产管理 */
+
+/* 资产管理 --资产信息查询*/
+
+//资产信息查询列表
+export const getAccountList = query => {
+    return request({
+        url: 'public/index.php/api/admin.Task/getAccountList',
+        method: 'get',
+        params: query
+    });
+};
+
+/* 资产管理 --资产挂牌审核*/
+
+//资产审核列表
+export const accountApplyList = query => {
+    return request({
+        url: 'public/index.php/api/admin.Task/accountApplyList',
+        method: 'get',
+        params: query
+    });
+};
+
+/* 交易管理 */
+
+/* 交易管理 --交易订单查询*/
+
+//交易订单查询列表
+export const orderList = query => {
+    return request({
+        url: 'public/index.php/api/admin.Task/orderList',
+        method: 'get',
+        params: query
+    });
+};
\ No newline at end of file
diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index fd75847..92033b9 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -99,7 +99,7 @@ export default {
                         },
                         {
                             index: 'groundingAudit',
-                            title: '资产上架审核'
+                            title: '资产挂牌审核'
                         },
                         {
                             index: 'releaseAudit',
diff --git a/src/components/common/dialog/content.vue b/src/components/common/dialog/content.vue
index e69de29..07489da 100644
--- a/src/components/common/dialog/content.vue
+++ b/src/components/common/dialog/content.vue
@@ -0,0 +1,19 @@
+<template>
+  <div>
+    
+  </div>
+</template>
+<script>
+export default ({
+  props:{
+    sidebarId:{
+      require: true
+    },
+    dialogType:{
+      require: true
+    }
+  },
+  data() {
+  },
+})
+</script>
diff --git a/src/components/common/dialog/insex.vue b/src/components/common/dialog/insex.vue
index f38285f..ac9e84d 100644
--- a/src/components/common/dialog/insex.vue
+++ b/src/components/common/dialog/insex.vue
@@ -4,13 +4,13 @@
       <p class="tips">{{dialogData.tips}}</p>
       <div class="body">
         <el-tabs tab-position="left" >
-          <el-tab-pane v-for="(item,index) in dialogData.sidebar" :key="index">
+          <el-tab-pane v-for="(item,index) in dialogData.sidebar" :key="index" @tab-click="handleClick">
             <span slot="label">
               <i class="el-icon-question" v-if="item.type==2" style="color:#4E73E4"></i>
               <span v-else-if="item.type==1" style="color:red">*</span>
               {{item.title}}
             </span>
-            
+            <sidebarContent :sidebarId="item.id" :dialogType="dialogType" v-if="tabID==item.id"/>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -23,6 +23,7 @@
 </template>
 <script>
 import {whySidebar} from '../dialog/sidebar.vue'
+import {sidebarContent} from '../dialog/content.vue'
 export default {
   name:'whyDialog',
   props:{
@@ -46,7 +47,8 @@ export default {
         title:'',
         tips:'',
         sidebar:[]
-      }
+      },
+      tabID:''
     }
   },
   components:{
@@ -57,13 +59,17 @@ export default {
       this.dialogData.title='账户信息';
       this.dialogData.tips='以下为交易平台账户申请账户时提交的相关资料：';
       this.dialogData.sidebar=[
-        {title:'企业风险评估',type:0},{title:'基础信息',type:1},{title:'营业执照(复印件)',type:1},{title:'法人代表证明书',type:1},{title:'法人身份证(复印件)',type:1},
-        {title:'数字证书申请表',type:1},{title:'银行开户证明',type:1},{title:'开户申请书与承诺书',type:1},{title:'法人授权委托书',type:0},{title:'经办人身份证(复印件)',type:0},
-        {title:'资产证明文件',type:2},{title:'其他要求文件',type:0}
+        {title:'企业风险评估',type:0,id:'basics'},{title:'基础信息',type:1,id:'basics'},{title:'营业执照(复印件)',type:1,id:'basics'},
+        {title:'法人代表证明书',type:1,id:'basics'},{title:'法人身份证(复印件)',type:1,id:'basics'},{title:'数字证书申请表',type:1,id:'basics'},
+        {title:'银行开户证明',type:1,id:'basics'},{title:'开户申请书与承诺书',type:1,id:'basics'},{title:'法人授权委托书',type:0,id:'basics'},
+        {title:'经办人身份证(复印件)',type:0,id:'basics'},{title:'资产证明文件',type:2,id:'basics'},{title:'其他要求文件',type:0,id:'basics'}
       ]
     }
   },
   methods:{
+    handleClick(tab){
+      this.tabID=tab.id
+    },
     saveEdit(){
 
     },
diff --git a/src/components/page/AssetManagement/assetQuery.vue b/src/components/page/AssetManagement/assetQuery.vue
index 6a44a8b..a7d0e55 100644
--- a/src/components/page/AssetManagement/assetQuery.vue
+++ b/src/components/page/AssetManagement/assetQuery.vue
@@ -10,34 +10,43 @@
         </div>
         <div class="container">
             <div class="handle-box">
-              <el-input v-model="query.name" placeholder="标准编号" class="handle-input mr10"></el-input>
-              <el-input  placeholder="资产名称" class="handle-input mr10"></el-input>
-              <el-input  placeholder="机构名称" class="handle-input mr10"></el-input>
-                <el-select  placeholder="资产状态" class="handle-select mr10">
-                    <el-option key="1" label="广东省" value="广东省"></el-option>
-                    <el-option key="2" label="湖南省" value="湖南省"></el-option>
+                <el-input v-model="query.serial_number" placeholder="标准编号" class="handle-input mr10"></el-input>
+                <el-input v-model="query.account_name" placeholder="资产名称" class="handle-input mr10"></el-input>
+                <el-input v-model="query.firm_name" placeholder="机构名称" class="handle-input mr10"></el-input>
+                <el-select v-model="query.account_status" placeholder="资产状态" class="handle-select mr10">
+                    <el-option key="4" label="全部" :value="4"></el-option>
+                    <el-option key="1" label="待托管" :value="1"></el-option>
+                    <el-option key="2" label="已托管" :value="2"></el-option>
+                    <el-option key="3" label="待发布" :value="3"></el-option>
+                    <el-option key="5" label="已发布" :value="5"></el-option>
+                    <el-option key="6" label="已下架" :value="6"></el-option>
                 </el-select>
-                <el-select v-model="query.address" placeholder="审核状态" class="handle-select mr10">
-                    <el-option key="1" label="广东省" value="广东省"></el-option>
-                    <el-option key="2" label="湖南省" value="湖南省"></el-option>
+                <el-select v-model="query.account_apply" placeholder="审核状态" class="handle-select mr10">
+                    <el-option key="4" label="全部" :value="4"></el-option>
+                    <el-option key="1" label="待托管审核" :value="1"></el-option>
+                    <el-option key="2" label="托管审核不通过" :value="2"></el-option>
+                    <el-option key="3" label="托管审核通过" :value="3"></el-option>
+                    <el-option key="5" label="待发布审核" :value="5"></el-option>
+                    <el-option key="6" label="发布审核不通过" :value="6"></el-option>
+                    <el-option key="7" label="发布审核通过" :value="7"></el-option>
                 </el-select>
-                <el-select v-model="query.address" placeholder="审核人员" class="handle-select mr10">
-                    <el-option key="1" label="广东省" value="广东省"></el-option>
-                    <el-option key="2" label="湖南省" value="湖南省"></el-option>
+                <el-select v-model="query.auditID" placeholder="审核人员" class="handle-select mr10">
+                    <el-option v-for="item in auditList" :key="item.uid" :label="item.username" :value="item.uid"></el-option>
                 </el-select>
                 <el-date-picker
-                  class="mr10"
-                  v-model="query.time"
-                  type="datetimerange"
-                  :picker-options="pickerOptions"
-                  range-separator="至"
-                  value-format="yyyy-MM-dd h:m:s"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  align="right"
+                    class="mr10"
+                    v-model="query.time"
+                    type="datetimerange"
+                    :picker-options="pickerOptions"
+                    range-separator="至"
+                    value-format="timestamp"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    align="right"
                 >
                 </el-date-picker>
                 <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+                <el-button type="primary" plain  @click="reset">重置</el-button>
             </div>
             <el-table
                 :data="tableData"
@@ -45,18 +54,36 @@
                 class="table"
                 ref="multipleTable"
                 header-cell-class-name="table-header"
-                @selection-change="handleSelectionChange"
             >
+                <el-table-column type="selection" width="55" align="center"></el-table-column>
                 <el-table-column prop="id" label="序号" width="55" align="center"></el-table-column>
-                <el-table-column prop="name" label="上架时间"></el-table-column>
-                <el-table-column label="标准编号" prop="name"></el-table-column>
-                <el-table-column label="资产名称" prop="name"></el-table-column>
-                <el-table-column prop="address" label="机构名称"></el-table-column>
-                <el-table-column prop="address" label="剩余数量"></el-table-column>
-                <el-table-column prop="address" label="资产状态"></el-table-column>
-                <el-table-column prop="address" label="审核状态"></el-table-column>
-                <el-table-column prop="date" label="审核人员"></el-table-column>
-                <el-table-column label="操作" width="280" align="center">
+                <el-table-column prop="create_time" label="创建时间" :formatter="formatDate" ></el-table-column>
+                <el-table-column label="标准编号" prop="serial" width="200"></el-table-column>
+                <el-table-column label="资产名称" prop="serial_name"></el-table-column>
+                <el-table-column prop="firm_name" label="机构名称"></el-table-column>
+                <el-table-column prop="apply_name" label="托管数量" width="80"></el-table-column>
+                <el-table-column prop="amount" label="剩余数量" width="80"></el-table-column>
+                <el-table-column prop="asset_status" label="资产状态" width="80">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.asset_status==1">已发布</span>
+                        <span v-else-if="scope.row.asset_status==0">待发布</span>
+                        <span v-else-if="scope.row.asset_status==2">待上架</span>
+                        <span v-else-if="scope.row.asset_status==3">已上架</span>
+                        <span v-else-if="scope.row.asset_status==4">已下架</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="apply_status" label="审核状态">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.apply_status==1">发布审核通过</span>
+                        <span v-else-if="scope.row.apply_status==0">待发布审核</span>
+                        <span v-else-if="scope.row.apply_status==2">待上架审核</span>
+                        <span v-else-if="scope.row.apply_status==3">上架审核通过</span>
+                        <span v-else-if="scope.row.apply_status==4">上架审核不通过</span>
+                        <span v-else-if="scope.row.apply_status==5">发布审核不通过</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="username" label="审核人员"></el-table-column>
+                <el-table-column label="操作" width="250" align="center">
                     <template slot-scope="scope">
                         <el-button
                             type="text"
@@ -64,11 +91,11 @@
                         >资料查看</el-button>
                         <el-button
                             type="text"
-                            @click="handleDelete(scope.$index, scope.row)"
-                        >上架资产</el-button>
+                            @click="operationRecord(scope.row)"
+                        >{{scope.row | operationStatus}}</el-button>
                         <el-button
                             type="text"
-                            @click="handleDelete(scope.$index, scope.row)"
+                            @click="blacklist( scope.row)"
                         >交易查看</el-button>
                     </template>
                 </el-table-column>
@@ -77,118 +104,144 @@
                 <el-pagination
                     background
                     layout="total, prev, pager, next"
-                    :current-page="query.pageIndex"
-                    :page-size="query.pageSize"
+                    :current-page="query.page"
+                    :page-size="query.limit"
                     :total="pageTotal"
                     @current-change="handlePageChange"
                 ></el-pagination>
             </div>
         </div>
-
-        <!-- 编辑弹出框 -->
-        <el-dialog title="编辑" :visible.sync="editVisible" width="30%">
-            <el-form ref="form" :model="form" label-width="70px">
-                <el-form-item label="用户名">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="地址">
-                    <el-input v-model="form.address"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="editVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveEdit">确 定</el-button>
-            </span>
-        </el-dialog>
     </div>
 </template>
 
 <script>
-import { fetchData } from '../../../api/index';
+import { getAccountList ,operationRecord,updateBlackList,auditList} from '../../../api/index';
+import moment from 'moment'
 export default {
-    name: 'basetable',
     data() {
         return {
             query: {
-                address: '',
-                name: '',
-                pageIndex: 1,
-                pageSize: 10
+                serial_number: '',
+                account_name: '',
+                firm_name: '',
+                account_status: '',
+                account_apply: '',
+                auditID:'',
+                time: '',
+                page: 1,
+                limit: 10
+            },
+            query1:{
+                uid:'',
+                buyer_account_type:0,
+                enter_shop_type:0,
+                third_party_type:0
             },
             tableData: [],
+            recordList:[],
+            auditList:[],
             multipleSelection: [],
             delList: [],
             editVisible: false,
             pageTotal: 0,
-            form: {},
-            idx: -1,
-            id: -1,
             pickerOptions: {
-              shortcuts: [
-                {
-                  text: "最近一周",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-                {
-                  text: "最近一个月",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-                {
-                  text: "最近三个月",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-              ],
+                shortcuts: [
+                    {
+                    text: "最近一周",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                    {
+                    text: "最近一个月",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                    {
+                    text: "最近三个月",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                ],
             },
         };
     },
     created() {
         this.getData();
+        this.getAuditList()
     },
     methods: {
+        // 审核人员下拉数据
+        getAuditList(){
+            auditList().then(res => {
+                // console.log(res);
+                if (res.code==100) {
+                    this.auditList=res.data.list
+                }
+            });
+        },
+        //添加黑名单
+        addBlacklist(){
+            updateBlackList(this.query1).then(res => {
+                console.log(res);
+                if (res.code==100) {
+                    this.$message.success(res.msg);
+                }else{
+                    this.$message.error(res.msg);
+                }
+                this.editVisible2=false
+            });
+        },
+        // 操作记录
+        operationRecord(row){
+            let data={uid:row.id}
+            operationRecord(data).then(res => {
+                console.log(res);
+                if(res.code==100){
+                    this.recordList=res.data.list
+                }
+                this.editVisible1=true
+            });
+        },
+        // 重置方法
+        reset(){
+            Object.keys(this.query).forEach(key => {
+                console.info(key)
+                if (key!='page' && key!='limit') {
+                    this.query[key] = ''
+                }
+            });
+        },
+        //时间戳转换时间
+        formatDate(row,colnum){
+            return moment(row[colnum.create_time]).format('YYYY-MM-DD HH:mm:ss')
+        },
         // 获取 easy-mock 的模拟数据
         getData() {
-            fetchData(this.query).then(res => {
-                // console.log(res);
-                this.tableData = res.list;
-                this.pageTotal = res.pageTotal || 50;
+            getAccountList(this.query).then(res => {
+                console.log(res);
+                if (res.code==100) {
+                    this.tableData = res.data.list;
+                    this.pageTotal = res.data.count;
+                }
             });
         },
         // 触发搜索按钮
         handleSearch() {
-            this.$set(this.query, 'pageIndex', 1);
+            this.$set(this.query, 'page', 1);
             this.getData();
         },
-        // 删除操作
-        handleDelete(index, row) {
-            // 二次确认删除
-            this.$confirm('确定要删除吗？', '提示', {
-                type: 'warning'
-            })
-                .then(() => {
-                    this.$message.success('删除成功');
-                    this.tableData.splice(index, 1);
-                })
-                .catch(() => {});
-        },
-        // 多选操作
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
         // 编辑操作
         handleEdit(index, row) {
             this.idx = index;
@@ -203,14 +256,40 @@ export default {
         },
         // 分页导航
         handlePageChange(val) {
-            this.$set(this.query, 'pageIndex', val);
+            this.$set(this.query, 'page', val);
             this.getData();
         }
+    },
+    filters:{
+        operationStatus(res){
+            let text='';
+            if (res.asset_status==2|| res.asset_status==4 && res.apply_status==3) {
+                text='上架资产'
+            }else if(res.asset_status==1 || res.asset_status==3 && res.apply_status==3 || res.apply_status==1){
+                text='下架资产'
+            }
+            return text
+        }
     }
 };
 </script>
 
 <style scoped>
+.record_select{
+    display: flex;
+    flex-direction: column;
+}
+.record_select >>> .el-checkbox{
+    margin-bottom: 10px;
+}
+.record_content{
+    font-size: 16px;
+    margin-bottom: 10px;
+}
+.recordTips{
+    font-size: 16px;
+    margin-bottom: 15px;
+}
 .handle-box {
     margin-bottom: 20px;
 }
diff --git a/src/components/page/AssetManagement/groundingAudit.vue b/src/components/page/AssetManagement/groundingAudit.vue
index c49f3b9..617f259 100644
--- a/src/components/page/AssetManagement/groundingAudit.vue
+++ b/src/components/page/AssetManagement/groundingAudit.vue
@@ -5,35 +5,35 @@
                 <el-breadcrumb-item>
                     <i class="el-icon-lx-cascades"></i> 资产管理
                 </el-breadcrumb-item>
-                <el-breadcrumb-item>资产上架审核</el-breadcrumb-item>
+                <el-breadcrumb-item>资产挂牌审核</el-breadcrumb-item>
             </el-breadcrumb>
         </div>
         <div class="container">
             <div class="handle-box">
-              <el-input  placeholder="资产名称" class="handle-input mr10"></el-input>
-              <el-input  placeholder="机构名称" class="handle-input mr10"></el-input>
-              <el-input  placeholder="法人名称" class="handle-input mr10"></el-input>
-              <el-select v-model="query.address" placeholder="审核状态" class="handle-select mr10">
-                  <el-option key="1" label="广东省" value="广东省"></el-option>
-                  <el-option key="2" label="湖南省" value="湖南省"></el-option>
-              </el-select>
-              <el-select v-model="query.address" placeholder="审核人员" class="handle-select mr10">
-                  <el-option key="1" label="广东省" value="广东省"></el-option>
-                  <el-option key="2" label="湖南省" value="湖南省"></el-option>
-              </el-select>
-              <el-date-picker
-                class="mr10"
-                v-model="query.time"
-                type="datetimerange"
-                :picker-options="pickerOptions"
-                range-separator="至"
-                value-format="yyyy-MM-dd h:m:s"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                align="right"
-              >
-              </el-date-picker>
-              <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+                <el-input v-model="query.account_name" placeholder="资产名称" class="handle-input mr10"></el-input>
+                <el-input v-model="query.firm_name" placeholder="机构名称" class="handle-input mr10"></el-input>
+                <el-input v-model="query.username" placeholder="法人名称" class="handle-input mr10"></el-input>
+                <el-select v-model="query.account_apply" placeholder="审核状态" class="handle-select mr10">
+                    <el-option key="4" label="全部" :value="4"></el-option>
+                    <el-option key="2" label="湖南省" value="湖南省"></el-option>
+                </el-select>
+                <el-select v-model="query.auditID" placeholder="审核人员" class="handle-select mr10">
+                    <el-option v-for="item in auditList" :key="item.uid" :label="item.username" :value="item.uid"></el-option>
+                </el-select>
+                <el-date-picker
+                    class="mr10"
+                    v-model="query.time"
+                    type="datetimerange"
+                    :picker-options="pickerOptions"
+                    range-separator="至"
+                    value-format="timestamp"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    align="right"
+                >
+                </el-date-picker>
+                <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+                <el-button type="primary" plain  @click="reset">重置</el-button>
             </div>
             <el-table
                 :data="tableData"
@@ -44,12 +44,21 @@
                 @selection-change="handleSelectionChange"
             >
                 <el-table-column prop="id" label="序号" width="55" align="center"></el-table-column>
-                <el-table-column prop="name" label="申请时间"></el-table-column>
-                <el-table-column label="资产名称" prop="name"></el-table-column>
-                <el-table-column prop="address" label="机构名称"></el-table-column>
-                <el-table-column prop="address" label="法人名称"></el-table-column>
-                <el-table-column prop="address" label="审核状态"></el-table-column>
-                <el-table-column prop="date" label="审核人员"></el-table-column>
+                <el-table-column prop="update_time" :formatter="formatDate" label="申请时间"></el-table-column>
+                <el-table-column label="资产名称" prop="serial_name"></el-table-column>
+                <el-table-column prop="firm_name" label="机构名称"></el-table-column>
+                <el-table-column prop="apply_name" label="法人名称"></el-table-column>
+                <el-table-column  label="审核状态">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.apply_status==1">发布审核通过</span>
+                        <span v-else-if="scope.row.apply_status==0">待发布审核</span>
+                        <span v-else-if="scope.row.apply_status==2">待上架审核</span>
+                        <span v-else-if="scope.row.apply_status==3">上架审核通过</span>
+                        <span v-else-if="scope.row.apply_status==4">上架审核不通过</span>
+                        <span v-else-if="scope.row.apply_status==5">发布审核不通过</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="username" label="审核人员"></el-table-column>
                 <el-table-column label="操作" width="280" align="center">
                     <template slot-scope="scope">
                         <el-button
@@ -63,94 +72,109 @@
                 <el-pagination
                     background
                     layout="total, prev, pager, next"
-                    :current-page="query.pageIndex"
-                    :page-size="query.pageSize"
+                    :current-page="query.page"
+                    :page-size="query.limit"
                     :total="pageTotal"
                     @current-change="handlePageChange"
                 ></el-pagination>
             </div>
         </div>
 
-        <!-- 编辑弹出框 -->
-        <el-dialog title="编辑" :visible.sync="editVisible" width="30%">
-            <el-form ref="form" :model="form" label-width="70px">
-                <el-form-item label="用户名">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="地址">
-                    <el-input v-model="form.address"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="editVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveEdit">确 定</el-button>
-            </span>
-        </el-dialog>
     </div>
 </template>
 
 <script>
-import { fetchData } from '../../../api/index';
+import { accountApplyList,auditList } from '../../../api/index';
+import moment from 'moment'
 export default {
     name: 'basetable',
     data() {
         return {
             query: {
-                address: '',
-                name: '',
-                pageIndex: 1,
-                pageSize: 10
+                account_name: '',
+                firm_name: '',
+                username: '',
+                account_status: '',
+                account_apply: '',
+                auditID: '',
+                time: '',
+                page: 1,
+                limit: 10
             },
             tableData: [],
             multipleSelection: [],
             delList: [],
+            auditList:[],
             editVisible: false,
             pageTotal: 0,
             form: {},
             idx: -1,
             id: -1,
             pickerOptions: {
-              shortcuts: [
-                {
-                  text: "最近一周",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-                {
-                  text: "最近一个月",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-                {
-                  text: "最近三个月",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-              ],
+                shortcuts: [
+                    {
+                    text: "最近一周",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                    {
+                    text: "最近一个月",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                    {
+                    text: "最近三个月",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                ],
             },
         };
     },
     created() {
         this.getData();
+        this.getAuditList();
     },
     methods: {
+        //时间戳转换时间
+        formatDate(row,colnum){
+            return moment(row[colnum.create_time]).format('YYYY-MM-DD HH:mm:ss')
+        },
+        // 重置方法
+        reset(){
+            Object.keys(this.query).forEach(key => {
+                console.info(key)
+                if (key!='page' && key!='limit') {
+                    this.query[key] = ''
+                }
+            });
+        },
+        // 审核人员下拉数据
+        getAuditList(){
+            auditList().then(res => {
+                // console.log(res);
+                if (res.code==100) {
+                    this.auditList=res.data.list
+                }
+            });
+        },
         // 获取 easy-mock 的模拟数据
         getData() {
-            fetchData(this.query).then(res => {
+            accountApplyList(this.query).then(res => {
                 // console.log(res);
-                this.tableData = res.list;
+                this.tableData = res.data.list;
                 this.pageTotal = res.pageTotal || 50;
             });
         },
@@ -189,7 +213,7 @@ export default {
         },
         // 分页导航
         handlePageChange(val) {
-            this.$set(this.query, 'pageIndex', val);
+            this.$set(this.query, 'page', val);
             this.getData();
         }
     }
diff --git a/src/components/page/AssetManagement/releaseAudit.vue b/src/components/page/AssetManagement/releaseAudit.vue
index a24d621..9fdb8e0 100644
--- a/src/components/page/AssetManagement/releaseAudit.vue
+++ b/src/components/page/AssetManagement/releaseAudit.vue
@@ -10,30 +10,30 @@
         </div>
         <div class="container">
             <div class="handle-box">
-              <el-input  placeholder="资产名称" class="handle-input mr10"></el-input>
-              <el-input  placeholder="机构名称" class="handle-input mr10"></el-input>
-              <el-input v-model="query.name" placeholder="法人名称" class="handle-input mr10"></el-input>
-                <el-select v-model="query.address" placeholder="审核状态" class="handle-select mr10">
-                    <el-option key="1" label="广东省" value="广东省"></el-option>
+                <el-input v-model="query.account_name" placeholder="资产名称" class="handle-input mr10"></el-input>
+                <el-input v-model="query.firm_name" placeholder="机构名称" class="handle-input mr10"></el-input>
+                <el-input v-model="query.username" placeholder="法人名称" class="handle-input mr10"></el-input>
+                <el-select v-model="query.account_apply" placeholder="审核状态" class="handle-select mr10">
+                    <el-option key="4" label="全部" :value="4"></el-option>
                     <el-option key="2" label="湖南省" value="湖南省"></el-option>
                 </el-select>
-                <el-select v-model="query.address" placeholder="审核人员" class="handle-select mr10">
-                    <el-option key="1" label="广东省" value="广东省"></el-option>
-                    <el-option key="2" label="湖南省" value="湖南省"></el-option>
+                <el-select v-model="query.auditID" placeholder="审核人员" class="handle-select mr10">
+                    <el-option v-for="item in auditList" :key="item.uid" :label="item.username" :value="item.uid"></el-option>
                 </el-select>
                 <el-date-picker
-                  class="mr10"
-                  v-model="query.time"
-                  type="datetimerange"
-                  :picker-options="pickerOptions"
-                  range-separator="至"
-                  value-format="yyyy-MM-dd h:m:s"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  align="right"
+                    class="mr10"
+                    v-model="query.time"
+                    type="datetimerange"
+                    :picker-options="pickerOptions"
+                    range-separator="至"
+                    value-format="timestamp"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    align="right"
                 >
                 </el-date-picker>
                 <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+                <el-button type="primary" plain  @click="reset">重置</el-button>
             </div>
             <el-table
                 :data="tableData"
@@ -44,12 +44,21 @@
                 @selection-change="handleSelectionChange"
             >
                 <el-table-column prop="id" label="序号" width="55" align="center"></el-table-column>
-                <el-table-column prop="name" label="申请时间"></el-table-column>
-                <el-table-column label="资产名称" prop="name"></el-table-column>
-                <el-table-column prop="address" label="机构名称"></el-table-column>
-                <el-table-column prop="address" label="法人名称"></el-table-column>
-                <el-table-column prop="address" label="审核状态"></el-table-column>
-                <el-table-column prop="date" label="审核人员"></el-table-column>
+                <el-table-column prop="update_time" :formatter="formatDate" label="申请时间"></el-table-column>
+                <el-table-column label="资产名称" prop="serial_name"></el-table-column>
+                <el-table-column prop="firm_name" label="机构名称"></el-table-column>
+                <el-table-column prop="apply_name" label="法人名称"></el-table-column>
+                <el-table-column  label="审核状态">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.apply_status==1">发布审核通过</span>
+                        <span v-else-if="scope.row.apply_status==0">待发布审核</span>
+                        <span v-else-if="scope.row.apply_status==2">待上架审核</span>
+                        <span v-else-if="scope.row.apply_status==3">上架审核通过</span>
+                        <span v-else-if="scope.row.apply_status==4">上架审核不通过</span>
+                        <span v-else-if="scope.row.apply_status==5">发布审核不通过</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="username" label="审核人员"></el-table-column>
                 <el-table-column label="操作" width="280" align="center">
                     <template slot-scope="scope">
                         <el-button
@@ -63,94 +72,106 @@
                 <el-pagination
                     background
                     layout="total, prev, pager, next"
-                    :current-page="query.pageIndex"
-                    :page-size="query.pageSize"
+                    :current-page="query.page"
+                    :page-size="query.limit"
                     :total="pageTotal"
                     @current-change="handlePageChange"
                 ></el-pagination>
             </div>
         </div>
 
-        <!-- 编辑弹出框 -->
-        <el-dialog title="编辑" :visible.sync="editVisible" width="30%">
-            <el-form ref="form" :model="form" label-width="70px">
-                <el-form-item label="用户名">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="地址">
-                    <el-input v-model="form.address"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="editVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveEdit">确 定</el-button>
-            </span>
-        </el-dialog>
     </div>
 </template>
 
 <script>
-import { fetchData } from '../../../api/index';
+import { accountApplyList,auditList } from '../../../api/index';
+import moment from 'moment'
 export default {
     name: 'basetable',
     data() {
         return {
             query: {
-                address: '',
-                name: '',
-                pageIndex: 1,
-                pageSize: 10
+                account_name: '',
+                firm_name: '',
+                username: '',
+                account_status: '',
+                account_apply: '',
+                auditID: '',
+                time: '',
+                page: 1,
+                limit: 10
             },
             tableData: [],
             multipleSelection: [],
             delList: [],
+            auditList:[],
             editVisible: false,
             pageTotal: 0,
-            form: {},
-            idx: -1,
-            id: -1,
             pickerOptions: {
-              shortcuts: [
-                {
-                  text: "最近一周",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-                {
-                  text: "最近一个月",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-                {
-                  text: "最近三个月",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-              ],
+                shortcuts: [
+                    {
+                    text: "最近一周",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                    {
+                    text: "最近一个月",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                    {
+                    text: "最近三个月",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                ],
             },
         };
     },
     created() {
         this.getData();
+        this.getAuditList();
     },
     methods: {
+        //时间戳转换时间
+        formatDate(row,colnum){
+            return moment(row[colnum.create_time]).format('YYYY-MM-DD HH:mm:ss')
+        },
+        // 重置方法
+        reset(){
+            Object.keys(this.query).forEach(key => {
+                console.info(key)
+                if (key!='page' && key!='limit') {
+                    this.query[key] = ''
+                }
+            });
+        },
+        // 审核人员下拉数据
+        getAuditList(){
+            auditList().then(res => {
+                // console.log(res);
+                if (res.code==100) {
+                    this.auditList=res.data.list
+                }
+            });
+        },
         // 获取 easy-mock 的模拟数据
         getData() {
-            fetchData(this.query).then(res => {
+            accountApplyList(this.query).then(res => {
                 // console.log(res);
-                this.tableData = res.list;
+                this.tableData = res.data.list;
                 this.pageTotal = res.pageTotal || 50;
             });
         },
@@ -189,7 +210,7 @@ export default {
         },
         // 分页导航
         handlePageChange(val) {
-            this.$set(this.query, 'pageIndex', val);
+            this.$set(this.query, 'page', val);
             this.getData();
         }
     }
diff --git a/src/components/page/TransactionManagement/transactionQuery.vue b/src/components/page/TransactionManagement/transactionQuery.vue
index 9c2180b..c05be38 100644
--- a/src/components/page/TransactionManagement/transactionQuery.vue
+++ b/src/components/page/TransactionManagement/transactionQuery.vue
@@ -10,35 +10,35 @@
         </div>
         <div class="container">
             <div class="handle-box">
-              <el-input  placeholder="订单编号" class="handle-input mr10"></el-input>
-              <el-input v-model="query.name" placeholder="商家名称" class="handle-input mr10"></el-input>
-              <el-input  placeholder="买家名称" class="handle-input mr10"></el-input>
-              <el-input  placeholder="资产名称" class="handle-input mr10"></el-input>
-                <el-select  placeholder="交易方式" class="handle-select mr10">
-                    <el-option key="1" label="广东省" value="广东省"></el-option>
-                    <el-option key="2" label="湖南省" value="湖南省"></el-option>
-                </el-select>
-                <el-select v-model="query.address" placeholder="交易状态" class="handle-select mr10">
-                    <el-option key="1" label="广东省" value="广东省"></el-option>
-                    <el-option key="2" label="湖南省" value="湖南省"></el-option>
-                </el-select>
-                <el-select v-model="query.address" placeholder="审核人员" class="handle-select mr10">
-                    <el-option key="1" label="广东省" value="广东省"></el-option>
-                    <el-option key="2" label="湖南省" value="湖南省"></el-option>
-                </el-select>
-                <el-date-picker
-                  class="mr10"
-                  v-model="query.time"
-                  type="datetimerange"
-                  :picker-options="pickerOptions"
-                  range-separator="至"
-                  value-format="yyyy-MM-dd h:m:s"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  align="right"
+                <el-input v-model="query.batchcode"  placeholder="订单编号" class="handle-input mr10"></el-input>
+                <el-input v-model="query.name" placeholder="商家名称" class="handle-input mr10"></el-input>
+                <el-input v-model="query.pay_username" placeholder="买家名称" class="handle-input mr10"></el-input>
+                <el-input v-model="query.account_name" placeholder="资产名称" class="handle-input mr10"></el-input>
+                    <el-select v-model="query.trade_type" placeholder="交易方式" class="handle-select mr10">
+                        <el-option key="1" label="广东省" value="广东省"></el-option>
+                        <el-option key="2" label="湖南省" value="湖南省"></el-option>
+                    </el-select>
+                    <el-select v-model="query.trade_status" placeholder="交易状态" class="handle-select mr10">
+                        <el-option key="1" label="广东省" value="广东省"></el-option>
+                        <el-option key="2" label="湖南省" value="湖南省"></el-option>
+                    </el-select>
+                    <el-select v-model="query.auditID" placeholder="审核人员" class="handle-select mr10">
+                        <el-option v-for="item in auditList" :key="item.uid" :label="item.username" :value="item.uid"></el-option>
+                    </el-select>
+                    <el-date-picker
+                    class="mr10"
+                    v-model="query.time"
+                    type="datetimerange"
+                    :picker-options="pickerOptions"
+                    range-separator="至"
+                    value-format="timestamp"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    align="right"
                 >
                 </el-date-picker>
                 <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+                <el-button type="primary" plain  @click="reset">重置</el-button>
             </div>
             <el-table
                 :data="tableData"
@@ -49,7 +49,7 @@
                 @selection-change="handleSelectionChange"
             >
                 <el-table-column prop="id" label="序号" width="55" align="center"></el-table-column>
-                <el-table-column prop="name" label="创建时间"></el-table-column>
+                <el-table-column prop="update_time" :formatter="formatDate" label="创建时间"></el-table-column>
                 <el-table-column label="订单编号" prop="name"></el-table-column>
                 <el-table-column prop="address" label="商家名称"></el-table-column>
                 <el-table-column label="资产名称" prop="name"></el-table-column>
@@ -76,92 +76,105 @@
                 <el-pagination
                     background
                     layout="total, prev, pager, next"
-                    :current-page="query.pageIndex"
-                    :page-size="query.pageSize"
+                    :current-page="query.page"
+                    :page-size="query.limit"
                     :total="pageTotal"
                     @current-change="handlePageChange"
                 ></el-pagination>
             </div>
         </div>
 
-        <!-- 编辑弹出框 -->
-        <el-dialog title="编辑" :visible.sync="editVisible" width="30%">
-            <el-form ref="form" :model="form" label-width="70px">
-                <el-form-item label="用户名">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="地址">
-                    <el-input v-model="form.address"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="editVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveEdit">确 定</el-button>
-            </span>
-        </el-dialog>
     </div>
 </template>
 
 <script>
-import { fetchData } from '../../../api/index';
+import { orderList ,auditList} from '../../../api/index';
+import moment from 'moment'
 export default {
     name: 'basetable',
     data() {
         return {
             query: {
-                address: '',
-                name: '',
-                pageIndex: 1,
-                pageSize: 10
+                batchcode: '',
+                firm_name: '',
+                pay_username: '',
+                account_name: '',
+                trade_type: '',
+                trade_status: '',
+                auditID: '',
+                time: '',
+                page: 1,
+                limit: 10
             },
             tableData: [],
             multipleSelection: [],
             delList: [],
+            auditList:[],
             editVisible: false,
             pageTotal: 0,
-            form: {},
-            idx: -1,
-            id: -1,
             pickerOptions: {
-              shortcuts: [
-                {
-                  text: "最近一周",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-                {
-                  text: "最近一个月",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-                {
-                  text: "最近三个月",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-              ],
+                shortcuts: [
+                    {
+                    text: "最近一周",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                    {
+                    text: "最近一个月",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                    {
+                    text: "最近三个月",
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                        picker.$emit("pick", [start, end]);
+                    },
+                    },
+                ],
             },
         };
     },
     created() {
         this.getData();
+        this.getAuditList();
     },
     methods: {
+        //时间戳转换时间
+        formatDate(row,colnum){
+            return moment(row[colnum.create_time]).format('YYYY-MM-DD HH:mm:ss')
+        },
+        // 重置方法
+        reset(){
+            Object.keys(this.query).forEach(key => {
+                console.info(key)
+                if (key!='page' && key!='limit') {
+                    this.query[key] = ''
+                }
+            });
+        },
+        // 审核人员下拉数据
+        getAuditList(){
+            auditList().then(res => {
+                // console.log(res);
+                if (res.code==100) {
+                    this.auditList=res.data.list
+                }
+            });
+        },
         // 获取 easy-mock 的模拟数据
         getData() {
-            fetchData(this.query).then(res => {
+            orderList(this.query).then(res => {
                 // console.log(res);
                 this.tableData = res.list;
                 this.pageTotal = res.pageTotal || 50;
@@ -202,7 +215,7 @@ export default {
         },
         // 分页导航
         handlePageChange(val) {
-            this.$set(this.query, 'pageIndex', val);
+            this.$set(this.query, 'page', val);
             this.getData();
         }
     }
diff --git a/src/router/index.js b/src/router/index.js
index cd3eedc..9166a0c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -137,7 +137,7 @@ export default new Router({
                 {
                     path: '/groundingAudit',
                     component: () => import(/* webpackChunkName: "groundingAudit" */ '../components/page/AssetManagement/groundingAudit.vue'),
-                    meta: { title: '资产上架审核' }
+                    meta: { title: '资产挂牌审核' }
                 },
                 {
                     path: '/releaseAudit',