diff --git a/src/assets/i18n/langs/en/laborManage/personManage.js b/src/assets/i18n/langs/en/laborManage/personManage.js index de6559c4..07a4f16d 100644 --- a/src/assets/i18n/langs/en/laborManage/personManage.js +++ b/src/assets/i18n/langs/en/laborManage/personManage.js @@ -402,17 +402,6 @@ export default { message: "Please select the business type", trigger: "submit", }, ], - "projectEnterprise.dictionaryItemId": [{ - required: true, - message: "请选择项目类型", - trigger: "change", - }, ], - "projectEnterprise.projectManage": [ - { required: true, message: "Please enter the legal projectManage", trigger: "blur" }, - ], - "projectEnterprise.projectNumber": [ - { required: true, message: "Please enter the legal projectNumber", trigger: "blur" }, - ], }, //班组校验 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 211a7990..ace0dcc5 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,9 +84,9 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // 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:9111/' //郭圣雄本地 - // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 - axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 + 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/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 diff --git a/src/store/index.js b/src/store/index.js index 73647a14..e99f6716 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -44,22 +44,22 @@ export default new Vuex.Store({ }), ], - state: { - PAGESIZRS: [10, 20, 30, 50], - // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 - // FILEURL:' http://101.43.164.214:11111/image/',// 百色 - // UPLOADURL:'http://182.90.224.237:51234/upload/image/', - // 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/',// 郭圣雄本地 - FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 - // WORKFLOWURL: "http://192.168.34.138: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',//测试 - // FILEURL:'http://42.180.188.17:11211/image/',//测试 + state: { + PAGESIZRS: [10, 20, 30, 50], + // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 + // FILEURL:' http://101.43.164.214:11111/image/',// 百色 + // UPLOADURL:'http://182.90.224.237:51234/upload/image/', + // 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/',// 郭圣雄本地 + // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 + // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) + WORKFLOWURL: "http://192.168.34.175: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',//测试 + // FILEURL:'http://42.180.188.17:11211/image/',//测试 // BASEURL: baseUrl // ? baseUrl @@ -318,14 +318,10 @@ export default new Vuex.Store({ isFolder: (state) => Number(state.sideMenu.isFolder), // 左侧栏是否折叠，0不折叠，1折叠 operaColumnExpand: (state) => state.fileList.operaColumnExpand !== null ? - Number(state.fileList.operaColumnExpand) : - document.body.clientWidth > 1280 ? - 1 : - 0, // 操作列是否展开，0不展开，1展开 + Number(state.fileList.operaColumnExpand) : document.body.clientWidth > 1280 ? + 1 : 0, // 操作列是否展开，0不展开，1展开 selectedColumnList: (state) => - state.fileList.selectedColumnList === null ? - ["extendName", "fileSize", "uploadTime", "deleteTime"] : - state.fileList.selectedColumnList.split(","), // 列显隐 + state.fileList.selectedColumnList === null ? ["extendName", "fileSize", "uploadTime", "deleteTime"] : state.fileList.selectedColumnList.split(","), // 列显隐 fileModel: (state) => state.fileList.fileModel === null ? 0 : Number(state.fileList.fileModel), // 文件展示模式，0列表模式，1网格模式 2 时间线模式 }, diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue index a5de33b9..5a715bbf 100644 --- a/src/views/projectFront/projectSummary/cooperationUnit.vue +++ b/src/views/projectFront/projectSummary/cooperationUnit.vue @@ -185,11 +185,11 @@ - - + + :value="item.id"> @@ -343,7 +343,7 @@ - @@ -355,7 +355,7 @@ - @@ -460,7 +460,7 @@ - @@ -497,18 +497,19 @@ - + - {{ $t('message.laborMange.clickOnTheUpload') }} + @@ -516,7 +517,7 @@ - @@ -747,6 +748,16 @@ export default { this.getDictionaryByStructure(); this.getDicProjectTypeList(); }, + watch: { + addEnterpriseDialog: { + handler(newVal) { + this.$nextTick(() => { + this.$refs['enterpriseForm'] && this.$refs['enterpriseForm'].clearValidate(); + }) + }, + deep:true, + } + }, methods: { //获取经纬度 toGetLocalFn() { @@ -940,7 +951,7 @@ export default { enterpriseEmail: '', //企业邮箱 enterpriseLegalPerson: '', //法定代表人 enterpriseName: '', //企业名称 - companyTypeName: this.enterpriseForm.companyTypeName, + companyTypeName: "", enterpriseProperty: '', //单位性质 1.国有企业 2三资企业 3集体企业 4私营企业 enterpriseQualificationUrl: '', //企业资质图片地址 enterpriseSafeAllow: '', //企业安全生产许可证 @@ -985,7 +996,7 @@ export default { 'message.laborMange.theNewEnterprise' ) this.addEnterpriseDialog = true - this.enterpriseForm.enterpriseTypeId = Number(this.checkedId) + // this.enterpriseForm.enterpriseTypeId = Number(this.checkedId) }, //编辑按钮 editBtn(value) { @@ -1004,6 +1015,7 @@ export default { this.aptitudeFileList = [] this.logoFileList = [] this.enterpriseForm = { ...JSON.parse(JSON.stringify(value)) } + this.enterpriseForm.enterpriseTypeId = !value.enterpriseTypeId || value.enterpriseTypeId == 0 ? '' : value.enterpriseTypeId; let aptitude = this.enterpriseForm.enterpriseQualificationUrl ? this.enterpriseForm.enterpriseQualificationUrl.split(',') : [] @@ -1036,11 +1048,11 @@ export default { this.enterpriseForm.projectEnterprise = { ...projectEnterprise }; - this.layoutImageList = JSON.parse(this.enterpriseForm.projectEnterprise.layoutImage); - this.constructionMapUrlList = JSON.parse(this.enterpriseForm.projectEnterprise.constructionMapUrl); + this.layoutImageList = this.enterpriseForm.projectEnterprise.layoutImage && this.enterpriseForm.projectEnterprise.layoutImage != 'null' ? JSON.parse(this.enterpriseForm.projectEnterprise.layoutImage) : []; + this.constructionMapUrlList = this.enterpriseForm.projectEnterprise.constructionMapUrl && this.enterpriseForm.projectEnterprise.constructionMapUrl != 'null' ? JSON.parse(this.enterpriseForm.projectEnterprise.constructionMapUrl) : []; } }).finally(() => { - this.addEnterpriseDialog = true + this.addEnterpriseDialog = true; }) }, @@ -1069,8 +1081,8 @@ export default { } } - if (this.enterpriseForm.projectTel) { - if (!checkPhone(this.enterpriseForm.projectTel)) { + if (this.enterpriseForm.projectEnterprise.projectTel) { + if (!checkPhone(this.enterpriseForm.projectEnterprise.projectTel)) { this.$message.error('请输入正确的联系电话') return } @@ -1280,7 +1292,7 @@ export default { //文件上传成功 handleSuccess(file, type) { this.$message.success(this.$t('message.laborMange.uploadSuccessful')) - let data = { name: file.data[0].filename, url: file.data[0].imageUrl } + let data = { name: file.data[0].fileInfo.originalFilename ? file.data[0].fileInfo.originalFilename : file.data[0].filename, url: file.data[0].imageUrl } console.log(file); if (type == 1) { this.aptitudeFileList.push(data)