Commit 70ea180f by wangchunyang

样式调整,人员选择组件优化

parent a0e2485f
...@@ -106,7 +106,6 @@ export const getLeaveTypeList = (param) => { ...@@ -106,7 +106,6 @@ export const getLeaveTypeList = (param) => {
}) })
} }
// 转交审批人(前端发起将当前待审批任务转给其他审批人) // 转交审批人(前端发起将当前待审批任务转给其他审批人)
export const transferLeaveApproval = (param) => { export const transferLeaveApproval = (param) => {
return axios.request({ return axios.request({
......
...@@ -68,4 +68,4 @@ export const getDmUserById = (param) => { ...@@ -68,4 +68,4 @@ export const getDmUserById = (param) => {
method: 'post', method: 'post',
data: param data: param
}) })
} }
\ No newline at end of file
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择开始时间" placeholder="请选择开始时间"
class="mr10" class="mr10"
style="width: 200px" style="width: 150px"
/> />
<span>结束时间:</span> <span>结束时间:</span>
<DatePicker <DatePicker
...@@ -37,15 +37,17 @@ ...@@ -37,15 +37,17 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择结束时间" placeholder="请选择结束时间"
class="mr10" class="mr10"
style="width: 200px" style="width: 150px"
/> />
<br> <br>
<div class="mt8">
<span>入库类型:</span> <span>入库类型:</span>
<Select <Select
v-model="filters.inbound.inbound_type" v-model="filters.inbound.inbound_type"
placeholder="请选择入库类型" placeholder="请选择入库类型"
class="mr10" class="mr10"
style="width: 200px" style="width: 200px"
clearable
> >
<Option :value='1'>手工入库</Option> <Option :value='1'>手工入库</Option>
<Option :value='2'>归还入库</Option> <Option :value='2'>归还入库</Option>
...@@ -56,10 +58,12 @@ ...@@ -56,10 +58,12 @@
placeholder="请选择入库状态" placeholder="请选择入库状态"
class="mr10" class="mr10"
style="width: 200px" style="width: 200px"
clearable
> >
<Option :value='0'>待入库</Option> <Option :value='0'>待入库</Option>
<Option :value='1'>已入库</Option> <Option :value='1'>已入库</Option>
</Select> </Select>
</div>
</Col> </Col>
<Col span="6" class="text-right"> <Col span="6" class="text-right">
<Button type="primary" class="mr10" @click="handleSearch('inbound')">搜索</Button> <Button type="primary" class="mr10" @click="handleSearch('inbound')">搜索</Button>
...@@ -72,10 +76,10 @@ ...@@ -72,10 +76,10 @@
<Table :data="tables.inbound" :loading="loading.inbound" :columns="inboundColumns" border> <Table :data="tables.inbound" :loading="loading.inbound" :columns="inboundColumns" border>
<template slot="action" slot-scope="{ row }"> <template slot="action" slot-scope="{ row }">
<Poptip confirm title="确认执行入库?" transfer @on-ok="doInbound(row)" v-if="canEdit(row)"> <Poptip confirm title="确认执行入库?" transfer @on-ok="doInbound(row)" v-if="canEdit(row)">
<Button size="small" type="success">入库</Button> <Button size="small" type="success" class="mr5">入库</Button>
</Poptip> </Poptip>
<Button size="small" @click="openDetail(row)">详细</Button> <Button size="small" @click="openDetail(row)" class="mr5">详细</Button>
<Button size="small" type="primary" @click="openEdit(row)" v-if="canEdit(row)">修改</Button> <Button size="small" type="primary" @click="openEdit(row)" v-if="canEdit(row)" class="mr5">修改</Button>
<Poptip confirm title="确认删除?" transfer @on-ok="deleteInbound(row)" v-if="canEdit(row)"> <Poptip confirm title="确认删除?" transfer @on-ok="deleteInbound(row)" v-if="canEdit(row)">
<Button size="small" type="error">删除</Button> <Button size="small" type="error">删除</Button>
</Poptip> </Poptip>
...@@ -151,13 +155,13 @@ ...@@ -151,13 +155,13 @@
<!-- 入库弹窗 --> <!-- 入库弹窗 -->
<Modal v-model="inboundModal.visible" :title="inboundModal.isEdit ? '修改入库' : '新增入库'" width="800"> <Modal v-model="inboundModal.visible" :title="inboundModal.isEdit ? '修改入库' : '新增入库'" width="800">
<Form :model="inboundModal.form" :rules="inboundRules" :label-width="120" ref="inboundForm"> <Form :model="inboundModal.form" :rules="inboundRules" :label-width="120" ref="inboundForm">
<FormItem label="入库单号"> <FormItem label="入库单号" prop="inbound_no">
<Input v-model="inboundModal.form.inbound_no" /> <Input v-model="inboundModal.form.inbound_no" />
</FormItem> </FormItem>
<FormItem label="批次号"> <FormItem label="批次号" prop="batch_no">
<Input v-model="inboundModal.form.batch_no" /> <Input v-model="inboundModal.form.batch_no" />
</FormItem> </FormItem>
<FormItem label="入库日期"> <FormItem label="入库日期" prop="inbound_date">
<DatePicker <DatePicker
v-model="inboundModal.form.inbound_date" v-model="inboundModal.form.inbound_date"
type="date" type="date"
...@@ -323,7 +327,7 @@ export default { ...@@ -323,7 +327,7 @@ export default {
return h('span', this.inboundStatusMap[row.inbound_status] || row.inbound_status || '-') return h('span', this.inboundStatusMap[row.inbound_status] || row.inbound_status || '-')
} }
}, },
{ title: '操作', slot: 'action', width: 360, align: 'center' } { title: '操作', slot: 'action', width: 260, align: 'center' }
], ],
returnColumns: [ returnColumns: [
{ type: 'index', title: '序号', width: 60, align: 'center' }, { type: 'index', title: '序号', width: 60, align: 'center' },
...@@ -362,6 +366,7 @@ export default { ...@@ -362,6 +366,7 @@ export default {
{ title: '物料编码', key: 'material_code', align: 'center' }, { title: '物料编码', key: 'material_code', align: 'center' },
{ title: '物料名称', key: 'material_name', align: 'center' }, { title: '物料名称', key: 'material_name', align: 'center' },
{ title: '总量', key: 'total_quantity', align: 'center' }, { title: '总量', key: 'total_quantity', align: 'center' },
{ title: '借出', key: 'borrowed_quantity', align: 'center' },
{ {
title: '可用', title: '可用',
key: 'available_quantity', key: 'available_quantity',
...@@ -369,9 +374,7 @@ export default { ...@@ -369,9 +374,7 @@ export default {
render: (h, { row }) => { render: (h, { row }) => {
return h('span', (row.total_quantity - row.borrowed_quantity - row.damaged_quantity) || 0) return h('span', (row.total_quantity - row.borrowed_quantity - row.damaged_quantity) || 0)
} }
}, }
{ title: '借出', key: 'borrowed_quantity', align: 'center' },
{ title: '损坏', key: 'damaged_quantity', align: 'center' }
], ],
// 模态窗口内表格列定义 // 模态窗口内表格列定义
inboundDetailColumns: [ inboundDetailColumns: [
...@@ -483,7 +486,19 @@ export default { ...@@ -483,7 +486,19 @@ export default {
inboundSelectedDetails: [], inboundSelectedDetails: [],
inboundModal: { visible: false, isEdit: false, saving: false, form: {}, details: [] }, inboundModal: { visible: false, isEdit: false, saving: false, form: {}, details: [] },
returnModal: { visible: false, record: {}, details: [], saving: false }, returnModal: { visible: false, record: {}, details: [], saving: false },
detailModal: { visible: false, loading: false, data: {}, details: [], logs: [] } detailModal: { visible: false, loading: false, data: {}, details: [], logs: [] },
// 表单验证规则
inboundRules: {
inbound_no: [
{ required: true, message: '请填写入库单号', trigger: 'blur' }
],
batch_no: [
{ required: true, message: '请选择批次号', trigger: 'blur' }
],
inbound_date: [
{ required: true, message: '请选择入库日期' }
]
}
} }
}, },
watch: {}, watch: {},
...@@ -819,6 +834,9 @@ export default { ...@@ -819,6 +834,9 @@ export default {
.text-right { text-align: right; } .text-right { text-align: right; }
.page_style { margin-top: 12px; text-align: right; } .page_style { margin-top: 12px; text-align: right; }
.mt8 { margin-top: 8px; } .mt8 { margin-top: 8px; }
.mr5 {
margin-right: 5px;
}
/* 搜索区域外层盒:统一间距+背景 */ /* 搜索区域外层盒:统一间距+背景 */
.search-container { .search-container {
padding: 16px; padding: 16px;
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
style="width: 200px" style="width: 200px"
/> />
<br> <br>
<div class="mt8">
<span>审批状态:</span> <span>审批状态:</span>
<Select <Select
v-model="filters.apply.approval_status" v-model="filters.apply.approval_status"
...@@ -52,6 +53,7 @@ ...@@ -52,6 +53,7 @@
<Option :value='9'>审核通过</Option> <Option :value='9'>审核通过</Option>
<Option :value='-1'>驳回</Option> <Option :value='-1'>驳回</Option>
</Select> </Select>
</div>
</Col> </Col>
<!-- 右侧操作按钮区:固定居右 --> <!-- 右侧操作按钮区:固定居右 -->
<Col span="6" class="action-col"> <Col span="6" class="action-col">
...@@ -378,7 +380,7 @@ export default { ...@@ -378,7 +380,7 @@ export default {
return h('span', this.approvalStatusMap[row.approval_status + ''] || row.approval_status || '-') return h('span', this.approvalStatusMap[row.approval_status + ''] || row.approval_status || '-')
} }
}, },
{ title: '操作', slot: 'action', align: 'center', width: 320 } { title: '操作', slot: 'action', align: 'center', width: 260 }
], ],
pendingColumns: [ pendingColumns: [
{ type: 'index', title: '序号', width: 60, align: 'center' }, { type: 'index', title: '序号', width: 60, align: 'center' },
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
</div> </div>
<Table :data="tables.workload" :loading="loading.workload" :columns="workloadColumns" border> <Table :data="tables.workload" :loading="loading.workload" :columns="workloadColumns" border>
<template slot="action" slot-scope="{ row }"> <template slot="action" slot-scope="{ row }">
<Button size="small" class="mr10" @click="openWorkloadDetail(row,'leave')">请假明细</Button> <Button size="small" type="primary" class="mr10" @click="openWorkloadDetail(row,'leave')">请假明细</Button>
<Button size="small" @click="openWorkloadDetail(row,'inventory')">申领明细</Button> <Button size="small" type="primary" @click="openWorkloadDetail(row,'inventory')">申领明细</Button>
</template> </template>
</Table> </Table>
</TabPane> </TabPane>
......
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
{ type: 'selection', width: 60, align: 'center' }, { type: 'selection', width: 60, align: 'center' },
{ title: '归属部门', key: 'office_name', align: 'center', minWidth: 150 }, { title: '归属部门', key: 'office_name', align: 'center', minWidth: 150 },
{ title: '姓名', key: 'name', align: 'center', minWidth: 100 }, { title: '姓名', key: 'name', align: 'center', minWidth: 100 },
{ title: '工号', key: 'gh', align: 'center', minWidth: 120 }, // { title: '工号', key: 'gh', align: 'center', minWidth: 120 },
// { title: '邮箱', key: 'email', align: 'center', minWidth: 150 }, // { title: '邮箱', key: 'email', align: 'center', minWidth: 150 },
{ title: '电话', key: 'phone', align: 'center', minWidth: 120 }, { title: '电话', key: 'phone', align: 'center', minWidth: 120 },
{ title: '手机', key: 'mobile', align: 'center', minWidth: 120 } { title: '手机', key: 'mobile', align: 'center', minWidth: 120 }
......
...@@ -53,13 +53,12 @@ export default { ...@@ -53,13 +53,12 @@ export default {
selectedRow: null, selectedRow: null,
confirming: false, confirming: false,
columns: [ columns: [
{ title: '归属部门', key: 'office_name', align: 'center', minWidth: 150 },
{ title: '姓名', key: 'name', align: 'center', minWidth: 100 }, { title: '姓名', key: 'name', align: 'center', minWidth: 100 },
{ title: '工号', key: 'gh', align: 'center', minWidth: 120 }, // { title: '工号', key: 'gh', align: 'center', minWidth: 120 },
{ title: '邮箱', key: 'email', align: 'center', minWidth: 150 }, { title: '邮箱', key: 'email', align: 'center', minWidth: 150 },
{ title: '电话', key: 'phone', align: 'center', minWidth: 120 }, { title: '电话', key: 'phone', align: 'center', minWidth: 120 },
{ title: '手机', key: 'mobile', align: 'center', minWidth: 120 }, { title: '手机', key: 'mobile', align: 'center', minWidth: 120 }
{ title: '归属部门', key: 'office_name', align: 'center', minWidth: 150 },
{ title: '人员分类', key: 'category_names', align: 'center', minWidth: 200 }
] ]
} }
}, },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论