Dev

PMS/ClientApp/src/app/pages/domsale/SNSE004_M/SNSE004_M.component.html

@@ -267,19 +267,19 @@
           </div>
 
           <!--<div class="col-md-6">
-            <mat-form-field class="w-100" floatLabel="always">
-              <mat-label>Address2</mat-label>
-              <input
-                type="text"
-                class="can-input"
-                matInput
-                autocompleteOff
-                [disabled]="orderHeader.PAYMENT_TYPE != '1'"
-                [ngModel]="orderHeader.CUST_ADDR2"
-                name="address2"
-              />
-            </mat-form-field>
-          </div>-->
+          <mat-form-field class="w-100" floatLabel="always">
+            <mat-label>Address2</mat-label>
+            <input
+              type="text"
+              class="can-input"
+              matInput
+              autocompleteOff
+              [disabled]="orderHeader.PAYMENT_TYPE != '1'"
+              [ngModel]="orderHeader.CUST_ADDR2"
+              name="address2"
+            />
+          </mat-form-field>
+        </div>-->
         </div>
         <div class="row">
           <div class="col-md-2">
@@ -440,7 +440,7 @@
             </mat-form-field>
           </div>
 
-          <div class="col-md-2">
+          <div class="col-md-1">
             <mat-form-field class="w-100" floatLabel="always">
               <mat-label>Total Quantity</mat-label>
               <input type="text"
@@ -499,11 +499,6 @@
             </mat-form-field>
           </div>
 
-
-
-
-
-
           <div class="col-md-3">
             <mat-form-field class="w-100" floatLabel="always">
               <mat-label>Change Route Name</mat-label>
@@ -512,13 +507,11 @@
           </div>
 
 
-        </div>
-        <div class="row">
-          <div class="col-md-3" *ngIf="orderHeader.LAST_UPD_DATE">
+          <div class="col-md-2" *ngIf="orderHeader.LAST_UPD_DATE">
             <mat-form-field class="w-100" floatLabel="always">
               <mat-label>Update By</mat-label>
               <input type="text"
-                     class="can-input text-right"
+                     class="can-input"
                      name="LAST_UPD_BY"
                      matInput
                      autocompleteOff
@@ -527,11 +520,11 @@
             </mat-form-field>
 
           </div>
-          <div class="col-md-4" *ngIf="orderHeader.LAST_UPD_DATE">
+          <div class="col-md-2" *ngIf="orderHeader.LAST_UPD_DATE">
             <mat-form-field class="w-100" floatLabel="always">
               <mat-label>Update Date</mat-label>
               <input type="text"
-                     class="can-input text-right"
+                     class="can-input"
                      name="LAST_UPD_DATE"
                      matInput
                      autocompleteOff
@@ -539,7 +532,7 @@
                      disabled />
             </mat-form-field>
           </div>
-          <div class="col-md-5 text-right">
+          <div class="col-md-3 text-right">
             <ng-template [ngIf]="!IsEdit">
               <button type="button"
                       mat-raised-button
@@ -552,7 +545,7 @@
       </form>
 
     </div>
-    <div class="form-box">
+    <div class="form-box" *ngIf="IsEdit">
       <auto-table-hl [tableName]="'SNSE004_Detail'"
                      id="tbl1"
                      [tableData]="orderDetail"
@@ -572,8 +565,7 @@
                      autocompleteOff
                      [(ngModel)]="data._PART_NO"
                      (change)="autoCompletePart.query()"
-                     required
-                     [disabled]="!IsEdit" />
+                     required/>
               <auto-complete-part matSuffix
                                   [config]="PartNoLookupConfig"
                                   [textInput]="data._PART_NO"
@@ -619,7 +611,6 @@
                      [(ngModel)]="data.ORDER_QTY"
                      (focus)="qty.select()"
                      (change)="OrderQtyChange($event, data)"
