Pārlūkot izejas kodu

<!--按钮操作-->

liangyan0105 3 gadi atpakaļ
vecāks
revīzija
c3c5b3d5cb

+ 2 - 2
src/app/routes/basedata/material-file/material-file.component.html

@@ -175,10 +175,10 @@
                 <!-- 属性  1采购   2销售 -->
                 <td nzAlign="center">
                   <ng-container *ngIf="data.attribute == 1">
-                    <nz-tag [nzColor]="'#f50'">{{ 'procurement' | translate }}</nz-tag>
+                    <span style="color:#f50;">{{ 'procurement' | translate }}</span>
                   </ng-container>
                   <ng-container *ngIf="data.attribute == 2">
-                    <nz-tag [nzColor]="'#108ee9'"> {{ 'sales' | translate }}</nz-tag>
+                    <span style="color:#108ee9;">{{ 'sales' | translate }}</span>
                   </ng-container>
                 </td>
 

+ 6 - 5
src/app/routes/down-payment-management/collection-confirmation/collection-confirmation.component.html

@@ -113,12 +113,13 @@
               {{ data.invoice }}
             </td>
             <td>
-              <!-- 带确认 -->
-              <a *ngIf="data.status === '0'" (click)="toBeConfirmed(data)" acl [acl-ability]="'receipt:update'">{{
-                'waiting.confim' | translate
-              }}</a>
+              <!-- 待确认 -->
+              <a *ngIf="data.status === '0'" (click)="toBeConfirmed(data)" acl [acl-ability]="'receipt:update'">
+                {{'waiting.confim' | translate}}
+              </a>
+              
               <!-- 已确认 -->
-              <nz-tag *ngIf="data.status === '1'" [nzColor]="'green'">{{ 'have.confim' | translate }}</nz-tag>
+              <nz-tag *ngIf="data.status === '1'" [nzColor]="'gray'">{{ 'have.confim' | translate }}</nz-tag>
             </td>
           </tr>
         </tbody>

+ 3 - 1
src/app/routes/expense-reimbursement/expense-reimbursement-form/expense-reimbursement-form.component.html

@@ -14,7 +14,9 @@
         <nz-form-item>
           <!-- 项目名称 -->
           <nz-form-label [nzSm]="6" [nzXs]="24">{{ 'cost.item.name' | translate }}</nz-form-label>
-          <nz-form-control [nzSm]="14" [nzXs]="24"> </nz-form-control>
+          <nz-form-control [nzSm]="14" [nzXs]="24">
+            <input nz-input name="code" [(ngModel)]="reExpenseSlip.proName" />
+          </nz-form-control>
         </nz-form-item>
       </div>
       <div nz-col [nzSpan]="8">

+ 30 - 20
src/app/routes/monitor/message/message.component.html

@@ -1,21 +1,23 @@
 <page-header [action]="phActionTpl">
-  <ng-template #phActionTpl>
-  </ng-template>
+  <ng-template #phActionTpl> </ng-template>
 </page-header>
+
 <nz-card>
-  <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
+  <!-- 查询条件 -->
+  <div nz-row [nzGutter]="{ xs: 12, sm: 15, md: 29, lg: 36, xl: 40 }">
     <!-- 标题 -->
-    <div nz-col nzXs="24" nzSm="3" nzLg="3" [nzPush]="1">
+    <div nz-col nzXs="24" nzSm="3" nzLg="2" [nzPush]="1">
       <nz-form-label>{{ 'title' | translate }}</nz-form-label>
     </div>
     <div nz-col nzXs="24" nzSm="4" nzLg="6">
       <input nz-input [(ngModel)]="sysAnnouncement.titile" />
     </div>
+
     <!-- 发布人 -->
-    <div nz-col nzXs="24" nzSm="5" nzLg="3">
+    <div nz-col nzXs="24" nzSm="3" nzLg="2">
       <nz-form-label>{{ 'issuer' | translate }}</nz-form-label>
     </div>
-    <div nz-col nzXs="24" nzSm="5" nzLg="6">
+    <div nz-col nzXs="24" nzSm="4" nzLg="6">
       <input nz-input [(ngModel)]="sysAnnouncement.sender" />
     </div>
     <!-- 查询 -->
