Merge remote-tracking branch 'origin/master'

dangan-ui/src/views/dangan/qyz/index.vue

@@ -25,15 +25,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="姓名1" prop="name1">
+      <el-form-item label="姓名" prop="name1">
         <el-input
           v-model="queryParams.name1"
-          placeholder="请输入姓名1"
+          placeholder="请输入姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="性别1" prop="sex1">
+<!--      <el-form-item label="性别1" prop="sex1">
         <el-input
           v-model="queryParams.sex1"
           placeholder="请输入性别1"
@@ -120,7 +120,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
 <!--      <el-form-item label="迁移原因" prop="qyReason">
         <el-input
           v-model="queryParams.qyReason"
@@ -161,14 +161,14 @@
                         placeholder="签发有效时间止">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="承办人" prop="cbr">
+<!--      <el-form-item label="承办人" prop="cbr">
         <el-input
           v-model="queryParams.cbr"
           placeholder="请输入承办人"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="是否纠错" prop="errorCorrect">
         <el-select
           v-model="queryParams.errorCorrect"

dangan-ui/src/views/dangan/zfnyhkcg/index.vue

@@ -33,7 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="与申请人关系1" prop="relation1">
+      <!--     <el-form-item label="与申请人关系1" prop="relation1">
         <el-input
           v-model="queryParams.relation1"
           placeholder="请输入与申请人关系1"
@@ -168,7 +168,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="承办人" prop="cbr">
         <el-input
           v-model="queryParams.cbr"