修改人员详情页，新增预算页

oa-ui/src/assets/icons/svg/ArrowDown.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M12 14.308L8.192 10.5h7.616z"/></svg>

oa-ui/src/assets/icons/svg/ArrowRight.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M10.5 16.3q-.2 0-.35-.137T10 15.8V8.2q0-.225.15-.362t.35-.138q.05 0 .35.15l3.625 3.625q.125.125.175.25t.05.275q0 .15-.05.275t-.175.25L10.85 16.15q-.075.075-.162.113t-.188.037"/></svg>

oa-ui/src/assets/icons/svg/certificate.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" fill-rule="evenodd" d="M14.285 2.142a3 3 0 0 0-4.57 0l-.042.05a1 1 0 0 1-.842.348l-.065-.005a3 3 0 0 0-3.23 3.231l.004.065a1 1 0 0 1-.348.842l-.05.042a3 3 0 0 0 0 4.57l.05.042a1 1 0 0 1 .348.842l-.005.065A3.002 3.002 0 0 0 8 15.429V22a1 1 0 0 0 1.555.832L12 21.202l2.445 1.63A1 1 0 0 0 16 22v-6.57a3.002 3.002 0 0 0 2.465-3.196l-.005-.065a1 1 0 0 1 .348-.842l.05-.042a3 3 0 0 0 0-4.57l-.05-.042a1 1 0 0 1-.348-.842l.005-.065a3 3 0 0 0-3.231-3.23l-.065.004a1 1 0 0 1-.842-.348zM10 20.132V16.15a3.002 3.002 0 0 0 4 0v3.98l-1.445-.963a1 1 0 0 0-1.11 0zm4.707-11.425a1 1 0 0 0-1.414-1.414L11 9.586l-.293-.293a1 1 0 0 0-1.414 1.414l1 1a1 1 0 0 0 1.414 0z" clip-rule="evenodd"/></svg>

oa-ui/src/assets/icons/svg/postSalary.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 56 56"><path fill="currentColor" fill-rule="evenodd" d="M28 52C14.745 52 4 41.255 4 28S14.745 4 28 4s24 10.745 24 24s-10.745 24-24 24m9.831-35.143h-3.864l-5.71 10.21h-.095l-5.71-10.21h-3.88l6.965 11.817h-4.5v1.797h5.423V33h-5.423v1.797h5.423v4.564h3.467v-4.564h5.423V33h-5.423v-2.53h5.423v-1.797h-4.5z"/></svg>

