Merge branch 'dev' of http://192.168.1.249:8085/smgo/pms-client into dev

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

@@ -343,7 +343,7 @@ export class SNSE204Component implements OnInit {
   }
 
 
-  SetSourcePO(data){
+  public SetSourcePO(data){
 
 
     if(!data.INVOICE_NO) {
@@ -356,7 +356,7 @@ export class SNSE204Component implements OnInit {
       console.log('xxx',this.ConfigPO)
   }
 
-  SetSourceInvoice(data){
+  public SetSourceInvoice(data){
 
     if(!data.ORDER_PART_NO) {
       this.modal.warning("Please insert order part no",this.viewref)
@@ -365,7 +365,7 @@ export class SNSE204Component implements OnInit {
     this.ConfigInvoice.SourceParams.ORDER_PART_NO = data.ORDER_PART_NO
   }
 
-  SetSourceCase(data){
+  public SetSourceCase(data){
     if(!data.PO_NO) {
       this.modal.warning("Please insert po no",this.viewref)
       return

PMS/ClientApp/src/app/pages/saleorder/SNSQ074_MR/SNSQ074_MR.component.html

@@ -19,70 +19,22 @@
       <div class="col-md-6">
         <mat-form-field class="w-100" floatLabel="always">
           <mat-label>Condition</mat-label>
-          <mat-select class="can-input" [(ngModel)]="params.SELECT_LIST" (selectionChange)="SetSelectList($event.value)">
-            <mat-option value="1">ALL ZONE</mat-option>
-            <mat-option value="0">ALL SALES CHANNEL</mat-option>
-            <mat-option value="2">ALL CUSTOMER CODE</mat-option>
-            <mat-option value="3">ALL PRODUCT CODE</mat-option>
-            <mat-option value="4">ALL DESCRIPT CODE</mat-option>
-            <mat-option value="5">ALL PART NO</mat-option>
-            <mat-option value="6">SALES CHANNEL | ZONE AREA</mat-option>
-            <mat-option value="7">ZONE_AREA | CUSTOMER CODE</mat-option>
-            <mat-option value="8">CUSTOMER CODE | PRODUCT CODE</mat-option>
-            <mat-option value="9">PRODUCT CODE | DESCRIPTION CODE</mat-option>
-            <mat-option value="10">DESCRIPTION CODE | PART NO</mat-option>
-            <mat-option value="11">SALES CHANNEL & CUSTOMER CODE</mat-option>
-            <mat-option value="12">SALES CHANNEL & PRODUCT CODE</mat-option>
-            <mat-option value="13">SALES CHANNEL & DESCRIPT CODE</mat-option>
-            <mat-option value="14">SALES CHANNEL & PART NO</mat-option>
-            <mat-option value="15">ZONE AREA & PRODUCT CODE</mat-option>
-            <mat-option value="16">ZONE AREA & DESCRIPT CODE</mat-option>
-            <mat-option value="17">ZONE AREA & PART NO</mat-option>
-            <mat-option value="18">CUSTOMER CODE & DESCRIPT CODE</mat-option>
-            <mat-option value="19">CUSTOMER CODE & PART NO</mat-option>
-            <mat-option value="20">PRODUCT CODE & PART NO</mat-option>
-            <!--<mat-option value="21">PRODUCT CODE & SALES CHANNEL</mat-option>-->
-            <mat-option value="22"> </mat-option>
+          <mat-select class="can-input" [(ngModel)]="params.SELECT_LIST" name="PARAMS_SELECT_LIST">
+            <mat-option *ngFor="let PARAMS_SELECT_LIST of conditionList" [value]="PARAMS_SELECT_LIST.value" (click)="SetSelectList($event.value)" [disabled]="PARAMS_SELECT_LIST.chkdisable == true">
+              {{PARAMS_SELECT_LIST.viewValue}}
+            </mat-option>
           </mat-select>
         </mat-form-field>
       </div>
     </div>
     <div class="row">
       <div class="col-md-2">
-        <mat-form-field class="w-100" floatLabel="always">
-          <mat-label>Sale Channel</mat-label>
-          <input class="can-input" type="text" matInput autocompleteOff [(ngModel)]="paramshow.DSP_SALES_CHANNEL" disabled/>
-        </mat-form-field>
-      </div>
-      <div class="col-md-2">
-        <mat-form-field class="w-100" floatLabel="always">
-          <mat-label>Zone Area</mat-label>
-          <input class="can-input" type="text" matInput autocompleteOff [(ngModel)]="paramshow.DSP_ZONE" disabled/>
-        </mat-form-field>
-      </div>
-      <div class="col-md-2">
-        <mat-form-field class="w-100" floatLabel="always">
-          <mat-label>Customer Code</mat-label>
-          <input class="can-input" type="text" matInput autocompleteOff [(ngModel)]="paramshow.DSP_CUSTOMER" disabled/>
-        </mat-form-field>
-      </div>
-      <div class="col-md-2">
-        <mat-form-field class="w-100" floatLabel="always">
-          <mat-label>Product Code</mat-label>
-          <input class="can-input" type="text" matInput autocompleteOff [(ngModel)]="paramshow.DSP_PRODUCT" disabled/>
-        </mat-form-field>
-      </div>
-      <div class="col-md-2">
-        <mat-form-field class="w-100" floatLabel="always">
-          <mat-label>Description Code</mat-label>
-          <input class="can-input" type="text" matInput autocompleteOff [(ngModel)]="paramshow.DSP_DESC" disabled/>
-        </mat-form-field>
-      </div>
-      <div class="col-md-2">
-        <!--<mat-form-field class="w-100" floatLabel="always">
-          <mat-label>Part No</mat-label>
-          <input class="can-input" type="text" matInput autocompleteOff [(ngModel)]="params.DSP_PARTNO" />
-        </mat-form-field>-->
+        <div *ngIf="paramshow.SHOW_VAL != null">
+          <mat-form-field class="w-100" floatLabel="always">
+            <mat-label>{{displayShow}}</mat-label>
+            <input class="can-input" type="text" matInput autocompleteOff [(ngModel)]="paramshow.SHOW_VAL" disabled/>
+          </mat-form-field>
+        </div>
       </div>
     </div>