Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/views/cxyrd/LT.vue

@@ -62,7 +62,8 @@ export default {
       let destbarcode = sessionStorage.getItem('destbarcode') || ''
       let qqid = sessionStorage.getItem('qqid') || ''
       let qid = sessionStorage.getItem('qid') || ''
-      let querytype = 1
+      // 2：正查
+      let querytype = 2
       this.$axios({
         method: 'post',
         url: '/api/matchcand/affirm/hit',
@@ -88,8 +89,35 @@ export default {
      * @return {*}
      */
     Rdwc () {
+      let self = this
       console.log('认定完成');
-
+      let affirmState = 1
+      let srcseqno = sessionStorage.getItem('srcseqno') || ''
+      let destseqno = sessionStorage.getItem('destseqno') || ''
+      let srcbarcode = sessionStorage.getItem('srcbarcode') || ''
+      let destbarcode = sessionStorage.getItem('destbarcode') || ''
+      let qqid = sessionStorage.getItem('qqid') || ''
+      let qid = sessionStorage.getItem('qid') || ''
+      // 2：正查
+      let querytype = 2
+      this.$axios({
+        method: 'post',
+        url: '/api/matchcand/affirm/finish',
+        data: {
+          affirmState,
+          srcseqno,
+          destseqno,
+          srcbarcode,
+          destbarcode,
+          qqid,
+          qid,
+          querytype
+        }
+      }).then(response => {
+        // 跟新列表数据
+        self.$bus.emit('updateFinderSource')
+        console.log(response);
+      })
     }
   },
 };

src/views/cxyrd/QueryConfirm.vue

@@ -657,7 +657,7 @@ export default {
         // 打开新页面
         let routeUrl = this.$router.resolve({
           path: "/confirm/LT",
-          query: { rowData: row }
+          query: { rowData: row.qid }
         });
         window.open(routeUrl.href, "_blank");
       }

src/views/cxyrd/modules/LTCandidate.vue

@@ -13,7 +13,7 @@
       <el-checkbox v-model="checked">显示已比中候选</el-checkbox>
     </div>
     <div class="lt_candidate_number">
-      <el-table highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" height="800" :data="tableData">
+      <el-table highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" height="800" :data="tableData" :row-class-name="tableRowClassName">
         <el-table-column label="排名" type="index" width="50">
         </el-table-column>
         <!--        <el-table-column label="排名" width="50"></el-table-column>-->
@@ -127,6 +127,7 @@ export default {
   created () {
     let self = this
     self.$bus.on('initCandidate', (tableData) => {
+      console.log(tableData);
       self.tableData = tableData
       self.total = self.tableData.length
       self.sourceTableData = tableData
@@ -135,6 +136,26 @@ export default {
   },
   methods: {
     /**
+     * @description: 比中与认定完成添加样式
+     * @param {*} row
+     * @param {*} column
+     * @param {*} rowIndex
+     * @param {*} columnIndex
+     * @return {*}
+     */
+    tableRowClassName ({ row, column, rowIndex, columnIndex }) {
+      console.log(row);
+      // 比中的行
+      if (row.affirmStatus == 2) {
+        console.log(row);
+        return "Bizhong"
+      } else if (row.affirmStatus == 1) {
+        // 认定完成的行
+        console.log(row);
+        return "Identification"
+      }
+    },
+    /**
      * @description: 切换指位选择
      * @param {*}
      * @return {*}
@@ -927,6 +948,7 @@ export default {
     handleCurrentChange (val, old) {
       let self = this
       console.log(val);
+      if (val != null) {
         // 存储目标条码号
         sessionStorage.setItem('destbarcode', val.destbarcode)
         // 存储目的数据序号
@@ -939,6 +961,20 @@ export default {
           })
       }
     }
+  },
+  watch: {
+    checked (newValue, oldValue) {
+      console.log();
+      if (newValue) {
+        this.tableData = this.sourceTableData
+      } else {
+        this.tableData = this.sourceTableData.filter(item => {
+          return item.affirmStatus != 2
+        })
+        console.log(this.tableData);
+      }
+    }
+  },
 };
 const candidates = [
   {
@@ -974,45 +1010,49 @@ const candidates = [
 ];
 </script>
 
-<style scoped lang="scss">
-div {
-  display: inline-block;
-}
+<style lang="scss">
 .lt_candidate {
   width: 100%;
   height: 100%;
   background: #f6f8fa;
   border-radius: 8px;
-}
-.lt_candidate .lt_cnadidate_search {
+  div {
+    display: inline-block;
+  }
+  .lt_cnadidate_search {
     width: 100%;
     height: 48px;
-}
-.lt_candidate .lt_cnadidate_checked {
+  }
+  .lt_cnadidate_checked {
     width: 100%;
     height: 31px;
     display: flex;
     justify-content: flex-end;
-}
-
-.lt_candidate .lt_candidate_number {
+  }
+  .lt_candidate_number {
     width: 100%;
-}
-.lt_candidate .lt_candidate_bottom {
+  }
+  .lt_candidate_bottom {
     text-align: center;
     height: 40px;
     width: 100%;
-}
-.el-select .el-input {
+  }
+  .el-select {
+    .el-input {
       width: 130px;
-}
-.input-with-select .el-input-group__prepend {
+    }
+  }
+  .input-with-select  {
+    .el-input-group__prepend {
       background-color: #fff;
-}
-.selectFinger {
+    }
+  }
+  .selectFinger {
     z-index: 10;
     position: absolute;
-  top: 187px;
+    // top: 187px;
+    // right: 60px;
+    top: 220px;
     right: 60px;
     width: 236px;
     height: 194px;
@@ -1067,6 +1107,20 @@ div {
         background: #F5F5F7;
       }
     }
-  
+  }
+  .Bizhong {
+    .cell {
+      color: #FF0039;
+    }
+  }
+  .Identification {
+    .cell {
+      color: #055FE7;
+    }
+  }
 }
+
+ 
+
+
 </style>

src/views/cxyrd/modules/LTSrc.vue

 <template>
   <div class="lt_src">
     <div class="lt_top">
-      <label>任务号：{{ tableData.qid }}</label>
+      <!-- <label>任务号：{{ tableData.qid }}</label> -->
+      <label>任务号：{{ rwh }}</label>
       <el-checkbox v-model="checked">显示已认定完成查询ID</el-checkbox>
     </div>
     <div class="lt_middle">
       <!-- 源数据区 -->
       <div class="lt_middle_src_data">
-        <el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius" :height="tableHeight" @row-click="getFirgerPrintDetail">
+        <el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius" :height="tableHeight" @row-click="getFirgerPrintDetail" :row-class-name="tableRowClassName">
           <el-table-column prop="qqid" label="查询ID" width="80"></el-table-column>
           <el-table-column prop="barcode" label="源条码号" width="190"></el-table-column>
           <el-table-column prop="maxcandidatecnt" label="枚数" width="80"></el-table-column>
@@ -42,17 +43,18 @@
 export default {
   name: "LTSrc",
   props: ["srcData"],
-  watch: {
-    srcData: {
-      immediate: true,
-      handler (val) {
-        console.info("源数据传入组件的值为===>", val);
-        this.tableData = val;
-      }
-    }
-  },
+  // watch: {
+  //   srcData: {
+  //     immediate: true,
+  //     handler (val) {
+  //       console.info("源数据传入组件的值为===>", val);
+  //       this.tableData = val;
+  //     }
+  //   }
+  // },
   data () {
     return {
+      rwh: null,
       checked: true,
       enumerate: null,
       tableData: null,
@@ -60,6 +62,7 @@ export default {
       fingerSrc: require("../../../assets/img/img.png"),
       isShowPrint: true,
       tableHeight: 368,
+      sourceDataList: [],
       dataList: [],
       total: 0,
       fingerTotal: 0,
@@ -70,6 +73,25 @@ export default {
   },
   methods: {
     /**
+     * @description: 比中与认定完成添加样式
+     * @param {*} row
+     * @param {*} column
+     * @param {*} rowIndex
+     * @param {*} columnIndex
+     * @return {*}
+     */    
+    tableRowClassName ({ row, column, rowIndex, columnIndex }) {
+      // 比中的行
+      if (row.affirmStatus == 2 || row.affirmStatus == 3) {
+        console.log(row);
+        return "Bizhong"
+      } else if (row.affirmStatus == 1) {
+        // 认定完成的行
+        console.log(row);
+        return "Identification"
+      }
+    },
+    /**
      * @description: 选择切换
      * @param {*} val
      * @param {*} old
@@ -110,7 +132,8 @@ export default {
         .post("/api/queryque/standardAll", {})
         .then(response => {
           console.log(response);
-          self.dataList = response.data.ret
+          self.sourceDataList = response.data.ret
+          self.dataList = self.sourceDataList
           self.total = response.data.ret.length
           console.log(self.dataList);
           // 默认选中第一行
@@ -135,6 +158,7 @@ export default {
     },
     // 指纹部分 增加边框
     changeStyle (index, imageInfo) {
+      console.log(imageInfo);
       let self = this
       this.isActive = index;
       console.log(this.isActive);
@@ -163,7 +187,28 @@ export default {
       }
     }
   },
+  watch: {
+    /**
+     * @description: 过滤显示已认定完成查询ID
+     * @param {*} newValue
+     * @param {*} oldValue
+     * @return {*}
+     */    
+    checked(newValue, oldValue) {
+      console.log(newValue);
+      if(newValue) {
+        this.dataList = this.sourceDataList
+      } else {
+        this.dataList = this.sourceDataList.filter(item => {
+          return item.affirmStatus != 1
+        })
+        console.log(this.dataList);
+      }
+    }
+  },
   mounted () {
+    console.log(this.$route.query.rowData);
+    this.rwh = this.$route.query.rowData
     let self = this
     // 初始状态下 展示当前任务的第一条指纹信息（指纹个数）
     // this.enumerate = datas[0].enumerate;
@@ -197,14 +242,17 @@ const datas = [
 ];
 </script>
 
-<style scoped lang="scss">
-div {
+<style lang="scss">
+.lt_src {
+  width: 100%;
+  height: 100%;
+  div {
     display: inline-block;
-}
-label {
+  }
+  label {
     margin-right: 67px;
-}
-.el-button {
+  }
+  .el-button {
     margin-left: 32px;
     width: 24px;
     height: 16px;
@@ -213,43 +261,48 @@ label {
     color: #055fe7;
     line-height: 16px;
     font-weight: 350;
-}
-.lt_src {
-  width: 100%;
-  height: 100%;
-}
-.lt_src .lt_top {
+  }
+  .lt_top {
     width: 100%;
     margin: 0 0 10px 0;
-}
-.lt_src .lt_middle {
+  }
+  .lt_middle {
     width: 100%;
     height: 100%;
     background: #ffffff;
     border-radius: 8px;
-}
-.lt_middle_src_data {
+  }
+  .lt_middle_src_data {
     border-radius: 8px;
     width: 100%;
     height: 416px;
-}
-.lt_middle_src_data .finger_print_number {
+    .Bizhong {
+      .cell {
+        color: #FF0039;
+      }
+    }
+    .Identification {
+      .cell {
+        color: #055FE7;
+      }
+    }
+    .finger_print_number {
       width: 100%;
       height: 40px;
-}
-.lt_middle_finger_print {
+    }
+  }
+  .lt_middle_finger_print {
     width: 100%;
-}
-/* 指纹部分 */
-.lt_middle_finger_print .lt_middle_finger_prints {
+    .lt_middle_finger_prints {
       background: #f6f8fa;
       margin-top: 12px;
       overflow-y: auto;
       width: 100%;
       height: 400px;
-}
-/*底部的统计数据*/
-.lt_middle_bottom {
+    }
+  }
+  /*底部的统计数据*/
+  .lt_middle_bottom {
     text-align: center;
     background: #f6f8fa;
     height: 40px;
@@ -257,9 +310,9 @@ label {
     font-size: 12px;
     font-family: MicrosoftYaHei;
     color: #999999;
-}
-/* 单个指纹*/
-.finger_print {
+  }
+  /* 单个指纹*/
+  .finger_print {
     position: relative;
     width: 106px;
     height: 106px;
@@ -272,21 +325,7 @@ label {
       top: 0;
       left: 0;
     }
-}
-.finger_print_active {
-  position: relative;
-  width: 106px;
-  height: 106px;
-  background: #ffffff;
-  border-radius: 2px;
-  border: 1px solid #055fe7;
     .finger_print_number {
-    color: #ffffff;
-    font-size: 12px;
-  }
-}
-/* 单个指纹 左上角的序号*/
-.finger_print .finger_print_number {
       font-size: 12px;
       width: 24px;
       height: 24px;
@@ -299,8 +338,8 @@ label {
       display: flex;
       justify-content: center;
       align-items: center;
-}
-.finger_print .finger_print_number_active {
+    }
+    .finger_print_number_active {
       position: absolute;
       top: 0;
       left: 0;
@@ -308,5 +347,19 @@ label {
       height: 24px;
       background: #055fe7;
       border-radius: 0px 0px 7px 0px;
+    }
+  }
+  .finger_print_active {
+    position: relative;
+    width: 106px;
+    height: 106px;
+    background: #ffffff;
+    border-radius: 2px;
+    border: 1px solid #055fe7;
+    .finger_print_number {
+      color: #ffffff;
+      font-size: 12px;
+    }
+  }
 }
 </style>