Skip to content

J
jilinzhongdianrenqun-web
Commit 70ea180f by wangchunyang
Options

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

parent a0e2485f
正在显示 包含 41 行增加 和 24 行删除
src/api/key-dm-leave.js
......@@ -106,7 +106,6 @@ export const getLeaveTypeList = (param) => {
})
}
// 转交审批人（前端发起将当前待审批任务转给其他审批人）
export const transferLeaveApproval = (param) => {
return axios.request({
......
src/api/key-dm-user.js
......@@ -68,4 +68,4 @@ export const getDmUserById = (param) => {
method: 'post',
data: param
})
}
\ No newline at end of file
}
src/view/key-person/key_dm_inventory/inbound.vue
......@@ -27,7 +27,7 @@
value-format="yyyy-MM-dd"
placeholder="请选择开始时间"
class="mr10"
style="width: 200px"
style="width: 150px"
/>
<span>结束时间：</span>
<DatePicker
......@@ -37,15 +37,17 @@
value-format="yyyy-MM-dd"
placeholder="请选择结束时间"
class="mr10"
style="width: 200px"
style="width: 150px"
/>
<br>
<div class="mt8">
<span>入库类型：</span>
<Select
v-model="filters.inbound.inbound_type"
placeholder="请选择入库类型"
class="mr10"
style="width: 200px"
clearable
>
<Option :value='1'>手工入库</Option>
<Option :value='2'>归还入库</Option>
......@@ -56,10 +58,12 @@
placeholder="请选择入库状态"
class="mr10"
style="width: 200px"
clearable
>
<Option :value='0'>待入库</Option>
<Option :value='1'>已入库</Option>
</Select>
</div>
</Col>
<Col span="6" class="text-right">
<Button type="primary" class="mr10" @click="handleSearch('inbound')">搜索</Button>
......@@ -72,10 +76,10 @@
<Table :data="tables.inbound" :loading="loading.inbound" :columns="inboundColumns" border>
<template slot="action" slot-scope="{ 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>
<Button size="small" @click="openDetail(row)">详细</Button>
<Button size="small" type="primary" @click="openEdit(row)" v-if="canEdit(row)">修改</Button>
<Button size="small" @click="openDetail(row)" class="mr5">详细</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)">
<Button size="small" type="error">删除</Button>
</Poptip>
......@@ -151,13 +155,13 @@
<!-- 入库弹窗 -->
<Modal v-model="inboundModal.visible" :title="inboundModal.isEdit ? '修改入库' : '新增入库'" width="800">
<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" />
</FormItem>
<FormItem label="批次号">
<FormItem label="批次号" prop="batch_no">
<Input v-model="inboundModal.form.batch_no" />
</FormItem>
<FormItem label="入库日期">
<FormItem label="入库日期" prop="inbound_date">
<DatePicker
v-model="inboundModal.form.inbound_date"
type="date"
......@@ -323,7 +327,7 @@ export default {
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: [
{ type: 'index', title: '序号', width: 60, align: 'center' },
......@@ -362,6 +366,7 @@ export default {
{ title: '物料编码', key: 'material_code', align: 'center' },
{ title: '物料名称', key: 'material_name', align: 'center' },
{ title: '总量', key: 'total_quantity', align: 'center' },
{ title: '借出', key: 'borrowed_quantity', align: 'center' },
{
title: '可用',
key: 'available_quantity',
......@@ -369,9 +374,7 @@ export default {
render: (h, { row }) => {
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: [
......@@ -483,7 +486,19 @@ export default {
inboundSelectedDetails: [],
inboundModal: { visible: false, isEdit: false, saving: false, form: {}, details: [] },
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: {},
......@@ -819,6 +834,9 @@ export default {
.text-right { text-align: right; }
.page_style { margin-top: 12px; text-align: right; }
.mt8 { margin-top: 8px; }
.mr5 {
margin-right: 5px;
}
/* 搜索区域外层盒：统一间距+背景 */
.search-container {
padding: 16px;
......
src/view/key-person/key_dm_inventory/index.vue
......@@ -40,6 +40,7 @@
style="width: 200px"
/>
<br>
<div class="mt8">
<span>审批状态：</span>
<Select
v-model="filters.apply.approval_status"
......@@ -52,6 +53,7 @@
<Option :value='9'>审核通过</Option>
<Option :value='-1'>驳回</Option>
</Select>
</div>
</Col>
<!-- 右侧操作按钮区：固定居右 -->
<Col span="6" class="action-col">
......@@ -378,7 +380,7 @@ export default {
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: [
{ type: 'index', title: '序号', width: 60, align: 'center' },
......
src/view/key-person/key_dm_inventory/stats.vue
......@@ -42,8 +42,8 @@
</div>
<Table :data="tables.workload" :loading="loading.workload" :columns="workloadColumns" border>
<template slot="action" slot-scope="{ row }">
<Button size="small" class="mr10" @click="openWorkloadDetail(row,'leave')">请假明细</Button>
<Button size="small" @click="openWorkloadDetail(row,'inventory')">申领明细</Button>
<Button size="small" type="primary" class="mr10" @click="openWorkloadDetail(row,'leave')">请假明细</Button>
<Button size="small" type="primary" @click="openWorkloadDetail(row,'inventory')">申领明细</Button>
</template>
</Table>
</TabPane>
......
src/view/key-person/key_dm_user/userMultiSelector.vue
......@@ -67,7 +67,7 @@ export default {
{ type: 'selection', width: 60, align: 'center' },
{ title: '归属部门', key: 'office_name', align: 'center', minWidth: 150 },
{ 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: 'phone', align: 'center', minWidth: 120 },
{ title: '手机', key: 'mobile', align: 'center', minWidth: 120 }
......
src/view/key-person/key_dm_user/userSelector.vue
......@@ -53,13 +53,12 @@ export default {
selectedRow: null,
confirming: false,
columns: [
{ title: '归属部门', key: 'office_name', align: 'center', minWidth: 150 },
{ 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: 'phone', 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 }
{ title: '手机', key: 'mobile', align: 'center', minWidth: 120 }
]
}
},
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论