1

src/views/projectFront/projectSummary/cooperationUnit.vue

@@ -98,6 +98,17 @@
                 ></el-input
               >
             </el-form-item>
+            <el-form-item>
+              <el-select v-model="companyTypeId" placeholder="请选择项目类型">
+              <el-option
+                v-for="item in companyTypeList"
+                :key="item.id"
+                :label="item.companyTypeName"
+                :value="item.id">
+              </el-option>
+            </el-select>
+            </el-form-item>
+           
             <el-form-item>
               <!-- 查询 -->
               <el-button
@@ -114,7 +125,7 @@
           <div class="list_wrap flex">
             <div
               class="list"
-              @click="goDetailPage(item.id, item.projectEnterpriseId)"
+              @click="goDetailPage(item.id, item.projectEnterpriseId,item.projectSn)"
               v-for="(item, index) in listData"
               :key="index"
             >
@@ -247,10 +258,10 @@
                     v-model="enterpriseForm.companyTypeName"
                     :placeholder="$t('message.laborMange.pleaseChoose')"
                     style="width: 100%"
-                    :disabled="true"
+                    :disabled="enterpriseTypeName == '全部' ? false : true"
                   >
                     <el-option
-                      v-for="item in enterpriseTypeList"
+                      v-for="item in companyTypeList"
                       :key="item.id"
                       :label="item.companyTypeName"
                       :value="item.companyTypeName"
@@ -674,7 +685,7 @@
         {{ $t('message.cooperationUnit.companyDetails') }}
       </div>
     </div>
-    <Detail :detailId="detailId" :projectEnterpriseId="projectEnterpriseId" />
+    <Detail :detailId="detailId" :projectEnterpriseId="projectEnterpriseId" :enterpriseSn="enterpriseSn" />
   </div>
 </template>
 <script>
@@ -694,13 +705,17 @@ import {
   CheckSocialCreditCode,
   checkPhone
 } from '@/assets/js/util.js'
