Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-operate-ui/.env.production

@@ -8,7 +8,7 @@ ENV = 'production'
 VUE_APP_BASE_API = 'http://172.17.0.75:9099/prod-api'
 
 # 子系统地址
-#VUE_APP_SUB_SYSTEM_ADDRESS = "https://plug.jiansheku.com"
+VUE_APP_SUB_SYSTEM_ADDRESS = "https://plug.jiansheku.com"
 
 # Bi大屏系统地址
 #VUE_APP_BI_SYSTEM_ADDRESS = "https://192.168.60.104:8001"

dsk-operate-ui/src/views/bigDataSearch/advisoryOrgan.vue

@@ -36,6 +36,7 @@ export default {
   },
   created() {
     this.domain = process.env.VUE_APP_SUB_SYSTEM_ADDRESS;
+
     this.gettokens();
     this.iframeObserver();
     let that = this;

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency.vue

@@ -109,28 +109,28 @@
             <td class="table-key">业主名称</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeader ? comProjectDetailInfo.advisoryBodyProject.projectLeader : "-"}}
+                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.ownerName ? comProjectDetailInfo.advisoryBodyProject.ownerName : "-"}}
               </div>
-              <el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.projectLeader">
-                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeader" clearable placeholder="请输入业主名称"></el-input>
+              <el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.ownerName">
+                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.ownerName" clearable placeholder="请输入业主名称"></el-input>
               </el-form-item>
             </td>
             <td class="table-key">项目经理及联系方式</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor ? comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor : "-"}}
+                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectManagerAndPhone ? comProjectDetailInfo.advisoryBodyProject.projectManagerAndPhone : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor" clearable placeholder="请输入项目经理及联系方式"></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectManagerAndPhone" clearable placeholder="请输入项目经理及联系方式"></el-input>
               </el-form-item>
             </td>
             <td class="table-key">商务经理及联系方式</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor ? comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor : "-"}}
+                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.businessManagerAndPhone ? comProjectDetailInfo.advisoryBodyProject.businessManagerAndPhone : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor" clearable placeholder="请输入商务经理及联系方式"></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.businessManagerAndPhone" clearable placeholder="请输入商务经理及联系方式"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -144,10 +144,10 @@
             <td class="table-key">招标代理单位</td>
             <td colspan="3" :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-              {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone ? comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone : "-"}}
+              {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.bidAgencyUnit ? comProjectDetailInfo.advisoryBodyProject.bidAgencyUnit : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone" clearable placeholder="请输入招标代理单位"></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.bidAgencyUnit" clearable placeholder="请输入招标代理单位"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -161,28 +161,28 @@
             <td class="table-key">一审单位</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeader ? comProjectDetailInfo.advisoryBodyProject.projectLeader : "-"}}
+                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.firstAuditUnit ? comProjectDetailInfo.advisoryBodyProject.firstAuditUnit : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeader" clearable placeholder="请输入一审单位"></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.firstAuditUnit" clearable placeholder="请输入一审单位"></el-input>
               </el-form-item>
             </td>
             <td class="table-key">二审单位</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor ? comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor : "-"}}
+                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.secondAuditUnit ? comProjectDetailInfo.advisoryBodyProject.secondAuditUnit : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor" clearable placeholder="请输入二审单位"></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.secondAuditUnit" clearable placeholder="请输入二审单位"></el-input>
               </el-form-item>
             </td>
             <td class="table-key">三审单位</td>
             <td :class="[comIsModify ? 'td-none-padding' : '']">
               <div class="normal-value" v-if="!comIsModify">
-                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor ? comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor : "-"}}
+                {{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.thirdAuditUnit ? comProjectDetailInfo.advisoryBodyProject.thirdAuditUnit : "-"}}
               </div>
               <el-form-item label="" v-if="comIsModify">
-                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor" clearable placeholder="请输入三审单位"></el-input>
+                <el-input v-model="comProjectDetailInfo.advisoryBodyProject.thirdAuditUnit" clearable placeholder="请输入三审单位"></el-input>
               </el-form-item>
             </td>
           </tr>

dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue

@@ -89,7 +89,10 @@
           <el-table-column label="发包人名称" min-width="170" prop="ownerName">
             <template slot-scope="scope">
               <!--<span v-if="scope.row.ownerUnitCid" class="no-line-feed" @click="viewOwnerUnit(scope.row)">{{scope.row.ownerName}}</span>-->
-              <span v-if="scope.row.ownerUnitCid" class="no-line-feed" @click="viewOwnerUnit(scope.row)">{{scope.row.ownerName}}</span>
+              <div v-if="scope.row.ownerName">
+                <span v-if="scope.row.ownerUnitCid" class="no-line-feed" @click="viewOwnerUnit(scope.row)">{{scope.row.ownerName}}</span>
+                <span v-else>{{scope.row.ownerName}}</span>
+              </div>
               <span v-else>-</span>
             </template>
           </el-table-column>

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

@@ -208,7 +208,7 @@ export default {
   //可访问data属性
   created() {
     this.initDetail();
-    this.formData[2].options=this.engineeringCategoryDetailOptions
+    // this.formData[2].options=this.engineeringCategoryDetailOptions
   },
   //计算集
   computed: {
@@ -230,7 +230,7 @@ export default {
       try {
         const result = await getProjectUndertakingTypesApi();
         if (result.code == 200 && result?.data?.length) {
-          this.formData[1].options = result.data.map(item => ({ value: item, label: item }));
+          // this.formData[1].options = result.data.map(item => ({ value: item, label: item }));
         }
       } catch (error) {
 
@@ -241,7 +241,7 @@ export default {
         const area = await getAllAreaApi();
         if (area.code == 200) {
           this.areaList = area.data;
-          this.$set(this.formData[0], "options", this.areaList);
+          // this.$set(this.formData[0], "options", this.areaList);
           console.log();
         }
       } catch (error) {