oa-ui/src/router/index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: 
- * @LastEditTime: 2024-03-22 14:50:52
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-25 17:35:52
  */
 /*
  * @Author: ysh
@@ -193,14 +193,14 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/device/expense',
+    path: '/device/approval',
     component: Layout,
     hidden: true,
     children: [
       {
         path: '',
-        component: () => import('@/views/oa/device/expense'),
-        name: 'deviceExpense',
+        component: () => import('@/views/oa/device/approval'),
+        name: 'deviceApproval',
         meta: { title: '设备明细', icon: '' }
 
       }
@@ -217,6 +217,20 @@ export const constantRoutes = [
         name: 'staffInfo',
         meta: { title: '员工详情', icon: '' }
 
+      }
+    ]
+  },
+  {
+    path: '/budget/add',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/oa/budget/addBudget'),
+        name: 'addBudget',
+        meta: { title: '新增预算', icon: '' }
+
       }
     ]
   }

oa-ui/src/views/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: wrh
- * @LastEditTime: 2024-03-21 14:50:16
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-25 15:08:15
 -->
 
 <template>
@@ -191,6 +191,20 @@ export default {
           bgColor: '#F7C59F',
           boxShadow: '0 5px 20px rgba(247,197,159,0.5)',
           path: '/tender'
+        }, {
+          id: 8,
+          name: '人事管理',
+          icon: 'dept',
+          bgColor: '#20B2AA',
+          boxShadow: '0 5px 20px rgba(32,178,170,0.5)',
+          path: '/staff'
+        }, {
+          id: 9,
+          name: '预算管理',
+          icon: 'form',
+          bgColor: '#E64A19',
+          boxShadow: '0 5px 20px rgba(230,74,25,0.5)',
+          path: '/budget'
         }
       ]
     }
@@ -294,8 +308,8 @@ export default {
 
   .nav-item {
     background-color: #ffffff;
-    max-width: 240px;
-    width: 220px;
+    // max-width: 240px;
+    // width: 220px;
     flex-grow: 1;
     height: 120px;
     border-radius: 10px;

oa-ui/src/views/oa/budget/addBudget.vue

@@ -0,0 +1,327 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-03-25 15:05:59
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-25 17:28:17
+-->
+<template>
+  <div>
+    <div class="header">
+      <div class="back">
+        <el-button type="primary" plain @click="goBack">返回</el-button>
+      </div>
+      <div class="title">
+        <div class="title-text">新增预算</div>
+        <div class="title-tips">请精准填写预算标准，对应的人员、设备、车辆可直接选择生成固定成本</div>
+      </div>
+    </div>
+    <div class="add-main">
+      <el-steps :active="activeStep" align-center finish-status="success">
+        <el-step title="选择项目" description="选择想要生成预算的项目"></el-step>
+        <el-step title="选择参与人员" description="选择参与的人员，得到人员预算"></el-step>
+        <el-step title="选择车辆和设备" description="选择车辆和设备，得到对应预算"></el-step>
+        <el-step title="其他预算开支项" description="项目预算其他项"></el-step>
+        <el-step title="生成预算表" description="生成最终的项目预算表"></el-step>
+      </el-steps>
+      <!-- 选择项目 -->
+      <div class="project" v-if="activeStep == 0">
+        <el-form ref="form1" :model="projectForm" :rules="projectRule" label-width="120px">
+          <el-form-item label="项目编号：" prop="projectNumber">
+            <div style="display: flex;">
+              <el-input v-model="projectForm.projectNumber" placeholder="请选择项目编号" disabled style="width:300px" />
+              <el-button @click="openProject = true">选择</el-button>
+            </div>
+          </el-form-item>
+          <el-form-item label="项目名称：" prop="projectName">
+            {{ projectForm.projectName }}
+          </el-form-item>
+          <el-form-item label="项目负责人：" prop="projectLeader">
+            {{ projectForm.projectLeader }}
+          </el-form-item>
+          <el-form-item label="项目类型：" prop="projectType">
+            {{ projectForm.projectType }}
+          </el-form-item>
+          <el-form-item label="项目概况：">
+            <table border="1">
+              <tr>
+                <td style="width:250px;">工作内容</td>
+                <td>等级或比例尺</td>
+                <td>单位</td>
+                <td>工作量</td>
+                <td style="width:100px;">要求完成时间</td>
+                <td>备注</td>
+              </tr>
+              <tr v-for="(work, index) in workList" :key="index">
+                <td>
+                  {{ work.content }}
+                </td>
+                <td>
+                  {{ work.scale }}
+                </td>
+                <td>
+                  {{ work.unit }}
+                </td>
+                <td>
+                  {{ work.workload }}
+                </td>
+                <td>
+                  {{ work.deadline }}
+                </td>
+                <td>
+                  {{ work.remark }}
+                </td>
+              </tr>
+            </table>
+          </el-form-item>
+          <el-form-item label="甲方单位：">
+            {{ projectForm.partyA }}
+          </el-form-item>
+          <el-form-item label="联系人：">
+            {{ projectForm.contactPerson }}
+          </el-form-item>
+          <el-form-item label="联系方式：">
+            {{ projectForm.telephone }}
+          </el-form-item>
+          <el-form-item label="备注：">
+            {{ projectForm.remark }}
+          </el-form-item>
+          <el-form-item label="项目登记人：">
+            {{ projectForm.projectRegistrant }}
+          </el-form-item>
+          <el-form-item label="登记时间：">
+            {{ projectForm.createTime }}
+          </el-form-item>
+        </el-form>
+      </div>
+      <!-- 选择参与人员 -->
+      <div class="staff" v-if="activeStep == 1">
+        <el-breadcrumb separator-class="el-icon-arrow-right">
+          <el-breadcrumb-item>选择项目</el-breadcrumb-item>
+          <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
+          <el-breadcrumb-item>{{ projectForm.projectName }}</el-breadcrumb-item>
+          <el-breadcrumb-item>{{ projectForm.projectLeader }}</el-breadcrumb-item>
+        </el-breadcrumb>
+        <el-form ref="form2" :model="peopleForm">
+          <el-form-item label="选择人员：">
+
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-divider></el-divider>
+      <div class="btn">
+        <el-button @click="activeStep -= 1" :disabled="activeStep == 0">上一步</el-button>
+        <el-button @click="confirmStep" type="primary" v-if="activeStep < 4">下一步</el-button>
+        <el-button @click="activeStep += 1" type="primary" v-if="activeStep == 4">生成预算表</el-button>
+      </div>
+    </div>
+
+    <el-dialog title="选择项目" :visible.sync="openProject" width="700px" append-to-body>
+      <el-form :inline="true">
+        <el-form-item label="项目编号" prop="projectNumber">
+          <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable
+            @keyup.enter.native="getProjectList" />
+        </el-form-item>
+        <el-form-item style="margin-bottom:0;display:none;">
+          <el-input></el-input>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button @click="getProjectList" type="primary">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table :data="projectList" style="margin-top: 30px;" height="600px">
+        <el-table-column type="index" width="50">
+        </el-table-column>
+        <el-table-column prop="isFinshed" label="状态" width="90px">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.isFinished === '0' ? 'success' : 'warning'" disable-transitions>
+              {{ scope.row.isFinished == '0' ? '进行中' : '已结束' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
+        <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" width="200px" />
+        <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderName" />
+        <el-table-column align="center">
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" @click="chooseProject(scope.row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="text-align: right;">
+        <el-pagination @current-change="getProjectList" :current-page.sync="queryParams.pageNum"
+          :page-size="queryParams.pageSize" layout="total, prev, pager, next" :total="projectTotal">
+        </el-pagination>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listProject } from "@/api/oa/project/project";
+export default {
+  data() {
+    return {
+      activeStep: 0,
+      form: {},
+      openProject: false,
+      projectList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectNumber: '',
+        projectLeader: '',
+        projectLeaderName: undefined,
+        projectName: '',
+      },
+      projectTotal: 0,
+      projectForm: {},
+      workList: [
+        {
+          content: '实景三维制作（影像分辨率优于5cm）',
+          scale: '1:500',
+          workload: '81',
+          unit: 'km²',
+          deadline: '2024-01-31',
+          remark: '此为备注此为备注此为备注此为备注此为备注此为备注'
+        }
+      ],
+      projectRule: {
+        projectNumber: [{ required: true, message: '请选择项目编号', trigger: 'blur' }],
+      },
+      peopleForm: {}
+    }
+  },
+  created() {
+    this.getProjectList();
+  },
+  methods: {
+    goBack() {
+      let obj = { path: "/budget/add" }
+      this.$tab.closeOpenPage(obj);
+      this.$router.push({ path: '/budget' });
+    },
+    // 查询项目列表
+    getProjectList() {
+      listProject(this.queryParams).then(response => {
+        this.projectList = response.rows;
+        this.projectTotal = response.total;
+      })
+    },
+    // 选择项目
+    chooseProject(row) {
+      this.projectForm = row;
+      this.openProject = false
+    },
+    confirmStep() {
+      if (this.projectForm.projectNumber == undefined) {
+        this.activeStep = 0;
+        this.$message.error(`请选择项目编号！`);
+      }
+      if(this.projectForm.projectNumber){
+        this.activeStep += 1;
+      }
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.header {
+  background-color: #fff;
+  height: 110px;
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #EBEEF5;
+
+  .back {
+    margin-left: 30px;
+    flex: 1;
+  }
+
+  .title {
+    text-align: left;
+    flex: 24;
+    padding-left: 40px;
+
+    .title-text {
+      font-size: 20px;
+      font-weight: 700;
+    }
+
+    .title-tips {
+      font-size: 14px;
+      color: #5a5a5a;
+    }
+  }
+}
+
+.add-main {
+  padding: 20px;
+
+  .project {
+    padding-top: 50px;
+    width: 1000px;
+    margin: 0 auto;
+
+    .info-item {
+      line-height: 30px;
+      color: #5A5A5A;
+      font-size: 14px;
+      padding-left: 30px;
+      display: flex;
+      align-items: start;
+
+      .info-icon {
+        font-size: 20px;
+        margin-right: 10px;
+        vertical-align: middle;
+      }
+
+      .item-label {
+        max-width: 120px;
+        display: flex;
+        align-items: center;
+        font-size: 16px;
+      }
+
+      .item-value {
+        max-width: 260px;
+        // display: inline-block;
+      }
+    }
+  }
+
+  .staff {
+    width: 1200px;
+    margin: 0 auto;
+    padding-top: 50px;
+  }
+
+}
+
+.btn {
+  margin-top: 20px;
+  text-align: center;
+}
+
+table {
+  /*居中*/
+  margin: 0 auto;
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 3px;
+  }
+}
+
+::v-deep .el-input.is-disabled .el-input__inner {
+  background-color: #fff;
+  color: #5A5A5A;
+}
+</style>