@@ -24,22 +26,30 @@
     </div>
   </div>
 
-  <nz-table nzSize="small" #nzTable [nzData]="listOfMapData" [nzFrontPagination]="false" [nzTotal]="page.total"
-    [nzPageIndex]="page.current" (nzPageIndexChange)="pageIndexChange($event)" [nzLoading]="isLoading">
+  <nz-table
+    nzSize="small"
+    #nzTable
+    [nzData]="listOfMapData"
+    [nzFrontPagination]="false"
+    [nzTotal]="page.total"
+    [nzPageIndex]="page.current"
+    (nzPageIndexChange)="pageIndexChange($event)"
+    [nzLoading]="isLoading"
+  >
     <thead>
       <tr>
         <!-- 标题 -->
-        <th>{{'title'|translate}}</th>
+        <th>{{ 'title' | translate }}</th>
         <!-- 消息内容 -->
-        <th>{{'message.type'|translate}}</th>
+        <th>{{ 'message.type' | translate }}</th>
         <!-- 发布人 -->
-        <th>{{'issuer'|translate}}</th>
+        <th>{{ 'issuer' | translate }}</th>
         <!-- 发布时间 -->
-        <th>{{'release.time'|translate}}</th>
+        <th>{{ 'release.time' | translate }}</th>
         <!-- 阅读状态 -->
-        <th>{{'Reading.state'|translate}}</th>
+        <th>{{ 'Reading.state' | translate }}</th>
         <!-- 操作 -->
-        <th>{{'table.operation'|translate}}</th>
+        <th>{{ 'table.operation' | translate }}</th>
       </tr>
     </thead>
     <tbody *ngFor="let data of nzTable.data">
@@ -55,13 +65,13 @@
         <!-- 优先级 -->
         <td>
           <!-- <nz-tag [nzColor]="'data.color'">{{ data.priority }}</nz-tag> -->
-          <nz-tag *ngIf="data.readFlag==='0'" [nzColor]="'red'">{{'Unread'|translate}}</nz-tag>
-          <nz-tag *ngIf="data.readFlag==='1'" [nzColor]="'lime'">{{'Already.read'|translate}}</nz-tag>
+          <nz-tag *ngIf="data.readFlag === '0'" [nzColor]="'red'">{{ 'Unread' | translate }}</nz-tag>
+          <nz-tag *ngIf="data.readFlag === '1'" [nzColor]="'lime'">{{ 'Already.read' | translate }}</nz-tag>
         </td>
         <!-- 操作 -->
         <td>
-          <a (click)="check(data,modal)">
-            {{'check'|translate}}
+          <a (click)="check(data, modal)">
+            {{ 'check' | translate }}
           </a>
         </td>
       </tr>
@@ -69,5 +79,5 @@
   </nz-table>
 </nz-card>
 <ng-template #modal>
-  <button nz-button nzType="primary" (click)="close()">{{'determine'|translate}}</button>
-</ng-template>
+  <button nz-button nzType="primary" (click)="close()">{{ 'determine' | translate }}</button>
+</ng-template>

+ 51 - 25
src/app/routes/system/depart/add/add.component.html

@@ -3,19 +3,31 @@
     <th style="width: 600px;"></th>
   </table>
   <nz-form-item>
-    <nz-form-label nzRequired [nzSm]="6" [nzXs]="24">{{'depart.name'|translate}}</nz-form-label>
+    <nz-form-label nzRequired [nzSm]="6" [nzXs]="24">{{ 'depart.name' | translate }}</nz-form-label>
     <nz-form-control [nzSm]="14" [nzXs]="24">
-      <input [(ngModel)]="depart.departName" name="departName" nz-input placeholder="{{'placeholder'|translate}}{{'depart.name'|translate}}" maxlength=10/>
+      <input
+        [(ngModel)]="depart.departName"
+        name="departName"
+        nz-input
+        placeholder="{{ 'placeholder' | translate }}{{ 'depart.name' | translate }}"
+        maxlength="10"
+      />
     </nz-form-control>
   </nz-form-item>
