fix

dsk-operate-ui/src/api/consultingOrgManagement/index.js

@@ -132,3 +132,13 @@ export const removeFileFromOssApi = (ossId) => request({
   method: "delete",
   params: {}
 });
+
+/**
+ * 获取项目承接类型下拉框
+ * @returns 
+ */
+export const getProjectUndertakingTypesApi = () => request({
+  url: "/advisory/body/getIsInvestProject",
+  method: "get",
+  params: {}
+});

dsk-operate-ui/src/components/DskCustomItemRender/index.vue

@@ -39,7 +39,8 @@
         <div class="dsk-cutom-form-render-detail-item">
           <div class="render-detail-item-inner">
             <dsk-text-over-flow-tip>
-              <span>{{detailRender(comCustomItem)}}</span>
+              <div v-if="comCustomItem.comType == 'textarea'" v-html="detailRender(comCustomItem)"></div>
+              <span v-else>{{detailRender(comCustomItem)}}</span>
               <template slot="overflow">{{detailRender(comCustomItem)}}</template>
             </dsk-text-over-flow-tip>
           </div>
@@ -171,9 +172,15 @@ export default {
       return classParams;
     },
     detailRender(item) {
-      const value = item.componentAttribute.value;
+      let value = item.componentAttribute.value;
       const valueType = Object.prototype.toString.call(value);
-      if (valueType === "[object String]") return value || value == "0" ? value : "-";
+      if (valueType === "[object String]") {
+        if (value || value == "0") {
+          value = value.replace(new RegExp("\\n", "gmi"), "<\/br>");
+          return value;
+        }
+        return "-";
+      };
       if (valueType === "[object Array]") return value?.length ? value.join(",") : "-";
     },
     fileChange(isRemove, fileList) {
@@ -221,6 +228,10 @@ export default {
 
   &.custom-render-item-textarea {
     min-height: 73px;
+    .dsk-cutom-form-render-detail-item {
+      height: auto;
+      line-height: 22px;
+    }
   }
 }
 </style>

dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue

@@ -127,7 +127,7 @@ import DskAmountRange from "@/components/DskAmountRange";
 import DskTableHeaderSetting from "@/components/DskTableHeaderSetting";
 import TableListCom from "@/components/TableListCom";
 import Skeleton from "@/components/Skeleton";
-import { getConsultingOrgProjectListWithSearchApi } from "@/api/consultingOrgManagement";
+import { getConsultingOrgProjectListWithSearchApi, getProjectUndertakingTypesApi } from "@/api/consultingOrgManagement";
 import { queryConditionFiltering } from "@/utils";
 import { v4 } from 'uuid';
 import { encodeStr } from "@/assets/js/common.js";
@@ -199,16 +199,7 @@ export default {
       rules: {
 
       },
-      projectTypeOptions: [
-        {
-          value: "1",
-          label: "测试1"
-        },
-        {
-          value: "2",
-          label: "测试2"
-        }
-      ],
+      projectTypeOptions: [],
       engineeringCategoryOptions: [
         {
           value: "1",
@@ -246,11 +237,22 @@ export default {
   methods: {
     async init() {
       try {
+        await this.getProjectUndertakingTypes();
         await this.getList(this.queryParams);
       } catch (error) {
 
       }
     },
+    async getProjectUndertakingTypes() {
+      try {
+        const result = await getProjectUndertakingTypesApi();
+        if (result.code == 200 && result?.data?.length) {
+          this.projectTypeOptions = result.data.map(item => ({ value: item, label: item }));
+        }
+      } catch (error) {
+
+      }
+    },
     // 创建最终查询条件
     mergeCondition() {
       const _queryParams = JSON.parse(JSON.stringify(this.queryParams));