Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/plan-management/entry-plan-look/AddPlanone.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-06-16 11:14:41
+ * @LastEditTime: 2021-06-21 14:28:53
 -->
 <form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
     <div class="topbox" style="text-align: center;">
@@ -57,12 +57,12 @@
                     
                     <mat-radio-group required name="planup" [(ngModel)]="defaultisshow" style="float: left;"  (change)="selectradio($event)">
                         <div *ngIf="localup">
-                            <mat-radio-button value="0" style="margin-right: 10px;">本地上传</mat-radio-button>
+                            <mat-radio-button value="1" style="margin-right: 10px;">本地上传</mat-radio-button>
                             <input style="width: 175px;" type="file" name="" id="uploadFile" *ngIf="isup" (change)="filechange($event)">
                             <span *ngIf="uploadover" style="font-size: 13px;">(已上传)</span>
                         </div>
                         <div *ngIf="inputword">
-                          <mat-radio-button value="1" style="margin-right: 10px;">在线编制</mat-radio-button>
+                          <mat-radio-button value="2" style="margin-right: 10px;">在线编制</mat-radio-button>
                           <!-- <button mat-raised-button *ngIf="isinput" (click)='createWord()'>在线编制预案</button> -->
                         </div>
                         <!-- <div *ngIf="inputword">

src/app/plan-management/entry-plan-look/entry-plan-look.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-06-16 13:42:46
+ * @LastEditTime: 2021-06-21 15:14:48
 -->
 <!-- <p>录入预案</p> -->
 <div style="overflow: auto;height: 100%;">
@@ -80,13 +80,13 @@
                         <span (click)="changeName(element)" *ngIf="element.auditStatus==8">改名</span>
                         <span (click)="editPlan(element)"
                             [ngClass]="{'grey': !(element.auditStatus!='16' && element.auditStatus != '1')}">编辑</span>
-                        <span (click)="lookPlan(element)" *ngIf="element.attachmentUrls!=null || element.planType == 2">查看</span>
+                        <span (click)="lookPlan(element)" *ngIf="element.planType == 2">查看</span>
                         <span (click)="readFile(element)"
                             [ngClass]="{'grey': element.planMode == '1' || element.planMode == '2' || element.planMode == '3'}">下载</span>
                         <span (click)="deletePlan(element)" *ngIf="element.auditStatus==8">删除</span>
                         <span (click)="auditResult(element)">审批结果</span>
                         <span (click)="submitAudit(element)"
-                            *ngIf="element.attachmentUrls!=null&&element.auditStatus!=1&&element.auditStatus!=16">提交审核</span>
+                            *ngIf="element.auditStatus!=1&&element.auditStatus!=16">提交审核</span>
                         <span (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
                     </td>
                 </ng-container>

src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@@ -550,7 +550,7 @@ export class AddPlanone {
     this.dialogRef.close();
   }
   levels//
-  isup: boolean = true //上传input框是否显示
+  isup: boolean = false //上传input框是否显示
   isweb: boolean = false //web输入框是否显示
   isinput: boolean = false //编制按钮是否显示
   defaultisshow = '0' //默认显示上传input框
@@ -559,13 +559,13 @@ export class AddPlanone {
   cadPlan//是否为卡片预案
   //选择radio
   selectradio(e) {
-    if (e.value == "0") { //如果点击本地上传
+    if (e.value == "1") { //如果点击本地上传
       this.isup = true
       this.isinput = false
       this.isweb = false
       this.webaddress = ""
     }
-    if (e.value == "1") { //如果点击导入word文档
+    if (e.value == "4") { //如果点击导入word文档
       this.isinput = true
       this.isup = false
       this.isweb = false
@@ -946,13 +946,13 @@ export class AddPlanone {
       PlanLevel = 8
     }
     if (this.selectedPLanType != "1") {//如果创建的不是二维预案
-      if (this.defaultisshow == '0' && this.file == null) {  //如果是本地上传
+      if (this.defaultisshow == '1' && this.file == null) {  //如果是本地上传
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
         this.snackBar.open('请先上传文件', '确定', config);
       }
-      if (this.defaultisshow == '0' && this.file) { //如果是本地上传并且有文件
+      if (this.defaultisshow == '1' && this.file) { //如果是本地上传并且有文件
         //先上传成功
         this.startUploading("非二维")
 
@@ -972,7 +972,7 @@ export class AddPlanone {
         // })
       }
 
-      if (this.defaultisshow == '1') {//如果是导入则很复杂
+      if (this.defaultisshow == '2') {//如果是导入则很复杂
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
@@ -1015,13 +1015,13 @@ export class AddPlanone {
 
       }
     } else { //如果创建的是二维预案
-      if (this.defaultisshow == '0' && this.file == null) {  //如果是本地上传
+      if (this.defaultisshow == '1' && this.file == null) {  //如果是本地上传
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
         this.snackBar.open('请先上传文件', '确定', config);
       }
-      if (this.defaultisshow == '0' && this.file) {
+      if (this.defaultisshow == '1' && this.file) {
         this.startUploading("二维")
         // let body  = {
         //   id: "",