院线通订单管理模块小调整

src/views/school-center/yxtManager/exchangeCoupon.vue

@@ -20,7 +20,7 @@
                             </a-select>
                             </a-select>
                         </a-form-item>
                         </a-form-item>
                     </a-col>
                     </a-col>
-                    <a-col :md="6" :sm="12">
+                    <a-col :md="6" :sm="12" v-show="false">
                         <a-form-item label="上架状态">
                         <a-form-item label="上架状态">
                             <a-select v-model="queryParam.shelfState" style="width: 15rem;">
                             <a-select v-model="queryParam.shelfState" style="width: 15rem;">
                                 <a-select-option key="">--全部--</a-select-option>
                                 <a-select-option key="">--全部--</a-select-option>
@@ -94,19 +94,20 @@
             <template slot="validityPeriod" slot-scope="text">
             <template slot="validityPeriod" slot-scope="text">
                 {{ text | dayjs}}
                 {{ text | dayjs}}
             </template>
             </template>
-            <template slot="shelfState" slot-scope="text">
+            <!--<template slot="shelfState" slot-scope="text">
                 <p v-if="text==1">已上架</p>
                 <p v-if="text==1">已上架</p>
                 <p v-if="text==2">已下架</p>
                 <p v-if="text==2">已下架</p>
                 <p v-else=""></p>
                 <p v-else=""></p>
-            </template>
+            </template>-->
             <template slot="state" slot-scope="text">
             <template slot="state" slot-scope="text">
                 <p v-if="text==1">未售出</p>
                 <p v-if="text==1">未售出</p>
                 <p v-if="text==2">已售出</p>
                 <p v-if="text==2">已售出</p>
-                <p v-else="">售出中</p>
+                <p v-if="text==3">售出中</p>
+                <p v-else=""></p>
             </template>
             </template>
             <template slot="operation" slot-scope="text,record">
             <template slot="operation" slot-scope="text,record">
                 <span>
                 <span>
-                    <a-popconfirm title="确定删除吗" v-if="record.delFlag == 0" @confirm="remove(record,1)">
+                    <a-popconfirm title="确定删除吗" v-if="record.state == 1" @confirm="remove(record,1)">
                         <a>删除</a>
                         <a>删除</a>
                     </a-popconfirm>
                     </a-popconfirm>
                     <a-popconfirm title="确定恢复删除吗" v-if="record.delFlag == 1" @confirm="remove(record,0)">
                     <a-popconfirm title="确定恢复删除吗" v-if="record.delFlag == 1" @confirm="remove(record,0)">
@@ -186,7 +187,7 @@
                     {dataIndex: 'cardNumber', width: 40, title: '兑换券账号'},
                     {dataIndex: 'cardNumber', width: 40, title: '兑换券账号'},
                     {dataIndex: 'password', width: 20, title: '密码'},
                     {dataIndex: 'password', width: 20, title: '密码'},
                     {dataIndex: 'state', width: 20, title: '出售状态 ', scopedSlots: {customRender: 'state'}},
                     {dataIndex: 'state', width: 20, title: '出售状态 ', scopedSlots: {customRender: 'state'}},
-                    {dataIndex: 'shelfState', width: 20, title: '上架状态 ', scopedSlots: {customRender: 'shelfState'}},
+                    /*{dataIndex: 'shelfState', width: 20, title: '上架状态 ', scopedSlots: {customRender: 'shelfState'}},*/
                     {
                     {
                         dataIndex: 'validityPeriod',
                         dataIndex: 'validityPeriod',
                         width: 40,
                         width: 40,

src/views/school-center/yxtManager/yxtOrder.vue

@@ -158,7 +158,8 @@
                 <template slot="state2" slot-scope="text">
                 <template slot="state2" slot-scope="text">
                     <p v-if="text==1">未售出</p>
                     <p v-if="text==1">未售出</p>
                     <p v-if="text==2">已售出</p>
                     <p v-if="text==2">已售出</p>
-                    <p v-else="">售出中</p>
+                    <p v-if="text==3">售出中</p>
+                    <p v-else=""></p>
                 </template>
                 </template>
                 <template v-for="col in ['cardNumber', 'state', 'shelfState','validityPeriod','updateDate']" :slot="col" slot-scope="text, record, index">
                 <template v-for="col in ['cardNumber', 'state', 'shelfState','validityPeriod','updateDate']" :slot="col" slot-scope="text, record, index">
                     <div :key="col">
                     <div :key="col">