摘牌申请审核和资产评估订单

src/api/index.js

@@ -182,6 +182,23 @@ export const sendCheck = query => {
         data: query
     });
 };
+// 摘牌申请审核
+export const checkAssetOut = query => {
+    return request({
+        url: 'api/admin.Asset/checkAssetOut',
+        method: 'post',
+        data: query
+    });
+};
+//摘牌申请审核列表
+export const outCheckList = query => {
+    return request({
+        url: 'api/admin.Asset/outCheckList',
+        method: 'get',
+        params: query
+    });
+};
+
 
 /* 交易管理 */
 

src/components/common/Sidebar.vue

@@ -101,6 +101,14 @@ export default {
                             index: '/groundingAudit',
                             title: '资产审核'
                         },
+                        {
+                            index: '/assessmentOreder',
+                            title: '资产评估订单'
+                        },
+                        {
+                            index: '/delistingAudit',
+                            title: '摘牌申请审核'
+                        },
                         // {
                         //     index: '/releaseAudit',
                         //     title: '资产发布审核'

src/components/common/dialog/DataReview/assetsInfo.vue

@@ -18,6 +18,10 @@
     <p class="p_info">基本回报：{{contentDatas.asset_data.legal_name}}</p>
     <p class="p_info">额外回报：{{contentDatas.asset_data.domicile}}</p>
     <p class="p_info">其他：{{contentDatas.asset_data.establish_time }}</p>
+    <p class="p_info" v-if="contentDatas.asset_data.delist!=null">
+      摘牌申请详情：
+      <a :href="contentDatas.asset_data.delist" class="p_info_a">点击下载</a>
+    </p>
   </div>
 </template>
 <script>
