gaoluyang
2026-05-06 6f07f6503055e92d74cad79dc93633c3896ef3c2
天津军泰伟业
1.人力资源模块修改字段
已修改10个文件
467 ■■■■■ 文件已修改
src/views/inventoryManagement/dispatchLog/Record.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/receiptManagement/Record.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/Qualified.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/contractManagement/index.vue 45 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/dimission/components/formDia.vue 82 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/dimission/index.vue 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue 131 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/employeeRecord/components/Show.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/employeeRecord/index.vue 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vite.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/dispatchLog/Record.vue
@@ -1,5 +1,5 @@
<template>
    <div class="app-container">
    <div>
        <div class="search_form">
            <div>
                <span class="search_title ml10">出库日期:</span>
@@ -12,6 +12,16 @@
                    clearable
                    @change="handleQuery"
                />
        <span class="search_title ml10">产品大类:</span>
        <el-input v-model="searchForm.productName"
                  style="width: 240px"
                  placeholder="请输入"
                  clearable/>
        <span class="search_title ml10">图纸编号:</span>
        <el-input v-model="searchForm.model"
                  style="width: 240px"
                  placeholder="请输入"
                  clearable/>
        <span class="search_title ml10">来源:</span>
        <el-select v-model="searchForm.recordType"
                   style="width: 240px"
@@ -34,8 +44,6 @@
                >搜索</el-button
                >
                <el-button @click="handleReset">重置</el-button>
            </div>
            <div>
                <el-button @click="handleOut">导出</el-button>
                <el-button type="danger" plain @click="handleDelete">删除</el-button>
                <el-button type="primary" plain @click="handlePrint">打印</el-button>
