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-11 20:14:49 +08:00
parent b425e709aa
commit 208584c34b
11 changed files with 103 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/styles/index.scss
View File

@@ -551,7 +551,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
}
.approval-record {
padding-bottom: 30px;
//padding-bottom: 30px;
position: relative;
.approval-title {
display: flex;

68
src/components/DetailComponent/ProjectApply.vue
View File

@@ -19,23 +19,38 @@
@getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
:preview="mode == 'resubmit'"/>
<div v-if="mode === 'resubmit'&&!changeDiagram">
<div class="approval-title">
<baseTitle title="审批记录"></baseTitle>
<div class="diagram">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"
style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
/>
<div class="approval-record">
<div class="approval-title">
<baseTitle title="审批记录"></baseTitle>
<div class="diagram">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"
style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
/>
</div>
</div>
</div>
<div class="process">
<operation-render :operation-list="data.operationList" :state="data.state"/>
</div>
</div>
<baseTitle title="流程"></baseTitle>
<div class="approval-record">
<process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer&&changeDiagram"/>
<div v-if="changeDiagram">
<div class="approval-record">
<div class="approval-title">
<baseTitle title="审批记录"></baseTitle>
<div class="diagram">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"
style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
/>
</div>
</div>
</div>
<div class="process">
<process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer"/>
</div>
</div>
<div class="oper-page-btn">
<el-button color="#DED0B2" v-if="mode === 'submit'" @click="handleSubmit">提交</el-button>
@@ -63,8 +78,10 @@
<el-table-column prop="createTime" label="创建时间"></el-table-column>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button @click="chooseProProcess(scope.row)">选择</el-button>
<a :href="scope.row.baseUrl" target="_blank" style="color: #2a99ff">查看详情</a>
<div style="display: flex;align-items: center">
<el-button type="primary" @click="chooseProProcess(scope.row)" link>选择</el-button>
<a :href="scope.row.baseUrl" target="_blank" style="color: #2a99ff;margin-left: 10px">查看详情</a>
</div>
</template>
</el-table-column>
</el-table>
@@ -96,7 +113,7 @@ import Paging from "@/components/pagination/index.vue";
const router = useRouter()
const route = useRoute()
const changeDiagram = ref(false)
const changeDiagram = ref(true)
const emit = defineEmits(["getAttachment", "getOtherFile"])
const props = defineProps({
title: {
@@ -273,17 +290,17 @@ const handleSubmit = async () => {
// if (localFormData.value.singleFile) {
//
// } else {
if (attachment.value.singleFile == null) {
attachment.value.validate()
ElNotification({
title: '提示',
message: '请上传附件',
type: 'error'
})
return;
} else {
attachment.value.clearValidate()
}
if (attachment.value.singleFile == null) {
attachment.value.validate()
ElNotification({
title: '提示',
message: '请上传附件',
type: 'error'
})
return;
} else {
attachment.value.clearValidate()
}
// }
let params = {
@@ -375,6 +392,7 @@ watchEffect(() => {
})
onMounted(async () => {
changeDiagram.value = props.mode === 'submit';
await init()
})
</script>

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

@@ -268,7 +268,7 @@ const getBaseInfo = async () => {
const loading = ElLoading.service({fullscreen: true})
try {
const {code, data} = await getBaseInfoApi(route.query.projectId)
console.log('data.procedure',data.procedure,route.query.step)
// console.log('data.procedure',data.procedure,route.query.step)
if(route.query.step==='40'){
if(data.procedure.indexOf('40')==-1){
data.procedure.push('40')

12
src/views/expense-management/share/index.vue
View File

@@ -105,12 +105,12 @@ const tableConfig = reactive({
if (buttons.has("edit")) {
btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
}
if (buttons.has("report")) {
btn.push({label: '明细导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
}
if (buttons.has("report")) {
btn.push({label: '汇总导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
}
// if (buttons.has("report")) {
// btn.push({label: '明细导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
// }
// if (buttons.has("report")) {
// btn.push({label: '汇总导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
// }
return (
<div style={{width: '100%'}}>
{

71
src/views/project-demand/requirement/add.vue
View File

@@ -2,35 +2,44 @@
<div v-loading="loading" class="add-block">
<baseTitle title="需求征集信息录入"></baseTitle>
<el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
<el-form-item label="名称" prop="requirementName">
<el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
</el-form-item>
<el-form-item label="所属公司" prop="companyIds">
<el-tree-select v-model="formData.companyIds" :data="companyOption" style="width: 100%;"
filterable clearable :check-strictly="true" multiple/>
</el-form-item>
<el-form-item label="征集类型" prop="collectType">
<el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
<el-option
v-for="item in typeOption"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="截止时间" prop="deadline">
<el-config-provider>
<el-date-picker
v-model="formData.deadline"
type="date"
placeholder="截止时间"
value-format="YYYY-MM-DD"
/>
</el-config-provider>
</el-form-item>
<el-row>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="名称" prop="requirementName">
<el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="征集类型" prop="collectType">
<el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
<el-option
v-for="item in typeOption"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="截止时间" prop="deadline">
<el-config-provider>
<el-date-picker
v-model="formData.deadline"
type="date"
placeholder="截止时间"
value-format="YYYY-MM-DD"
/>
</el-config-provider>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="所属公司" prop="companyIds" class="tree-select">
<el-button @click="showCompany">请选择</el-button>
<!-- <el-tree-select v-model="formData.companyIds" :data="companyOption"-->
<!-- filterable clearable :check-strictly="true" multiple/>-->
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否专项资金" prop="isSpecialFund">
<el-radio-group v-model="formData.isSpecialFund" size="mini">
<el-radio :label="true">是</el-radio>
@@ -380,6 +389,12 @@ onMounted(async () => {
:deep(.el-empty__description) {
margin-top: 0;
}
.tree-select{
:deep(.el-form-item__content .el-select__wrapper ) {
width: 750px;
}
}
:deep(.el-table--fit ) {
height: 300px !important;

2
src/views/project-demand/requirement/index.vue
View File

@@ -151,7 +151,7 @@ const tableConfig = reactive({
api: '/workflow/mosr/requirement',
btns: [
{name: '新增', key: 'add', color: '#DED0B2',auth: auths.add},
{name: '导出', key: 'export', type: ''},
// {name: '导出', key: 'export', type: ''},
],
params: {}
})

4
src/views/project-demand/summary/index.vue
View File

@@ -201,8 +201,8 @@ const tableConfig = reactive({
params: {},
btns: [
{name: '新增上报', key: 'add', color: '#DED0B2', auth:auths.report},
{name: '年度计划导出', key: '_export', auth: ''},
{name: '经费预算生成', key: 'preMonty', auth: ''},
// {name: '年度计划导出', key: '_export', auth: ''},
// {name: '经费预算生成', key: 'preMonty', auth: ''},
]
})
const headBtnClick = (key) => {

2
src/views/special-fund/index.vue
View File

@@ -156,7 +156,7 @@ const tableConfig = reactive({
params: {},
btns: [
{name: '新增', key: 'add', color: '#DED0B2', auth: ''},
{name: '导出', key: '_export', color: '#DED0B2', auth: ''},
// {name: '导出', key: '_export', color: '#DED0B2', auth: ''},
]
})
const tableIns = ref()

4
src/views/system/config/index.vue
View File

@@ -28,8 +28,8 @@
:icon="Delete" plain
:disabled="disabled">删除
</el-button>
<el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出
</el-button>
<!-- <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出-->
<!-- </el-button>-->
</div>
<div class="table">
<el-table

2
src/views/tool/ipblacklist/index.vue
View File

@@ -25,7 +25,7 @@
<div class="table">
<div class="table-header-btn">
<el-button type="primary" :icon="Plus" @click="handleAdd" plain>新增</el-button>
<el-button type="warning" @click="handleExport" :icon="Download" plain>导出</el-button>
<!-- <el-button type="warning" @click="handleExport" :icon="Download" plain>导出</el-button>-->
</div>
<el-table :data="list" ref="" :lazy="true" v-loading="loading" v-tabh>
<el-table-column prop="ipAddr" label="IP地址"></el-table-column>

4
src/views/workflow/listen/index.vue
View File

@@ -34,8 +34,8 @@
<el-button type="danger" v-perm="['code:listener:del']" @click="handleMoreDelete(listenId,listenNameList)" :icon="Delete" plain
:disabled="disabled">删除
</el-button>
<el-button type="warning" v-perm="['code:listener:export']" @click="handleExport" :icon="Download" plain>导出
</el-button>
<!-- <el-button type="warning" v-perm="['code:listener:export']" @click="handleExport" :icon="Download" plain>导出-->
<!-- </el-button>-->
</div>
<div class="table">
<el-table