医废展示单价和总价

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.4.163",
+    "target": "http://192.168.3.108",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/medical-waste-information/medical-waste-information.component.html

@@ -75,11 +75,12 @@
             <th nzWidth="10%">序号</th>
             <th nzWidth="10%">重量（KG）</th>
             <th nzWidth="10%">科室名称</th>
-            <th nzWidth="11%">收取人</th>
-            <th nzWidth="11%">收取时间</th>
-            <th nzWidth="11%">医废状态</th>
-            <th nzWidth="11%">备注</th>
-            <th nzWidth="11%">操作</th>
+            <th nzWidth="10%">收取人</th>
+            <th nzWidth="10%">收取时间</th>
+            <th nzWidth="8%">医废状态</th>
+            <th nzWidth="10%">备注</th>
+            <th nzWidth="7%">总价</th>
+            <th nzWidth="10%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -93,6 +94,7 @@
             <td>{{ data.receiveTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
             <td>{{ data.status ? data.status.name : '' }}</td>
             <td>{{ data.remark }}</td>
+            <td>{{ data.totalPrice }}</td>
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.look" (click)="viewHistory(data)">查看日志</span>

src/app/views/medical-waste-type/medical-waste-type.component.html

@@ -12,15 +12,17 @@
         <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="16%">单价</th>
+            <th nzWidth="16%">单位</th>
+            <th nzWidth="16%">储存单位</th>
+            <th nzWidth="16%">库存限制天数</th>
+            <th nzWidth="16%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{ data.typeName }}</td>
+            <td>{{ data.unitPrice }}</td>
             <td>{{ data.unit ? data.unit.name : '' }}</td>
             <td>{{ data.storageUnit ? data.storageUnit.name : '' }}</td>
             <td>{{ data.inventoryDays }}</td>
@@ -57,6 +59,14 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="unitPrice">单价</nz-form-label>
+          <nz-form-control nzErrorTip="请输入单价!">
+            <nz-input-group>
+              <nz-input-number formControlName="unitPrice" placeholder="请输入单价" [nzMin]="0" [nzStep]="1" [nzPrecision]="2"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
           <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="unit">单位</nz-form-label>
           <nz-form-control nzErrorTip="请选择单位!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear

src/app/views/medical-waste-type/medical-waste-type.component.ts

@@ -114,6 +114,7 @@ export class MedicalWasteTypeComponent implements OnInit {
     this.validateForm = this.fb.group({
       typeName: [null, [Validators.required]],
       inventoryDays: [0, [Validators.required]],
+      unitPrice: [0, [Validators.required]],
       unit: [null, [Validators.required]],
       storageUnit: [null, [Validators.required]],
     });
@@ -130,6 +131,7 @@ export class MedicalWasteTypeComponent implements OnInit {
     let data:any = {
       typeName: that.validateForm.value.typeName,
       inventoryDays: that.validateForm.value.inventoryDays,
+      unitPrice: that.validateForm.value.unitPrice || undefined,
       unit: that.validateForm.value.unit ? { id: that.validateForm.value.unit } : undefined,
       storageUnit: that.validateForm.value.storageUnit ? { id: that.validateForm.value.storageUnit } : undefined,
       hosId: that.hosId,
@@ -161,6 +163,7 @@ export class MedicalWasteTypeComponent implements OnInit {
     this.coopData = data;
     this.validateForm.controls.typeName.setValue(data.typeName);
     this.validateForm.controls.inventoryDays.setValue(data.inventoryDays);
+    this.validateForm.controls.unitPrice.setValue(data.unitPrice);
     this.validateForm.controls.unit.setValue(data.unit.id);
     this.validateForm.controls.storageUnit.setValue(data.storageUnit.id);
   }