From a1a28f05f9560cd6a265caef72e0ca07977510ac Mon Sep 17 00:00:00 2001
From: 付煜 <fuyu3103346691@163.com>
Date: 星期一, 28 三月 2022 15:56:23 +0800
Subject: [PATCH] 系统周报

---
 force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js |   42 +++++++++++++++++++++++++++++-------------
 1 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index fff0276..f49b1b0 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -12,8 +12,8 @@
                 component.set('v.allselectlist',res.allselectlist);
                 component.set('v.doclist',res.doclist);
                 // PIPL update Yin Mingjie 21/02/2022 start
-                component.find('select_agency_person').set('v.options', this.conv_selected(res.allselectlist.AgencyPerson__c));
-                // this.search_contact(component, event, helper,res.allselectlist.AgencyPerson__c);
+                // component.find('select_agency_person').set('v.options', this.conv_selected(res.allselectlist.AgencyPerson__c));
+                this.search_contact(component, event, helper,res.allselectlist.AgencyPerson__c);
                 // PIPL update Yin Mingjie 21/02/2022 end
                 component.find('select_department').set('v.options', this.conv_selected(res.allselectlist.Department_Cateogy__c));
                 component.find('select_purpose_type').set('v.options', this.conv_selected(res.allselectlist.Purpose_Type__c));
@@ -669,13 +669,13 @@
         component.find('save_button').set('v.disabled', true);
 
         var Report_Date__c = component.get('v.data.Report_Date__c');
