Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.html

@@ -44,11 +44,13 @@
             [nzLoading]="loading1" [nzScroll]="{ y: tableWechatHeight + 'px' }">
             <thead>
               <tr class="thead">
-                <th nzWidth="20%">排序号</th>
-                <th nzWidth="20%">检查项目标识</th>
-                <th nzWidth="20%">检查项目名称</th>
-                <th nzWidth="20%">检查类型</th>
-                <th nzWidth="20%">操作</th>
+                <th nzWidth="7%">排序号</th>
+                <th nzWidth="12%">检查项目标识</th>
+                <th nzWidth="12%">检查项目名称</th>
+                <th nzWidth="12%">检查类型</th>
+                <th nzWidth="12%">默认检查科室</th>
+                <th nzWidth="30%">检查科室</th>
+                <th nzWidth="15%">操作</th>
               </tr>
             </thead>
             <tbody>
@@ -57,6 +59,8 @@
                 <td>{{data.extra6}}</td>
                 <td>{{data.name}}</td>
                 <td>{{data.extra5DTO?.name}}</td>
+                <td>{{data.extra4DTO?.dept}}</td>
+                <td>{{data.deptList | multipleName: 'dept'}}</td>
                 <td>
                   <div class="coop">
                     <span (click)="showDelModal(data,'您确认要删除吗？','删除','del')">删除</span>

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.ts

@@ -120,15 +120,13 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
       postData = {
         // dictionary: {
           ...this.coopData,
-          ...{
-            orders: this.validateForm.value.orders,
-            name: this.validateForm.value.name,
-            extra6: this.validateForm.value.extra6,
-            value: this.validateForm.value.value,
-            extra4: this.validateForm.value.extra4,
-            extra5: this.validateForm.value.extra5,
-            extra7: this.validateForm.value.extra7.toString(),
-          }
+          orders: this.validateForm.value.orders,
+          name: this.validateForm.value.name,
+          extra6: this.validateForm.value.extra6,
+          value: this.validateForm.value.extra6,
+          extra4: this.validateForm.value.extra4,
+          extra5: this.validateForm.value.extra5,
+          extra7: this.validateForm.value.extra7.toString(),
         // }
       };
     }

src/app/pipes/multiple-name.pipe.ts

@@ -0,0 +1,17 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'multipleName'
+})
+export class MultipleNamePipe implements PipeTransform {
+
+  transform(value: any[], ...args: any[]): any {
+    if(value){
+      return value.map(v => v[args[0]]).toString();
+    }else{
+      return '';
+    }
+
+  }
+
+}

src/app/share/share.module.ts

@@ -35,6 +35,7 @@ import { BatchOrdersComponent } from './batch-orders/batch-orders.component';
 import { CollapseComponent } from './collapse/collapse.component';
 import { CollapsePanelComponent } from './collapse-panel/collapse-panel.component';
 import { HtmlTransformPipe } from '../pipes/html-transform.pipe';
+import { MultipleNamePipe } from '../pipes/multiple-name.pipe';
 import { BxPromptModalComponent } from './bx-prompt-modal/bx-prompt-modal.component';
 import { ExcelExportComponent } from './excel-export/excel-export.component';
 import { ExcelImportComponent } from './excel-import/excel-import.component';
@@ -118,6 +119,7 @@ import { AddInspectThreeModalComponent } from './add-inspect-three-modal/add-ins
     CollapseComponent,
     CollapsePanelComponent,
     HtmlTransformPipe,
+    MultipleNamePipe,
     StripHtmlPipe,
     FilterSelfPipe,
     ExcelExportComponent,
@@ -206,6 +208,7 @@ import { AddInspectThreeModalComponent } from './add-inspect-three-modal/add-ins
     CollapseComponent,
     CollapsePanelComponent,
     HtmlTransformPipe,
+    MultipleNamePipe,
     StripHtmlPipe,
     FilterSelfPipe,
     ExcelExportComponent,

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.html

@@ -70,7 +70,7 @@
 <!-- 打印的内容 -->
 <div id="print-section-package" hidden>
   <!-- 80mm*80mm -->
-  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;height: 80mm;" *ngIf="configs.spePackageCodeSize == 1">
+  <div style="overflow: hidden;padding: 2mm;font-size: 4mm;width: 75mm;height: 75mm;" *ngIf="configs.spePackageCodeSize == 1">
     <div style="display: flex;">
       <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
       <div style="flex: 1;">
@@ -87,7 +87,7 @@
     </div>
   </div>
   <!-- 70mm*50mm -->
-  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 70mm;height: 50mm;" *ngIf="configs.spePackageCodeSize == 2">
+  <div style="overflow: hidden;padding: 2mm;font-size: 4mm;width: 65mm;height: 45mm;" *ngIf="configs.spePackageCodeSize == 2">
     <div style="display: flex;">
       <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
       <div style="flex: 1;">

src/app/views/batch-specimen/batch-specimen.component.html

@@ -80,7 +80,7 @@
 <!-- 打印的内容 -->
 <div id="print-section" hidden>
   <!-- 80mm*80mm -->
-  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;max-height: 80mm;" *ngIf="configs.spePackageCodeSize == 1">
+  <div style="overflow: hidden;padding: 2mm;font-size: 4mm;width: 75mm;height: 75mm;" *ngIf="configs.spePackageCodeSize == 1">
     <div style="display: flex;">
       <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
       <div style="flex: 1;">
@@ -97,9 +97,9 @@
     </div>
   </div>
   <!-- 70mm*50mm -->
-  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 70mm;max-height: 50mm;" *ngIf="configs.spePackageCodeSize == 2">
+  <div style="overflow: hidden;padding: 2mm;font-size: 4mm;width: 65mm;height: 45mm;" *ngIf="configs.spePackageCodeSize == 2">
     <div style="display: flex;">
-      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 1mm;">
+      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
       <div style="flex: 1;">
         <div>包号:{{package.packCode}}</div>
         <div>{{package.packDeptDTO?.dept}}</div>