mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-13 04:46:46 +08:00
讲师管理bug
This commit is contained in:
@@ -60,8 +60,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="btnn">
|
<div class="btnn">
|
||||||
<button class="btn1" @click="config">确认提交审批</button>
|
<button class="btn1" @click="config">提交审批</button>
|
||||||
<button class="btn1" @click="qureyDrawer">确认至审批中心</button>
|
<button class="btn1" @click="qureyDrawer">保存至审批中心</button>
|
||||||
<button class="btn2" @click="closeDrawer">取消</button>
|
<button class="btn2" @click="closeDrawer">取消</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -218,7 +218,7 @@ const removeId = (e,i) =>{
|
|||||||
}else{
|
}else{
|
||||||
expenseList.value = expenseList.value.filter(item=>item.id !== e.id)
|
expenseList.value = expenseList.value.filter(item=>item.id !== e.id)
|
||||||
}
|
}
|
||||||
forData.value[indexList.value].summaryTotal = forData.value[indexList.value]?.summaryTotal - e.payableExpense
|
forData.value[indexList.value].summaryTotal = (forData.value[indexList.value]?.summaryTotal - e.payableExpense).toFixed(2)
|
||||||
if(!forData.value[indexList.value].expenseList.length){
|
if(!forData.value[indexList.value].expenseList.length){
|
||||||
forData.value.splice(indexList.value,1)
|
forData.value.splice(indexList.value,1)
|
||||||
forData.value.length > 0 && clickItem(forData.value[0],0)
|
forData.value.length > 0 && clickItem(forData.value[0],0)
|
||||||
|
|||||||
@@ -64,11 +64,11 @@
|
|||||||
<a-tab-pane key="2" tab="审批记录" force-render>
|
<a-tab-pane key="2" tab="审批记录" force-render>
|
||||||
<div style="margin-bottom: 20px">
|
<div style="margin-bottom: 20px">
|
||||||
<a-table :columns="columnsTwo" :loading="formData?.loadingTwo" :data-source="formData?.tableDataTwo" :pagination="pagination">
|
<a-table :columns="columnsTwo" :loading="formData?.loadingTwo" :data-source="formData?.tableDataTwo" :pagination="pagination">
|
||||||
<template #action="{ record }">
|
<!-- <template #action="{ record }">
|
||||||
<div class="action">
|
<div class="action">
|
||||||
<div style="color: #1890ff;cursor: pointer;" class="btn" @click="lookList(record)">查看</div>
|
<div style="color: #1890ff;cursor: pointer;" class="btn" @click="lookList(record)">查看</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template> -->
|
||||||
</a-table>
|
</a-table>
|
||||||
</div>
|
</div>
|
||||||
<!-- <div style="margin-bottom: 100px">
|
<!-- <div style="margin-bottom: 100px">
|
||||||
@@ -244,18 +244,18 @@ const columnsTwo = ref([
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '审批人',
|
title: '提交人',
|
||||||
dataIndex: 'employeeName',
|
dataIndex: 'employeeName',
|
||||||
key: 'employeeName',
|
key: 'employeeName',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
title: '操作',
|
// title: '操作',
|
||||||
dataIndex: 'address',
|
// dataIndex: 'address',
|
||||||
key:'age',
|
// key:'age',
|
||||||
align: 'center',
|
// align: 'center',
|
||||||
slots: { customRender: "action" },
|
// slots: { customRender: "action" },
|
||||||
}
|
// }
|
||||||
])
|
])
|
||||||
const approvalData = ref(null)
|
const approvalData = ref(null)
|
||||||
const threeList = ref(false)
|
const threeList = ref(false)
|
||||||
|
|||||||
@@ -837,7 +837,7 @@ export default {
|
|||||||
}).then(res=>{
|
}).then(res=>{
|
||||||
message.success('移除成功')
|
message.success('移除成功')
|
||||||
search()
|
search()
|
||||||
state.formData.summaryTotal = Number(state.formData.summaryTotal) - Number(record.expense)
|
state.formData.summaryTotal = (Number(state.formData.summaryTotal) - Number(record.expense)).toFixed(2)
|
||||||
}).catch(err=>{
|
}).catch(err=>{
|
||||||
message.error(err.msg)
|
message.error(err.msg)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -95,7 +95,7 @@
|
|||||||
<!-- <a-button type="link" @click="() => handleOperate(record, String(record.courseform))">审批</a-button> -->
|
<!-- <a-button type="link" @click="() => handleOperate(record, String(record.courseform))">审批</a-button> -->
|
||||||
<!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
|
<!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
|
||||||
<!-- <a-button v-if="record.status == 4" type="link" @click="submit(record)">提交</a-button> -->
|
<!-- <a-button v-if="record.status == 4" type="link" @click="submit(record)">提交</a-button> -->
|
||||||
<a-button v-if="record.status == 2" type="link" @click="withdraw(record)">撤回</a-button>
|
<a-button v-if="record.status == 2&&false" type="link" @click="withdraw(record)">撤回</a-button>
|
||||||
</a-space>
|
</a-space>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
@@ -136,9 +136,9 @@
|
|||||||
<a-descriptions style="margin-top:16px" bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
|
<a-descriptions style="margin-top:16px" bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
|
||||||
<a-descriptions-item label="审批编号">{{formParam?.approvalNumber||'-'}}</a-descriptions-item>
|
<a-descriptions-item label="审批编号">{{formParam?.approvalNumber||'-'}}</a-descriptions-item>
|
||||||
<a-descriptions-item label="培训发生组织">{{formParam?.trainOrgName||'-'}}</a-descriptions-item>
|
<a-descriptions-item label="培训发生组织">{{formParam?.trainOrgName||'-'}}</a-descriptions-item>
|
||||||
<a-descriptions-item v-if="activeKey==2" label="汇总周期" >{{formParam?.summaryDate||'-'}}</a-descriptions-item>
|
<a-descriptions-item label="汇总时间" >{{formParam?.summaryTime||'-'}}</a-descriptions-item>
|
||||||
<a-descriptions-item label="提交时间">{{formParam?.approvalSubmitTime||'-'}}</a-descriptions-item>
|
|
||||||
<a-descriptions-item label="汇总金额">{{formParam?.summaryTotal||'-'}}</a-descriptions-item>
|
<a-descriptions-item label="汇总金额">{{formParam?.summaryTotal||'-'}}</a-descriptions-item>
|
||||||
|
<a-descriptions-item label="提交时间">{{formParam?.approvalSubmitTime||'-'}}</a-descriptions-item>
|
||||||
<a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'审核拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
|
<a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'审核拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
|
||||||
</a-descriptions>
|
</a-descriptions>
|
||||||
<!-- <span>审批详情</span> -->
|
<!-- <span>审批详情</span> -->
|
||||||
@@ -165,7 +165,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</a-tab-pane>
|
</a-tab-pane>
|
||||||
<a-tab-pane key="2" tab="讲师费审批记录" force-render>
|
<a-tab-pane key="2" tab="讲师费审批记录" force-render v-if="false">
|
||||||
<div style="padding-bottom:70px">
|
<div style="padding-bottom:70px">
|
||||||
<a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columnsExamineTwo"
|
<a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columnsExamineTwo"
|
||||||
:data-source="tableDataExamineTwo" :loading="tableDataExamineLoading" @expand="expandTable" :pagination="false">
|
:data-source="tableDataExamineTwo" :loading="tableDataExamineLoading" @expand="expandTable" :pagination="false">
|
||||||
|
|||||||
@@ -536,11 +536,11 @@
|
|||||||
<a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
|
<a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
|
||||||
<a-descriptions-item label="备注 ">{{formParam.remark || '-'}}</a-descriptions-item>
|
<a-descriptions-item label="备注 ">{{formParam.remark || '-'}}</a-descriptions-item>
|
||||||
</a-descriptions>
|
</a-descriptions>
|
||||||
<div style="margin-bottom: 20px;">
|
<div style="margin-bottom: 20px;" v-if="false">
|
||||||
<span class="line"></span>
|
<span class="line"></span>
|
||||||
<span style="font-weight: 600;">讲师费审批</span>
|
<span style="font-weight: 600;">讲师费审批</span>
|
||||||
</div>
|
</div>
|
||||||
<div style="margin-bottom:32px;">
|
<div style="margin-bottom:32px;" v-if="false">
|
||||||
<a-table :columns="columnSee" :loading="SeeLoading" :data-source="tableDataSee" :pagination="false" />
|
<a-table :columns="columnSee" :loading="SeeLoading" :data-source="tableDataSee" :pagination="false" />
|
||||||
</div>
|
</div>
|
||||||
<!-- <span class="line"></span> -->
|
<!-- <span class="line"></span> -->
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
<div style="color: #1890ff;cursor: pointer;">查看</div>
|
<div style="color: #1890ff;cursor: pointer;">查看</div>
|
||||||
</lockLecturer>
|
</lockLecturer>
|
||||||
<a-button v-if="record.status!=2" type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
|
<a-button v-if="record.status!=2" type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
|
||||||
<a-button v-if="record.status==2" type="link" @click="() => updateModal(record)">撤回</a-button>
|
<a-button v-if="record.status==2&&false" type="link" @click="() => updateModal(record)">撤回</a-button>
|
||||||
<a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
|
<a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
|
||||||
</a-space>
|
</a-space>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
Reference in New Issue
Block a user