金鹰黄金 1.劳保防具新增编辑逻辑修改 2.添加劳保库存页面

gaoluyang

4 小时以前 8b2293e7a0994519434f9d63f6c5cb814ac15046

金鹰黄金
1.劳保防具新增编辑逻辑修改
2.添加劳保库存页面

 src/views/lavorissue/dictData/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,256 @@
<template>
   <div class="app-container">
      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
         <el-form-item label="劳保防具" prop="dictLabel">
            <el-input
               v-model="queryParams.dictLabel"
               placeholder="请输入劳保防具"
               clearable
               style="width: 200px"
               @keyup.enter="handleQuery"
            />
         </el-form-item>
         <el-form-item>
            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
      </el-form>

      <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
            <el-button
               type="primary"
               plain
               icon="Plus"
               @click="handleAdd"
            >新增</el-button>
         </el-col>
         <el-col :span="1.5">
            <el-button
               type="success"
               plain
               icon="Edit"
               :disabled="single"
               @click="handleUpdate"
            >修改</el-button>
         </el-col>
         <el-col :span="1.5">
            <el-button
               type="danger"
               plain
               icon="Delete"
               :disabled="multiple"
               @click="handleDelete"
            >删除</el-button>
         </el-col>
         <el-col :span="1.5">
            <el-button
               type="warning"
               plain
               icon="Download"
               @click="handleExport"
            >导出</el-button>
         </el-col>
         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>

      <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="防具编码" align="center" prop="dictValue" />
         <el-table-column label="劳保防具" align="center" prop="dictLabel" />
         <el-table-column label="数量" align="center" prop="num" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
            <template #default="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
            </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
            <template #default="scope">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
            </template>
         </el-table-column>
      </el-table>

      <pagination
         v-show="total > 0"
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
      />

      <!-- æ·»åŠ æˆ–修改参数配置对话框 -->
      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
         <el-form ref="dataRef" :model="form" :rules="rules" label-width="80px">
            <el-form-item label="劳保防具" prop="dictLabel">
               <el-input v-model="form.dictLabel" placeholder="请输入劳保防具" />
            </el-form-item>
            <el-form-item label="防具编码" prop="dictValue">
               <el-input v-model="form.dictValue" placeholder="请输入防具编码" />
            </el-form-item>
            <el-form-item label="数量" prop="num">
               <el-input-number v-model="form.num" controls-position="right" :min="0" />
            </el-form-item>
         </el-form>
         <template #footer>
            <div class="dialog-footer">
               <el-button type="primary" @click="submitForm">ç¡® å®š</el-button>
               <el-button @click="cancel">取 æ¶ˆ</el-button>
            </div>
         </template>
      </el-dialog>
   </div>
</template>

<script setup name="LavorIssueDictData">
import useDictStore from '@/store/modules/dict'
import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data"

const { proxy } = getCurrentInstance()

const dataList = ref([])
const open = ref(false)
const loading = ref(true)
const showSearch = ref(true)
const ids = ref([])
const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref("")
const fixedDictType = ref("sys_lavor_issue")

const data = reactive({
  form: {},
  queryParams: {
    pageNum: 1,
    pageSize: 10,
    dictType: "sys_lavor_issue",
    dictLabel: undefined
  },
  rules: {
    dictLabel: [{ required: true, message: "劳保防具不能为空", trigger: "blur" }],
    dictValue: [{ required: true, message: "防具编码不能为空", trigger: "blur" }],
    num: [{ required: true, message: "数量不能为空", trigger: "blur" }]
  }
})

const { queryParams, form, rules } = toRefs(data)

/** æŸ¥è¯¢å­—典数据列表 */
function getList() {
  loading.value = true
  queryParams.value.dictType = fixedDictType.value
  listData(queryParams.value).then(response => {
    dataList.value = response.rows
    total.value = response.total
    loading.value = false
  })
}

/** å–消按钮 */
function cancel() {
  open.value = false
  reset()
}