-  <nz-form-item *ngIf="isOne==2">
-    <nz-form-label [nzSm]="6" [nzXs]="24">{{'depart.prant'|translate}}</nz-form-label>
+  <nz-form-item *ngIf="isOne == 2">
+    <nz-form-label [nzSm]="6" [nzXs]="24">{{ 'depart.prant' | translate }}</nz-form-label>
     <nz-form-control [nzSm]="14" [nzXs]="24">
-      <nz-select nzShowSearch nzAllowClear [nzDisabled]="flase" nzPlaceHolder="{{'select.please.choose'|translate}}"
-        [(ngModel)]="depart.parentId" name="parentId">
+      <nz-select
+        nzShowSearch
+        nzAllowClear
+        [nzDisabled]="flase"
+        nzPlaceHolder="{{ 'select.please.choose' | translate }}"
+        [(ngModel)]="depart.parentId"
+        name="parentId"
+      >
         <ng-container *ngFor="let de of listDepart">
           <!-- <ng-container *ngIf="depart.parentId==de.id"> -->
-            <nz-option nzLabel="{{de.departName}}" nzValue="{{de.id}}"></nz-option>
+          <nz-option nzLabel="{{ de.departName }}" nzValue="{{ de.id }}"></nz-option>
           <!-- </ng-container> -->
           <!-- <ng-container *ngIf="depart.parentId!=de.id">
             <nz-option nzLabel="{{'nothing'|translate}}" nzValue=""></nz-option>
@@ -25,50 +37,64 @@
     </nz-form-control>
   </nz-form-item>
   <nz-form-item>
-    <nz-form-label [nzSm]="6" [nzXs]="24">{{'depart.sort'|translate}}</nz-form-label>
+    <nz-form-label [nzSm]="6" [nzXs]="24">{{ 'depart.sort' | translate }}</nz-form-label>
     <nz-form-control [nzSm]="14" [nzXs]="24">
-      <nz-input-number [(ngModel)]="depart.departOrder" name="departOrder" [nzMin]="0" [nzStep]="1">
-      </nz-input-number>
+      <nz-input-number [(ngModel)]="depart.departOrder" name="departOrder" [nzMin]="0" [nzStep]="1"> </nz-input-number>
     </nz-form-control>
   </nz-form-item>
   <nz-form-item>
-    <nz-form-label [nzSm]="6" [nzXs]="24">{{'depart.telephone'|translate}}</nz-form-label>
+    <nz-form-label [nzSm]="6" [nzXs]="24">{{ 'depart.telephone' | translate }}</nz-form-label>
     <nz-form-control [nzSm]="14" [nzXs]="24">
-      <input [(ngModel)]="depart.mobile" name="mobile" nz-input placeholder="{{'placeholder'|translate}}{{'depart.telephone'|translate}}" maxlength=20/>
+      <input
+        [(ngModel)]="depart.mobile"
+        name="mobile"
+        nz-input
+        placeholder="{{ 'placeholder' | translate }}{{ 'depart.telephone' | translate }}"
+        maxlength="20"
+      />
     </nz-form-control>
   </nz-form-item>
   <nz-form-item>
-    <nz-form-label [nzSm]="6" [nzXs]="24">{{'depart.fax'|translate}}</nz-form-label>
+    <nz-form-label [nzSm]="6" [nzXs]="24">{{ 'depart.fax' | translate }}</nz-form-label>
     <nz-form-control [nzSm]="14" [nzXs]="24">
-      <input [(ngModel)]="depart.fix" name="fix" nz-input maxlength=20/>
+      <input [(ngModel)]="depart.fix" name="fix" nz-input maxlength="20" />
     </nz-form-control>
   </nz-form-item>
   <nz-form-item>
     <nz-form-item>
