bug5232

src/js/itemDefectDetail.js

@@ -49,16 +49,20 @@ if(defectName){
     casesEntryName=defectName
     $('.selectDefect').html(casesEntryName)
 }
-if(deptIdPram&&deptNamePram){
+if(deptIdPram&&deptNamePram || from == 2 &&deptList.length > 0  ){
     deptIdTemp = deptIdPram
     deptId = deptIdPram
     deptName = deptNamePram
-    if(deptNamePram.length > 10){
-        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+    if(from == 2){
+        deptId =  deptIdTemp = deptList[0].deptId
+        deptName = deptNameTemp = deptList[0].deptName
+    }
+    if(deptName.length > 10){
+        $('.selectDept').html(deptName.substring(0,8)+'...')
     }else{
-        $('.selectDept').html(deptNamePram)
+        $('.selectDept').html(deptName)
     }
-    $('.selectDept ').attr('title',deptNamePram)
+    $('.selectDept ').attr('title',deptName)
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
@@ -172,8 +176,12 @@ $(".abnormalClear").on("click", function(e){
     doctorNum=""; 
     doctorNameTemp=""; 
     doctorNumTemp=""; 
-    data_desc=[]; 
+    data_desc=["leaveHospitalDate"];
     data_asc=[];
+    if(from == 2){
+        deptId =  deptIdTemp = deptList[0].deptId
+        deptName = deptNameTmp = deptList[0].deptName
+    }
     $('.patientNumInp').val('')
     $('.patientNameInp').val('')
     $('.doctorInp').val('')
@@ -182,17 +190,12 @@ $(".abnormalClear").on("click", function(e){
     // $('#datepicker').val('')
     // $('#datepicker2').val('')
     //默认日期为近一个月
-    $( "#datepicker" ).datepicker({
-        changeMonth: true,
-        changeYear: true,
-        dateFormat:"yy/mm/dd",
-    }).datepicker( "setDate", "-6d");
-    $( "#datepicker2" ).datepicker({
-        changeMonth: true,
-        changeYear: true,
-        dateFormat:"yy/mm/dd"
-    }).datepicker( "setDate",new Date());
-    $('.selectDept ').html('全部')
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+    if(from == 2){
+        $('.selectDept ').html('全部') 
+    }else{
+        $('.selectDept ').html(deptName) 
+    }
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectDept ').addClass('unSelect')
@@ -356,6 +359,10 @@ $('.selectDept').on("click", function(e){
 //获取科室列表
 getDeptList()
 function getDeptList(){
+    if(from == 2){
+        rendeDeptList(deptList)
+        return
+    }
     post(api.getDeptList,{inputStr:""}).then(res =>{
         if(res.data.code == '0'){
            const  deptList = res.data.data
@@ -368,7 +375,13 @@ function getDeptList(){
 
 
 function rendeDeptList(deptList){
-    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
+    let str
+    if(from == 2){
+        str = ``;
+    } else{
+        str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
+    }
+     
     for(let i = 0; i < deptList.length; i++){
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }

src/js/singleVeto.js

@@ -161,6 +161,7 @@ function getTabData(activePage){
     }
     startDateParam=dateStatrt
     endDateParam=dateEnd
+    let deptName = from == 2&&deptList.length > 0 ? deptList[0].deptName : '';
     const param = {
         current:activePage,
         type: 0,
@@ -168,7 +169,7 @@ function getTabData(activePage){
         casesName:casesName=='全部'?'':casesName, //模块Id
         isReject:isSingleReject, //是否单项否决
         name: name, //条目名
-        deptName: deptId, //科室名
+        deptName: deptName, //科室名
         size: 15,
         "startDate":dateStatrt,
         "endDate":dateEnd