fix : 修复细节

This commit is contained in:
2024-06-02 19:42:33 +08:00
parent 9ad29c3a13
commit 6bb97b4a1d
11 changed files with 172 additions and 159 deletions

View File

@@ -2,16 +2,6 @@
<div v-loading="loading">
<el-form :model="formData" ref="form" class="query-form" label-width="auto">
<el-row>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="分摊名称">-->
<!-- <span>{{ formData.shareName }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="分摊月份">-->
<!-- <span>{{ formData.apportionmentMonth }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="24">
<el-form-item>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
@@ -19,7 +9,7 @@
</el-col>
<el-col :span="24">
<el-form-item>
<el-table :data="formData.usrAllocationList" style="width: 100%">
<el-table :data="detailList" style="width: 100%">
<el-table-column prop="projectId" label="项目名称" width="180"/>
<el-table-column prop="researchPersonnel" label="研发人员" width="180"/>
<el-table-column prop="wagesPayable" label="应发工资"/>
@@ -30,40 +20,14 @@
<el-table-column prop="workday" label="工作日(天)"/>
<el-table-column prop="researchDuration" label="研发时长(天)"/>
</el-table>
</el-form-item>
</el-col>
<el-col :span="24">
<div v-if="formData.taskId">
<baseTitle title="审核意见"></baseTitle>
<el-form-item prop="auditOpinion">
<el-input
v-model="formData.auditOpinion"
:rows="3"
type="textarea"
placeholder="请输入审核意见"
/>
</el-form-item>
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="approval-record">
<baseTitle title="审批记录"></baseTitle>
<div class="process">
<operation-render v-if="processViewer" :operation-list="data.operationList"
:state="data.state"/>
<process-diagram-viewer v-if="processViewer" id-name="collectionProcess"/>
</div>
</div>
<opinion v-if="data.taskId" :formData="data.formData" :taskId="data.taskId"></opinion>
</div>
</template>
<script setup lang="jsx">
import OperationRender from '@/views/workflow/common/OperationRender.vue'
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
const searchConfig = reactive([
{
@@ -100,7 +64,6 @@ const searchConfig = reactive([
},
])
const tableIns = ref()
const tableData = ref([])
const props = defineProps({
formData: {
type: Array,
@@ -110,9 +73,9 @@ const props = defineProps({
type: Array,
default: []
},
processViewer: {
type: Boolean,
default: false
detailList: {
type: Array,
default: []
},
loading: {
type: Boolean,
@@ -121,7 +84,7 @@ const props = defineProps({
})
const search = (val) => {
tableConfig.params = {...val}
// tableIns.value.refresh()
tableIns.value.refresh()
}
</script>