admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain

Browse Source
This commit is contained in:
”Rain“ 2024-05-29 21:17:42 +08:00
commit a01e2a62ac
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/projectFront/projectSummary/cooperationUnit.vue
View File

@ -116,7 +116,7 @@
}}{{ item.projectDirectorPhone }} }}{{ item.projectDirectorPhone }}
</div> </div>
<div class="nature"> <div class="nature">
<!-- 项目负责人电话： -->项目类型:{{ item.projectEnterprise }} <!-- 项目负责人电话： -->项目类型:{{ item.projectEnterprise.cbsProjectTypeName }}
</div> </div>
<!-- <div class="nature"> <!-- <div class="nature">
{{ $t("message.cooperationUnit.enterpriseProperty") }}：{{ {{ $t("message.cooperationUnit.enterpriseProperty") }}：{{
@ -374,7 +374,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24" style="font-size:18px">
承包商项目基本信息 承包商项目基本信息
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
@ -393,7 +393,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="竣工日期" prop="completionDate"> <el-form-item label="竣工日期" prop="completionDate">
<el-date-picker v-model="enterpriseForm.projectEnterprise.completionDate" type="date" <el-date-picker value-format="yyyy-MM-dd" v-model="enterpriseForm.projectEnterprise.completionDate" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -485,7 +485,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="开工日期" prop="enterpriseEmail"> <el-form-item label="开工日期" prop="enterpriseEmail">
<el-date-picker v-model="enterpriseForm.projectEnterprise.startWorkDate" type="date" placeholder="选择日期"> <el-date-picker value-format="yyyy-MM-dd" v-model="enterpriseForm.projectEnterprise.startWorkDate" type="date" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -502,16 +502,8 @@
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="现场布置图" prop="layoutImage"> <el-form-item label="联系电话" prop="projectTel">
<el-upload class="upload-demo" :action="uploadUrl" :on-remove=" <el-input v-model="enterpriseForm.projectEnterprise.projectTel" placeholder="请输入联系电话"></el-input>
(file, flexList) => handleRemove(file, flexList, 3)
" :on-success="(file) => handleSuccess(file, 3)" :on-error="(file) => handleError(file, 3)"
:on-preview="(file) => handlePreview(file, 3)" :before-upload="(file) => handleBeforeUpload(file, 3)"
name="files" :file-list="layoutImageList">
<el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload')
}}</el-button>
</el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -530,8 +522,16 @@
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系电话" prop="projectTel"> <el-form-item label="现场布置图" prop="layoutImage">
<el-input v-model="enterpriseForm.projectEnterprise.projectTel" placeholder="请输入联系电话"></el-input> <el-upload class="upload-demo" :action="uploadUrl" :on-remove="
(file, flexList) => handleRemove(file, flexList, 3)
" :on-success="(file) => handleSuccess(file, 3)" :on-error="(file) => handleError(file, 3)"
:on-preview="(file) => handlePreview(file, 3)" :before-upload="(file) => handleBeforeUpload(file, 3)"
name="files" :file-list="layoutImageList">
<el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload')
}}</el-button>
</el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -1416,7 +1416,7 @@ export default {
.list { .list {
width: 30%; width: 30%;
height: 150px; height: 160px;
margin: 8px 18px; margin: 8px 18px;
border: 1px solid rgba(225, 232, 250, 1); border: 1px solid rgba(225, 232, 250, 1);
border-radius: 3px; border-radius: 3px;

4
src/views/projectFront/projectSummary/cooperatorDatails.vue
View File

@ -576,8 +576,8 @@ export default {
{ {
fieldName: "现场布置图", fieldName: "现场布置图",
fieldName2: "现场施工图", fieldName2: "现场施工图",
value: res.result.projectEnterprise.layoutImage && JSON.parse(res.result.projectEnterprise.layoutImage).length > 0? this.$store.state.FILEURL + JSON.parse(res.result.projectEnterprise.layoutImage)[0].url:"", value: res.result.projectEnterprise.layoutImage && JSON.parse(res.result.projectEnterprise.layoutImage) instanceof Array && JSON.parse(res.result.projectEnterprise.layoutImage).length > 0? this.$store.state.FILEURL + JSON.parse(res.result.projectEnterprise.layoutImage)[0].url:"",
value2: res.result.projectEnterprise.constructionMapUrl&& JSON.parse(res.result.projectEnterprise.constructionMapUrl).length > 0?this.$store.state.FILEURL + JSON.parse(res.result.projectEnterprise.constructionMapUrl)[0].url:"", value2: res.result.projectEnterprise.constructionMapUrl && JSON.parse(res.result.projectEnterprise.constructionMapUrl) instanceof Array && JSON.parse(res.result.projectEnterprise.constructionMapUrl).length > 0?this.$store.state.FILEURL + JSON.parse(res.result.projectEnterprise.constructionMapUrl)[0].url:"",
}, },
{ {
fieldName: "联系电话", fieldName: "联系电话",