Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-operate-ui/src/api/detail/party-a/opport.js

@@ -6,7 +6,7 @@ export function bidNoticePage(data) {
     url: '/enterpriseProject/bidNoticePage',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 招标公告招标阶段
@@ -15,7 +15,7 @@ export function bidNoticeTenderStage(data) {
     url: '/enterpriseProject/bidNoticeTenderStage',
     method: 'post',
     data: data
-  })
+  });
 }
 // 招标公告项目类别
 export function bidNoticeProjectCategory(data) {
@@ -32,7 +32,7 @@ export function bidNoticeArea(data) {
     url: '/enterpriseProject/bidNoticeArea',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 土地交易列表
@@ -41,7 +41,7 @@ export function landTransactionPage(data) {
     url: '/enterpriseProject/landTransactionPage',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 土地交易用途
@@ -50,7 +50,7 @@ export function landUse(data) {
     url: '/enterpriseProject/landUse',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 拟建项目列表
@@ -59,7 +59,7 @@ export function approvalProjectPage(data) {
     url: '/enterpriseProject/approvalProjectPage',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 标讯PRO招标公告列表
@@ -68,7 +68,7 @@ export function bidNoticeProPage(data) {
     url: '/enterpriseProject/bidNoticeProPage',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 标讯PRO招标公告项目类别
@@ -77,7 +77,7 @@ export function bidNoticeProProjectType(data) {
     url: '/enterpriseProject/bidNoticeProProjectType',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 标讯PRO招标公告工程类别
@@ -86,7 +86,7 @@ export function bidNoticeProProjectPurposes(data) {
     url: '/enterpriseProject/bidNoticeProProjectPurposes',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 标讯PRO招标公告评标办法
@@ -95,7 +95,7 @@ export function bidNoticeProAssessmentWay(data) {
     url: '/enterpriseProject/bidNoticeProAssessmentWay',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 行政许可列表
@@ -104,7 +104,7 @@ export function creditXzxkPage(data) {
     url: '/enterpriseProject/creditXzxkPage',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 专项债项目列表
@@ -113,7 +113,7 @@ export function specialDebtProjectPage(data) {
     url: '/enterpriseProject/specialDebtProjectPage',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 招标计划列表
@@ -122,7 +122,7 @@ export function bidPlanPage(data) {
     url: '/enterpriseProject/bidPlanPage',
     method: 'post',
     data: data
-  })
+  });
 }
 // 招标计划项目类型
 export function bidPlanProjectType(data) {
@@ -130,5 +130,12 @@ export function bidPlanProjectType(data) {
     url: '/enterpriseProject/bidPlanProjectType',
     method: 'post',
     data: data
-  })
+  });
 }
+
+// 企业重点项目列表
+export const getMajorProjectListApi = (data) => request({
+  url: "/enterpriseProject/importantList",
+  method: "post",
+  data
+});
\ No newline at end of file

dsk-operate-ui/src/views/detail/party-a/component/HeadFormNew.vue

@@ -9,7 +9,7 @@
         <slot name="slot"></slot>
       </template>
       <div v-else class="flex-box">
-        <span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>
+        <span class="flex-box ability-total" v-if="isTotal">共有{{ total }}条</span>
         <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel && title ==='集团业绩'" @click="clickEXCEL"><img
             src="@/assets/images/ability_excel.png">导出EXCEL</span>
         <span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
@@ -157,7 +157,7 @@
         <slot name="slot"></slot>
       </template>
       <div v-else class="flex-box">
-        <span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>
+        <span class="flex-box ability-total" v-if="isTotal">共有{{ total }}条</span>
         <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel && title ==='集团业绩'" @click="clickEXCEL"><img
             src="@/assets/images/ability_excel.png">导出EXCEL</span>
         <span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
@@ -450,7 +450,7 @@ export default {
           height: 32px;
           position: absolute;
           top: 0;
-          padding-right: 22px;
+          padding-right: 28px;
           font-size: 12px;
           padding-left: 8px;
         }

dsk-operate-ui/src/views/detail/party-a/component/Tables.vue

@@ -160,7 +160,7 @@ export default {
       this.$emit('sort-change',e)
     },
     flexWidth(tableData) {
-      let currentMax = this.queryParams.pageNum*this.queryParams.pageSize - this.queryParams.pageSize + tableData.length, wdth = 55
+      let currentMax = this.queryParams.pageNum*this.queryParams.pageSize - this.queryParams.pageSize + tableData.length, wdth = 59
       // return currentMax.toString().length*25 + 'px'
       if(currentMax.toString().length>3){
         wdth = wdth + (currentMax.toString().length-3)*10

dsk-operate-ui/src/views/detail/party-a/opport/MajorProject.vue

+<template>
+  <div class="detail-container major-project">
+    <head-form-new title="重点项目" :form-data="formData" :query-params="queryParams" :total="tableDataTotal" :isExcel="false"
+      @handle-search="handleSearch" />
+    <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+    <tables v-else :tableLoading="tableLoading" :tableData="tableData" :forData="forData" :tableDataTotal="tableDataTotal" :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange" @sort-change="sortChange">
+      <template slot="projectName" slot-scope="scope">
+        <router-link :to="`/radar/Land/details/${scope.row.id}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectName "
+          v-html="scope.row.projectName"></router-link>
+        <div v-else v-html="scope.row.projectName  || '--'"></div>
+      </template>
+      <!-- 项目投资金额 -->
+      <template slot="totalInvestment" slot-scope="scope">
+        <div style="text-align:right;">
+          {{scope.row.totalInvestment ? `${scope.row.totalInvestment}万元` : "--"}}
+        </div>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin';
+import { getMajorProjectListApi } from '@/api/detail/party-a/opport';
+import skeleton from '@/views/project/projectList/component/skeleton';
+export default {
+  name: 'majorProject',
+  props: ['companyId'],
+  mixins: [mixin],
+  components: {
+    skeleton
+  },
+  data() {
+    return {
+      isSkeleton: true,
+      queryParams: {
+        cid: this.companyId,
+        pageNum: 1,
+        pageSize: 20
+      },
+      forData: [
+        { label: '项目名称', prop: 'projectName', minWidth: '450', slot: true },
+        { label: '项目地区', prop: 'projectAddress', width: '127' },
+        { label: '项目等级', prop: 'projectLevel', width: '90' },
+        { label: '项目投资金额', prop: 'totalInvestment', width: '120', slot: true },
+        { label: '项目类型', prop: 'projectType', width: '120' },
+        { label: '项目年度', prop: 'year', width: '90' },
+      ],
+      formData: [
+        { type: 1, fieldName: 'projectLevel', value: '', placeholder: '项目级别', options: [], uid: this.getUid() },
+        { type: 4, fieldName: 'projectType', value: '', placeholder: '项目类型', options: [], uid: this.getUid() },
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220, uid: this.getUid() }
+      ],
+      //列表
+      tableLoading: false,
+      tableData: [],
+      tableDataTotal: 0
+    };
+  },
+  computed: {
+  },
+  created() {
+    this.setProjectLevelOptions();
+    this.setProjectTypeOptions();
+    this.handleQuery();
+  },
+  methods: {
+    async setProjectLevelOptions() {
+      try {
+        const result = await this.getDicts("project_level");
+        if (result.code == 200) {
+          const levels = result.data.map(item => {
+            return {
+              name: item.dictLabel,
+              value: item.dictValue,
+              id: item.dictCode
+            };
+          });
+          this.setFormData("projectLevel", levels);
+        }
+      } catch (error) {
+
+      }
+    },
+    async setProjectTypeOptions() {
+      try {
+        const result = await this.getDicts("project_type_new");
+        if (result.code == 200) {
+          const types = result.data.map(item => {
+            return {
+              name: item.dictLabel,
+              value: item.dictValue,
+              id: item.dictCode
+            };
+          });
+          this.setFormData("projectType", types);
+        }
+      } catch (error) {
+
+      }
+    },
+    async handleQuery(params) {
+      this.tableLoading = true;
+      let param = params ? params : this.queryParams;
+      let res = await getMajorProjectListApi(param);
+      this.tableLoading = false;
+      if (res.code == 200) {
+        this.isSkeleton = false;
+        this.tableData = res.rows;
+        if (this.tableData.length > 0) {
+          this.tableData.map(item => {
+            item.transactionPrice == 0 && (item.transactionPrice = '--');
+          });
+        }
+      }
+      this.tableDataTotal = res.total;
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+}
+
+.major-project {
+  @import "@/assets/styles/search-common.scss";
+}
+</style>
\ No newline at end of file