warrior 7 kuukautta sitten
vanhempi
commit
4181d77b4f

+ 1 - 1
projects/textbook/src/modules/nav-admin/components/profile/profile.component.html

@@ -37,7 +37,7 @@
         {{ data?.get("user").get("phone") || "-" }}
       </td>
       <td nzEllipsis>
-        {{ data?.get("user").get("phone") || data?.get("email") || "-" }}
+        {{ data?.get("user").get("email") || data?.get("email") || "-" }}
       </td>
       <td nzEllipsis>
         {{ data?.get("user").get("departmentName") || "-" }}

+ 4 - 4
projects/textbook/src/modules/nav-admin/page-role/page-role.component.html

@@ -2,9 +2,9 @@
   <nz-page-header-title
     >申报单位管理
     <br />
-    <div class="subtitle">
+    <!-- <div class="subtitle">
       使用组织机构树管理使用“十四五”高等教育国家规划教材申报系统的所有单位,单位与申报工作流程相关联。
-    </div>
+    </div> -->
   </nz-page-header-title>
   <nz-page-header-extra>
     <nz-space>
@@ -299,7 +299,7 @@
         </div>
         <div class="select">
           <div class="bar">
-            <a style="color: #86909c" (click)="onPre()">教材遴选</a>
+            <a style="color: #86909c" (click)="onPre()">所有部门</a>
             @for (data of parentMap; track data.title) {
             <span style="margin: 0 10px">/</span>
             <a (click)="onPre(data, $index)">{{ data.title }}</a>
@@ -373,7 +373,7 @@
         </div>
         <div class="select">
           <div class="bar">
-            <a style="color: #86909c" (click)="onPre()">教材遴选</a>
+            <a style="color: #86909c" (click)="onPre()">所有部门</a>
             @for (data of parentMap; track data.title) {
             <span style="margin: 0 10px">/</span>
             <a (click)="onPre(data, $index)">{{ data.title }}</a>

+ 2 - 2
projects/textbook/src/modules/nav-admin/page-user/page-user.component.html

@@ -255,9 +255,9 @@
         <div class="select">
           <div class="bar">
             @if (this.tbookSer.profile.identity == '国家级管理员') {
-            <a style="color: #86909c" (click)="onPre()">教材遴选</a>
+            <a style="color: #86909c" (click)="onPre()">所有部门</a>
             }@else {
-            <a style="color: #86909c">教材遴选</a>
+            <a style="color: #86909c">所有部门</a>
             } @for (data of parentMap; track data.title) {
             <span style="margin: 0 10px">/</span>
             @if (this.tbookSer.profile.identity == '国家级管理员' ||

+ 1 - 1
projects/textbook/src/modules/nav-admin/page-user/user-create/user-create.component.html

@@ -399,7 +399,7 @@
         </div>
         <div class="select">
           <div class="bar">
-            <a style="color: #86909c">教材遴选</a>
+            <a style="color: #86909c">所有部门</a>
             @for (data of parentMap; track data.title) {
             <span style="margin: 0 10px">/</span>
             @if($index == 0){

+ 3 - 6
projects/textbook/src/modules/nav-admin/user-edit/user-edit.component.html

@@ -271,13 +271,10 @@
           user?.get("department")?.get('name') || user?.get("companyName")
         }}</nz-tag>
       </div> -->
-      <div class="title">原始JSON数据</div>
+      <!-- <div class="title">原始JSON数据</div>
       <div class="fill-template">
         <div nz-row>
           <div nz-col nzSpan="24">
-            <!-- <div class="view-block">
-              {{inputValue}}
-            </div> -->
             <textarea
               rows="4"
               disabled="true"
@@ -287,7 +284,7 @@
             ></textarea>
           </div>
         </div>
-      </div>
+      </div> -->
     </nz-tab>
   </nz-tabset>
 </div>
@@ -331,7 +328,7 @@
         </div>
         <div class="select">
           <div class="bar">
-            <a style="color: #86909c">教材遴选</a>
+            <a style="color: #86909c">所有部门</a>
             @for (data of parentMap; track data.title) {
             <span style="margin: 0 10px">/</span>
             @if($index == 0){ @if (tbookSer.profile.identity != '国家级管理员')

+ 1 - 0
projects/textbook/src/modules/nav-admin/user-edit/user-edit.component.ts

@@ -204,6 +204,7 @@ export class UserEditComponent implements OnInit {
   }
   onCheck(e: any) {
     console.log(e);
+    this.userDataJson.department = undefined
     this.provinceChange();
   }
   parent:string = '' //搜索时传入的id

+ 4 - 4
projects/textbook/src/modules/nav-province-contact/page-role/page-role.component.html

@@ -2,9 +2,9 @@
   <nz-page-header-title
     >申报单位管理
     <br />
-    <div class="subtitle">
+    <!-- <div class="subtitle">
       使用组织机构树管理使用“十四五”高等教育国家规划教材申报系统的所有单位,单位与申报工作流程相关联。
-    </div>
+    </div> -->
   </nz-page-header-title>
   <nz-page-header-extra>
     <nz-space>
@@ -287,7 +287,7 @@
         </div>
         <div class="select">
           <div class="bar">
-            <a style="color: #86909c">教材遴选</a>
+            <a style="color: #86909c">所有部门</a>
             @for (data of parentMap; track data.title) {
             <span style="margin: 0 10px">/</span>
             @if ($index !=0 && data?.verify) {
@@ -364,7 +364,7 @@
         </div>
         <div class="select">
           <div class="bar">
-            <a style="color: #86909c">教材遴选</a>
+            <a style="color: #86909c">所有部门</a>
             @for (data of parentMap; track data.title) {
             <span style="margin: 0 10px">/</span>
             @if ($index !=0 && data?.verify) {