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

ruoyi-ui/src/views/system/hscj/index.vue

@@ -268,7 +268,14 @@
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="省" align="center" prop="province" width="100" :show-overflow-tooltip="true" />
       <el-table-column label="市" align="center" prop="city" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="采集地点" align="center" prop="cjPlace" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="箱号" align="center" prop="boxhao" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="采集管号" align="center" prop="cjgh" width="140" :show-overflow-tooltip="true" />
+      <el-table-column label="姓名" align="center" prop="userName" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="身份证号码" align="center" prop="cardNo" width="180" :show-overflow-tooltip="true" />
+      <el-table-column label="联系方式" align="center" prop="phone" width="120" :show-overflow-tooltip="true" />
       <el-table-column label="居住地所在区" align="center" prop="area" width="140" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.residential_area" :value="scope.row.area"/>
@@ -285,19 +292,15 @@
         </template>
       </el-table-column>
       <el-table-column label="小区/村名称" align="center" prop="communityName" width="120" :show-overflow-tooltip="true"/>
-      <el-table-column label="采集地点" align="center" prop="cjPlace" width="100" :show-overflow-tooltip="true" />
-      <el-table-column label="采集管号" align="center" prop="cjgh" width="140" :show-overflow-tooltip="true" />
-      <el-table-column label="姓名" align="center" prop="userName" width="100" :show-overflow-tooltip="true" />
-      <el-table-column label="身份证号码" align="center" prop="cardNo" width="180" :show-overflow-tooltip="true" />
-      <el-table-column label="联系方式" align="center" prop="phone" width="120" :show-overflow-tooltip="true" />
+      <el-table-column label="住址" align="center" prop="address" width="120" :show-overflow-tooltip="true" />
       <el-table-column label="性别" align="center" prop="sex" width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
         </template>
       </el-table-column>
-      <el-table-column label="住址" align="center" prop="address" width="120" :show-overflow-tooltip="true" />
       <el-table-column label="年龄" align="center" prop="age" width="100" :show-overflow-tooltip="true" />
       <el-table-column label="类别" align="center" prop="category" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="人员关系" align="center" prop="rygx" width="100" :show-overflow-tooltip="true" />
       <el-table-column label="采集时间" align="center" prop="cjTime"width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.cjTime)  ? parseTime(scope.row.cjTime).substring(0,10) : '' }}</span>
@@ -312,13 +315,6 @@
           <span>{{parseTime(scope.row.jcTime) ? parseTime(scope.row.jcTime).substring(0,10) : '' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="人员关系" align="center" prop="rygx" width="100" :show-overflow-tooltip="true" />
-      <el-table-column label="箱号" align="center" prop="boxhao" width="100" :show-overflow-tooltip="true" />
-<!--      <el-table-column label="状态" align="center" prop="status">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
       <el-table-column label="备注" align="center" prop="remark" width="100" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
         <template slot-scope="scope">