修改导出PDF模板新增教材所属学科专业类

projects/textbook/src/app/textbook/textbook.component.html

@@ -227,14 +227,14 @@
         <td nzEllipsis nz-popover [nzPopoverContent]="contentTemplatemajor">
           {{
             (data?.get("discipline")?.code || "") +
-              "/" +
+              " " +
               (data?.get("discipline")?.name || "")
           }}
           <ng-template #contentTemplatemajor>
             <div style="max-width: 400px">
               {{
                 (data?.get("discipline")?.code || "") +
-                  "/" +
+                  " " +
                   (data?.get("discipline")?.name || "")
               }}
             </div>
@@ -473,7 +473,7 @@
         <th nzEllipsis nzWidth="50px">册数</th>
         <th nzEllipsis nzWidth="120px">第一主编/作者</th>
         <th nzEllipsis nzWidth="80px">所属单位</th>
-        <th nzEllipsis nzWidth="120px">所属本科专业</th>
+        <th nzEllipsis nzWidth="120px">教材所属学科专业类</th>
         <th nzEllipsis nzWidth="80px">主要语种类型</th>
         <th nzEllipsis nzWidth="80px">ISBN</th>
         <th nzEllipsis nzWidth="120px">出版单位</th>
@@ -609,10 +609,19 @@
           </ng-template>
         </td>
         <td nzEllipsis nz-popover [nzPopoverContent]="contentTemplatemajor">
-          {{ data?.get("major")?.name || "-" }}
+          <!-- {{ data?.get("major")?.name || "-" }} -->
+          {{
+            (data?.get("discipline")?.code || "") +
+              " " +
+              (data?.get("discipline")?.name || "")
+          }}
           <ng-template #contentTemplatemajor>
             <div style="max-width: 400px">
-              {{ data?.get("major")?.name || "-" }}
+              {{
+                (data?.get("discipline")?.code || "") +
+                  " " +
+                  (data?.get("discipline")?.name || "")
+              }}
             </div>
           </ng-template>
         </td>

server/cloud/tbook/func-tbook-export.js

@@ -238,9 +238,12 @@ function fixVolumeData(json,volumeData,index,totalJson){
     json.index = index + 1;
     // 教材基本信息
 
-    // 专业代码：前四位 discipline
-    let majorCode4 = volumeData?.discipline?.code?.slice(0,4) || json?.discipline?.code?.slice(0,4) || ""
-    let majorName4 = volumeData?.discipline?.name || json?.discipline?.name  || ""
+    // 教材所属学科专业类：前四位 discipline
+    let disciplineCode4 = volumeData?.discipline?.code?.slice(0,4) || json?.discipline?.code?.slice(0,4) || ""
+    let disciplineName4 = volumeData?.discipline?.name || json?.discipline?.name  || ""
+    // 教材应用对象及所属学科专业类：前四位 majorPoniter
+    let majorCode4 = volumeData?.majorPoniter?.code?.slice(0,4) || json?.majorPoniter?.code?.slice(0,4) || ""
+    let majorName4 = volumeData?.majorPoniter?.name || json?.majorPoniter?.name  || ""
     // 专业代码：前六位 major
     let majorCode6 = volumeData?.major?.code?.slice(0,6) || json?.major?.code?.slice(0,6)  || ""
     let majorName6 = volumeData?.major?.name || json?.major?.name || ""
@@ -299,9 +302,11 @@ function fixVolumeData(json,volumeData,index,totalJson){
     json.uHJ = circleCheck[(volumeData?.unitType?.indexOf("合建")>-1)?1:0];
     json.uGJ = circleCheck[(volumeData?.unitType?.indexOf("共建")>-1)?1:0];
     json.uQT = circleCheck[(volumeData?.unitType?.indexOf("其他")>-1)?1:0];
+    json.dc4 = disciplineCode4;
+    json.dn4 = disciplineName4;
     json.mc4 = majorCode4;
-    json.majorCodePad = majorCode4;
     json.mn4 = majorName4;
+    json.majorCodePad = majorCode4;
     json.mc6 = majorCode6;
     json.mn6 = majorName6;
     json.lCN = circleCheck[(volumeData?.lang=="中文")?1:0];