update code

src/pages/engin/auditingPage.vue

@@ -409,7 +409,7 @@ export default {
           d.percent = (d.value * 100.0 / sum).toFixed(2);
         });
       }
-      this.label2 = `项目审批排名 (${sum})`
+      this.label2 = `工程审批排名 (${sum})`
       let objs = [];
       let prjIds = this.prjs.map(d => d.id).filter(d => d > 0);
       tmps.forEach(d => {
@@ -421,10 +421,10 @@ export default {
         let out = objs.filter(d => d.id == this.project.id);
         if (out.length == 0) {
           this.flowList = [{ id: this.project.id, name: this.project.projectName, value: 0, percent: 0, no: '-' }];
-          this.label2 = `项目审批排名 (0)`
+          this.label2 = `工程审批排名 (0)`
         } else {
           this.flowList = out;
-          this.label2 = `项目审批排名 (${out[0].value})`
+          this.label2 = `工程审批排名 (${out[0].value})`
         }
       } else {
         this.flowList = objs;

src/pages/projectQuality.vue

@@ -489,6 +489,7 @@ export default {
         deptId: this.dept?.id || 0,
         projectId: this.projectInfo.id,
         checkType: this.samplingNav,
+        data:this.chkDetection
       });
     },
     doShowMeasuredDlg() {

src/pages/quality/checkDetectionDlg.vue

@@ -34,8 +34,12 @@
                     </svg>
                 </i>
             </div>
+            <div class="head-title-tab" style="padding: 10px 0px;max-width: unset;margin-top:10px;margin-left:40px;">
+                <div  :class="nav == 0 ? 'head-nav active' : 'head-nav'" @click="doNav(0)">审批中({{ total1}})</div>
+                <div  :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(1)">已完成({{ total2}})</div>
+            </div>
             <template v-if="dataTable.length>0">
-            <div class="data-list scroll" style="max-height:730px;overflow-y: auto;margin:12px 0px;overflow-x: hidden;" >
+            <div class="data-list scroll" style="max-height:670px;overflow-y: auto;margin:12px 0px;overflow-x: hidden;" >
                 <div v-for="(it, idx) in dataTable" :key="idx" class="data-item"
                     :class="it.timeout ? 'time-out' : ''">
                     <div class="item-left">
@@ -168,10 +172,13 @@ export default {
             title:'',
             size: 10,
             index: 1,
+            nav:0,
             total: 0,
             show: false,
             dataTable: [],
-            opt:{}
+            opt:{},
+            total1:0,
+            total2:0,
         };
     },
 
@@ -192,13 +199,21 @@ export default {
         toggleNav(n) {
             this.nav = n;
         },
+        doNav(n){
+            this.nav=n;
+            this.loadData();
+        },
         showDialog(opt) {
             this.show = true    
+            this.nav=0;
             this.opt=opt;
+            this.total1=opt.data.chk1*1-opt.data.chk3*1;
+            this.total2=opt.data.chk3;
             this.loadData();
         },
         loadData(){
             this.$api.checkDetection.getList({
+                detectionResult:this.nav==0?0:1,
                 ...this.opt
             },this.size,this.index).then(d=>{
                 this.total=d.total||0;
@@ -232,8 +247,7 @@ export default {
             top: 20px;
             right: 100px;
         }
-    }
+    }    
-
     &.font-size-2 {
         .head-title-tab {
             .head-nav {
@@ -286,7 +300,7 @@ export default {
             background-size: 100% 100%;
             display: inline-block;
             width: auto;
-            padding: 0px 24px;
+            padding: 0px 32px;
         }
     }