oa-ui/src/views/oa/budget/index.vue

@@ -1,101 +1,9 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="人员成本" prop="staffCost">
-        <el-input
-          v-model="queryParams.staffCost"
-          placeholder="请输入人员成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车辆成本" prop="carCost">
-        <el-input
-          v-model="queryParams.carCost"
-          placeholder="请输入车辆成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备成本" prop="deviceCost">
-        <el-input
-          v-model="queryParams.deviceCost"
-          placeholder="请输入设备成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预结算额" prop="budgetSettle">
-        <el-input
-          v-model="queryParams.budgetSettle"
-          placeholder="请输入预结算额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="外协费用" prop="outExpense">
-        <el-input
-          v-model="queryParams.outExpense"
-          placeholder="请输入外协费用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="商务费用" prop="businessExpense">
-        <el-input
-          v-model="queryParams.businessExpense"
-          placeholder="请输入商务费用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车船租赁" prop="rentExpense">
-        <el-input
-          v-model="queryParams.rentExpense"
-          placeholder="请输入车船租赁"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="其他费用" prop="otherExpense">
-        <el-input
-          v-model="queryParams.otherExpense"
-          placeholder="请输入其他费用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预算总额" prop="totalExpense">
-        <el-input
-          v-model="queryParams.totalExpense"
-          placeholder="请输入预算总额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="编制人" prop="compiler">
-        <el-input
-          v-model="queryParams.compiler"
-          placeholder="请输入编制人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核人" prop="auditor">
-        <el-input
-          v-model="queryParams.auditor"
-          placeholder="请输入审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="项目编号" prop="projectId">
+        <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -105,46 +13,20 @@
 
     <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="['oa:budget:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:budget:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:budget:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:budget:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:budget:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:budget:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:budget:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:budget:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -166,31 +48,16 @@
       <el-table-column label="审核人" align="center" prop="auditor" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:budget:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:budget:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:budget:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:budget:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc预算管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -340,14 +207,15 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.budgetId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc预算管理";
