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

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

@@ -116,3 +116,11 @@ export function bidPlanPage(data) {
     data: data
   })
 }
+// 招标计划项目类型
+export function bidPlanProjectType(data) {
+  return request({
+    url: '/enterpriseProject/bidPlanProjectType',
+    method: 'post',
+    data: data
+  })
+}

dsk-operate-ui/src/router/index.js

@@ -169,7 +169,7 @@ export const constantRoutes = [
 	      path: '/radar/debtProject/details/:id',
 	      component: () => import('@/views/radar/debtProject/details'),
 	      name: 'debtProjectDetails',
-	      meta: { title: '企业专项债详情', icon: 'radar' }
+	      meta: { title: '政府专项债项目详情', icon: 'radar' }
 	    }
 	  ]
 	},

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

@@ -202,7 +202,7 @@ export default {
                   this.sideRoute[2].children[4].disabled = true;
                 }
                 break;
-                case 'proCount':
+                case 'proBiddingAnnouncement':
                 if(arr[i][j]<1){
                   this.sideRoute[2].children[5].disabled = true;
                 }

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

@@ -34,7 +34,7 @@
 
 <script>
 import mixin from '../mixins/mixin'
-import {bidPlanPage} from '@/api/detail/party-a/opport'
+import {bidPlanPage,bidPlanProjectType} from '@/api/detail/party-a/opport'
 export default {
   name: 'Biddingplan',
   props: ['companyId'],
@@ -74,8 +74,19 @@ export default {
   },
   created() {
     this.handleQuery()
+    this.handleOption()
   },
   methods: {
+    async handleOption(){
+      let res = await bidPlanProjectType({cid: this.companyId})
+      if(res.code==200){
+        let buildingProjectType = res.data.map(item => {
+          let it = {name:item.buildingProjectType+'('+item.count+')',value:item.buildingProjectType}
+          return it
+        })
+        this.setFormData('buildingProjectType', buildingProjectType)
+      }
+    },
     async handleQuery(params) {
       this.tableLoading = true
       let param = params?params:this.queryParams

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

@@ -87,7 +87,19 @@
           </template>
         </el-table-column>
         <el-table-column prop="operName" label="负责人"></el-table-column>
-        <el-table-column prop="provinceCode" label="地区"></el-table-column>
+        <el-table-column label="地区">
+          <template slot-scope="scope">
+							{{scope.row.provinceName}}
+							<template v-if="scope.row.cityName">
+							  -
+							</template>
+							{{scope.row.cityName}}
+							<template v-if="scope.row.districtName">
+							  -
+							</template>
+							{{scope.row.districtName}}
+	  			</template>
+        </el-table-column>
         <el-table-column prop="startDate" label="成立日期"></el-table-column>
       </el-table>
       <div class="rela-more" v-show="activeName=='second'&& shipTotal>shipParams.pageSize"><span class="a-link" @click="handlePath">查看更多数据 ></span></div>

dsk-operate-ui/src/views/radar/index.vue

@@ -14,7 +14,7 @@
 			</div>
 			<p class="solid"></p>
 		</div>
-		<!-- 企业专项债 -->
+		<!-- 政府专项债 -->
 		<debtProject v-if="personnelHerf=='debtProject'" />
 		<!-- 土地交易 -->
 		<Land v-if="personnelHerf=='Land'" />
@@ -52,7 +52,7 @@
 				personnelList: [{
 						key: 'debtProject',
 						status: true,
-						value: '企业专项债项目',
+						value: '政府专项债项目',
 
 					},
 					{