Commit 3cd537bb by yubin

请假

parent 6391ed84
...@@ -100,7 +100,7 @@ export const getLeaveStats = (param) => { ...@@ -100,7 +100,7 @@ export const getLeaveStats = (param) => {
export const getLeaveTypeList = (param) => { export const getLeaveTypeList = (param) => {
return axios.request({ return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeaveType/selectList', url: '/api/ac/jilinsscgsdp/keyDmUserCategory/selectLeaveTypeList',
method: 'post', method: 'post',
data: param data: param
}) })
...@@ -114,3 +114,12 @@ export const transferLeaveApproval = (param) => { ...@@ -114,3 +114,12 @@ export const transferLeaveApproval = (param) => {
data: param data: param
}) })
} }
// 选择转审核审批人列表
export const selectTransferApprovalList = (param) => {
return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmLeave/selectTransferApprovalList',
method: 'post',
data: param
})
}
...@@ -2,52 +2,52 @@ import axios from '@/libs/api.request' ...@@ -2,52 +2,52 @@ import axios from '@/libs/api.request'
const permissionType = { const permissionType = {
// 键:枚举名,值:枚举值(可以是数字/字符串) // 键:枚举名,值:枚举值(可以是数字/字符串)
LEAVEAPPROVAL: "leave_approval", // 请假审核 LEAVEAPPROVAL: 'leave_approval', // 请假审核
LEAVEVIEW: "leave_view", // 请假查询统计 LEAVEVIEW: 'leave_view', // 请假查询统计
SUPPLYAPPROVAL: "supply_approval", // 用品审核 SUPPLYAPPROVAL: 'supply_approval', // 用品审核
SUPPLYVIEW: "supply_view" // 用品查询统计 SUPPLYVIEW: 'supply_view' // 用品查询统计
}; }
// 获取日常人员列表 // 获取日常人员列表
export const getLeaveApprovalPermission = () => { export const getLeaveApprovalPermission = () => {
return axios.request({ return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUserCategoryPermission/selectOrgPermission', url: '/api/ac/jilinsscgsdp/keyDmUserCategory/selectOrgPermission',
method: 'post', method: 'post',
data:{ data: {
permissionType: permissionType.LEAVEAPPROVAL permissionType: permissionType.LEAVEAPPROVAL
} }
}) })
} }
// 根据机构编码同步本级及下属机构用户(存在则更新、不存在则新增;null 不覆盖) // 根据机构编码同步本级及下属机构用户(存在则更新、不存在则新增;null 不覆盖)
export const getLeaveView = () => { export const getLeaveView = () => {
return axios.request({ return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUserCategoryPermission/selectOrgPermission', url: '/api/ac/jilinsscgsdp/keyDmUserCategory/selectOrgPermission',
method: 'post', method: 'post',
data:{ data: {
permissionType: permissionType.LEAVEVIEW permissionType: permissionType.LEAVEVIEW
} }
}) })
} }
// 保存单个日常人员(前端编辑后保存) // 保存单个日常人员(前端编辑后保存)
export const getSupplyApproval = () => { export const getSupplyApproval = () => {
return axios.request({ return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUserCategoryPermission/selectOrgPermission', url: '/api/ac/jilinsscgsdp/keyDmUserCategory/selectOrgPermission',
method: 'post', method: 'post',
data:{ data: {
permissionType: permissionType.SUPPLYAPPROVAL permissionType: permissionType.SUPPLYAPPROVAL
} }
}) })
} }
// 分页查询日常人员可选上级领导列表 // 分页查询日常人员可选上级领导列表
export const getSupplyView = () => { export const getSupplyView = () => {
return axios.request({ return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUserCategoryPermission/selectOrgPermission', url: '/api/ac/jilinsscgsdp/keyDmUserCategoryPermission/selectOrgPermission',
method: 'post', method: 'post',
data:{ data: {
permissionType: permissionType.SUPPLYVIEW permissionType: permissionType.SUPPLYVIEW
} }
}) })
} }
\ No newline at end of file
...@@ -47,7 +47,7 @@ export const dmUserOffice = (param) => { ...@@ -47,7 +47,7 @@ export const dmUserOffice = (param) => {
export const getUserTypeList = (param) => { export const getUserTypeList = (param) => {
return axios.request({ return axios.request({
url: '/api/ac/jilinsscgsdp/keyDmUserCategory/selectList', url: '/api/ac/jilinsscgsdp/keyDmUserCategory/selectList'
}) })
} }
......
...@@ -180,7 +180,10 @@ export default { ...@@ -180,7 +180,10 @@ export default {
{ type: 'selection', width: 60 }, { type: 'selection', width: 60 },
{ title: '物料编码', key: 'material_code', minWidth: 120 }, { title: '物料编码', key: 'material_code', minWidth: 120 },
{ title: '物料名称', key: 'material_name', minWidth: 150 }, { title: '物料名称', key: 'material_name', minWidth: 150 },
{ title: '入库数量', key: 'inbound_quantity', minWidth: 120, render: (h, params) => { { title: '入库数量',
key: 'inbound_quantity',
minWidth: 120,
render: (h, params) => {
return h('InputNumber', { return h('InputNumber', {
props: { props: {
value: params.row.inbound_quantity || 0, value: params.row.inbound_quantity || 0,
...@@ -195,8 +198,11 @@ export default { ...@@ -195,8 +198,11 @@ export default {
} }
} }
}) })
}}, } },
{ title: '单价', key: 'unit_price', minWidth: 120, render: (h, params) => { { title: '单价',
key: 'unit_price',
minWidth: 120,
render: (h, params) => {
return h('InputNumber', { return h('InputNumber', {
props: { props: {
value: params.row.unit_price || 0, value: params.row.unit_price || 0,
...@@ -211,11 +217,14 @@ export default { ...@@ -211,11 +217,14 @@ export default {
} }
} }
}) })
}}, } },
{ title: '总金额', key: 'total_amount', minWidth: 120, render: (h, params) => { { title: '总金额',
key: 'total_amount',
minWidth: 120,
render: (h, params) => {
const amount = ((params.row.inbound_quantity || 0) * (params.row.unit_price || 0)).toFixed(2) const amount = ((params.row.inbound_quantity || 0) * (params.row.unit_price || 0)).toFixed(2)
return h('span', amount) return h('span', amount)
}} } }
], ],
returnDetailColumns: [ returnDetailColumns: [
{ title: '物料名称', key: 'material_name' }, { title: '物料名称', key: 'material_name' },
......
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
visible: false, visible: false,
saving: false, saving: false,
form: {} form: {}
}, }
// leader / office state 已移除 // leader / office state 已移除
} }
}, },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论