+      // this.reset();
+      // this.open = true;
+      // this.title = "添加cmc预算管理";
+      this.$router.push({ path: '/budget/add' })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -382,12 +250,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const budgetIds = row.budgetId || this.ids;
-      this.$modal.confirm('是否确认删除cmc预算管理编号为"' + budgetIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc预算管理编号为"' + budgetIds + '"的数据项？').then(function () {
         return delBudget(budgetIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/oa/device/approval.vue

@@ -295,7 +295,7 @@ export default {
       })
     },
     goBack() {
-      let obj = { path: "/device/expense" }
+      let obj = { path: "/device/approval" }
       this.$tab.closeOpenPage(obj);
       this.$router.push({ path: '/device' });
     },

oa-ui/src/views/oa/staff/changeRecord.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+  export default {
+    
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

oa-ui/src/views/oa/staff/index.vue

@@ -90,7 +90,7 @@
             <span>{{ parseTime(scope.row.entryDate, '{y}-{m}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="固定成本(天)" align="center" key="salary" prop="salary.salary" v-if="columns[2].visible"
+        <el-table-column label="固定成本(天)" align="center" key="salary" prop="salary.salary"v-if="columns[2].visible"
           :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.salary ? scope.row.salary.salary : "" }}
@@ -236,6 +236,7 @@
                   :value="dict.value" />
               </el-select>
             </el-form-item>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -394,7 +395,8 @@ export default {
           }
         ]
       },