+
 export default {
   components: {
     Detail,
   },
   data() {
     return {
-      checkedId: 1,
+      checkedId: "",
+      companyTypeId:"",
+      companyTypeList:[],
+      enterpriseTypeSelectId:"",
       enterpriseTypeId: '',
       enterpriseTypeName: '',
       projectSn: '',
@@ -752,6 +767,7 @@ export default {
       noDataList: false,
       detailId: '',
       projectEnterpriseId: '',
+      enterpriseSn:"",
       pageType: 1, //1项目，2企业
       moveEnterpriseDialog: false,
       enterpriseType: '',
@@ -819,11 +835,22 @@ export default {
       getEnterpriseTypeList(data).then((res) => {
         if (res.code == 200) {
           console.log('获取企业类型列表', res)
-          this.enterpriseTypeList = res.result
+          this.enterpriseTypeList = [{
-          this.enterpriseTypeId = res.result[0].id
+            id: "",
+            companyTypeName:"全部",
+          },...res.result];
+          // this.enterpriseTypeId = res.result[0].id
+          // console.log('==========单位名称', res)
+          // this.enterpriseTypeName = res.result[0].companyTypeName
+          // this.enterpriseForm.companyTypeName = res.result[0].companyTypeName
+          
           console.log('==========单位名称', res)
-          this.enterpriseTypeName = res.result[0].companyTypeName
+          this.enterpriseTypeSelectId = this.enterpriseTypeList[0].id;
-          this.enterpriseForm.companyTypeName = res.result[0].companyTypeName
+          this.enterpriseTypeName = this.enterpriseTypeList[0].companyTypeName;
+          this.enterpriseTypeId = res.result[0].id;
+          this.enterpriseForm.companyTypeName = res.result[0].companyTypeName;
+          
+          this.companyTypeList = res.result;
           console.log(this.enterpriseTypeList)
           this.getCooperatorList()
         }
@@ -835,7 +862,7 @@ export default {
         projectSn: this.$store.state.projectSn,
         pageNo: this.pageNo,
         pageSize: this.pageSize,
-        enterpriseTypeId: this.enterpriseTypeId,
+        enterpriseTypeId: this.enterpriseTypeSelectId,
         enterpriseName: this.enterpriseName,
       }
       getCooperatorListApi(data).then((res) => {
@@ -877,9 +904,12 @@ export default {
     selectMenu(value) {
       console.log('切换菜单', value)
       this.checkedId = value.id
-      this.enterpriseTypeName = value.companyTypeName
+      this.enterpriseTypeName = value.companyTypeName;
+      this.enterpriseTypeSelectId = value.id;
+      if(!(value.id == '' && value.companyTypeName == '全部')){
         this.enterpriseTypeId = value.id
         this.enterpriseForm.companyTypeName = value.companyTypeName
+      }
       this.getCooperatorList()
     },
     //新增按钮
@@ -1159,9 +1189,10 @@ export default {
     //批量选中的数据
     getDeleteList(value) { },
     //跳转详情页
-    goDetailPage(id, projectEnterpriseId) {
+    goDetailPage(id, projectEnterpriseId,enterpriseSn) {
-      this.detailId = id
+      this.detailId = id;
-      this.projectEnterpriseId = projectEnterpriseId
+      this.projectEnterpriseId = projectEnterpriseId;
+      this.enterpriseSn = enterpriseSn;
       this.showDetail = true
       this.checkedDeleteList = []
     },

src/views/projectFront/projectSummary/cooperatorDatails.vue

@@ -57,7 +57,7 @@
         </el-table>
       </vue-scroll>
     </div>
-    <div v-if="activeIndex == '2'" class="content_wrap">
+    <div v-show="activeIndex == '2'" class="content_wrap">
       <el-button
         class="addQualificationBtn"
         type="primary"
@@ -198,7 +198,7 @@
         </div>
       </el-dialog>
     </div>
-    <div v-if="activeIndex == '3'" class="content_wrap">
+    <div v-show="activeIndex == '3'" class="content_wrap">
       <el-button
         v-permission="{key: 'hzdw_add_bad', menuPath: '/project/summary/cooperationUnit'}"
         class="addBadRecordBtn"
@@ -319,8 +319,12 @@ import {
   addEnterpriseQualification,
   addEnterpriseBadRecord,
 } from "@/assets/js/api/cooperationUnit";
+
+import {
+  getProjectDetail
+} from '@/assets/js/api/baseInfo.js'
 export default {
-  props: ["detailId", "projectEnterpriseId"],
+  props: ["detailId", "projectEnterpriseId","enterpriseSn"],
   data() {
     return {
       activeIndex: "1",
@@ -389,7 +393,72 @@ export default {
         }, 200);
       }
     },
-
+    // 获取承包商信息
+    getDataDateils(){
+      getProjectDetail({
+        projectSn: this.$props.enterpriseSn,
+      }).then((res) => {
+        if (res.code == 200) {
+          if(!res.result) return;
+          console.log('~~~~~~~~~~~~~~~~~~~~',res)
+          this.enterpriseInfo = [
+            ...this.enterpriseInfo,
+            {
+              fieldName: "承包商名称",
+              fieldName2: "项目施工区域",
+              value: res.result.projectDirectorName,
+              value2: res.result.projectDirectorPhone,
+            },
+            {
+              fieldName: "竣工日期",
+              fieldName2: "项目类型",
+              value: res.result.projectDirectorName,
+              value2: res.result.projectDirectorPhone,
+            },
+            {
+              fieldName: "项目经理",
+              fieldName2: "维度位置",
+              value: res.result.projectManage,
+              value2: res.result.latitude,
+            },
+            {
+              fieldName: "经度位置",
+              fieldName2: "工程类别",
+              value: res.result.longitude,
+              value2: res.result.engineeringPurpose,
+            },
+            {
+              fieldName: "项目编号",
+              fieldName2: "结构类型",
+              value: res.result.projectNumber,
+              value2: res.result.structureType,
+            },
+            {
+              fieldName: "项目面积(m²)",
+              fieldName2: "工程状态",
+              value: res.result.projectAcreage,
+              value2: res.result.bulidStatus,
+            },
+            {
+              fieldName: "开工日期",
+              fieldName2: "施工阶段",
+              value: res.result.startWorkDate,
+              value2: res.result.constructionStage,
+            },
+            {
+              fieldName: "现场布置图",
+              fieldName2: "现场施工图",
+              value: res.result.layoutImage,
+              value2: res.result.constructionMapUrl,
+            },
+            {
+              fieldName: "联系电话",
+              value: res.result.projectTel,
+            },
+          ]
+        }
+      });
+    },
     //获取企业信息
     getEnterpriseInfoById() {
       let data = {
@@ -493,6 +562,7 @@ export default {
             },
           ];
           this.infoEnterpriseId = res.result.id;
+          this.getDataDateils();
           console.log(this.enterpriseInfo,666777888)
         }
       });