From 07390e2fcb4adf27c928335bf27ae7939c5a80ad Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 23 五月 2023 11:28:12 +0800
Subject: [PATCH] bakcup20230523

---
 force-app/main/default/lwc/lexConsumable/lexConsumable.js |   66 +++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.js b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
index 3c88359..f365f1e 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.js
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
@@ -113,10 +113,10 @@
    @track tempidHp;
    @track hosCols = [
       // {label:'鍖婚櫌鍚嶇О',fieldName:'Name',type:'button',typeAttributes:{label:{fieldName:'Name'},variant:'base'}},
-      {label:'',type:'button',typeAttributes:{label:'閫夋嫨'},initialWidth:80,hideDefaultActions: true},
+      {label:'',type:'button',typeAttributes:{label:'閫夋嫨'},initialWidth:90,hideDefaultActions: true,wrapText:true},
       {label:'鍖婚櫌鍚嶇О',fieldName:'Name',initialWidth:380,wrapText:true,hideDefaultActions: true},
-      {label:'鐪佷唤',fieldName:'StateMaster',initialWidth:80,hideDefaultActions: true},
-      {label:'鍦板潃',fieldName:'Address__c',hideDefaultActions: true}
+      {label:'鐪佷唤',fieldName:'StateMaster',initialWidth:80,hideDefaultActions: true,wrapText:true},
+      {label:'鍦板潃',fieldName:'Address__c',hideDefaultActions: true,wrapText:true}
    ];
    //鍚堝悓鎼滅储
    @track contractLabel;
@@ -129,27 +129,27 @@
    @track contractName;
    @track tempidPp;
    @track conCols = [
-      {label:'',type:'button',typeAttributes:{label:'閫夋嫨'},initialWidth:80,hideDefaultActions: true},
+      {label:'',type:'button',typeAttributes:{label:'閫夋嫨'},initialWidth:90,hideDefaultActions: true,wrapText:true},
       {label:'鍚堝悓鍚嶇О',fieldName:'Name',wrapText:true,hideDefaultActions: true},
-      {label:'鐪佷唤',fieldName:'StateMaster',initialWidth:80,hideDefaultActions: true},
-      {label:'鐢宠閿�鍞',fieldName:'Sales_Section__c',initialWidth:160,hideDefaultActions: true},
-      {label:'鍏佽鎶ヤ环鏈熼棿(寮�濮嬫棩)',fieldName:'Contract_Decide_Start_Date__c',initialWidth:160,hideDefaultActions: true},
-      {label:'鍏佽鎶ヤ环鏈熼棿(缁撴潫鏃�)',fieldName:'Contract_Decide_End_Date__c',initialWidth:160,hideDefaultActions: true}
+      {label:'鐪佷唤',fieldName:'StateMaster',initialWidth:80,hideDefaultActions: true,wrapText:true},
+      {label:'鐢宠閿�鍞',fieldName:'Sales_Section__c',initialWidth:160,hideDefaultActions: true,wrapText:true},
+      {label:'鍏佽鎶ヤ环鏈熼棿(寮�濮嬫棩)',fieldName:'Contract_Decide_Start_Date__c',initialWidth:175,hideDefaultActions: true,wrapText:true},
+      {label:'鍏佽鎶ヤ环鏈熼棿(缁撴潫鏃�)',fieldName:'Contract_Decide_End_Date__c',initialWidth:175,hideDefaultActions: true,wrapText:true}
    ];
 
    //娑堣�楀搧鏁版嵁col
    get cols(){
       var cols = [];
       cols.push({label:'娑堣�楀搧鍚嶇О',fieldName:'prodName',wrapText:true,hideDefaultActions: true,sortable: true});
-      cols.push({label:'瑙勬牸',fieldName:'packing_list',hideDefaultActions: true,initialWidth:40,cellAttributes: { alignment: "right" }});
-      cols.push({label:'CFDA鐘舵��',fieldName:'prodSFDAStatus',hideDefaultActions: true,initialWidth:78});
-      cols.push({label:'娉ㄥ唽璇佺紪鐮佸彿',fieldName:'approbation_No',wrapText:true,hideDefaultActions: true,initialWidth:153});
-      cols.push({label:'娉ㄥ唽璇佹晥鏈�',fieldName:'expiration_Date',hideDefaultActions: true,initialWidth:100});
-      cols.push({label:'绗�3鍒嗙被',fieldName:'prodCategory3',wrapText:true,hideDefaultActions: true,initialWidth:95,sortable: true});
-      cols.push({label:'绗�4鍒嗙被',fieldName:'prodCategory4',wrapText:true,hideDefaultActions: true,initialWidth:90,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:'approbation_No',wrapText:true,hideDefaultActions: true,initialWidth:120});
+      cols.push({label:'娉ㄥ唽璇佹晥鏈�',fieldName:'expiration_Date',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});
       if(this.cansee){
-         cols.push({label:'鏍囧噯鍗曚环',type:'number',typeAttributes:{minimumFractionDigits: 2},fieldName:'prodIntraTradeList',hideDefaultActions: true,initialWidth:60});
+         cols.push({label:'鏍囧噯鍗曚环',type:'number',typeAttributes:{minimumFractionDigits: 2},fieldName:'prodIntraTradeList',hideDefaultActions: true,initialWidth:80});
       }
       if(this.editAble){
          cols.push(
@@ -162,12 +162,12 @@
                allnumber: { fieldName: "allnumber" },
                valueType: 'Number'
             },
-            hideDefaultActions: true,initialWidth:70});
+            hideDefaultActions: true,initialWidth:80});
       }else{
-         cols.push({label:'閲囪喘鏁伴噺',fieldName:'consumableCount',hideDefaultActions: true,initialWidth:70,cellAttributes: { alignment: "right" }});
+         cols.push({label:'閲囪喘鏁伴噺',fieldName:'consumableCount',hideDefaultActions: true,initialWidth:80,cellAttributes: { alignment: "right" }});
       }