@@ -168,6 +176,8 @@
const data = reactive({
    searchForm: {
        supplierName: "",
        productName: "",
        model: "",
        timeStr: "",
    recordType: "",
    type: "",
@@ -185,6 +195,8 @@
/** 重置按钮操作 */
const handleReset = () => {
  searchForm.value.supplierName = "";
  searchForm.value.productName = "";
  searchForm.value.model = "";
  searchForm.value.timeStr = "";
  searchForm.value.recordType = "";
  searchForm.value.type = "";
src/views/inventoryManagement/receiptManagement/Record.vue
@@ -1,5 +1,5 @@
<template>
  <div class="app-container">
  <div>
    <div class="search_form">
      <div>
        <span class="search_title ml10">入库日期:</span>
@@ -12,6 +12,11 @@
                        @change="handleQuery"/>
        <span class="search_title ml10">产品大类:</span>
        <el-input v-model="searchForm.productName"
                  style="width: 240px"
                  placeholder="请输入"
                  clearable/>
        <span class="search_title ml10">图纸编号:</span>
        <el-input v-model="searchForm.model"
                  style="width: 240px"
                  placeholder="请输入"
                  clearable/>
@@ -38,8 +43,6 @@
                   style="margin-left: 10px">搜索
        </el-button>
        <el-button @click="handleReset">重置</el-button>
      </div>
      <div>
        <el-button @click="handleOut">导出</el-button>
        <el-button type="danger"
                   plain
@@ -159,6 +162,7 @@
const data = reactive({
  searchForm: {
    productName: "",
    model: "",
    timeStr: "",
    recordType: "",
    type: "",
@@ -176,6 +180,7 @@
/** 重置按钮操作 */
const handleReset = () => {
  searchForm.value.productName = "";
  searchForm.value.model = "";
  searchForm.value.timeStr = "";
  searchForm.value.recordType = "";
  searchForm.value.type = "";
@@ -200,6 +205,7 @@
  }
  params.timeStr = searchForm.value.timeStr;
  params.productName = searchForm.value.productName;
  params.model = searchForm.value.model;
  params.recordType = searchForm.value.recordType;
  if (searchForm.value.type !== "") {
    params.type = searchForm.value.type;
src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -1,9 +1,14 @@
<template>
  <div class="app-container">
  <div>
    <div class="search_form">
      <div>
        <span class="search_title ml10">产品大类:</span>
        <el-input v-model="searchForm.productName"
                  style="width: 240px"
                  placeholder="请输入"
                  clearable/>
        <span class="search_title ml10">图纸编号:</span>
        <el-input v-model="searchForm.model"
                  style="width: 240px"
                  placeholder="请输入"
                  clearable/>
@@ -127,6 +132,7 @@
const data = reactive({
  searchForm: {
    productName: '',
    model: '',
    type: 0,
  }
})
@@ -146,6 +152,7 @@
/** 重置按钮操作 */
const handleReset = () => {
  searchForm.value.productName = '';
  searchForm.value.model = '';
  searchForm.value.type = 0;
  handleQuery();
}
src/views/personnelManagement/contractManagement/index.vue
@@ -124,12 +124,18 @@
    prop: "sex",
  },
  {
    label: "户籍住址",
    prop: "nativePlace",
    label: "民族",
    prop: "nation",
  },
  {
    label: "岗位",
    prop: "postJob",
    label: "出生日期",
    prop: "birthDate",
    width: 120
  },
  {
    label: "身份证号",
    prop: "identityCard",
    width: 180
  },
  {
    label: "现住址",
@@ -137,33 +143,28 @@
    width: 200
  },
  {
    label: "第一学历",
    prop: "firstStudy",
  },
  {
    label: "专业",
    prop: "profession",
    width: 100
  },
  {
    label: "年龄",
    prop: "age",
  },
  {
    label: "联系电话",
    prop: "phone",
    width: 150
  },
  {
    label: "紧急联系人",
    prop: "emergencyContact",
    width: 120
  },
  {
    label: "紧急联系人电话",
    prop: "emergencyContactPhone",
    width: 150
  },
  {
    label: "入职日期",
    prop: "entryDate",
    width: 120
  },
  {
    label: "岗位",
    prop: "postName",
  },
  {
    label: "部门",
    prop: "deptName",
  },
  // {
  //   label: "合同年限",
  //   prop: "contractTerm",
src/views/personnelManagement/dimission/components/formDia.vue
@@ -40,8 +40,44 @@
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="户籍住址:">
                {{ currentStaffRecord.nativePlace || '-' }}
              <el-form-item label="民族:">
                {{ currentStaffRecord.nation || '-' }}
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="出生日期:">
                {{ currentStaffRecord.birthDate || '-' }}
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="身份证号:">
                {{ currentStaffRecord.identityCard || '-' }}
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="现住址:">
                {{ currentStaffRecord.adress || '-' }}
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="联系电话:">
                {{ currentStaffRecord.phone || '-' }}
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="紧急联系人电话:">
                {{ currentStaffRecord.emergencyContactPhone || '-' }}
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="入职日期:">
                {{ currentStaffRecord.entryDate || '-' }}
              </el-form-item>
            </el-col>
          </el-row>
@@ -52,46 +88,8 @@
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="现住址:">
                {{ currentStaffRecord.adress || '-' }}
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="第一学历:">
                {{ currentStaffRecord.firstStudy || '-' }}
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="专业:">
                {{ currentStaffRecord.profession || '-' }}
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="年龄:">
                {{ currentStaffRecord.age || '-' }}
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="联系电话:">
                {{ currentStaffRecord.phone || '-' }}
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="紧急联系人:">
                {{ currentStaffRecord.emergencyContact || '-' }}
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="紧急联系人联系电话:">
                {{ currentStaffRecord.emergencyContactPhone || '-' }}
              <el-form-item label="部门:">
                {{ currentStaffRecord.deptName || '-' }}
              </el-form-item>
            </el-col>
          </el-row>
src/views/personnelManagement/dimission/index.vue
@@ -88,49 +88,46 @@
    prop: "sex",
  },
  {
    label: "户籍住址",
    prop: "nativePlace",
    label: "民族",
    prop: "nation",
  },
  {
    label: "部门",
    prop: "deptName",
    label: "出生日期",
    prop: "birthDate",
    width: 120
  },
  {
    label: "身份证号",
    prop: "identityCard",
    width: 180
  },
  {
    label: "现住址",
    prop: "adress",
    width: 200
  },
  {
    label: "联系电话",
    prop: "phone",
    width: 150
  },
  {
    label: "紧急联系人电话",
    prop: "emergencyContactPhone",
    width: 150
  },
  {
    label: "入职日期",
    prop: "entryDate",
    width: 120
  },
  {
    label: "岗位",
    prop: "postName",
  },
  {
    label: "现住址",
    prop: "adress",
    width:200
  },
  {
    label: "第一学历",
    prop: "firstStudy",
  },
  {
    label: "专业",
    prop: "profession",
    width:100
  },
  {
    label: "年龄",
    prop: "age",
  },
  {
    label: "联系电话",
    prop: "phone",
    width:150
  },
  {
    label: "紧急联系人",
    prop: "emergencyContact",
    width: 120
  },
  {
    label: "紧急联系人电话",
    prop: "emergencyContactPhone",
    width:150
    label: "部门",
    prop: "deptName",
  },
  {
    dataType: "action",
src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue
@@ -22,22 +22,74 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="性别:" prop="sex">
              <el-select v-model="form.sex">
              <el-select v-model="form.sex" style="width: 100%">
                <el-option label="男" value="男" />
                <el-option label="女" value="女" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="户籍住址:" prop="nativePlace">
              <el-input v-model="form.nativePlace" placeholder="请输入" clearable/>
            <el-form-item label="民族:" prop="nation">
              <el-input v-model="form.nation" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="出生日期:" prop="birthDate">
              <el-date-picker
                  v-model="form.birthDate"
                  type="date"
                  placeholder="请选择日期"
                  value-format="YYYY-MM-DD"
                  format="YYYY-MM-DD"
                  clearable
                  style="width: 100%"
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="身份证号:" prop="identityCard">
              <el-input v-model="form.identityCard" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="现住址:" prop="adress">
              <el-input v-model="form.adress" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="联系电话:" prop="phone">
              <el-input v-model="form.phone" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="紧急联系人电话:" prop="emergencyContactPhone">
              <el-input v-model="form.emergencyContactPhone" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="入职日期:" prop="entryDate">
              <el-date-picker
                  v-model="form.entryDate"
                  type="date"
                  placeholder="请选择日期"
                  value-format="YYYY-MM-DD"
                  format="YYYY-MM-DD"
                  clearable
                  style="width: 100%"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="岗位:" prop="sysPostId">
              <el-select v-model="form.sysPostId" placeholder="请选择岗位" clearable>
              <el-select v-model="form.sysPostId" placeholder="请选择岗位" clearable style="width: 100%">
                <el-option
                    v-for="item in postOptions"
                    :key="item.postId"
@@ -49,13 +101,6 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="现住址:" prop="adress">
              <el-input v-model="form.adress" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="部门:" prop="sysDeptId">
              <el-tree-select
                  v-model="form.sysDeptId"
@@ -64,52 +109,17 @@
                  value-key="id"
                  placeholder="请选择部门"
                  check-strictly
                  style="width: 100%"
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="年龄:" prop="age">
              <el-input-number v-model="form.age" :precision="0" :step="1" style="width: 100%"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="第一学历:" prop="firstStudy">
              <el-input v-model="form.firstStudy" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="专业:" prop="profession">
              <el-input v-model="form.profession" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="联系电话:" prop="phone">
              <el-input v-model="form.phone" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="紧急联系人:" prop="emergencyContact">
              <el-input v-model="form.emergencyContact" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="紧急联系人联系电话:" prop="emergencyContactPhone">
              <el-input v-model="form.emergencyContactPhone" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="合同年限:" prop="contractTerm">
              <el-input-number v-model="form.contractTerm" :precision="0" :step="1" style="width: 100%" :disabled="true"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="合同开始日期:" prop="contractStartTime">
              <el-date-picker
@@ -120,10 +130,12 @@
                  format="YYYY-MM-DD"
                  clearable
                  style="width: 100%"
                                    @change="calculateContractTerm"
                  @change="calculateContractTerm"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="合同结束日期:" prop="contractEndTime">
              <el-date-picker
@@ -134,7 +146,7 @@
                  format="YYYY-MM-DD"
                  clearable
                  style="width: 100%"
                                    @change="calculateContractTerm"
                  @change="calculateContractTerm"
              />
            </el-form-item>
          </el-col>
@@ -167,15 +179,14 @@
    staffNo: "",
    staffName: "",
    sex: "",
    nativePlace: "",
    postJob: "",
    nation: "",
    birthDate: "",
    identityCard: "",
    adress: "",
    firstStudy: "",
    profession: "",
    age: 0,
    phone: "",
    emergencyContact: "",
    emergencyContactPhone: "",
    entryDate: "",
    postJob: "",
    contractTerm: 0,
    contractStartTime: "",
    contractEndTime: "",
@@ -186,15 +197,13 @@
    staffNo: [{ required: true, message: "请输入", trigger: "blur" },],
    staffName: [{ required: true, message: "请输入", trigger: "blur" }],
    sex: [{ required: true, message: "请输入", trigger: "blur" }],
    nativePlace: [{ required: true, message: "请输入", trigger: "blur" }],
    postJob: [{ required: true, message: "请输入", trigger: "blur" }],
    nation: [{ required: true, message: "请输入", trigger: "blur" }],
    birthDate: [{ required: true, message: "请输入", trigger: "blur" }],
    identityCard: [{ required: true, message: "请输入", trigger: "blur" }],
    adress: [{ required: true, message: "请输入", trigger: "blur" }],
    firstStudy: [{ required: true, message: "请输入", trigger: "blur" }],
    profession: [{ required: true, message: "请输入", trigger: "blur" }],
    age: [{ required: true, message: "请输入", trigger: "blur" }],
    phone: [{ required: true, message: "请输入", trigger: "blur" }],
    emergencyContact: [{ required: true, message: "请输入", trigger: "blur" }],
    emergencyContactPhone: [{ required: true, message: "请输入", trigger: "blur" }],
    entryDate: [{ required: true, message: "请输入", trigger: "blur" }],
    contractTerm: [{ required: true, message: "请输入", trigger: "blur" }],
    contractStartTime: [{ required: true, message: "请输入", trigger: "blur" }],
    contractEndTime: [{ required: true, message: "请输入", trigger: "blur" }],
src/views/personnelManagement/employeeRecord/components/Show.vue
@@ -31,6 +31,54 @@
const dialogFormVisible = ref(false);
const operationType = ref('')
const tableColumn = ref([
  {
    label: "员工编号",
    prop: "staffNo",
  },
  {
    label: "姓名",
    prop: "staffName",
  },
  {
    label: "性别",
    prop: "sex",
  },
  {
    label: "民族",
    prop: "nation",
  },
  {
    label: "出生日期",
    prop: "birthDate",
  },
  {
    label: "身份证号",
    prop: "identityCard",
  },
  {
    label: "现住址",
    prop: "adress",
  },
  {
    label: "联系电话",
    prop: "phone",
  },
  {
    label: "紧急联系人电话",
    prop: "emergencyContactPhone",
  },
  {
    label: "入职日期",
    prop: "entryDate",
  },
  {
    label: "岗位",
    prop: "postName",
  },
  {
    label: "部门",
    prop: "deptName",
  },
  // {
  //   label: "合同年限",
  //   prop: "contractTerm",
src/views/personnelManagement/employeeRecord/index.vue
@@ -11,7 +11,7 @@
            clearable
            :prefix-icon="Search"
        />
        <span  style="margin-left: 10px" class="search_title">合同结束日期:</span>
        <span  style="margin-left: 10px" class="search_title">入职日期:</span>
        <el-date-picker  v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                         placeholder="请选择" clearable @change="changeDaterange" />
        <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
@@ -152,49 +152,46 @@
    prop: "sex",
  },
  {
    label: "户籍住址",
    prop: "nativePlace",
    label: "民族",
    prop: "nation",
  },
  {
    label: "部门",
    prop: "deptName",
    label: "出生日期",
    prop: "birthDate",
    width: 120
  },
  {
    label: "岗位",
    prop: "postJob",
    label: "身份证号",
    prop: "identityCard",
    width: 180
  },
  {
    label: "现住址",
    prop: "adress",
    width:200
  },
  {
    label: "第一学历",
    prop: "firstStudy",
  },
  {
    label: "专业",
    prop: "profession",
    width:100
  },
  {
    label: "年龄",
    prop: "age",
    width: 200
  },
  {
    label: "联系电话",
    prop: "phone",
    width:150
  },
  {
    label: "紧急联系人",
    prop: "emergencyContact",
    width: 120
    width: 150
  },
  {
    label: "紧急联系人电话",
    prop: "emergencyContactPhone",
    width:150
    width: 150
  },
  {
    label: "入职日期",
    prop: "entryDate",
    width: 120
  },
  {
    label: "岗位",
    prop: "postName",
  },
  {
    label: "部门",
    prop: "deptName",
  },
  // {
  //   label: "合同年限",
vite.config.js
@@ -8,7 +8,7 @@
  const { VITE_APP_ENV } = env;
  const baseUrl =
      env.VITE_APP_ENV === "development"
          ? "http://1.15.17.182:9003"
          ? "http://192.168.0.226:7005"
          : env.VITE_BASE_API;
  const javaUrl =
      env.VITE_APP_ENV === "development"