odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 修复细节

Browse Source
This commit is contained in:
odjbin
2024-06-02 19:42:33 +08:00
parent 9ad29c3a13
commit 6bb97b4a1d
11 changed files with 172 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/components/DetailComponent/ExpenseDetail.vue
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>

2
src/components/DetailComponent/FileComponent.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-form-item label="需求上报附件" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'">
<file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>
<file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>{{fileList}}
<fvTable style="width: 100%;max-height: 400px;" v-if="processViewer" :tableConfig="tableConfig"
:data="fileList" :isSettingCol="false" :pagination="false">
<template #empty>

38
src/components/DetailComponent/SummaryDetail.vue
View File

@@ -3,7 +3,7 @@
<el-form :model="localFormData" ref="summaryForm" :rules="rules">
<el-row gutter="50">
<el-col :span="12">
<el-form-item label="名称" prop="projectName">
<el-form-item label="项目名称" prop="projectName">
<span>{{ localFormData.projectName }}</span>
</el-form-item>
</el-col>
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="结束时间" prop="endTime">
<span>{{ formData.endTime }}</span>
<span>{{ localFormData.endTime }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -73,7 +73,9 @@
</el-col>
<el-col :span="12">
<el-form-item label="知识产权状况" prop="intellectualProperty">
<span>{{ filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty) }}</span>
<span>{{
filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)
}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -129,33 +131,11 @@
</el-button>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24">
<file-component title="需求上报附件" tag="需求上报"
:file-list="localFormData.fileList"
:file-list-show="fileListShow"/>
<!-- <el-form-item label="需求上报附件">-->
<!-- <file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>-->
<!-- <fvTable style="width: 100%;max-height: 400px;" v-if="processViewer" :tableConfig="tableConfig"-->
<!-- :data="localFormData.fileList" :isSettingCol="false" :pagination="false">-->
<!-- <template #empty>-->
<!-- <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>-->
<!-- </template>-->
<!-- </fvTable>-->
<!-- </el-form-item>-->
</el-col>
<!-- <el-col :span="24">-->
<!-- <div v-if="data.taskId">-->
<!-- <baseTitle title="审核意见"></baseTitle>-->
<!-- <el-form-item prop="auditOpinion">-->
<!-- <el-input-->
<!-- v-model="localFormData.auditOpinion"-->
<!-- :rows="3"-->
<!-- type="textarea"-->
<!-- placeholder="请输入审核意见"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
</el-row>
<div class="approval-record">
<baseTitle title="审批记录"></baseTitle>
@@ -165,10 +145,6 @@
<process-diagram-viewer v-if="processViewer" id-name="summaryProcess"/>
</div>
</div>
<!-- <div class="oper-page-btn" v-if="data.state === '1' && data.taskId">-->
<!-- <el-button @click="handleReject(summaryForm)">驳回</el-button>-->
<!-- <el-button color="#DED0B2" @click="handleAgree">同意</el-button>-->
<!-- </div>-->
</el-form>
</div>
</template>
@@ -252,8 +228,6 @@ const handleDownload = (row) => {
})
}
watch(() => props.processViewer, (newVal) => {
props.processViewer = newVal
}, {deep: true})

2
src/components/TagAndFileUpload.vue
View File

@@ -42,7 +42,7 @@ const props = defineProps({
},
})
const rules = reactive({
tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
tagName: [{required: true, message: '请输入标签名称', trigger: ['blur', 'change']}],
})
const tagForm = ref()
const showTable = ref(true)

10
src/components/steps/index.vue
View File

@@ -45,6 +45,11 @@ const props = defineProps({
stepSuccess: {
type: Array,
default: ['00']
},
//直接上报/需求征集
reportType:{
type: String,
default: ''
}
})
@@ -238,6 +243,11 @@ getBaseInfo()
watchEffect(() => {
localActive.value = props.active
})
watchEffect(() => {
if(props.reportType==='direct'){
localSteps.value=localSteps.value.slice(1)
}
})
</script>
<style lang="scss" scoped>