Browse Source

翻译时的小错误修正

liangyan0105 3 years ago
parent
commit
5c51dc05ea

+ 9 - 6
src/app/routes/basedata/milestone-category/milestone-category.component.html

@@ -17,16 +17,19 @@
   >
     <thead>
       <tr>
-        <th nzAlign="center">{{ 'contract.name' | translate }}</th>
-        <th nzAlign="center">{{ 'data.value' | translate }}</th>
-        <th nzAlign="center" style="width: 21%">{{ 'table.operation' | translate }}</th>
+        <!-- 名称 -->
+        <th>{{ 'contract.name' | translate }}</th>
+        <!-- 数据值 -->
+        <th>{{ 'data.value' | translate }}</th>
+        <!-- 操作 -->
+        <th style="width: 21%">{{ 'table.operation' | translate }}</th>
       </tr>
     </thead>
     <tbody>
       <tr *ngFor="let data of basicTable.data">
-        <td nzAlign="center">{{ data.itemText }}</td>
-        <td nzAlign="center">{{ data.itemValue }}</td>
-        <td nzAlign="center">
+        <td>{{ data.itemText }}</td>
+        <td>{{ data.itemValue }}</td>
+        <td>
           <a href="javascript:void(0);" (click)="edit(data)">{{ 'table.update' | translate }}</a>
           <nz-divider nzType="vertical"></nz-divider>
           <a href="javascript:void(0);" (click)="delete(data.id)">{{ 'table.delete' | translate }}</a>

+ 1 - 1
src/app/routes/down-payment-management/payment-slip/payment-slip.component.html

@@ -2,7 +2,7 @@
   <ng-template #phActionTpl>
     <!-- 新建 -->
     <button (click)="add()" nz-button nzType="primary" acl [acl-ability]="'payment-slip:add'">
