Skip to content

J
jilinzhongdianrenqun-web
Commit 227c2bf1 by wangchunyang
Options

api的js文件整合到key-dm.js文件中

parent 80c3f585
正在显示 包含 29 行增加 和 454 行删除
src/api/key-dm-inbound.js deleted 100644 → 0
import axios from '@/libs/api.request'
// 入库列表
export const getInboundList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmInbound/selectList',
method: 'post',
data: param
})
}
// 保存入库（含明细）
export const saveInbound = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmInbound/save',
method: 'post',
data: param
})
}
// 删除入库记录
export const deleteInbound = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmInbound/delete',
method: 'post',
data: param
})
}
// 执行入库（生成库存变更与日志）
export const doInbound = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmInbound/doInbound',
method: 'post',
data: param
})
}
// 待归还列表（从申领中查询）
export const getPendingReturnList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmInbound/selectPendingReturnList',
method: 'post',
data: param
})
}
// 处理归还（生成入库单并更新库存）
export const processReturn = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmInbound/processReturn',
method: 'post',
data: param
})
}
// 库存查询
export const getInventoryList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmInbound/selectInventoryList',
method: 'post',
data: param
})
}
// 详情
export const getInboundById = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmInbound/getById',
method: 'post',
data: param
})
}
// 归还详情
export const getPendingReturnById = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmInbound/getPendingReturnById',
method: 'post',
data: param
})
}
// 导入物料（Excel）
export const importInbound = (formData) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmInbound/importInbound',
method: 'post',
data: formData
})
}
src/api/key-dm-inventory.js deleted 100644 → 0
import axios from '@/libs/api.request'
// 申领列表（包含历史与查询）
export const getBorrowList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmBorrow/selectList',
method: 'post',
data: param
})
}
// 待审核列表
export const getPendingBorrowList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmBorrow/selectPendingList',
method: 'post',
data: param
})
}
// 获取历史列表
export const getHistoryBorrowList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmBorrow/selectHistoryList',
method: 'post',
data: param
})
}
// 保存申请（含明细）
export const saveBorrowApplication = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmBorrow/save',
method: 'post',
data: param
})
}
// 提交
export const submitBorrow = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmBorrow/submit',
method: 'post',
data: param
})
}
// 撤回
export const revokeBorrow = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmBorrow/revoke',
method: 'post',
data: param
})
}
// 审批通过（内部生成出库、更新库存）
export const approveBorrow = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmBorrow/approve',
method: 'post',
data: param
})
}
// 驳回
export const rejectBorrow = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmBorrow/reject',
method: 'post',
data: param
})
}
// 查询申请及明细/日志
export const getBorrowById = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmBorrow/getById',
method: 'post',
data: param
})
}
src/api/key-dm-leave.js deleted 100644 → 0
import axios from '@/libs/api.request'
// 列表查询（支持分页与筛选）
export const getLeaveList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/selectList',
method: 'post',
data: param
})
}
// 列表查询（支持分页与筛选）
export const getLeaveListByUserId = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/selectListByUserId',
method: 'post',
data: param
})
}
// 获取待审核列表
export const getPendingList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/selectPendingList',
method: 'post',
data: param
})
}
// 保存（新增/修改）请假申请
export const saveLeaveApplication = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/save',
method: 'post',
data: param
})
}
// 提交请假申请进入审批
export const submitLeaveApplication = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/submit',
method: 'post',
data: param
})
}
// 撤回请假申请
export const revokeLeaveApplication = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/revoke',
method: 'post',
data: param
})
}
// 审批通过
export const approveLeave = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/approve',
method: 'post',
data: param
})
}
// 驳回
export const rejectLeave = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/reject',
method: 'post',
data: param
})
}
// 获取某申请的详情（含审批记录）
export const getLeaveById = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/getById',
method: 'post',
data: param
})
}
// 审批历史（用于历史查询）
export const getApprovalHistory = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/selectApprovalHistory',
method: 'post',
data: param
})
}
// 请假统计
export const getLeaveStats = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/selectStats',
method: 'post',
data: param
})
}
export const getLeaveTypeList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUserCategory/selectLeaveTypeList',
method: 'post',
data: param
})
}
// 转交审批人（前端发起将当前待审批任务转给其他审批人）
export const transferLeaveApproval = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/transferApproval',
method: 'post',
data: param
})
}
// 选择转审核审批人列表
export const selectTransferApprovalList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/selectTransferApprovalList',
method: 'post',
data: param
})
}
export const deleteById = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/deleteById',
method: 'post',
data: param
})
}
src/api/key-dm-user-permission.js deleted 100644 → 0
import axios from '@/libs/api.request'
const permissionType = {
// 键：枚举名，值：枚举值（可以是数字/字符串）
LEAVEAPPROVAL: 'leave_approval', // 请假审核
LEAVEVIEW: 'leave_view', // 请假查询统计
SUPPLYAPPROVAL: 'supply_approval', // 用品审核
SUPPLYVIEW: 'supply_view' // 用品查询统计
}
// 获取日常人员列表
export const getLeaveApprovalPermission = () => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUserCategory/selectOrgPermission',
method: 'post',
data: {
permissionType: permissionType.LEAVEAPPROVAL
}
})
}
// 根据机构编码同步本级及下属机构用户（存在则更新、不存在则新增；null 不覆盖）
export const getLeaveView = () => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUserCategory/selectOrgPermission',
method: 'post',
data: {
permissionType: permissionType.LEAVEVIEW
}
})
}
// 保存单个日常人员（前端编辑后保存）
export const getSupplyApproval = () => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUserCategory/selectOrgPermission',
method: 'post',
data: {
permissionType: permissionType.SUPPLYAPPROVAL
}
})
}
// 分页查询日常人员可选上级领导列表
export const getSupplyView = () => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUserCategoryPermission/selectOrgPermission',
method: 'post',
data: {
permissionType: permissionType.SUPPLYVIEW
}
})
}
src/api/key-dm-user.js deleted 100644 → 0
import axios from '@/libs/api.request'
// 获取日常人员列表
export const getDmUserList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUser/selectList',
method: 'post',
data: param
})
}
// 根据机构编码同步本级及下属机构用户（存在则更新、不存在则新增；null 不覆盖）
export const syncDmUsersByOffice = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUser/syncByOffice',
method: 'post',
data: param
})
}
// 保存单个日常人员（前端编辑后保存）
export const saveDmUser = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUser/save',
method: 'post',
data: param
})
}
// 获取人员选择器列表（根据机构和权限过滤）
export const getUserSelectorList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUser/selectUserSelectorList',
method: 'post',
data: param
})
}
// 分页查询日常人员可选上级部门列表
export const dmUserOffice = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUser/dmUserOffice',
method: 'post',
data: param
})
}
export const getUserTypeList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUserCategory/selectList',
method: 'post',
data: param
})
}
// 获取人员多选器列表（所有在职人员）
export const getUserMultiSelectorList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUser/selectUserMultiSelectorList',
method: 'post',
data: param
})
}
// 根据ID获取单个用户信息
export const getDmUserById = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUser/getById',
method: 'post',
data: param
})
}
src/view/key-person/key_dm_conf/index.vue
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
</Tabs> </Tabs>
<!-- 导入物料弹窗 --> <!-- 导入物料弹窗 -->
<Modal v-model="importShow" title="物料导入" width="360"> <Modal v-model="importShow" title="数据导入" width="360">
<Row type="flex" justify="center" align="middle"> <Row type="flex" justify="center" align="middle">
<Col span="10"> <Col span="10">
<div style="text-align: center;"> <div style="text-align: center;">
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="单价" prop="unit_price"> <FormItem label="单价" prop="unit_price">
<InputNumber v-model="modals.material.form.unit_price" :min="0" :precision="4" style="width: 100%" /> <InputNumber v-model="modals.material.form.unit_price" :min="0" :precision="2" style="width: 100%" />
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -532,7 +532,8 @@ export default { ...@@ -532,7 +532,8 @@ export default {
}, },
rules: { rules: {
category_id: [{ required: true, message: '请选择分类', trigger: 'change' }], category_id: [{ required: true, message: '请选择分类', trigger: 'change' }],
material_name: [{ required: true, message: '请输入物料名称', trigger: 'blur' }] material_code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
material_name: [{ required: true, message: '请输入名称', trigger: 'blur' }]
} }
}, },
org: { org: {
...@@ -627,7 +628,8 @@ export default { ...@@ -627,7 +628,8 @@ export default {
leave_approval: false, // 请假审核 leave_approval: false, // 请假审核
leave_view: false, // 请假查询（统计） leave_view: false, // 请假查询（统计）
supply_approval: false, // 用品申领审核 supply_approval: false, // 用品申领审核
supply_view: false // 用品查询（统计） supply_view: false, // 用品查询（统计）
inventory_manager: false // 库存管理
}, },
userRound: '1' userRound: '1'
} }
......
src/view/key-person/key_dm_inventory/inbound.vue
...@@ -260,7 +260,7 @@ import { ...@@ -260,7 +260,7 @@ import {
getInboundById, getInboundById,
getPendingReturnById, getPendingReturnById,
importInbound importInbound
} from '@/api/key-dm-inbound' } from '@/api/key-dm'
import MaterialSelector from '@/view/key-person/key_dm_conf/materialSelector.vue' import MaterialSelector from '@/view/key-person/key_dm_conf/materialSelector.vue'
import { normalizeVisitTimeValue } from '@/view/key-person/key_dm_conf/dates.js' import { normalizeVisitTimeValue } from '@/view/key-person/key_dm_conf/dates.js'
import axios from 'axios' import axios from 'axios'
...@@ -270,7 +270,6 @@ export default { ...@@ -270,7 +270,6 @@ export default {
components: { MaterialSelector }, components: { MaterialSelector },
data () { data () {
return { return {
// 表单验证规则
importShow: false, importShow: false,
impBtnDisabled: false, impBtnDisabled: false,
// 时间范围数组 // 时间范围数组
......
src/view/key-person/key_dm_inventory/index.vue
...@@ -290,10 +290,10 @@ import { ...@@ -290,10 +290,10 @@ import {
getHistoryBorrowList, getHistoryBorrowList,
approveBorrow, approveBorrow,
rejectBorrow, rejectBorrow,
getBorrowById getBorrowById,
} from '@/api/key-dm-inventory' getSupplyApproval
} from '@/api/key-dm'
import MaterialSelector from '@/view/key-person/key_dm_conf/materialSelector.vue' import MaterialSelector from '@/view/key-person/key_dm_conf/materialSelector.vue'
import { getSupplyApproval } from '@/api/key-dm-user-permission'
import { normalizeVisitTimeValue } from '@/view/key-person/key_dm_conf/dates.js' import { normalizeVisitTimeValue } from '@/view/key-person/key_dm_conf/dates.js'
export default { export default {
......
src/view/key-person/key_dm_leave/index.vue
...@@ -274,19 +274,19 @@ import { ...@@ -274,19 +274,19 @@ import {
saveLeaveApplication, saveLeaveApplication,
submitLeaveApplication, submitLeaveApplication,
revokeLeaveApplication, revokeLeaveApplication,
getPendingList, getPendingLeaveList,
approveLeave, approveLeave,
rejectLeave, rejectLeave,
getApprovalHistory, getLeaveApprovalHistory,
getLeaveStats, getLeaveStats,
getLeaveById, getLeaveById,
getLeaveTypeList, getLeaveTypeList,
deleteById, deleteLeaveById,
selectTransferApprovalList, selectTransferApprovalList,
transferLeaveApproval transferLeaveApproval,
} from '@/api/key-dm-leave' getLeaveApprovalPermission
// 注意：不单独调用后台的 isPending 接口，改为复用 getPendingList 获取 totalRecord 判定是否存在待办 } from '@/api/key-dm'
import { getLeaveApprovalPermission } from '@/api/key-dm-user-permission' // 注意：不单独调用后台的 isPending 接口，改为复用 getPendingLeaveList 获取 totalRecord 判定是否存在待办
export default { export default {
name: 'key-dm-leave-index', name: 'key-dm-leave-index',
...@@ -593,7 +593,7 @@ export default { ...@@ -593,7 +593,7 @@ export default {
if (name === 'query') this.fetchList('query') if (name === 'query') this.fetchList('query')
}, },
fetchList (tab) { fetchList (tab) {
const apiMap = { apply: getLeaveListByUserId, pending: getPendingList, history: getApprovalHistory, query: getLeaveList } const apiMap = { apply: getLeaveListByUserId, pending: getPendingLeaveList, history: getLeaveApprovalHistory, query: getLeaveList }
const api = apiMap[tab] const api = apiMap[tab]
if (!api) return if (!api) return
this.loading[tab] = true this.loading[tab] = true
...@@ -643,9 +643,9 @@ export default { ...@@ -643,9 +643,9 @@ export default {
// 加载待审批数量（用于显示“！”） // 加载待审批数量（用于显示“！”）
loadPendingCount () { loadPendingCount () {
// 复用 getPendingList，一页一条以从返回中读取 totalRecord // 复用 getPendingLeaveList，一页一条以从返回中读取 totalRecord
// 兼容后端可能返回多种结构：{errcode:0, data:{totalRecord,...}}, {data:{results:[]}}, 直接数组，或 page 对象等 // 兼容后端可能返回多种结构：{errcode:0, data:{totalRecord,...}}, {data:{results:[]}}, 直接数组，或 page 对象等
getPendingList({ pageNo: 1, pageSize: 1, params: {} }).then(ret => { getPendingLeaveList({ pageNo: 1, pageSize: 1, params: {} }).then(ret => {
try { try {
// 常见包装结构：{ errcode:0, data: {...} } // 常见包装结构：{ errcode:0, data: {...} }
if (ret && ret.data) { if (ret && ret.data) {
...@@ -1189,8 +1189,8 @@ export default { ...@@ -1189,8 +1189,8 @@ export default {
this.tables.stats = [] this.tables.stats = []
}, },
deleteApply (row) { deleteApply (row) {
deleteById({ id: row.id, leave_id: row.leave_id }).then(ret => { deleteLeaveById({ id: row.id, leave_id: row.leave_id }).then(ret => {
if (ret.data && ret.data.errcode === 0) { if (ret.data && ret.data.errcode === 0) {
this.$Message.success('删除成功') this.$Message.success('删除成功')
this.fetchList('apply') this.fetchList('apply')
......
src/view/key-person/key_dm_user/index.vue
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</Select> </Select>
</FormItem> </FormItem>
<FormItem v-if="editModal.form.is_leave === 1" label="离职时间"> <FormItem v-if="editModal.form.is_leave === 1" label="离职时间">
<Input v-model="editModal.form.leave_time" type="datetime" placeholder="请选择离职时间" format="yyyy-MM-dd HH:mm:ss" /> <DatePicker v-model="editModal.form.leave_time" type="date" placeholder="请选择离职时间" />
</FormItem> </FormItem>
</Form> </Form>
<div slot="footer"> <div slot="footer">
...@@ -88,8 +88,9 @@ ...@@ -88,8 +88,9 @@
</template> </template>
<script> <script>
import { getDmUserList, syncDmUsersByOffice, saveDmUser } from '@/api/key-dm-user' import { getDmUserList, syncDmUsersByOffice, saveDmUser } from '@/api/key-dm'
import UserSelector from './userSelector.vue' import UserSelector from './userSelector.vue'
import { normalizeVisitTimeValue } from '@/view/key-person/key_dm_conf/dates.js'
export default { export default {
name: 'key-dm-user-index', name: 'key-dm-user-index',
...@@ -299,6 +300,8 @@ export default { ...@@ -299,6 +300,8 @@ export default {
if (formData._raw_leave_time !== undefined) delete formData._raw_leave_time if (formData._raw_leave_time !== undefined) delete formData._raw_leave_time
} }
this.editModal.saving = true this.editModal.saving = true
formData.in_work_time = formData.in_work_time ? normalizeVisitTimeValue(formData.in_work_time) : null
formData.leave_time = formData.leave_time ? normalizeVisitTimeValue(formData.leave_time) : null
saveDmUser(formData).then(ret => { saveDmUser(formData).then(ret => {
if (ret.data && ret.data.errcode === 0) { if (ret.data && ret.data.errcode === 0) {
this.$Message.success('保存成功') this.$Message.success('保存成功')
......
src/view/key-person/key_dm_user/userMultiSelector.vue
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</template> </template>
<script> <script>
import { getUserMultiSelectorList } from '@/api/key-dm-user' import { getUserMultiSelectorList } from '@/api/key-dm'
import { selectCityList } from '@/api/contradiction.js' import { selectCityList } from '@/api/contradiction.js'
export default { export default {
......
src/view/key-person/key_dm_user/userSelector.vue
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</template> </template>
<script> <script>
import { getUserSelectorList } from '@/api/key-dm-user' import { getUserSelectorList } from '@/api/key-dm'
export default { export default {
name: 'user-selector', name: 'user-selector',
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论