修复项目基本信息模块 合作单位

src/store/index.js

@@ -52,10 +52,10 @@ 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.138:88/#/workspace/forms", //坤工作流地址(本地)
-    // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
+        WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
         // 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',//测试
@@ -175,8 +175,7 @@ export default new Vuex.Store({
             name: "工作站",
             id: 1,
             url: "/projectV2/taskList",
-      menuList: [
+            menuList: [{
-        {
                     id: 100000,
                     menuName: "任务清单",
                     path: "/projectV2/taskList",
@@ -315,15 +314,15 @@ export default new Vuex.Store({
         userInfoObj: (state) => state.user.userInfoObj,
         isFolder: (state) => Number(state.sideMenu.isFolder), //  左侧栏是否折叠，0不折叠，1折叠
         operaColumnExpand: (state) =>
-      state.fileList.operaColumnExpand !== null
+            state.fileList.operaColumnExpand !== null ?
-        ? Number(state.fileList.operaColumnExpand)
+            Number(state.fileList.operaColumnExpand) :
-        : document.body.clientWidth > 1280
+            document.body.clientWidth > 1280 ?
-        ? 1
+            1 :
-        : 0, //  操作列是否展开，0不展开，1展开
+            0, //  操作列是否展开，0不展开，1展开
         selectedColumnList: (state) =>
-      state.fileList.selectedColumnList === null
+            state.fileList.selectedColumnList === null ?
-        ? ["extendName", "fileSize", "uploadTime", "deleteTime"]
+            ["extendName", "fileSize", "uploadTime", "deleteTime"] :
-        : state.fileList.selectedColumnList.split(","), //  列显隐
+            state.fileList.selectedColumnList.split(","), //  列显隐
         fileModel: (state) =>
             state.fileList.fileModel === null ? 0 : Number(state.fileList.fileModel), //  文件展示模式，0列表模式，1网格模式 2 时间线模式
     },

src/views/projectFront/projectSummary/cooperationUnit.vue

@@ -384,10 +384,8 @@
             </el-row>
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item label="竣工日期" prop="completionDate">
+                <el-form-item label="项目经理" prop="projectEnterprise.projectManage">
-                  <el-date-picker value-format="yyyy-MM-dd" v-model="enterpriseForm.projectEnterprise.completionDate"
+                  <el-input v-model="enterpriseForm.projectEnterprise.projectManage" placeholder="请输入项目经理"></el-input>
-                    type="date" placeholder="选择日期">
-                  </el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -403,13 +401,18 @@
             </el-row>
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item label="项目经理" prop="projectEnterprise.projectManage">
+                <el-form-item label="项目编号" prop="projectEnterprise.projectNumber">
-                  <el-input v-model="enterpriseForm.projectEnterprise.projectManage" placeholder="请输入项目经理"></el-input>
+                  <el-input v-model="enterpriseForm.projectEnterprise.projectNumber" placeholder="请输入项目编号"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="项目编号" prop="projectEnterprise.projectNumber">
+                <el-form-item label="施工阶段" prop="constructionStage">
-                  <el-input v-model="enterpriseForm.projectEnterprise.projectNumber" placeholder="请输入项目编号"></el-input>
+                  <el-select v-model="enterpriseForm.projectEnterprise.constructionStage" placeholder="请选择施工阶段" filterable
+                    clearable style="width: 100%">
+                    <el-option v-for="(item, index) in constructionStageList" :label="item.name"
+                      :value="Number(item.data)" :key="index">
+                    </el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -484,13 +487,10 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="施工阶段" prop="constructionStage">
+                <el-form-item label="竣工日期" prop="completionDate">
-                  <el-select v-model="enterpriseForm.projectEnterprise.constructionStage" placeholder="请选择施工阶段" filterable
+                  <el-date-picker value-format="yyyy-MM-dd" v-model="enterpriseForm.projectEnterprise.completionDate"
-                    clearable style="width: 100%">
+                    type="date" placeholder="选择日期">
-                    <el-option v-for="(item, index) in constructionStageList" :label="item.name"
+                  </el-date-picker>
-                      :value="Number(item.data)" :key="index">
-                    </el-option>
-                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -986,7 +986,7 @@ export default {
         }
 
       }
-      console.log('==========',this.enterpriseForm.companyTypeName)
+      // console.log('==========',this.enterpriseForm.companyTypeName)
       this.aptitudeFileList = [];
       this.logoFileList = [];
       this.layoutImageList = [];
@@ -996,7 +996,8 @@ export default {
         'message.laborMange.theNewEnterprise'
       )
       this.addEnterpriseDialog = true
-      // this.enterpriseForm.enterpriseTypeId = Number(this.checkedId)
+      this.enterpriseForm.enterpriseTypeId = this.checkedId;
+      // console.log("111111111111",this.checkedId)
     },
     //编辑按钮
     editBtn(value) {

src/views/projectFront/projectSummary/cooperatorDatails.vue

@@ -585,15 +585,16 @@ export default {
               value2: res.result.projectEnterprise.projectBuildArea ? res.result.projectEnterprise.projectBuildArea : "",
             },
             {
-              fieldName: "竣工日期",
+            
+              fieldName: "项目经理",
               fieldName2: "项目类型",
-              value: res.result.projectEnterprise.completionDate ? res.result.projectEnterprise.completionDate :"",
+              value: res.result.projectEnterprise.projectManage ? res.result.projectEnterprise.projectManage :"",
               value2: res.result.projectEnterprise.cbsProjectTypeName ? res.result.projectEnterprise.cbsProjectTypeName:"",
             },
             {
-              fieldName: "项目经理",
+              fieldName: "施工阶段",
               fieldName2: "维度位置",
-              value: res.result.projectEnterprise.projectManage ? res.result.projectEnterprise.projectManage :"",
+              value: res.result.projectEnterprise.constructionStageName?res.result.projectEnterprise.constructionStageName:"",
               value2: res.result.projectEnterprise.latitude ? res.result.projectEnterprise.latitude :"",
             },
             {
@@ -616,9 +617,9 @@ export default {
             },
             {
               fieldName: "开工日期",
-              fieldName2: "施工阶段",
+              fieldName2: "竣工日期",
               value: res.result.projectEnterprise.startWorkDate?res.result.projectEnterprise.startWorkDate:"",
-              value2: res.result.projectEnterprise.constructionStageName?res.result.projectEnterprise.constructionStageName:"",
+              value2: res.result.projectEnterprise.completionDate ? res.result.projectEnterprise.completionDate :"",
             },
             {
               fieldName: "现场布置图",