@@ -28,7 +32,8 @@ export default {
   props:{
     contentDatas:{
       require: true
-    }
+    },
+
   },
   data() {
     return{
@@ -56,4 +61,7 @@ export default {
 </script>
 <style scoped>
   @import url('../../../../assets/css/sidebar.css');
+  .p_info_a{
+    text-decoration: underline;
+  }
 </style>

src/components/common/dialog/insex.vue

@@ -50,7 +50,7 @@
 <script>
 import {whySidebar} from '../dialog/sidebar.vue'
 import sidebarContent from '../dialog/content.vue'
-import {getAccountData,getAssetInfo,accountCheck,assertCheck,sendCheck} from '../../../api/index'
+import {getAccountData,getAssetInfo,accountCheck,assertCheck,sendCheck,checkAssetOut} from '../../../api/index'
 import bus from '../bus'
 export default {
   name:'whyDialog',
@@ -79,7 +79,7 @@ export default {
       type:Boolean,
       default:false,
     },
-    //dialogType为2时使用，1为资产信息查询，2为资产挂牌审核，3为资产发布审核
+    //dialogType为2时使用，1为资产信息查询，2为资产挂牌审核，3为资产发布审核，4为摘牌申请审核
     assets_type:{
       type:Number
     }
@@ -201,6 +201,9 @@ export default {
           this.dialogData.title='资产信息';
         }else if(this.assets_type==2){
           this.dialogData.title='资产托管审核';
+        }
+        else if(this.assets_type==4){
+          this.dialogData.title='摘牌申请审核';
         }else{
           this.dialogData.title='资产发布审核';
         }
@@ -220,11 +223,26 @@ export default {
           this.saveCartellinoCheck()
         }else if (this.assets_type==3) {
           this.saveSendCheck()
+        }else if (this.assets_type==4) {
+          this.checkAssetOut()
         }else{
           this.MisShow()
         }
       }
     },
+    // 摘牌申请审核
+    checkAssetOut(){
+      checkAssetOut(this.query).then(res => {
+        console.log(res);
+        if (res.code==100) {
+          this.MisShow()
+          this.$message.success('提交成功~');
+          this.$emit('getData')
+        }else{
+          this.$message.error(res.msg);
+        }
+      });
+    },
     // 资产发布审核
     saveSendCheck(){
       sendCheck(this.query).then(res => {

src/components/common/orderDialog/index.vue

@@ -52,7 +52,7 @@
         </el-tabs>
         <div class="order_switch">
           <span>订单状态</span>
-          <el-switch v-model="value1" @change="closeOrerd"></el-switch>
+          <el-switch v-model="value1" @change="closeOrerd" :disabled="orderInfos.order.status==8"></el-switch>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -95,7 +95,7 @@ export default ({
   data() {
     return{
       activeName: 'first',
-      value1:'',
+      value1:true,
       orderInfos:{
         asset:{},
         order:{}
@@ -153,6 +153,9 @@ export default ({
         console.info(res);
         if (res.code==100) {
           this.orderInfos=res.data
+          if (res.data.order.status==8) {
+            this.value1=false
+          }
         }
       })
     },

src/components/page/AssetManagement/assessmentOreder.vue

@@ -0,0 +1,247 @@
+<template>
+    <div>
+        <div class="crumbs">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item>
+                    <i class="el-icon-lx-cascades"></i> 资产管理
+                </el-breadcrumb-item>
+                <el-breadcrumb-item>资产评估订单</el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="container">
+            <div class="handle-box">
+                <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="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>
+            </div>
+            <el-table
+                :data="tableData"
+                border
+                class="table"
+                ref="multipleTable"
+                header-cell-class-name="table-header"
+            >
+                <el-table-column prop="id" label="序号" width="55" align="center"></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
+                            type="text"
+                            @click="orderDetails(scope.$index, scope.row)"
+                        >订单详情</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <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>
+
+        <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 } from '../../../api/index';
+import moment from 'moment'
+export default {
+    data() {
+        return {
+            orderShowVisible:false,
+            order_batchcode:'',
+            query: {
+                page: 1,
+                limit: 10,
+                batchcode:'',
+                firm_name:'',
+                pay_username:'',
+                account_name:'',
+                trade_type:'',
+                auditID:'',
+                time:'',
+                order_type:0,
+                type:1
+            },
+            tableData: [],
+            multipleSelection: [],
+            delList: [],
+            editVisible: false,
+            dialogID:'',
+            dialogType:3,
+            pageTotal: 0,
+            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]);
+                    },
+                    },
+                ],
+            },
+        };
+    },
+    components:{
+        whyDialog: () => import('../../common/dialog/insex.vue'),
+        orderDialog: () => import('../../common/orderDialog/index.vue')
+    },
+    created() {
+        this.getData();
+    },
+    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')
+        },
+        // 获取 easy-mock 的模拟数据
+        getData() {
+            orderList(this.query).then(res => {
+                console.log(res);
+                this.tableData = res.data.list;
+                this.pageTotal = res.data.count ;
+            });
+        },
+        // 触发搜索按钮
+        handleSearch() {
+            this.$set(this.query, 'pageIndex', 1);
+            this.getData();
+        },
+        // 编辑操作
+        handleEdit(index, row) {
+            this.dialogID=row.asset_id;
+            this.editVisible = true;
+        },
+        orderDetails(index, row) {
+            this.order_batchcode=row.batchcode;
+            this.orderShowVisible = true;
+        },
+        // 分页导航
+        handlePageChange(val) {
+            this.$set(this.query, 'page', val);
+            this.getData();
+        }
+    }
+};
+</script>
+
+<style scoped>
+.handle-box {
+    margin-bottom: 20px;
+}
+
+.handle-select {
+    width: 120px;
+}
+
+.handle-input {
+    width: 150px;
+    display: inline-block;
+}
+.table {
+    width: 100%;
+    font-size: 14px;
+}
+.red {
+    color: #ff0000;
+}
+.mr10 {
+    margin-right: 10px;
+}
+.table-td-thumb {
+    display: block;
+    margin: auto;
+    width: 40px;
+    height: 40px;
+}
+</style>

src/components/page/AssetManagement/assetQuery.vue

@@ -82,8 +82,10 @@
                         <el-button
                             type="text"
                             v-if="scope.row.asset_status==2"
-                            @click="operationRecord(scope.row)"
+                            @click="operationRecord(scope.row)">
-                        >{{scope.row | operationStatus}}</el-button>
+                            <!-- {{scope.row | operationStatus}} -->
+                            强制摘牌
+                        </el-button>
                         <el-button
                             type="text"
                             @click="blacklist( scope.row)"

