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 1/2] =?UTF-8?q?fix=20:=20=E6=96=B0=E5=A2=9E(=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E6=A1=86)=E9=BB=98=E8=AE=A4=E5=90=A6,=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A5=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=8D=A2=E8=A1=8C=E6=95=B0=E6=8D=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA,=E9=80=89=E6=8B=A9=E6=A1=86=E4=B8=BA=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E6=90=9C=E7=B4=A2=E8=A7=A3=E5=86=B3=E5=8D=A1=E9=A1=BF?=
 =?UTF-8?q?=E9=97=AE=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 @@
       <el-row gutter="20" style="margin-left: 5px;margin-bottom: -18px;">
         <el-col :span="24">
           <el-form-item label="现有业务描述" prop="serviceDescription">
-            <span>{{ localFormData.serviceDescription }}</span>
+            <span style="white-space: pre-wrap">{{ localFormData.serviceDescription }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="研发项目关键内容描述" prop="contentDescription">
-            <span>{{ localFormData.contentDescription }}</span>
+            <span style="white-space: pre-wrap">{{ localFormData.contentDescription }}</span>
           </el-form-item>
         </el-col>
       </el-row>
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;
 }
 </style>
+<style lang="scss">
+.el-select {
+  .el-select__wrapper {
+    .el-select__suffix::before {
+      content: "";
+      width: 6px;
+      height: 6px;
+      border: solid #a8abb2;
+      border-width: 0 0 1px 1px;
+      transform: translate(-50%, -50%) rotate(-45deg);
+    }
+  }
+
+  .is-focused {
+    .el-select__suffix::before {
+      margin-top: 10px;
+      transform: translate(-50%, -50%) rotate(-225deg) !important;
+    }
+  }
+}
+</style>
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 @@
       </el-col>
     </el-row>
   </el-form>
-  <!--  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>-->
 
   <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
     <template #empty>
@@ -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 @@
       <el-row gutter="20" style="margin-bottom: -18px;margin-left: 5px;">
         <el-col :span="24">
           <el-form-item label="现有业务描述" prop="serviceDescription">
-            <span>{{ localFormData.serviceDescription }}</span>
+            <span style="white-space: pre-wrap">{{ localFormData.serviceDescription }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="研发项目关键内容描述" prop="contentDescription">
-            <span>{{ localFormData.contentDescription }}</span>
+            <span style="white-space: pre-wrap">{{ localFormData.contentDescription }}</span>
           </el-form-item>
         </el-col>
       </el-row>
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
     }
   },
 ])

From 0250e3008b105b133717c70459842b8ba500bcb3 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 7 Aug 2024 22:51:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E9=80=89=E6=8B=A9=E6=A1=86?=
 =?UTF-8?q?=E4=B8=BA=E8=BF=9C=E7=A8=8B=E6=90=9C=E7=B4=A2=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                  | 20 ++++++++++++++++++
 .../DetailComponent/ApprovalDetail.vue        |  2 +-
 src/components/SearchFilesByTag.vue           |  2 +-
 src/fvcomponents/fvSearchForm/index.vue       | 21 -------------------
 src/views/expense-management/ledger/index.vue |  3 ++-
 src/views/project-demand/summary/index.vue    |  1 +
 src/views/project-management/filing/index.vue |  4 +++-
 .../implementation/attachment.vue             |  2 +-
 .../implementation/index.vue                  |  4 +++-
 .../project-management/initiation/index.vue   |  6 ++++--
 src/views/special-fund/add.vue                |  4 ++++
 src/views/special-fund/index.vue              |  1 +
 12 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 985579c..a59d942 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -588,3 +588,23 @@ html, body, #app, .el-container, .el-aside, .el-main {
     position: relative;
   }
 }
+//绘制下拉选择框远程搜索时右侧的箭头
+.el-select {
+  .el-select__wrapper {
+    .el-select__suffix::before {
+      content: "";
+      width: 6px;
+      height: 6px;
+      border: solid #a8abb2;
+      border-width: 0 0 1px 1px;
+      transform: translate(-50%, -50%) rotate(-45deg);
+    }
+  }
+
+  .is-focused {
+    .el-select__suffix::before {
+      margin-top: 10px;
+      transform: translate(-50%, -50%) rotate(-225deg) !important;
+    }
+  }
+}
diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 46da324..24b87b0 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -6,7 +6,7 @@
       </el-col>
       <el-form :model="attachmentParam" inline style="margin-top: 15px;margin-left: 15px">
         <el-form-item label="标签" prop="tag">
