diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index 411e670..2443bed 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -117,10 +117,10 @@ export default {
                     index: '3',
                     title: '交易管理',
                     subs:[
-                        // {
-                        //     index: '/transactionQuery',
-                        //     title: '交易订单查询'
-                        // },
+                        {
+                            index: '/transactionQuery',
+                            title: '交易订单查询'
+                        },
                         {
                             index: '/TobepaidOrder',
                             title: '待付款订单'
diff --git a/src/components/common/dialog/DataReview/assetsInfo.vue b/src/components/common/dialog/DataReview/assetsInfo.vue
index 842c1e8..d5bdd24 100644
--- a/src/components/common/dialog/DataReview/assetsInfo.vue
+++ b/src/components/common/dialog/DataReview/assetsInfo.vue
@@ -11,7 +11,7 @@
       />
     </div>
     <p class="p_info">资产名称：{{contentDatas.asset_data.serial_name}}</p>
-    <p class="p_info">资产类型：{{contentDatas.asset_data.asset_type_id}}</p>
+    <p class="p_info">资产类型：{{contentDatas.asset_data.asset_type_name}}</p>
     <p class="p_info">转让价格：￥{{contentDatas.asset_data.price}}元/{{contentDatas.asset_data.asset_unit}}</p>
     <p class="p_info">涉及数量：{{contentDatas.asset_data.count}}</p>
     <p class="p_info">资产转让有效期：{{contentDatas.asset_data.reg_money}}</p>
diff --git a/src/components/common/orderDialog/index.vue b/src/components/common/orderDialog/index.vue
index 635e4fe..bbde12a 100644
--- a/src/components/common/orderDialog/index.vue
+++ b/src/components/common/orderDialog/index.vue
@@ -26,6 +26,7 @@
             <p class="order_info_p">快递单号：{{orderInfos.order.express_id}} </p>
             <br/>
             <p class="order_info_p">资产名称：{{orderInfos.asset.serial_name}} </p>
+            <p class="order_info_p">资产类型：{{orderInfos.asset.asset_type_name}} </p>
             <p class="order_info_p">转让单价：{{orderInfos.asset.price}} </p>
             <p class="order_info_p">交易数量：{{orderInfos.order.count}} </p>
             <p class="order_info_p">交易金额：{{orderInfos.order.price}} </p>
@@ -51,20 +52,33 @@
         </el-tabs>
         <div class="order_switch">
           <span>订单状态</span>
-          <el-switch
-            v-model="value1"
-            >
-          </el-switch>
+          <el-switch v-model="value1" @change="closeOrerd"></el-switch>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="settlement" v-if="orderInfos.order.status==5">结 算</el-button>
         <el-button @click="MisShow">返 回</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="提示" :visible.sync="editVisible2" width="30%">
+      <p class="recordTips">请输入关闭订单原因：</p>
+      <div class="msg">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="query.message">
+        </el-input>
+      </div>
+      <span slot="footer" class="dialog-footer">
+          <el-button @click="editVisible2 = false">取 消</el-button>
+          <el-button type="primary" @click="close">确 定</el-button>
+      </span>
+  </el-dialog>
   </div>
 </template>
 <script>
-import { orderInfo } from '../../../api/index'
+import { orderInfo ,close,settlement} from '../../../api/index'
 export default ({
   name:'orderDialog',
   props:{
@@ -85,13 +99,51 @@ export default ({
       orderInfos:{
         asset:{},
         order:{}
-      }
+      },
+      query:{
+        message:'',
+        batchcode:''
+      },
+      editVisible2:false
     }
   },
   created(){
     this.getData()
+    this.query.batchcode=this.batchcode
   },
   methods:{
+    settlement(){
+      let data={batchcode:this.batchcode}
+      settlement(data).then(res=>{
+          console.info(res)
+          if (res.code==100) {
+              this.$message.success('结算订单成功！');
+          }else{
+              this.$message.error(res.msg)
+          }
+      })
+    },
+    close(){
+      if (this.query.message=='') {
+        this.$message.error('请输入关闭订单的原因！')
+      }else{
+        close(this.query).then(res=>{
+            console.info(res)
+            if (res.code==100) {
+                this.$message.success('关闭订单成功！')
+                this.MisShow();
+            }else{
+                this.$message.error(res.msg)
+            }
+        })
+      }
+    },
+    closeOrerd(res){
+      console.info(res)
+      if (!res) {
+        this.editVisible2=true
+      }
+    },
     handleClick(tab, event) {
       console.log(tab, event);
     },
@@ -155,4 +207,10 @@ export default ({
     cursor: pointer;
     margin-left: 15px;
 }
+  .textarea{
+    margin-top: 10px;
+  }
+  .msg{
+    margin-top: 15px;
+  }
 </style>
diff --git a/src/components/page/TransactionManagement/completed.vue b/src/components/page/TransactionManagement/completed.vue
index 012dcb9..8bea514 100644
--- a/src/components/page/TransactionManagement/completed.vue
+++ b/src/components/page/TransactionManagement/completed.vue
@@ -168,7 +168,7 @@ export default {
             close(data).then(res=>{
                 console.info(res)
                 if (res.code==100) {
-                    this.$message.success('结算订单成功！')
+                    this.$message.success('关闭订单成功！')
                     this.getData();
                 }else{
                     this.$message.error(res.msg)
diff --git a/src/components/page/TransactionManagement/transactionQuery.vue b/src/components/page/TransactionManagement/transactionQuery.vue
index 196f446..f27cc3e 100644
--- a/src/components/page/TransactionManagement/transactionQuery.vue
+++ b/src/components/page/TransactionManagement/transactionQuery.vue
@@ -5,41 +5,37 @@
                 <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 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
+                <el-input  placeholder="订单编号" v-model="query.batchcode" class="handle-input mr10"></el-input>
+                <el-input v-model="query.firm_name" placeholder="商家名称" class="handle-input mr10"></el-input>
+                <el-input  placeholder="摘牌方名称" v-model="query.pay_username" class="handle-input mr10"></el-input>
+                <el-input  placeholder="资产名称" v-model="query.account_name" class="handle-input mr10"></el-input>
+                <el-select  placeholder="交易方式" v-model="query.trade_type" 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 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="timestamp"
+                    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>
-                <br/>
-                <el-button type="primary" plain  @click="reset" class="reset">重置</el-button>
             </div>
             <el-table
                 :data="tableData"
@@ -47,28 +43,43 @@
                 class="table"
                 ref="multipleTable"
                 header-cell-class-name="table-header"
-                @selection-change="handleSelectionChange"
             >
                 <el-table-column prop="id" label="序号" width="55" align="center"></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>
-                <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 prop="create_time" label="创建时间" :formatter="formatDate"></el-table-column>
+                <el-table-column label="订单编号" prop="batchcode"></el-table-column>
+                <el-table-column prop="sell_firm_name" label="商家名称"></el-table-column>
+                <el-table-column label="资产名称" prop="serial_name"></el-table-column>
+                <el-table-column label="摘牌方名称" prop="firm_name"></el-table-column>
+                <el-table-column  label="交易方式">
+                    <template slot-scope="scope">
+                        <span>{{scope.row.order_pay_mode==1? '线下':'网银'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="count" label="交易数量"></el-table-column>
+                <el-table-column prop="price" label="交易金额"></el-table-column>
+                <el-table-column  label="交易状态" align="center">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.status==0">待付款</span>
+                        <span v-else-if="scope.row.status==1">待审核付款</span>
+                        <span v-else-if="scope.row.status==2">待上传签约合同</span>
+                        <span v-else-if="scope.row.status==3">待确认签约合同</span>
+                        <span v-else-if="scope.row.status==4">待交付</span>
+                        <span v-else-if="scope.row.status==5">待确认交付</span>
+                        <span v-else-if="scope.row.status==6">待结算</span>
+                        <span v-else-if="scope.row.status==7">已完成</span>
+                        <span v-else-if="scope.row.status==8">已关闭</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="auditID_name" label="审核人员"></el-table-column>
                 <el-table-column label="操作" width="280" align="center">
                     <template slot-scope="scope">
                         <el-button
                             type="text"
                             @click="handleEdit(scope.$index, scope.row)"
-                        >资料查看</el-button>
+                        >资产查看</el-button>
                         <el-button
                             type="text"
-                            @click="handleDelete(scope.$index, scope.row)"
+                            @click="orderDetails(scope.$index, scope.row)"
                         >订单详情</el-button>
                     </template>
                 </el-table-column>
@@ -85,33 +96,41 @@
             </div>
         </div>
 
+        <whyDialog v-if="editVisible" :isshow="editVisible" :dialogID="dialogID"
+        :dialogType="dialogType" @MisShow="MisShow"  :assets_type="1" >
+        </whyDialog>
+        <orderDialog v-if="orderShowVisible" :isshow="orderShowVisible" :batchcode="order_batchcode"
+            @orderShow="orderShow"  >
+        </orderDialog>
     </div>
 </template>
 
 <script>
-import { orderList ,auditList} from '../../../api/index';
+import { orderList } from '../../../api/index';
 import moment from 'moment'
 export default {
-    name: 'basetable',
     data() {
         return {
+            orderShowVisible:false,
+            order_batchcode:'',
             query: {
-                batchcode: '',
-                firm_name: '',
-                pay_username: '',
-                account_name: '',
-                trade_type: '',
-                trade_status: '',
-                auditID: '',
-                time: '',
                 page: 1,
-                limit: 10
+                limit: 10,
+                batchcode:'',
+                firm_name:'',
+                pay_username:'',
+                account_name:'',
+                trade_type:'',
+                auditID:'',
+                time:'',
+                order_type:0
             },
             tableData: [],
             multipleSelection: [],
             delList: [],
-            auditList:[],
             editVisible: false,
+            dialogID:'',
+            dialogType:3,
             pageTotal: 0,
             pickerOptions: {
                 shortcuts: [
@@ -146,39 +165,30 @@ export default {
             },
         };
     },
+    components:{
+        whyDialog: () => import('../../common/dialog/insex.vue'),
+        orderDialog: () => import('../../common/orderDialog/index.vue')
+    },
     created() {
         this.getData();
-        this.getAuditList();
     },
     methods: {
+        MisShow(){
+            this.editVisible=false
+        },
+        orderShow(){
+            this.orderShowVisible=false
+        },
         //时间戳转换时间
         formatDate(row,colnum){
             return moment(row.create_time*1000).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() {
             orderList(this.query).then(res => {
                 console.log(res);
-                this.tableData = res.list;
-                this.pageTotal = res.count;
+                this.tableData = res.data.list;
+                this.pageTotal = res.data.count ;
             });
         },
         // 触发搜索按钮
@@ -186,33 +196,14 @@ export default {
             this.$set(this.query, 'pageIndex', 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;
-            this.form = row;
+            this.dialogID=row.asset_id;
             this.editVisible = true;
         },
-        // 保存编辑
-        saveEdit() {
-            this.editVisible = false;
-            this.$message.success(`修改第 ${this.idx + 1} 行成功`);
-            this.$set(this.tableData, this.idx, this.form);
+        orderDetails(index, row) {
+            this.order_batchcode=row.batchcode;
+            this.orderShowVisible = true;
         },
         // 分页导航
         handlePageChange(val) {
@@ -252,7 +243,4 @@ export default {
     width: 40px;
     height: 40px;
 }
-.reset{
-    margin-top: 10px;
-}
 </style>