/** è¡¨å•é‡ç½® */
function reset() {
  form.value = {
    dictCode: undefined,
    dictLabel: undefined,
    dictValue: undefined,
    num: undefined,
    dictType: fixedDictType.value,
    dictSort: 0,
    status: "0",
    cssClass: undefined,
    listClass: "default",
    remark: undefined
  }
  proxy.resetForm("dataRef")
}

/** æœç´¢æŒ‰é’®æ“ä½œ */
function handleQuery() {
  queryParams.value.pageNum = 1
  getList()
}

/** é‡ç½®æŒ‰é’®æ“ä½œ */
function resetQuery() {
  proxy.resetForm("queryRef")
  queryParams.value.dictType = fixedDictType.value
  handleQuery()
}

/** æ–°å¢žæŒ‰é’®æ“ä½œ */
function handleAdd() {
  reset()
  open.value = true
  title.value = "添加劳保类型数据"
  form.value.dictType = fixedDictType.value
}

/** å¤šé€‰æ¡†é€‰ä¸­æ•°æ® */
function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.dictCode)
  single.value = selection.length != 1
  multiple.value = !selection.length
}

/** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
function handleUpdate(row) {
  reset()
  const dictCode = row.dictCode || ids.value
  getData(dictCode).then(response => {
    form.value = response.data
    open.value = true
    title.value = "修改劳保类型数据"
  })
}

/** æäº¤æŒ‰é’® */
function submitForm() {
  proxy.$refs["dataRef"].validate(valid => {
    if (valid) {
      if (form.value.dictCode != undefined) {
        updateData(form.value).then(response => {
          useDictStore().removeDict(fixedDictType.value)
          proxy.$modal.msgSuccess("修改成功")
          open.value = false
          getList()
        })
      } else {
        addData(form.value).then(response => {
          useDictStore().removeDict(fixedDictType.value)
          proxy.$modal.msgSuccess("新增成功")
          open.value = false
          getList()
        })
      }
    }
  })
}

/** åˆ é™¤æŒ‰é’®æ“ä½œ */
function handleDelete(row) {
  const dictCodes = row.dictCode || ids.value
  proxy.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
    return delData(dictCodes)
  }).then(() => {
    getList()
    proxy.$modal.msgSuccess("删除成功")
    useDictStore().removeDict(fixedDictType.value)
  }).catch(() => {})
}

/** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
function handleExport() {
  proxy.download("system/dict/data/export", {
    ...queryParams.value
  }, `lavor_issue_dict_data_${new Date().getTime()}.xlsx`)
}

getList()
</script>

 src/views/lavorissue/ledger/EditModal.vue

@@ -6,20 +6,6 @@
                    <el-option :label="item.name" :value="item.id" v-for="(item,index) in positionOptions" :key="item.id" />
                </el-select>
            </el-form-item>
            <el-form-item label="劳保类型" prop="dictType">
                <el-select
                    v-model="form.dictType"
                    placeholder="请选择"
                    clearable
                >
                    <el-option :label="item.label" :value="item.value" v-for="(item,index) in sys_lavor_issue_type" :key="value" />
                </el-select>
            </el-form-item>
            <el-form-item label="劳保用品" prop="dictId">
                <el-select v-model="form.dictId" placeholder="请选择" clearable>
                    <el-option :label="item.dictName" :value="item.dictId" v-for="(item,index) in laborSuppliesOptions" :key="item.dictId" />
                </el-select>
            </el-form-item>
            <el-form-item label="进厂日期" prop="factoryDate">
                <el-date-picker
                    style="width: 100%"
@@ -43,13 +29,7 @@
                />
            </el-form-item>
            <el-form-item label="员工名称" prop="staffId">
                <el-select
                    v-model="form.staffId"
                    placeholder="请选择"
                    clearable
                >
                    <el-option :label="item.staffName" :value="item.id" v-for="(item,index) in personList" :key="id" />
                </el-select>
                <span>{{ personList.find(p => p.id === form.staffId)?.staffName }}</span>
            </el-form-item>
            <el-form-item label="发放数量" prop="num">
                <el-input-number :step="1" :min="0" style="width: 100%"
@@ -73,7 +53,7 @@
import useUserStore from "@/store/modules/user";
import {staffOnJobListPage} from "@/api/personnelManagement/employeeRecord.js";
import { getDept } from "@/api/collaborativeApproval/approvalProcess.js";
import { deptPositionListPage, getDeptPositionByDeptIdLabor } from "@/api/lavorissce/issue";
import { deptPositionListPage } from "@/api/lavorissce/issue";
import { deepCopySameProperties } from '@/utils/util'
import { ElMessage } from "element-plus";

@@ -85,17 +65,13 @@
const formRef = ref(null)
const userStore = useUserStore();
const { sys_lavor_issue } = proxy.useDict("sys_lavor_issue")
const { sys_lavor_issue_type } = proxy.useDict("sys_lavor_issue_type")

const productOptions = ref([]);
const personList = ref([]);
const positionOptions = ref([]);
const laborSuppliesOptions = ref([]);

const formRules = {
  deptPositionId: [{ required: true, trigger: "blur", message: "请输入" }],
  dictType: [{ required: true, trigger: "change", message: "请选择" }],
  dictId: [{ required: true, trigger: "change", message: "请选择" }],
  adoptedDate: [{ required: true, trigger: "change", message: "请选择" }],
  factoryDate: [{ required: true, trigger: "change", message: "请选择" }],
  issueDate: [{ required: true, trigger: "change", message: "请选择" }],
@@ -160,10 +136,6 @@
  openModal(row.id)
  await nextTick()
  deepCopySameProperties(row, form)
  // å¦‚果传入了岗位ID，自动查询劳保用品数据
  if (form.deptPositionId) {
    await handlePositionChange(form.deptPositionId)
  }
}
async function loadPositions() {
  const res = await deptPositionListPage({pageNum: -1, pageSize:-1})
@@ -171,13 +143,7 @@
}

async function handlePositionChange(deptPositionId) {
  if (!deptPositionId) {
    laborSuppliesOptions.value = []
    form.dictId = undefined
    return
  }
  const res = await getDeptPositionByDeptIdLabor({ id: deptPositionId })
  laborSuppliesOptions.value = res?.data || []
  console.log('选择的岗位ID:', deptPositionId)
}

onMounted(() => {

 src/views/lavorissue/ledger/Modal.vue

@@ -5,8 +5,8 @@
        <el-tree-select
          v-model="form.deptPositionId"
          :data="deptPositionTree"
          :props="{ value: 'id', label: 'label', children: 'children' }"
          placeholder="请选择部门或岗位"
          :props="{ value: 'id', label: 'label', children: 'children', disabled: checkDisabled }"
          placeholder="请选择岗位"
          clearable
          check-strictly
    :render-after-expand="false"
@@ -23,16 +23,6 @@
          </template>
        </el-tree-select>
      </el-form-item>
      <el-form-item label="劳保类型" prop="dictType">
        <el-select v-model="form.dictType" placeholder="请选择" clearable>
          <el-option :label="item.label" :value="item.value" v-for="(item,index) in sys_lavor_issue_type" :key="item.value" />
        </el-select>
      </el-form-item>
      <el-form-item label="劳保用品" prop="dictId">
        <el-select v-model="form.dictId" placeholder="请选择" clearable>
          <el-option :label="item.dictName" :value="item.dictId" v-for="(item,index) in laborSuppliesOptions" :key="item.dictId" />
        </el-select>
      </el-form-item>
      <el-form-item label="进厂日期" prop="factoryDate">
        <el-date-picker style="width: 100%" v-model="form.factoryDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date" placeholder="请选择日期" clearable />
      </el-form-item>
@@ -41,18 +31,14 @@
      </el-form-item>
      <el-form-item label="员工与数量" required>
        <div style="width:100%">
          <div style="margin-bottom:8px; text-align:right;">
            <el-button size="small" type="primary" @click="addItemRow">新增一行</el-button>
          </div>
          <el-table :data="form.laborIssueList" border size="small">
          <el-table :data="form.laborIssueList" border size="small" :span-method="arraySpanMethod">
            <el-table-column label="员工名称" width="220">
              <template #default="scope">
                <el-select v-model="scope.row.staffId" placeholder="请选择" filterable>
                  <el-option :label="p.staffName" :value="p.id" v-for="p in personList" :key="p.id" />
                </el-select>
                <span>{{ personList.find(p => p.id === scope.row.staffId)?.staffName }}</span>
              </template>
            </el-table-column>
            <el-table-column label="发放数量" align="center">
            <el-table-column label="劳保用品" prop="dictName" align="center" />
            <el-table-column label="发放数量" align="center" width="150">
              <template #default="scope">
                <el-input-number v-model="scope.row.num" :min="0" :step="1" />
              </template>
@@ -102,8 +88,6 @@

const formRules = {
  deptPositionId: [{ required: true, trigger: "blur", message: "请输入" }],
  dictType: [{ required: true, trigger: "change", message: "请选择" }],
  dictId: [{ required: true, trigger: "change", message: "请选择" }],
  adoptedDate: [{ required: true, trigger: "change", message: "请选择" }],
  factoryDate: [{ required: true, trigger: "change", message: "请选择" }],
  issueDate: [{ required: true, trigger: "change", message: "请选择" }],
@@ -134,9 +118,6 @@
  getPersonList()
}

function addItemRow() {
  form.laborIssueList.push({ staffId: undefined, num: undefined })
}
function removeItemRow(index) {
  form.laborIssueList.splice(index, 1)
}
@@ -153,13 +134,13 @@
function sendForm() {
  formRef.value?.validate(async valid => {
    if (!valid) return
    // é¢å¤–校验多人明细
    if (!Array.isArray(form.laborIssueList) || form.laborIssueList.length === 0) {
      ElMessage.error('请至少添加一行员工与数量')
      return
    }
    for (const row of form.laborIssueList) {
      if (!row.staffId) { ElMessage.error('请选择员工'); return }
      if (!row.dictId) { ElMessage.error('请选择劳保用品'); return }
      if (row.num == null || row.num === '' || Number(row.num) < 0) { ElMessage.error('请输入数量'); return }
    }
    const payload = { ...form }
@@ -223,10 +204,54 @@
  if (!deptPositionId) {
    laborSuppliesOptions.value = []
    form.dictId = undefined
    form.laborIssueList = []
    return
  }
  const res = await getDeptPositionByDeptIdLabor({ id: deptPositionId })
  laborSuppliesOptions.value = res?.data || []
  
  const staffRes = await staffOnJobListPage({ current: -1, size: -1, staffState: 1, deptPositionId: deptPositionId })
  const staffList = staffRes?.data?.records || []
  const suppliesList = laborSuppliesOptions.value || []
  
  if (staffList.length > 0 && suppliesList.length > 0) {
    form.laborIssueList = []
    staffList.forEach(staff => {
      suppliesList.forEach(supply => {
        form.laborIssueList.push({
          staffId: staff.id,
          dictId: supply.dictId,
          dictName: supply.dictName,
          num: supply.num || 0
        })
      })
    })
  } else {
    form.laborIssueList = []
  }
}

function arraySpanMethod({ row, column, rowIndex, columnIndex }) {
  if (columnIndex === 0) {
    const staffId = row.staffId
    const sameStaffRows = form.laborIssueList.filter(item => item.staffId === staffId)
    const firstIndex = form.laborIssueList.findIndex(item => item.staffId === staffId)
    if (rowIndex === firstIndex) {
      return {
        rowspan: sameStaffRows.length,
        colspan: 1
      }
    } else {
      return {
        rowspan: 0,
        colspan: 0
      }
    }
  }
}

function checkDisabled(data) {
  return data.type === 1
}

onMounted(() => {

 src/views/lavorissue/ledger/index.vue

@@ -108,7 +108,7 @@
    },
    [
      {
        label: "部门/岗位",
        label: "岗位",
        align: "center",
        prop: "deptName"
      },
@@ -126,12 +126,6 @@
        label: "员工编号",
        align: "center",
        prop: "staffNo"
      },
      {
        label: "劳保类型",
        align: "center",
        prop: "dictTypeName",

      },
      {
        label: "劳保防具",