From c2c1cfd6e1be64cbffa7c4d881ddcae8935afbda Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 24 Oct 2024 13:13:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=BD=AE?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=BC=B9=E7=AA=97=E7=9A=84=E6=8F=90=E7=A4=BA?=
=?UTF-8?q?,=E9=A6=96=E9=A1=B5=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A5?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DetailComponent/ApprovalDetail.vue | 8 +-
src/components/DetailComponent/Opinion.vue | 14 +-
src/components/SelectPreProcess.vue | 53 +-
src/components/steps/index.vue | 1 +
src/views/doneList/index.vue | 22 +-
.../project-ledger/index.vue | 2 +-
src/views/home/index-old.vue | 537 ------------------
src/views/home/index.vue | 22 +-
src/views/project-demand/summary/detail.vue | 2 +-
src/views/project-management/filing/index.vue | 2 +-
.../implementation/detail.vue | 10 +-
.../implementation/index.vue | 2 +-
.../project-management/initiation/index.vue | 2 +-
.../mobledetail/OpinionMoblie.vue | 14 +-
src/views/todoList/index.vue | 22 +-
15 files changed, 111 insertions(+), 602 deletions(-)
delete mode 100644 src/views/home/index-old.vue
diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 1f97a5f..528b72c 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -68,6 +68,10 @@ const props = defineProps({
type: Array,
default: []
},
+ basicData: {
+ type: Object,
+ default: {}
+ },
fileListShow: {
type: String,
default: 'READ'
@@ -251,7 +255,7 @@ const schema = computed(() => {
component: () => (
{
-
+
}
)
@@ -304,7 +308,7 @@ const schema = computed(() => {
component: () => (
{
-
+
}
)
diff --git a/src/components/DetailComponent/Opinion.vue b/src/components/DetailComponent/Opinion.vue
index bab31ba..2a86413 100644
--- a/src/components/DetailComponent/Opinion.vue
+++ b/src/components/DetailComponent/Opinion.vue
@@ -132,13 +132,13 @@ const back = () => {
}
}
break;
- case 'Summary/detail':
- if (route.query.source === 'home') {
- router.push('/home')
- } else {
- router.push({name: 'Summary'})
- }
- break;
+ // case 'Summary/detail':
+ // if (route.query.source === 'home') {
+ // router.push('/home')
+ // } else {
+ // router.push({name: 'Summary'})
+ // }
+ // break;
case 'Requirement/detail':
if (route.query.source === 'home') {
router.push('/home')
diff --git a/src/components/SelectPreProcess.vue b/src/components/SelectPreProcess.vue
index 95e5adb..5e3cf55 100644
--- a/src/components/SelectPreProcess.vue
+++ b/src/components/SelectPreProcess.vue
@@ -1,16 +1,17 @@
-
-
- {{
- localFormData.preProcess && localFormData.preProcess.length > 0 ? '更改' : '请选择前置流程'
- }}
-
-
-
+
+
+ {{
+ localFormData.preProcess && localFormData.preProcess.length > 0 ? '更改' : '请选择前置流程'
+ }}
+
+
+
@@ -21,6 +22,9 @@
搜索
重置
+
+ {{ getPreProcessTag(localFormData.projectImpact,basicData.projectImpact) }}
+
@@ -53,11 +57,16 @@ import {
getPreProcess
} from "@/api/project-manage";
import Paging from "@/components/pagination/index.vue";
+
const props = defineProps({
formData: {
type: Object,
default: {}
},
+ basicData: {
+ type: Object,
+ default: {}
+ },
})
const loading = ref(false)
//暂存数据
@@ -84,6 +93,24 @@ const pageInfo = reactive({
pageNum: 1,
pageSize: 10,
})
+const getPreProcessTag = (impact,basicImpact) => {
+ let data=''
+ if(impact){
+ data= impact
+ }else if(basicImpact){
+ data= basicImpact
+ }
+ if (data == 1) {
+ //一般项目
+ return '一般项目20万以下要总经理审批'
+ } else if (data == 2) {
+ //重大项目
+ return '重大项目20万元到500万元之间要总办会审批'
+ } else if (data == 3) {
+ //特别重大项目
+ return '特别重大项目500万元以上要董事会审批'
+ }
+}
const handleReset = () => {
preProcessForm.requestName = ''
getPreProcessList()
@@ -152,7 +179,7 @@ const handleCurrentChange = (val) => {
preProcessList.value = currentList.value.slice((val - 1) * pageInfo.pageSize, val * pageInfo.pageSize)
};
watchEffect(() => {
- return Object.keys(props.formData).length && (localFormData.value = props.formData)
+ return Object.keys(props.formData).length && (localFormData.value = props.formData)
})
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 3ac5f6e..b4c82e8 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -595,6 +595,7 @@ const getBaseInfo = async () => {
localStepSuccess.value = formatProcedure(data.procedure)
baseForm.value.setValues(data)
baseFormData.value = data
+ emits('getBasicData', data)
emits('setDetail', formatActive(localActive.value))
loading.close()
nextTick(() => {
diff --git a/src/views/doneList/index.vue b/src/views/doneList/index.vue
index 71980ec..7b66beb 100644
--- a/src/views/doneList/index.vue
+++ b/src/views/doneList/index.vue
@@ -85,16 +85,18 @@ const handleView = (row) => {
source: 'home'
}
})
- } else if (row.targetState == '10' && row.targetId) {
- router.push({
- name: 'Summary/detail',
- query: {
- projectId: row.targetId,
- state: row.state,
- source: 'home'
- }
- })
- } else if (row.targetState == '20' || row.targetState == '40' || row.targetState == '50') {
+ }
+ // else if (row.targetState == '10' && row.targetId) {
+ // router.push({
+ // name: 'Summary/detail',
+ // query: {
+ // projectId: row.targetId,
+ // state: row.state,
+ // source: 'home'
+ // }
+ // })
+ // }
+ else if (row.targetState == '10' ||row.targetState == '20' || row.targetState == '40' || row.targetState == '50') {
router.push({
name: 'Implementation/detail',
query: {
diff --git a/src/views/expense-management/project-ledger/index.vue b/src/views/expense-management/project-ledger/index.vue
index 7d833e2..2256280 100644
--- a/src/views/expense-management/project-ledger/index.vue
+++ b/src/views/expense-management/project-ledger/index.vue
@@ -192,7 +192,7 @@ const tableConfig = reactive({
prop: 'projectImpact',
label: '项目影响',
align: 'center',
- width: 100,
+ width: 120,
showOverflowTooltip: false,
currentRender: ({row, index}) => {
if (row.projectImpact && row.projectImpact !== null && row.projectImpact !== undefined) {
diff --git a/src/views/home/index-old.vue b/src/views/home/index-old.vue
deleted file mode 100644
index f84aff1..0000000
--- a/src/views/home/index-old.vue
+++ /dev/null
@@ -1,537 +0,0 @@
-
-
-
-
-
-
我的科创工作
-
-
-
-
-
- {{ item.title }}
- {{ item.num }}个
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
帮助文档
- 查看更多
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
- 您没有任何角色, 请联系管理员!
-
-
-
-
-
-
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 2f140fe..4536983 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -766,16 +766,18 @@ const handleView = (row) => {
source: 'home'
}
})
- } else if (row.targetState == '10' && row.targetId) {
- router.push({
- name: 'Summary/detail',
- query: {
- projectId: row.targetId,
- state: row.state,
- source: 'home'
- }
- })
- } else if (row.targetState == '20' || row.targetState == '40' || row.targetState == '50') {
+ }
+ // else if (row.targetState == '10' && row.targetId) {
+ // router.push({
+ // name: 'Summary/detail',
+ // query: {
+ // projectId: row.targetId,
+ // state: row.state,
+ // source: 'home'
+ // }
+ // })
+ // }
+ else if (row.targetState == '10'||row.targetState == '20' || row.targetState == '40' || row.targetState == '50') {
router.push({
name: 'Implementation/detail',
query: {
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index d0c9982..a59960c 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -1,6 +1,6 @@
+ :reportType="route.query.id==='-1'?'direct':''" :taskId="summaryData.taskId" >
{
if (row.projectImpact !== null) {
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 93d5909..3fbae73 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -1,5 +1,5 @@
-
@@ -33,6 +34,7 @@
:processViewer="commonProvessViewer"
:fileListShow="fileListShow"
:preProcessShow="preProcessShow"
+ :basicData="basicData"
v-model:value="auditOpinion"/>
{
}
getAllInfo(data.active)
}
+const getBasicData=(data)=>{
+ console.info("🚀 ~method:data -----", data)
+ basicData.value=data
+}