-      outCrtificates: []
+      certificates: '',
+      postSalary: ''
     };
   },
   watch: {
@@ -519,13 +521,17 @@ export default {
     },
     // 查看人员详情按钮
     handleView(row) {
+      console.log(row);
+      this.formatLevel(row.postLevel, row.salaryLevel, this.dict.type.sys_user_postlevel, this.dict.type.sys_user_salarylevel);
+      this.formatCrtificates(this.dict.type.sys_user_certificates, row.certificates)
       this.$router.push({
         path: '/staff/info',
         query: {
           userId: row.userId,
           nickName: row.nickName,
           postIds: this.form.postIds,
-          crtificates: this.crtificates
+          certificates: this.certificates,
+          postSalary: this.postSalary,
         }
       })
     },
@@ -639,6 +645,7 @@ export default {
       if (postLevel && salaryLevel) {
         let post = postLevelList[postLevel].label
         let salary = salaryLevelList[salaryLevel].label
+        this.postSalary = post + salary
         return post + salary
       } else {
         return ''
@@ -652,6 +659,7 @@ export default {
         for (let i of valArr) {
           outCrtificates.push(arr[i].label)
         }
+        this.certificates = outCrtificates.join(' / ')
         return outCrtificates.join(' / ')
       }
     }

oa-ui/src/views/oa/staff/info.vue

@@ -1,14 +1,20 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-03-22 14:50:46
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-25 13:56:25
+-->
 <template>
   <div class="bg">
     <div class="header">
       <div class="back">
-        <el-button type="primary" plain>返回</el-button>
+        <el-button type="primary" plain @click="goBack">返回</el-button>
       </div>
       <div class="title">
         {{ '【' + this.form.nickName + '】' }}详细信息
       </div>
     </div>
-    <el-row class="app-container" :gutter="20">
+    <el-row class="app-container">
       <el-col :span="6" class="userInfo">
         <div class="text-center">
           <div class="avatar">
@@ -18,48 +24,85 @@
           <div class="user-sex">{{ this.form.age + '岁 ' }} {{ this.form.sex == '0' ? ' 男' : ' 女' }}</div>
         </div>
         <div class="info-item">
-          <svg-icon icon-class="car" class="info-icon"></svg-icon>
-          <span class="item-label">职称：</span>
-          <span>{{ (dict.type.sys_user_titles[this.form.titles]) ?
+          <div class="item-label">
+            <svg-icon icon-class="car" class="info-icon"></svg-icon>
+            <div class="item-label">职称：</div>
+          </div>
+          <div>{{ (dict.type.sys_user_titles[this.form.titles]) ?
           (dict.type.sys_user_titles[this.form.titles]).label
-          : "" }}</span>
+          : "" }}</div>
+        </div>
+        <div class="info-item">
+          <div class="item-label">
+            <svg-icon icon-class="dept" class="info-icon"></svg-icon>
+            <div class="item-label">部门：</div>
+          </div>
+          <div>{{ postData }}</div>
+        </div>
+        <div class="info-item">
+          <div class="item-label">
+            <svg-icon icon-class="phone" class="info-icon"></svg-icon>
+            <div class="item-label">联系电话：</div>
+          </div>
+          <div class="item-value">{{ form.phonenumber }}</div>
+        </div>
+        <div class="info-item">
+          <div class="item-label">
+            <svg-icon icon-class="certificate" class="info-icon"></svg-icon>
+            执业证书：
+          </div>
+          <div class="item-value">{{ form.certificates }}</div>
         </div>
         <div class="info-item">
-          <svg-icon icon-class="dept" class="info-icon"></svg-icon>
-          <span class="item-label">部门：</span>
-          <span>{{ postData }}</span>
+          <div class="item-label">
+            <svg-icon icon-class="postSalary" class="info-icon"></svg-icon>
+            <div class="item-label">薪资岗级：</div>
+          </div>
+          <div>{{ form.postSalary }}</div>
         </div>
         <div class="info-item">
-          <svg-icon icon-class="telephone" class="info-icon"></svg-icon>
-          <span class="item-label">联系电话：</span>
-          <span>{{ form.phonenumber }}</span>
+          <div class="item-label">
+            <svg-icon icon-class="date" class="info-icon"></svg-icon>
+            <div class="item-label">入职时间：</div>
+          </div>
+          <div>{{ parseTime(form.entryDate, '{y}-{m}') }}</div>
         </div>
         <div class="info-item">
-          <svg-icon icon-class="telephone" class="info-icon"></svg-icon>
-          <span class="item-label">执业证书：</span>
-          <span>{{ }}</span>
+          <div class="item-label">
+            <svg-icon icon-class="rate" class="info-icon"></svg-icon>
+            <div class="item-label">状态：</div>
+          </div>
+          <div>{{ form.status }}</div>
         </div>
       </el-col>
-      <el-col :span="18"></el-col>
+      <el-col :span="17" class="stateInfo">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="参与项目" name="1">
+            <projectInfo></projectInfo>
+          </el-tab-pane>
+          <el-tab-pane label="变更记录" name="2">
+            <changeRecord></changeRecord>
+          </el-tab-pane>
+        </el-tabs>
+      </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import userAvatar from "@/views/system/user/profile/userAvatar.vue";
+import userAvatar from "@/views/system/user/profile/userAvatar.vue"
 import { getUser } from "@/api/system/user"
-import { mapGetters } from "vuex";
+import { mapGetters } from "vuex"
+import projectInfo from './projectInfo'
+import changeRecord from './changeRecord'
 export default {
-  components: { userAvatar },
+  components: { userAvatar, projectInfo, changeRecord },
   dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_postlevel', 'sys_user_salarylevel'],
   computed: {
     ...mapGetters(["avatar"]),
   },
   created() {
-    if (this.$route.query) {
-      this.form.userId = this.$route.query.userId
-      this.form.nickName = this.$route.query.nickName
-    }
+
     this.getUserInfo(this.$route.query.userId);
   },
   data() {
@@ -72,7 +115,8 @@ export default {
         }
       },
       postOptions: [],
-      postData: ''
+      postData: '',
+      activeName: '1'
     }
   },
   methods: {
@@ -81,36 +125,45 @@ export default {
         console.log(res);
         this.postOptions = res.posts;
         if (res.data) {
-          this.formartForm(res.data);
           this.form = res.data;
-          let postArr = [];
-          for (let post of res.posts) {
-            for (let postid of res.postIds) {
-              if (postid == post.postId) {
-                postArr.push(post.postName)
-              }
-            }
-          }
-          this.postData = '中水成勘测绘公司-' + postArr.join('-')
+          this.formartForm(res);
         }
       })
     },