-      <nz-form-label nzRequired [nzSm]="6" [nzXs]="24">{{'depart.person.in.charge'|translate}}</nz-form-label>
+      <nz-form-label nzRequired [nzSm]="6" [nzXs]="24">{{ 'depart.person.in.charge' | translate }}</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24">
-        <nz-select nzShowSearch nzAllowClear nzPlaceHolder="Select a person" [(ngModel)]="depart.pkPersonnel"
-          name="pkPersonnel">
-          <nz-option nzLabel="{{'select.please.choose'|translate}}" nzValue=""></nz-option>
+        <nz-select
+          nzShowSearch
+          nzAllowClear
+          nzPlaceHolder="Select a person"
+          [(ngModel)]="depart.pkPersonnel"
+          name="pkPersonnel"
+        >
+          <nz-option nzLabel="{{ 'select.please.choose' | translate }}" nzValue=""></nz-option>
           <ng-container *ngFor="let per of listPersonnel">
-              <nz-option nzLabel="{{per.name}}" nzValue="{{per.id}}"></nz-option>
+            <nz-option nzLabel="{{ per.name }}" nzValue="{{ per.id }}"></nz-option>
           </ng-container>
         </nz-select>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-label [nzSm]="6" [nzXs]="24">{{'address'|translate}}</nz-form-label>
+    <nz-form-label [nzSm]="6" [nzXs]="24">{{ 'address' | translate }}</nz-form-label>
     <nz-form-control [nzSm]="14" [nzXs]="24">
-      <input [(ngModel)]="depart.address" name="address" nz-input maxlength=100/>
+      <input [(ngModel)]="depart.address" name="address" nz-input maxlength="100" />
     </nz-form-control>
   </nz-form-item>
   <nz-form-item>
-    <nz-form-label [nzSm]="6" [nzXs]="24">{{'memo'|translate}}</nz-form-label>
+    <nz-form-label [nzSm]="6" [nzXs]="24">{{ 'memo' | translate }}</nz-form-label>
     <nz-form-control [nzSm]="14" [nzXs]="24">
       <textarea [(ngModel)]="depart.memo" name="memo" nz-input [nzAutosize]="{ minRows: 2, maxRows: 6 }"></textarea>
     </nz-form-control>
   </nz-form-item>
   <div class="footer">
-    <button type="button" (click)="close()" class="ant-btn" style="margin-right: 8px;"><span>{{'button.close'|translate}}</span></button>
-    <button type="button" (click)="save()" class="ant-btn ant-btn-primary"><span>{{'button.save'|translate}}</span></button>
+    <button type="button" (click)="close()" class="ant-btn" style="margin-right: 8px;">
+      <span>{{ 'button.close' | translate }}</span>
+    </button>
+    <button type="button" (click)="save()" class="ant-btn ant-btn-primary">
+      <span>{{ 'button.save' | translate }}</span>
+    </button>
   </div>
-</form>
+</form>

+ 63 - 57
src/app/routes/system/depart/add/add.component.ts

@@ -24,44 +24,43 @@ import { messageShared } from '@shared/utils/message';
         left: 0px;
         background: #fff;
       }
