修改

dsk-operate-ui/src/views/detail/party-a/internalCooperation/consultingAgencyCooperation.vue

@@ -43,6 +43,7 @@ import { getConsultingAgencyCooperationListApi, getConsultingAgencyCooperationTy
 import { getAllAreaApi } from "@/api/common";
 import { getTreeSelectAreaList } from "@/utils";
 import { encodeStr } from "@/assets/js/common";
+import { getProjectUndertakingTypesApi } from "@/api/consultingOrgManagement";
 export default {
   name: "consultingAgencyCooperation",
   mixins: [mixin],
@@ -64,7 +65,7 @@ export default {
         { label: '省市', prop: 'provinceName', minWidth: '140', slot: true },
         { label: '项目承接类型', prop: 'isinvestproject', width: '120', showOverflowTooltip: true },
         { label: '工程基础大类', prop: 'projectType1', width: '120', showOverflowTooltip: true },
-        { label: '工程类别明细', prop: 'projectType', width: '120', showOverflowTooltip: true },
+        { label: '工程类别明细', prop: 'projectType2', width: '120', showOverflowTooltip: true },
         { label: '项目负责人姓名', prop: 'projectLeader', width: '120' },
         { label: '项目负责人专业', prop: 'projectLeaderMajor', width: "120" },
         { label: '项目负责人联系电话', prop: 'projectLeaderPhone', width: "160" },
@@ -83,8 +84,8 @@ export default {
             // checkStrictly: true
           }
         },
-        { type: 4, fieldName: 'projectUndertakingType', value: '', placeholder: '项目承接类型', options: [], uid: this.getUid() },
-        { type: 4, fieldName: 'detailOfWorksCategory', value: '', placeholder: '工程类别明细', options: [], uid: this.getUid() },
+        { type: 1, fieldName: 'isinvestproject', value: '', placeholder: '项目承接类型', options: [], uid: this.getUid() },
+        { type: 1, fieldName: 'projectType2', value: '', placeholder: '工程类别明细', options: [], uid: this.getUid() },
         { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '请输入', uid: this.getUid() },
       ],
       //列表
@@ -92,12 +93,51 @@ export default {
       tableData: [],
       tableDataTotal: 0,
       isSkeleton: true,
-      areaList: []
+      areaList: [],
+      engineeringCategoryDetailOptions: [
+        {
+          value: "住宅",
+          label: "住宅"
+        },
+        {
+          value: "房建其他",
+          label: "房建其他"
+        },
+        {
+          value: "装饰",
+          label: "装饰"
+        },
+        {
+          value: "专业其他",
+          label: "专业其他"
+        },
+        {
+          value: "市政工程",
+          label: "市政工程"
+        },
+        {
+          value: "教育",
+          label: "教育"
+        },
+        {
+          value: "安装",
+          label: "安装"
+        },
+        {
+          value: "工业厂房",
+          label: "工业厂房"
+        },
+        {
+          value: "商业综合",
+          label: "商业综合"
+        }
+      ]
     };
   },
   //可访问data属性
   created() {
     this.initDetail();
+    this.formData[2].options=this.engineeringCategoryDetailOptions
   },
   //计算集
   computed: {
@@ -107,6 +147,7 @@ export default {
   methods: {
     async initDetail() {
       try {
+        this.getProjectUndertakingTypes()
         await this.handleQuery();
         await this.getAllArea();
         await this.getConsultingAgencyCooperationTypes();
@@ -114,6 +155,16 @@ export default {
 
       }
     },
+    async getProjectUndertakingTypes() {
+      try {
+        const result = await getProjectUndertakingTypesApi();
+        if (result.code == 200 && result?.data?.length) {
+          this.formData[1].options = result.data.map(item => ({ value: item, label: item }));
+        }
+      } catch (error) {
+
+      }
+    },
     async getAllArea() {
       try {
         const area = await getAllAreaApi();
@@ -156,11 +207,28 @@ export default {
         this.isSkeleton = false;
       }
     },
-    async handleSearch(params) {
+    async handleSearch() {
       try {
-        console.log(params);
+        let params = this.formParams();
         const areaSearchList = this.$refs["searchFormNew"].$refs["cascader"][0].getCheckedNodes();
-        console.log(areaSearchList);
+        let province=[]
+        let city=[]
+        if(params.projectProvince){
+          for (let i=0; i<params.projectProvince.length; i++){
+            province.push(params.projectProvince[i][1])
+            city.push(params.projectProvince[i][2])
+          }
+        }
+        province=province.filter((item, index, self) => self.indexOf(item) === index);
+        if(province){
+          params.province=province
+        }
+        if(city){
+          params.city=city
+        }
+        delete params.projectProvince
+        this.handleQuery(params)
+
       } catch (error) {
 
       }

dsk-operate-ui/src/views/supplier/supplierOverview/index.vue

@@ -174,8 +174,8 @@
           </el-table-column>
           <el-table-column label="司法风险" prop="judicatureRiskCount">
             <template slot-scope="scope">
-              <span v-if="scope.row.riskTotal > 0" style="color:red;">{{scope.row.riskTotal}}</span>
-              <span v-else>{{scope.row.riskTotal}}</span>
+              <span v-if="scope.row.judicatureRiskCount > 0" style="color:red;">{{scope.row.judicatureRiskCount}}</span>
+              <span v-else>{{scope.row.judicatureRiskCount}}</span>
             </template>
           </el-table-column>
           <el-table-column label="经营风险" prop="operatingRiskCount">