问题修改

src/css/appealExamine.less

@@ -74,13 +74,15 @@ h2 {
   .history {
     overflow: hidden;
     .box {
-      float: left;
       margin: 0 12px;
       margin-top: 15px;
       & span {
         padding-right: 15px;
       }
     }
+    .box:first-child{
+      border-top: none!important;
+    }
   }
 }
 .goback {

src/js/appealCheck.js

@@ -28,7 +28,8 @@ let srcUrl = $("#contentIframe", parent.document).attr("src")
 let statisticsType = getUrlArgObjectNew("dateType", srcUrl) || getUrlArgObjectNew("shijian", srcUrl) || ""
 let startDateParam = getUrlArgObjectNew("startDateParam", srcUrl) || ""
 let endDateParam = getUrlArgObjectNew("endDateParam", srcUrl) || ""
-let tabList = [],  deptName = "", deptNameTemp = "", behosDateStart = "", behosDateEnd = "", nameTemp = "", casesName = "", operationType = "",
+let page = getUrlArgObjectNew("page", srcUrl) || 1
+let tabList = [], deptName = "", deptNameTemp = "", behosDateStart = "", behosDateEnd = "", nameTemp = "", casesName = "", operationType = "",
     deptId = "", deptIdTemp = "",
     fpCheckStatusTemp = "", fpCheckNameTemp = "", qcCheckNameTemp = "", state = "";
 let isPlacefile = getCookie('isPlacefile') || 1
@@ -61,7 +62,7 @@ function getTabData(activePage) {
         name: nameTemp,
         complaintDateEnd: behosDateEnd.replace(/\//g, '-'),
         complaintDateStart: behosDateStart.replace(/\//g, '-'),
-        "desc":['claimant_gmt_create']
+        "desc": ['claimant_gmt_create']
     }
     $('.pagination').html("")
     $('.tbody').html(emptyBox('努力加载中...', '',))
@@ -113,10 +114,11 @@ $(".filter").on("click", function (e) {
     qcCheckName = qcCheckNameTemp
     fpCheckStatus = fpCheckStatusTemp
     qcCheckStatus = state
-    getTabData(1)
+    getTabData(page)
 })
 
 $(".abnormalClear").on("click", function (e) {
+    page = 1
     tabList = [];
     behospitalCode = "";
     scoreSum = 0;
@@ -184,7 +186,7 @@ $(".abnormalClear").on("click", function (e) {
     $(".modularList").css("display", "none")
     $(".selectModular").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectModular ').addClass('unSelect')
-     $('.selectType').html('全部')
+    $('.selectType').html('全部')
     $(".typeList ").css("display", "none")
     $(".selectType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $('.qcSelectCheck').html('全部')
@@ -204,7 +206,7 @@ $(".abnormalClear").on("click", function (e) {
     if (behosDateEnd) {
         behosDateEnd = behosDateEnd.replace(/\//g, '-') + ' 23:59:59'
     }
-    getTabData(1)
+    getTabData(page)
 })
 
 function renderTab(data) {
@@ -243,7 +245,7 @@ function renderTab(data) {
         let casesEntryId = $(this).parent().attr("data-casesEntryId")
         let qcresultDetailId = $(this).parent().attr("data-qcresultDetailId")
         let appealOperationType = $(this).parent().attr("data-appealOperationType")
-        $(parent.document).find("#contentIframe").attr("src", "appealExamine.html?id=" + id + "&hospitalId=" + hospitalId + "&behospitalCode=" + behospitalCode + "&casesEntryId=" + casesEntryId + "&qcresultDetailId=" + qcresultDetailId + "&appealOperationType=" + appealOperationType + "&form=" + 1)
+        $(parent.document).find("#contentIframe").attr("src", "appealExamine.html?id=" + id + "&hospitalId=" + hospitalId + "&behospitalCode=" + behospitalCode + "&casesEntryId=" + casesEntryId + "&qcresultDetailId=" + qcresultDetailId + "&appealOperationType=" + appealOperationType + "&page=" + page + "&form=" + 1)
     })
     $(".goHomeDetail1").click(function () {
         let id = $(this).parent().attr("data-id")
@@ -252,7 +254,7 @@ function renderTab(data) {
         let casesEntryId = $(this).parent().attr("data-casesEntryId")
         let qcresultDetailId = $(this).parent().attr("data-qcresultDetailId")
         let appealOperationType = $(this).parent().attr("data-appealOperationType")
-        $(parent.document).find("#contentIframe").attr("src", "appealExamine.html?id=" + id + "&hospitalId=" + hospitalId + "&behospitalCode=" + behospitalCode + "&casesEntryId=" + casesEntryId + "&qcresultDetailId=" + qcresultDetailId + "&appealOperationType=" + appealOperationType + "&form=" + 2)
+        $(parent.document).find("#contentIframe").attr("src", "appealExamine.html?id=" + id + "&hospitalId=" + hospitalId + "&behospitalCode=" + behospitalCode + "&casesEntryId=" + casesEntryId + "&qcresultDetailId=" + qcresultDetailId + "&appealOperationType=" + appealOperationType + "&page=" + page + "&form=" + 2)
     })
 }
 
@@ -317,7 +319,7 @@ getmoduleList()
 
 //获取模块类型
 function getmoduleList() {
-    post(api.getAppealMode,{pageType:2}).then(res => {
+    post(api.getAppealMode, { pageType: 2 }).then(res => {
         if (res.data.code == '0') {
             const moduleTypeList = res.data.data
             renderModuleList(moduleTypeList)
@@ -425,7 +427,7 @@ $('.selectDept').on("click", function (e) {
 //获取科室列表
 getDeptList()
 function getDeptList() {
-    post(api.getAppealDept, { inputStr: "",pageType:2}).then(res => {
+    post(api.getAppealDept, { inputStr: "", pageType: 2 }).then(res => {
         if (res.data.code == '0') {
             const deptList = res.data.data
             rendeDeptList(deptList)
@@ -729,7 +731,7 @@ $(function () {
         changeYear: true,
         dateFormat: "yy/mm/dd"
     }).datepicker("setDate", "");
-    getTabData(1)
+    getTabData(page)
 });
 
 //分页渲染
@@ -771,11 +773,13 @@ function renderPagination(totalPage, activePage, totalNum) {
     $('.page' + activePage).addClass('activePage')
     $(".pageNum").on("click", function (e) {
         const activePageNow = Number($(this).attr('data-page'))
+        page = activePageNow
         getTabData(activePageNow)
         // renderPagination(totalPage,activePageNow,totalNum)
     })
     $(".prePage").on("click", function (e) {
         let activePageNow = Number($(".activePage").attr('data-page'))
+        page = activePageNow
         if (activePageNow > 1) {
             activePageNow--
             getTabData(activePageNow)
@@ -784,6 +788,7 @@ function renderPagination(totalPage, activePage, totalNum) {
     })
     $(".nextPage").on("click", function (e) {
         let activePageNow = Number($(".activePage").attr('data-page'))
+        page = activePageNow
         if (activePageNow < totalPage) {
             activePageNow++
             getTabData(activePageNow)
@@ -825,7 +830,7 @@ $((function ($) {
             name: nameTemp,
             complaintDateEnd: behosDateEnd.replaceAll("/", "-"),
             complaintDateStart: behosDateStart.replaceAll("/", "-"),
-            "desc":['claimant_gmt_create']
+            "desc": ['claimant_gmt_create']
         }
         expJson(api.getAppealReviewExport, param).then(res => {
             downloadExportedData(res.data, "申诉审核.xls")

src/js/appealExamine.js

@@ -28,6 +28,7 @@ const casesEntryId = getUrlArgObjectNew("casesEntryId", srcUrl) || "";
 const qcresultDetailId = getUrlArgObjectNew("qcresultDetailId", srcUrl) || "";
 const appealOperationType = getUrlArgObjectNew("appealOperationType", srcUrl) || "";
 const form = getUrlArgObjectNew("form", srcUrl) || "";
+const page = getUrlArgObjectNew("page", srcUrl) || "";
 let appealInfo, appealExamineRecordDTOList, auditNumber;
 (function () {
     getApprovedView()
@@ -148,7 +149,7 @@ function getHistory(data) {
     let str = ''
     for (let i = 0; i < data.length; i++) {
         const item = data[i]
-        str += `<div class="box">
+        str += `<div class="box" style="border-top: 1px solid #333;margin-top: 10px;padding-top: 10px;">
             <p class="con-title"><span>申诉时间：${item.appealCreateDate || '-'}</span><span>申诉人：${item.claimantName || '-'}</span><span>审核人：${item.checkName || '-'}</span></p>
             <p class="con-title">操作类型：${item.appealOperationType == 0 ? '删改条目' : item.appealOperationType == 1 ? '新增已有条目' : item.appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</p>
             ${item.appealOperationType == 1 ?
@@ -159,7 +160,7 @@ function getHistory(data) {
                 `:""}
             <p class="con-title">申诉说明：${item.appealExplain || '-'}</p>
             ${item.exampleStatus == 2 ?
-                `<p class="con-title" style="border-top: 1px solid #333;margin-top: 10px;padding-top: 10px;"><span>审核时间：${item.appealExamineDate || '-'}</span><span>审核人：${item.checkName || '-'}</span></p>
+                `<p class="con-title" ><span>审核时间：${item.appealExamineDate || '-'}</span><span>审核人：${item.checkName || '-'}</span></p>
                 <p class="con-title">审核结果：审核通过</p>
                 <p class="con-title">处理方式：${item.exampleOperation == 1 ? '修改' : item.exampleOperation == 2 ? '删除' : item.exampleOperation == 3 ? '新增已有' : item.exampleOperation == 4 ? '新增缺失' : '恢复条目'}</p>
                 <p class="con-title">质控条目：${item.casesEntryName || '-'}</p>
@@ -167,7 +168,7 @@ function getHistory(data) {
                 <p class="con-title">分值：${item.score || '-'}</p>
                 <p class="con-title">备注：${item.exampleRemark || '-'}</p>`
                 : item.exampleStatus == 1 ?
-                    `<p class="con-title" style="border-top: 1px solid #333;margin-top: 10px;padding-top: 10px;">审核时间：${item.appealExamineDate || '-'}</p>
+                    `<p class="con-title" >审核时间：${item.appealExamineDate || '-'}</p>
                 <p class="con-title">审核结果：驳回</p>
                 <p class="con-title">驳回理由：${item.rejectReason || '-'}</p>`
                     : ""}
@@ -219,10 +220,10 @@ $(document).on("click", ".btn-sure", (e) => {
 $(document).on("click", ".goback", (e) => {
     console.log(form);
     if (form == 1 || form == 2) {
-        $(parent.document).find("#contentIframe").attr("src", './appealCheck.html');
+        $(parent.document).find("#contentIframe").attr("src", './appealCheck.html?page='+ page);
     } else {
         console.log(123);
-        $(parent.document).find("#contentIframe").attr("src", './appealHistory.html');
+        $(parent.document).find("#contentIframe").attr("src", './appealHistory.html?page='+ page);
     }
 
 });

src/js/appealHistory.js

@@ -31,6 +31,7 @@ let srcUrl = $("#contentIframe", parent.document).attr("src")
 let statisticsType = getUrlArgObjectNew("dateType", srcUrl) || getUrlArgObjectNew("shijian", srcUrl) || ""
 let startDateParam = getUrlArgObjectNew("startDateParam", srcUrl) || ""
 let endDateParam = getUrlArgObjectNew("endDateParam", srcUrl) || ""
+let page = getUrlArgObjectNew("page", srcUrl) || 1
 let tabList = [], deptName = "", deptNameTemp = "", behosDateStart = "", behosDateEnd = "", moduleName = "", operationType = "",
     deptId = "", deptIdTemp = "",
     fpCheckStatusTemp = "", fpCheckNameTemp = "", qcCheckNameTemp = "", state = "",
@@ -50,11 +51,11 @@ $('.iconCalen').on("click", function (e) {
 $(".menu .page", parent.document).removeClass("active")
 $(parent.document).find(".menu .page[code=YH-SSXX-SSJL]").addClass("active")
 
-function getTabData(activePage) {
+function getTabData(page) {
     const behosDateStart = getPickerDate($("#datepicker"), 1)
     const behosDateEnd = getPickerDate($("#datepicker2"), 2)
     const param = {
-        current: activePage,
+        current: page,
         deptId: deptId.trim(),
         deptName: deptName == "全部" ? "" : deptName || '',
         modeName: moduleName == "全部" ? "" : moduleName || '',
@@ -117,10 +118,11 @@ $(".filter").on("click", function (e) {
     qcCheckName = qcCheckNameTemp
     fpCheckStatus = fpCheckStatusTemp
     qcCheckStatus = state
-    getTabData(1)
+    getTabData(page)
 })
 
 $(".abnormalClear").on("click", function (e) {
+    page = 1
     tabList = [];
     scoreSum = 0;
     deptId = "";
@@ -206,7 +208,7 @@ $(".abnormalClear").on("click", function (e) {
     if (behosDateEnd) {
         behosDateEnd = behosDateEnd.replace(/\//g, '-') + ' 23:59:59'
     }
-    getTabData(1)
+    getTabData(page)
 })
 
 getmoduleList()
@@ -392,14 +394,14 @@ function renderTab(data) {
         let casesEntryId = $(this).parent().attr("data-casesEntryId")
         let qcresultDetailId = $(this).parent().attr("data-qcresultDetailId")
         let appealOperationType = $(this).parent().attr("data-appealOperationType")
-        $(parent.document).find("#contentIframe").attr("src", "appealExamine.html?id=" + id + "&hospitalId=" + hospitalId + "&behospitalCode=" + behospitalCode + "&casesEntryId=" + casesEntryId + "&qcresultDetailId=" + qcresultDetailId + "&appealOperationType=" + appealOperationType + "&form=" + 3)
+        $(parent.document).find("#contentIframe").attr("src", "appealExamine.html?id=" + id + "&hospitalId=" + hospitalId + "&behospitalCode=" + behospitalCode + "&casesEntryId=" + casesEntryId + "&qcresultDetailId=" + qcresultDetailId + "&appealOperationType=" + appealOperationType+ "&page=" + page + "&form=" + 3)
     })
 }
 
 function cancelAppealInfo(id) {
     post(api.cancelAppealInfo, { id: id }).then(function (res) {
         if (res.data.code === '0') {
-            getTabData(1)
+            getTabData(page)
             $("#delModal").hide();
             $.alerModal({ "message": "撤回成功", type: "tip", time: '1000', win: true });
         } else {
@@ -442,7 +444,7 @@ function addAppealInfo(data) {
     }
     post(api.addAppealInfo, param).then(function (res) {
         if (res.data.code === '0') {
-            getTabData(1)
+            getTabData(page)
             $("#delModal").hide();
             $.alerModal({ "message": "申诉成功", type: "tip", time: '1000', win: true });
         } else {
@@ -853,7 +855,7 @@ $(function () {
         changeYear: true,
         dateFormat: "yy/mm/dd"
     }).datepicker("setDate", "");
-    getTabData(1)
+    getTabData(page)
 });
 
 //分页渲染
@@ -895,11 +897,13 @@ function renderPagination(totalPage, activePage, totalNum) {
     $('.page' + activePage).addClass('activePage')
     $(".pageNum").on("click", function (e) {
         const activePageNow = Number($(this).attr('data-page'))
+        page = activePageNow
         getTabData(activePageNow)
         // renderPagination(totalPage,activePageNow,totalNum)
     })
     $(".prePage").on("click", function (e) {
         let activePageNow = Number($(".activePage").attr('data-page'))
+        page = activePageNow
         if (activePageNow > 1) {
             activePageNow--
             getTabData(activePageNow)
@@ -908,6 +912,7 @@ function renderPagination(totalPage, activePage, totalNum) {
     })
     $(".nextPage").on("click", function (e) {
         let activePageNow = Number($(".activePage").attr('data-page'))
+        page = activePageNow
         if (activePageNow < totalPage) {
             activePageNow++
             getTabData(activePageNow)

src/js/appealUserPage.js

@@ -432,6 +432,7 @@ $(function () {
   //新增申诉
   function addScore(info) {
     let param = {};
+    console.log(info);
     if (info.type === '1') {
       param = {
         "appealExplain": info.appealExec,
@@ -462,19 +463,19 @@ $(function () {
         "remark": info.explainInfo,
       };
     }
-    // post(api.addAppealInfo, param).then(function (res) {
-    //   if (res.data.code === '0') {
-    //     $("#delModal").hide();
-    //     //updateFlaws(res.data.data);
-    //     $.alerModal({ "message": "申诉成功", type: "tip", win: true, time: '1000' });
-    //   } else {
-    //     $.alerModal({ "message": res.data.msg || '申诉失败,请重试~', type: "tip", win: 'default', time: '1000' });
-
-    //   }
-    // }).catch(() => {
-    //   $.alerModal({ "message": res.data.msg || '申诉失败,请重试~', type: "tip", win: 'default', time: '1000' });
-
-    // });
+    post(api.addAppealInfo, param).then(function (res) {
+      if (res.data.code === '0') {
+        $("#delModal").hide();
+        //updateFlaws(res.data.data);
+        $.alerModal({ "message": "申诉成功", type: "tip", win: true, time: '1000' });
+      } else {
+        $.alerModal({ "message": res.data.msg || '申诉失败,请重试~', type: "tip", win: 'default', time: '1000' });
+
+      }
+    }).catch(() => {
+      $.alerModal({ "message": res.data.msg || '申诉失败,请重试~', type: "tip", win: 'default', time: '1000' });
+
+    });
   }
 
   function getAppealDetail(id, flg, casesEntryId, qcresultDetailId) {