-    `
-  ]
+    `,
+  ],
 })
 export class SystemDepartAddComponent implements OnInit {
+  @Input() isOne = 0; //标题
+  @Input() departId = ''; //部门id
+  listDepart = []; //部门集合
+  listPersonnel = []; //人员集合
 
-  @Input() isOne=0;//标题
-  @Input() departId = "";//部门id
-  listDepart = [];//部门集合
-  listPersonnel=[];//人员集合
-
-
-  depart:Depart={//初始化部门对象
-    parentId: "",
-    departName: "",
+  depart: Depart = {
+    //初始化部门对象
+    parentId: '',
+    departName: '',
     departOrder: 0,
-    mobile: "",
-    address: "",
-    memo: "",
-    fax: "",
-    pkPersonnel:"",
-    type:""
-  };//部门对象
+    mobile: '',
+    address: '',
+    memo: '',
+    fax: '',
+    pkPersonnel: '',
+    type: '',
+  }; //部门对象
 
   constructor(
     private nzDrawerRef: NzDrawerRef,
-    private departService: DepartService,//部门service
+    private departService: DepartService, //部门service
     private message: NzMessageService,
     private notification: NzNotificationService,
-    private personnelService:PersonnelService,
-    private i18NService: I18NService
-  ) { }
+    private personnelService: PersonnelService,
+    private i18NService: I18NService,
+  ) {}
 
   ngOnInit(): void {
-    console.log(this.listDepart)
-    if(this.isOne==2){
+    console.log(this.listDepart);
+    if (this.isOne == 2) {
       this.getById();
-    }else{
-      this.depart.parentId=this.departId
+    } else {
+      this.depart.parentId = this.departId;
       // this.depart = {}
     }
     this.getAllDepart();
@@ -69,58 +68,65 @@ export class SystemDepartAddComponent implements OnInit {
   }
 
   //查询全部人员
-  getListPersonnel(){
-    var page=new Page();
-    page.pageSize=500;
-    this.personnelService.getAllPersonnel(page).then((response)=>{
-      this.listPersonnel=response.result.records
+  getListPersonnel() {
+    var page = new Page();
+    page.pageSize = 500;
+    this.personnelService.getAllPersonnel(page).then(response => {
+      this.listPersonnel = response.result.records;
     });
   }
   //全部部门
-  getAllDepart(){
+  getAllDepart() {
     // var page =new Page();
     // page.pageSize=500;
-    var depart=new Depart();
-    depart.id=this.departId;
-    this.departService.queryByNotParentId(depart).then((response)=>{
-      this.listDepart=response.result
+    var depart = new Depart();
+    depart.id = this.departId;
+    this.departService.queryByNotParentId(depart).then(response => {
+      this.listDepart = response.result;
     });
   }
 
   //根据id查询
-  getById(){
-    this.departService.getById(this.departId).then((response)=>{
-      this.depart=response.result
-    })
+  getById() {
+    this.departService.getById(this.departId).then(response => {
+      this.depart = response.result;
+    });
   }
 
   //添加部门
   save() {
-    if(this.isOne==2){
+    if (this.isOne == 2) {
       //修改
-      this.departService.updateDepart(this.depart).then((respon) => {
+      this.departService.updateDepart(this.depart).then(respon => {
         if (respon.success) {
-          this.notification.success(this.i18NService.fanyi("successful.revision"),"");
-          this.nzDrawerRef.close(true);//参数用于判断关闭抽屉是否刷新树列表
+          this.notification.success(this.i18NService.fanyi('successful.revision'), '');
+          this.nzDrawerRef.close(true); //参数用于判断关闭抽屉是否刷新树列表
         } else {
-          this.notification.error(this.i18NService.fanyi("modification.failed"),messageShared(this.i18NService,respon.message));
+          this.notification.error(
+            this.i18NService.fanyi('modification.failed'),
+            messageShared(this.i18NService, respon.message),
+          );
         }
-      })
-    }else{
+      });
+    } else {
       //添加
-      if(this.isOne==0){
-        this.depart.type="1";
-      }else{
-        this.depart.type="2";
+      if (this.isOne == 0) {
+        this.depart.type = '1';
+      } else {
+        this.depart.type = '2';
       }
-      this.departService.addDepart(this.depart).then((response) => {
-        if (response.success) {//判断添加成功
-          this.notification.success(this.i18NService.fanyi("insert.success"),"");
-          this.nzDrawerRef.close(true);//参数用于判断关闭抽屉是否刷新树列表
+      this.departService.addDepart(this.depart).then(response => {
+        if (response.success) {
+          //判断添加成功
+          this.notification.success(this.i18NService.fanyi('insert.success'), '');
+          this.nzDrawerRef.close(true); //参数用于判断关闭抽屉是否刷新树列表
         } else {
-          this.notification.error(this.i18NService.fanyi("insert.defeated"),messageShared(this.i18NService,response.message));
+          this.notification.error(
+            this.i18NService.fanyi('insert.defeated'),
+            messageShared(this.i18NService, response.message),
+          );
         }
-      })
+      });
     }
   }
 

+ 82 - 58
src/app/routes/system/depart/depart.component.html

@@ -2,8 +2,9 @@
   <ng-template #phActionTpl>
     <span id="titleAdd" hidden="true">{{ 'button.add' | translate }}{{ 'personnel' | translate }}</span>
     <span id="titleUpdate" hidden="true">{{ 'table.update' | translate }}{{ 'personnel' | translate }}</span>
-    <button nz-button nzType="primary"
-      (click)="editPersonnel('')">{{'button.add'|translate}}{{'personnel'|translate}}</button>
+    <button nz-button nzType="primary" (click)="editPersonnel('')">
+      {{ 'button.add' | translate }}{{ 'personnel' | translate }}
+    </button>
   </ng-template>
 </page-header>
 
@@ -13,18 +14,22 @@
   <!--左边card-->
   <div nz-col nzMd="24" nzLg="6">
     <nz-card>
-      <!--按钮操作-->
+      <!--添加一级-->
       <div nz-row [nzGutter]="24" style="margin-bottom: 10px;">
         <div nz-col nzMd="24" nzLg="24">
-          <button nz-button nzType="primary" (click)="addDepar(0)">{{'button.leve.one'|translate}}</button>
+          <button nz-button nzType="primary" (click)="addDepar(0)">{{ 'button.leve.one' | translate }}</button>
         </div>
       </div>
-      <!--搜索-->
+      <!--搜索-->
       <div nz-row [nzGutter]="24">
         <div nz-col nzMd="24" nzLg="24">
           <nz-input-group [nzSuffix]="suffixIcon" style="width:100%">
-            <input type="text" nz-input placeholder="{{'placeholder'|translate}}{{'depart.name'|translate}}"
-              [(ngModel)]="searchValue" />
+            <input
+              type="text"
+              nz-input
+              placeholder="{{ 'placeholder' | translate }}{{ 'depart.name' | translate }}"
+              [(ngModel)]="searchValue"
+            />
           </nz-input-group>
           <ng-template #suffixIcon>
             <i nz-icon type="search"></i>
@@ -34,22 +39,26 @@
       <!--树形体-->
       <div nz-row [nzGutter]="24">
         <div nz-col nzMd="24" nzLg="24">
-          <nz-tree [nzData]="nodes"  [nzSearchValue]="searchValue" (nzClick)="treeClick($event)"
-            (nzDblClick)="openFolder($event)">
+          <nz-tree
+            [nzData]="nodes"
+            [nzSearchValue]="searchValue"
+            (nzClick)="treeClick($event)"
+            (nzDblClick)="openFolder($event)"
+          >
             <ng-template #contextTemplate>
               <ul nz-menu nzInDropDown>
-                <li nz-menu-item (click)="addDepar(1)">{{'button.add'|translate}}</li>
-                <li nz-menu-item (click)="addDepar(2)">{{'table.update'|translate}}</li>
-                <li nz-menu-item (click)="deleteDepart()">{{'table.delete'|translate}}</li>
-                <li nz-menu-item (click)="cancel()">{{'button.cancel'|translate}}</li>
+                <li nz-menu-item (click)="addDepar(1)">{{ 'button.add' | translate }}</li>
+                <li nz-menu-item (click)="addDepar(2)">{{ 'table.update' | translate }}</li>
+                <li nz-menu-item (click)="deleteDepart()">{{ 'table.delete' | translate }}</li>
+                <li nz-menu-item (click)="cancel()">{{ 'button.cancel' | translate }}</li>
               </ul>
             </ng-template>
             <ng-template #nzTreeTemplate let-node>
               <span class="custom-node">
-                <span *ngIf="!node.isLeaf" (contextmenu)="contextMenu(node.key,$event, contextTemplate)">
+                <span *ngIf="!node.isLeaf" (contextmenu)="contextMenu(node.key, $event, contextTemplate)">
                   <span class="folder-name">{{ node.title }}</span>
                 </span>
-                <span *ngIf="node.isLeaf" (contextmenu)="contextMenu(node.key,$event, contextTemplate)">
+                <span *ngIf="node.isLeaf" (contextmenu)="contextMenu(node.key, $event, contextTemplate)">
                   <span class="file-name">{{ node.title }}</span>
                 </span>
               </span>
@@ -63,32 +72,41 @@
   <div nz-col nzMd="24" nzLg="18">
     <nz-card>
       <form>
-      <!--查询条件-->
-      <div nz-row nzGutter="24">
-        <div nz-col nzMd="24" nzLg="3">
-          <nz-form-label>{{ 'personnel.code' | translate }}</nz-form-label>
-        </div>
-        <div nz-col nzMd="24" nzLg="6">
-          <input nz-input [(ngModel)]="personnl.code" name="code">
-        </div>
-        <div nz-col nzMd="24" nzLg="3">
-          <nz-form-label>{{ 'personnel.name' | translate }}</nz-form-label>
-        </div>
-        <div nz-col nzMd="24" nzLg="6">
-          <input nz-input [(ngModel)]="personnl.name" name="name">
+        <!--查询条件-->
+        <div nz-row nzGutter="24">
+          <div nz-col nzMd="24" nzLg="3">
+            <nz-form-label>{{ 'personnel.code' | translate }}</nz-form-label>
+          </div>
+          <div nz-col nzMd="24" nzLg="6">
+            <input nz-input [(ngModel)]="personnl.code" name="code" />
+          </div>
+          <div nz-col nzMd="24" nzLg="3">
+            <nz-form-label>{{ 'personnel.name' | translate }}</nz-form-label>
+          </div>
+          <div nz-col nzMd="24" nzLg="6">
+            <input nz-input [(ngModel)]="personnl.name" name="name" />
+          </div>
+          <div nz-col nzMd="24" nzLg="6">
+            <button (click)="query()" nz-button nzType="primary">{{ 'button.query' | translate }}</button>
+            <button (click)="rest()" nz-button nzType="primary">{{ 'button.reset' | translate }}</button>
+          </div>
         </div>
-        <div nz-col nzMd="24" nzLg="6">
-          <button (click)="query()" nz-button nzType="primary">{{ 'button.query' | translate }}</button>
-          <button (click)="rest()" nz-button nzType="primary">{{ 'button.reset' | translate }}</button>
-        </div>
-      </div>
-    </form>
+      </form>
       <!-- 人员数据表 -->
       <div nz-row nzGutter="24">
         <div nz-col nzMd="24" nzLg="24">
-          <nz-table  class="tableTdPadding" nzSize="small" #basicTable [nzData]="listOfData" [nzFrontPagination]="false" [nzTotal]="page.total"
-            [nzPageIndex]="page.current" (nzPageIndexChange)="pageIndexChange($event)" [nzLoading]="isSpinning"
-            [nzScroll]="{x:'70vw'}">
+          <nz-table
+            class="tableTdPadding"
+            nzSize="small"
+            #basicTable
+            [nzData]="listOfData"
+            [nzFrontPagination]="false"
+            [nzTotal]="page.total"
+            [nzPageIndex]="page.current"
+            (nzPageIndexChange)="pageIndexChange($event)"
+            [nzLoading]="isSpinning"
+            [nzScroll]="{ x: '70vw' }"
+          >
             <thead>
               <tr>
                 <th nzWidth="8vw" nzLeft="0px" nzAlign="center">{{ 'personnel.code' | translate }}</th>
@@ -108,32 +126,32 @@
                 <td nzAlign="center" nzLeft="8vw">{{ data.name }}</td>
                 <!-- 性别 -->
                 <!-- <td nzAlign="center"> -->
-                  <!-- 男 -->
-                  <!-- <nz-tag *ngIf="data.gender==='0'" [nzColor]="'blue'">{{'male'|translate}}</nz-tag> -->
-                  <!-- 女 -->
-                  <!-- <nz-tag *ngIf="data.gender==='1'" [nzColor]="'magenta'">{{'female'|translate}}</nz-tag>
+                <!-- 男 -->
+                <!-- <nz-tag *ngIf="data.gender==='0'" [nzColor]="'blue'">{{'male'|translate}}</nz-tag> -->
+                <!-- 女 -->
+                <!-- <nz-tag *ngIf="data.gender==='1'" [nzColor]="'magenta'">{{'female'|translate}}</nz-tag>
                 </td> -->
                 <td nzAlign="center">{{ data.orgName }}</td>
                 <td nzAlign="center">{{ data.departName }}</td>
                 <td nzAlign="center">{{ data.namePersonnel }}</td>
                 <td nzAlign="center">{{ data.email }}</td>
                 <td nzAlign="center">
-                  <ng-container *ngIf="data.status==1">
-                    {{'state.stay'| translate}}
+                  <ng-container *ngIf="data.status == 1">
+                    {{ 'state.stay' | translate }}
                   </ng-container>
-                  <ng-container *ngIf="data.status==2">
-                    {{'state.leave'| translate}}
+                  <ng-container *ngIf="data.status == 2">
+                    {{ 'state.leave' | translate }}
                   </ng-container>
-                  <ng-container *ngIf="data.status==3">
-                    {{'state.vacation'| translate}}
+                  <ng-container *ngIf="data.status == 3">
+                    {{ 'state.vacation' | translate }}
                   </ng-container>
                 </td>
                 <!-- 是否停用 -->
                 <td nzAlign="center">
                   <!-- 否 -->
-                  <nz-tag *ngIf="data.enable==='0'" [nzColor]="'green'">{{'no'|translate}}</nz-tag>
+                  <nz-tag *ngIf="data.enable === '0'" [nzColor]="'green'">{{ 'no' | translate }}</nz-tag>
                   <!-- 是 -->
-                  <nz-tag *ngIf="data.enable==='1'" [nzColor]="'red'">{{'yes'|translate}}</nz-tag>
+                  <nz-tag *ngIf="data.enable === '1'" [nzColor]="'red'">{{ 'yes' | translate }}</nz-tag>
                   <!-- <ng-container *ngIf="data.enable==0">
                     {{'no'| translate}}
                   </ng-container>
@@ -142,20 +160,27 @@
                   </ng-container> -->
                 </td>
                 <td nzAlign="center" nzRight="0px" style="width: 10%;">
-                  <a href="javascript:void(0);"
-                    (click)="openDetailsComponent(data.id)">{{ 'table.view' | translate }}</a>
+                  <a href="javascript:void(0);" (click)="openDetailsComponent(data.id)">{{
+                    'table.view' | translate
+                  }}</a>
                   <nz-divider nzType="vertical"></nz-divider>
                   <nz-dropdown>
-                    <a nz-dropdown>&nbsp;{{'hospital.operation.more' | translate}}<i nz-icon type="down"></i> </a>
+                    <a nz-dropdown>&nbsp;{{ 'hospital.operation.more' | translate }}<i nz-icon type="down"></i> </a>
                     <ul nz-menu nzSelectable>
                       <li nz-menu-item>
-                        <a href="javascript:void(0);"
-                          (click)="editPersonnel(data.id)">{{ 'table.update' | translate }}</a>
+                        <a href="javascript:void(0);" (click)="editPersonnel(data.id)">{{
+                          'table.update' | translate
+                        }}</a>
                       </li>
                       <li nz-menu-item>
-                        <a nz-popconfirm nzTitle="{{'isdelete' | translate}}" nzOkText="{{ 'yes' | translate }}"
+                        <a
+                          nz-popconfirm
+                          nzTitle="{{ 'isdelete' | translate }}"
+                          nzOkText="{{ 'yes' | translate }}"
                           nzCancelText="{{ 'no' | translate }}"
-                          (nzOnConfirm)="deletePersonnel(data.id)">{{ 'table.delete' | translate }}</a>
+                          (nzOnConfirm)="deletePersonnel(data.id)"
+                          >{{ 'table.delete' | translate }}</a
+                        >
                       </li>
                     </ul>
                   </nz-dropdown>
@@ -165,7 +190,6 @@
           </nz-table>
         </div>
       </div>
-
     </nz-card>
   </div>
-</div>
+</div>

+ 2 - 1
src/assets/tmp/i18n/zh-CN.json

@@ -602,6 +602,7 @@
   "milestone.Creatin.time": "创建时间",
   "milestone.please.input": "请输入",
   "milestone.serial.number": "序号",
+  "milestone.milestone": "里程碑",
   "milestone.milestone.description": "里程碑描述",
   "milestone.milestone.type": "里程碑类型",
   "milestone.schedule": "权重",
@@ -1110,7 +1111,7 @@
   "their.fees.contract.specification": "合同说明",
   "indent.their.fees.money": "订单金额",
   "no.ticket.money": "未收票金额",
-  "this..ticket.money": "本次收票金额",
+  "this.ticket.money": "本次收票金额",
   "their.fees.money": "金额",
   "transfer.amount": "转账金额",
   "payee.name": "收款人姓名",