-      cols.push({label:'鍦ㄥ簱鏁颁笅闄�',fieldName:'lowerlimit',hideDefaultActions: true,initialWidth:85,cellAttributes: { alignment: "right" }});
-      cols.push({label:'鍦ㄥ簱鏁颁笂闄�',fieldName:'upperlimit',hideDefaultActions: true,initialWidth:85,cellAttributes: { alignment: "right" }});
+      cols.push({label:'鍦ㄥ簱鏁颁笅闄�',fieldName:'lowerlimit',hideDefaultActions: true,initialWidth:100,cellAttributes: { alignment: "right" }});
+      cols.push({label:'鍦ㄥ簱鏁颁笂闄�',fieldName:'upperlimit',hideDefaultActions: true,initialWidth:100,cellAttributes: { alignment: "right" }});
       // cols.push({label:'鏈夋晥鏈熷簱瀛�(鐩�)',fieldName:'allnumber',hideDefaultActions: true,initialWidth:105,sortable: true});
       cols.push(
          {label:'鏈夋晥鏈熷簱瀛�(鐩�)',
@@ -178,8 +178,8 @@
             lowerlimit: { fieldName: "lowerlimit" },
             boxPrice: '鐩�'
          },
-         hideDefaultActions: true,initialWidth:105});
-      cols.push({label:'鏈夋晥鏈熷簱瀛�(涓�)',fieldName:'allnumber_piece',hideDefaultActions: true,initialWidth:105,cellAttributes: { alignment: "right" }});
+         hideDefaultActions: true,initialWidth:126});
+      cols.push({label:'鏈夋晥鏈熷簱瀛�(涓�)',fieldName:'allnumber_piece',hideDefaultActions: true,initialWidth:126,cellAttributes: { alignment: "right" }});
       return cols;
    }
 
@@ -1040,6 +1040,14 @@
    //    this.chooseHospitalId = hosid;
    // }
 
+   changeHos(event){
+      this.hospitalName = event.detail.value;
+   }
+
+   changeCon(event){
+      this.contractName = event.detail.value;
+   }
+
    chooseHos(event){
       const row = event.detail.row;
       this.chooseHospitalId = row.Id;
@@ -1222,9 +1230,21 @@
    }
 
    showMyToast(title, message, variant) {
-      console.log('show custom message')
+      console.log('show custom message');
+      var iconName = '';
+      var content = '';
+      if(variant == 'success'){
+         iconName = 'utility:check';
+      }else{
+         iconName = 'utility:error';
+      }
+      if(message != ''){
+         content = '<h2><strong>'+title+'<strong/></h2><h5>'+message+'</h5>';
+      }else{
+         content = '<h2><strong>'+title+'<strong/></h2>';
+      }
       this.template.querySelector('c-common-toast').
-      showToast('success','<strong>'+message+'<strong/>','utility:warning',1000);
+      showToast(variant,content,iconName,10000);
       // var mode;
       // if(this.isNoteStay){
       //     mode ='sticky';

--
Gitblit v1.9.1