Merge remote-tracking branch 'origin/versionV1.3.5' into test

src/css/deptScoreDetailControl.less

@@ -216,7 +216,7 @@
         border: 1px solid #777;
         box-sizing: border-box;
         cursor: pointer;
-        margin-left: 10px;
+        margin:0 0 20px 10px;
         float: left;
         top: 0px;
     }

src/js/api.js

@@ -81,7 +81,8 @@ const api = {
     exportQcList:'/qc/behospitalInfo/exportQcresult',//质控评分导出
     exportQcListDept:'/qc/behospitalInfo/exportQcresultByDept',//质控评分（科室）导出
     exportQcDocteam:'/qc/behospitalInfo/exportQcresultByGroup', //质控评分（医疗组）导出
-    exportDeptFlaws:'/console/export/levelExport',       //各科室缺陷占比导出
+    exportDeptFlaws:'/console/export/levelExport',       //各科室缺陷占比导出-长兴
+    exportDeptFlawsTz:'/console/export/levelExport_TZ', //各科室缺陷占比导出-台州
     exportIndexQualified:'/console/export/homePageLevelExport',       //病案首页合格率占比导出
     exportItemFlaw:'/console/export/entryGroupByEntryExport',       //条目缺陷占比导出
     entryRejectPercent:'/console/entryRejectPercent',//单项否决占比

src/js/deptScoreDetailControl.js

@@ -601,8 +601,9 @@ $(function() {
       "type": statisticsType||2, //1-本月，2-本年
       "startDate":dateStatrt,
       "endDate":dateEnd
-    }
-    expJson(api.exportDeptFlaws,param).then(res =>{
+    };
+    const url = hospital == '台州市立'?api.exportDeptFlawsTz:api.exportDeptFlaws;
+    expJson(url,param).then(res =>{
       downloadExportedData(res.data, dateStatrt.slice(0,10).replace(/-/g,"")+"-"+dateEnd.slice(0,10).replace(/-/g,"")+"各科室缺陷占比.xls")
     })
 

src/js/qcListDocteam.js

@@ -65,7 +65,7 @@ $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
   //判断有无某一权限
 function hasData(data){
     let trdObj = JSON.parse(getCookie("trdObj"))
-    let lis = trdObj['YH-BLZK-ZKPFKS']
+    let lis = trdObj['YH-BLZK-ZKPFYLZ']
     if(!lis){
       return false
     }

src/js/qcScore.js

@@ -17,9 +17,13 @@ $(function(){
   let global_flaws=[];  //缺陷条目列表缓存
   let global_selectedFlaw = {};    //新增时选中的条目信息
   getAllModules();
-  $(".add-flaw").click(function(){
-    getQcCasesEntry();
-  });
+  let hasAu3 = hasData('FUNC000011');   //新增缺陷权限
+  if(hasAu3){
+    $(".add-flaw").click(function(){
+      getQcCasesEntry();
+    });
+  }
+
 function initMenu(data){
   const menu=[{id:0,name:"缺陷总览",parentId: -1,sonMode: []},...(data||[])];
   //菜单数据填充
@@ -201,8 +205,8 @@ function initList(data){
 //评分项数据填充
 function initScoreItem(data){
   $("#flaws .flaw-box").html("");
-  let hasAu = hasData('FUNC000013')
-  let hasAu2 = hasData('FUNC000012')
+  let hasAu = hasData('FUNC000013');    //修改缺陷权限
+  let hasAu2 = hasData('FUNC000012');   //删除缺陷权限
   for(let k in data){
     $("#flawTmpl").tmpl(data[k]).appendTo("#flaws .flaw-box");
   }
@@ -211,7 +215,7 @@ function initScoreItem(data){
     const i = $(".flaw-item[code="+global_activeTab+"]").index($(this).parents(".flaw-item"));
     const code=$(this).attr("code");
     const isEdit = $(this).is(".edit-flaw");
-    if(!hasAu)return
+    //if(!hasAu)return
     if(isEdit&&hasAu){
       showModal('0',code,i);
     }else if(!isEdit&&hasAu2){
@@ -220,6 +224,7 @@ function initScoreItem(data){
   })
   $(".edit-flaw").css({"opacity":hasAu?"1":"0.5",cursor:hasAu?"pointer":"unset"});
   $(".del-flaw").css({"opacity":hasAu2?"1":"0.5",cursor:hasAu2?"pointer":"unset"});
+  $(".add-flaw").css({"opacity":hasAu3?"1":"0.5",cursor:hasAu3?"pointer":"unset"});
   $(".flaw-item .title a[href]").click(function(){
     const id = $(this).attr("href");
     const anchors=$(this).attr("anchors").split(",");