- 🠊
+
arrow forward
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.scss b/src/app/key-unit/key-unit-management/key-unit-management.component.scss
index ef26154..adf9eda 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.scss
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.scss
@@ -1,4 +1,10 @@
-
+@media screen and (min-device-width:1280px){
+
+}
+//margin: 3px 40px;
+@media screen and (max-device-width:1290px){
+
+}
.header {
@@ -16,7 +22,14 @@
align-items:center;
// justify-content:center;
.queryField {
- margin: 3px 40px;
+ @media screen and (min-device-width:1280px){
+ margin: 3px 40px;
+ }
+ //margin: 3px 40px;
+ @media screen and (max-device-width:1280px){
+ margin-left: 20px;
+ }
+
input {
width: 180px;
height: 22px;
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
index 5009c92..3ca590a 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
@@ -21,6 +21,16 @@ export class KeyUnitManagementComponent implements OnInit {
constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
+ padMore=true//pad收缩控制
+ padput=false//pad收起按钮
+ open="更多筛选条件"
+ down="收起"
+ imgsrcopen="../../../assets/images/routdown2.png"
+ imgsrcdown="../../../assets/images/routup2.png"
+ padInfo(){
+ this.padMore=!this.padMore
+ this.padput=!this.padput
+ }
private _transformer = (node, level: number) => { //初始化tree
return {
expandable: !!node.children && node.children.length > 0,
@@ -59,7 +69,7 @@ export class KeyUnitManagementComponent implements OnInit {
//表头排序
sortData (e) {
let data = this.tabledataSource.filteredData;
- console.log(data.filteredData)
+ //console.log(data.filteredData)
// data.filteredData.forEach(element => {
// if(element.key.indexOf(".") != -1){
// let typeArr = element.key.split('.')
@@ -208,6 +218,11 @@ export class KeyUnitManagementComponent implements OnInit {
this.getOrganizations();
this.getUnittype();
this.getAllKeyUnit();
+ if(window.matchMedia("(max-width: 1290px)").matches){
+ this.padMore=true
+ }else{
+ this.padMore=false
+ }
}
//获得所有重点单位
@@ -431,8 +446,6 @@ export class KeyUnitManagementComponent implements OnInit {
//勾选框事件
verifyState //判断是否可以修改
checkChange(e,element){
- console.log(e)
- console.log(element)
if(element.contentVerify!=null){
this.verifyState=element.contentVerify.verifyState
@@ -534,7 +547,7 @@ export class KeyUnitManagementComponent implements OnInit {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
- console.log(this.deleteAll)
+ //console.log(this.deleteAll)
if(this.verifyState==0||this.verifyState==3){
this.snackBar.open('审核中，不能删除','确定',config);
}else{
@@ -574,7 +587,7 @@ export class KeyUnitManagementComponent implements OnInit {
}
}else if(this.deleteAll.length > 1){
- let isTrue = confirm('您确定要提交删除审核吗')
+ let isTrue = confirm('重点单位删除需审核员审核，审核通过方可删除')
if(isTrue){
for(var i=0;i
{
this.snackBar.open('操作成功','确定',config);
this.getAllKeyUnit()
@@ -748,7 +761,6 @@ export class KeyUnitManagementComponent implements OnInit {
}
//审核结果
auditResult(element){
- // console.log(element)
const dialogRef = this.dialog.open(companyAuditResult, {
width:"400px",
//height:"300px",
@@ -866,7 +878,6 @@ export class upname{
id:this.oldid,
name: this.unitname
}
- console.log(paramsdata)
this.http.put(`/api/Companies/${this.oldid}/UpdateName`,paramsdata).subscribe((data:any)=>{
this.snackBar.open("修改名字成功",'确定',config);
},err => {
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
index 39c1835..788e2d9 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
@@ -4,100 +4,101 @@
* @Author: sueRimn
* @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn
- * @LastEditTime: 2021-03-20 16:29:51
+ * @LastEditTime: 2021-03-23 15:09:09
-->
-
-
-
-
-
-
-
-
-
-
{{downloadFileName}}
-
下载中...
-
+
+
-
-
-
-
- | 预案名称 |
- {{element.name}} |
-
-
- 添加人 |
- {{element.creatorName}} |
-
-
- 修改时间 |
-
- {{element.modifiedTime | date:'yyyy-MM-dd'}}
- |
-
-
- 预案类型 |
- {{element.planType | plantype}} |
-
-
- 审核状态 |
- {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
- '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}} |
-
-
- 是否公开 |
- {{element.openRange}} |
-
-
- 编制级别 |
- {{element.planLevel | planlevel}} |
-
-
- 操作 |
-
- 改名
- 编辑
- 查看
- 下载
- 删除
- 审批结果
- 提交审核
- 撤销审核
- |
-
-
- 操作 |
-
- 查看
- 下载
- |
-
- |
- |
-
-
-
+
查看详情
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+ {{downloadFileName}}
+ 下载中...
+
+
+
+
+
+
+
+ | 预案名称 |
+ {{element.name}} |
+
+
+ 添加人 |
+ {{element.creatorName}} |
+
+
+ 修改时间 |
+
+ {{element.modifiedTime | date:'yyyy-MM-dd'}}
+ |
+
+
+ 预案类型 |
+ {{element.planType | plantype}} |
+
+
+
+ 审核状态 |
+ {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
+ '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}} |
+
+
+ 是否公开 |
+ {{element.openRange}} |
+
+
+ 编制级别 |
+ {{element.planLevel | planlevel}} |
+
+
+ 操作 |
+
+ 改名
+ 编辑
+ 查看
+ 下载
+ 删除
+ 审批结果
+ 提交审核
+ 撤销审核
+ |
+
+
+ 操作 |
+
+ 查看
+ 下载
+ |
+
+ |
+ |
+
+
+
+
+
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss
index 9324d93..59234db 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss
@@ -15,6 +15,7 @@
// margin-bottom: 30px;
}
.body{
+ overflow: auto;
.btn{
button{
width: 80px;
@@ -23,6 +24,7 @@
}
}
.tablebox{
+ overflow: auto;
table{
width: 100%;
margin-left: 0%;
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.html b/src/app/plan-management/entry-plan/entry-plan.component.html
index 4c4bddc..099f1fd 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.html
+++ b/src/app/plan-management/entry-plan/entry-plan.component.html
@@ -16,6 +16,8 @@
包含下级
+
更多筛选条件![]()
+
收起![]()
-
+
@@ -49,7 +51,7 @@
-
+
@@ -60,7 +62,7 @@
-
+
@@ -71,7 +73,7 @@
-
+
@@ -85,7 +87,7 @@
包含下级
-
+
@@ -94,7 +96,7 @@
-
+
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts
index e00c887..1e4032f 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.ts
+++ b/src/app/plan-management/entry-plan/entry-plan.component.ts
@@ -170,6 +170,11 @@ export class EntryPlanComponent implements OnInit {
}
level
ngOnInit(): void {
+ if(window.matchMedia("(max-width: 1300px)").matches){
+ this.padMore=true
+ }else{
+ this.padMore=false
+ }
this.getunitdata();
this.getOrganizations();
this.getUnittype();
@@ -202,6 +207,14 @@ export class EntryPlanComponent implements OnInit {
]
}
}
+ padMore=true//pad收缩控制
+ padput=false//pad收起按钮
+ imgsrcopen="../../../assets/images/routdown2.png"
+ imgsrcdown="../../../assets/images/routup2.png"
+ padInfo(){
+ this.padMore=!this.padMore
+ this.padput=!this.padput
+ }
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.html b/src/app/plan-management/meet-plan/meet-plan.component.html
index 9f5133c..2db3eb0 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.html
+++ b/src/app/plan-management/meet-plan/meet-plan.component.html
@@ -19,24 +19,26 @@
市级
+
更多筛选条件![]()
+
收起![]()
-