Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

src/views/AllPersonnelBase/AllPersonnelBase.vue

@@ -616,7 +616,9 @@ export default {
     },
     isShowFcxBtn1 (val) {
       console.log('单行人员发查询数据', val)
-      this.rowData = val
+      let rowVal = [];
+      rowVal.push(val)
+      this.rowData = rowVal
       this.isShowFcx = true;
     },
     closeFcx (val) {

src/views/AllPersonnelBase/qbalk.vue

@@ -32,7 +32,7 @@
           @click="batch"
         >批量操作</div>
         <el-checkbox-group
-          v-model="reqParam.caseStoreCustomSearchReq.checkboxQuery"
+          v-model="reqParam.caseStoreCustomSearchReq.caseCheckboxQuery"
           @change="searchCheckList"
         >
           <el-checkbox label="shouwen">手纹</el-checkbox>
@@ -368,7 +368,7 @@ export default {
         caseStoreCustomSearchReq: {
           barcode: '',// 搜索条码
           searchOptions: '',// 通用搜索
-          checkboxQuery: [],// 条件查询
+          caseCheckboxQuery: [],// 条件查询
 
         },
         page: {
@@ -474,8 +474,8 @@ export default {
     //滚动平面等筛选条件
     searchCheckList (val) {
       console.log(val, '筛选条件')
-      this.reqParam.page.checkboxQuery = val
-      console.log(this.reqParam.page.checkboxQuery)
+      this.reqParam.page.caseCheckboxQuery = val
+      console.log(this.reqParam.page.caseCheckboxQuery)
       this.search()
     },
     // 复制条码号 获取选中条码值
@@ -569,7 +569,9 @@ export default {
     },
     isShowFcxBtn1 (val) {
       console.log('单行案件发查询数据', val)
-      this.rowData = val
+      let rowVal = [];
+      rowVal.push(val)
+      this.rowData = rowVal
       this.isShowFcx = true;
     },
     closeFcx (val) {