修改表格字段显示位置

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

@@ -247,6 +247,16 @@
           <span>{{ parseTime(scope.row.zrTime) ? parseTime(scope.row.zrTime).substring(0,10) : '-'}}</span>
         </template>
       </el-table-column>
+      <el-table-column label="从其他方舱转来时间" align="center" prop="otherFcTime" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.otherFcTime) ? parseTime(scope.row.otherFcTime).substring(0,10) : '-'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="从其他隔离点转来时间" align="center" prop="otherGldTime" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.otherGldTime) ? parseTime(scope.row.otherGldTime).substring(0,10) : '-'}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="转出时间" align="center" prop="zcTime" width="180" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.zcTime) ? parseTime(scope.row.zcTime).substring(0,10) : '-' }}</span>
@@ -476,7 +486,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="从其他隔离点转来时间" prop="zrTme">
+            <el-form-item label="从其他隔离点转来时间" prop="otherGldTime">
               <el-date-picker clearable
                               v-model="form.otherGldTime"
                               type="date"

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

@@ -127,14 +127,14 @@
     <el-table v-loading="loading" :data="fkqkList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="街道/镇名称" width="140" align="center" prop="street" :show-overflow-tooltip="true">
+      <el-table-column label="所在区" width="140" align="center" prop="area" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.street_town" :value="scope.row.street"/>
+          <dict-tag :options="dict.type.residential_area" :value="scope.row.area"/>
         </template>
       </el-table-column>
-      <el-table-column label="小区名称" width="140" align="center" prop="community" :show-overflow-tooltip="true">
+      <el-table-column label="街道/镇名称" width="140" align="center" prop="street" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.community" :value="scope.row.community"/>
+          <dict-tag :options="dict.type.street_town" :value="scope.row.street"/>
         </template>
       </el-table-column>
       <el-table-column label="居委会" width="140" align="center" prop="committee" :show-overflow-tooltip="true">
@@ -142,9 +142,9 @@
           <dict-tag :options="dict.type.committee" :value="scope.row.committee"/>
         </template>
       </el-table-column>
-      <el-table-column label="所在区" width="140" align="center" prop="area" :show-overflow-tooltip="true">
+      <el-table-column label="小区名称" width="140" align="center" prop="community" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.residential_area" :value="scope.row.area"/>
+          <dict-tag :options="dict.type.community" :value="scope.row.community"/>
         </template>
       </el-table-column>
       <el-table-column label="楼号" align="center" prop="floor"  :show-overflow-tooltip="true">

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

@@ -235,6 +235,11 @@
           <span>{{ parseTime(scope.row.zrTime) ? parseTime(scope.row.zrTime).substring(0,10) : '' }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="从其他隔离点转来时间" align="center" prop="otherZrTime" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.otherZrTime) ? parseTime(scope.row.otherZrTime).substring(0,10) : ''}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="转出时间" align="center" prop="zcTime" width="180" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.zcTime) ? parseTime(scope.row.zcTime).substring(0,10) : ''}}</span>