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

Merge pull request 'master' (#685) from master into prod

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/685
This commit is contained in:
odjbin
2024-08-07 15:48:24 +00:00
parent 8d87e2a7a0 433f0bc712
commit 474cf72333
10 changed files with 105 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="title==='apply'||title==='check'"> <el-col :span="6" v-if="title==='apply'||title==='check'">
<el-form-item label="部门分管领导" label-width="115" <el-form-item label="部门分管领导" :label-width="title==='check'?110:115"
> >
<el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker"> <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
{{ {{
@@ -830,6 +830,19 @@ onMounted(async () => {
} }
} }
} }
.is-leaf:first-child {
.cell {
margin-left: -18px !important;
}
}
.el-table__body {
.el-table__cell:first-child {
.cell {
margin-left: -10px !important;
}
}
}
} }
</style> </style>
<style scoped lang="scss"> <style scoped lang="scss">

4
src/components/SearchFilesByTag.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div v-loading="_value"> <div v-loading="_value">
<el-form :model="attachment" inline> <el-form :model="attachment" inline style="margin-left: 15px">
<el-form-item label="名称" prop="fileName"> <el-form-item label="名称" prop="fileName">
<el-input v-model="attachment.fileName" placeholder="请输入附件名称查询" clearable filterable style="width: 300px"/> <el-input v-model="attachment.fileName" placeholder="请输入附件名称查询" clearable filterable style="width: 300px"/>
</el-form-item> </el-form-item>
@@ -20,7 +20,7 @@
<el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button> <el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-card style="width: 100%"> <el-card style="width: 100%;overflow-y: hidden">
<fvTable style="width: 100%;max-height: 300px" v-if="showTable" height="300" :tableConfig="tableConfig" <fvTable style="width: 100%;max-height: 300px" v-if="showTable" height="300" :tableConfig="tableConfig"
:data="fileList" :isSettingCol="false" :pagination="false"> :data="fileList" :isSettingCol="false" :pagination="false">
<template #empty> <template #empty>

18
src/views/project-management/filing/attachment.vue
View File

@@ -1,12 +1,14 @@
<template> <template>
<baseTitle title="项目基本信息"></baseTitle> <div style="padding: 0 30px">
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm> <baseTitle title="项目基本信息"></baseTitle>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick"> <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
<el-tab-pane v-for="item in paneList" :label="item.label" :name="item.name"> <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<search-files-by-tag @search="search" @upload="upload" :type="item.name==='40'?'40':''" <el-tab-pane v-for="item in paneList" :label="item.label" :name="item.name">
:fileList="fileList" :uploadState="uploadState" v-model:loading="loading"/> <search-files-by-tag @search="search" @upload="upload" :type="item.name==='40'?'40':''"
</el-tab-pane> :fileList="fileList" :uploadState="uploadState" v-model:loading="loading"/>
</el-tabs> </el-tab-pane>
</el-tabs>
</div>
</template> </template>
<script setup lang="jsx"> <script setup lang="jsx">

32
src/views/project-management/filing/upload.vue
View File

@@ -1,19 +1,21 @@
<template> <template>
<baseTitle title="项目基本信息"></baseTitle> <div style="padding: 0 30px">
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm> <baseTitle title="项目基本信息"></baseTitle>
<baseTitle :title="getName()+'-上传附件'"></baseTitle> <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
<el-card style="width: 100%;margin: 15px 0"> <baseTitle :title="getName()+'-上传附件'"></baseTitle>
<file-upload @getFile="getFile" /> <el-card style="width: 100%;margin: 15px 0">
<fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300" :tableConfig="tableConfig" <file-upload @getFile="getFile" />
:data="fileList" :isSettingCol="false" :pagination="false"> <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300" :tableConfig="tableConfig"
<template #empty> :data="fileList" :isSettingCol="false" :pagination="false">
<el-empty :image-size="90" description="暂无数据" style="padding: 0"/> <template #empty>
</template> <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
</fvTable> </template>
</el-card> </fvTable>
<div class="oper-page-btn"> </el-card>
<el-button color="#DED0B2" @click="handleSubmit">提交</el-button> <div class="oper-page-btn">
</div> <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
</div>
</div>
</template> </template>
<script setup lang="jsx"> <script setup lang="jsx">

