From c5bdcd5fa7e6548cc0ecf7f2b82381f5fada51de Mon Sep 17 00:00:00 2001 From: Sjh <55341701@qq.com> Date: Thu, 11 Jan 2024 08:47:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E7=BC=96=E5=88=B6=E9=A2=84=E6=A1=88=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=80=BC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.json | 2 +- .../create-plan-online-five.component.html | 7 ++- .../create-plan-online-five.component.ts | 60 +++++++++++++------ 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/proxy.config.json b/proxy.config.json index 8129e12..e61e510 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://121.36.37.70:8201/", + "target": "http://10.81.73.39:8000/", "生产": "http://10.81.73.39:8000/", "测试": "http://121.36.37.70:8201/", "生产2": "http://183.194.244.232:8088/", diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index 9374b46..6e29e17 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -758,7 +758,7 @@ [readonly]='info.zdy==undefined'> + [(ngModel)]="info.value" *ngIf="pattern == 'edit'"> - {{info.propertyValue}} + {{info.value}} @@ -1054,7 +1054,8 @@ line-height: 40px; color: #b99a00;">{{element.headName}} + *ngIf="pattern == 'edit'" + (click)='delTd2(key,i,uniti,elei)'> diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index ab65c39..c3d7666 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts @@ -94,7 +94,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { planMode; //预案类型 xiazai; //是否点击下载按钮进来的 //index - orName + orName; async ngOnInit() { //this.index = this.getArrayIndex(this.planTemplateData,'单位概况') this.xiazai = this.route.snapshot.queryParams.xiazai; @@ -412,26 +412,33 @@ export class CreatePlanOnlineFiveComponent implements OnInit { if (element.body[0].completed) { element.body[0].attinf.forEach((arrval, atti, attarr) => { if (arrval.propertyName == "统一社会信用代码") { - arrval.value = arrval.olddata = this.unitData.usci; + arrval.value + ? null + : (arrval.value = arrval.olddata = this.unitData.usci); } else if (arrval.propertyName == "单位类型") { - arrval.value = arrval.olddata = - this.unitData.buildingTypes[0].name; + arrval.value + ? null + : (arrval.value = arrval.olddata = + this.unitData.buildingTypes[0].name); } else if (arrval.propertyName == "联系人") { - arrval.value = arrval.olddata = this.unitData.contacts; + arrval.value + ? null + : (arrval.value = arrval.olddata = this.unitData.contacts); } else if (arrval.propertyName == "联系电话") { - arrval.value = arrval.olddata = this.unitData.phone; + arrval.value + ? null + : (arrval.value = arrval.olddata = this.unitData.phone); } else if (arrval.propertyName == "辖区中队") { - arrval.value = arrval.olddata = this.unitData.organizationName; + arrval.value + ? null + : (arrval.value = arrval.olddata = + this.unitData.organizationName); } else if (arrval.propertyName == "单位地址") { - arrval.value = arrval.olddata = this.unitData.address; + arrval.value + ? null + : (arrval.value = arrval.olddata = this.unitData.address); } }); - /* element.body[0].attinf[0].value = element.body[0].attinf[0].olddata = this.unitData.usci - element.body[0].attinf[1].value = element.body[0].attinf[1].olddata = this.unitData.buildingTypes[0].name - element.body[0].attinf[2].value = element.body[0].attinf[2].olddata = this.unitData.contacts - element.body[0].attinf[3].value = element.body[0].attinf[3].olddata = this.unitData.phone - element.body[0].attinf[4].value = element.body[0].attinf[4].olddata = this.unitData.organizationName - element.body[0].attinf[5].value = element.body[0].attinf[5].olddata = this.unitData.address */ if (element.body.length > 1 && element.body[1].attinf != undefined) { element.body[1].attinf.forEach((eBuild) => { @@ -737,9 +744,9 @@ export class CreatePlanOnlineFiveComponent implements OnInit { this.planTemplateData = JSON.parse(data.webTextData).filter( (item) => item.completed == true ); - //this.planTemplateData=JSON.parse(data.webTextData) - console.log(888, this.route.snapshot.queryParams.planName); - console.log(999, this.planTemplateData); + + console.log(7891, this.planTemplateData); + // return if (this.planTemplateData[0].groupName != "封面") { let obj = { completed: true, @@ -798,6 +805,25 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } } if (element.groupName == "单位概况") { + element.building.forEach((item) => { + item.body.forEach((i) => { + if (i.surveyName === "单位基本信息") { + i.attinf.forEach((v) => { + if (v.completed) { + !v.value ? (v.value = v.propertyValue) : null; + } + }); + } + if (i.surveyName === "建筑信息") { + i.attinf.forEach((v) => { + if (v.completed) { + v.propertyValue ? (v.value = v.propertyValue) : null; + } + }); + } + }); + }); + this.clickTitleItem(this.planTemplateData[1]); } });