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

src/views/AllPersonnelBase/gzlb.vue

@@ -19,11 +19,11 @@
         >
         </el-input>
       </div>
-      <div class='search barcode'>
+      <div class='search name'>
         <div class='item'> 姓名：</div>
         <el-input
           placeholder="请输入姓名"
-          v-model.trim="barcode"
+          v-model.trim="name"
           maxlength="50"
           show-word-limit
           clearable
@@ -33,7 +33,7 @@
       <div class="search ljfk">
         <div class="item">性别：</div>
         <el-select
-          v-model="logicDatabase"
+          v-model="sex"
           placeholder="请选择性别"
         >
           <el-option
@@ -49,7 +49,7 @@
         <div class='item'> 身份证号：</div>
         <el-input
           placeholder="请输入身份证号"
-          v-model.trim="taskNumber"
+          v-model.trim="idcard"
           maxlength="18"
           show-word-limit
           clearable
@@ -79,7 +79,7 @@
       <div class="search ljfk">
         <div class="item">案件类型：</div>
         <el-select
-          v-model="queryType"
+          v-model="caseType"
           placeholder="请选择案件类型"
         >
           <el-option
@@ -94,7 +94,7 @@
       <div class="search ljfk">
         <div class="item">提取单位：</div>
         <el-select
-          v-model="logicDatabase"
+          v-model="collectunitName"
           placeholder="请选择提取单位"
         >
           <el-option
@@ -473,6 +473,11 @@ export default {
   data () {
     return {
       barcode: "", // 条码号
+      name: '', // 姓名
+      sex: '',// 性别
+      idcard: "", // 身份证号
+      caseType: '', // 案件类型
+      collectunitName: '', // 提取单位
       logicDatabaseoptions: [
         {
           // 逻辑库
@@ -572,23 +577,38 @@ export default {
       if (this.showType == 1) {
         reqUrl = "/api/mypsn/list";
         reqParam = {
-          FollowPersonSearchReq: {},
+          selectParam: {
+            barcode: "",
+            name: "",
+            sex: null,
+            idcard: ""
+          },
           page: {
             pageSize: 10,
             currPage: 1
           }
-        };
+        }
+        reqParam.selectParam.barcode = this.barcode
+        reqParam.selectParam.name = this.name
+        reqParam.selectParam.sex = this.sex
+        reqParam.selectParam.idcard = this.idcard
       } else if (this.showType == 2) {
         // console.log('bizhong bizhong ')
         reqUrl = "/api/mycase/list";
         reqParam = {
-          FollowCaseSearchReq: {},
+          selectParam: {
+            barcode: "",
+            caseType: '',
+            collectunitName: ""
+          },
           page: {
             pageSize: 10,
             currPage: 1
           }
-        };
-
+        }
+        reqParam.selectParam.barcode = this.barcode
+        reqParam.selectParam.caseType = this.caseType
+        reqParam.selectParam.collectunitName = this.collectunitName
       }
       // console.info("请求===>", this.reqParam);
       this.$axios.post(reqUrl, reqParam).then((response) => {
@@ -872,6 +892,23 @@ export default {
         height: 32px;
       }
     }
+    .name {
+      // margin-left: 65px;
+      // margin-left: 24px;
+      .item {
+        width: 60px;
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        color: #333333;
+      }
+      /deep/.el-input.el-input--suffix {
+        width: 168px;
+        height: 32px;
+      }
+      /deep/.el-input--suffix .el-input__inner {
+        height: 32px;
+      }
+    }
     .ljfk {
       margin-left: 24px;
       .item {

src/views/AllPersonnelBase/modules/dcfptxAj.vue

@@ -50,10 +50,10 @@
             @click.native.prevent="clickitemsjlx(1)"
             :label="1"
           >原图</el-radio>
-          <el-radio
+          <!-- <el-radio
             @click.native.prevent="clickitemsjlx(2)"
             :label="2"
-          >压缩图</el-radio>
+          >压缩图</el-radio> -->
           <!-- <el-radio :label="3">特征</el-radio> -->
           <el-checkbox v-model="tz">特征</el-checkbox>
         </el-radio-group>