6
src/views/project-management/implementation/attachment.vue
View File

@@ -1,7 +1,8 @@
<template> <template>
<div style="padding: 0 30px">
<baseTitle title="项目基本信息"></baseTitle> <baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm> <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
<el-form :model="attachment" inline style="margin-top: 15px"> <el-form :model="attachment" inline style="margin-left: 15px">
<el-form-item label="标签" prop="tag"> <el-form-item label="标签" prop="tag">
<el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 300px"> <el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
<el-option <el-option
@@ -25,6 +26,7 @@
</template> </template>
</fvTable> </fvTable>
</el-card> </el-card>
</div>
</template> </template>
<script setup lang="jsx"> <script setup lang="jsx">

5
src/views/project-management/implementation/phase.vue
View File

@@ -1,10 +1,10 @@
<template> <template>
<div class="apply-block" v-loading="loading"> <div class="apply-block" v-loading="loading">
<baseTitle title="项目基本信息"></baseTitle> <baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm> <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
<baseTitle title="阶段变更信息" style="margin-top: -10px"></baseTitle> <baseTitle title="阶段变更信息" style="margin-top: -10px"></baseTitle>
<el-form :model="formData" label-width="auto"> <el-form :model="formData" label-width="auto">
<el-form-item label="抄送人员" label-width="105"> <el-form-item label="抄送人员" label-width="110">
<Ttsup :modelValue="chooseUserInfo()" @clickCopyUser="chooseUser"/> <Ttsup :modelValue="chooseUserInfo()" @clickCopyUser="chooseUser"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -528,5 +528,6 @@ onMounted(async () => {
<style scoped> <style scoped>
.apply-block { .apply-block {
margin: 15px 0; margin: 15px 0;
padding: 0 30px ;
} }
</style> </style>

7
src/views/project-management/implementation/phaseDetail.vue
View File

@@ -1,11 +1,14 @@
<template> <template>
<div style="padding: 0 30px">
<baseTitle title="项目基本信息"></baseTitle> <baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm> <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
<baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle> <baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
<div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;text-align: right;margin-right: 14px">抄送人</span>{{copyName?copyName:'--'}}</div> <div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;text-align: right;margin-right: 14px;margin-left: 15px">抄送人</span>{{copyName?copyName:'--'}}</div>
<ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase" <ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow" v-model:value="auditOpinion"/> :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow" v-model:value="auditOpinion"/>
<opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId" :taskUserOptionList="summaryData.taskUserOptionList" v-model:value="auditOpinion"></opinion> <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId" :taskUserOptionList="summaryData.taskUserOptionList" v-model:value="auditOpinion"></opinion>
</div>
</template> </template>
<script setup lang="jsx"> <script setup lang="jsx">

19
src/views/project-management/implementation/share.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<baseTitle title="项目基本信息"></baseTitle> <baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm> <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 15px;"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig"> <fvTable ref="tableIns" :tableConfig="tableConfig">
<template #empty> <template #empty>
<el-empty description="暂无数据"/> <el-empty description="暂无数据"/>
@@ -347,6 +347,17 @@ const getBaseInfo = async () => {
getBaseInfo() getBaseInfo()
</script> </script>
<style scoped> <style scoped lang="scss">
.search-form{
padding-top: 0;
}
:deep(.el-col-offset-1){
margin-left: 50px;
}
:deep(.el-date-editor.el-input, .el-date-editor.el-input__wrapper ){
width: 100%!important;
}
:deep(.btn-col){
margin-left: -28px;
}
</style> </style>

62
src/views/project-management/implementation/upload.vue
View File

@@ -1,33 +1,35 @@
<template> <template>
<baseTitle title="项目基本信息"></baseTitle> <div style="padding: 0 30px">
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm> <baseTitle title="项目基本信息"></baseTitle>
<baseTitle title="项目实施-上传附件"></baseTitle> <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
<el-form :model="formData" ref="tagForm" label-width="auto"> <baseTitle title="项目实施-上传附件" style="margin-bottom: 15px"></baseTitle>
<el-form-item label="标签名称" prop="tagName"> <el-form :model="formData" ref="tagForm" label-width="auto">
<el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px" v-if="showInput" clearable/> <el-form-item label="标签名称" prop="tagName" style="margin-left: 15px;">
<el-select v-model="formData.tagName" placeholder="请选择标签名称" clearable filterable style="width: 300px" v-else> <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px" v-if="showInput" clearable/>
<el-option <el-select v-model="formData.tagName" placeholder="请选择标签名称" clearable filterable style="width: 300px" v-else>
v-for="item in tagsOption" <el-option
:key="item.value" v-for="item in tagsOption"
:label="item.label" :key="item.value"
:value="item.value" :label="item.label"
/> :value="item.value"
</el-select> />
<el-button type="primary" link @click="changeInput">{{ showInput ? '选择' : '输入' }}</el-button> </el-select>
</el-form-item> <el-button type="primary" link @click="changeInput">{{ showInput ? '选择' : '输入' }}</el-button>
</el-form> </el-form-item>
<div style="display: flex; align-items: center"> </el-form>
<baseTitle title="其他文件" style="margin-right: 10px"></baseTitle> <div style="display: flex; align-items: center;margin-top: -5px">
<file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/> <baseTitle title="其他文件" style="margin-right: 10px;"></baseTitle>
</div> <file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/>
<fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300" :tableConfig="tableConfig" </div>
:data="fileList" :isSettingCol="false" :pagination="false"> <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300" :tableConfig="tableConfig"
<template #empty> :data="fileList" :isSettingCol="false" :pagination="false">
<el-empty :image-size="90" description="暂无数据" style="padding: 0"/> <template #empty>
</template> <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
</fvTable> </template>
<div class="oper-page-btn"> </fvTable>
<el-button color="#DED0B2" @click="handleSubmit(tagForm)">提交</el-button> <div class="oper-page-btn">
<el-button color="#DED0B2" @click="handleSubmit(tagForm)">提交</el-button>
</div>
</div> </div>
</template> </template>
@@ -457,7 +459,7 @@ const handleSubmit = async (instance) => {
await router.push({ await router.push({
name: 'Implementation/detail', name: 'Implementation/detail',
query: { query: {
id: route.query.requirementId, id: route.query.id,
projectId: route.query.projectId, projectId: route.query.projectId,
state: route.query.state, state: route.query.state,
step: '40' step: '40'

4
src/views/project-management/implementation/uploadFee.vue
View File

@@ -1,6 +1,7 @@
<template> <template>
<div style="padding: 0 30px ">
<baseTitle title="项目基本信息"></baseTitle> <baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm> <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
<el-form :model="tableForm" ref="form" class="query-form"> <el-form :model="tableForm" ref="form" class="query-form">
<el-table :data="tableForm.tableData"> <el-table :data="tableForm.tableData">
<el-table-column prop="time" label="时间" min-width="180"> <el-table-column prop="time" label="时间" min-width="180">
@@ -75,6 +76,7 @@
<el-button color="#DED0B2" @click="handleSubmit(form)">提交</el-button> <el-button color="#DED0B2" @click="handleSubmit(form)">提交</el-button>
<el-button @click="handleBack">返回</el-button> <el-button @click="handleBack">返回</el-button>
</div> </div>
</div>
</template> </template>
<script setup lang="jsx"> <script setup lang="jsx">