-    formartForm(user) {
-      // if (user.certificates != null && user.certificates != undefined && user.certificates != "") {
-      //   let arr = user.certificates.split(',');
-      //   let cerArr = this.dict.type.sys_user_certificates
-      //   cerArr.map(item =>{
-      //     for(let a of arr){
-      //       if(a == item.value){
-
-      //       }
-      //     }
-      //   })
-      // }
-      // console.log();
+    formartForm(res) {
+      if (this.$route.query) {
+        this.form.userId = this.$route.query.userId
+        this.form.nickName = this.$route.query.nickName
+        this.form.certificates = this.$route.query.certificates
+        this.form.postSalary = this.$route.query.postSalary
+      }
+      let postArr = [];
+      for (let post of res.posts) {
+        for (let postid of res.postIds) {
+          if (postid == post.postId) {
+            postArr.push(post.postName)
+          }
+        }
+      }
+      this.postData = '中水成勘测绘公司-' + postArr.join('-')
 
-    }
-  },
+      if (this.form.status == '0') {
+        this.form.status = '在职'
+      } else if (this.form.status == '1') {
+        this.form.status = '离职'
+      } else {
+        this.form.status = '退休'
+      }
+    },
+    handleClick() {
+
+    },
+    goBack() {
+      let obj = { path: "/staff/info" }
+      this.$tab.closeOpenPage(obj);
+      this.$router.push({ path: '/staff' });
+    },
+  }
 }
 </script>
 