-                     [disabled]="!IsEdit"
                      #qty />
             </mat-form-field>
           </ng-template>
@@ -670,6 +661,48 @@
         </ng-template>
       </auto-table-hl>
     </div>
+    <div class="form-box" *ngIf="!IsEdit">
+      <auto-table-hl [tableName]="'SNSE004_Detail_View'"
+                     id="tbl1"
+                     [tableData]="orderDetail"
+                     [showPagination]="false"
+                     maxHeight="46vh"
+                     [hideColumns]="hideCols">
+        <ng-template let-header="header" let-data="data" let-index="index">
+          <ng-template [ngIf]="header.FIELD_NAME == 'SEQ'">
+            {{ index + 1 | number: "1.0" }}
+          </ng-template>
+     
+        
+        
+          <ng-template [ngIf]="
+                  header.FIELD_NAME != 'SEQ' &&
+                  header.FIELD_NAME != 'AMOUNT'
+                ">
+            <ng-template [ngIf]="header.DATA_TYPE == 'number'">
+              {{ data[header.FIELD_NAME] | number: "1.0-0" }}
+            </ng-template>
+            <ng-template [ngIf]="header.DATA_TYPE == 'number2'">
+              {{ data[header.FIELD_NAME] | number: "1.2-2" }}
+            </ng-template>
+            <ng-template [ngIf]="header.DATA_TYPE == 'date'">
+              {{ data[header.FIELD_NAME] | dateFormat }}
+            </ng-template>
+            <ng-template [ngIf]="header.DATA_TYPE == 'dateTime'">
+              {{ data[header.FIELD_NAME] | dateTimeFormat }}
+            </ng-template>
+            <ng-template [ngIf]="
+                    header.DATA_TYPE != 'date' &&
+                    header.DATA_TYPE != 'dateTime' &&
+                    header.DATA_TYPE != 'number' &&
+                    header.DATA_TYPE != 'number2'
+                  ">
+              {{ data[header.FIELD_NAME] }}
+            </ng-template>
+          </ng-template>
+        </ng-template>
+      </auto-table-hl>
+    </div>
   </ng-template>
 </div>
 <!--

PMS/ClientApp/src/app/pages/domsale/SNSE004_M/SNSE004_M.component.ts

@@ -232,7 +232,7 @@ export class SNSE004_MComponent implements OnInit {
     this.orderDetail = [];
     this.hideCols = ["CHK_STATUS"]
 
-    this.http.get("SL", "SNSE004_GetOrderDetail", order.ORDER_NO, order.CUSTOMER_CODE)
+    this.http.get("SL", "SNSE004_GetOrderDetail", order.ORDER_NO, order.CUSTOMER_CODE, order.BRANCH_CODE)
       .subscribe(res => {
         this.orderHeader = res.Table[0];
         this.orderDetail = res.Table1;
@@ -705,11 +705,21 @@ export class SNSE004_MComponent implements OnInit {
   }
 
   public CalTotalAmt() {
-    return this.orderDetail.reduce((o, n) => o + (parseFloat(n.ORDER_QTY || 0) * parseFloat(n.UNIT_PRICE || 0)), 0)
+
+    if (this.IsEdit) {
+      return this.orderDetail.reduce((o, n) => o + (parseFloat(n.ORDER_QTY || 0) * parseFloat(n.UNIT_PRICE || 0)), 0);
+    } else {
+      return this.orderHeader.TOTAL_ORDER_QTY;
+    }
   }
 
   public CalTotalQty() {
-    return this.orderDetail.reduce((o, n) => o + parseFloat(n.ORDER_QTY || 0), 0)
+    if (this.IsEdit) {
+      return this.orderDetail.reduce((o, n) => o + parseFloat(n.ORDER_QTY || 0), 0);
+    } else {
+      return this.orderHeader.TOTAL_ORDER_QTY;
+    }
+  
   }
 
   public BackToGrid() {