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-05-29 21:34:37 +08:00
parent dd3f793ac2
commit 04c1175cf8
6 changed files with 116 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,8 +50,8 @@
<!-- </div>-->
</div>
<div class="oper-page-btn">
<el-button color="#DED0B2" @click="handleSubmit(demandForm)">提交</el-button>
<el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
<el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
<el-button @click="handleBack">返回</el-button>
</div>
</div>
@@ -90,6 +90,7 @@ const formData = ref({
fileList: []
})
const showTinymce = ref(true)
const routerName = ref(router.currentRoute.value.name)
const processDiagramViewer = ref(false)
const typeOption = ref([
{
@@ -174,11 +175,10 @@ const handleDownload = (row) => {
})
}
const compositeParam = (item) => {
let name=router.currentRoute.value.name
let tag = ''
if (!formData.value.collectType && name === 'Requirement/add') {
if (!formData.value.collectType && routerName.value === 'Requirement/add') {
tag = '需求征集'
}else if(name === 'Requirement/edit'){
}else if(routerName.value === 'Requirement/edit'){
tag = '需求征集'
}
return {

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

@@ -4,8 +4,8 @@
<el-form :model="formData" ref="summaryForm" :rules="rules">
<el-row gutter="50">
<el-col :span="12">
<el-form-item label="名称" prop="projectName">
<el-input v-model="formData.projectName" placeholder="请输入名称" clearable></el-input>
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -227,9 +227,9 @@
<!-- </div>-->
</div>
<div class="oper-page-btn">
<el-button type="primary" @click="staging">存为草稿</el-button>
<el-button type="primary" @click="handleSubmit(summaryForm)">发布</el-button>
<el-button color="#DED0B2" @click="handleResubmit">重新发布</el-button>
<el-button type="info" @click="staging">存为草稿</el-button>
<el-button color="#DED0B2" v-if="name==='Summary/add'" @click="handleSubmit(summaryForm)">发布</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit">重新发布</el-button>
</div>
</div>
</template>

4
src/views/project-management/filing/conclusion.vue
View File

@@ -11,8 +11,8 @@
</div>
</el-form>
<div class="oper-page-btn">
<el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
<el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
<el-button color="#DED0B2" v-if="name==='Filing/conclusion'" @click="handleSubmit(applyForm)">提交</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
</div>
</div>
</template>

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

@@ -18,8 +18,8 @@
<process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
</div>
<div class="oper-page-btn">
<el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
<el-button color="#DED0B2" @click="handleResubmit(applyForm)">重新提交</el-button>
<el-button color="#DED0B2" v-if="name==='Implementation/check'" @click="handleSubmit(applyForm)">提交</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit(applyForm)">重新提交</el-button>
</div>
</div>
</template>

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

@@ -1,54 +1,58 @@
<template>
<baseTitle title="上传费用"></baseTitle>
<el-table :data="tableData" style="width: 100%">
<el-table-column prop="projectName" label="项目名称">
<template #default="scope">
<el-input v-model="scope.row.projectName" placeholder="请输入项目名称" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="time" label="时间" width="250">
<template #default="scope">
<el-date-picker
v-model="scope.row.time"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择时间"
>
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="projectCost" label="项目费用">
<template #default="scope">
<el-input v-model="scope.row.projectCost" placeholder="请输入项目费用" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="researchStage" label="研发阶段">
<template #default="scope">
<el-input v-model="scope.row.researchStage" placeholder="请选择研发阶段" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="digest" label="摘要">
<template #default="scope">
<el-input v-model="scope.row.digest" placeholder="请输入摘要" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="afterTax" label="税后余额(元)">
<template #default="scope">
<el-input v-model="scope.row.afterTax" placeholder="请输入税后余额" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="oper" label="操作">
<template #default="scope">
<el-button type="primary" @click="handleDelete(scope.$index)" link style="font-size: 18px">删除</el-button>
</template>
</el-table-column>
</el-table>
<el-form :model="tableForm" :rules="rules">
<el-table :data="tableForm.tableData" style="width: 100%">
<el-table-column prop="projectName" label="项目名称">
<template #default="scope">
<el-form-item prop="projectName">
<el-input v-model="scope.row.projectName" placeholder="请输入项目名称" clearable>
</el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="time" label="时间">
<template #default="scope">
<el-date-picker
v-model="scope.row.time"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择时间"
>
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="projectCost" label="项目费用">
<template #default="scope">
<el-input v-model="scope.row.projectCost" placeholder="请输入项目费用" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="researchStage" label="研发阶段">
<template #default="scope">
<el-input v-model="scope.row.researchStage" placeholder="请选择研发阶段" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="digest" label="摘要">
<template #default="scope">
<el-input v-model="scope.row.digest" placeholder="请输入摘要" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="afterTax" label="税后余额(元)">
<template #default="scope">
<el-input v-model="scope.row.afterTax" placeholder="请输入税后余额" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="oper" label="操作">
<template #default="scope">
<el-button type="primary" @click="handleDelete(scope.$index)" link style="font-size: 18px">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<div style="width:100%;text-align: center;padding: 10px">
<el-button type="primary" @click="handleAdd" link style="font-size: 18px">添加一行</el-button>
</div>
@@ -67,17 +71,22 @@ import {useRoute} from "vue-router";
const route = useRoute()
const tagsViewStore = useTagsView()
const formData = ref({})
const tableData = ref([
{
projectId: route.query.id,
projectName: '',
time: '',
projectCost: '',
researchStage: '',
digest: '',
afterTax: ''
}
])
const rules = reactive({
auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
})
const tableForm = reactive({
tableData: [
{
projectId: route.query.id,
projectName: '',
time: '',
projectCost: '',
researchStage: '',
digest: '',
afterTax: ''
}
]
})
const handleAdd = () => {
let row = {
projectId: route.query.id,
@@ -88,18 +97,18 @@ const handleAdd = () => {
digest: '',
afterTax: ''
}
tableData.value.push(row)
tableForm.tableData.push(row)
}
const handleDelete = (index) => {
tableData.value.splice(index, 1)
tableForm.tableData.splice(index, 1)
}
const handleSubmit = (instance) => {
// if (!instance) return
// instance.validate(async (valid) => {
// if (!valid) return
let params = {}
console.log('params', tableData.value)
const res = addLedger(tableData.value)
console.log('params', tableForm.tableData)
const res = addLedger(tableForm.tableData)
ElNotification({
title: '提示',
message: res.msg,
@@ -107,7 +116,7 @@ const handleSubmit = (instance) => {
})
if (res.code === 1000) {
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
router.push({
router.push({
name: 'Implementation'
})
}

55
src/views/project-management/initiation/apply.vue
View File

@@ -12,14 +12,15 @@
</el-form>
<AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
@getAttachment="getAttachment"
@getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Initiation/edit'"/>
@getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
:preview="name === 'Initiation/edit'"/>
<div class="approval-record">
<baseTitle title="流程"></baseTitle>
<process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
</div>
<div class="oper-page-btn">
<el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
<el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
<el-button color="#DED0B2" v-if="name==='Initiation/apply'" @click="handleSubmit(applyForm)">提交</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
</div>
</div>
</template>
@@ -28,7 +29,7 @@
import {useTagsView} from '@/stores/tagsview.js'
import {ElMessage, ElNotification} from "element-plus";
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
import {getApplyProcess, projectApply,resubmitApply,getApplyDetail} from "@/api/project-manage";
import {getApplyProcess, projectApply, resubmitApply, getApplyDetail} from "@/api/project-manage";
import {useProcessStore} from '@/stores/processStore.js';
const tagsViewStore = useTagsView()
@@ -88,10 +89,10 @@ const tableConfig = reactive({
const loading = ref(false)
const processInstanceData = ref()
const processDiagramViewer = ref(true)
const name=ref(router.currentRoute.value.name)
const name = ref(router.currentRoute.value.name)
const compositeParam = (item) => {
let tag = ''
if (name.value === 'Initiation/apply'||name.value === 'Initiation/edit') {
if (name.value === 'Initiation/apply' || name.value === 'Initiation/edit') {
tag = '项目立项申请'
}
return {
@@ -100,12 +101,12 @@ const compositeParam = (item) => {
originalFileName: item.originalFilename,
fileType: item.fileType,
url: item.url,
tag:tag
tag: tag
}
}
const getAttachment = (val) => {
console.log('上传文件getAttachment', val)
file.value=compositeParam(val)
file.value = compositeParam(val)
}
const getOtherFile = (val) => {
console.log('上传文件getOtherFile', val)
@@ -125,15 +126,15 @@ const getFileParam = (item) => {
const handleSubmit = (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if(JSON.stringify(file.value) === "{}"){
if (JSON.stringify(file.value) === "{}") {
attachment.value.validate()
}else {
} else {
attachment.value.clearValidate()
}
if (!valid) return
let files = []
let singleFile={}
if(file.value.fileId!==undefined){
let singleFile = {}
if (file.value.fileId !== undefined) {
singleFile = {
fileId: file.value.fileId
}
@@ -146,9 +147,9 @@ const handleSubmit = (instance) => {
requirementId: route.query.id,
fileList: files,
singleFile: singleFile,
projectId:route.query.projectId,
projectId: route.query.projectId,
}
console.log('params',params)
console.log('params', params)
let res = await projectApply(params)
ElNotification({
title: '提示',
@@ -163,27 +164,27 @@ const handleSubmit = (instance) => {
}
})
}
const handleResubmit =async () => {
const handleResubmit = async () => {
let files = []
let singleFile={}
let singleFile = {}
let fileArray
if (JSON.stringify(file.value) === "{}"||attachment.value.singleFile===null) {
if (JSON.stringify(file.value) === "{}" || attachment.value.singleFile === null) {
attachment.value.validate()
} else {
attachment.value.clearValidate()
}
if(attachment.value.singleFile!==null&&name.value === 'Initiation/edit'){
if (attachment.value.singleFile !== null && name.value === 'Initiation/edit') {
singleFile = {
fileId: attachment.value.singleFile.fileId
}
fileArray=attachment.value.allFileList
}else {
fileArray = attachment.value.allFileList
} else {
if (file.value.fileId !== undefined) {
singleFile = {
fileId: file.value.fileId
}
}
fileArray=otherFileList.value
fileArray = otherFileList.value
}
fileArray.forEach(item => {
files.push(getFileParam(item))
@@ -193,9 +194,9 @@ const handleResubmit =async () => {
requirementId: route.query.id,
fileList: files,
singleFile: singleFile,
projectId:route.query.projectId,
projectId: route.query.projectId,
}
console.log('params',params)
console.log('params', params)
let res = await resubmitApply(params)
ElNotification({
title: '提示',
@@ -218,11 +219,11 @@ const getDetailInfo = async () => {
})
if (res.code === 1000) {
formData.value = res.data.formData
loading.value=false
loading.value = false
}
})
}
const init = () => {
const init = () => {
getApplyProcess(route.query.projectId).then(res => {
ElNotification({
title: '提示',
@@ -232,7 +233,7 @@ const init = () => {
processDiagramViewer.value = false
if (res.code === 1000) {
let data = res.data
deploymentId.value=data.deploymentId
deploymentId.value = data.deploymentId
processInstanceData.value = data
processStore.setDesign(data)
processStore.runningList.value = data.runningList;
@@ -250,7 +251,7 @@ init()
onMounted(async () => {
await init()
if (name.value === 'Initiation/edit') {
loading.value=true
loading.value = true
await getDetailInfo()
}
})