-      {{ 'cost.new | translate }}
+      {{ 'cost.new' | translate }}
     </button>
   </ng-template>
 </page-header>

+ 3 - 1
src/app/routes/down-payment-management/receipt/receipt.component.html

@@ -3,7 +3,7 @@
   <ng-template #phActionTpl>
     <!-- 新建 -->
     <button (click)="add()" nz-button nzType="primary" acl [acl-ability]="'receipt:add'">
-      {{ 'cost.new | translate }}
+      {{ 'cost.new' | translate }}
     </button>
   </ng-template>
 </page-header>
@@ -75,11 +75,13 @@
                 {{ 'table.view' | translate }}
               </a>
               <nz-divider nzType="vertical" acl [acl-ability]="'receipt:update'"></nz-divider>
+
               <!-- 修改 -->
               <a (click)="update(data)" acl [acl-ability]="'receipt:update'">
                 {{ 'table.update' | translate }}
               </a>
               <nz-divider nzType="vertical" acl [acl-ability]="'receipt:update'"></nz-divider>
+              
               <!-- 删除 -->
               <a (click)="delete(data.id)" acl [acl-ability]="'receipt:delete'">
                 {{ 'table.delete' | translate }}

+ 81 - 50
src/app/routes/expense-reimbursement/expense-reimbursement-form/expense-reimbursement-form.component.html

@@ -1,60 +1,91 @@
 <page-header [action]="phActionTpl">
   <ng-template #phActionTpl>
-    <button (click)="add()" nz-button nzType="primary" acl [acl-ability]="'expense-reimbursement-form:add'">新建</button>
+    <!-- 新建 -->
+    <button (click)="add()" nz-button nzType="primary" acl [acl-ability]="'expense-reimbursement-form:add'">
+      {{ 'new' | translate }}
+    </button>
   </ng-template>
 </page-header>
 <nz-card>
   <!-- 查询条件 -->
- <form nz-form>
-  <div nz-row [nzGutter]="{ xs: 8, sm: 16, md: 24, lg: 32 }">
-    <div nz-col [nzSpan]="8">
-      <nz-form-item>
-        <nz-form-label [nzSm]="6" [nzXs]="24">项目名称</nz-form-label>
-        <nz-form-control [nzSm]="14" [nzXs]="24">
-          <!-- <input nz-input name="code" [(ngModel)]="reExpenseSlip.billcode" /> -->
-        </nz-form-control>
-      </nz-form-item>
+  <form nz-form>
+    <div nz-row [nzGutter]="{ xs: 8, sm: 16, md: 24, lg: 32 }">
+      <div nz-col [nzSpan]="8">
+        <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-item>
+      </div>
+      <div nz-col [nzSpan]="8">
+        <nz-form-item>
+          <nz-form-label [nzSm]="2" [nzXs]="24" [nzNoColon]="true"></nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24">
+            <!-- 查询 -->
+            <button nzType="primary" (click)="query()" nz-button>
+              <span>
+                {{ 'store.search' | translate }}
+              </span>
+            </button>
+          </nz-form-control>
+        </nz-form-item>
+      </div>
     </div>
-    <div nz-col [nzSpan]="8">
-      <nz-form-item>
-        <nz-form-label [nzSm]="2" [nzXs]="24" [nzNoColon]=true></nz-form-label>
-        <nz-form-control [nzSm]="14" [nzXs]="24">
-          <button nzType="primary" (click)="query()" nz-button><span>查询</span></button>
-        </nz-form-control>
-      </nz-form-item>
+  </form>
+  <!-- 表格 -->
+  <div nz-row [nzGutter]="{ xs: 8, sm: 16, md: 24, lg: 32 }">
+    <div nz-col [nzSpan]="24">
+      <nz-table
+        nzSize="small"
+        #basicTable
+        [nzData]="listOfData"
+        [nzFrontPagination]="false"
+        [nzTotal]="page.total"
+        [nzPageIndex]="page.current"
+        (nzPageIndexChange)="pageIndexChange($event)"
+        [nzLoading]="isSpinning"
+      >
+        <thead>
+          <tr>
+            <!-- 人员 -->
+            <th>{{ 'personnel' | translate }}</th>
+
+            <!-- 日期 -->
+            <th>{{ 'Date' | translate }}</th>
+
+            <!-- 项目 -->
+            <th>{{ 'project' | translate }}</th>
+
+            <!-- 制单人 -->
+            <th>{{ 'pm.quotation.Single.person' | translate }}</th>
+
+            <!-- 操作 -->
+            <th>{{ 'table.operation' | translate }}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of basicTable.data">
+            <td>{{ data.person }}</td>
+            <td>{{ data.date }}</td>
+            <td>{{ data.proName }}</td>
+            <td>{{ data.producer }}</td>
+            <td>
+              <!-- 详情  修改  删除 -->
+              <a (click)="view(data)" acl [acl-ability]="'expense-reimbursement-form:view'">
+                {{ 'table.view' | translate }}
+              </a>
+              <nz-divider nzType="vertical" acl [acl-ability]="'expense-reimbursement-form:view'"></nz-divider>
+              <a (click)="update(data)" acl [acl-ability]="'expense-reimbursement-form:update'">
+                {{ 'table.update' | translate }}
+              </a>
+              <nz-divider nzType="vertical" acl [acl-ability]="'expense-reimbursement-form:update'"></nz-divider>
+              <a (click)="delete(data.id)" acl [acl-ability]="'expense-reimbursement-form:delete'">
+                {{ 'table.delete' | translate }}
+              </a>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
     </div>
   </div>
-</form>
- <!-- 表格 -->
- <div nz-row [nzGutter]="{ xs: 8, sm: 16, md: 24, lg: 32 }">
-  <div nz-col [nzSpan]="24">
-    <nz-table nzSize="small" #basicTable [nzData]="listOfData" [nzFrontPagination]="false" [nzTotal]="page.total"
-      [nzPageIndex]="page.current" (nzPageIndexChange)="pageIndexChange($event)" [nzLoading]="isSpinning">
-      <thead>
-        <tr>
-          <th>人员</th>
-          <th>日期</th>
-          <th>项目</th>
-          <th>制单人</th>
-          <th>操作</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr *ngFor="let data of basicTable.data">
-          <td>{{ data.person }}</td>
-          <td>{{ data.date }}</td>
-          <td>{{ data.proName }}</td>
-          <td>{{ data.producer }}</td>
-          <td>
-            <a (click)="view(data)" acl [acl-ability]="'expense-reimbursement-form:view'">详情</a>
-            <nz-divider nzType="vertical" acl [acl-ability]="'expense-reimbursement-form:view'"></nz-divider>
-            <a (click)="update(data)" acl [acl-ability]="'expense-reimbursement-form:update'">修改</a>
-            <nz-divider nzType="vertical" acl [acl-ability]="'expense-reimbursement-form:update'"></nz-divider>
-            <a (click)="delete(data.id)" acl [acl-ability]="'expense-reimbursement-form:delete'">删除</a>
-          </td>
-        </tr>
-      </tbody>
-    </nz-table>
-  </div>
-</div>
 </nz-card>

+ 1 - 1
src/app/routes/invoice-management/invoice-manage-purchase/invoice-manage-purchase.component.html

@@ -3,7 +3,7 @@
   <ng-template #phActionTpl>
     <!-- 新建 -->
     <button (click)="add()" nz-button nzType="primary" acl [acl-ability]="'invoice-manage-purchase:add'">
-      {{ 'cost.new | translate }}
+      {{ 'cost.new' | translate }}
     </button>
   </ng-template>
 </page-header>

+ 4 - 2
src/app/routes/invoice-management/invoice-sales/add/add.component.html

@@ -23,7 +23,7 @@
       <div nz-col [nzSpan]="8">
         <nz-form-item>
           <!-- 项目名称 -->
-          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>{ 'cost.item.name' | translate }}</nz-form-label>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>{{ 'cost.item.name' | translate }}</nz-form-label>
           <nz-form-control [nzSm]="14" [nzXs]="24">
             <nz-select
               style="widows: 100%;"
@@ -53,7 +53,9 @@
     <div nz-row [nzGutter]="24">
       <div nz-col [nzSpan]="24">
         <!-- 新增按钮 -->
-        <button (click)="addRow()" nz-button nzType="primary">{{ 'button.add' | translate }}</button>
+        <button (click)="addRow()" nz-button nzType="primary">
+          {{ 'button.add' | translate }}
+        </button>
       </div>
     </div>
     <div nz-row [nzGutter]="24">

+ 1 - 1
src/app/routes/invoice-management/invoice-sales/invoice-sales.component.html

@@ -3,7 +3,7 @@
   <ng-template #phActionTpl>
     <!-- 新建 -->
     <button (click)="add()" nz-button nzType="primary" acl [acl-ability]="'invoice-sales:add'">
-      {{ 'cost.new | translate }}
+      {{ 'cost.new' | translate }}
     </button>
   </ng-template>
 </page-header>

+ 5 - 1
src/app/routes/project-manage-archives/list/list.component.html

@@ -6,6 +6,7 @@
     </button>
   </ng-template>
 </page-header>
+
 <nz-card>
   <!-- 查询条件 -->
   <form nz-form>
@@ -21,10 +22,13 @@
           </nz-form-control>
         </nz-form-item>
       </div>
+      
       <div nz-col [nzSpan]="8">
         <nz-form-item>
           <!-- 项目名称 -->
-          <nz-form-label [nzSm]="6" [nzXs]="24">{{ 'cost.item.name' | translate }}</nz-form-label>
+          <nz-form-label [nzSm]="6" [nzXs]="24">
+            {{ 'cost.item.name' | translate }}
+          </nz-form-label>
           <nz-form-control [nzSm]="14" [nzXs]="24">
             <input nz-input name="name" [(ngModel)]="projectManageArchives.proName" />
           </nz-form-control>

+ 0 - 1
src/app/routes/project-manage-archives/update/serviceta/serviceta.component.html

@@ -53,7 +53,6 @@
           <td>{{ 'the.fifth' | translate }}</td>
           <td>{{ remittanceInformation.price5 }}</td>
         </tr>
-      </tr>
       <tr>
         <!--实际回款  -->
         <td>

+ 5 - 4
src/app/routes/project-work/implementation-log/add/add.component.html

@@ -41,7 +41,7 @@
             </nz-select>
             <nz-form-explain *ngIf="validateForm.get('proId')?.dirty && validateForm.get('proId')?.errors">
               <!-- 请选择项目名称 -->
-              { 'select.please.choose' | translate }}{{ 'cost.item.name' | translate }}
+              {{ 'select.please.choose' | translate }}{{ 'cost.item.name' | translate }}
             </nz-form-explain>
           </nz-form-control>
         </nz-form-item>
@@ -184,8 +184,9 @@
                   nz-popconfirm
                   nzTitle="{{ 'table.Whether.to.delete' | translate }}?"
                   (nzOnConfirm)="deleteRow(data.sort)"
-                  >{{ 'table.delete' | translate }}</a
                 >
+                  {{ 'table.delete' | translate }}
+                </a>
               </td>
             </tr>
           </tbody>
@@ -198,10 +199,10 @@
 <div class="base">
   <!-- 填写人 -->
   <strong>{{ 'fill.person' | translate }}:</strong>{{ proWorkLogic.currentUser }}
-  
+
   <!-- 填写时间 -->
   <strong>{{ 'fill.time' | translate }}:</strong>{{ proWorkLogic.createTime }}
-  
+
   <!-- 关闭按钮 -->
   <a
     nz-popconfirm

+ 2 - 4
src/app/routes/report-form/project-situation/project-situation.component.html

@@ -14,8 +14,7 @@
       <div nz-col [nzSpan]="8">
         <nz-form-item>
           <!--  项目名称-->
-          <nz-form-label [nzSm]="6" [nzXs]="24">{{'cost.item.name'
-            translate}}</nz-form-label>
+          <nz-form-label [nzSm]="6" [nzXs]="24">{{'cost.item.name' | translate}}</nz-form-label>
           <nz-form-control [nzSm]="14" [nzXs]="24">
             <input nz-input name="proArchivesName" [(ngModel)]="projectStatisticsWhere.proArchivesName" />
           </nz-form-control>
@@ -54,8 +53,7 @@
 
             <!-- 项目名称 -->
             <th nzWidth="150px" nzLeft="173px">
-              {{'cost.item.name'
-              translate}}
+              {{ 'cost.item.name' | translate }}
             </th>
 
             <!-- 项目组成员 -->

+ 2 - 2
src/app/routes/report-form/project-statistics/project-statistics.component.html

@@ -15,7 +15,7 @@
         <nz-form-item>
           <!-- 项目名称 -->
           <nz-form-label [nzSm]="6" [nzXs]="24">
-            {{'cost.item.name'translate}}
+            {{'cost.item.name' | translate}}
           </nz-form-label>
           <nz-form-control [nzSm]="14" [nzXs]="24">
             <input nz-input name="proArchivesName" [(ngModel)]="projectStatisticsWhere.proArchivesName" />
@@ -69,7 +69,7 @@
             <th rowSpan="2" nzWidth="170px">{{ 'project.code' | translate }}</th>
 
             <!--项目名称  -->
-            <th rowSpan="2" nzWidth="150px">{{'cost.item.name'translate}}</th>
+            <th rowSpan="2" nzWidth="150px">{{'cost.item.name' | translate}}</th>
 
             <!-- 产品 -->
             <th nzWidth="100px">{{ 'product' | translate }}</th>

+ 51 - 33
src/app/routes/system/dict/dict.component.html

@@ -1,57 +1,75 @@
 <page-header [action]="phActionTpl">
   <ng-template #phActionTpl>
-    <button (click)="add()" nz-button nzType="primary">{{'add'|translate}}</button>
+    <button (click)="add()" nz-button nzType="primary">{{ 'add' | translate }}</button>
     <!-- <button nz-button nzType="primary" >导出</button>
         <button nz-button nzType="primary">导入</button> -->
   </ng-template>
 </page-header>
 <nz-card>
-
   <!--查询条件-->
   <form>
-  <div nz-row nzGutter="24">
-    <div nz-col nzMd="24" nzLg="2">
-      <nz-form-label>{{'dictionary.name'|translate}}</nz-form-label>
-    </div>
-    <div nz-col nzMd="24" nzLg="6">
-      <input nz-input [(ngModel)]="dict.dictName" name="dictName">
-    </div>
-    <div nz-col nzMd="24" nzLg="2">
-      <nz-form-label>{{'dictionary.code'|translate}}</nz-form-label>
-    </div>
-    <div nz-col nzMd="24" nzLg="6">
-      <input nz-input [(ngModel)]="dict.dictCode" name="dictCode">
+    <div nz-row nzGutter="24">
+      <div nz-col nzMd="24" nzLg="2">
+        <nz-form-label>{{ 'dictionary.name' | translate }}</nz-form-label>
+      </div>
+      <div nz-col nzMd="24" nzLg="6">
+        <input nz-input [(ngModel)]="dict.dictName" name="dictName" />
+      </div>
+      <div nz-col nzMd="24" nzLg="2">
+        <nz-form-label>{{ 'dictionary.code' | translate }}</nz-form-label>
+      </div>
+      <div nz-col nzMd="24" nzLg="6">
+        <input nz-input [(ngModel)]="dict.dictCode" name="dictCode" />
+      </div>
+      <div nz-col nzMd="24" nzLg="8">
+        <button (click)="getListDict(1)" nz-button nzType="primary">{{ 'button.query' | translate }}</button>
+      </div>
     </div>
-    <div nz-col nzMd="24" nzLg="8">
-      <button (click)="getListDict(1)" nz-button nzType="primary">{{'button.query'|translate}}</button>
-    </div>
-  </div>
-</form>
-  <nz-table nzSize="small" #basicTable [nzData]="listOfData" [nzFrontPagination]="false" [nzTotal]="page.total"
-    [nzPageIndex]="page.current" (nzPageIndexChange)="pageIndexChange($event)" [nzLoading]="isSpinning">
+  </form>
+  <nz-table
+    nzSize="small"
+    #basicTable
+    [nzData]="listOfData"
+    [nzFrontPagination]="false"
+    [nzTotal]="page.total"
+    [nzPageIndex]="page.current"
+    (nzPageIndexChange)="pageIndexChange($event)"
+    [nzLoading]="isSpinning"
+  >
     <thead>
       <tr>
-        <th nzAlign="center">{{'dictionary.name'|translate}}</th>
-        <th nzAlign="center">{{'dictionary.code'|translate}}</th>
-        <th nzAlign="center">{{'description'|translate}}</th>
-        <th nzAlign="center" style="width: 18%">{{'table.operation'|translate}}</th>
+        <!-- 字典名称 -->
+        <th >{{ 'dictionary.name' | translate }}</th>
+        <!-- 字典编码 -->
+        <th >{{ 'dictionary.code' | translate }}</th>
+        <!-- 描述 -->
+        <th >{{ 'description' | translate }}</th>
+        <!-- 操作 -->
+        <th  style="width: 18%">{{ 'table.operation' | translate }}</th>
       </tr>
     </thead>
+
     <tbody>
       <tr *ngFor="let data of basicTable.data">
-        <td nzAlign="center">{{ data.dictName }}</td>
-        <td nzAlign="center">{{ data.dictCode }}</td>
-        <td nzAlign="center">{{ data.description }}</td>
-        <td nzAlign="center">
-          <a href="javascript:void(0);" (click)="update(data.id)">{{'edit'|translate}}</a>
+        <td >{{ data.dictName }}</td>
+        <td >{{ data.dictCode }}</td>
+        <td >{{ data.description }}</td>
+        <td>
+          <a href="javascript:void(0);" (click)="update(data.id)">{{ 'edit' | translate }}</a>
           <nz-divider nzType="vertical"></nz-divider>
-          <a href="javascript:void(0);" (click)="config(data)">{{'dictionary.configuration'|translate}}</a>
+          <a href="javascript:void(0);" (click)="config(data)">{{ 'dictionary.configuration' | translate }}</a>
           <nz-divider nzType="vertical"></nz-divider>
-          <a nz-popconfirm nzTitle="{{'confirm.to.delete'|translate}}?" nzOkText="{{'yes'|translate}}" nzCancelText="{{'no'|translate}}" (nzOnConfirm)="delete(data.id)">{{'table.delete'|translate}}</a>
+          <a
+            nz-popconfirm
+            nzTitle="{{ 'confirm.to.delete' | translate }}?"
+            nzOkText="{{ 'yes' | translate }}"
+            nzCancelText="{{ 'no' | translate }}"
+            (nzOnConfirm)="delete(data.id)">
+            {{ 'table.delete' | translate }}
+          </a>
         </td>
       </tr>
     </tbody>
   </nz-table>
-
 </nz-card>
 <app-system-dict-config #systemDictConfigComponent></app-system-dict-config>