讲师管理bug

This commit is contained in:
zhangsir
2024-12-14 12:18:24 +08:00
parent f1ad9b18da
commit 31aea6411c
12 changed files with 591 additions and 130 deletions

View File

@@ -224,12 +224,12 @@ const columns = [
key: 'expense',
align: 'center',
},
{
title: '应发费用',
dataIndex: 'payableExpense',
key: 'payableExpense',
align: 'center',
},
// {
// title: '应发费用',
// dataIndex: 'payableExpense',
// key: 'payableExpense',
// align: 'center',
// },
{
title: '操作',
align: 'center',

View File

@@ -374,12 +374,12 @@ const columns = [
key: 'expense',
align: 'center',
},
{
title: '应发费用',
dataIndex: 'payableExpense',
key: 'payableExpense',
align: 'center',
},
// {
// title: '应发费用',
// dataIndex: 'payableExpense',
// key: 'payableExpense',
// align: 'center',
// },
{
title: '操作',
align: 'center',

View File

@@ -22,7 +22,7 @@
<a-descriptions title="基本信息" style="padding:0 20px;" bordered :column="3" :contentStyle="rowCenters" :labelStyle="rowCenter">
<!-- 一层 -->
<a-descriptions-item label="讲师头像"> <a-image
:width="55" style="border-radius: 50%;"
:width="55" style="border-radius: 50%;width:55px;height:55px;"
:src=formParam.photo
/></a-descriptions-item>
<a-descriptions-item label="讲师姓名">{{formParam.name||'-'}}</a-descriptions-item>

View File

@@ -20,7 +20,7 @@
<a-descriptions title="基本信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenters">
<!-- 一层 -->
<a-descriptions-item label="讲师头像">
<a-image :width="55" style="border-radius: 50%;" :src=formParam.photo />
<a-image :width="55" style="border-radius: 50%;width:55px;height:55px;" :src=formParam.photo />
</a-descriptions-item>
<a-descriptions-item label="讲师姓名">{{formParam.name}}/{{formParam.userNo}}</a-descriptions-item>
<a-descriptions-item label="讲师体系">{{formParam.tsystemName || '-'}}</a-descriptions-item>

View File

@@ -441,13 +441,13 @@ const changeOut = () => {
left: 0px !important;
}
.pover{
// ::v-deep .ant-select-selector{
// height: 30px !important;
// border-radius: 4px !important;
// line-height: 30px !important;
// }
::v-deep .ant-select-selector{
height: 40px !important;
border-radius: 8px !important;
line-height: 40px !important;
}
.search{
margin-top: 10px;
// margin-top: 10px;
}
.tree{
margin-top: 5px;

View File

@@ -67,9 +67,9 @@
</template>
</a-table>
</div>
<div style="margin-bottom: 100px">
<!-- <div style="margin-bottom: 100px">
<a-table v-if="threeList" :columns="columnsThree" :loading="formData?.loadingThree" :data-source="formData?.tableDataThree" :pagination="false"/>
</div>
</div> -->
</a-tab-pane>
</a-tabs>
</div>
@@ -80,6 +80,11 @@
<button class="btn2" @click="confirm">撤销编辑内容</button>
</div>
</div>
<a-modal :footer="null" width="800px" v-model:visible="visibleModal" title="审批记录详情">
<div style="margin: 20px;padding-bottom: 20px;">
<a-table :columns="columnsThree" :loading="formData?.loadingThree" :data-source="formData?.tableDataThree" :pagination="false"/>
</div>
</a-modal>
</a-drawer>
</template>
@@ -99,6 +104,7 @@ const props = defineProps({
}
});
const emit = defineEmits({});
const visibleModal = ref(false)
const columns = [
{
title: '组织的名称',
@@ -250,9 +256,11 @@ const approvalData = ref(null)
const threeList = ref(false)
const lookList = (record) => {
console.log(record,'resssssss')
if(!threeList.value||record.approvalId!=approvalData.value){
threeList.value = true
approvalData.value = record.approvalId
// if(!threeList.value||record.approvalId!=approvalData.value){
// threeList.value = true
// approvalData.value = record.approvalId
formData.value.tableDataThree = []
visibleModal.value = true
formData.value.loadingThree = true
api.getApprovalResultByApprovalIdList(record.approvalId).then(res=>{
if(res.data.code == 200){
@@ -264,10 +272,10 @@ const lookList = (record) => {
formData.value.loadingThree = false
message.error(err.data.msg)
})
}else{
threeList.value = false
approvalData.value = null
}
// }else{
// threeList.value = false
// approvalData.value = null
// }
}
const visible = ref(false);
watch(visible, (val)=>{