Merge branch 'master' of https://gitee.com/mini-org-project/course_information_center_vue
This commit is contained in:
commit
ca625044d2
|
@ -37,13 +37,16 @@
|
|||
</div>
|
||||
</a-col>
|
||||
<a-col :span="24" v-if="listType == 1 || listType == '1'">
|
||||
<!-- <a-col :span="24" > -->
|
||||
<a-row style="text-align: center;">
|
||||
<a-col :span="12">
|
||||
<a-button type="primary" class="yyyClass" @click="toLivePage(item)" :disabled="!item.jsbh || !item.zhjsId || item.sftkb=='1'" style="color: white;">听课</a-button>
|
||||
<a-button type="primary" class="yyyClass" @click="toLivePage(item)" :disabled="!item.jsbh || !item.zhjsId || item.sftkb=='1'" v-if="item.sftkb!='1'" style="color: white;">听课</a-button>
|
||||
<a-button type="primary" class="yyyClass" @click="toLivePage(item)" :disabled="!item.jsbh || !item.zhjsId || item.sftkb=='1'" v-else style="color: white;" :title="`停课事由:`+item.tksy">停课</a-button>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" :disabled="item.sftkb=='1'" style="color: white;">评价</a-button>
|
||||
<a-col :span="12" v-if="item.sftkb=='1'">
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" :disabled="true" style="color: white;" :title="`停课事由:`+item.tksy">评价</a-button>
|
||||
</a-col>
|
||||
<a-col :span="12" v-else>
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" style="color: white;">评价</a-button>
|
||||
</a-col>
|
||||
<!-- <a-col :span="8">
|
||||
<a-button type="primary" class="bcClass" @click="handleBaocuo(item)">报错</a-button>
|
||||
|
@ -56,8 +59,13 @@
|
|||
<span v-if="props.type == 'zzsk'">
|
||||
<!-- 正在上课的,就给个评价 -->
|
||||
<!-- <a-button type="primary" class="bcClass" @click="funpingjia(item)" >评价</a-button> -->
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" v-if="pjDisabled" style="background-color: #dfdfdf;" disabled>评价</a-button>
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" v-else style="color: white;" :disabled="item.sftkb=='1'">评价</a-button>
|
||||
<span v-if="pjDisabled">
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" style="background-color: #dfdfdf;" disabled>评价</a-button>
|
||||
</span>
|
||||
<span v-else>
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" v-if="item.sftkb=='1'" style="color: white;" :disabled="true" :title="`停课事由:`+item.tksy">评价</a-button>
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" v-else style="color: white;" >评价</a-button>
|
||||
</span>
|
||||
</span>
|
||||
<span v-else>
|
||||
<a-button type="primary" class="yyyClass" disabled v-if="item.sfyy==1 && item.isdeleted==0">已预约</a-button>
|
||||
|
@ -65,9 +73,14 @@
|
|||
</span>
|
||||
</div>
|
||||
<div v-show="isNow(item)">
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" v-if="pjDisabled" style="background-color: #dfdfdf;" disabled>评价</a-button>
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" v-else :disabled="item.sftkb=='1'" style="color: white;">评价</a-button>
|
||||
</div>
|
||||
<span v-if="pjDisabled">
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" style="background-color: #dfdfdf;" disabled>评价</a-button>
|
||||
</span>
|
||||
<span v-else>
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" v-if="item.sftkb=='1'" :disabled="true" style="color: white;" :title="`停课事由:`+item.tksy">评价</a-button>
|
||||
<a-button type="primary" class="bcClass" @click="funpingjia(item)" v-else :disabled="true" style="color: white;">评价</a-button>
|
||||
</span>
|
||||
</div>
|
||||
<!-- <a-col :span="24"> -->
|
||||
<!-- <a-button type="primary" class="bcClass" @click="handleBaocuo(item)">报错</a-button> -->
|
||||
</a-col>
|
||||
|
|
|
@ -68,6 +68,7 @@ import { defHttp } from '/@/utils/http/axios';
|
|||
import { Modal } from 'ant-design-vue';
|
||||
import addModalPage from '/@/views/site/tingKeZuJi/components/addModal.vue';
|
||||
import { CloseOutlined } from '@ant-design/icons-vue';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
const { createMessage } = useMessage();
|
||||
enum Api {
|
||||
|
@ -155,7 +156,11 @@ function newFunction() {
|
|||
if(width<800){
|
||||
pageSize = 1;
|
||||
}
|
||||
listApi({ pageSize: pageSize, isdeleted: 0, userid: getUserId(), isOrderByNow: true,startTime:getSysConfig().bxqkssj,endTime:getSysConfig().bxqjssj }).then(res => {
|
||||
|
||||
//----------------20231024 新增需求过期的预约不显示-----------------------
|
||||
var startTime = dayjs(new Date()).format('YYYY-MM-DD')
|
||||
// var startTime = getSysConfig().bxqkssj;
|
||||
listApi({ pageSize: pageSize, isdeleted: 0, userid: getUserId(), isOrderByNow: true,startTime:startTime,endTime:getSysConfig().bxqjssj }).then(res => {
|
||||
list.value = (res?.records) ?? [];
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue