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

Merge pull request 'fix : 优化流程图样式及位置,需求上报排版展示' (#414) from dd into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/414
This commit is contained in:
odjbin
2024-06-28 19:30:39 +00:00
parent 6fe8626acb e44b41bf14
commit a769d114bb
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
src/components/AttachmentUpload.vue
View File

@@ -217,7 +217,7 @@ const singleFile = ref(props.formData.singleFile)
const isSingleFile = ref(false)
const allFileList = ref([])
const singleFileList = ref([])
if(props.formData.fileList !== null && props.formData.fileList.length > 0){
if(props.formData.fileList !== null && props.formData.fileList?.length > 0){
allFileList.value = props.formData.fileList
}
watch(() => props.showTable, (newVal) => {
@@ -237,7 +237,7 @@ watch(() => props.formData.fileList, (newVal) => {
watch(() => props.otherFileList, (newVal) => {
// console.log('newotherFileList', newVal, props.formData)
if (props.preview) {
if (props.formData.fileList === null || props.formData.fileList.length === 0) {
if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
allFileList.value = newVal
} else {
newVal?.forEach(item => {

1
src/components/Tag.vue
View File

@@ -31,7 +31,6 @@ const props = defineProps({
const tagConfig = ref({})
const filterDict = (data, value) => {
console.log("🚀 ~ filterDict ~ data:", data)
if (!data || value == null) return
if (data instanceof Array) {
if (value == true || value == false) {

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

@@ -114,7 +114,7 @@
<div class="approval-title">
<baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData?.operationList"></baseTitle>
<div v-else></div>
<div style="display: flex;align-items: center;justify-content: flex-end;">
<div style="display: flex;align-items: center;justify-content: flex-start;">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"

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

@@ -86,7 +86,7 @@
</template>
</fvTable>
<div class="approval-record">
<div style="display: flex;align-items: center;justify-content: flex-end;">
<div style="display: flex;align-items: center;justify-content: flex-start;">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"

18
src/views/project-demand/summary/add.vue
View File

@@ -111,7 +111,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?!route.query.id?6:8:6">
<el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="125">
<el-radio-group v-model="formData.industryUniversityResearch">
<el-radio v-for="item in cacheStore.getDict('industry_university')"
@@ -121,8 +121,8 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="开展政府申报" prop="governmentDeclaration">
<el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?route.query.id?8:6:6">
<el-form-item label="开展政府申报" prop="governmentDeclaration" :label-width="route.query.id && formData.isSpecialFund?145:!formData.isSpecialFund?145:145">
<el-radio-group v-model="formData.governmentDeclaration">
<el-radio v-for="item in cacheStore.getDict('government_declaration')"
:key="item.value"
@@ -131,7 +131,7 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="!route.query.id && formData.isSpecialFund?4:12" v-if="!route.query.id">
<el-col :span="!route.query.id && formData.isSpecialFund?4:!route.query.id?12:12" v-if="!route.query.id">
<el-form-item label="是否专项资金" prop="isSpecialFund" >
<el-radio-group v-model="formData.isSpecialFund" @change="specialFundChange">
<el-radio :label="true">是</el-radio>
@@ -140,7 +140,7 @@
</el-form-item>
</el-col>
<el-col :span="8" v-if="route.query.id && formData.isSpecialFund">
<el-form-item label="专项资金名称" prop="specialFundId">
<el-form-item label="专项资金名称" prop="specialFundId" :label-width="route.query.id && formData.isSpecialFund?135:''">
<span>{{ formData.specialFund }}</span>
</el-form-item>
</el-col>
@@ -157,7 +157,7 @@
</el-form-item>
</el-col>
<el-col :span="8" style="margin-bottom: -18px">
<el-form-item label="知识产权状况" prop="intellectualProperty" label-width="125">
<el-form-item label="知识产权状况" prop="intellectualProperty" :label-width="!formData.isSpecialFund?!route.query.id?125:135:125">
<el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
<el-option
v-for="item in cacheStore.getDict('intellectual_property')"
@@ -236,8 +236,8 @@
@getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
@getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
:preview="name === 'Summary/edit'"/>
<div class="approval-record">
<div style="display: flex;align-items: center;justify-content: flex-end;">
<div class="approval-record" style="margin-left: 70px">
<div style="display: flex;align-items: center;justify-content: flex-start;">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"
@@ -468,7 +468,7 @@ const handleResubmit = debounce(() => {
...formData.value,
deploymentId: deploymentId.value,
fileList: otherFiles,
requirementId: route.query.id ? route.query.id : '-1'
requirementId: route.query.requirementId ? route.query.requirementId : '-1'
}
// console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
resubmitReported(params).then(res => {

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

@@ -304,7 +304,7 @@ const handleEdit = (row) => {
router.push({
name: 'Summary/edit',
query: {
id: row.requirementId,
requirementId: row.requirementId,
projectId: row.projectId
}
})

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

@@ -13,7 +13,7 @@
@getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
:preview="name === 'Phase/edit'"/>
<div class="approval-record">
<div style="display: flex;align-items: center;justify-content: flex-end;">
<div style="display: flex;align-items: center;justify-content: flex-start;">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"

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

@@ -27,7 +27,7 @@
</template>
</fvTable>
<div class="approval-record">
<div style="display: flex;align-items: center;justify-content: flex-end;">
<div style="display: flex;align-items: center;justify-content: flex-start;">
<div class="base-title">流程图</div>
<el-switch
v-model="changeDiagram"