-          <el-select v-model="attachmentParam.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
+          <el-select v-model="attachmentParam.tag" placeholder="请选择标签" clearable filterable remote style="width: 300px">
             <el-option
                 v-for="item in tagsOption"
                 :key="item.value"
diff --git a/src/components/SearchFilesByTag.vue b/src/components/SearchFilesByTag.vue
index 06b96b1..748127d 100644
--- a/src/components/SearchFilesByTag.vue
+++ b/src/components/SearchFilesByTag.vue
@@ -5,7 +5,7 @@
         <el-input v-model="attachment.fileName" placeholder="请输入附件名称查询" clearable filterable style="width: 300px"/>
       </el-form-item>
       <el-form-item label="标签" prop="tag" v-if="type==='40'">
-        <el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
+        <el-select v-model="attachment.tag" placeholder="请选择标签" clearable remote filterable style="width: 300px">
           <el-option
               v-for="item in tagsOption"
               :key="item.value"
diff --git a/src/fvcomponents/fvSearchForm/index.vue b/src/fvcomponents/fvSearchForm/index.vue
index a156be4..304adbc 100644
--- a/src/fvcomponents/fvSearchForm/index.vue
+++ b/src/fvcomponents/fvSearchForm/index.vue
@@ -119,24 +119,3 @@ onMounted(() => {
   align-items: center;
 }
 </style>
-<style lang="scss">
-.el-select {
-  .el-select__wrapper {
-    .el-select__suffix::before {
-      content: "";
-      width: 6px;
-      height: 6px;
-      border: solid #a8abb2;
-      border-width: 0 0 1px 1px;
-      transform: translate(-50%, -50%) rotate(-45deg);
-    }
-  }
-
-  .is-focused {
-    .el-select__suffix::before {
-      margin-top: 10px;
-      transform: translate(-50%, -50%) rotate(-225deg) !important;
-    }
-  }
-}
-</style>
diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue
index e0981f0..5ee64d9 100644
--- a/src/views/expense-management/ledger/index.vue
+++ b/src/views/expense-management/ledger/index.vue
@@ -23,7 +23,8 @@ const searchConfig = ref([
       clearable: true,
       data: [],
       filterable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      remote: true
     }
   },
   {
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index c545010..bebc49b 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -110,6 +110,7 @@ const searchConfig = reactive([
     props: {
       placeholder: '请选择状态',
       clearable: true,
+      filterable:true,
       cacheKey: 'demand_summary',
       remote: true
     }
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 746da8d..9c5691f 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -54,7 +54,8 @@ const searchConfig = ref([
       clearable: true,
       data: [],
       filterable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      remote:true
     }
   },
   {
@@ -125,6 +126,7 @@ const searchConfig = ref([
       placeholder: '请选择状态',
       clearable: true,
       cacheKey: 'project_filing',
+      filterable: true,
       remote: true
     }
   },
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index 95bfc8e..2273e88 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -3,7 +3,7 @@
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
   <el-form :model="attachment" inline style="margin-top: 15px">
     <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 remote style="width: 300px">
         <el-option
             v-for="item in tagsOption"
             :key="item.value"
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 5a7a7e5..a019817 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -52,7 +52,8 @@ const searchConfig = ref([
       clearable: true,
       data: [],
       filterable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      remote: true
     }
   },
   {
@@ -123,6 +124,7 @@ const searchConfig = ref([
     props: {
       placeholder: '请选择状态',
       clearable: true,
+      filterable: true,
       cacheKey: 'project_implementation',
       remote: true
     }
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index d839beb..a155708 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -51,7 +51,8 @@ const searchConfig = ref([
       clearable: true,
       data: [],
       filterable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      remote: true
     }
   },
   {
@@ -121,8 +122,9 @@ const searchConfig = ref([
     props: {
       placeholder: '请选择状态',
       clearable: true,
+      filterable: true,
+      remote: true,
       cacheKey: 'project_initiation',
-      remote: true
     }
   },
   // {
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index dccda0c..be6d2a7 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -322,4 +322,8 @@ onMounted(async () => {
 :deep(.el-table--fit ) {
   height: 300px !important;
 }
+.add-block{
+
+  padding: 0 30px 30px 15px;
+}
 </style>
diff --git a/src/views/special-fund/index.vue b/src/views/special-fund/index.vue
index 2104095..c68acb8 100644
--- a/src/views/special-fund/index.vue
+++ b/src/views/special-fund/index.vue
@@ -31,6 +31,7 @@ const searchConfig = reactive([
     props: {
       placeholder: '请选择状态',
       clearable: true,
+      filterable:true,
       cacheKey: 'special_fund',
       remote: true
     }