Merge pull request 'dd' (#680) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/680
2024-08-07 14:51:22 +00:00
parent 89603d1094 0250e3008b
commit 87d3493c34
19 changed files with 78 additions and 58 deletions
--- 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;
+    }
+  }
+}
--- 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"
--- 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>
--- 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"
--- 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
    }
  },
  {
@@ -60,6 +61,7 @@ const searchConfig = ref([
      clearable: true,
      filterable: true,
      cacheKey: 'project_cost',
+      remote: true
    }
  },
  {
@@ -72,6 +74,7 @@ const searchConfig = ref([
      filterable: true,
      checkStrictly: true,
      cacheKey: 'fee_stage',
+      remote: true
    }
  },
  {
--- 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)
--- 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()
--- 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: []
 })

--- 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,9 @@ const searchConfig = reactive([
    props: {
      placeholder: '请选择状态',
      clearable: true,
-      cacheKey: 'demand_summary'
+      filterable:true,
+      cacheKey: 'demand_summary',
+      remote: true
    }
  },
  // {
--- 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
    }
  },
  {
@@ -76,6 +77,7 @@ const searchConfig = ref([
      cacheKey: 'project_type',
      clearable: true,
      filterable: true,
+      remote: true
    }
  },
  {
@@ -87,6 +89,7 @@ const searchConfig = ref([
      placeholder: '请选择项目影响',
      clearable: true,
      filterable: true,
+      remote: true
    },
    colProps: {}
  },
@@ -99,6 +102,7 @@ const searchConfig = ref([
      cacheKey: 'rd_subject',
      clearable: true,
      filterable: true,
+      remote: true
    }
  },
  {
@@ -121,7 +125,9 @@ const searchConfig = ref([
    props: {
      placeholder: '请选择状态',
      clearable: true,
-      cacheKey: 'project_filing'
+      cacheKey: 'project_filing',
+      filterable: true,
+      remote: true
    }
  },
  // {
--- 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
    }
  },
  {
--- 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"
--- 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
    }
  },
  {
@@ -75,6 +76,7 @@ const searchConfig = ref([
      cacheKey: 'project_type',
      clearable: true,
      filterable: true,
+      remote: true
    }
  },
  {
@@ -86,6 +88,7 @@ const searchConfig = ref([
      cacheKey: 'project_impact',
      clearable: true,
      filterable: true,
+      remote: true
    },
    colProps: {}
  },
@@ -98,6 +101,7 @@ const searchConfig = ref([
      cacheKey: 'rd_subject',
      clearable: true,
      filterable: true,
+      remote: true
    }
  },
  {
@@ -120,7 +124,9 @@ const searchConfig = ref([
    props: {
      placeholder: '请选择状态',
      clearable: true,
-      cacheKey: 'project_implementation'
+      filterable: true,
+      cacheKey: 'project_implementation',
+      remote: true
    }
  },
  // {
--- 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
    }
  },
  {
@@ -73,6 +74,7 @@ const searchConfig = ref([
      cacheKey: 'project_type',
      clearable: true,
      filterable: true,
+      remote: true
    }
  },
  {
@@ -84,6 +86,7 @@ const searchConfig = ref([
      placeholder: '请选择项目影响',
      clearable: true,
      filterable: true,
+      remote: true
    },
    colProps: {}
  },
@@ -96,6 +99,7 @@ const searchConfig = ref([
      cacheKey: 'rd_subject',
      clearable: true,
      filterable: true,
+      remote: true
    }
  },
  {
@@ -118,7 +122,9 @@ const searchConfig = ref([
    props: {
      placeholder: '请选择状态',
      clearable: true,
-      cacheKey: 'project_initiation'
+      filterable: true,
+      remote: true,
+      cacheKey: 'project_initiation',
    }
  },
  // {
--- 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>
--- 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>
--- a/src/views/special-fund/index.vue
+++ b/src/views/special-fund/index.vue
@@ -31,7 +31,9 @@ const searchConfig = reactive([
    props: {
      placeholder: '请选择状态',
      clearable: true,
-      cacheKey: 'special_fund'
+      filterable:true,
+      cacheKey: 'special_fund',
+      remote: true
    }
  },
  {
--- 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
    }
  },
  {
--- 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
    }
  },
 ])