diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index 3b32975..7e39a23 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -1,208 +1,713 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="姓名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="业务类型" prop="ywType">
-        <el-select v-model="queryParams.ywType" placeholder="请选择业务类型">
-          <el-option label="常住人口登记1" value="option1"></el-option>
-          <el-option label="常住人口登记2" value="option3"></el-option>
-          <el-option label="常住人口登记3" value="option9"></el-option>
-          <el-option label="常住卡" value="option2"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="出生日期" prop="birthday">
-        <el-input
-          v-model="queryParams.birthday"
-          placeholder="请选择出生日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="民族" prop="nation">
-        <el-input
-          v-model="queryParams.nation"
-          placeholder="请输入民族"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" prop="yxrq">
-        <el-input
-          v-model="queryParams.yxrq"
-          placeholder="请输入有效日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="身份证号" prop="cardId">
-        <el-input
-          v-model="queryParams.cardId"
-          placeholder="请输入身份证号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否纠错" prop="errorCorrect">
-        <el-select
-          v-model="queryParams.errorCorrect"
-          placeholder="是否纠错"
-          clearable
-          style="width:100%"
-        >
-          <el-option
-            v-for="dict in dict.type.error_correct"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="审核状态" prop="auditStatus">
-        <el-select
-          v-model="queryParams.auditStatus"
-          placeholder="审核状态"
-          clearable
-          style="width:100%"
-        >
-          <el-option
-            v-for="dict in dict.type.audit_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['dangan:czrkdj:add']"
-        >新增手动识别</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dangan:czrkdj:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    <el-tabs v-model="queryParams.ywType" @tab-click="ywTypeClick">
+      <el-tab-pane label="常住人口登记1" name="option1">
+
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入姓名"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="出生年月日" prop="birthday">
+            <el-input
+              v-model="queryParams.birthday"
+              placeholder="请选择出生年月日"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="民族" prop="nation">
+            <el-input
+              v-model="queryParams.nation"
+              placeholder="请输入民族"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="身份证号" prop="cardId">
+            <el-input
+              v-model="queryParams.cardId"
+              placeholder="请输入身份证号"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="是否纠错" prop="errorCorrect">
+            <el-select
+              v-model="queryParams.errorCorrect"
+              placeholder="是否纠错"
+              clearable
+              style="width:100%"
+            >
+              <el-option
+                v-for="dict in dict.type.error_correct"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="审核状态" prop="auditStatus">
+            <el-select
+              v-model="queryParams.auditStatus"
+              placeholder="审核状态"
+              clearable
+              style="width:100%"
+            >
+              <el-option
+                v-for="dict in dict.type.audit_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['dangan:czrkdj:add']"
+            >新增手动识别</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['dangan:czrkdj:export']"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="czrkdjList" border>
+          <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>
+          <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="180" show-overflow-tooltip fixed/>
+          <el-table-column label="户主或与户主关系" align="center" prop="relation" min-width="130" show-overflow-tooltip/>
+          <el-table-column label="姓名" align="center" prop="name" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="出生年月日" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="原籍" align="center" prop="yj" min-width="100" show-overflow-tooltip />
+          <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="文化程度" align="center" prop="whcd" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="职业及服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>
+          <el-table-column label="本县(市)其它住址" align="center" prop="bxsqtzz" min-width="130" show-overflow-tooltip />
+          <el-table-column label="公民证代号号码签发机关及日期" align="center" prop="gmzdhhmqfjgjrq" min-width="240" show-overflow-tooltip />
+          <el-table-column label="何时由何地迁来本县、市何时登记户口" align="center" prop="hsyhdqlbxshsdjhk" min-width="250" show-overflow-tooltip />
+          <el-table-column label="何时由本县、市何处迁来何时登记户口" align="center" prop="hsybxshcqlhsdjhk" min-width="250" show-overflow-tooltip />
+          <el-table-column label="注销户口日期" align="center" prop="zxhkrq" min-width="100" show-overflow-tooltip />
+          <el-table-column label="注销户口原因" align="center" prop="zxhkyy" min-width="100" show-overflow-tooltip />
+          <el-table-column label="户口登记事项变更记载内容、时间及办理人章_1" align="center" prop="hkdjsxbgjznrsjjblrz1" min-width="320" show-overflow-tooltip />
+          <el-table-column label="户口登记事项变更记载内容、时间及办理人章_2" align="center" prop="hkdjsxbgjznrsjjblrz2" min-width="320" show-overflow-tooltip />
+          <el-table-column label="识别图片" align="center" prop="pictures" >
+            <template slot-scope="scope">
+              <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
+            </template>
+          </el-table-column>
+<!--          <el-table-column label="相关图片" align="center" prop="allPics" >
+            <template slot-scope="scope">
+              <image-preview :src="scope.row.allPics" :width="50" :height="50"/>
+            </template>
+          </el-table-column>-->
+          <el-table-column label="是否纠错" align="center" prop="errorCorrect" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.error_correct" :value="scope.row.errorCorrect"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核状态" align="center" prop="auditStatus" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.audit_status" :value="scope.row.auditStatus"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核结果" align="center" prop="auditResult" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.audit_status" :value="scope.row.auditResult"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核原因" align="center" prop="auditReason" />
+          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="160">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['dangan:czrkdj:edit']"
+              >纠错</el-button>
+              <el-button
+                v-if="scope.row.auditStatus=='0'"
+                size="mini"
+                type="text"
+                @click="handleShenHe(scope.row)"
+                v-hasPermi="['dangan:czrkdj:audit']"
+              >审核</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['dangan:czrkdj:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-tab-pane>
+      <el-tab-pane label="常住人口登记2" name="option3">
+
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入姓名"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="出生日期" prop="birthday">
+            <el-input
+              v-model="queryParams.birthday"
+              placeholder="请选择出生日期"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="民族" prop="nation">
+            <el-input
+              v-model="queryParams.nation"
+              placeholder="请输入民族"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="身份证号" prop="cardId">
+            <el-input
+              v-model="queryParams.cardId"
+              placeholder="请输入身份证号"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="是否纠错" prop="errorCorrect">
+            <el-select
+              v-model="queryParams.errorCorrect"
+              placeholder="是否纠错"
+              clearable
+              style="width:100%"
+            >
+              <el-option
+                v-for="dict in dict.type.error_correct"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="审核状态" prop="auditStatus">
+            <el-select
+              v-model="queryParams.auditStatus"
+              placeholder="审核状态"
+              clearable
+              style="width:100%"
+            >
+              <el-option
+                v-for="dict in dict.type.audit_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['dangan:czrkdj:add']"
+            >新增手动识别</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['dangan:czrkdj:export']"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="czrkdjList" border>
+          <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>
+          <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="180" show-overflow-tooltip fixed/>
+          <el-table-column label="户别" align="center" prop="hb" min-width="100" show-overflow-tooltip />
+          <el-table-column label="户主姓名" align="center" prop="hzName" min-width="100" show-overflow-tooltip />
+          <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="姓名" align="center" prop="name" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="住址" align="center" prop="xzz" min-width="100" show-overflow-tooltip />
+          <el-table-column label="其他住址" align="center" prop="bxsqtzz" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="出生地" align="center" prop="address" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="籍贯" align="center" prop="jiguan" min-width="100" show-overflow-tooltip />
+          <el-table-column label="文化程度" align="center" prop="whcd" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="兵役状况" align="center" prop="byzk" min-width="100" show-overflow-tooltip />
+          <el-table-column label="身高" align="center" prop="height" min-width="80" show-overflow-tooltip />
+          <el-table-column label="血型" align="center" prop="blood" min-width="80" show-overflow-tooltip />
+          <el-table-column label="服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>
+          <el-table-column label="职业" align="center" prop="zy" min-width="100" show-overflow-tooltip />
+          <el-table-column label="申领居民身份证原因" align="center" prop="slReason" min-width="140" show-overflow-tooltip />
+          <el-table-column label="申领居民身份证签名" align="center" prop="sljmsfzqm" min-width="140" show-overflow-tooltip />
+          <el-table-column label="签发意见" align="center" prop="qfyj" min-width="100" show-overflow-tooltip />
+          <el-table-column label="身份证签发日期及有效期限" align="center" prop="yxrq" min-width="180" show-overflow-tooltip />
+          <el-table-column label="身份证号" align="center" prop="cardId" min-width="100" show-overflow-tooltip />
+          <el-table-column label="何时由何地迁来本市（县）" align="center" prop="hsybxshcqlhsdjhk" min-width="180" show-overflow-tooltip />
+          <el-table-column label="何时由何地迁来本址" align="center" prop="hsyhdqlbxshsdjhk" min-width="160" show-overflow-tooltip />
+          <el-table-column label="何时迁往何地" align="center" prop="hshyqwhd" min-width="120" show-overflow-tooltip />
+          <el-table-column label="何因注销户口是否缴销身份证" align="center" prop="zxhkyy" min-width="200" show-overflow-tooltip />
+          <el-table-column label="识别图片" align="center" prop="pictures" >
+            <template slot-scope="scope">
+              <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
+            </template>
+          </el-table-column>
+<!--          <el-table-column label="相关图片" align="center" prop="allPics" >
+            <template slot-scope="scope">
+              <image-preview :src="scope.row.allPics" :width="50" :height="50"/>
+            </template>
+          </el-table-column>-->
+          <el-table-column label="是否纠错" align="center" prop="errorCorrect" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.error_correct" :value="scope.row.errorCorrect"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核状态" align="center" prop="auditStatus" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.audit_status" :value="scope.row.auditStatus"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核结果" align="center" prop="auditResult" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.audit_status" :value="scope.row.auditResult"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核原因" align="center" prop="auditReason" />
+          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="160">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['dangan:czrkdj:edit']"
+              >纠错</el-button>
+              <el-button
+                v-if="scope.row.auditStatus=='0'"
+                size="mini"
+                type="text"
+                @click="handleShenHe(scope.row)"
+                v-hasPermi="['dangan:czrkdj:audit']"
+              >审核</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['dangan:czrkdj:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-tab-pane>
+      <el-tab-pane label="常住人口登记3" name="option9">
+
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入姓名"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="出生日期" prop="birthday">
+            <el-input
+              v-model="queryParams.birthday"
+              placeholder="请选择出生日期"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="民族" prop="nation">
+            <el-input
+              v-model="queryParams.nation"
+              placeholder="请输入民族"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="身份证号" prop="cardId">
+            <el-input
+              v-model="queryParams.cardId"
+              placeholder="请输入身份证号"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="是否纠错" prop="errorCorrect">
+            <el-select
+              v-model="queryParams.errorCorrect"
+              placeholder="是否纠错"
+              clearable
+              style="width:100%"
+            >
+              <el-option
+                v-for="dict in dict.type.error_correct"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="审核状态" prop="auditStatus">
+            <el-select
+              v-model="queryParams.auditStatus"
+              placeholder="审核状态"
+              clearable
+              style="width:100%"
+            >
+              <el-option
+                v-for="dict in dict.type.audit_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['dangan:czrkdj:add']"
+            >新增手动识别</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['dangan:czrkdj:export']"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="czrkdjList" border>
+          <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>
+          <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="180" show-overflow-tooltip fixed/>
+          <el-table-column label="户别" align="center" prop="hb" min-width="100" show-overflow-tooltip />
+          <el-table-column label="户主姓名" align="center" prop="hzName" min-width="100" show-overflow-tooltip />
+          <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="姓名" align="center" prop="name" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="曾用名" align="center" prop="usedName" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="监护人1" align="center" prop="jhr1" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="监护人2" align="center" prop="jhr2" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="监护关系1" align="center" prop="jhgx1" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="监护关系2" align="center" prop="jhgx2" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="出生地" align="center" prop="address" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="公民出生证签发日期" align="center" prop="gmcszqfrq" min-width="140" show-overflow-tooltip/>
+          <el-table-column label="住址" align="center" prop="xzz" min-width="100" show-overflow-tooltip />
+          <el-table-column label="本市（县）其他住址" align="center" prop="bxsqtzz" min-width="140" show-overflow-tooltip />
+          <el-table-column label="籍贯" align="center" prop="jiguan" min-width="100" show-overflow-tooltip />
+          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="身份证号" align="center" prop="cardId" min-width="100" show-overflow-tooltip />
+          <el-table-column label="身份证签发日期" align="center" prop="yxrq" min-width="120" show-overflow-tooltip />
+          <el-table-column label="文化程度" align="center" prop="whcd" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="兵役状况" align="center" prop="byzk" min-width="100" show-overflow-tooltip />
+          <el-table-column label="身高" align="center" prop="height" min-width="80" show-overflow-tooltip />
+          <el-table-column label="血型" align="center" prop="blood" min-width="80" show-overflow-tooltip />
+          <el-table-column label="职业" align="center" prop="zy" min-width="100" show-overflow-tooltip />
+          <el-table-column label="服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>
+          <el-table-column label="何时何因由何地迁来本市" align="center" prop="hsyhdqlbxshsdjhk" min-width="170" show-overflow-tooltip />
+          <el-table-column label="何时何因由何地迁来本址" align="center" prop="hsybxshcqlhsdjhk" min-width="170" show-overflow-tooltip />
+          <el-table-column label="何时何因迁往何地" align="center" prop="hshyqwhd" min-width="130" show-overflow-tooltip />
+          <el-table-column label="何时何因注销户口" align="center" prop="zxhkyy" min-width="130" show-overflow-tooltip />
+          <el-table-column label="登记日期" align="center" prop="djrq" min-width="100" show-overflow-tooltip />
+          <el-table-column label="识别图片" align="center" prop="pictures" >
+            <template slot-scope="scope">
+              <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
+            </template>
+          </el-table-column>
+<!--          <el-table-column label="相关图片" align="center" prop="allPics" >
+            <template slot-scope="scope">
+              <image-preview :src="scope.row.allPics" :width="50" :height="50"/>
+            </template>
+          </el-table-column>-->
+          <el-table-column label="是否纠错" align="center" prop="errorCorrect" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.error_correct" :value="scope.row.errorCorrect"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核状态" align="center" prop="auditStatus" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.audit_status" :value="scope.row.auditStatus"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核结果" align="center" prop="auditResult" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.audit_status" :value="scope.row.auditResult"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核原因" align="center" prop="auditReason" />
+          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="160">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['dangan:czrkdj:edit']"
+              >纠错</el-button>
+              <el-button
+                v-if="scope.row.auditStatus=='0'"
+                size="mini"
+                type="text"
+                @click="handleShenHe(scope.row)"
+                v-hasPermi="['dangan:czrkdj:audit']"
+              >审核</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['dangan:czrkdj:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
-    <el-table v-loading="loading" :data="czrkdjList" border>
-      <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>
-      <el-table-column label="业务类型" align="center" prop="ywType" min-width="150" fixed show-overflow-tooltip>
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="150" show-overflow-tooltip/>
-      <el-table-column label="姓名" align="center" prop="name" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="与户主关系" align="center" prop="relation" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="原籍" align="center" prop="yj" min-width="100" show-overflow-tooltip />
-      <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
-      <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>
-      <el-table-column label="文化程度" align="center" prop="whcd" min-width="90" show-overflow-tooltip/>
-      <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>
-      <el-table-column label="职业及服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>
-      <el-table-column label="本县(市)其他住址" align="center" prop="bxsqtzz" min-width="130" show-overflow-tooltip />
-      <el-table-column label="公民证代号号码签发机关及日期" align="center" prop="gmzdhhmqfjgjrq" min-width="240" show-overflow-tooltip />
-      <el-table-column label="何时由何地迁来本县市何时登记户口" align="center" prop="hsyhdqlbxshsdjhk" min-width="250" show-overflow-tooltip />
-      <el-table-column label="何时由本县、市何处迁来何时登记户口" align="center" prop="hsybxshcqlhsdjhk" min-width="250" show-overflow-tooltip />
-      <el-table-column label="注销户口日期" align="center" prop="zxhkrq" min-width="100" show-overflow-tooltip />
-      <el-table-column label="注销户口原因" align="center" prop="zxhkyy" min-width="100" show-overflow-tooltip />
-      <el-table-column label="户口登记事项变更记载内容、时间及办理人章_1" align="center" prop="hkdjsxbgjznrsjjblrz1" min-width="320" show-overflow-tooltip />
-      <el-table-column label="户口登记事项变更记载内容、时间及办理人章_2" align="center" prop="hkdjsxbgjznrsjjblrz2" min-width="320" show-overflow-tooltip />
-      <el-table-column label="籍贯" align="center" prop="jiguan" min-width="100" show-overflow-tooltip />
-      <el-table-column label="现住址" align="center" prop="xzz" min-width="100" show-overflow-tooltip />
-      <el-table-column label="户主姓名" align="center" prop="hzName" min-width="100" show-overflow-tooltip />
-      <el-table-column label="户别" align="center" prop="hb" min-width="100" show-overflow-tooltip />
-      <el-table-column label="登记日期" align="center" prop="djrq" min-width="100" show-overflow-tooltip />
-      <el-table-column label="兵役状况" align="center" prop="byzk" min-width="100" show-overflow-tooltip />
-      <el-table-column label="身高" align="center" prop="height" min-width="80" show-overflow-tooltip />
-      <el-table-column label="血型" align="center" prop="blood" min-width="80" show-overflow-tooltip />
-      <el-table-column label="职业" align="center" prop="zy" min-width="100" show-overflow-tooltip />
-      <el-table-column label="申领居民身份证原因" align="center" prop="slReason" min-width="140" show-overflow-tooltip />
-      <el-table-column label="申领居民身份证签名" align="center" prop="sljmsfzqm" min-width="140" show-overflow-tooltip />
-      <el-table-column label="签发意见" align="center" prop="qfyj" min-width="100" show-overflow-tooltip />
-      <el-table-column label="有效日期" align="center" prop="yxrq" min-width="100" show-overflow-tooltip />
-      <el-table-column label="身份证号" align="center" prop="cardId" min-width="100" show-overflow-tooltip />
-      <el-table-column label="识别图片" align="center" prop="pictures" >
-        <template slot-scope="scope">
-          <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="相关图片" align="center" prop="allPics" >
-        <template slot-scope="scope">
-          <image-preview :src="scope.row.allPics" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否纠错" align="center" prop="errorCorrect" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.error_correct" :value="scope.row.errorCorrect"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="审核状态" align="center" prop="auditStatus" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.audit_status" :value="scope.row.auditStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="审核结果" align="center" prop="auditResult" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.audit_status" :value="scope.row.auditResult"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="审核原因" align="center" prop="auditReason" />
-      <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="160">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['dangan:czrkdj:edit']"
-          >纠错</el-button>
-          <el-button
-            v-if="scope.row.auditStatus=='0'"
-            size="mini"
-            type="text"
-            @click="handleShenHe(scope.row)"
-            v-hasPermi="['dangan:czrkdj:audit']"
-          >审核</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['dangan:czrkdj:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="常住卡" name="option2">
+
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入姓名"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="出生日期" prop="birthday">
+            <el-input
+              v-model="queryParams.birthday"
+              placeholder="请选择出生日期"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="民族" prop="nation">
+            <el-input
+              v-model="queryParams.nation"
+              placeholder="请输入民族"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="身份证号" prop="cardId">
+            <el-input
+              v-model="queryParams.cardId"
+              placeholder="请输入身份证号"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="是否纠错" prop="errorCorrect">
+            <el-select
+              v-model="queryParams.errorCorrect"
+              placeholder="是否纠错"
+              clearable
+              style="width:100%"
+            >
+              <el-option
+                v-for="dict in dict.type.error_correct"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="审核状态" prop="auditStatus">
+            <el-select
+              v-model="queryParams.auditStatus"
+              placeholder="审核状态"
+              clearable
+              style="width:100%"
+            >
+              <el-option
+                v-for="dict in dict.type.audit_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['dangan:czrkdj:add']"
+            >新增手动识别</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['dangan:czrkdj:export']"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="czrkdjList" border>
+          <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>
+          <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="180" show-overflow-tooltip fixed/>
+          <el-table-column label="户主姓名与户主关系" align="center" prop="relation" min-width="140" show-overflow-tooltip/>
+          <el-table-column label="姓名" align="center" prop="name" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="别名" align="center" prop="otherName" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="文化程度" align="center" prop="whcd" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="婚姻状况" align="center" prop="hyzk" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="宗教信仰" align="center" prop="zjxy" min-width="90" show-overflow-tooltip/>
+          <el-table-column label="民族" align="center" prop="nation" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="出生地址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
+          <el-table-column label="籍贯" align="center" prop="jiguan" min-width="100" show-overflow-tooltip />
+          <el-table-column label="职业及服务处所" align="center" prop="zyjfwcs" min-width="120" show-overflow-tooltip/>
+          <el-table-column label="何时由何地迁来" align="center" prop="hsyhdqlbxshsdjhk" min-width="120" show-overflow-tooltip />
+          <el-table-column label="本县市其他住址" align="center" prop="bxsqtzz" min-width="130" show-overflow-tooltip />
+          <el-table-column label="现住址" align="center" prop="xzz" min-width="100" show-overflow-tooltip />
+          <el-table-column label="登记日期" align="center" prop="djrq" min-width="100" show-overflow-tooltip />
+          <el-table-column label="识别图片" align="center" prop="pictures" >
+            <template slot-scope="scope">
+              <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
+            </template>
+          </el-table-column>
+<!--          <el-table-column label="相关图片" align="center" prop="allPics" >
+            <template slot-scope="scope">
+              <image-preview :src="scope.row.allPics" :width="50" :height="50"/>
+            </template>
+          </el-table-column>-->
+          <el-table-column label="是否纠错" align="center" prop="errorCorrect" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.error_correct" :value="scope.row.errorCorrect"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核状态" align="center" prop="auditStatus" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.audit_status" :value="scope.row.auditStatus"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核结果" align="center" prop="auditResult" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.audit_status" :value="scope.row.auditResult"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核原因" align="center" prop="auditReason" />
+          <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="160">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['dangan:czrkdj:edit']"
+              >纠错</el-button>
+              <el-button
+                v-if="scope.row.auditStatus=='0'"
+                size="mini"
+                type="text"
+                @click="handleShenHe(scope.row)"
+                v-hasPermi="['dangan:czrkdj:audit']"
+              >审核</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['dangan:czrkdj:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-tab-pane>
+    </el-tabs>
 
     <pagination
       v-show="total>0"
@@ -230,82 +735,82 @@
             <!--常住人口登记表1-->
             <el-row :gutter="10" v-if="form.ywType==='option1'">
               <el-col :span="12">
-                <el-form-item label="与户主关系" prop="relation" label-width="90px">
-                  <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+                <el-form-item label="户主或与户主关系" prop="relation" label-width="125px">
+                  <el-input v-model="form.relation" placeholder="请输入户主或与户主关系" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="姓名" prop="name" label-width="60px">
+                <el-form-item label="姓名" prop="name" label-width="40px">
                   <el-input v-model="form.name" placeholder="请输入姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="别名" prop="otherName" label-width="60px">
+                <el-form-item label="别名" prop="otherName" label-width="40px">
                   <el-input v-model="form.otherName" placeholder="请输入别名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="性别" prop="sex" label-width="60px">
+                <el-form-item label="性别" prop="sex" label-width="40px">
                   <el-input v-model="form.sex" placeholder="请输入性别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生日期" prop="birthday">
-                  <el-input v-model="form.birthday" placeholder="请输入出生日期" />
+                <el-form-item label="出生年月日" prop="birthday" label-width="83px">
+                  <el-input v-model="form.birthday" placeholder="请输入出生年月日" />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="出生地址" prop="address">
+              <el-col :span="12">
+                <el-form-item label="出生地址" prop="address" label-width="70px">
                   <el-input v-model="form.address" placeholder="请输入出生地址" />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="原籍" prop="yj">
+              <el-col :span="12">
+                <el-form-item label="原籍" prop="yj" label-width="40px">
                   <el-input v-model="form.yj" placeholder="请输入原籍" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="民族" prop="nation">
+                <el-form-item label="民族" prop="nation" label-width="40px">
                   <el-input v-model="form.nation" placeholder="请输入民族" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="宗教信仰" prop="zjxy">
+                <el-form-item label="宗教信仰" prop="zjxy" label-width="70px">
                   <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="文化程度" prop="whcd">
+                <el-form-item label="文化程度" prop="whcd" label-width="70px">
                   <el-input v-model="form.whcd" placeholder="请输入文化程度" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="婚姻状况" prop="hyzk">
+                <el-form-item label="婚姻状况" prop="hyzk" label-width="70px">
                   <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="120px">
+                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="110px">
                   <el-input v-model="form.zyjfwcs" placeholder="请输入职业及服务处所" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="本县(市)其他住址" prop="bxsqtzz" label-width="120px">
-                  <el-input v-model="form.bxsqtzz" placeholder="请输入本县(市)其他住址" />
+                <el-form-item label="本县(市)其它住址" prop="bxsqtzz" label-width="120px">
+                  <el-input v-model="form.bxsqtzz" placeholder="请输入本县(市)其它住址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="220px">
+                <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="210px">
                   <el-input v-model="form.gmzdhhmqfjgjrq" placeholder="请输入公民证代号号码签发机关及日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由何地迁来本县市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
-                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县市何时登记户口" />
+                <el-form-item label="何时由何地迁来本县、市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
+                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县、市何时登记户口" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="260px">
+                <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="250px">
                   <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
                 </el-form-item>
               </el-col>
@@ -330,7 +835,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark" label-width="40px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -339,97 +844,102 @@
             <!--常住人口登记表2-->
             <el-row :gutter="10" v-if="form.ywType==='option3'">
               <el-col :span="12">
-                <el-form-item label="户别" prop="hb">
+                <el-form-item label="户别" prop="hb" label-width="40px">
                   <el-input v-model="form.hb" placeholder="请输入户别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="户主姓名" prop="hzName">
+                <el-form-item label="户主姓名" prop="hzName" label-width="70px">
                   <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="与户主关系" prop="relation" label-width="90px">
+                <el-form-item label="与户主关系" prop="relation" label-width="84px">
                   <el-input v-model="form.relation" placeholder="请输入与户主关系" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="姓名" prop="name">
+                <el-form-item label="姓名" prop="name" label-width="40px">
                   <el-input v-model="form.name" placeholder="请输入姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="别名" prop="otherName">
+                <el-form-item label="别名" prop="otherName" label-width="40px">
                   <el-input v-model="form.otherName" placeholder="请输入别名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="性别" prop="sex">
+                <el-form-item label="性别" prop="sex" label-width="40px">
                   <el-input v-model="form.sex" placeholder="请输入性别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="民族" prop="nation">
+                <el-form-item label="民族" prop="nation" label-width="40px">
                   <el-input v-model="form.nation" placeholder="请输入民族" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生日期" prop="birthday">
+                <el-form-item label="出生日期" prop="birthday" label-width="70px">
                   <el-input v-model="form.birthday" placeholder="请输入出生日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="宗教信仰" prop="zjxy">
+                <el-form-item label="宗教信仰" prop="zjxy" label-width="70px">
                   <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="现住址" prop="xzz">
-                  <el-input v-model="form.xzz" placeholder="请输入现住址" />
+                <el-form-item label="住址" prop="xzz" label-width="40px">
+                  <el-input v-model="form.xzz" placeholder="请输入住址" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生地址" prop="address">
-                  <el-input v-model="form.address" placeholder="请输入出生地址" />
+                <el-form-item label="其他住址" prop="bxsqtzz" label-width="70px">
+                  <el-input v-model="form.bxsqtzz" placeholder="请输入其他住址" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="籍贯" prop="jiguan">
+                <el-form-item label="出生地" prop="address" label-width="55px">
+                  <el-input v-model="form.address" placeholder="请输入出生地" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="籍贯" prop="jiguan" label-width="40px">
                   <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="文化程度" prop="whcd">
+                <el-form-item label="文化程度" prop="whcd" label-width="70px">
                   <el-input v-model="form.whcd" placeholder="请输入文化程度" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="婚姻状况" prop="hyzk">
+                <el-form-item label="婚姻状况" prop="hyzk" label-width="70px">
                   <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="兵役状况" prop="byzk">
+                <el-form-item label="兵役状况" prop="byzk" label-width="70px">
                   <el-input v-model="form.byzk" placeholder="请输入兵役状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="身高" prop="height">
+                <el-form-item label="身高" prop="height" label-width="40px">
                   <el-input v-model="form.height" placeholder="请输入身高" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="血型" prop="blood">
+                <el-form-item label="血型" prop="blood" label-width="40px">
                   <el-input v-model="form.blood" placeholder="请输入血型" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="120px">
-                  <el-input v-model="form.zyjfwcs" placeholder="请输入职业及服务处所" />
+                <el-form-item label="服务处所" prop="zyjfwcs" label-width="70px">
+                  <el-input v-model="form.zyjfwcs" placeholder="请输入服务处所" />
                 </el-form-item>
               </el-col>
               <el-col :span="10">
-                <el-form-item label="职业" prop="zy" label-width="50px">
+                <el-form-item label="职业" prop="zy" label-width="40px">
                   <el-input v-model="form.zy" placeholder="请输入职业" />
                 </el-form-item>
               </el-col>
@@ -444,37 +954,42 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="签发意见" prop="qfyj">
+                <el-form-item label="签发意见" prop="qfyj" label-width="70px">
                   <el-input v-model="form.qfyj" placeholder="请输入签发意见" />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="有效日期" prop="yxrq">
-                  <el-input v-model="form.yxrq" placeholder="请输入有效日期" />
+              <el-col :span="24">
+                <el-form-item label="身份证签发日期及有效期限" prop="yxrq" label-width="180px">
+                  <el-input v-model="form.yxrq" placeholder="请输入身份证签发日期及有效期限" />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="身份证号" prop="cardId">
+              <el-col :span="24">
+                <el-form-item label="身份证号" prop="cardId" label-width="70px">
                   <el-input v-model="form.cardId" placeholder="请输入身份证号" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由何地迁来本县市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
-                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县市何时登记户口" />
+                <el-form-item label="何时由何地迁来本市（县）" prop="hsyhdqlbxshsdjhk" label-width="180px">
+                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本市（县）" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="260px">
-                  <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
+                <el-form-item label="何时由何地迁来本址" prop="hsybxshcqlhsdjhk" label-width="140px">
+                  <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时由何地迁来本址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="注销户口原因" prop="zxhkyy" label-width="100px">
-                  <el-input v-model="form.zxhkyy" placeholder="请输入注销户口原因" />
+                <el-form-item label="何时迁往何地" prop="hshyqwhd" label-width="98px">
+                  <el-input v-model="form.hshyqwhd" placeholder="请输入何时迁往何地" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="何因注销户口是否缴销身份证" prop="zxhkyy" label-width="195px">
+                  <el-input v-model="form.zxhkyy" placeholder="请输入何因注销户口是否缴销身份证" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark" label-width="40px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -483,132 +998,167 @@
             <!--常住人口登记表3-->
             <el-row :gutter="10" v-if="form.ywType==='option9'">
               <el-col :span="12">
-                <el-form-item label="户别" prop="hb">
+                <el-form-item label="户别" prop="hb" label-width="40px">
                   <el-input v-model="form.hb" placeholder="请输入户别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="户主姓名" prop="hzName">
+                <el-form-item label="户主姓名" prop="hzName" label-width="70px">
                   <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="与户主关系" prop="relation" label-width="90px">
+                <el-form-item label="与户主关系" prop="relation" label-width="83px">
                   <el-input v-model="form.relation" placeholder="请输入与户主关系" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="姓名" prop="name">
+                <el-form-item label="姓名" prop="name" label-width="40px">
                   <el-input v-model="form.name" placeholder="请输入姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="性别" prop="sex">
+                <el-form-item label="性别" prop="sex" label-width="40px">
                   <el-input v-model="form.sex" placeholder="请输入性别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="民族" prop="nation">
+                <el-form-item label="曾用名" prop="usedName" label-width="55px">
+                  <el-input v-model="form.usedName" placeholder="请输入曾用名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="民族" prop="nation" label-width="40px">
                   <el-input v-model="form.nation" placeholder="请输入民族" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生日期" prop="birthday">
+                <el-form-item label="出生日期" prop="birthday" label-width="70px">
                   <el-input v-model="form.birthday" placeholder="请输入出生日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生地址" prop="address">
-                  <el-input v-model="form.address" placeholder="请输入出生地址" />
+                <el-form-item label="监护人1" prop="jhr1" label-width="65px">
+                  <el-input v-model="form.jhr1" placeholder="请输入监护人1" />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="220px">
-                  <el-input v-model="form.gmzdhhmqfjgjrq" placeholder="请输入公民证代号号码签发机关及日期" />
+              <el-col :span="12">
+                <el-form-item label="监护人2" prop="jhr2" label-width="65px">
+                  <el-input v-model="form.jhr2" placeholder="请输入监护人2" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="现住址" prop="xzz">
-                  <el-input v-model="form.xzz" placeholder="请输入现住址" />
+                <el-form-item label="监护关系1" prop="jhgx1" label-width="80px">
+                  <el-input v-model="form.jhgx1" placeholder="请输入监护关系1" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="本县(市)其他住址" prop="bxsqtzz" label-width="120px">
-                  <el-input v-model="form.bxsqtzz" placeholder="请输入本县(市)其他住址" />
+                <el-form-item label="监护关系2" prop="jhgx2" label-width="80px">
+                  <el-input v-model="form.jhgx2" placeholder="请输入监护关系2" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="出生地" prop="address" label-width="55px">
+                  <el-input v-model="form.address" placeholder="请输入出生地" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="公民出生证签发日期" prop="gmcszqfrq" label-width="140px">
+                  <el-input v-model="form.gmcszqfrq" placeholder="请输入公民出生证签发日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="住址" prop="xzz" label-width="40px">
+                  <el-input v-model="form.xzz" placeholder="请输入住址" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="本市（县）其他住址" prop="bxsqtzz" label-width="140px">
+                  <el-input v-model="form.bxsqtzz" placeholder="请输入本市（县）其他住址" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="籍贯" prop="jiguan">
+                <el-form-item label="籍贯" prop="jiguan" label-width="40px">
                   <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="宗教信仰" prop="zjxy">
+                <el-form-item label="宗教信仰" prop="zjxy" label-width="70px">
                   <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="身份证号" prop="cardId">
+                <el-form-item label="身份证号" prop="cardId" label-width="70px">
                   <el-input v-model="form.cardId" placeholder="请输入身份证号" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="文化程度" prop="whcd">
+                <el-form-item label="身份证签发日期" prop="yxrq" label-width="110px">
+                  <el-input v-model="form.yxrq" placeholder="请输入身份证签发日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="文化程度" prop="whcd" label-width="70px">
                   <el-input v-model="form.whcd" placeholder="请输入文化程度" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="婚姻状况" prop="hyzk">
+                <el-form-item label="婚姻状况" prop="hyzk" label-width="70px">
                   <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="兵役状况" prop="byzk">
+                <el-form-item label="兵役状况" prop="byzk" label-width="70px">
                   <el-input v-model="form.byzk" placeholder="请输入兵役状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="身高" prop="height">
+                <el-form-item label="身高" prop="height" label-width="40px">
                   <el-input v-model="form.height" placeholder="请输入身高" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="血型" prop="blood">
+                <el-form-item label="血型" prop="blood" label-width="40px">
                   <el-input v-model="form.blood" placeholder="请输入血型" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="职业" prop="zy" label-width="50px">
+                <el-form-item label="职业" prop="zy" label-width="40px">
                   <el-input v-model="form.zy" placeholder="请输入职业" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="120px">
-                  <el-input v-model="form.zyjfwcs" placeholder="请输入职业及服务处所" />
+                <el-form-item label="服务处所" prop="zyjfwcs" label-width="70px">
+                  <el-input v-model="form.zyjfwcs" placeholder="请输入服务处所" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由何地迁来本县市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
-                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县市何时登记户口" />
+                <el-form-item label="何时何因由何地迁来本市" prop="hsyhdqlbxshsdjhk" label-width="170px">
+                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时何因由何地迁来本市" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="260px">
-                  <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
+                <el-form-item label="何时何因由何地迁来本址" prop="hsybxshcqlhsdjhk" label-width="170px">
+                  <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时何因由何地迁来本址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="注销户口原因" prop="zxhkyy" label-width="100px">
-                  <el-input v-model="form.zxhkyy" placeholder="请输入注销户口原因" />
+                <el-form-item label="何时何因迁往何地" prop="hshyqwhd" label-width="130px">
+                  <el-input v-model="form.hshyqwhd" placeholder="请输入何时何因迁往何地" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="何时何因注销户口" prop="zxhkyy" label-width="130px">
+                  <el-input v-model="form.zxhkyy" placeholder="请输入何时何因注销户口" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="登记日期" prop="djrq">
+                <el-form-item label="登记日期" prop="djrq" label-width="70px">
                   <el-input v-model="form.djrq" placeholder="请输入登记日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark" label-width="45px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -617,87 +1167,87 @@
             <!--常住卡-->
             <el-row :gutter="10" v-if="form.ywType==='option2'">
               <el-col :span="12">
-                <el-form-item label="与户主关系" prop="relation" label-width="90px">
-                  <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+                <el-form-item label="户主姓名与户主关系" prop="relation" label-width="140px">
+                  <el-input v-model="form.relation" placeholder="请输入户主姓名与户主关系" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="姓名" prop="name">
+                <el-form-item label="姓名" prop="name" label-width="40px">
                   <el-input v-model="form.name" placeholder="请输入姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="别名" prop="otherName">
+                <el-form-item label="别名" prop="otherName" label-width="40px">
                   <el-input v-model="form.otherName" placeholder="请输入别名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="性别" prop="sex">
+                <el-form-item label="性别" prop="sex" label-width="40px">
                   <el-input v-model="form.sex" placeholder="请输入性别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="文化程度" prop="whcd">
+                <el-form-item label="文化程度" prop="whcd" label-width="68px">
                   <el-input v-model="form.whcd" placeholder="请输入文化程度" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="婚姻状况" prop="hyzk">
+                <el-form-item label="婚姻状况" prop="hyzk" label-width="68px">
                   <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="宗教信仰" prop="zjxy">
+                <el-form-item label="宗教信仰" prop="zjxy" label-width="68px">
                   <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="民族" prop="nation">
+                <el-form-item label="民族" prop="nation" label-width="40px">
                   <el-input v-model="form.nation" placeholder="请输入民族" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生日期" prop="birthday">
+                <el-form-item label="出生日期" prop="birthday" label-width="68px">
                   <el-input v-model="form.birthday" placeholder="请输入出生日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="出生地址" prop="address">
+                <el-form-item label="出生地址" prop="address" label-width="68px">
                   <el-input v-model="form.address" placeholder="请输入出生地址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="籍贯" prop="jiguan">
+                <el-form-item label="籍贯" prop="jiguan" label-width="40px">
                   <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="120px">
+                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="110px">
                   <el-input v-model="form.zyjfwcs" placeholder="请输入职业及服务处所" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由何地迁来本县市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="240px">
-                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县市何时登记户口" />
+                <el-form-item label="何时由何地迁来" prop="hsyhdqlbxshsdjhk" label-width="110px">
+                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="本县(市)其他住址" prop="bxsqtzz" label-width="120px">
-                  <el-input v-model="form.bxsqtzz" placeholder="请输入本县(市)其他住址" />
+                <el-form-item label="本市其他住址" prop="bxsqtzz" label-width="98px">
+                  <el-input v-model="form.bxsqtzz" placeholder="请输入本市其他住址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="现住址" prop="xzz">
+                <el-form-item label="现住址" prop="xzz" label-width="55px">
                   <el-input v-model="form.xzz" placeholder="请输入现住址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="登记日期" prop="djrq">
+                <el-form-item label="登记日期" prop="djrq" label-width="68px">
                   <el-input v-model="form.djrq" placeholder="请输入登记日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark" label-width="40px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -718,16 +1268,6 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
 
         <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="业务类型" prop="ywType">
-              <el-select v-model="form.ywType" placeholder="请选择业务类型">
-                <el-option label="常住人口登记1" value="option1"></el-option>
-                <el-option label="常住人口登记2" value="option3"></el-option>
-                <el-option label="常住人口登记3" value="option9"></el-option>
-                <el-option label="常住卡" value="option2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="14">
             <el-form-item label="档案目录路径" prop="muPath" label-width="120px">
               <el-input readonly  placeholder="请选择档案目录路径" v-model="form.muPath">
@@ -755,82 +1295,82 @@
             <!--常住人口登记表1-->
             <el-row :gutter="10" v-if="form.ywType==='option1'">
               <el-col :span="12">
-                <el-form-item label="与户主关系" prop="relation" label-width="90px">
-                  <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+                <el-form-item label="户主或与户主关系" prop="relation" label-width="125px">
+                  <el-input v-model="form.relation" placeholder="请输入户主或与户主关系" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="姓名" prop="name" label-width="60px">
+                <el-form-item label="姓名" prop="name" label-width="40px">
                   <el-input v-model="form.name" placeholder="请输入姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="别名" prop="otherName" label-width="60px">
+                <el-form-item label="别名" prop="otherName" label-width="40px">
                   <el-input v-model="form.otherName" placeholder="请输入别名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="性别" prop="sex" label-width="60px">
+                <el-form-item label="性别" prop="sex" label-width="40px">
                   <el-input v-model="form.sex" placeholder="请输入性别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生日期" prop="birthday">
-                  <el-input v-model="form.birthday" placeholder="请输入出生日期" />
+                <el-form-item label="出生年月日" prop="birthday" label-width="83px">
+                  <el-input v-model="form.birthday" placeholder="请输入出生年月日" />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="出生地址" prop="address">
+              <el-col :span="12">
+                <el-form-item label="出生地址" prop="address" label-width="70px">
                   <el-input v-model="form.address" placeholder="请输入出生地址" />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="原籍" prop="yj">
+              <el-col :span="12">
+                <el-form-item label="原籍" prop="yj" label-width="40px">
                   <el-input v-model="form.yj" placeholder="请输入原籍" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="民族" prop="nation">
+                <el-form-item label="民族" prop="nation" label-width="40px">
                   <el-input v-model="form.nation" placeholder="请输入民族" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="宗教信仰" prop="zjxy">
+                <el-form-item label="宗教信仰" prop="zjxy" label-width="70px">
                   <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="文化程度" prop="whcd">
+                <el-form-item label="文化程度" prop="whcd" label-width="70px">
                   <el-input v-model="form.whcd" placeholder="请输入文化程度" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="婚姻状况" prop="hyzk">
+                <el-form-item label="婚姻状况" prop="hyzk" label-width="70px">
                   <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="120px">
+                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="110px">
                   <el-input v-model="form.zyjfwcs" placeholder="请输入职业及服务处所" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="本县(市)其他住址" prop="bxsqtzz" label-width="120px">
-                  <el-input v-model="form.bxsqtzz" placeholder="请输入本县(市)其他住址" />
+                <el-form-item label="本县(市)其它住址" prop="bxsqtzz" label-width="120px">
+                  <el-input v-model="form.bxsqtzz" placeholder="请输入本县(市)其它住址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="220px">
+                <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="210px">
                   <el-input v-model="form.gmzdhhmqfjgjrq" placeholder="请输入公民证代号号码签发机关及日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由何地迁来本县市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
-                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县市何时登记户口" />
+                <el-form-item label="何时由何地迁来本县、市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
+                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县、市何时登记户口" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="260px">
+                <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="250px">
                   <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
                 </el-form-item>
               </el-col>
@@ -855,7 +1395,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark" label-width="40px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -864,97 +1404,102 @@
             <!--常住人口登记表2-->
             <el-row :gutter="10" v-if="form.ywType==='option3'">
               <el-col :span="12">
-                <el-form-item label="户别" prop="hb">
+                <el-form-item label="户别" prop="hb" label-width="40px">
                   <el-input v-model="form.hb" placeholder="请输入户别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="户主姓名" prop="hzName">
+                <el-form-item label="户主姓名" prop="hzName" label-width="70px">
                   <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="与户主关系" prop="relation" label-width="90px">
+                <el-form-item label="与户主关系" prop="relation" label-width="84px">
                   <el-input v-model="form.relation" placeholder="请输入与户主关系" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="姓名" prop="name">
+                <el-form-item label="姓名" prop="name" label-width="40px">
                   <el-input v-model="form.name" placeholder="请输入姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="别名" prop="otherName">
+                <el-form-item label="别名" prop="otherName" label-width="40px">
                   <el-input v-model="form.otherName" placeholder="请输入别名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="性别" prop="sex">
+                <el-form-item label="性别" prop="sex" label-width="40px">
                   <el-input v-model="form.sex" placeholder="请输入性别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="民族" prop="nation">
+                <el-form-item label="民族" prop="nation" label-width="40px">
                   <el-input v-model="form.nation" placeholder="请输入民族" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生日期" prop="birthday">
+                <el-form-item label="出生日期" prop="birthday" label-width="70px">
                   <el-input v-model="form.birthday" placeholder="请输入出生日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="宗教信仰" prop="zjxy">
+                <el-form-item label="宗教信仰" prop="zjxy" label-width="70px">
                   <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="现住址" prop="xzz">
-                  <el-input v-model="form.xzz" placeholder="请输入现住址" />
+                <el-form-item label="住址" prop="xzz" label-width="40px">
+                  <el-input v-model="form.xzz" placeholder="请输入住址" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生地址" prop="address">
-                  <el-input v-model="form.address" placeholder="请输入出生地址" />
+                <el-form-item label="其他住址" prop="bxsqtzz" label-width="70px">
+                  <el-input v-model="form.bxsqtzz" placeholder="请输入其他住址" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="出生地" prop="address" label-width="55px">
+                  <el-input v-model="form.address" placeholder="请输入出生地" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="籍贯" prop="jiguan">
+                <el-form-item label="籍贯" prop="jiguan" label-width="40px">
                   <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="文化程度" prop="whcd">
+                <el-form-item label="文化程度" prop="whcd" label-width="70px">
                   <el-input v-model="form.whcd" placeholder="请输入文化程度" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="婚姻状况" prop="hyzk">
+                <el-form-item label="婚姻状况" prop="hyzk" label-width="70px">
                   <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="兵役状况" prop="byzk">
+                <el-form-item label="兵役状况" prop="byzk" label-width="70px">
                   <el-input v-model="form.byzk" placeholder="请输入兵役状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="身高" prop="height">
+                <el-form-item label="身高" prop="height" label-width="40px">
                   <el-input v-model="form.height" placeholder="请输入身高" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="血型" prop="blood">
+                <el-form-item label="血型" prop="blood" label-width="40px">
                   <el-input v-model="form.blood" placeholder="请输入血型" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="120px">
-                  <el-input v-model="form.zyjfwcs" placeholder="请输入职业及服务处所" />
+                <el-form-item label="服务处所" prop="zyjfwcs" label-width="70px">
+                  <el-input v-model="form.zyjfwcs" placeholder="请输入服务处所" />
                 </el-form-item>
               </el-col>
               <el-col :span="10">
-                <el-form-item label="职业" prop="zy" label-width="50px">
+                <el-form-item label="职业" prop="zy" label-width="40px">
                   <el-input v-model="form.zy" placeholder="请输入职业" />
                 </el-form-item>
               </el-col>
@@ -969,37 +1514,42 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="签发意见" prop="qfyj">
+                <el-form-item label="签发意见" prop="qfyj" label-width="70px">
                   <el-input v-model="form.qfyj" placeholder="请输入签发意见" />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="有效日期" prop="yxrq">
-                  <el-input v-model="form.yxrq" placeholder="请输入有效日期" />
+              <el-col :span="24">
+                <el-form-item label="身份证签发日期及有效期限" prop="yxrq" label-width="180px">
+                  <el-input v-model="form.yxrq" placeholder="请输入身份证签发日期及有效期限" />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="身份证号" prop="cardId">
+              <el-col :span="24">
+                <el-form-item label="身份证号" prop="cardId" label-width="70px">
                   <el-input v-model="form.cardId" placeholder="请输入身份证号" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由何地迁来本县市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
-                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县市何时登记户口" />
+                <el-form-item label="何时由何地迁来本市（县）" prop="hsyhdqlbxshsdjhk" label-width="180px">
+                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本市（县）" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="260px">
-                  <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
+                <el-form-item label="何时由何地迁来本址" prop="hsybxshcqlhsdjhk" label-width="140px">
+                  <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时由何地迁来本址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="注销户口原因" prop="zxhkyy" label-width="100px">
-                  <el-input v-model="form.zxhkyy" placeholder="请输入注销户口原因" />
+                <el-form-item label="何时迁往何地" prop="hshyqwhd" label-width="98px">
+                  <el-input v-model="form.hshyqwhd" placeholder="请输入何时迁往何地" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="何因注销户口是否缴销身份证" prop="zxhkyy" label-width="195px">
+                  <el-input v-model="form.zxhkyy" placeholder="请输入何因注销户口是否缴销身份证" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark" label-width="40px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -1008,132 +1558,167 @@
             <!--常住人口登记表3-->
             <el-row :gutter="10" v-if="form.ywType==='option9'">
               <el-col :span="12">
-                <el-form-item label="户别" prop="hb">
+                <el-form-item label="户别" prop="hb" label-width="40px">
                   <el-input v-model="form.hb" placeholder="请输入户别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="户主姓名" prop="hzName">
+                <el-form-item label="户主姓名" prop="hzName" label-width="70px">
                   <el-input v-model="form.hzName" placeholder="请输入户主姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="与户主关系" prop="relation" label-width="90px">
+                <el-form-item label="与户主关系" prop="relation" label-width="83px">
                   <el-input v-model="form.relation" placeholder="请输入与户主关系" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="姓名" prop="name">
+                <el-form-item label="姓名" prop="name" label-width="40px">
                   <el-input v-model="form.name" placeholder="请输入姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="性别" prop="sex">
+                <el-form-item label="性别" prop="sex" label-width="40px">
                   <el-input v-model="form.sex" placeholder="请输入性别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="民族" prop="nation">
+                <el-form-item label="曾用名" prop="usedName" label-width="55px">
+                  <el-input v-model="form.usedName" placeholder="请输入曾用名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="民族" prop="nation" label-width="40px">
                   <el-input v-model="form.nation" placeholder="请输入民族" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生日期" prop="birthday">
+                <el-form-item label="出生日期" prop="birthday" label-width="70px">
                   <el-input v-model="form.birthday" placeholder="请输入出生日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生地址" prop="address">
-                  <el-input v-model="form.address" placeholder="请输入出生地址" />
+                <el-form-item label="监护人1" prop="jhr1" label-width="65px">
+                  <el-input v-model="form.jhr1" placeholder="请输入监护人1" />
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="公民证代号号码签发机关及日期" prop="gmzdhhmqfjgjrq" label-width="220px">
-                  <el-input v-model="form.gmzdhhmqfjgjrq" placeholder="请输入公民证代号号码签发机关及日期" />
+              <el-col :span="12">
+                <el-form-item label="监护人2" prop="jhr2" label-width="65px">
+                  <el-input v-model="form.jhr2" placeholder="请输入监护人2" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="现住址" prop="xzz">
-                  <el-input v-model="form.xzz" placeholder="请输入现住址" />
+                <el-form-item label="监护关系1" prop="jhgx1" label-width="80px">
+                  <el-input v-model="form.jhgx1" placeholder="请输入监护关系1" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="本县(市)其他住址" prop="bxsqtzz" label-width="120px">
-                  <el-input v-model="form.bxsqtzz" placeholder="请输入本县(市)其他住址" />
+                <el-form-item label="监护关系2" prop="jhgx2" label-width="80px">
+                  <el-input v-model="form.jhgx2" placeholder="请输入监护关系2" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="出生地" prop="address" label-width="55px">
+                  <el-input v-model="form.address" placeholder="请输入出生地" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="公民出生证签发日期" prop="gmcszqfrq" label-width="140px">
+                  <el-input v-model="form.gmcszqfrq" placeholder="请输入公民出生证签发日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="住址" prop="xzz" label-width="40px">
+                  <el-input v-model="form.xzz" placeholder="请输入住址" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="本市（县）其他住址" prop="bxsqtzz" label-width="140px">
+                  <el-input v-model="form.bxsqtzz" placeholder="请输入本市（县）其他住址" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="籍贯" prop="jiguan">
+                <el-form-item label="籍贯" prop="jiguan" label-width="40px">
                   <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="宗教信仰" prop="zjxy">
+                <el-form-item label="宗教信仰" prop="zjxy" label-width="70px">
                   <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="身份证号" prop="cardId">
+                <el-form-item label="身份证号" prop="cardId" label-width="70px">
                   <el-input v-model="form.cardId" placeholder="请输入身份证号" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="文化程度" prop="whcd">
+                <el-form-item label="身份证签发日期" prop="yxrq" label-width="110px">
+                  <el-input v-model="form.yxrq" placeholder="请输入身份证签发日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="文化程度" prop="whcd" label-width="70px">
                   <el-input v-model="form.whcd" placeholder="请输入文化程度" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="婚姻状况" prop="hyzk">
+                <el-form-item label="婚姻状况" prop="hyzk" label-width="70px">
                   <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="兵役状况" prop="byzk">
+                <el-form-item label="兵役状况" prop="byzk" label-width="70px">
                   <el-input v-model="form.byzk" placeholder="请输入兵役状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="身高" prop="height">
+                <el-form-item label="身高" prop="height" label-width="40px">
                   <el-input v-model="form.height" placeholder="请输入身高" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="血型" prop="blood">
+                <el-form-item label="血型" prop="blood" label-width="40px">
                   <el-input v-model="form.blood" placeholder="请输入血型" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="职业" prop="zy" label-width="50px">
+                <el-form-item label="职业" prop="zy" label-width="40px">
                   <el-input v-model="form.zy" placeholder="请输入职业" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="120px">
-                  <el-input v-model="form.zyjfwcs" placeholder="请输入职业及服务处所" />
+                <el-form-item label="服务处所" prop="zyjfwcs" label-width="70px">
+                  <el-input v-model="form.zyjfwcs" placeholder="请输入服务处所" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由何地迁来本县市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="250px">
-                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县市何时登记户口" />
+                <el-form-item label="何时何因由何地迁来本市" prop="hsyhdqlbxshsdjhk" label-width="170px">
+                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时何因由何地迁来本市" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由本县、市何处迁来何时登记户口" prop="hsybxshcqlhsdjhk" label-width="260px">
-                  <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时由本县、市何处迁来何时登记户口" />
+                <el-form-item label="何时何因由何地迁来本址" prop="hsybxshcqlhsdjhk" label-width="170px">
+                  <el-input v-model="form.hsybxshcqlhsdjhk" placeholder="请输入何时何因由何地迁来本址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="注销户口原因" prop="zxhkyy" label-width="100px">
-                  <el-input v-model="form.zxhkyy" placeholder="请输入注销户口原因" />
+                <el-form-item label="何时何因迁往何地" prop="hshyqwhd" label-width="130px">
+                  <el-input v-model="form.hshyqwhd" placeholder="请输入何时何因迁往何地" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="何时何因注销户口" prop="zxhkyy" label-width="130px">
+                  <el-input v-model="form.zxhkyy" placeholder="请输入何时何因注销户口" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="登记日期" prop="djrq">
+                <el-form-item label="登记日期" prop="djrq" label-width="70px">
                   <el-input v-model="form.djrq" placeholder="请输入登记日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark" label-width="45px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -1142,87 +1727,87 @@
             <!--常住卡-->
             <el-row :gutter="10" v-if="form.ywType==='option2'">
               <el-col :span="12">
-                <el-form-item label="与户主关系" prop="relation" label-width="90px">
-                  <el-input v-model="form.relation" placeholder="请输入与户主关系" />
+                <el-form-item label="户主姓名与户主关系" prop="relation" label-width="140px">
+                  <el-input v-model="form.relation" placeholder="请输入户主姓名与户主关系" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="姓名" prop="name">
+                <el-form-item label="姓名" prop="name" label-width="40px">
                   <el-input v-model="form.name" placeholder="请输入姓名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="别名" prop="otherName">
+                <el-form-item label="别名" prop="otherName" label-width="40px">
                   <el-input v-model="form.otherName" placeholder="请输入别名" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="性别" prop="sex">
+                <el-form-item label="性别" prop="sex" label-width="40px">
                   <el-input v-model="form.sex" placeholder="请输入性别" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="文化程度" prop="whcd">
+                <el-form-item label="文化程度" prop="whcd" label-width="68px">
                   <el-input v-model="form.whcd" placeholder="请输入文化程度" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="婚姻状况" prop="hyzk">
+                <el-form-item label="婚姻状况" prop="hyzk" label-width="68px">
                   <el-input v-model="form.hyzk" placeholder="请输入婚姻状况" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="宗教信仰" prop="zjxy">
+                <el-form-item label="宗教信仰" prop="zjxy" label-width="68px">
                   <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="民族" prop="nation">
+                <el-form-item label="民族" prop="nation" label-width="40px">
                   <el-input v-model="form.nation" placeholder="请输入民族" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出生日期" prop="birthday">
+                <el-form-item label="出生日期" prop="birthday" label-width="68px">
                   <el-input v-model="form.birthday" placeholder="请输入出生日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="出生地址" prop="address">
+                <el-form-item label="出生地址" prop="address" label-width="68px">
                   <el-input v-model="form.address" placeholder="请输入出生地址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="籍贯" prop="jiguan">
+                <el-form-item label="籍贯" prop="jiguan" label-width="40px">
                   <el-input v-model="form.jiguan" placeholder="请输入籍贯" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="120px">
+                <el-form-item label="职业及服务处所" prop="zyjfwcs" label-width="110px">
                   <el-input v-model="form.zyjfwcs" placeholder="请输入职业及服务处所" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="何时由何地迁来本县市何时登记户口" prop="hsyhdqlbxshsdjhk" label-width="240px">
-                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来本县市何时登记户口" />
+                <el-form-item label="何时由何地迁来" prop="hsyhdqlbxshsdjhk" label-width="110px">
+                  <el-input v-model="form.hsyhdqlbxshsdjhk" placeholder="请输入何时由何地迁来" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="本县(市)其他住址" prop="bxsqtzz" label-width="120px">
-                  <el-input v-model="form.bxsqtzz" placeholder="请输入本县(市)其他住址" />
+                <el-form-item label="本市其他住址" prop="bxsqtzz" label-width="98px">
+                  <el-input v-model="form.bxsqtzz" placeholder="请输入本市其他住址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="现住址" prop="xzz">
+                <el-form-item label="现住址" prop="xzz" label-width="55px">
                   <el-input v-model="form.xzz" placeholder="请输入现住址" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="登记日期" prop="djrq">
+                <el-form-item label="登记日期" prop="djrq" label-width="68px">
                   <el-input v-model="form.djrq" placeholder="请输入登记日期" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark" label-width="40px">
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
               </el-col>
@@ -1378,12 +1963,19 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        ywType: null,
+        ywType: 'option1',
         muId: null,
+        muPath: null,
         relation: null,
         name: null,
         otherName: null,
+        usedName: null,
         sex: null,
+        jhr1: null,
+        jhgx1: null,
+        jhr2: null,
+        jhgx2: null,
+        gmcszqfrq: null,
         birthday: null,
         address: null,
         yj: null,
@@ -1396,6 +1988,7 @@ export default {
         gmzdhhmqfjgjrq: null,
         hsyhdqlbxshsdjhk: null,
         hsybxshcqlhsdjhk: null,
+        hshyqwhd: null,
         zxhkrq: null,
         zxhkyy: null,
         hkdjsxbgjznrsjjblrz1: null,
@@ -1487,10 +2080,71 @@ export default {
     };
   },
   created() {
-    this.queryParams.muId = this.$route.query.muId
+    this.queryParams.muId = this.$route.query.muId;
+    this.queryParams.ywType = this.$route.query.ywType;
     this.getList();
   },
   methods: {
+    ywTypeClick(tab){
+      this.queryParams = {
+        ywType: null,
+        muId: null,
+        muPath: null,
+        relation: null,
+        name: null,
+        otherName: null,
+        usedName: null,
+        sex: null,
+        jhr1: null,
+        jhgx1: null,
+        jhr2: null,
+        jhgx2: null,
+        gmcszqfrq: null,
+        birthday: null,
+        address: null,
+        yj: null,
+        nation: null,
+        zjxy: null,
+        whcd: null,
+        hyzk: null,
+        zyjfwcs: null,
+        bxsqtzz: null,
+        gmzdhhmqfjgjrq: null,
+        hsyhdqlbxshsdjhk: null,
+        hsybxshcqlhsdjhk: null,
+        hshyqwhd: null,
+        zxhkrq: null,
+        zxhkyy: null,
+        hkdjsxbgjznrsjjblrz1: null,
+        hkdjsxbgjznrsjjblrz2: null,
+        jiguan: null,
+        xzz: null,
+        hzName: null,
+        hb: null,
+        djrq: null,
+        byzk: null,
+        height: null,
+        blood: null,
+        zy: null,
+        slReason: null,
+        sljmsfzqm: null,
+        qfyj: null,
+        yxrq: null,
+        cardId: null,
+        picIds: null,
+        pictures: null,
+        allPicIds: null,
+        allPics: null,
+        errorCorrect: null,
+        auditStatus: null,
+        auditName: null,
+        auditResult: null,
+        auditReason: null,
+      };
+      this.queryParams.ywType = tab.name;
+      this.queryParams.pageSize = 10;
+      this.handleQuery()
+    },
     /** 查询常住人口登记列表 */
     getList() {
       this.loading = true;
@@ -1516,7 +2170,13 @@ export default {
         relation: null,
         name: null,
         otherName: null,
+        usedName: null,
         sex: null,
+        jhr1: null,
+        jhgx1: null,
+        jhr2: null,
+        jhgx2: null,
+        gmcszqfrq: null,
         birthday: null,
         address: null,
         yj: null,
@@ -1529,6 +2189,7 @@ export default {
         gmzdhhmqfjgjrq: null,
         hsyhdqlbxshsdjhk: null,
         hsybxshcqlhsdjhk: null,
+        hshyqwhd: null,
         zxhkrq: null,
         zxhkyy: null,
         hkdjsxbgjznrsjjblrz1: null,
@@ -1578,6 +2239,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.ywType = this.queryParams.ywType
       this.open_add = true;
     },
     /** 修改按钮操作 */