src/components/page/AssetManagement/delistingAudit.vue

@@ -0,0 +1,245 @@
+<template>
+    <div>
+        <div class="crumbs">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item>
+                    <i class="el-icon-lx-cascades"></i> 资产管理
+                </el-breadcrumb-item>
+                <el-breadcrumb-item>摘牌申请审核</el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="container">
+            <div class="handle-box">
+                <el-input v-model="query.serial_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.apply_name" 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"
+                border
+                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="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.asset_check_status==0">待审核</span>
+                        <span v-else-if="scope.row.asset_check_status==1">审核通过</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="audit_staff_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>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <whyDialog v-if="editVisible" :isshow="editVisible" :dialogID="dialogID"
+            :dialogType="dialogType" @MisShow="MisShow" :isexamine="true" :assets_type="4" @getData="getData">
+            </whyDialog>
+        </div>
+
+    </div>
+</template>
+
+<script>
+import { outCheckList,auditList } from '../../../api/index';
+import moment from 'moment'
+export default {
+    name: 'basetable',
+    data() {
+        return {
+            query: {
+                account_name: '',
+                firm_name: '',
+                account_status: '',
+                audit_staff_name:'',
+                account_apply: '',
+                auditID: '',
+                time: '',
+                page: 1,
+                limit: 10
+            },
+            tableData: [],
+            multipleSelection: [],
+            delList: [],
+            auditList:[],
+            editVisible: false,
+            pageTotal: 0,
+            dialogID:'',
+            dialogType:2,
+            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]);
+                    },
+                    },
+                ],
+            },
+        };
+    },
+    components:{
+        whyDialog: () => import('../../common/dialog/insex.vue')
+    },
+    created() {
+        this.getData();
+        this.getAuditList();
+    },
+    methods: {
+        MisShow(){
+            this.editVisible=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() {
+            outCheckList(this.query).then(res => {
+                console.log(res);
+                this.tableData = res.data.list;
+                this.pageTotal = res.pageTotal || 50;
+            });
+        },
+        // 触发搜索按钮
+        handleSearch() {
+            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.editVisible = true;
+            this.dialogID=row.id;
+        },
+        // 保存编辑
+        saveEdit() {
+            this.editVisible = false;
+            this.$message.success(`修改第 ${this.idx + 1} 行成功`);
+            this.$set(this.tableData, this.idx, this.form);
+        },
+        // 分页导航
+        handlePageChange(val) {
+            this.$set(this.query, 'page', val);
+            this.getData();
+        }
+    }
+};
+</script>
+
+<style scoped>
+.handle-box {
+    margin-bottom: 20px;
+}
+
+.handle-select {
+    width: 120px;
+}
+
+.handle-input {
+    width: 150px;
+    display: inline-block;
+}
+.table {
+    width: 100%;
+    font-size: 14px;
+}
+.red {
+    color: #ff0000;
+}
+.mr10 {
+    margin-right: 10px;
+}
+.table-td-thumb {
+    display: block;
+    margin: auto;
+    width: 40px;
+    height: 40px;
+}
+</style>

src/router/index.js

@@ -137,13 +137,23 @@ export default new Router({
                 {
                     path: '/groundingAudit',
                     component: () => import(/* webpackChunkName: "groundingAudit" */ '../components/page/AssetManagement/groundingAudit.vue'),
-                    meta: { title: '资产挂牌审核' }
+                    meta: { title: '资产审核' }
                 },
                 {
                     path: '/releaseAudit',
                     component: () => import(/* webpackChunkName: "releaseAudit" */ '../components/page/AssetManagement/releaseAudit.vue'),
                     meta: { title: '资产发布审核' }
                 },
+                {
+                    path: '/assessmentOreder',
+                    component: () => import(/* webpackChunkName: "releaseAudit" */ '../components/page/AssetManagement/assessmentOreder.vue'),
+                    meta: { title: '资产评估订单' }
+                },
+                {
+                    path: '/delistingAudit',
+                    component: () => import(/* webpackChunkName: "releaseAudit" */ '../components/page/AssetManagement/delistingAudit.vue'),
+                    meta: { title: '摘牌申请审核' }
+                },
                 // 交易管理
                 {
                     path: '/transactionQuery',