Merge remote-tracking branch 'origin/referMasterBak'

src/html/quexianDetail.html

@@ -52,9 +52,9 @@
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
                     <th class="moduleItemName desc" code="casesName">所属模块</th>
-                    <th class="moduleItemName">缺陷名称</th>
-                    <th class="moduleItemName textCenter">数量</th>
-                    <th class="moduleScore" style="width: 80px;">缺陷占比</th>
+                    <th class="moduleItemName" code="name">缺陷名称</th>
+                    <th class="moduleItemName textCenter" code="num">数量</th>
+                    <th class="moduleScore" style="width: 100px;" code="percent">缺陷占比</th>
                 </thead>
                 <tbody>
                     

src/js/qcScore.js

@@ -479,7 +479,7 @@ function formatFlawKeys(data){
     const module=global_modules[mid].moduleDetail;
     const key = global_modules[mid].modeName.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,'');
     let hml = '<div class="content-item" code="'+key+'">' +
-      '<h2 class="title">'+global_modules[mid].modeName+'('+mid+')</h2>' +
+      '<h2 class="title">'+global_modules[mid].modeName+'</h2>' +
       (n>1?'<div class="container">':'<div class="container content-ht">');
 
     for(let i in module){

src/js/singleVeto.js

@@ -26,11 +26,11 @@ $(function(){
     selectReject = getUrlArgObjectNew("selectReject",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     special = getUrlArgObjectNew("special",srcUrl)||""
-    name = getUrlArgObjectNew("qxName",srcUrl)||""
+    name=nameTemp = getUrlArgObjectNew("qxName",srcUrl)||""
     casesName =casesNameTemp = getUrlArgObjectNew("model",srcUrl)||""
     if(name){
-        $(".moduleItemInp").attr("title",name)
-        $(".moduleItemInp").val(name)
+        $(".moduleItemInp").attr("title",name).val(name)
+        selectReject=1
     }
     if(casesName){
         $(".selectModuleType").html(casesName).attr("title",casesName).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -191,32 +191,7 @@ function hasData(data){
     }
     return false;
 }
-//获取表格数据
-function getTabDatas(activePage){
-    const param = {
-        current:activePage,
-        casesId: casesId,
-        name: name, //条目名
-        isReject: isReject, //1-单项否决 0-非
-        isUsed: isUsed, //0-未启用 1-启用
-        size: 15
-    }
-    post(api.getQcCasesEntryAll,param).then(res =>{
-        if(res.data.code == '0'){
-            const data = res.data.data.records
-            const totalPage = res.data.data.pages
-            const totalNum = res.data.data.total
-            renderTab(data,activePage)
-            if(totalPage > 1){
-                renderPagination(totalPage,Number(activePage),totalNum)
-            } else{
-                $('.pagination').html("")
-            }
-        }else{}
-    }).catch((e) =>{
-    
-    })
-}
+
 $(".moduleItemInp").on("input", function(e){
     const val = $(this).val().trim()
     nameTemp = val
@@ -457,7 +432,7 @@ function bindRejectSelect(){
     $('.rejectItem').on("click",function(){
         const rejectItemName = $(this).attr("data-name")
         const rejectItemId = $(this).attr("data-id")
-        isSingleRejectTemp=rejectItemId
+        isSingleReject=isSingleRejectTemp=rejectItemId
         $('.selectReject').html(rejectItemName)
         $(".rejectList ").css("display", "none")
         $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)