Merge branch 'master' of http://git.fmode.cn:3000/bin/edu-textbook

projects/textbook/src/app/comp-upload/comp-upload.component.ts

@@ -38,8 +38,11 @@ export class CompUploadComponent implements OnInit {
 
   ngOnInit() {
     this.fileList = this.files.map((item: any) => {
+      console.log(item);
       return {
-        url: item,
+        url: item?.url,
+        name:item?.name,
+        status: 'done',
       };
     });
   }

projects/textbook/src/modules/nav-author/components/basic-in/basic-in.component.html

@@ -122,7 +122,7 @@
         <nz-form-label [nzSm]="8" [nzNoColon]="true" [nzXs]="8" nzRequired>教材获批截图</nz-form-label>
         <nz-form-control nzErrorTip="请上传教材获批截图" [nzSm]="12" [nzXs]="12">
           <nz-input-group>
-            <app-comp-upload (change)="upload($event, 'approvedImgUrl')" title="上传教材获批截图"></app-comp-upload>
+            <app-comp-upload [files]="approvedImgList" (change)="upload($event, 'approvedImgUrl')" title="上传教材获批截图"></app-comp-upload>
           </nz-input-group>
           <p style="color: gray;">支持上传 PDF 格式，文件大小不超过 2M</p>
         </nz-form-control>
@@ -131,26 +131,23 @@
     
     <nz-form-item style="margin-bottom: 16px">
       <nz-form-label [nzSm]="8" [nzNoColon]="true" [nzXs]="8" nzRequired>出版单位</nz-form-label>
-      <nz-form-control nzErrorTip="请输入出版单位" [nzSm]="12" [nzXs]="12">
-        <!-- <nz-input-group>
-          <input
-            type="text"
-            nz-input
-            formControlName="editionUnit"
-            placeholder="请输入出版单位"
-          />
-        </nz-input-group> -->
-        <nz-input-group>
-          <nz-select nzShowSearch nzServerSearch nzPlaceHolder="选择出版单位" formControlName="editionUnit"
-            [nzShowArrow]="false" [nzFilterOption]="nzFilterOption" (nzOnSearch)="search($event)">
-            @for(edu of eduList; track edu;let index = $index){
-            <nz-option nzCustomContent [nzLabel]="edu?.get('name')" [nzValue]="edu?.get('name')">
-              {{edu?.get('name')}}
-            </nz-option>
-            }
-          </nz-select>
-        </nz-input-group>
-      </nz-form-control>
+      @if (!isShowChooseEU) {
+        <p title="点击更改出版单位" (click)="isShowChooseEU=true" style="margin-top: 6px;color: rgb(0, 140, 255);">{{validateForm.value.editionUnit}}</p>
+      }@else{
+        <nz-form-control nzErrorTip="请输入出版单位" [nzSm]="12" [nzXs]="12">
+          <nz-input-group>
+            <nz-select nzShowSearch nzServerSearch nzPlaceHolder="选择出版单位" formControlName="editionUnit"
+              [nzShowArrow]="false" [nzFilterOption]="nzFilterOption" (nzOnSearch)="search($event)">
+              @for(edu of eduList; track edu;let index = $index){
+              <nz-option nzCustomContent [nzLabel]="edu?.get('name')" [nzValue]="edu?.get('name')">
+                {{edu?.get('name')}}
+              </nz-option>
+              }
+            </nz-select>
+          </nz-input-group>
+        </nz-form-control>
+      }
+      
     </nz-form-item>
     <nz-form-item style="margin-bottom: 16px">
       <nz-form-label [nzSm]="8" [nzNoColon]="true" [nzXs]="8" nzRequired>初版时间</nz-form-label>

projects/textbook/src/modules/nav-author/components/basic-in/basic-in.component.ts

@@ -41,7 +41,12 @@ export class BasicInComponent implements OnInit {
   @Input('editFrom') editFrom: any;
   @Output() state: EventEmitter<any> = new EventEmitter<any>();
   @Output() save: EventEmitter<any> = new EventEmitter<any>();
-
+/***教材获批截图 */
+  approvedImgList:Array<any>=[{
+    name:'获批截图',
+    status:'done',
+    url:''
+  }]
   /**
    * 书号自动补全函数
    * @param isbn 书号
@@ -176,7 +181,13 @@ export class BasicInComponent implements OnInit {
   ) {
   }
 
+  isShowChooseEU:boolean=true
   ngOnInit() {
+    if(this.eduTextbook?.get('editionUnit')){
+      this.isShowChooseEU=false
+    }
+    this.approvedImgList[0].url = this.eduTextbook.get('approvedImgUrl')
+    console.log(this.approvedImgList)
     console.log(this.eduTextbook);
     this.validateForm = this.fb.group({
       title: [this.eduTextbook?.get('title') || '', [Validators.required]],
@@ -245,7 +256,7 @@ export class BasicInComponent implements OnInit {
     let file = e[0];
     // if(type == 'copyrightImgUrl' || type == 'CIPImgUrl' ||type=='approvedImgUrl'){
     if(type=='approvedImgUrl'){
-      this.validateForm.value[type] = file?.name
+      this.validateForm.value[type] = file?.url
     }
   }
   async submitForm(event?: string): Promise<void> {

projects/textbook/src/modules/nav-author/components/textbook-pertain/textbook-pertain.component.html

@@ -252,19 +252,25 @@
       </nz-table>
     </div>
   </form>
+  
+</div>
+<div style="width: 100%;display: flex;justify-content: space-between;padding: 30px;">
   <a (click)="downloadFile()">
     <span nz-icon nzType="download" nzTheme="outline"></span>
     下载本页所有附件模板
   </a>
+  <div class="footer">
+    <div>
+      <button nz-button nzType="default" style="margin-right: 20px" (click)="submitForm('save')">
+        保存本页
+      </button>
+      <button nz-button nzType="default" style="margin-right: 20px" (click)="submitForm('pre')">
+        上一页
+      </button>
+      <button nz-button nzType="primary" style="background: #3e49b3; border: 1px #3e49b3" (click)="submitForm('next')">
+        下一页
+      </button>
+    </div>
+  
+  </div>
 </div>
-<div class="footer">
-  <button nz-button nzType="default" style="margin-right: 20px" (click)="submitForm('save')">
-    保存本页
-  </button>
-  <button nz-button nzType="default" style="margin-right: 20px" (click)="submitForm('pre')">
-    上一页
-  </button>
-  <button nz-button nzType="primary" style="background: #3e49b3; border: 1px #3e49b3" (click)="submitForm('next')">
-    下一页
-  </button>
-</div>

projects/textbook/src/modules/nav-author/components/textbook-pertain/textbook-pertain.component.scss

@@ -44,10 +44,8 @@
 }
 .footer{
   display: flex;
-  margin: 10px auto;
   align-items: center;
   justify-content: space-evenly;
   // width: 200px;
   justify-content: end;
-  padding-right: 100px;
 }