From cab7311cfb1ed8924ad15d630884eccd4d6f853d Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 7 Aug 2024 22:37:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E6=96=B0=E5=A2=9E(=E5=8D=95=E9=80=89?=
=?UTF-8?q?=E6=A1=86)=E9=BB=98=E8=AE=A4=E5=90=A6,=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A5=E4=B8=9A=E5=8A=A1=E6=8F=8F?=
=?UTF-8?q?=E8=BF=B0=E6=8D=A2=E8=A1=8C=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?,=E9=80=89=E6=8B=A9=E6=A1=86=E4=B8=BA=E8=BF=9C=E7=A8=8B?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=A7=A3=E5=86=B3=E5=8D=A1=E9=A1=BF=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DetailComponent/SummaryDetail.vue | 4 +--
src/fvcomponents/fvSearchForm/index.vue | 21 +++++++++++
src/views/expense-management/ledger/index.vue | 2 ++
src/views/project-demand/requirement/add.vue | 2 +-
.../project-demand/requirement/index.vue | 36 -------------------
src/views/project-demand/summary/add.vue | 6 ++--
src/views/project-demand/summary/index.vue | 6 +++-
src/views/project-management/filing/index.vue | 6 +++-
.../implementation/account.vue | 2 ++
.../implementation/index.vue | 6 +++-
.../project-management/initiation/index.vue | 6 +++-
.../mobledetail/SummaryDetailMoblie.vue | 4 +--
src/views/special-fund/index.vue | 3 +-
src/views/system/role/index.vue | 3 +-
src/views/system/user/index.vue | 3 +-
15 files changed, 59 insertions(+), 51 deletions(-)
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index d31d5e5..8eefe26 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -46,12 +46,12 @@
- {{ localFormData.serviceDescription }}
+ {{ localFormData.serviceDescription }}
- {{ localFormData.contentDescription }}
+ {{ localFormData.contentDescription }}
diff --git a/src/fvcomponents/fvSearchForm/index.vue b/src/fvcomponents/fvSearchForm/index.vue
index 304adbc..a156be4 100644
--- a/src/fvcomponents/fvSearchForm/index.vue
+++ b/src/fvcomponents/fvSearchForm/index.vue
@@ -119,3 +119,24 @@ onMounted(() => {
align-items: center;
}
+
diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue
index 0aee67e..e0981f0 100644
--- a/src/views/expense-management/ledger/index.vue
+++ b/src/views/expense-management/ledger/index.vue
@@ -60,6 +60,7 @@ const searchConfig = ref([
clearable: true,
filterable: true,
cacheKey: 'project_cost',
+ remote: true
}
},
{
@@ -72,6 +73,7 @@ const searchConfig = ref([
filterable: true,
checkStrictly: true,
cacheKey: 'fee_stage',
+ remote: true
}
},
{
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 5e8ef89..e5b4858 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -169,7 +169,7 @@ const formData = ref({
deadline: '',
collectExplain: '',
fileList: [],
- isSpecialFund: true
+ isSpecialFund: false
})
const routerName = ref(router.currentRoute.value.name)
const processDiagramViewer = ref(false)
diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index 47cc772..c554b0e 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -39,7 +39,6 @@
-
@@ -60,41 +59,6 @@ import {getRequirementStatePerm} from "@/api/project-demand";
const cacheStore = useCacheStore()
const authStore = useAuthStore()
const router = useRouter()
-const collectTypeSelectRef=ref()
-const searchConfig = reactive([
- {
- label: '征集名称',
- prop: 'requirementName',
- component: 'el-input',
- props: {
- placeholder: '请输入征集名称查询',
- clearable: true,
- filterable: true,
- checkStrictly: true
- }
- },
- {
- label: '征集类型',
- prop: 'collectType',
- component: shallowRef(fvSelect),
- props: {
- placeholder: '请选择征集类型',
- clearable: true,
- filterable: true,
- cacheKey: 'collect_type'
- }
- },
- {
- label: '状态',
- prop: 'state',
- component: shallowRef(fvSelect),
- props: {
- placeholder: '请选择状态',
- clearable: true,
- cacheKey: 'demand_collection'
- }
- },
-])
const selectForm = ref({})
const tableIns = ref()
const formRef = ref()
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index cc3a0cb..fa9ec5d 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -348,9 +348,9 @@ const showSingleTable = ref(false)
const otherFileList = ref([])
const singleList = ref([])
const formData = ref({
- isSpecialFund: true,
- industryUniversityResearch: '0',
- governmentDeclaration: '0',
+ isSpecialFund: false,
+ industryUniversityResearch: '1',
+ governmentDeclaration: '1',
resultForm: []
})
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 4ba15f5..c545010 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -61,6 +61,7 @@ const searchConfig = reactive([
cacheKey: 'project_type',
clearable: true,
filterable: true,
+ remote: true
},
colProps: {}
},
@@ -73,6 +74,7 @@ const searchConfig = reactive([
placeholder: '请选择项目影响',
clearable: true,
filterable: true,
+ remote: true
},
colProps: {}
},
@@ -85,6 +87,7 @@ const searchConfig = reactive([
cacheKey: 'rd_subject',
clearable: true,
filterable: true,
+ remote: true
}
},
{
@@ -107,7 +110,8 @@ const searchConfig = reactive([
props: {
placeholder: '请选择状态',
clearable: true,
- cacheKey: 'demand_summary'
+ cacheKey: 'demand_summary',
+ remote: true
}
},
// {
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 4d88703..746da8d 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -76,6 +76,7 @@ const searchConfig = ref([
cacheKey: 'project_type',
clearable: true,
filterable: true,
+ remote: true
}
},
{
@@ -87,6 +88,7 @@ const searchConfig = ref([
placeholder: '请选择项目影响',
clearable: true,
filterable: true,
+ remote: true
},
colProps: {}
},
@@ -99,6 +101,7 @@ const searchConfig = ref([
cacheKey: 'rd_subject',
clearable: true,
filterable: true,
+ remote: true
}
},
{
@@ -121,7 +124,8 @@ const searchConfig = ref([
props: {
placeholder: '请选择状态',
clearable: true,
- cacheKey: 'project_filing'
+ cacheKey: 'project_filing',
+ remote: true
}
},
// {
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 18d0361..3a0653c 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -324,6 +324,7 @@ const searchConfig = reactive([
clearable: true,
filterable: true,
cacheKey: 'project_cost',
+ remote: true
}
},
{
@@ -336,6 +337,7 @@ const searchConfig = reactive([
filterable: true,
checkStrictly: true,
cacheKey: 'fee_stage',
+ remote: true
}
},
{
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index e47bd03..5a7a7e5 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -75,6 +75,7 @@ const searchConfig = ref([
cacheKey: 'project_type',
clearable: true,
filterable: true,
+ remote: true
}
},
{
@@ -86,6 +87,7 @@ const searchConfig = ref([
cacheKey: 'project_impact',
clearable: true,
filterable: true,
+ remote: true
},
colProps: {}
},
@@ -98,6 +100,7 @@ const searchConfig = ref([
cacheKey: 'rd_subject',
clearable: true,
filterable: true,
+ remote: true
}
},
{
@@ -120,7 +123,8 @@ const searchConfig = ref([
props: {
placeholder: '请选择状态',
clearable: true,
- cacheKey: 'project_implementation'
+ cacheKey: 'project_implementation',
+ remote: true
}
},
// {
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 6c6be6a..d839beb 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -73,6 +73,7 @@ const searchConfig = ref([
cacheKey: 'project_type',
clearable: true,
filterable: true,
+ remote: true
}
},
{
@@ -84,6 +85,7 @@ const searchConfig = ref([
placeholder: '请选择项目影响',
clearable: true,
filterable: true,
+ remote: true
},
colProps: {}
},
@@ -96,6 +98,7 @@ const searchConfig = ref([
cacheKey: 'rd_subject',
clearable: true,
filterable: true,
+ remote: true
}
},
{
@@ -118,7 +121,8 @@ const searchConfig = ref([
props: {
placeholder: '请选择状态',
clearable: true,
- cacheKey: 'project_initiation'
+ cacheKey: 'project_initiation',
+ remote: true
}
},
// {
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index b76c283..8cba8e4 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -47,12 +47,12 @@
- {{ localFormData.serviceDescription }}
+ {{ localFormData.serviceDescription }}
- {{ localFormData.contentDescription }}
+ {{ localFormData.contentDescription }}
diff --git a/src/views/special-fund/index.vue b/src/views/special-fund/index.vue
index b7890ab..2104095 100644
--- a/src/views/special-fund/index.vue
+++ b/src/views/special-fund/index.vue
@@ -31,7 +31,8 @@ const searchConfig = reactive([
props: {
placeholder: '请选择状态',
clearable: true,
- cacheKey: 'special_fund'
+ cacheKey: 'special_fund',
+ remote: true
}
},
{
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 1b055f4..4031c0b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -82,7 +82,8 @@ const searchConfig = ref([
props: {
placeholder: '请选择',
clearable: true,
- cacheKey: 'normal_disable'
+ cacheKey: 'normal_disable',
+ remote: true
}
},
{
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 41e4949..6e50612 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -71,7 +71,8 @@ const searchConfig = ref([
props: {
placeholder: '请输入',
cacheKey: 'normal_disable',
- clearable: true
+ clearable: true,
+ remote: true
}
},
])