Commit c94d6563 authored by Administrator's avatar Administrator

Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

parents aae11a3e 1e65f7ae
...@@ -9,7 +9,6 @@ import com.dsk.cscec.domain.AdvisoryBodyCustomForm; ...@@ -9,7 +9,6 @@ import com.dsk.cscec.domain.AdvisoryBodyCustomForm;
import com.dsk.cscec.domain.bo.*; import com.dsk.cscec.domain.bo.*;
import com.dsk.cscec.domain.vo.*; import com.dsk.cscec.domain.vo.*;
import com.dsk.cscec.service.AdvisoryBodyCustomFormService; import com.dsk.cscec.service.AdvisoryBodyCustomFormService;
import com.dsk.cscec.service.AdvisoryBodyProjectService;
import com.dsk.cscec.service.AdvisoryBodyService; import com.dsk.cscec.service.AdvisoryBodyService;
import com.dsk.cscec.service.IDProjectService; import com.dsk.cscec.service.IDProjectService;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -34,12 +33,10 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -34,12 +33,10 @@ public class AdvisoryBodyManageController extends BaseController {
@Resource @Resource
private AdvisoryBodyService advisoryBodyService; private AdvisoryBodyService advisoryBodyService;
@Resource @Resource
private AdvisoryBodyProjectService advisoryBodyProjectService;
@Resource
private AdvisoryBodyCustomFormService advisoryBodyCustomFormService; private AdvisoryBodyCustomFormService advisoryBodyCustomFormService;
/** /**
* 获取所有项目列表数据 * 获取项目列表
*/ */
@GetMapping("/getProjectList") @GetMapping("/getProjectList")
public TableDataInfo<ProjectSearchVo> getProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery) { public TableDataInfo<ProjectSearchVo> getProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery) {
...@@ -93,7 +90,7 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -93,7 +90,7 @@ public class AdvisoryBodyManageController extends BaseController {
* 新增/更新咨询机构与项目关联信息(advisory_body_project表) * 新增/更新咨询机构与项目关联信息(advisory_body_project表)
*/ */
@PostMapping("/editAdvisoryBody") @PostMapping("/editAdvisoryBody")
public R<Void> editAdvisoryBody(@Validated EditAdvisoryBodyInfoBo editInfoBo) { public R<Void> editAdvisoryBody(@Validated @RequestBody EditAdvisoryBodyInfoBo editInfoBo) {
return toAjax(advisoryBodyService.editAdvisoryBody(editInfoBo)); return toAjax(advisoryBodyService.editAdvisoryBody(editInfoBo));
} }
...@@ -110,7 +107,7 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -110,7 +107,7 @@ public class AdvisoryBodyManageController extends BaseController {
*/ */
@PostMapping("/addAdvisoryBodyCustomForm") @PostMapping("/addAdvisoryBodyCustomForm")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public R<Void> addAdvisoryBodyCustomForm(@Validated AdvisoryBodyCustomForm advisoryBodyCustomForm) { public R<Void> addAdvisoryBodyCustomForm(@Validated @RequestBody AdvisoryBodyCustomForm advisoryBodyCustomForm) {
return toAjax(advisoryBodyCustomFormService.save(advisoryBodyCustomForm)); return toAjax(advisoryBodyCustomFormService.save(advisoryBodyCustomForm));
} }
...@@ -119,7 +116,7 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -119,7 +116,7 @@ public class AdvisoryBodyManageController extends BaseController {
*/ */
@PutMapping("/updateAdvisoryBodyCustomForm") @PutMapping("/updateAdvisoryBodyCustomForm")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public R<Void> updateAdvisoryBodyCustomForm(@Validated EditAdvisoryBodyCustomFormBo editBo) { public R<Void> updateAdvisoryBodyCustomForm(@Validated @RequestBody EditAdvisoryBodyCustomFormBo editBo) {
return toAjax(advisoryBodyCustomFormService.updateById(editBo)); return toAjax(advisoryBodyCustomFormService.updateById(editBo));
} }
} }
\ No newline at end of file
...@@ -80,7 +80,6 @@ public class ExportService { ...@@ -80,7 +80,6 @@ public class ExportService {
//回调函数 //回调函数
composeQueryDto.setExportBackUrl(EXPORT_BACK_URL); composeQueryDto.setExportBackUrl(EXPORT_BACK_URL);
composeQueryDto.setExportExeclName(fileName); composeQueryDto.setExportExeclName(fileName);
log.info(JSONObject.toJSONString(composeQueryDto));
dskOpenApiUtil.requestBody("/operate/export/zjyj/aptitude", BeanUtil.beanToMap(composeQueryDto,false,false)); dskOpenApiUtil.requestBody("/operate/export/zjyj/aptitude", BeanUtil.beanToMap(composeQueryDto,false,false));
return AjaxResult.success(); return AjaxResult.success();
} }
......
...@@ -38,7 +38,7 @@ export const getConsultingOrgEenterpriseDetailWithSearchApi = (params) => reques ...@@ -38,7 +38,7 @@ export const getConsultingOrgEenterpriseDetailWithSearchApi = (params) => reques
* @param {*} params * @param {*} params
* @returns * @returns
*/ */
export const getgetConsultingOrgProjectDetailApi = (params) => request({ export const getConsultingOrgProjectDetailApi = (params) => request({
url: "/advisory/body/getProjectDetail", url: "/advisory/body/getProjectDetail",
method: "get", method: "get",
params params
...@@ -55,4 +55,47 @@ export const searchConsultingApi = (advisoryBodyName) => request({ ...@@ -55,4 +55,47 @@ export const searchConsultingApi = (advisoryBodyName) => request({
params: { params: {
advisoryBodyName advisoryBodyName
} }
}); });
\ No newline at end of file
/**
* 更新咨询机构结算信息
* @param {*} data
* @returns
*/
export const updateConsultingDetailApi = (data) => request({
url: "/advisory/body/editAdvisoryBody",
method: "post",
data
});
/**
* 获取自定义表单
* @returns
*/
export const getCustomFormDetailApi = () => request({
url: "/advisory/body/getAdvisoryBodyCustomForm",
method: "get",
params: {}
});
/**
* 新增自定义表单
* @param {*} data
* @returns
*/
export const addCustomFormDataApi = (data) => request({
url: "/advisory/body/addAdvisoryBodyCustomForm",
method: "post",
data
});
/**
* 更新自定义表单
* @param {*} data
* @returns
*/
export const updateCustomFormDataApi = (data) => request({
url: "/advisory/body/updateAdvisoryBodyCustomForm",
method: "post",
data
});
...@@ -245,3 +245,6 @@ ...@@ -245,3 +245,6 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.el-range-editor--medium{
text-align: left;
}
import { Message } from "element-ui"; import { Message } from "element-ui";
import { parseTime } from './ruoyi'; import { parseTime } from './ruoyi';
import { router } from "@/router";
/** /**
* 表格时间格式化 * 表格时间格式化
...@@ -924,5 +925,10 @@ export const detailSideBar = new Map([ ...@@ -924,5 +925,10 @@ export const detailSideBar = new Map([
["cooperationList", "cooperationRecord"], ["cooperationList", "cooperationRecord"],
// 内部合作 准入情况 // 内部合作 准入情况
["approveInfo", "accessCondition"], ["approveInfo", "accessCondition"],
]) ]);
export const tableContainerFixed = (scrollBarContainer = "",) => {
}
<template> <template>
<div class="consulting-agency-container"> <div class="consulting-agency-container">
<el-form :model="comProjectDetailInfo" :rules="rules" :inline-message="false" class="basic-engineering-information-inner"> <el-form :model="comProjectDetailInfo" :rules="rules" :show-message="false" class="basic-engineering-information-inner"
ref="comProjectDetailForm">
<!-- 基础信息 --> <!-- 基础信息 -->
<div class="project-basic-information"> <div class="project-basic-information">
<div class="info-module-title"><span>基础信息</span></div> <div class="info-module-title"><span>基础信息</span></div>
...@@ -14,15 +15,13 @@ ...@@ -14,15 +15,13 @@
<tr> <tr>
<td class="table-key">咨询机构名称</td> <td class="table-key">咨询机构名称</td>
<td> <td>
<transition mode="out-in" name="edit-fade"> <div class="normal-value" v-if="!comIsModify">
<div class="normal-value" v-if="!comIsModify"> {{comProjectDetailInfo.advisoryBody && comProjectDetailInfo.advisoryBody.advisoryBodyName ? comProjectDetailInfo.advisoryBody.advisoryBodyName : "-"}}
{{comProjectDetailInfo.advisoryBody && comProjectDetailInfo.advisoryBody.advisoryBodyName ? comProjectDetailInfo.advisoryBody.advisoryBodyName : "-"}} </div>
</div> <el-form-item label="" v-if="comIsModify" prop="advisoryBody.advisoryBodyName">
<el-form-item label="" v-if="comIsModify"> <el-input v-model="comProjectDetailInfo.advisoryBody.advisoryBodyName" clearable v-focus placeholder="请输入完整咨询机构名称"
<el-input v-model="comProjectDetailInfo.advisoryBody.advisoryBodyName" clearable v-focus placeholder="请输入完整咨询机构名称" @input="searchConsulting"></el-input>
@input="searchConsulting"></el-input> </el-form-item>
</el-form-item>
</transition>
</td> </td>
<td class="table-key">法人代表</td> <td class="table-key">法人代表</td>
<td> <td>
...@@ -54,17 +53,32 @@ ...@@ -54,17 +53,32 @@
<tr> <tr>
<td class="table-key">项目负责人</td> <td class="table-key">项目负责人</td>
<td> <td>
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeader ? comProjectDetailInfo.advisoryBodyProject.projectLeader : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeader ? comProjectDetailInfo.advisoryBodyProject.projectLeader : "-"}}
</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>
</td> </td>
<td class="table-key">项目负责人专业</td> <td class="table-key">项目负责人专业</td>
<td> <td>
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor ? comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor ? comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor : "-"}}
</div>
<el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.projectLeaderMajor">
<el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor" clearable placeholder="请输入项目负责人专业"></el-input>
</el-form-item>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="table-key">联系电话</td> <td class="table-key">联系电话</td>
<td colspan="3"> <td colspan="3">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone ? comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone ? comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone : "-"}}
</div>
<el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.projectLeaderPhone">
<el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone" clearable placeholder="请输入项目负责人联系电话"></el-input>
</el-form-item>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -82,17 +96,39 @@ ...@@ -82,17 +96,39 @@
<tr> <tr>
<td class="table-key">结算开始时间</td> <td class="table-key">结算开始时间</td>
<td> <td>
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.settleStartTime ? comProjectDetailInfo.advisoryBodyProject.settleStartTime : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.settleStartTime ? comProjectDetailInfo.advisoryBodyProject.settleStartTime : "-"}}
</div>
<el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.settleStartTime">
<el-date-picker v-model="comProjectDetailInfo.advisoryBodyProject.settleStartTime" type="datetime" placeholder="选择结算开始时间"
:value-format="'yyyy-MM-dd HH:mm:ss'">
</el-date-picker>
</el-form-item>
</td> </td>
<td class="table-key">结算完成时间</td> <td class="table-key">结算完成时间</td>
<td> <td>
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.settleFinishTime ? comProjectDetailInfo.advisoryBodyProject.settleFinishTime : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.settleFinishTime ? comProjectDetailInfo.advisoryBodyProject.settleFinishTime : "-"}}
</div>
<el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.settleFinishTime">
<el-date-picker v-model="comProjectDetailInfo.advisoryBodyProject.settleFinishTime" type="datetime" placeholder="选择结算完成时间"
:value-format="'yyyy-MM-dd HH:mm:ss'">
</el-date-picker>
</el-form-item>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="table-key">是否为终审单位</td> <td class="table-key">是否为终审单位</td>
<td colspan="3"> <td colspan="3">
{{comProjectDetailInfo.advisoryBodyProject && statusCheck(comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit) ? statusCheck(comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit) : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && statusCheck(comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit) ? statusCheck(comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit) : "-"}}
</div>
<el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.isFinalJudgeUnit">
<el-radio-group v-model="comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit">
<el-radio :label="'0'"></el-radio>
<el-radio :label="'1'"></el-radio>
</el-radio-group>
</el-form-item>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -101,7 +137,8 @@ ...@@ -101,7 +137,8 @@
</div> </div>
</template> </template>
<script> <script>
import { searchConsultingApi } from "@/api/consultingOrgManagement"; import { searchConsultingApi, getCustomFormDetailApi } from "@/api/consultingOrgManagement";
import { elementMessageSingleton } from "@/utils";
export default { export default {
name: "consultingAgency", name: "consultingAgency",
props: { props: {
...@@ -121,8 +158,8 @@ export default { ...@@ -121,8 +158,8 @@ export default {
watch: { watch: {
projectDetailInfo: { projectDetailInfo: {
handler(newValue, oldValue) { handler(newValue, oldValue) {
this.comProjectDetailInfo = JSON.parse(JSON.stringify(newValue)); this.setInitData(this.comProjectDetailInfo, JSON.parse(JSON.stringify(newValue)), "comProjectDetailInfo");
this.oldComProjectDetailInfo = JSON.parse(JSON.stringify(oldValue)); this.setInitData(this.oldComProjectDetailInfo, JSON.parse(JSON.stringify(oldValue)), "oldComProjectDetailInfo");
}, },
deep: true deep: true
}, },
...@@ -133,19 +170,32 @@ export default { ...@@ -133,19 +170,32 @@ export default {
} }
}, },
data() { data() {
const phoneValidator = (rule, value, callback) => {
const phoneReg = /^1[3-9]\d{9}$/;
// if (!value && !value?.toString()?.trim()) {
// return callback(new Error(`请输入项目负责人联系电话`));
// }
if (value && !phoneReg.test(value)) {
return callback(new Error(`请输入正确的联系电话`));
}
return callback();
};
return { return {
comIsModify: this.isModify, comIsModify: this.isModify,
comProjectDetailInfo: JSON.parse(JSON.stringify(this.projectDetailInfo)), comProjectDetailInfo: {},
oldComProjectDetailInfo: JSON.parse(JSON.stringify(this.projectDetailInfo)), oldComProjectDetailInfo: {},
rules: { rules: {
"advisoryBody.advisoryBodyName": [{ required: true, trigger: ["blur", "change"], message: "咨询机构名称不能为空" }],
"advisoryBodyProject.projectLeaderPhone": [{ required: true, trigger: ["blur", "change"], validator: phoneValidator }],
}, },
tableKeyWidth: 0, tableKeyWidth: 0,
searchTimer: null searchTimer: null,
}; };
}, },
//可访问data属性 //可访问data属性
created() { created() {
this.setInitData(this.comProjectDetailInfo, JSON.parse(JSON.stringify(this.projectDetailInfo)), "comProjectDetailInfo");
this.setInitData(this.oldComProjectDetailInfo, JSON.parse(JSON.stringify(this.projectDetailInfo)), "oldComProjectDetailInfo");
this.setTableKeyWidth(); this.setTableKeyWidth();
}, },
//计算集 //计算集
...@@ -154,6 +204,12 @@ export default { ...@@ -154,6 +204,12 @@ export default {
}, },
//方法集 //方法集
methods: { methods: {
setInitData(originData, mergeData, mergeKey) {
if (!mergeData.advisoryBody) mergeData.advisoryBody = {};
if (!mergeData.advisoryBodyProject) mergeData.advisoryBodyProject = {};
// 响应更新
this.$set(this, mergeKey, { ...this[mergeKey], ...mergeData });
},
statusCheck(status) { statusCheck(status) {
if (status == "0") { if (status == "0") {
return "是"; return "是";
...@@ -186,7 +242,10 @@ export default { ...@@ -186,7 +242,10 @@ export default {
if ((keywords || keywords == "0") && keywords?.toString()?.trim() && keywords?.toString()?.trim()?.length >= 1) { if ((keywords || keywords == "0") && keywords?.toString()?.trim() && keywords?.toString()?.trim()?.length >= 1) {
this.clearSearchTimer(); this.clearSearchTimer();
this.searchTimer = setTimeout(async () => { this.searchTimer = setTimeout(async () => {
await this.searchConsultingHandle(keywords.toString().trim()); const result = await this.searchConsultingHandle(keywords.toString().trim());
if (result) {
this.updateTemplate(result);
}
}, 1000); }, 1000);
} }
} catch (error) { } catch (error) {
...@@ -196,16 +255,92 @@ export default { ...@@ -196,16 +255,92 @@ export default {
async searchConsultingHandle(keywords) { async searchConsultingHandle(keywords) {
try { try {
const searchResult = await searchConsultingApi(keywords); const searchResult = await searchConsultingApi(keywords);
if (searchResult.code == 200) { if (searchResult.code == 200 && searchResult.data) {
console.log(searchResult); return searchResult.data;
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
}, },
updateTemplate(data) {
const updateMap = new Map([
["advisoryBody.advisoryBodyName", "advisoryBodyName"],
["advisoryBody.advisoryBodyCid", "advisoryBodyCid"],
["advisoryBody.businessScope", "businessScope"],
["isNewAdvisoryBody", "isNewAdvisoryBody"],
["corporatePerson", "corporatePerson"],
["regAddress", "regAddress"],
]);
this.setTemplateData(updateMap, data);
console.log(this.comProjectDetailInfo);
},
setTemplateData(mapData, data) {
/**
* @type {Map<string,string>}
*/
const _mapTemp = mapData;
// 寻找对应的赋值对象
for (const [key, value] of _mapTemp) {
const keys = key.split(".");
const len = keys.length;
if (len == 1) {
this.$set(this.comProjectDetailInfo, key, data[value]);
continue;
}
const currentObjectKey = keys[len - 2];
const currentKey = keys[len - 1];
const currentObject = this.findCurrent(this.comProjectDetailInfo, currentObjectKey);
this.$set(currentObject, currentKey, data[value]);
}
},
findCurrent(originData, key) {
for (const _key in originData) {
if (_key == key) {
return originData[_key];
}
if (Object.prototype.toString.call(originData[_key]) == "[object Object]") {
return this.findCurrent(originData[_key], key);
}
}
},
clearSearchTimer() { clearSearchTimer() {
clearTimeout(this.searchTimer); clearTimeout(this.searchTimer);
this.searchTimer = null; this.searchTimer = null;
},
async updateConsultingDetail() {
try {
const flag = await this.$refs["comProjectDetailForm"].validate();
if (flag) {
// 通过验证校验咨询机构是否存在
const result = await this.searchConsultingHandle(this.comProjectDetailInfo.advisoryBody.advisoryBodyName);
if (result.advisoryBodyCid) {
const _temp = JSON.parse(JSON.stringify(this.comProjectDetailInfo));
const paramsData = {
isNewAdvisoryBody: _temp.isNewAdvisoryBody,
projectKey: _temp.projectKey,
advisoryBodyCid: _temp.advisoryBody.advisoryBodyCid,
advisoryBodyName: _temp.advisoryBody.advisoryBodyName ?? "",
businessScope: _temp.advisoryBody.businessScope ?? "",
projectLeader: _temp.advisoryBodyProject.projectLeader ?? "",
projectLeaderMajor: _temp.advisoryBodyProject.projectLeaderMajor ?? "",
projectLeaderPhone: _temp.advisoryBodyProject.projectLeaderPhone ?? "",
projectLeaderPhone: _temp.advisoryBodyProject.projectLeaderPhone ?? "",
settleStartTime: _temp.advisoryBodyProject.settleStartTime ?? "",
settleFinishTime: _temp.advisoryBodyProject.settleFinishTime ?? "",
isFinalJudgeUnit: _temp.advisoryBodyProject.isFinalJudgeUnit ?? "",
};
this.$emit("editComProjectDetailSuccess", paramsData);
}
}
} catch (error) {
if (error) {
for (const key in error) {
const _temp = error[key];
_temp instanceof Array ? elementMessageSingleton("error", `${_temp[0].message}`) : null;
break;
}
}
}
} }
}, },
} }
...@@ -280,6 +415,16 @@ export default { ...@@ -280,6 +415,16 @@ export default {
margin-bottom: 0px; margin-bottom: 0px;
z-index: 9; z-index: 9;
&.is-error {
.el-form-item__content {
.el-input {
.el-input__inner {
border-color: #ff4949;
}
}
}
}
.el-form-item__content { .el-form-item__content {
height: 100%; height: 100%;
font-size: 12px; font-size: 12px;
...@@ -306,6 +451,35 @@ export default { ...@@ -306,6 +451,35 @@ export default {
border: 1px solid #0081ff; border: 1px solid #0081ff;
} }
} }
.el-date-editor {
width: 100%;
.el-input__prefix {
display: none;
}
}
.el-radio-group {
display: flex;
height: 100%;
align-items: center;
padding-left: 12px;
box-sizing: border-box;
.el-radio__input.is-checked .el-radio__inner {
border-color: #0081ff;
background: #0081ff;
}
.el-radio__input.is-checked + .el-radio__label {
color: #0081ff;
}
.el-radio__inner:hover {
border-color: #0081ff;
}
}
} }
} }
} }
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange"> v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange">
<!-- 项目列表 --> <!-- 项目列表 -->
<template slot="projectName" slot-scope="{data,row}"> <template slot="projectName" slot-scope="{data,row}">
<div v-if="row.projectName" class="no-line-feed">{{row.projectName}}</div> <div v-if="row.projectName" class="no-line-feed" v-html="row.projectName"></div>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
<template slot="projectLeader" slot-scope="{data,row}"> <template slot="projectLeader" slot-scope="{data,row}">
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<el-button type="primary" @click="editProjectDetail">编辑信息</el-button> <el-button type="primary" @click="editProjectDetail">编辑信息</el-button>
</div> </div>
<div class="save-project-detail-container" v-if="currentList === 'consultingAgency' && isModify" :key="'save-project'"> <div class="save-project-detail-container" v-if="currentList === 'consultingAgency' && isModify" :key="'save-project'">
<el-button type="primary" @click="editProjectDetail">保存</el-button> <el-button type="primary" @click="saveProjectDetail">保存</el-button>
<el-button @click="cancelSave">取消</el-button> <el-button @click="cancelSave">取消</el-button>
</div> </div>
</transition> </transition>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<basic-engineering-information v-if="currentList === 'project'" :projectDetailInfo="projectDetailInfo"></basic-engineering-information> <basic-engineering-information v-if="currentList === 'project'" :projectDetailInfo="projectDetailInfo"></basic-engineering-information>
<!-- 咨询机构结算信息 --> <!-- 咨询机构结算信息 -->
<consulting-agency v-if="currentList === 'consultingAgency'" :projectDetailInfo="projectDetailInfo" :isModify="isModify" <consulting-agency v-if="currentList === 'consultingAgency'" :projectDetailInfo="projectDetailInfo" :isModify="isModify"
ref="consultingAgency"></consulting-agency> ref="consultingAgency" @editComProjectDetailSuccess="editComProjectDetailSuccess"></consulting-agency>
</div> </div>
</div> </div>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</template> </template>
<script> <script>
import DskTabToggle from "@/components/DskTabToggle"; import DskTabToggle from "@/components/DskTabToggle";
import { getgetConsultingOrgProjectDetailApi } from "@/api/consultingOrgManagement/index"; import { getConsultingOrgProjectDetailApi, updateConsultingDetailApi } from "@/api/consultingOrgManagement";
import { v4 } from 'uuid'; import { v4 } from 'uuid';
import BasicEngineeringInformation from "@/views/consultingOrgManagement/components/EnterpriseList/detail/basicEngineeringInformation"; import BasicEngineeringInformation from "@/views/consultingOrgManagement/components/EnterpriseList/detail/basicEngineeringInformation";
import consultingAgency from "@/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency"; import consultingAgency from "@/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency";
...@@ -92,26 +92,38 @@ export default { ...@@ -92,26 +92,38 @@ export default {
methods: { methods: {
async init() { async init() {
try { try {
const advisoryBodyCid = this.$route.params?.advisoryBodyCid; const advisoryBodyCid = this.$route.query?.advisoryBodyCid;
const projectKey = this.$route.query?.projectKey; const projectKey = this.$route.query?.projectKey;
if (!advisoryBodyCid) return this.$message.error("缺少咨询机构ID"); // if (!advisoryBodyCid) return this.$message.error("缺少咨询机构ID");
if (!projectKey) return this.$message.error("缺少项目主键"); if (!projectKey) return this.$message.error("缺少项目主键");
const detail = await getgetConsultingOrgProjectDetailApi({ const detail = await getConsultingOrgProjectDetailApi({
advisoryBodyCid, advisoryBodyCid,
projectKey projectKey
}); });
if (detail.code == 200 && detail.data) { if (detail.code == 200 && detail.data) {
this.projectDetailInfo = { ...this.pprojectDetailInfo, ...detail.data }; this.projectDetailInfo = { ...this.projectDetailInfo, ...detail.data };
} }
} catch (error) { } catch (error) {
console.log(error);
} }
}, },
editProjectDetail() { editProjectDetail() {
this.isModify = true; this.isModify = true;
}, },
saveProjectDetail() { saveProjectDetail() {
this.$refs["consultingAgency"].updateConsultingDetail();
},
// 编辑成功提交信息
async editComProjectDetailSuccess(data) {
try {
const result = await updateConsultingDetailApi(data);
if (result.code) {
this.$message.success("更新咨询机构结算信息成功");
this.isModify = false;
}
} catch (error) {
}
}, },
cancelSave() { cancelSave() {
this.isModify = false; this.isModify = false;
......
...@@ -337,8 +337,8 @@ export default { ...@@ -337,8 +337,8 @@ export default {
}, },
// 查看项目详情 // 查看项目详情
viewProjectDetail(row) { viewProjectDetail(row) {
if (!row?.advisoryBody?.advisoryBodyCid) return this.$message.warning("缺少咨询机构id"); // if (!row?.advisoryBody?.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail/${row.advisoryBody?.advisoryBodyCid}?projectKey=${row.projectKey}`); this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail?advisoryBodyCid=${row.advisoryBody?.advisoryBodyCid ? row.advisoryBody?.advisoryBodyCid : ""}&projectKey=${row.projectKey}`);
}, },
// 跳转到企业详情 // 跳转到企业详情
viewEnterprise(row) { viewEnterprise(row) {
......
...@@ -13,15 +13,15 @@ ...@@ -13,15 +13,15 @@
:value="item"> :value="item">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="value1" value-key="id" @change="selectChange1" v-if="options.length>0" placeholder="请选择"> <el-select v-model="value1" value-key="id" @change="selectChange1" v-if="options1&&options1.length>0" placeholder="请选择">
<el-option <el-option
v-for="item in options" v-for="item in options1"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item"> :value="item">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="value2" value-key="id" @change="selectChange2" v-if="options2.length>0" placeholder="请选择"> <el-select v-model="value2" value-key="id" @change="selectChange2" v-if="options2&&options2.length>0" placeholder="请选择">
<el-option <el-option
v-for="item in options2" v-for="item in options2"
:key="item.name" :key="item.name"
...@@ -29,6 +29,14 @@ ...@@ -29,6 +29,14 @@
:value="item"> :value="item">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="value3" value-key="id" @change="selectChange3" v-if="options3&&options3.length>0" placeholder="请选择">
<el-option
v-for="item in options3"
:key="item.name"
:label="item.name"
:value="item">
</el-option>
</el-select>
</div> </div>
<div style="padding:16px;"> <div style="padding:16px;">
<el-table :data="info.list" :span-method="objectSpanMethod" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'" <el-table :data="info.list" :span-method="objectSpanMethod" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
...@@ -46,7 +54,7 @@ ...@@ -46,7 +54,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :resizable="false" label="经营范围" > <el-table-column :resizable="false" label="可承包工程范围" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.contractScope||"--"}} {{scope.row.contractScope||"--"}}
</template> </template>
...@@ -68,86 +76,135 @@ export default { ...@@ -68,86 +76,135 @@ export default {
return{ return{
list, list,
activeIndex:0, activeIndex:0,
options: [], options1: [],
options2: [], options2: [],
options3: [],
value: '', value: '',
value1: '', value1: '',
value2: '', value2: '',
value3: '',
info:"", info:"",
} }
}, },
methods:{ mounted(){
flitterData(arr) { this.choose()
let spanOneArr = [];
let concatOne = 0;
arr.forEach((item, index) => {
if (index === 0) {
spanOneArr.push(1);
} else {
if (item.name === arr[index - 1].name) {
spanOneArr[concatOne] += 1;
spanOneArr.push(0);
} else {
spanOneArr.push(1);
concatOne = index;
}
}
});
return {
one: spanOneArr,
};
}, },
objectSpanMethod({ row, column, rowIndex, columnIndex }) { methods:{
if (columnIndex === 0) { choose(){
const _row = this.flitterData(this.info.list).one[rowIndex]; this.value = this.list[this.activeIndex].list[0];
const _col = _row > 0 ? 1 : 0; this.options1 = this.list[this.activeIndex].list[0].list
if(this.options1){
this.value1 = this.list[this.activeIndex].list[0].list[0];
this.options2 = this.list[this.activeIndex].list[0].list[0].list
if(this.options2){
this.value2 = this.list[this.activeIndex].list[0].list[0].list[0];
this.options3 = this.list[this.activeIndex].list[0].list[0].list[0].list
if(this.options3){
this.value3 = this.list[this.activeIndex].list[0].list[0].list[0].list[0];
standard({id:this.value3.id}).then(res=>{
this.info = res.data
})
}else{
standard({id:this.value2.id}).then(res=>{
this.info = res.data
})
}
}else{
standard({id:this.value1.id}).then(res=>{
this.info = res.data
})
}
}else{
standard({id:this.value.id}).then(res=>{
this.info = res.data
})
}
},
flitterData(arr) {
let spanOneArr = [];
let concatOne = 0;
arr.forEach((item, index) => {
if (index === 0) {
spanOneArr.push(1);
} else {
if (item.name === arr[index - 1].name) {
spanOneArr[concatOne] += 1;
spanOneArr.push(0);
} else {
spanOneArr.push(1);
concatOne = index;
}
}
});
return { return {
rowspan: _row, one: spanOneArr,
colspan: _col,
}; };
} },
}, objectSpanMethod({ row, column, rowIndex, columnIndex }) {
selectChange(){ if (columnIndex === 0) {
this.info = ""; const _row = this.flitterData(this.info.list).one[rowIndex];
if(this.value.list&&this.value.list.length>0){ const _col = _row > 0 ? 1 : 0;
this.options = this.value.list; return {
this.value1 = "" rowspan: _row,
}else{ colspan: _col,
this.options = [] };
standard({id:this.value.id}).then(res=>{
this.info = res.data
})
} }
this.value2 = ""; },
this.options2 = [] selectChange(){
}, if(this.value.list&&this.value.list.length>0){
selectChange1(){ this.options1 = this.value.list;
this.info = ""; this.value1 = ""
if(this.value1.list&&this.value1.list.length>0){ }else{
this.options2 = this.value1.list; this.options1 = []
this.value2 = "" standard({id:this.value.id}).then(res=>{
}else{ this.info = res.data
})
}
this.value2 = "";
this.options2 = [] this.options2 = []
standard({id:this.value1.id}).then(res=>{ },
selectChange1(){
this.info = "";
if(this.value1.list&&this.value1.list.length>0){
this.options2 = this.value1.list;
this.value2 = ""
}else{
this.options2 = []
standard({id:this.value1.id}).then(res=>{
this.info = res.data
})
}
},
selectChange2(){
this.info = "";
if(this.value2.list&&this.value2.list.length>0){
this.options3 = this.value2.list;
this.value3 = ""
}else{
this.options3 = []
standard({id:this.value2.id}).then(res=>{
this.info = res.data
})
}
},
selectChange3(){
this.info = "";
standard({id:this.value3.id}).then(res=>{
this.info = res.data this.info = res.data
}) })
} },
}, changeActiveIndex(index){
selectChange2(){ this.info = "";
this.info = ""; this.activeIndex=index;
standard({id:this.value2.id}).then(res=>{ this.value = '';
this.info = res.data this.options1 = [];
}) this.value2 = "";
}, this.options2 = [];
changeActiveIndex(index){ this.value3 = "";
this.info = ""; this.options3 = [];
this.activeIndex=index; this.choose()
this.value = ''; },
this.options = []; }
this.value2 = "";
this.options2 = []
},
}
} }
</script> </script>
...@@ -179,7 +236,6 @@ export default { ...@@ -179,7 +236,6 @@ export default {
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
.apt_stan_content_header{ .apt_stan_content_header{
padding: 16px; padding: 16px;
border-width: 0px 0px 1px 0px; border-width: 0px 0px 1px 0px;
border-style: solid; border-style: solid;
border-color: #EEEEEE; border-color: #EEEEEE;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div class="up_text">点击选择文件或将文件拖拽至此导入企业名录</div> <div class="up_text">点击选择文件或将文件拖拽至此导入企业名录</div>
<div class="up_tip">· 导入的文件内容必须依照下载模板的要求填写);</div> <div class="up_tip">· 导入的文件内容必须依照下载模板的要求填写);</div>
<div class="up_tip">· 上传文件最大为2M,仅支持Excel表格文件(xls,xlsx);</div> <div class="up_tip">· 上传文件最大为2M,仅支持Excel表格文件(xls,xlsx);</div>
<div class="up_tip">· 单次查询企业数量限时免费 5000 家。</div> <div class="up_tip">· 单次查询企业数量限时免费 500 家。</div>
</el-upload> </el-upload>
</div> </div>
<div class="bd"></div> <div class="bd"></div>
......
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :resizable="false" label="承包工程范围" width="415"> <el-table-column :resizable="false" label="承包工程范围" width="315">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.contractScope||"--"}} {{scope.row.contractScope||"--"}}
</template> </template>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
{{scope.row.organ||"--"}} {{scope.row.organ||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :resizable="false" label="经营范围" width="415"> <el-table-column :resizable="false" label="经营范围" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="light" :content="scope.row.businessScope" placement="bottom"> <el-tooltip class="item" effect="light" :content="scope.row.businessScope" placement="bottom">
<span class="line_2"> {{scope.row.businessScope||"--"}}</span> <span class="line_2"> {{scope.row.businessScope||"--"}}</span>
...@@ -602,6 +602,9 @@ export default { ...@@ -602,6 +602,9 @@ export default {
width: 405px; width: 405px;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
.el-input__inner{
width: 405px;
}
} }
.ckquery_list_right { .ckquery_list_right {
width: 670px; width: 670px;
...@@ -783,6 +786,9 @@ export default { ...@@ -783,6 +786,9 @@ export default {
font-weight: 700; font-weight: 700;
color: #232323; color: #232323;
margin-bottom: 12px; margin-bottom: 12px;
&:hover{
color:#0081FF;
}
} }
img{ img{
width: 28px; width: 28px;
...@@ -860,6 +866,9 @@ export default { ...@@ -860,6 +866,9 @@ export default {
font-size: 16px; font-size: 16px;
color: #232323; color: #232323;
margin-bottom: 12px; margin-bottom: 12px;
&:hover{
color:#0081FF;
}
} }
img{ img{
width: 28px; width: 28px;
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span> <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据编号" :fixed="tableColumnFixed" width="120" :resizable="false"> <el-table-column label="单据编号" :fixed="tableColumnFixed" width="150" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.frecordno||"--"}} {{scope.row.frecordno||"--"}}
</template> </template>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</el-table-column> </el-table-column>
<el-table-column label="社会统一信用代码" min-width="150"> <el-table-column label="社会统一信用代码" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.funifiedsocialcreditcode||"--"}} {{scope.row.funifiedsocialcreditcode||"--"}}
</template> </template>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>formdata.pageSize">
<el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span> <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据编号" :fixed="tableColumnFixed" width="120" :resizable="false"> <el-table-column label="单据编号" :fixed="tableColumnFixed" width="150" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.frecordno||"--"}} {{scope.row.frecordno||"--"}}
</template> </template>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</el-table-column> </el-table-column>
<el-table-column label="社会统一信用代码" min-width="150"> <el-table-column label="社会统一信用代码" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.funifiedsocialcreditcode||"--"}} {{scope.row.funifiedsocialcreditcode||"--"}}
</template> </template>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>formdata.pageSize">
<el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
......
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>formdata.pageSize">
<el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
...@@ -426,7 +426,7 @@ ...@@ -426,7 +426,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>formdata.pageSize">
<el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>pageSize">
<el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
......
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>pageSize">
<el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
......
...@@ -94,11 +94,6 @@ ...@@ -94,11 +94,6 @@
<span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span> <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="二级市场编码" :fixed="tableColumnFixed" width="120" :resizable="false">
<template slot-scope="scope">
{{scope.row.secondaryCode||"--"}}
</template>
</el-table-column>
<el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false"> <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
</el-table-column> </el-table-column>
...@@ -125,7 +120,11 @@ ...@@ -125,7 +120,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="二级市场编码" width="120" :resizable="false">
<template slot-scope="scope">
{{scope.row.secondaryCode||"--"}}
</template>
</el-table-column>
<el-table-column label="推荐单位" min-width="280"> <el-table-column label="推荐单位" min-width="280">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.recommendOrg||"--"}} {{scope.row.recommendOrg||"--"}}
...@@ -148,7 +147,7 @@ ...@@ -148,7 +147,7 @@
</el-table-column> </el-table-column>
<el-table-column label="专业类别" min-width="85" :resizable="false"> <el-table-column label="专业类别" min-width="85" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" v-if="scope.row.groupSpecialty.length>35"> <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
<div slot="content">{{scope.row.groupSpecialty}}</div> <div slot="content">{{scope.row.groupSpecialty}}</div>
<span class="ellipsis"> <span class="ellipsis">
{{scope.row.groupSpecialty||"--"}} {{scope.row.groupSpecialty||"--"}}
...@@ -176,7 +175,7 @@ ...@@ -176,7 +175,7 @@
</el-table-column> </el-table-column>
<el-table-column label="施工承包范围" min-width="120" :resizable="false"> <el-table-column label="施工承包范围" min-width="120" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top-start" v-if="scope.row.constructJobScope.length>35"> <el-tooltip placement="top-start" v-if="scope.row.constructJobScope&&scope.row.constructJobScope.length>35">
<div slot="content">{{scope.row.constructJobScope}}</div> <div slot="content">{{scope.row.constructJobScope}}</div>
<div class="ellipsis"> <div class="ellipsis">
<span>{{scope.row.constructJobScope||"--"}}</span> <span>{{scope.row.constructJobScope||"--"}}</span>
...@@ -241,7 +240,7 @@ ...@@ -241,7 +240,7 @@
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>formdata.pageSize">
<el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
......
...@@ -99,11 +99,6 @@ ...@@ -99,11 +99,6 @@
<span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span> <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="二级市场编码" :fixed="tableColumnFixed" width="120" :resizable="false">
<template slot-scope="scope">
{{scope.row.secondaryCode||"--"}}
</template>
</el-table-column>
<el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false"> <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
</el-table-column> </el-table-column>
...@@ -130,7 +125,11 @@ ...@@ -130,7 +125,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="二级市场编码" width="120" :resizable="false">
<template slot-scope="scope">
{{scope.row.secondaryCode||"--"}}
</template>
</el-table-column>
<el-table-column label="营业执照号码" min-width="180"> <el-table-column label="营业执照号码" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.unifySocialCode||"--"}} {{scope.row.unifySocialCode||"--"}}
...@@ -260,7 +259,7 @@ ...@@ -260,7 +259,7 @@
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>formdata.pageSize">
<el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row
:header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass" :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
ref="theOwnerListTable"> ref="theOwnerListTable" :row-key="'customerKey'">
<el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false"> <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
</el-table-column> </el-table-column>
<el-table-column label="专业类别" min-width="520" :resizable="false"> <el-table-column label="专业类别" min-width="520" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" v-if="scope.row.groupSpecialty.length>35"> <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
<div slot="content">{{scope.row.groupSpecialty}}</div> <div slot="content">{{scope.row.groupSpecialty}}</div>
<span class="ellipsis"> <span class="ellipsis">
{{scope.row.groupSpecialty||"--"}} {{scope.row.groupSpecialty||"--"}}
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
{{scope.row.laborCaptainPhone||"--"}} {{scope.row.laborCaptainPhone||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="队长身份证" min-width="120" :resizable="false"> <el-table-column label="队长身份证" min-width="180" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.laborCaptainIdcard||"--"}} {{scope.row.laborCaptainIdcard||"--"}}
</template> </template>
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
</el-table-column> </el-table-column>
<el-table-column label="施工承包范围" min-width="520" :resizable="false"> <el-table-column label="施工承包范围" min-width="520" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top-start" v-if="scope.row.constructJobScope.length>35"> <el-tooltip placement="top-start" v-if="scope.row.constructJobScope&&scope.row.constructJobScope.length>35">
<div slot="content">{{scope.row.constructJobScope}}</div> <div slot="content">{{scope.row.constructJobScope}}</div>
<div class="ellipsis"> <div class="ellipsis">
<span>{{scope.row.constructJobScope||"--"}}</span> <span>{{scope.row.constructJobScope||"--"}}</span>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>formdata.pageSize">
<el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
......
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
</el-table-column> </el-table-column>
<el-table-column label="专业类别" min-width="85" :resizable="false"> <el-table-column label="专业类别" min-width="85" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" v-if="scope.row.groupSpecialty.length>35"> <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
<div slot="content">{{scope.row.groupSpecialty}}</div> <div slot="content">{{scope.row.groupSpecialty}}</div>
<span class="ellipsis"> <span class="ellipsis">
{{scope.row.groupSpecialty||"--"}} {{scope.row.groupSpecialty||"--"}}
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
</el-table-column> </el-table-column>
<el-table-column label="施工承包范围" min-width="120" :resizable="false"> <el-table-column label="施工承包范围" min-width="120" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top-start" v-if="scope.row.constructJobScope.length>35"> <el-tooltip placement="top-start" v-if="scope.row.constructJobScope&&scope.row.constructJobScope.length>35">
<div slot="content">{{scope.row.constructJobScope}}</div> <div slot="content">{{scope.row.constructJobScope}}</div>
<div class="ellipsis"> <div class="ellipsis">
<span>{{scope.row.constructJobScope||"--"}}</span> <span>{{scope.row.constructJobScope||"--"}}</span>
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>formdata.pageSize">
<el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
......
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
</el-table-column> </el-table-column>
<el-table-column label="专业类别" min-width="85" :resizable="false"> <el-table-column label="专业类别" min-width="85" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" v-if="scope.row.groupSpecialty.length>35"> <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
<div slot="content">{{scope.row.groupSpecialty}}</div> <div slot="content">{{scope.row.groupSpecialty}}</div>
<span class="ellipsis"> <span class="ellipsis">
{{scope.row.groupSpecialty||"--"}} {{scope.row.groupSpecialty||"--"}}
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>formdata.pageSize">
<el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
......
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
</el-table> </el-table>
</div> </div>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>formdata.pageSize">
<el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next" <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment