fix : 修复费用分摊复制功能、数字框默认值为null、项目归档显示是哪个流程的上传附件

This commit is contained in:
2024-06-14 13:04:37 +08:00
parent 6d56c4702b
commit f240016e44
11 changed files with 523 additions and 75 deletions

View File

@@ -34,7 +34,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="所属公司" prop="companyIds" class="tree-select">
<!-- <el-button @click="showCompany">请选择</el-button>-->
<!-- <el-button @click="showCompany">请选择</el-button>-->
<el-tree-select v-model="formData.companyIds" :data="companyOption"
filterable clearable :check-strictly="true" multiple/>
</el-form-item>
@@ -79,8 +79,14 @@
</template>
</fvTable>
<div class="approval-record">
<baseTitle title="流程"></baseTitle>
<process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
<div style="display: flex;align-items: center;margin-bottom: 20px">
<baseTitle title="流程图"></baseTitle>
<el-switch
v-model="changeDiagram"
style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
/>
</div>
<process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
</div>
<div class="oper-page-btn">
<el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button>
@@ -109,6 +115,7 @@ import {getSubCompOpt} from '@/api/user/user.js'
import {useTagsView} from '@/stores/tagsview.js'
import {getFundOption} from "@/api/special-fund";
const changeDiagram = ref(false)
const tagsViewStore = useTagsView()
const authStore = useAuthStore()
const router = useRouter()
@@ -389,7 +396,8 @@ onMounted(async () => {
:deep(.el-empty__description) {
margin-top: 0;
}
.tree-select{
.tree-select {
:deep(.el-form-item__content .el-select__wrapper ) {
width: 750px;
}

View File

@@ -237,8 +237,14 @@
@getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
:preview="name === 'Summary/edit'"/>
<div class="approval-record">
<baseTitle title="流程"></baseTitle>
<process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
<div style="display: flex;align-items: center;margin-bottom: 20px">
<baseTitle title="流程图"></baseTitle>
<el-switch
v-model="changeDiagram"
style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
/>
</div>
<process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
</div>
<div class="oper-page-btn">
<!-- <el-button type="info" @click="staging">存为草稿</el-button>-->
@@ -261,6 +267,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
import {getFormInfo} from "@/api/project-demand";
import {getFundOption} from "@/api/special-fund";
const changeDiagram = ref(false)
const cacheStore = useCacheStore()
const processStore = useProcessStore()
const router = useRouter()