From cb95755fe8496d8af6d40b05c4bbd4b6df2e77ab Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 14:39:34 +0800
Subject: [PATCH] LEX Community Report&Dashboard

---
 force-app/main/default/lwc/lexConsumable/lexConsumable.js |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.js b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
index f365f1e..1bc8cee 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.js
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
@@ -52,6 +52,8 @@
    @track contactDealer = [];
    @track proLimitAndDate = [];
    @track agencyProType;
+   @track agencyProType1;
+   @track OSHFLG = false;
    @track bargainPrice;
    @track showOrderDate = false;
    @track showAttUploadDate = false;
@@ -141,10 +143,10 @@
    get cols(){
       var cols = [];
       cols.push({label:'娑堣�楀搧鍚嶇О',fieldName:'prodName',wrapText:true,hideDefaultActions: true,sortable: true});
-      cols.push({label:'瑙勬牸',fieldName:'packing_list',hideDefaultActions: true,initialWidth:50,cellAttributes: { alignment: "right" }});
-      cols.push({label:'CFDA鐘舵��',fieldName:'prodSFDAStatus',hideDefaultActions: true,initialWidth:97});
+      cols.push({label:'瑙勬牸',fieldName:'packing_list',wrapText:true,hideDefaultActions: true,initialWidth:50,cellAttributes: { alignment: "right" }});
+      cols.push({label:'CFDA鐘舵��',fieldName:'prodSFDAStatus',wrapText:true,hideDefaultActions: true,initialWidth:97});
       cols.push({label:'娉ㄥ唽璇佺紪鐮佸彿',fieldName:'approbation_No',wrapText:true,hideDefaultActions: true,initialWidth:120});
-      cols.push({label:'娉ㄥ唽璇佹晥鏈�',fieldName:'expiration_Date',hideDefaultActions: true,initialWidth:105});
+      cols.push({label:'娉ㄥ唽璇佹晥鏈�',fieldName:'expiration_Date',wrapText:true,hideDefaultActions: true,initialWidth:105});
       cols.push({label:'绗�3鍒嗙被',fieldName:'prodCategory3',wrapText:true,hideDefaultActions: true,initialWidth:78,sortable: true});
       cols.push({label:'绗�4鍒嗙被',fieldName:'prodCategory4',wrapText:true,hideDefaultActions: true,initialWidth:107,sortable: true});
       cols.push({label:'绗�5鍒嗙被',fieldName:'prodCategory5',wrapText:true,hideDefaultActions: true,initialWidth:80,sortable: true});
@@ -314,6 +316,8 @@
                this.category4Option = result.category4Option;
                this.category5Option = result.category5Option;
                this.agencyProType = result.agencyProType;
+               this.agencyProType1 = result.agencyProType1;
+               this.OSHFLG = result.OSHFLG;
                this.hospitalName = result.hospitalName;
                this.contractName = result.contractName;
                this.contractLabel = '缁忛攢鍟嗘湁鏁堝悎鍚�';
@@ -674,7 +678,10 @@
          contactDealerStr:JSON.stringify(this.contactDealer),
          methodTypeStr:this.pageType,
          eSetIdStr:this.esetId,
-         hospitalIdStr : this.hospitalId
+         hospitalIdStr : this.hospitalId,
+         contractIdStr : this.contractId,
+         agencyProType1Str : this.agencyProType1,
+         OSHFLGStr : this.OSHFLG
       }).then(result=>{
          this.showSpinner = false;
          if(result.result == 'Success'){
@@ -705,7 +712,10 @@
          consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
          contactDealerStr:JSON.stringify(this.contactDealer),
          methodTypeStr:this.pageType,
-         hospitalIdStr:this.hospitalId
+         hospitalIdStr:this.hospitalId,
+         contractIdStr : this.contractId,
+         agencyProType1Str : this.agencyProType1,
+         OSHFLGStr : this.OSHFLG
       }).then(result=>{
          this.showSpinner = false;
          if(result.result == 'Success'){
@@ -1112,7 +1122,7 @@
 
    //鎵撳紑鍚堝悓妫�绱㈠脊绐楀苟鍒濆鍖�
    showSearchCon(){
-      initContract({ctype:this.agencyProType})
+      initContract({ctype:this.agencyProType1})
       .then(result=>{
          if(result.result == 'Success'){
             this.showConPop = true;
@@ -1135,7 +1145,7 @@
 
    //妫�绱㈠悎鍚�
    searchCon(){
-      searchContract({searchName:this.searchNameCon, accountId:this.accountid, ctype:this.agencyProType})
+      searchContract({searchName:this.searchNameCon, accountId:this.accountid, ctype:this.agencyProType1,OSHFLGStr : this.OSHFLG})
       .then(result=>{
          if(result.result == 'Success'){
             this.contractList = result.attList;

--
Gitblit v1.9.1