luolei преди 4 години
родител
ревизия
f964f009fb
променени са 3 файла, в които са добавени 10 реда и са изтрити 8 реда
  1. 3 1
      src/js/advice.js
  2. 5 5
      src/js/qcListDept.js
  3. 2 2
      webpack.config.js

+ 3 - 1
src/js/advice.js

@@ -167,7 +167,8 @@ $('.fpSelectCheck').on("click", function(e){
 $(".whichAdvice span").click(function(){
     let type = $(this).attr("data-type")
     if(type != adviceShow){
-        name = nameTemp = names = nameTemps = medic = medicTemp = ''
+        name = nameTemp = names = nameTemps = medic = medicTemp = fpCheckStatus = fpCheckStatusTemp = ''
+        $(".fpSelectCheck").html("全部").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         $(".moduleItemInp,.moduleItemInps,.moduleMedicInp").val('')
     }
@@ -641,6 +642,7 @@ function renderPagination(totalPage,activePage,totalNum){
 $(document).on("click", function(){
     $(".moduleTypeList ").css("display", "none")
     $(".rejectList ").css("display","none")
+    $(".fpCheckList ").css("display","none")
     $(".usedList ").css("display", "none")
     $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)

+ 5 - 5
src/js/qcListDept.js

@@ -99,7 +99,7 @@ function hasData(data){
     }
     return false;
 }
-function getTabData(activePage){
+function getTabData(activePage,qcCheckMain){
     const param = {
         current:activePage,
         behospitalCode: behospitalCode,
@@ -200,11 +200,13 @@ $(".filter").on("click", function(e){
     doctorName = doctorNameTemp
     fpCheckName = fpCheckNameTemp
     qcCheckName = qcCheckNameTemp
+
     qcCheckMain = qcCheckMainTemp
+    
     doctorNum = doctorNumTemp
     fpCheckStatus = fpCheckStatusTemp
     qcCheckStatus = qcCheckStatusTemp
-    getTabData(1)
+    getTabData(1,qcCheckMain)
 })
 
 $(".abnormalClear").on("click", function(e){
@@ -327,7 +329,6 @@ function bindOrder(){
           $(this).addClass("asc");
         }
         getTabData(1);
-        // console.log(code)
     });
 }
 function renderTab(data){
@@ -932,7 +933,6 @@ function bindColOrder(){
         }else{
             const downItem =  pageSetCopy[index]
             const downItemBack =  pageSetCopy[index + 1]
-            console.log('downItem',downItem,'downItemBack',downItemBack)
             pageSetCopy.splice(index,2,downItemBack,downItem)
             scrollTop = $(".colTabInfoBox", parent.document).scrollTop()
             renderColSet(pageSetCopy)
@@ -966,7 +966,7 @@ $(".qcCheckPeople").on("input", function(e){
 })
 $(".qcCheckMain").on("input", function(e){
     const val = $(this).val().trim()
-    qcCheckMianTemp = val
+    qcCheckMain=qcCheckMainTemp = val
 })
 $(".doctorNumInp").on("input", function(e){
   const val = $(this).val().trim();

+ 2 - 2
webpack.config.js

@@ -6,8 +6,8 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-const proxyHost = "http://192.168.2.236:5858";
-// const proxyHost = "http://192.168.2.241:5858";
+// const proxyHost = "http://192.168.2.236:5858";
+const proxyHost = "http://192.168.2.241:5858";
 // const proxyHost = "http://192.168.4.222:5858";
 // const proxyHost = "http://192.168.3.117:5858";//铁钢
 // const proxyHost = "http://192.168.3.113:5858";//王峰