xll 2 ay önce
ebeveyn
işleme
026cb39b98

+ 10 - 5
projects/textbook/src/modules/nav-author/components/create/basic/basic.component.html

@@ -89,17 +89,17 @@
   </nz-form-item>
   <nz-form-item style="margin-bottom: 16px">
     <nz-form-label [nzSm]="8" [nzNoColon]="true" [nzXs]="8">其他主编姓名</nz-form-label>
-    <nz-form-control nzErrorTip="请输入其他主编姓名,使用「」隔开" [nzSm]="12" [nzXs]="12">
+    <nz-form-control nzErrorTip="请输入其他主编姓名,使用「」隔开" [nzSm]="12" [nzXs]="12">
       <nz-input-group>
-        <textarea type="text" nz-input formControlName="authors" placeholder="请输入其他主编姓名,使用「」隔开"></textarea>
+        <textarea type="text" nz-input formControlName="authors" placeholder="请输入其他主编姓名,使用「」隔开"></textarea>
       </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">其他编者姓名</nz-form-label>
-    <nz-form-control nzErrorTip="请输入其他编者姓名,使用「」隔开" [nzSm]="12" [nzXs]="12">
+    <nz-form-control nzErrorTip="请输入其他编者姓名,使用「」隔开" [nzSm]="12" [nzXs]="12">
       <nz-input-group>
-        <textarea type="text" nz-input formControlName="editor" placeholder="请输入其他编者姓名,使用「」隔开"></textarea>
+        <textarea type="text" nz-input formControlName="editor" placeholder="请输入其他编者姓名,使用「」隔开"></textarea>
       </nz-input-group>
     </nz-form-control>
   </nz-form-item>
@@ -206,7 +206,12 @@
     </nz-form-control>
   </nz-form-item>
   <nz-form-item style="margin-bottom: 16px">
-    <nz-form-label [nzSm]="8" [nzNoColon]="true" [nzXs]="8">初版以来是否列为重点项目</nz-form-label>
+    <nz-form-label nz-popover nzPopoverContent="若没有列为重点项目则不选此项"
+     [nzSm]="8" [nzNoColon]="true" [nzXs]="8">
+      初版以来是否列为重点项目
+      <span class="exclamation-circle" nz-icon nzType="exclamation-circle" nzTheme="outline"></span>
+    </nz-form-label>
+
     <nz-form-control nzErrorTip="" [nzSm]="12" [nzXs]="12">
       <nz-checkbox-wrapper>
         @for (item of importantProjectList; track item.value) {

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

@@ -31,15 +31,15 @@
                 (ngModelChange)="changeCode()"
                 (nzOnSearch)="getCode($event)"
               >
-                @for(major of selectList; track major.code;let index = $index){
+                @for(major of selectList; track major?.code;let index = $index){
                 <nz-option
                   nzCustomContent
-                  [nzValue]="major.code"
-                  [nzLabel]="major.name + '-' + major.code"
+                  [nzValue]="major?.code"
+                  [nzLabel]="major?.name + '-' + major?.code"
                 >
-                  <div>{{ major.name }}</div>
+                  <div>{{ major?.name }}</div>
                   <div style="font-size: 12px; color: gray">
-                    {{ major.code }}
+                    {{ major?.code }}
                   </div>
                 </nz-option>
                 }

+ 5 - 3
projects/textbook/src/modules/nav-author/components/textbook-pertain/textbook-pertain.component.ts

@@ -106,7 +106,9 @@ export class TextbookPertainComponent implements OnInit {
   });
 
   //适用专业代码及名称
-  selectList = major.majors.options;
+  selectList =[
+    {"cate":"适用所有专业"	,"code":"000000","name":	"适用所有专业","degree":	"适用所有专业"},
+...major.majors.options] ;
 
   //适用课程性质
   checkOptionsOne = [
@@ -198,7 +200,7 @@ export class TextbookPertainComponent implements OnInit {
       // this.checkOptionsOne =
       //   this.eduTextbook.get('characteristic') || this.checkOptionsOne;
       let major = this.selectList.find(
-        (item) => item.code == this.eduTextbook.get('major')?.code
+        (item:any) => item.code == this.eduTextbook.get('major')?.code
       );
       let lessons = this.eduTextbook.get('lessons')?.join(';');
       this.validateForm = this.fb.group({
@@ -420,7 +422,7 @@ export class TextbookPertainComponent implements OnInit {
         className: 'Company',
         objectId: this.tbookSer.company,
       });
-      let major = this.selectList.find((item) => item.code == params.major);
+      let major = this.selectList.find((item:any) => item.code == params.major);
       let lessons = params.lessons.split(';');
       this.eduTextbook?.set('major', major);
       params.period && this.eduTextbook?.set('period', params.period);