Merge remote-tracking branch 'origin/main'

fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java

@@ -35,6 +35,7 @@ public class HrmFlowInstanceVo implements Serializable {
     private BigDecimal hours;
     private String procStatus;
     private Date actualEndTime;
+    private String statusName;
 
     private String createBy;
     private Date createTime;

fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java

@@ -159,6 +159,22 @@ public class HrmFlowInstanceServiceImpl implements IHrmFlowInstanceService {
                 record.setActualEndTime(hrmTravelReqVo.getActualEndTime());
             }
         }
+        for (HrmFlowInstanceVo vo : result.getRecords()) {
+            if ("travel".equals(vo.getBizType())) {
+                HrmTravelReqVo travel = travelReqMapper.selectVoById(vo.getBizId());
+                if (travel != null) {
+                    vo.setActualEndTime(travel.getActualEndTime());
+                    // 只有流程已完成，才替换显示文字
+                    if ("complete".equals(vo.getStatus())) {
+                        if (travel.getActualEndTime() == null) {
+                            vo.setStatusName("出差中");
+                        } else {
+                            vo.setStatusName("已结束");
+                        }
+                    }
+                }
+            }
+        }
         return TableDataInfo.build(result);
     }
 

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaCity.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -26,6 +27,17 @@ public class OaCity extends BaseEntity {
     /** 城市 */
     private String cityName;
 
+    /**
+     * 城市编码
+     */
+    private String cityCode;
+
+    /**
+     * 所属省份
+     */
+    private String provinceName;
+
+
     /** 状态 1正常 0禁用 */
     private Long status;
 

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaCityBo.java

@@ -23,6 +23,7 @@ public class OaCityBo extends BaseEntity {
     private String cityName;
 
     private Long status;
-
+    private String cityCode;
+    private String provinceName;
     private String remark;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaCityVo.java

@@ -20,4 +20,8 @@ public class OaCityVo extends BaseEntity {
     private Long status;
 
     private String remark;
+    /** 城市编码 */
+    private String cityCode;
+    /** 所属省份 */
+    private String provinceName;
 }

ruoyi-ui/src/views/oa/city/index.vue

@@ -25,14 +25,21 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="cityList" @selection-change="handleSelectionChange" border stripe>
+    <!-- 表格取消所有固定宽度，100%自适应铺满容器 -->
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table 
-      <el-table-column label="序号" type="index" width="50" align="center" />
+      v-loading="loading" 
-      <el-table-column prop="cityCode" label="城市编码" align="center" width="150" />
+      :data="cityList" 
-      <el-table-column prop="countryName" label="国家" align="center" width="120" />
+      @selection-change="handleSelectionChange" 
-      <el-table-column prop="cityName" label="城市名称" align="center" width="200" />
+      border stripe
-      <el-table-column prop="provinceName" label="所属省份" align="center" width="150" />
+      style="width: 100%"
-      <el-table-column label="操作" align="center" width="150">
+    >
+      <el-table-column type="selection" align="center" />
+      <el-table-column label="序号" type="index" align="center" />
+      <el-table-column prop="cityCode" label="城市编码" align="center" />
+      <el-table-column prop="countryName" label="国家" align="center" />
+      <el-table-column prop="cityName" label="城市名称" align="center" />
+      <el-table-column prop="provinceName" label="所属省份" align="center" />
+      <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
@@ -48,7 +55,7 @@
       @pagination="getList"
     />
 
-    <!-- 弹窗表单：我加了国家输入框 -->
+    <!-- 弹窗表单 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="国家" prop="countryName">
@@ -86,7 +93,7 @@ export default {
       total: 0,
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50, // 已改成每页50条
         cityName: null
       },
       ids: [],
@@ -119,7 +126,7 @@ export default {
       this.getList();
     },
     resetQuery() {
-      this.queryParams = { pageNum: 1, pageSize: 10, cityName: null };
+      this.queryParams = { pageNum: 1, pageSize: 50, cityName: null };
       this.getList();
     },
     handleSelectionChange(selection) {
@@ -172,3 +179,26 @@ export default {
   }
 };
 </script>
+
+<style scoped>
+/* 全局弱化边框、阴影、降低层级 */
+.app-container {
+  padding: 12px;
+}
+.el-table {
+  box-shadow: none !important;
+  border-radius: 4px;
+}
+.el-table th, .el-table td {
+  border-color: #f0f2f5 !important;
+}
+/* 按钮缩小、弱化样式 */
+.el-button--mini {
+  padding: 3px 10px;
+  font-size: 12px;
+}
+/* 降低弹窗层级柔和化 */
+.el-dialog {
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08) !important;
+}
+</style>