flx:调整承包商入场审批

src/assets/js/http.js

@@ -174,7 +174,7 @@ if (process.env.NODE_ENV == "development") {
     // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
     // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
     // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地
-    axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
+    // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
     // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
     // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
     // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
@@ -187,7 +187,7 @@ if (process.env.NODE_ENV == "development") {
     // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
     // axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址
     // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
-    // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
+    axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
         // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
         // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
         // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址

src/store/index.js

@@ -56,14 +56,15 @@ export default new Vuex.Store({
         // FILEURL:'http://182.90.224.237:51234/image/',
         // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
         // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
-        UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
+        // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
-        FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
+        // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
         // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
-        WORKFLOWURL: "http://192.168.34.129:89/#/workspace/forms", //罗峰工作流地址(本地)
+        // WORKFLOWURL: "http://192.168.34.129:89/#/workspace/forms", //罗峰工作流地址(本地)
+        CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.175:5173/#/contractorApply" : `${window.location.protocol}//${host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地)
         // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
         // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
-        // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试
+        UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试
-        // FILEURL: 'http://42.180.188.17:11211/image/', //测试
+        FILEURL: 'http://42.180.188.17:11211/image/', //测试
         // BASEURL: baseUrl ?
         //     baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境
         // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
@@ -71,7 +72,7 @@ export default new Vuex.Store({
         // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
         // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
         // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址
-        // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
+        WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
         //---------------------------------------------------------------------------------------------
         // BASEURL: baseUrl
         //   ? baseUrl

src/views/projectFront/projectSummary/contractorAudit.vue

@@ -35,7 +35,9 @@
             <el-button type="warning" plain @click="refresh">{{
               $t("message.laborMange.refresh")
             }}</el-button>
-            <el-button type="primary" plain @click="inviteCBS">邀请新承包商入场</el-button>
+            <el-button type="primary" plain @click="inviteCBS"
+              >邀请新承包商入场</el-button
+            >
           </el-form-item>
         </el-form>
       </div>
@@ -168,9 +170,7 @@
                 </div>
                 <div class="flex3">
                   <span class="width_35 bg_color">企业类型</span>
-                  <span class="width_65 bg_color">{{
+                  <span class="width_65 bg_color">{{ supplierDetail.companyTypeName }}</span>
-                    supplierDetail.companyTypeName
-                  }}</span>
                 </div>
                 <div class="flex3">
                   <span class="width_35">开户行</span>
@@ -232,6 +232,7 @@
                   <span class="width_35 border_l">资质图片</span>
                   <span class="width_65"
                     ><img
+                    v-show="supplierDetail.enterpriseQualificationUrl"
                       :src="supplierDetail.enterpriseQualificationUrl"
                       style="
                         width: 40px;
@@ -289,6 +290,7 @@
                   <span class="width_35 border_l">logo</span>
                   <span class="width_65"
                     ><img
+                    v-show="supplierDetail.logo"
                       :src="supplierDetail.logo"
                       style="
                         width: 40px;
@@ -314,7 +316,11 @@
         </div>
         <vue-scroll v-show="activeTab == 3" style="height: 580px">
           <div class="basic-info">
-            <div class="custom_tab" v-for="(item, index) in supplierDetailCBS" :key="item.id">
+            <div
+              class="custom_tab"
+              v-for="(item, index) in supplierDetailCBS"
+              :key="item.id"
+            >
               <div class="flex4">
                 <div class="type_content" style="z-index: 2">
                   <div class="flex3">
@@ -322,77 +328,121 @@
                     <span class="width_65">{{ item.cbsName }}</span>
                   </div>
                   <div class="flex3">
-                              <span class="width_35 bg_color">项目施工区域</span>
+                    <span class="width_35 bg_color">项目经理</span>
-                              <span class="width_65 bg_color">{{ item.projectBuildArea }}</span>
+                    <span class="width_65 bg_color">{{
+                      item.projectManage
+                    }}</span>
                   </div>
                   <div class="flex3">
-                              <span class="width_35"> 竣工日期</span>
+                    <span class="width_35">施工阶段</span>
-                              <span class="width_65">{{ item.completionDate }}</span>
+                    <span class="width_65">{{
+                      item.constructionStageName
+                    }}</span>
                   </div>
                   <div class="flex3">
-                              <span class="width_35 bg_color">维度位置</span>
+                    <span class="width_35 bg_color">经度位置</span>
-                              <span class="width_65 bg_color">{{ item.latitude }}</span>
+                    <span class="width_65 bg_color">{{ item.longitude }}</span>
                   </div>
+                  
                   <div class="flex3">
-                              <span class="width_35">经度位置</span>
+                    <span class="width_35">项目编号</span>
-                              <span class="width_65">{{ item.longitude }}</span>
+                    <span class="width_65">{{
-                          </div>
+                      item.projectNumber
-                          <div class="flex3">
-                              <span class="width_35 bg_color">工程类别</span>
-                              <span class="width_65 bg_color">{{ item.projectType }}</span>
-                          </div>
-                          <div class="flex3">
-                              <span class="width_35">结构类型</span>
-                              <span class="width_65" style="white-space: nowrap">{{
-                                  item.structureType
                     }}</span>
                   </div>
                   <div class="flex3">
                     <span class="width_35 bg_color">项目面积(m²)</span>
-                              <span class="width_65 bg_color">{{ item.projectAcreage }}</span>
+                    <span class="width_65 bg_color">{{
+                      item.projectAcreage
+                    }}</span>
+                  </div>
+                  <div class="flex3">
+                    <span class="width_35">开工日期</span>
+                    <span class="width_65">{{ item.startWorkDate }}</span>
+                  </div>
+                  <div class="flex3">
+                    <span class="width_35 bg_color">现场布置图</span>
+                    <span class="width_65 bg_color"
+                      ><img
+                        v-show="item.layoutImage"
+                        :src="item.layoutImage"
+                        style="
+                          width: 40px;
+                          height: 40px;
+                          margin-top: 2px;
+                          cursor: pointer;
+                        "
+                        @click="
+                          bigImageDialog = true;
+                          bigImageUrl = item.layoutImage;
+                        "
+                    /></span>
+                  </div>
+                  <div class="flex3">
+                    <span class="width_35">联系电话</span>
+                    <span class="width_65">{{ item.projectTel }}</span>
                   </div>
                 </div>
                 <div class="type_content">
                   <div class="flex3">
-                              <span class="width_35 border_l">项目类型</span>
+                    <span class="width_35 border_l">项目施工区域</span>
-                              <span class="width_65">{{ item.cbsProjectType }}</span>
+                    <span class="width_65 ">{{
+                      item.projectBuildArea
+                    }}</span>
                   </div>
                   <div class="flex3">
-                              <span class="width_35 bg_color border_l">项目经理</span>
+                    <span class="width_35 bg_color border_l">项目类型</span>
-                              <span class="width_65 bg_color">{{ item.projectManage }}</span>
+                    <span class="width_65 bg_color">{{ item.cbsProjectTypeName }}</span>
                   </div>
                   <div class="flex3">
-                              <span class="width_35 border_l">联系电话</span>
+                    <span class="width_35 border_l">维度位置</span>
-                              <span class="width_65">{{ item.projectTel }}</span>
+                    <span class="width_65">{{ item.latitude }}</span>
+                  </div>
+                  <div class="flex3">
+                    <span class="width_35 bg_color border_l">工程类别</span>
+                    <span class="width_65 bg_color">{{
+                      item.projectTypeName
+                    }}</span>
+                  </div>
+                  <div class="flex3">
+                    <span class="width_35 border_l">结构类型</span>
+                    <span class="width_65" style="white-space: nowrap">{{
+                      item.structureTypeName
+                    }}</span>
                   </div>
                   <div class="flex3">
                     <span class="width_35 bg_color border_l">工程状态</span>
-                              <span class="width_65 bg_color">{{ item.bulidStatus }}</span>
+                    <span class="width_65 bg_color">{{
+                      typeof item.bulidStatus === 'number'  ?
+                      $t("message.companyDiagram.BUILDSTATUS")[item.bulidStatus]
+                        .name : ''
+                    }}</span>
                   </div>
                   <div class="flex3">
-                              <span class="width_35 border_l">开工日期</span>
+                    <span class="width_35 border_l"> 竣工日期</span>
-                              <span class="width_65">{{ item.startWorkDate }}</span>
+                    <span class="width_65">{{ item.completionDate }}</span>
-                          </div>
-                          <div class="flex3">
-                              <span class="width_35 bg_color border_l">施工阶段</span>
-                              <span class="width_65 bg_color">{{ item.constructionStage }}</span>
-                          </div>
-                          <div class="flex3">
-                              <span class="width_35 border_l">现场布置图</span>
-                              <span class="width_65"><img v-show="item.layoutImage" :src="item.layoutImage"
-                                      style="width: 40px; height: 40px; margin-top: 2px; cursor: pointer" @click="
-                                        bigImageDialog = true;
-                                      bigImageUrl = item.layoutImage;
-                                                            " /></span>
                   </div>
                   <div class="flex3">
                     <span class="width_35 bg_color border_l">现场施工图</span>
-                              <span class="width_65 bg_color"><img v-show="item.constructionMapUrl.length > 0"
+                    <span class="width_65 bg_color"
+                      ><img
+                        v-show="item.constructionMapUrl.length > 0"
                         :src="item.constructionMapUrl"
-                                      style="width: 40px; height: 40px; margin-top: 2px; cursor: pointer" @click="
+                        style="
+                          width: 40px;
+                          height: 40px;
+                          margin-top: 2px;
+                          cursor: pointer;
+                        "
+                        @click="
                           bigImageDialog = true;
                           bigImageUrl = item.constructionMapUrl;
-                                                            " /></span>
+                        "
+                    /></span>
+                  </div>
+                  <div class="flex3">
+                    <span class="width_35 border_l"></span>
+                    <span class="width_65"></span>
                   </div>
                 </div>
               </div>
@@ -407,6 +457,17 @@
               align="center"
               label="序号"
             ></el-table-column>
+            <el-table-column
+              prop="qualificationType"
+              label="资质类型"
+              align="center"
+            >
+              <template slot slot-scope="scope">
+                {{
+                  scope.row.qualificationTypeName
+                }}
+              </template>
+            </el-table-column>
             <el-table-column
               prop="fileName"
               label="资质文件名称"
@@ -419,7 +480,7 @@
             ></el-table-column>
             <el-table-column label="资质文件" align="center">
               <div slot slot-scope="scope">
-                <img
+                <!-- <img
                   :src="scope.row.fileUrl ? scope.row.fileUrl : []"
                   alt=""
                   width="50px"
@@ -427,7 +488,10 @@
                     bigImageDialog = true;
                     bigImageUrl = scope.row.fileUrl;
                   "
-                />
+                /> -->
+                <a :href="scope.row.fileUrl" target="_blank">{{
+                  scope.row.originFileName
+                }}</a>
               </div>
             </el-table-column>
             <el-table-column
@@ -531,14 +595,12 @@
     >
       <div class="invitecbs">
         <div>
-          {{$store.state.userInfo.account}}邀请您加入{{ $store.state.currentProDetail.name }}
+          {{ $store.state.userInfo.account }}邀请您加入{{
-        </div>
+            $store.state.currentProDetail.name
-        <div>
+          }}
-          邀请时间: {{ selectNowDate() }}
-        </div>
-        <div>
-          点击链接进入承包商入场申请:
         </div>
+        <div>邀请时间: {{ selectNowDate() }}</div>
+        <div>点击链接进入承包商入场申请:</div>
         <div>
           <a :href="inviteCBSUrl" target="_blank">{{ inviteCBSUrl }}</a>
         </div>
@@ -546,9 +608,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="inviteCBSDialog = false">取消</el-button>
-        <el-button type="primary" @click="onCopy">
+          <el-button type="primary" @click="onCopy"> 复制链接 </el-button>
-          复制链接
-        </el-button>
         </div>
       </template>
     </el-dialog>
@@ -563,9 +623,11 @@ import {
   qualificationApplyInfoApi,
   getEnterpriseSupplierInfoListApi,
   auditQualificationApplyPassApi,
-  auditQualificationApplyRefuseApi
+  auditQualificationApplyRefuseApi,
 } from "@/assets/js/api/supplier.js";
 import { getComapnyStatisticsListApi } from "@/assets/js/api/company/project";
+import { getEnterpriseTypeList } from "@/assets/js/api/laborPerson";
+import { getDictionaryItemApi } from "@/assets/js/api/companyDiagram";
 import moment from "moment";
 export default {
   name: "temporary",
@@ -586,7 +648,7 @@ export default {
         { name: "待审批", value: 1 },
         { name: "已审批", value: 2 },
         { name: "已驳回", value: 3 },
-        { name: "已撤销", value: 4 },
+        // { name: "已撤销", value: 4 },
       ],
       tableParameter: {
         applyStatus: "",
@@ -647,13 +709,38 @@ export default {
       rowData: {},
       replyData: {},
       inviteCBSDialog: false,
-      inviteCBSUrl: ""
+      inviteCBSUrl: "",
+      companyTypeList: [],
     };
   },
+  computed: {
+    xzSupplierType() {
+      const find = this.companyTypeList.find(
+        (item) => item.id == this.supplierDetail.xzSupplierTypeId
+      );
+      console.log(
+        find,
+        this.companyTypeList,
+        this.supplierDetail.xzSupplierTypeId
+      );
+      if (find) {
+        return find.companyTypeName;
+      }
+    },
+    constructionStageUp() {
+      return (typeList, constructionStage) => {
+        const find = typeList.find((item) => item.data == constructionStage);
+        if (find) {
+          return find.name;
+        }
+      };
+    },
+  },
   created() {
     this.projectSn = this.$store.state.projectSn;
     this.getTableList();
     this.loadData();
+    this.getCompanyTypeList();
   },
   watch: {
     filterText(val) {
@@ -661,10 +748,19 @@ export default {
     },
   },
   methods: {
+    // 获取企业类型列表
+    getCompanyTypeList() {
+      getEnterpriseTypeList({}).then((res) => {
+        console.log(res, "企业类型列表");
+        if (res.result) {
+          this.companyTypeList = res.result;
+        }
+      });
+    },
     // 邀请新承包商入场
     inviteCBS() {
-      console.log(this.inviteCBSDialog)
+      console.log(this.inviteCBSDialog);
-      this.inviteCBSUrl =`http://192.168.34.175:5173/#/contractorApply?sn=${this.$store.state.projectSn}`
+      this.inviteCBSUrl = `${this.$store.state.CONTRACTORURL}?sn=${this.$store.state.projectSn}`;
       this.inviteCBSDialog = true;
     },
     onCopy() {
@@ -685,7 +781,18 @@ export default {
       hours >= 0 && hours <= 9 ? (hours = "0" + hours) : "";
       minutes >= 0 && minutes <= 9 ? (minutes = "0" + minutes) : "";
       seconds >= 0 && seconds <= 9 ? (seconds = "0" + seconds) : "";
-      var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds  // 获取至当前的时间
+      var timer =
+        year +
+        "-" +
+        month +
+        "-" +
+        day +
+        " " +
+        hours +
+        ":" +
+        minutes +
+        ":" +
+        seconds; // 获取至当前的时间
       console.log(timer);
       return timer;
     },
@@ -715,7 +822,8 @@ export default {
             // }
             if (!item.fileUrl.includes(this.$store.state.FILEURL)) {
               if (item.fileUrl.includes("name")) {
-                item.fileUrl = this.$store.state.FILEURL + JSON.parse(item.fileUrl)[0].url;
+                item.fileUrl =
+                  this.$store.state.FILEURL + JSON.parse(item.fileUrl)[0].url;
               } else {
                 item.fileUrl = this.$store.state.FILEURL + item.fileUrl;
               }
@@ -796,7 +904,7 @@ export default {
       getEnterpriseSupplierInfoListApi(requestData).then((res) => {
         console.log(res, "承包项目信息");
         if (res.result) {
-          this.supplierDetailCBS = res.result
+          this.supplierDetailCBS = res.result;
         }
       });
     },
@@ -841,7 +949,7 @@ export default {
           applyContent: this.auditReplyVal,
           applyUser: this.$store.state.userInfo.realName,
           replyTime: moment().format("YYYY-MM-DD HH:mm:ss"),
-          resubmitApplicationUrl: `http://192.168.34.175:5173/#/contractorApply?sn=${this.$store.state.projectSn}&xzSupplierQualificationApplyId=${this.rowData.id}`,
+          resubmitApplicationUrl: `${this.$store.state.CONTRACTORURL}?sn=${this.$store.state.projectSn}&xzSupplierQualificationApplyId=${this.rowData.id}`,
         }).then((res) => {
           this.$message.error("已拒绝");
           this.relativeGroupDialog = false;

src/views/projectFront/projectSummary/cooperatorDatails.vue

@@ -143,7 +143,7 @@
         }"
         >项目信息填报</el-button
       >
-      <vue-scroll style="height: 650px">
+      <vue-scroll style="height: 590px">
         <div
           :style="index > 0 ? 'margin-top: 20px' : ''"
           v-for="(item, index) in enterpriseInfo2"
@@ -291,6 +291,8 @@
             align="center"
           >
           </el-table-column>
+          <el-table-column prop="qualificationTypeName" label="资质类型">
+          </el-table-column>
           <el-table-column
             prop="fileName"
             :label="$t('message.cooperationUnit.aptitudeFileName')"
@@ -781,6 +783,7 @@
                 :on-remove="
                   (file, flexList) => handleRemove1(file, flexList, 4, item)
                 "
+                :on-exceed="onExceed"
                 :on-success="(file) => handleSuccess1(file, 4, item)"
                 name="files"
                 :file-list="item.constructionMapUrlList"
@@ -798,6 +801,7 @@
                 :on-remove="
                   (file, flexList) => handleRemove1(file, flexList, 3, item)
                 "
+                :on-exceed="onExceed"
                 :on-success="(file) => handleSuccess1(file, 3, item)"
                 name="files"
                 :file-list="item.layoutImageList"
@@ -1134,9 +1138,12 @@ export default {
                 fieldName: "项目面积(m²)",
                 fieldName2: "工程状态",
                 value: item.projectAcreage ? item.projectAcreage : "",
-                value2: this.$t("message.companyDiagram.BUILDSTATUS")[
+                value2:
+                  typeof item.bulidStatus === "number"
+                    ? this.$t("message.companyDiagram.BUILDSTATUS")[
                         item.bulidStatus
-                ].name,
+                      ].name
+                    : "",
               },
               {
                 fieldName: "开工日期",
@@ -1189,7 +1196,7 @@ export default {
                 const resName = item.constructionMapUrl.substring(
                   item.constructionMapUrl.lastIndexOf("\/") + 1,
                   item.constructionMapUrl.length
-                    )
+                );
                 constructionMapList = [
                   {
                     name: resName,
@@ -1216,7 +1223,7 @@ export default {
                   item.layoutImage.lastIndexOf("\/") + 1,
                   item.layoutImage.length
                 );
-                constructionMapList = [
+                layoutImageList = [
                   {
                     name: resName,
                     url: resName,
@@ -1226,14 +1233,12 @@ export default {
                 JSON.parse(item.layoutImage) instanceof Array &&
                 JSON.parse(item.layoutImage).length > 0
               ) {
-                constructionMapList = JSON.parse(item.layoutImage).map(
+                layoutImageList = JSON.parse(item.layoutImage).map((item) => {
-                  (item) => {
                   return {
                     name: item.name,
                     url: item.url,
                   };
-                  }
+                });
-                );
               }
             }
 
@@ -1243,7 +1248,7 @@ export default {
               layoutImageList: layoutImageList,
             };
           });
-          console.log(this.supplierList)
+          console.log(this.supplierList);
           // basicInfo.supplierDetail = res.result
           // enterpriseInfo2
           // [
@@ -1430,7 +1435,7 @@ export default {
                   ? this.$t("message.cooperationUnit.subpackage11")
                   : res.result.enterpriseTypeId == 12
                   ? this.$t("message.cooperationUnit.subpackage12")
-                  : "",
+                  : res.result.companyTypeName,
               value2: res.result.enterpriseLegalPerson,
             },
             {
@@ -1734,9 +1739,12 @@ export default {
         row.constructionMapUrlList = fileList;
       }
     },
+    onExceed() {
+      this.$message.warning("超出最大上传限制!");
+    },
     //文件上传成功
     handleSuccess1(file, type, row) {
-      this.$message.success('上传成功')
+      this.$message.success("上传成功");
       let data = {
         name: file.data[0].fileInfo.originalFilename
           ? file.data[0].fileInfo.originalFilename
@@ -1821,6 +1829,16 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.projectDialog {
+  /deep/ .upload-demo {
+    display: flex;
+    width: 286px;
+  }
+  /deep/ .el-upload-list {
+    margin: 0;
+  }
+}
+
 .projectDialog /deep/ .el-dialog {
   margin-top: 5vh !important;
   margin-bottom: 0 !important;