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

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

@@ -60,7 +60,7 @@ export default {
         {label: '发布日期', prop: 'issueTime', sortable: 'custom', descending: '3', ascending: '4', width: '120'},
         {label: '预算金额（万元）', prop: 'projectAmount', sortable: 'custom', descending: '1', ascending: '2', width: '140'},
         {label: '项目地区', prop: 'province', width: '120', slot: true},
-        {label: '项目类别', prop: 'tenderStage', width: '90'},
+        {label: '招标阶段', prop: 'tenderStage', width: '90'},
         {label: '招采单位联系人', prop: 'contact', width: '120'},
         {label: '招采单位联系方式', prop: 'contactTel', width: '130'},
         {label: '代理单位', prop: 'agency', minWidth: '170'},

dsk-operate-ui/src/views/project/projectList/component/lxr.vue

@@ -143,21 +143,22 @@
               <el-radio label=0>女</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="联系人角色：" class="row">
-            <el-input type="text" v-model="queryParam.role" placeholder="请输入"></el-input>
+          <el-form-item label="联系方式：" class="row">
+            <el-input type="text" maxlength="11" @input="inputphone"  v-model="queryParam.contactInformation" placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item label="关联企业：" class="row" v-if="thistype == 'project'">
+          <!--<el-form-item label="关联企业：" class="row" v-if="thistype == 'project'">-->
+          <el-form-item label="关联企业：" class="row">
             <el-input type="text" v-model="queryParam.companyName" placeholder="请输入"></el-input>
           </el-form-item>
+          <el-form-item label="联系人角色：" class="row">
+            <el-input type="text" v-model="queryParam.role" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="联系人职位：" class="row">
             <el-input type="text" v-model="queryParam.position" placeholder="请输入"></el-input>
           </el-form-item>
           <!--<el-form-item label="内部维护人：" class="row">-->
             <!--<el-input type="text" v-model="queryParam.accendant" placeholder="请输入"></el-input>-->
           <!--</el-form-item>-->
-          <el-form-item label="联系方式：" class="row">
-            <el-input type="text" maxlength="11" @input="inputphone"  v-model="queryParam.contactInformation" placeholder="请输入"></el-input>
-          </el-form-item>
           <el-form-item label="备注：" class="row">
             <el-input
               type="textarea"
@@ -339,14 +340,17 @@
           position:"",
           contactInformation:"",
           remark:"",
+          companyName:"",
           // accendant:"",
         }
         if(this.thistype == 'project'){
           this.queryParam.businessId = this.searchParam.businessId
           this.companyName = ""
+          this.queryParam.companyName=this.$route.query.projectname
         }
         if(this.thistype == 'custom'){
           this.queryParam.customerId = this.searchParam.customerId
+          this.queryParam.companyName=this.customname
         }
       },
     }

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

@@ -239,15 +239,15 @@
       </template>
       <div class="table-item">
         <el-table :data="exportTableData">
-          <el-table-column prop="issueTime" label="招标发布时间" width="110"></el-table-column>
-          <el-table-column prop="tenderee" label="招标成员" width="200"></el-table-column>
-          <el-table-column prop="stockPercent" label="持股比例" min-width="100"></el-table-column>
-          <el-table-column prop="projectName" label="项目名称" min-width="220"></el-table-column>
-          <el-table-column prop="bidAmount" label="预算金额" min-width="100"></el-table-column>
-          <el-table-column prop="address" label="项目地区" min-width="110"></el-table-column>
-          <el-table-column prop="subjectMatter" label="招标采购分类" min-width="130"></el-table-column>
-          <el-table-column prop="projectType" label="项目类型" min-width="100"></el-table-column>
-          <el-table-column prop="agency" label="代理单位" min-width="160"></el-table-column>
+          <el-table-column prop="buildingProjectType" label="项目类型" width="80"></el-table-column>
+          <el-table-column prop="projectName" label="项目名称" width="220"></el-table-column>
+          <el-table-column prop="chargeDepartment" label="主管部门" min-width="170"></el-table-column>
+          <el-table-column prop="constructUnit" label="项目法人" min-width="170"></el-table-column>
+          <el-table-column prop="projectTotalInvestment" label="项目投资额" min-width="100"></el-table-column>
+          <el-table-column prop="domicile" label="项目地区" min-width="80"></el-table-column>
+          <el-table-column prop="projectScale" label="建设规模" min-width="430"></el-table-column>
+          <el-table-column prop="fileTitle" label="附件名称" min-width="200"></el-table-column>
+          <el-table-column prop="fileUrl" label="附件链接" min-width="360"></el-table-column>
         </el-table>
       </div>
       <div class="input">
@@ -295,29 +295,28 @@ export default {
     return {
 		encodeStr,
         dialogExportVisible1:false,
-		exportTableData:[{
-            "address":"四川省-成都市",
-            "stockPercent":"18.43%",
-            "agency":'鞍钢股份有限公司',
-            "issueTime":"2023-09-22",
-            "subjectMatter":"其他",
-            "memberLevel":"二级企业",
-            "tenderee":"鞍钢冷轧钢板（莆田）有限公司综合部",
-            "projectType":"其他",
-            "bidAmount":"202万元",
-            "projectName":"2023年中铁一局集团第二工程有限公司江浙区域项目自购物资集中招标采购文件（一）（钢材）招标公告",
+		exportTableData:[
+		{
+            "domicile":"江津区",
+            "chargeDepartment":"兴庆区商合局",
+            "constructUnit":'鞍钢股份有限公司',
+            "projectScale":"项目建设规划总面积约3000亩，其中商住用地面积2000亩，文化旅游综合用地约1000亩，打造集“市井民俗文化体验、休闲度假、亲子研学等”为一体的复合型文化旅游目的地，企业已完成项目规划方案。",
+            "fileTitle":"宁夏回族自治区银川市2023年度重点项目清单.pdf",
+            "fileUrl":"http://file.jiansheku.com/key_project/b9e22fbf2e409642aa97f8238e934272.pdf",
+            "buildingProjectType":"房建工程",
+            "projectTotalInvestment":"70000万元",
+            "projectName":"'上河堡'文旅综合体项目",
           },
-          {
-            "address":"四川省-成都市",
-            "stockPercent":"18.43%",
-            "agency":'鞍钢股份有限公司',
-            "issueTime":"2023-09-22",
-            "subjectMatter":"其他",
-            "memberLevel":"二级企业",
-            "tenderee":"鞍钢股份有限公司",
-            "projectType":"其他",
-            "bidAmount":"202万元",
-            "projectName":"太极集团四川太极制药有限公司转让持有的成都市4套住宅-高新区玉虹巷2号1栋6单元7层13号",
+		  {
+            "domicile":"江津区",
+            "chargeDepartment":"国网重庆江津区供电公司",
+            "constructUnit":'国网重庆江津区供电公司',
+            "projectScale":"新建110kV变电站1座，主变容量2*50MVA，新建110kV线路20km",
+            "fileTitle":"重庆市江津区2023年度重点项目清单.xlsx",
+            "fileUrl":"http://file.jiansheku.com/key_project/4080bef69da03056d1db953698f4d807.xlsx",
+            "buildingProjectType":"电力工程",
+            "projectTotalInvestment":"5500万元",
+            "projectName":"重庆江津李市110kV输变电工程",
           }],
 		exportData:{},
 		fieldshow: false,