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

src/views/AllPersonnelBase/modules/fcx.vue

@@ -19,6 +19,7 @@
       </div>
       <div class="right">
         <div class="rightTop">
+          <div></div>
         </div>
         <div class="rightBottom">
           <div class='msg1'><span class="colorspan"></span> 本次预估剩余 <span class="numbspan">85</span> </div>
@@ -33,7 +34,13 @@
       v-if="this.type== 'ry'"
     >
       <div class='barCodeNum'>
-        <div class="point"></div>源条码号 <span>已选择 <span>3</span> 条</span>
+        <div v-if='this.rowData.length>1'>
+          <div class="point"></div>源条码号 <span>已选择 <span>3</span> 条</span>
+        </div>
+        <div v-else>
+          <div class="point"></div>源条码号 <span>{{this.rowData.barcode}}</span> <span>已选择 <span>1</span>枚</span>
+
+        </div>
       </div>
 
       <el-form
@@ -631,6 +638,11 @@ export default {
       width: 610px;
       height: 24px;
       background-color: #02c89a;
+      div {
+        width: 20px;
+        height: 12px;
+        background-color: #111;
+      }
     }
     .rightBottom {
       display: flex;

src/views/cxyrd/LT.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="lt_main">
       <div class="lt_main_left">
-        <l-t-src :src-data="srcDataList"></l-t-src>
+        <l-t-src :src-data="qid"></l-t-src>
       </div>
       <div class="lt_main_middle">
         <!-- <div class="lt_main_header">顶部工具</div>
@@ -38,13 +38,12 @@ export default {
   },
   data() {
     return {
-      srcDataList: null
+      qid: null
     };
   },
   created() {
-    this.srcDataList = this.$route.query.rowData;
-    console.log("源数据src====>", this.srcDataList);
-    console.log(this.srcDataList.barcode);
+    this.qid = this.$route.query.rowData;
+    console.log("源qid====>", this.qid);
   },
   methods: {
     /**
@@ -81,7 +80,7 @@ export default {
         // 跟新列表数据
         self.$bus.emit("updateFinderSource");
         console.log(response);
-        this.$message.success('比中成功！')
+        this.$message.success("比中成功！");
       });
     },
     /**
@@ -89,16 +88,16 @@ export default {
      * @param {*}
      * @return {*}
      */
-    Rdwc () {
-      let self = this
-      console.log('认定完成');
+    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') || ''
+      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({
@@ -118,7 +117,7 @@ export default {
         // 跟新列表数据
         self.$bus.emit("updateFinderSource");
         console.log(response);
-        this.$message.success('认定完成！')
+        this.$message.success("认定完成！");
       });
     }
   }

src/views/cxyrd/TT.vue

@@ -18,7 +18,7 @@
         </div>
         <div class="tt_main_top_table">
           <span>源条码号:{{ barcode }}</span>
-          <el-table :data="srcDataList" class="lt_candidate_table" height="150">
+          <el-table :data="tableData" class="lt_candidate_table" height="150">
             <el-table-column
               label="排名"
               type="index"
@@ -61,19 +61,36 @@ export default {
   },
   data() {
     return {
-      srcDataList: null,
+      qid: null,
+      qqid: null,
+      tableData: [],
       isFinger: true,
       isPlam: false,
       isFace: false,
-      barcode: "123455624323"
+      barcode: null
     };
   },
   created() {
-    this.srcDataList = this.$route.query.rowData;
-    console.log("源数据src====>", this.srcDataList);
-    console.log(this.srcDataList.barcode);
+    this.qid = this.$route.query.qid;
+    this.qqid = this.$route.query.qqid;
+    this.barcode = this.$route.query.barcode;
+    console.log("源qid====>", this.qid);
+    console.log("源barcode====>", this.barcode);
+    // this.search();
   },
   methods: {
+    // 加载候选人
+    search() {
+      this.$axios
+        .get("/api/query/matchcand/src", {
+          params: {
+            qqid: this.qqid
+          }
+        })
+        .then(res => {
+          console.info(res);
+        });
+    },
     finger() {
       this.isFinger = true;
       this.isPlam = false;