-            alert('Report_Date__c'+Report_Date__c);
+            // alert('Report_Date__c'+Report_Date__c);
         var Person_In_Charge2__c = "";
         var Submit_date__c = "";
         if (component.get('v.mode') == 'edit') {
             // 鍛� Submit_date__c
             Submit_date__c = component.get('v.select_report_data').Submit_date__c;
-            alert('Submit_date__c'+Submit_date__c);
+            // alert('Submit_date__c'+Submit_date__c);
 
 
             // 鎷呭綋 Person_In_Charge2__c
@@ -683,7 +683,7 @@
         } else {
             // 鍛� Submit_date__c
             Submit_date__c = this.get_date_string(component.find('select_date').get('v.value'));
-            alert('Submit_date__c'+Submit_date__c);
+            // alert('Submit_date__c'+Submit_date__c);
 
             // 鎷呭綋 Person_In_Charge2__c
             Person_In_Charge2__c = component.find('select_agency_person').get('v.value');
@@ -754,7 +754,7 @@
         if (!Department_Cateogy__c) { error.push("绉戝 涓嶅瓨鍦�"); }
         if (!doctor2__c) { error.push("鎷滆浜� 涓嶅瓨鍦�"); }
         if (!Purpose_Type__c) { error.push("娲诲姩鍖哄垎 涓嶅瓨鍦�"); }
-        if (!SupportNeeds__c) { error.push("鏀彺闇�姹� 涓嶅瓨鍦�"); }
+        // if (!SupportNeeds__c) { error.push("鏀彺闇�姹� 涓嶅瓨鍦�"); }
         if (!Opportunity__c) { Opportunity__c = ""; }
         if (!Product_Category1__c) { error.push("浜у搧鍖哄垎1 涓嶅瓨鍦�"); }
         if (Purpose_Type__c && (Purpose_Type__c.substr(-3) == 'SIS' || Purpose_Type__c.substr(-3) == 'OPD')) {
@@ -774,7 +774,8 @@
 		if (component.get('v.mode') == 'edit') {
             var Agency_Report__c = component.get('v.select_report_data').Id;
             var action = component.get('c.editAgencyReport');
-            alert("Purpose_Type:"+Purpose_Type__c+","+"SupportNeedsc:"+SupportNeeds__c);
+            debugger
+            // alert("Purpose_Type:"+Purpose_Type__c+","+"SupportNeedsc:"+SupportNeeds__c);
             action.setParams({
                 "Agency_Report_Id" : Agency_Report__c,
                 "Department_Cateogy" : Department_Cateogy__c,
@@ -842,6 +843,8 @@
             /* Save (New & Copy) */
             
             var action = component.get('c.saveAgencyReport');
+            debugger;
+            // alert(SupportNeeds__c);
             action.setParams({
                 "Department_Cateogy" : Department_Cateogy__c,
                 "Purpose_Type" : Purpose_Type__c,
@@ -1118,6 +1121,7 @@
     searchHos : function(component, event, helper) {
     	var hospital_name = event.getParam("value");
     	var action = component.get("c.getHospitalList");
+        debugger;
     	action.setParams({"hospital_name": hospital_name});
 
     	action.setCallback(this, function(response) {
@@ -1144,6 +1148,7 @@
     },
 
     selectHos : function(component, event, helper) {
+        debugger
     	var hospital_list = component.find('hospital_list');
     	$A.util.removeClass(hospital_list, 'slds-is-open');
     	var accname = event.currentTarget.dataset.accname;
@@ -1375,6 +1380,11 @@
         for (const key in retMap) {
             if (key == 'sre') {continue;}
             dataArr.push(key);
+        }
+        if(dataArr.length == 0){
+            component.set('v.login',false);
+            this.warning('娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫鎴蜂汉鍛�');
+            return;
         }
         let obj= Object.create(null);
         obj['dataIds'] = dataArr;
@@ -1856,8 +1866,10 @@
     saveRecords : function(component,event){
         component.set('v.login',true);
         var action = component.get("c.processData");
+        debugger;
         var selectDate = component.find('select_date').get('v.value');
         var fieldsList=['Name','Phone','AccountNumber']; //Please write your code dynamic fields
+        var sss=component.get("v.fileContentData");
         action.setParams({ 
             fileData : component.get("v.fileContentData"),
             //selectDateselectDate :component.find('select_date').get('v.value'),
@@ -1919,8 +1931,9 @@
          }
         columnDivider = ',';
         lineDivider =  '\n';
-        keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c'];
-        thkeys = ['鍛�','鎷呭綋','娲诲姩鏃�','鍖婚櫌','绉戝','鎷滆浜�','鑱屼綅','浜у搧鍖哄垎1','浜у搧鍖哄垎2','浜у搧鍖哄垎3','娲诲姩鍖哄垎','缁撴灉']
+        //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+        keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c','SupportNeeds__c'];
+        thkeys = ['鍛�','鎷呭綋','娲诲姩鏃�','鍖婚櫌','绉戝','鎷滆浜�','鑱屼綅','浜у搧鍖哄垎1','浜у搧鍖哄垎2','浜у搧鍖哄垎3','娲诲姩鍖哄垎','缁撴灉','鏀彺闇�姹�']
         csvStringResult = '';
         csvStringResult += thkeys.join(columnDivider);
         csvStringResult += lineDivider;
@@ -1948,6 +1961,8 @@
                     csvStringResult += '"'+ objectRecords[i].Product_Category2__r.Name+'"';
                 }else if(skey == 'Product_Category3__c'){
                     csvStringResult += '"'+ objectRecords[i].Product_Category3__r.Name+'"';
+                }else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+                    csvStringResult += '"'+ objectRecords[i].SupportNeeds__c+'"';
                 }else{
                     csvStringResult += '"'+ objectRecords[i][skey]+'"';
                 }
@@ -1962,9 +1977,9 @@
         return csvStringResult;        
     },
     showExportDate : function(component,objectRecords){
-        console.log('杩涘叆showexceportdate'+objectRecords);
-        var keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c'];
-        var headers = ['鍛�','鎷呭綋','娲诲姩鏃�','鍖婚櫌','绉戝','鎷滆浜�','鑱屼綅','浜у搧鍖哄垎1','浜у搧鍖哄垎2','浜у搧鍖哄垎3','娲诲姩鍖哄垎','缁撴灉']
+        console.log('杩涘叆showexceportdate'+objectRecords);//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+        var keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c','SupportNeeds__c'];
+        var headers = ['鍛�','鎷呭綋','娲诲姩鏃�','鍖婚櫌','绉戝','鎷滆浜�','鑱屼綅','浜у搧鍖哄垎1','浜у搧鍖哄垎2','浜у搧鍖哄垎3','娲诲姩鍖哄垎','缁撴灉','鏀彺闇�姹�']
         var content = "<table class=\"table slds-table slds-table--bordered slds-table--cell-buffer\">";
         content += "<thead><tr class=\"slds-text-title--caps\">";
         for(i=0;i<headers.length; i++){
@@ -1995,6 +2010,8 @@
                     content += '<td>'+ objectRecords[i].Product_Category2__r.Name+'</td>';
                 }else if(skey == 'Product_Category3__c'){
                     content += '<td>'+ objectRecords[i].Product_Category3__r.Name+'</td>';
+                }else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+                    content += '<td>'+ objectRecords[i].SupportNeeds__c+'</td>';
                 }else{
                     content += '<td>'+ objectRecords[i][skey]+'</td>';
                 }
@@ -2102,5 +2119,4 @@
     //     var data = this.search(searchUrl,data,token);
     //     return data;searchUrl,requestSearchPayload,token
     // },
-    
 })
\ No newline at end of file

--
Gitblit v1.9.1