Merge branch 'appeal0121' into test

src/js/appealCheck.js

@@ -37,7 +37,7 @@ let moduleName = getUrlArgObjectNew("moduleName", srcUrl) || ""
 let name = getUrlArgObjectNew("name", srcUrl) || ""
 let operationType = getUrlArgObjectNew("operationType", srcUrl) || ""
 let state = getUrlArgObjectNew("state", srcUrl) || ""
-let tabList = [], deptNameTemp = "",typeList,
+let tabList = [], deptNameTemp = "", typeList,
     deptIdTemp = "",
     fpCheckStatusTemp = "", fpCheckNameTemp = "", qcCheckNameTemp = "";
 let isPlacefile = getCookie('isPlacefile') || 1
@@ -56,19 +56,19 @@ $('.iconCalen').on("click", function (e) {
 $(".menu .page", parent.document).removeClass("active")
 $(parent.document).find(".menu .page[code=YH-SSXX-SSSH]").addClass("active")
 if (deptName) {
-    $('.selectDept').html(deptName).attr("title",deptName)
+    $('.selectDept').html(deptName).attr("title", deptName)
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if (moduleName) {
-    $('.selectModular').html(moduleName).attr("title",moduleName)
+    $('.selectModular').html(moduleName).attr("title", moduleName)
     $(".selectModular").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if (operationType) {
-    $('.selectType').html(operationType).attr("title",operationType)
+    $('.selectType').html(operationType).attr("title", operationType)
     $(".selectType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if (state) {
-    $('.qcSelectCheck').html(state).attr("title",state)
+    $('.qcSelectCheck').html(state).attr("title", state)
     $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if (name) {
@@ -192,9 +192,9 @@ $(".abnormalClear").on("click", function (e) {
     state = ""
     moduleName = ""
     operationType = ""
-    name =""
+    name = ""
     $('.name').val(''),
-    data_desc = ["leave_hospital_date"]
+        data_desc = ["leave_hospital_date"]
     if (isPlacefile != 1) {
         data_desc = ["behospital_date"]
     }
@@ -280,7 +280,7 @@ function renderTab(data) {
                 <td >${item.behospitalCode}</td>
                 <td >${item.name || "-"}</td>
                 <td >${item.modeName || "-"}</td>
-                <td >${item.qcresultDetailMsg || "-"}</td>
+                ${item.qcresultDetailMsg && item.qcresultDetailMsg.length > 30 ? `<td title=${item.qcresultDetailMsg}>${item.qcresultDetailMsg.substring(0,30)+'...' || "-"}</td>` : `<td>${item.qcresultDetailMsg || "-"}</td>`}
                 <td >${item.checkName || "-"}</td>
                 <td >${item.checkGmtCreate || "-"}</td>
                 <td >${item.appealOperationType == 0 ? '删改条目' : item.appealOperationType == 1 ? '新增已有条目' : item.appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</td>
@@ -426,10 +426,10 @@ function renderTypeList(data) {
     }
     $('.typeList').html(str)
     if (operationType) {
-        $('.selectType').html(data[operationType]).attr("title",data[operationType])
+        $('.selectType').html(data[operationType]).attr("title", data[operationType])
         $(".selectType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     }
-   
+
     bindTypedSelect()
 }
 //操作类型选择
@@ -452,7 +452,7 @@ function renderStatusList(data) {
     $('.qcCheckList').html(str)
     bindCheckedSelectQc()
     if (state) {
-        $('.qcSelectCheck').html(data[state]).attr("title",data[state])
+        $('.qcSelectCheck').html(data[state]).attr("title", data[state])
         $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     }
 }

src/js/appealHistory.js

@@ -413,7 +413,7 @@ function renderTab(data) {
                 <td >${item.behospitalCode}</td>
                 <td >${item.name || "-"}</td>
                 <td >${item.modeName || "-"}</td>
-                <td >${item.qcresultDetailMsg || "-"}</td>
+                ${item.qcresultDetailMsg && item.qcresultDetailMsg.length > 30 ? `<td title=${item.qcresultDetailMsg}>${item.qcresultDetailMsg.substring(0,30)+'...' || "-"}</td>` : `<td>${item.qcresultDetailMsg || "-"}</td>`}
                 <td >${item.checkName || "-"}</td>
                 <td >${item.checkGmtCreate || "-"}</td>
                 <td >${item.appealOperationType == 0 ? '删改条目' : item.appealOperationType == 1 ? '新增已有条目' : item.appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</td>

src/js/appealUserPage.js

@@ -508,6 +508,7 @@ $(function () {
     $("#delModal .confirm").off("click");
     $("#addQcScore,#addQcMsg,#addQcInfo").off("input");
     $("#delModal .confirm").show();
+    $('.modal-body').scrollTop(100);
     if (flag === '0') {   //申诉
       getCheckUser(); //获取审核人列表
       getQcCasesEntry()

src/js/utils.js

@@ -382,7 +382,6 @@ function setBoxHeight() {
     $('.content-box').height(ht - 60 + 'px');
   }
   //$('.content-box').height(ht - 60 + 'px');
-  console.log(ht);
   $('.flaw-table').height(ht - 70 + 'px');
   $('.content-ht').height(ht - 120 + 'px');
   $('.scroll-table tbody').css('max-height', ht - 210 + 'px');