xll пре 7 месеци
родитељ
комит
5879dcdc88

+ 2 - 2
projects/textbook/src/modules/common/textbook-details/textbook-details.component.html

@@ -39,7 +39,7 @@
           </div>
           <div class="row">
             <div class="label">教材应用对象及所属学科专业类</div>
-            <div class="value">{{ textBook?.majorPoniter }}</div>
+            <div class="value">{{ textBook?.majorPoniter?.code }}-{{ textBook?.majorPoniter?.name }}</div>
           </div>
           <div class="row">
             <div class="label">教材主要语种类型</div>
@@ -131,7 +131,7 @@
           <div class="row">
             <div class="label">适用专业代码(六位)及名称</div>
             <div class="value">
-              {{ textBook?.major?.code }}/{{ textBook?.major?.name }}
+              {{ textBook?.major?.code }}-{{ textBook?.major?.name }}
             </div>
           </div>
           <div class="row">

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

@@ -79,14 +79,25 @@
       <nz-form-label [nzSm]="8" [nzNoColon]="true" [nzXs]="8" nzRequired>教材应用对象及所属学科专业类</nz-form-label>
       <nz-form-control nzErrorTip="输入所属本科专业类代码(四位)搜索所属学科" [nzSm]="12" [nzXs]="12">
         <nz-input-group>
-          <nz-select [nzOptionOverflowSize]="nzOptionOverflowSize" nzShowSearch nzAllowClear nzPlaceHolder="输入所属本科专业类代码(四位)搜索所属学科" formControlName="majorPoniter">
+
+
+          <nz-select style="width: 80%" nzShowSearch nzAllowClear nzPlaceHolder="填写 6 位专业代码选择"
+                formControlName="majorPoniter" (ngModelChange)="changeCode()" (nzOnSearch)="getCode($event)">
+                @for(major of selectList; track major.code;let index = $index){
+                <nz-option nzCustomContent [nzValue]="major.code" [nzLabel]="major.name+'-'+major.code">
+                  <div>{{ major.name }}</div>
+                  <div style="font-size: 12px;color: gray;">{{ major.code }}</div>
+                </nz-option>
+                }
+              </nz-select>
+          <!-- <nz-select [nzOptionOverflowSize]="nzOptionOverflowSize" nzShowSearch nzAllowClear nzPlaceHolder="输入所属本科专业类代码(四位)搜索所属学科" formControlName="majorPoniter">
             @for(major of selectList; track major.code;let index = $index){
-            <nz-option nzCustomContent [nzValue]="major.name" [nzLabel]="major.name+'-'+major.code">
+            <nz-option nzCustomContent [nzValue]="major.code +'/'+ major.name" [nzLabel]="major.name+'-'+major.code">
               <div>{{ major.name }}</div>
               <div style="font-size: 12px;color: gray;">{{ major.code }}</div>
             </nz-option>
             }
-          </nz-select>
+          </nz-select> -->
         </nz-input-group>
       </nz-form-control>
     </nz-form-item>

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

@@ -43,6 +43,11 @@ export class BasicInComponent implements OnInit {
   @Input('editFrom') editFrom: any;
   @Output() state: EventEmitter<any> = new EventEmitter<any>();
   @Output() save: EventEmitter<any> = new EventEmitter<any>();
+
+
+  changeCode() { }
+  getCode(e: any) { }
+
 /***教材获批截图 */
   approvedImgList:Array<any>=[{
     name:'获批截图',
@@ -281,7 +286,7 @@ export class BasicInComponent implements OnInit {
       type: [this.eduTextbook?.get('type') || '', [Validators.required]],
       // typeNumber: [this.eduTextbook?.get('typeNumber') || 2],
   
-      majorPoniter: [this.eduTextbook?.get('majorPoniter') || '', [Validators.required]],
+      majorPoniter: [this.eduTextbook?.get('majorPoniter')?.code || '', [Validators.required]],
       lang: [this.eduTextbook?.get('lang') || '', [Validators.required]],
       authors: [this.eduTextbook?.get('authors') || ''],
       editor: [this.eduTextbook?.get('editor') || '',],
@@ -377,7 +382,9 @@ export class BasicInComponent implements OnInit {
     this.eduTextbook?.set('type', params.type);
     // this.eduTextbook?.set('typeNumber', params.typeNumber);
     this.eduTextbook?.set('typeNumber', this.typeNumber);
-    this.eduTextbook?.set('majorPoniter', params.majorPoniter);
+
+    let majorPoniter = this.selectList.find((item) => item.code == params.majorPoniter);
+    this.eduTextbook?.set('majorPoniter', majorPoniter);
     this.eduTextbook?.set('lang', params.lang);
     this.eduTextbook?.set('authors', params.authors);
     this.eduTextbook?.set('editor', params.editor);