@@ -76,7 +76,7 @@
操作 |
改名
- 编辑
+ 编辑
查看
下载
删除
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
index c445c06..97c5a06 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
@@ -202,26 +202,26 @@ export class EntryPlanLookComponent implements OnInit {
window.open(`/keyUnit/editunitinfo?id=${companyId}&orName=${this.route.snapshot.queryParams.orName}&orId=${this.route.snapshot.queryParams.orId}`);
}
else if (e.planType == 16) {
-
- // let body={
- // // id:e.planId,
- // // resetAudit:true
- // ""
- // }
- let body = JSON.stringify("");
- let resetAudit = true
- let headers = new HttpHeaders({
- 'Content-Type': 'text/json'
- });
- let options = {
- headers
- };
+ if(e.attachmentUrls==null){
+ window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}`)
+ }
+ else{
+ let body = JSON.stringify("");
+ let resetAudit = true
+ let headers = new HttpHeaders({
+ 'Content-Type': 'text/json'
+ });
+ let options = {
+ headers
+ };
this.http.put(`/api/PlanComponents/${e.id}?resetAudit=${resetAudit}`, body, options).subscribe(data => {
this.getAllPlanComponents()
this.lookPlan(e)
}/* ,err => {
this.snackBar.open(err,'确定',config);
} */)
+ }
+
}
else {
@@ -491,7 +491,7 @@ export class EntryPlanLookComponent implements OnInit {
const dialogRef = this.dialog.open(AddPlanone, {
width:"585px",
height:"430px",
- data: {companyId:this.companyId,unitType:this.unitdata.unittype},
+ data: {companyId:this.companyId,unitType:this.unitdata.unittype,unitName:this.unitdata.unitname},
disableClose:true
});
dialogRef.afterClosed().subscribe(
@@ -910,7 +910,7 @@ export class AddPlanone {
this.planData=plandata
this.dialogRef.close(plandata);
//console.log(plandata)
- window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.data.companyId}&planName=${this.planData.name}`)
+ window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.data.companyId}&planName=${this.planData.name}&unitName=${this.data.unitName}`)
})
}else{
this.snackBar.open('请先创建模板!','确定',config);
@@ -971,6 +971,7 @@ export class AddPlanone {
config.verticalPosition = 'top';
config.duration = 3000
//this.snackBar.open('暂不支持导入','确定',config);
+ this.createWord()
}
if (this.defaultisshow == '3' && (this.webaddress == "" || this.webaddress == null)) { //如果是填写网址
const config = new MatSnackBarConfig();
diff --git a/src/app/ui/plan-template/plan-template.component.html b/src/app/ui/plan-template/plan-template.component.html
index fcf8d08..4c8e53d 100644
--- a/src/app/ui/plan-template/plan-template.component.html
+++ b/src/app/ui/plan-template/plan-template.component.html
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-05-19 15:50:20
* @LastEditors: sueRimn
- * @LastEditTime: 2021-06-15 10:20:06
+ * @LastEditTime: 2021-06-16 10:10:05
-->
-
-
- {{item.unitname}}
-
-
-
-
- {{item.unitname}}
-
-
- ![]()
- ![]()
- 复制
- {{item.planCategory==3?'Ⅲ级':item.planCategory==4?'Ⅳ级':'Ⅴ级'}}
-
+
+
+
+ {{item.unitname}}
+
+
+ ![]()
+ ![]()
+ 复制
+ {{item.planCategory==3?'Ⅲ级':item.planCategory==4?'Ⅳ级':'Ⅴ级'}}
-
-
-
-
- {{unitName}}
-
-
+
+
+
+
+
+
+ {{unitName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.groupName}}
+
+
+
+ 
+ 编辑
+
+
+ 
+ 删除
+
+
+
+
-
-
-
-
-
-
-
-
-
- {{item.groupName}}
+
+
+
+
+
+
+
+
+
+
+
+ {{element.surveyName}}
-
-
-
- 编辑
-
-
-
- 删除
-
+
+
+
-
-
-
-
-
-
-
-
-
-
- {{element.surveyName}}
-
-
-
-
-
-
-
+
+
+
+
+
+ | 名称 |
+ 类型 |
+ 操作 |
+
+
+
+ | {{attinf.propertyName}} |
+
+ {{attinf.propertyType==0?'单行文本':attinf.propertyType==1?'多行文本':'数值'}} |
+ 删除 |
+
+
+
+
+
+
+
+
+
+
+
+
+ {{attinf.name}}
+
+
+
+
+
+
| 名称 |
@@ -136,144 +174,101 @@
操作 |
-
- | {{attinf.propertyName}} |
-
- {{attinf.propertyType==0?'单行文本':attinf.propertyType==1?'多行文本':'数值'}} |
- 删除 |
+
+ |
+ {{facilityItems.name}} |
+
+ 文本类型 |
+
+
+ 删除 |
-
-
-
-
-
-
-
-
- {{attinf.name}}
-
-
-
-
-
-
-
-
- | 名称 |
- 类型 |
- 操作 |
-
-
-
- |
- {{facilityItems.name}} |
-
- 文本类型 |
-
-
- 删除 |
-
-
-
-
-
-
- |