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-20 14:39:24 +08:00
parent 255dbe67e0
commit 4c8959e3c4
2 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/expense-management/share/add.vue
View File

@@ -125,14 +125,23 @@
<el-button type="primary" @click="handleAdd" link style="font-size: 18px">添加一行</el-button>
</div>
<div class="approval-record">
<div style="display: flex;align-items: center;justify-content: flex-end;">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"
style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
/>
<div class="approval-title">
<baseTitle title="审批记录"></baseTitle>
<div style="display: flex;align-items: center;justify-content: flex-end;">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"
style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
/>
</div>
</div>
<div class="process">
<operation-render
v-if="processDiagramViewer&& opentionData.operationList && opentionData.operationList.length > 0&&!changeDiagram"
:operation-list="opentionData.operationList"
:state="opentionData.state"/>
<process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
</div>
<process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
</div>
<div class="oper-page-btn">
<el-button color="#DED0B2" v-if="routerName==='Share/add'" @click="handleSubmit(form)">提交</el-button>
@@ -156,6 +165,7 @@ import {
} from "@/api/expense-manage";
import {useProcessStore} from '@/stores/processStore.js';
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
import OperationRender from '@/views/workflow/common/OperationRender.vue'
const changeDiagram = ref(false)
const rules = reactive({
@@ -172,6 +182,7 @@ const rules = reactive({
researchDuration: [{required: true, message: '请输入研发时长', trigger: 'blur'}],
})
const processStore = useProcessStore()
const opentionData = ref()
const processInstanceData = ref()
const processDiagramViewer = ref(false)
const loading = ref(false)
@@ -332,6 +343,7 @@ const getDetailInfo = async () => {
if (res.code === 1000) {
getDetailList()
formData.value = res.data.formData
opentionData.value = res.data
loading.value = false
}
})

24
src/views/special-fund/add.vue
View File

@@ -27,14 +27,23 @@
</template>
</fvTable>
<div class="approval-record">
<div style="display: flex;align-items: center;justify-content: flex-end;">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"
style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
/>
<div class="approval-title">
<baseTitle title="审批记录"></baseTitle>
<div style="display: flex;align-items: center;justify-content: flex-end;">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"
style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
/>
</div>
</div>
<div class="process">
<operation-render
v-if="processDiagramViewer&& formData.operationList && formData.operationList.length > 0&&!changeDiagram"
:operation-list="formData.operationList"
:state="formData.state"/>
<process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
</div>
<process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
</div>
<div class="oper-page-btn">
<el-button color="#DED0B2" v-if="routerName === 'Fund/add'" @click="handleSubmit(fundForm)">提交</el-button>
@@ -53,6 +62,7 @@ import {useTagsView} from '@/stores/tagsview.js'
import {useProcessStore} from '@/stores/processStore.js';
import {downloadFile, deleteFile} from "@/api/project-demand";
import OperationRender from '@/views/workflow/common/OperationRender.vue'
const changeDiagram = ref(false)
const tagsViewStore = useTagsView()
const router = useRouter()