@@ -142,6 +195,8 @@ export default {
 
 .userInfo {
   background-color: #fff;
+  height: 650px;
+  margin-right: 40px;
 
   .avatar {
     text-align: center;
@@ -169,8 +224,10 @@ export default {
   .info-item {
     line-height: 30px;
     color: #5A5A5A;
-    font-size: 16px;
+    font-size: 14px;
     padding-left: 30px;
+    display: flex;
+    align-items: start;
 
     .info-icon {
       font-size: 20px;
@@ -179,10 +236,23 @@ export default {
     }
 
     .item-label {
-      // width: 110px;
+      max-width: 120px;
+      display: flex;
+      align-items: center;
       // text-align: right;
-      display: inline-block;
+      // display: inline-block;
+    }
+
+    .item-value {
+      max-width: 260px;
+      // display: inline-block;
     }
   }
 }
+
+.stateInfo {
+  background-color: #fff;
+  height: 650px;
+  padding: 10px 30px 0;
+}
 </style>

oa-ui/src/views/oa/staff/projectInfo.vue

@@ -0,0 +1,72 @@
+<template>
+  <div>
+    <!-- <el-table :data="tableData" style="width: 100%">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <div style="background-color: #F0F2F5;">
+            <el-descriptions direction="vertical" :column="3" border>
+              <el-descriptions-item label="工作内容">XXXXXX</el-descriptions-item>
+              <el-descriptions-item label="工作量">XXXXXX</el-descriptions-item>
+              <el-descriptions-item label="单位" :span="2">km²</el-descriptions-item>
+            </el-descriptions>
+          </div>
+        </template>
+</el-table-column>
+<el-table-column label="项目编号" prop="projectNumber">
+</el-table-column>
+<el-table-column label="项目名称" prop="projectName">
+</el-table-column>
+<el-table-column label="项目负责人" prop="projectLeader">
+</el-table-column>
+</el-table> -->
+    <el-collapse v-model="activeNames" @change="handleChange">
+      <el-collapse-item :name="item.projectNumber" v-for="item in tableData">
+        <template slot="title">
+          <div>
+            <svg-icon icon-class="ArrowRight" class="info-icon"></svg-icon>
+            {{ item.projectNumber + ' ' + ' ' + item.projectName + ' ' + ' ' + item.projectLeader }}
+          </div>
+        </template>
+        <div>暂无信息，敬请期待</div>
+      </el-collapse-item>
+    </el-collapse>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      tableData: [
+        {
+          projectNumber: '2021C40',
+          projectName: '重庆轨道交通4号线西延伸段工程施工监测及控制测量',
+          projectLeader: 'XXX'
+        }, 
+        {
+          projectNumber: '2021C50',
+          projectName: '重庆轨道交通4号线西延伸段工程施工监测及控制测量',
+          projectLeader: 'XXX'
+        },
+        {
+          projectNumber: '2021C60',
+          projectName: '重庆轨道交通4号线西延伸段工程施工监测及控制测量',
+          projectLeader: 'XXX'
+        }
+      ],
+      activeNames: ['1']
+    }
+  },
+  methods: {
+    handleChange(val) {
+      console.log(val);
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info-icon{
+  font-size: 20px;
+}
+</style>