Skip to content

D
dsk-operate-sys-cscec
Commit 7b5d3a5f authored by tianhongyang's avatar tianhongyang
Browse files
Options

fix bug

parent 6e52e49b
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 75 deletions
dsk-operate-ui/src/components/DskAmountRange/index.vue
View file @ 7b5d3a5f
......@@ -82,7 +82,7 @@ export default {
line-height: 1;
height: 100%;
width: 100%;
padding: 0px 12px;
padding: 0px 7px;
border: none;
}
}
......
dsk-operate-ui/src/utils/index.js
View file @ 7b5d3a5f
......@@ -1011,3 +1011,12 @@ export function groupArray(arr, max = 100, target = "") {
return result;
}
/**
* 去掉dom元素两边的标签
* @param {string} str
*/
export function replaceDomTags(str) {
const reg = /<[^>]*>/gmi;
return str.replace(reg, "");
}
dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/components/CustomFormDesign.vue
View file @ 7b5d3a5f
......@@ -69,7 +69,7 @@
:custom-class="'subfield-module-dialog-inner'" @close="removeDialogClose">
<div class="subfield-module-dialog-content">
<img src="@/assets/images/consultingAgencyManagement/customForm/icon_tips@2x.png" alt="">
<span>{{`确认删除“${removeSubfieldModule.subfieldModuleName ? removeSubfieldModule.subfieldModuleName : removeSubfieldModule.defaultSubfieldModuleName}”吗？`}}</span>
<span>{{`确认删除“${removeSubfieldModule.subfieldModuleName ? removeSubfieldModule.subfieldModuleName : removeSubfieldModule.defaultSubfieldModuleName ? removeSubfieldModule.defaultSubfieldModuleName : ""}”吗？`}}</span>
</div>
<div class="subfield-module-dialog-footer">
<el-button size="default" @click="removeSubFiledModuleDialog = false">取消</el-button>
......@@ -179,7 +179,8 @@ export default {
formAttribute: {
type: "object",
fields: {
fieldName: { type: "string", required: true, message: "字段名称不能为空" }
fieldName: { type: "string", required: true, message: "字段名称不能为空" },
label: { type: "string", required: true, message: "字段label不能为空" },
}
}
}
......
dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/components/SetFieldOption.vue
View file @ 7b5d3a5f
......@@ -23,7 +23,8 @@
</template>
<!-- label展示名称 -->
<el-form-item label="字段label" class="set-field-option-item" prop="formAttribute.label" v-if="comActiveFieldData.formAttribute">
<el-form-item label="字段label" class="set-field-option-item" prop="formAttribute.label" :rules="setFieldOptionRules.labelName"
v-if="comActiveFieldData.formAttribute">
<el-input v-model="comActiveFieldData.formAttribute.label" placeholder="请输入字段label" clearable></el-input>
</el-form-item>
......@@ -186,6 +187,7 @@ export default {
message: "请输入选项值",
trigger: ["change", "blur"]
},
labelName: [{ required: true, trigger: ["change", "blur"], message: "字段label不能为空" }]
},
placeholderContain: ["text", "textarea", "select", "date", "phone", "email"],
limitContain: ["photo", "file"]
......
dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/components/SubfieldItem.vue
View file @ 7b5d3a5f
......@@ -206,6 +206,9 @@ export default {
::v-deep .subfield-module-form-item {
display: flex;
max-width: calc(100% - 14px - 16px - 12px - 12px);
margin-bottom: 0px;
margin-left: 12px;
.el-form-item__label {
line-height: 32px;
......@@ -213,9 +216,43 @@ export default {
font-weight: 400;
color: rgba(35, 35, 35, 0.8);
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
max-width: 55%;
}
.el-form-item__content {
flex: 1;
line-height: 32px;
height: 32px;
.el-input {
line-height: 32px;
height: 32px;
.el-input__suffix {
display: flex;
align-items: center;
}
}
}
.el-input {
width: 100%;
.el-input__inner {
width: 100%;
height: 32px;
line-height: 32px;
padding-left: 12px;
&::placeholder {
color: #c0c4cc !important;
font-size: 14px !important;
}
}
.el-input__suffix {
.el-input__icon {
line-height: 32px;
}
}
}
}
......
dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/components/SubfieldModule.vue
View file @ 7b5d3a5f
......@@ -143,43 +143,5 @@ export default {
}
}
}
::v-deep .subfield-module-form-item {
margin-bottom: 0px;
margin-left: 12px;
flex: 1;
.el-form-item__content {
line-height: 32px;
height: 32px;
.el-input {
line-height: 32px;
height: 32px;
.el-input__suffix {
display: flex;
align-items: center;
}
}
}
.el-input {
width: 100%;
.el-input__inner {
width: 100%;
height: 32px;
line-height: 32px;
padding-left: 12px;
&::placeholder {
color: #c0c4cc !important;
font-size: 14px !important;
}
}
.el-input__suffix {
.el-input__icon {
line-height: 32px;
}
}
}
}
}
</style>
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/basicEngineeringInformation.vue
View file @ 7b5d3a5f
......@@ -19,9 +19,9 @@
</tr>
<tr>
<td class="table-key">履约责任单位</td>
<td>{{comProjectDetailInfo.ownerName ? comProjectDetailInfo.ownerName : "-"}}</td>
<td>{{"-"}}</td>
<td class="table-key">咨询单位</td>
<td>{{comProjectDetailInfo.advisoryBodyName ? comProjectDetailInfo.advisoryBodyName : "-"}}</td>
<td>{{comProjectDetailInfo.advisoryBody && comProjectDetailInfo.advisoryBody.advisoryBodyName ? comProjectDetailInfo.advisoryBody.advisoryBodyName : "-"}}</td>
</tr>
</table>
</div>
......@@ -39,17 +39,17 @@
<td class="table-key">国内外</td>
<td>{{"-"}}</td>
<td class="table-key">省市</td>
<td>{{"-"}}</td>
<td>{{comProjectDetailInfo.provinceName ? comProjectDetailInfo.provinceName : "-"}}</td>
</tr>
<tr>
<td class="table-key">投资来源</td>
<td>{{"-"}}</td>
<td>{{comProjectDetailInfo.ownerNature ? comProjectDetailInfo.ownerNature : "-"}}</td>
<td class="table-key">项目承接类型</td>
<td>{{"-"}}</td>
<td>{{comProjectDetailInfo.isinvestproject ? comProjectDetailInfo.isinvestproject : "-"}}</td>
</tr>
<tr>
<td class="table-key">合同签订日期</td>
<td>{{"-"}}</td>
<td>{{comProjectDetailInfo.contractSignDate ? comProjectDetailInfo.contractSignDate : "-"}}</td>
<td class="table-key">合同总工期</td>
<td>{{comProjectDetailInfo.contractWorkDays ? `${comProjectDetailInfo.contractWorkDays}天` : "-"}}</td>
</tr>
......@@ -57,19 +57,19 @@
<td class="table-key">开工日期方式</td>
<td>{{"-"}}</td>
<td class="table-key">开工具体时间</td>
<td>{{comProjectDetailInfo.actualStartDate ? comProjectDetailInfo.actualStartDate : "-"}}</td>
<td>{{comProjectDetailInfo.planStartDate ? comProjectDetailInfo.planStartDate : "-"}}</td>
</tr>
<tr>
<td class="table-key">竣工具体方式</td>
<td>{{"-"}}</td>
<td class="table-key">竣工具体时间</td>
<td>{{"-"}}</td>
<td>{{comProjectDetailInfo.actualEndDate ? comProjectDetailInfo.actualEndDate : "-"}}</td>
</tr>
<tr>
<td class="table-key">工程类型大类</td>
<td>{{"-"}}</td>
<td>{{comProjectDetailInfo.projectType1 ? comProjectDetailInfo.projectType1 : "-"}}</td>
<td class="table-key">工程类型明细</td>
<td>{{"-"}}</td>
<td>{{comProjectDetailInfo.projectType2 ? comProjectDetailInfo.projectType2 : "-"}}</td>
</tr>
<tr>
<td class="table-key">建筑高度</td>
......@@ -99,7 +99,7 @@
<td class="table-key">预收益率</td>
<td>{{comProjectDetailInfo.estiProfitRate ? `${comProjectDetailInfo.estiProfitRate}%` : "-"}}</td>
<td class="table-key">预收益额</td>
<td>{{comProjectDetailInfo.estiTtlProfit ? `${comProjectDetailInfo.estiTtlProfit}元` : "-"}}</td>
<td>{{comProjectDetailInfo.estimatedEarning ? `${comProjectDetailInfo.estimatedEarning}元` : "-"}}</td>
</tr>
</table>
</div>
......@@ -115,9 +115,9 @@
</colgroup>
<tr>
<td class="table-key">合同金额</td>
<td>{{"-"}}</td>
<td>{{comProjectDetailInfo.contractOrigValue ? `${comProjectDetailInfo.contractOrigValue}元` : "-"}}</td>
<td class="table-key">自施部分</td>
<td>{{"-"}}</td>
<td>{{comProjectDetailInfo.contractOrigSelfvalue ? `${comProjectDetailInfo.contractOrigSelfvalue}元` : "-"}}</td>
</tr>
<tr>
<td class="table-key">计价依据</td>
......@@ -149,9 +149,9 @@
</colgroup>
<tr>
<td class="table-key">工程预付款</td>
<td>{{"-"}}</td>
<td>{{comProjectDetailInfo.steppayType ? comProjectDetailInfo.steppayType : "-"}}</td>
<td class="table-key">支付比例</td>
<td>{{"-"}}</td>
<td>{{comProjectDetailInfo.steppayScale ? `${comProjectDetailInfo.steppayScale}%` : "-"}}</td>
</tr>
</table>
</div>
......
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency.vue
View file @ 7b5d3a5f
......@@ -275,8 +275,8 @@ export default {
this.$emit("searchLoadingChange", this.loading);
const _formTemplate = await this.getCustomFormDetail();
this.formTemplate = cloneDeep(_formTemplate);
const _formTemplateData = await this.getCustomFormDataByProjectKey(this.projectKey);
this.formTemplateData = cloneDeep(_formTemplateData);
let _formTemplateData = await this.getCustomFormDataByProjectKey(this.projectKey);
_formTemplateData ? this.formTemplateData = cloneDeep(_formTemplateData) : null;
await this.customFormRender(_formTemplate, _formTemplateData);
} catch (error) {
......@@ -290,7 +290,7 @@ export default {
// 缺失模板不渲染
if (!formTemplate || !formTemplate.jsonData) return;
const template = jsonStrToObject(formTemplate.jsonData);
const templateFormData = JSON.parse(formData.jsonData);
const templateFormData = formData && formData.jsonData ? JSON.parse(formData.jsonData) : null;
if (template) {
// 模板
let subfieldModuleListTemplate = template.subfieldModuleList;
......
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/projectDetail.vue
View file @ 7b5d3a5f
......@@ -5,7 +5,7 @@
<!-- 项目名称 logo -->
<div class="prject-icon-and-title">
<img src="@/assets/images/financing/head_icon.png" alt="">
<div class="prject-title">{{projectDetailInfo.finProjectName ? projectDetailInfo.finProjectName : "-"}}</div>
<div class="prject-title">{{projectDetailInfo.projectName ? projectDetailInfo.projectName : "-"}}</div>
</div>
<!-- 项目承接单位 -->
<div class="project-undertaking-unit-container">
......
dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue
View file @ 7b5d3a5f
......@@ -42,8 +42,8 @@
</el-select>
</el-form-item>
<el-form-item label="合同金额">
<dsk-amount-range v-model="form.contractAmount" :range-text="'至'" :start-placeholder="'最小金额(万元)'"
:end-placeholder="'最大金额(万元)'"></dsk-amount-range>
<dsk-amount-range v-model="form.contractAmount" :range-text="'至'" :start-placeholder="'最小金额（万元）'"
:end-placeholder="'最大金额（万元）'"></dsk-amount-range>
</el-form-item>
</div>
</el-form>
......@@ -78,10 +78,13 @@
<span v-else>-</span>
</template>
<!-- 业主单位 -->
<!-- <template slot="ownerName" slot-scope="{data,row}">
<div v-if="row.ownerName" class="no-line-feed">{{row.ownerName}}</div>
<template slot="ownerName" slot-scope="{data,row}">
<div v-if="row.ownerName">
<span v-if="row.ownerUnitCid" class="no-line-feed" @click="viewOwnerUnit(row)">{{row.ownerName}}</span>
<span v-else>{{row.ownerName}}</span>
</div>
<span v-else>-</span>
</template> -->
</template>
<!-- 项目承接单位 -->
<!-- <template slot="contractOrgName" slot-scope="{data,row}">
<div v-if="row.contractOrgName" class="no-line-feed">{{row.contractOrgName}}</div>
......@@ -89,8 +92,11 @@
</template> -->
<!-- 咨询机构名称 -->
<template slot="advisoryBodyName" slot-scope="{data,row}">
<div v-if="row.advisoryBody && row.advisoryBody.advisoryBodyName" class="no-line-feed" @click="viewEnterprise(row)">
{{row.advisoryBody.advisoryBodyName}}</div>
<div v-if="row.advisoryBody && row.advisoryBody.advisoryBodyName">
<span v-if="row.advisoryBody.advisoryBodyCid" class="no-line-feed"
@click="viewEnterprise(row)">{{row.advisoryBody.advisoryBodyName}}</span>
<span v-else>{{row.advisoryBody.advisoryBodyName}}</span>
</div>
<span v-else>-</span>
</template>
<!-- 项目负责人姓名 -->
......@@ -169,6 +175,7 @@ export default {
{ label: '序号', prop: "staticSerialNumber", type: "index", lock: true, fixed: false, uid: v4() },
{ label: '项目列表', prop: 'projectName', width: "220px", lock: true, fixed: false, slot: true, uid: v4(), showOverflowTooltip: true },
{ label: '项目编码', prop: 'projectCode', width: "121px", uid: v4() },
{ label: '业主单位', prop: 'ownerName', slot: true, uid: v4(), width: "185px", showOverflowTooltip: true },
{ label: '省市', prop: 'provinceName', width: "100px", uid: v4() },
{ label: '项目承接类型', prop: 'isinvestproject', width: "100px", uid: v4() },
{ label: '工程基础大类', prop: 'projectType1', minWidth: "100px", uid: v4() },
......@@ -179,7 +186,7 @@ export default {
{ label: '合同金额（元）', prop: 'contractOrigValue', width: "110px", align: "right", uid: v4() },
// { label: '业主单位', prop: 'ownerName', slot: true, uid: v4(), width: "185px", showOverflowTooltip: true },
// { label: '项目承接单位', prop: 'contractOrgName', width: "196px", slot: true, uid: v4() },
{ label: '咨询机构名称', prop: 'advisoryBodyName', width: "172px", slot: true, uid: v4() },
{ label: '咨询机构名称', prop: 'advisoryBodyName', width: "172px", slot: true, uid: v4(), showOverflowTooltip: true },
{ label: '创建时间', prop: 'contractSignDate', width: "172px", uid: v4() },
],
fixedPropsKey: ["staticSerialNumber", "projectName"],
......@@ -344,6 +351,10 @@ export default {
viewEnterprise(row) {
if (!row?.advisoryBody?.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
this.$tab.openPage(row.advisoryBody.advisoryBodyName ? row.advisoryBody.advisoryBodyName : "咨询机构详情", `/enterprise/${encodeStr(row.advisoryBody.advisoryBodyCid)}?companyName=${row.advisoryBody.advisoryBodyName}`);
},
// 业主单位跳转企业详情
viewOwnerUnit(row) {
}
},
}
......
dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeConstructionUnit.vue
View file @ 7b5d3a5f
......@@ -220,6 +220,12 @@ export default {
const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.queryParams }));
this.handleQuery(searchParams);
},
handleCurrentChange(page) {
this.queryParams.pageNum = page;
const params = this.createQueryCondition(this.formData);
const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.queryParams }));
this.handleQuery(searchParams);
},
async handleQuery(params) {
try {
let data = params ? params : this.queryParams;
......
dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeGroup.vue
View file @ 7b5d3a5f
......@@ -285,6 +285,12 @@ export default {
const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.queryParams }));
this.handleQuery(searchParams);
},
handleCurrentChange(page) {
this.queryParams.pageNum = page;
const params = this.createQueryCondition(this.formData);
const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.queryParams }));
this.handleQuery(searchParams);
},
async handleQuery(params) {
try {
let data = params ? params : this.queryParams;
......
dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeOwnerUnits.vue
View file @ 7b5d3a5f
......@@ -213,6 +213,12 @@ export default {
});
return params;
},
handleCurrentChange(page) {
this.queryParams.pageNum = page;
const params = this.createQueryCondition(this.formData);
const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.queryParams }));
this.handleQuery(searchParams);
},
// 查询
async handleSearch() {
const params = this.createQueryCondition(this.formData);
......
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @ 7b5d3a5f
......@@ -298,6 +298,7 @@ export default {
await this.getStatistic(this.companyName);
await this.handleQuery();
await this.association(this.$route.query.customerId);
console.log(this.$refs.sidebar,"sidebar");
this.$refs.sidebar.getFinancial(data);
}
},
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue
View file @ 7b5d3a5f
......@@ -43,9 +43,9 @@ export default {
{ label: '处罚原因', prop: 'punishReason', slot: true, fixed: true, width: '508' },
{ label: '决定日期', prop: 'punishBegin', width: '105' },
{ label: '处罚结果', prop: 'punishResult', width: '264' },
{ label: '处罚文书号', prop: 'fileNum', width: '240' },
{ label: '处罚机关', prop: 'office', width: '264' },
{ label: '处罚结束日期', prop: 'punishEnd', width: '110' },
{ label: '处罚文书号', prop: 'fileNum', minWidth: '240' },
{ label: '处罚机关', prop: 'office', minWidth: '264' },
{ label: '处罚结束日期', prop: 'punishEnd', minWidth: '110' },
],
formData: [
{ type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '处罚类别', options: [] },
......@@ -130,17 +130,18 @@ export default {
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
-webkit-line-clamp: 5;
cursor: pointer;
> span {
display: inline-block;
display: flex;
width: 37px;
position: absolute;
right: 0;
right: 11px;
bottom: 0;
background-color: #fff;
z-index: 1;
white-space: nowrap
}
}
}
......
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