领料申请

This commit is contained in:
jjLv 2024-11-14 12:57:47 +08:00
parent 0b500b85af
commit 18628e8288
3 changed files with 760 additions and 157 deletions

View File

@ -35,83 +35,9 @@ export function getLeaseOutInfo(id) {
})
}
// 领料申请租赁单位下拉框
export function getListUnite(data) {
return request({
url: '/material/select/getUnitList',
method: 'post',
data: data,
})
}
// 领料申请租赁工程下拉框
export function getListProject(data) {
return request({
url: '/material/select/getProjectList',
method: 'post',
data: data,
})
}
// 领料申请获取协议单id
export function getAgreement(data) {
return request({
url: '/material/select/getAgreementInfoById',
method: 'post',
data: data,
})
}
// 领料出库-删除
export function applyRemove(ids) {
return request({
url: '/material/lease_apply_info/' + ids,
method: 'delete',
})
}
// 领料出库-发布
export function applySend(ids) {
return request({
url: '/material/lease_apply_info/' + ids,
method: 'delete',
})
}
//新购到货-二级列表详情
export function getPurchaseCheckInfo(query) {
return request({
url: '/material/purchase_check_info/getInfo',
method: 'get',
params: query,
})
}
// 新购到货-新增
export function addPurchaseCheckInfo(data) {
return request({
url: '/material/purchase_check_info',
method: 'post',
data: data,
})
}
// 新购到货-编辑
export function updatePurchaseCheckInfo(data) {
return request({
url: '/material/purchase_check_info',
method: 'put',
data: data,
})
}
// 新购到货--删除
export function purchaseCheckInfoRemove(ids) {
return request({
url: '/material/purchase_check_info/' + ids,
method: 'delete',
})
}

View File

@ -32,16 +32,17 @@
/>
</el-form-item>
<el-form-item label="状态" prop="typeId">
<el-form-item label="状态" prop="taskStatus">
<el-select
v-model="queryParams.typeId"
v-model="queryParams.taskStatus"
placeholder="请选择状态"
clearable
filterable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.lease_apply_status"
v-for="dict in dict.type.lease_task_status"
v-if="dict.value != 2 && dict.value != 4 && dict.value != 5"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -140,13 +141,13 @@
prop="leaseProject"
:show-overflow-tooltip="true"
/>
<el-table-column
<!-- <el-table-column
label="领料物资类型"
align="center"
prop="leaseType"
width="110px"
:show-overflow-tooltip="true"
/>
/> -->
<el-table-column
label="协议号"
align="center"
@ -187,13 +188,13 @@
<el-table-column
label="状态"
align="center"
prop="status"
prop="taskStatus"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.lease_apply_status"
:value="scope.row.status"
:options="dict.type.lease_task_status"
:value="scope.row.taskStatus"
/>
</template>
</el-table-column>
@ -219,7 +220,7 @@
style="margin-bottom: 10px"
type="primary"
@click="handleUpdate(scope.row)"
v-if="scope.row.status != '2'"
v-if="scope.row.taskStatus != 3"
v-hasPermi="['purchase:info:edit']"
>编辑
</el-button>
@ -229,7 +230,7 @@
style="margin-bottom: 10px"
type="success"
@click="handleSend(scope.row)"
v-if="scope.row.status == '0'"
v-if="scope.row.taskStatus == 1"
v-hasPermi="['purchase:person:notice']"
>发布
</el-button>
@ -244,7 +245,7 @@
size="mini"
type="danger"
@click="handleDeletePurchase(scope.row)"
v-if="scope.row.status == '0'"
v-if="scope.row.taskStatus == 1"
v-hasPermi="['purchase:info:remove']"
>删除
</el-button>
@ -573,7 +574,7 @@ import vueEasyPrint from "vue-easy-print";
export default {
name: "Home",
dicts: ["lease_apply_status", "ma_type_manage_type"],
dicts: ["lease_task_status", "ma_type_manage_type"],
// components: { vueEasyPrint },
data() {
return {
@ -671,10 +672,10 @@ export default {
//
selectable(row) {
if (row.status == "1") {
return false;
} else {
if (row.taskStatus == 1) {
return true;
} else {
return false;
}
},
getList() {
@ -686,6 +687,7 @@ export default {
typeId: this.queryParams.typeId,
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
statusList: [0, 1],
};
getListLeaseApply(this.addDateRange(params)).then((response) => {
this.typeList = response.rows;

View File

@ -1,87 +1,762 @@
<template>
<!-- 新购工机具管理 -->
<div class="app-container">
<PageHeaderApply
v-if="isShowComponent != 'Home'"
:pageContent="pageContent"
@goBack="goBack"
/>
<component
:is="isShowComponent"
:isEdit="isEdit"
:editTaskId="editTaskId"
:editId="editId"
:queryTaskId="queryTaskId"
:queryId="queryId"
:isView="isView"
:codingTaskId="codingTaskId"
@addTools="addTools"
@editTools="editTools"
@addToolsSuccess="addToolsSuccess"
@queryTools="queryTools"
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="日期">
<el-date-picker
v-model="queryParams.time"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 240px"
>
</el-date-picker>
</el-form-item>
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
placeholder="请输入关键字"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="taskStatus">
<el-select
v-model="queryParams.taskStatus"
placeholder="请选择状态"
clearable
filterable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.lease_task_status"
v-if="dict.value != 1 && dict.value != 2"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="typeList" row-key="id" border>
<el-table-column width="60" align="center" label="序号" type="index" />
<el-table-column
align="center"
width="160"
label="申请时间"
prop="createTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="申请人"
width="100"
align="center"
prop="createBy"
:show-overflow-tooltip="true"
/>
<el-table-column
label="租赁单位"
align="center"
prop="leaseUnit"
:show-overflow-tooltip="true"
/>
<el-table-column
label="租赁工程"
align="center"
prop="leaseProject"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
label="领料物资类型"
align="center"
prop="leaseType"
width="110px"
:show-overflow-tooltip="true"
/> -->
<el-table-column
label="协议号"
align="center"
prop="agreementCode"
:show-overflow-tooltip="true"
/>
<el-table-column
label="租赁申请单号"
align="center"
prop="code"
width="110px"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="申请数量"
align="center"
prop="code"
width="110px"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="已出库数量"
align="center"
prop="code"
width="110px"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="领料人"
align="center"
prop="leasePerson"
:show-overflow-tooltip="true"
/>
<el-table-column
label="领料人电话"
align="center"
prop="phone"
width="120px"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作时间"
align="center"
width="160"
prop="updateTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="状态"
align="center"
prop="taskStatus"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.lease_task_status"
:value="scope.row.taskStatus"
/>
</template>
</el-table-column>
<el-table-column
label="备注"
align="center"
width="100"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column label="操作" align="center" width="230">
<template slot-scope="scope">
<el-button
size="mini"
style="margin-bottom: 10px"
type="normal"
@click="handleView(scope.row)"
v-if="scope.row.taskStatus != 3"
>查看</el-button
>
<el-button
size="mini"
style="margin-bottom: 10px"
type="primary"
@click="handleOut(scope.row)"
v-if="scope.row.taskStatus != 5"
v-hasPermi="['purchase:info:edit']"
>出库</el-button
>
<el-button
size="mini"
type="warning"
@click="handlePrint(scope.row)"
v-if="scope.row.taskStatus == 5"
>领料单</el-button
>
<el-button
size="mini"
type="warning"
@click="handlePrint(scope.row)"
v-if="scope.row.taskStatus == 5"
>出库检验单</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 出库弹窗 -->
<el-dialog
:title="title"
:visible.sync="showOutInfo"
width="1200px"
append-to-body
>
<el-form
:model="queryOutInfo"
ref="queryFormOutInfo"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item prop="typeId">
<el-input
v-model="queryOutInfo.typeId"
placeholder="请输入规格型号"
clearable
@keyup.enter.native="handleQueryOutInfo"
maxlength="20"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQueryOutInfo"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQueryOutInfo"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table :data="getListOutInfo" width="600px" height="450">
<el-table-column
label="类型名称"
align="center"
prop="userName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="deptName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="待出库数量"
align="center"
prop="roleName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="已出库数量"
align="center"
prop="telphone"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
@click="codeOut(scope.row)"
v-if="scope.row.manageType == 0 && scope.row.status != 2"
>
编码出库
</el-button>
<el-button
size="mini"
type="primary"
v-if="scope.row.manageType == 1 && scope.row.status != 2"
@click="numOut(scope.row)"
>
数量出库
</el-button>
</template>
</el-table-column>
</el-table>
<!-- <pagination
v-show="dialogTotal > 0"
:total="dialogTotal"
:page.sync="dialogQuery.pageNum"
:limit.sync="dialogQuery.pageSize"
@pagination="getDialogList"
/> -->
</el-dialog>
<!-- 查看弹窗 -->
<el-dialog
:title="title"
:visible.sync="showOutView"
width="1200px"
append-to-body
>
<el-form
:model="queryOutView"
ref="queryFormOutInfo"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item prop="typeId">
<el-input
v-model="queryOutView.typeId"
placeholder="请输入规格型号"
clearable
@keyup.enter.native="handleQueryOutInfo"
maxlength="20"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQueryOutInfo"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQueryOutInfo"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table :data="getListOutInfo" width="600px" height="450">
<el-table-column
label="类型名称"
align="center"
prop="userName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="deptName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="待出库数量"
align="center"
prop="roleName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="已出库数量"
align="center"
prop="telphone"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
@click="codeOut(scope.row)"
v-if="scope.row.manageType == 0"
>
编码出库
</el-button>
<el-button
size="mini"
type="primary"
v-if="scope.row.manageType == 1"
@click="numOut(scope.row)"
>
数量出库
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="ViewTotal > 0"
:total="ViewTotal"
:page.sync="queryOutView.pageNum"
:limit.sync="queryOutView.pageSize"
@pagination="getListView"
/>
</el-dialog>
<!-- 验收单弹窗 -->
<el-dialog
:title="title"
:visible.sync="openPrint"
width="1100px"
append-to-body
>
<div style="height: 500px; overflow-y: scroll">
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div
class="title"
style="text-align: center; font-weight: 600; font-size: 16px"
>
机具设备到货验收单
</div>
<div
class="info"
style="margin-top: 10px; display: flex; flex-wrap: wrap"
>
<div
class="item"
style="
width: 100%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>单据编号</span>
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>生产厂家供应商</span>
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>到货日期</span>
</div>
</div>
<el-table
:data="printTableData"
class="table"
style="margin-top: 20px; width: 1000px; padding-bottom: 1px"
border
>
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" align="center" type="index" row="2" />
<el-table-column
label="物资名称"
align="center"
prop="machineTypeName"
/>
<el-table-column
label="规格型号"
align="center"
prop="specificationType"
/>
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="配送信息" align="center">
<el-table-column
label="到货数量"
align="center"
prop="purchaseNum"
/>
<el-table-column
label="验收结论"
align="center"
prop="purchaseNum"
/>
<el-table-column label="质保质量" align="center">
<el-table-column
label="实收份数"
align="center"
prop="purchaseNum"
/>
<el-table-column
label="符合要求"
align="center"
prop="purchaseNum"
/>
</el-table-column>
</el-table-column>
<el-table-column label="备注" align="center" prop="unitName" />
<!-- <el-table-column-->
<!-- label="合格证及技术资料"-->
<!-- align="center"-->
<!-- prop=""-->
<!-- />-->
<!-- <el-table-column label="包装" align="center" prop="" />-->
</el-table>
<div
class="fillIn"
style="
margin-top: 20px;
display: flex;
justify-content: space-between;
"
>
<div class="item" style="width: 33%">
<div>
<span>供应科</span>
</div>
</div>
<div class="item" style="width: 33%">
<div>
<span>生产技术科</span>
</div>
</div>
<div class="item" style="width: 33%">
<div>
<span>库管班</span>
</div>
</div>
</div>
</vue-easy-print>
</div>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="print"> </el-button>
<el-button @click="openPrint = false"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import PageHeaderApply from "@/components/pageHeaderApply";
import Home from "./component/homeOutBound.vue"; //
import AddTools from "./component/addToolsOutBound.vue"; //
import QueryTools from "./component/queryToolsOutBound.vue"; //
import {
getListLeaseApply,
getAcceptanceForm,
purchaseCheckInfoRemove,
} from "@/api/lease/apply";
export default {
components: {
Home,
PageHeaderApply,
AddTools,
QueryTools,
},
dicts: ["lease_task_status"],
// components: { vueEasyPrint },
data() {
return {
isShowComponent: "Home",
pageContent: "领料申请",
isEdit: false,
editTaskId: "",
editId: "",
queryId: "",
queryTaskId: "",
isView: false,
codingTaskId: "",
//
loading: true,
//
showOutView: false,
//
showOutInfo: false,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
ViewTotal: 0,
//
title: "",
//
getListOutInfo: [{ deptName: 1, manageType: 0 }],
//
dateRange: [],
statusDataRange: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
time: null, //
name: undefined,
typeId: "",
keyWord: "",
},
//
queryOutInfo: {
pageNum: 1,
pageSize: 10,
},
//
queryOutView: {
pageNum: 1,
pageSize: 10,
},
form: {
remark: "",
},
//
rules: {},
openPrint: false,
printData: {},
printTableData: [],
};
},
created() {
this.getList();
},
methods: {
/* 新增工机具 */
addTools() {
this.isEdit = false;
this.editTaskId = "";
this.queryTaskId = "";
this.pageContent = "领料申请";
this.isShowComponent = "AddTools";
//
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
/* 新增成功 */
addToolsSuccess() {
this.isShowComponent = "Home";
getList() {
this.loading = true;
const params = {
keyWord: this.queryParams.keyWord,
startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1],
typeId: this.queryParams.typeId,
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
statusList: [3, 4, 5],
};
getListLeaseApply(this.addDateRange(params)).then((response) => {
this.typeList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/* 编辑工机具 */
editTools(taskId, id) {
this.isEdit = true;
this.pageContent = "领料编辑";
this.editTaskId = taskId;
this.editId = id;
this.isShowComponent = "AddTools";
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/* 查询工机具 */
queryTools(taskId, id) {
this.isView = true;
this.pageContent = "详情信息";
this.queryTaskId = taskId;
this.queryId = id;
this.isShowComponent = "QueryTools";
/** 重置按钮操作 */
resetQuery() {
this.queryParams.time = [];
this.resetForm("queryForm");
this.queryParams.keyWord = "";
this.handleQuery();
},
/* 返回按钮 */
goBack() {
this.isShowComponent = "Home";
//
handleQueryOutInfo() {},
resetQueryOutInfo() {},
/** 查看按钮操作 */
handleView(row) {
this.title = "查看";
this.showOutView = true;
},
/** 出库按钮操作 */
handleOut(row) {
this.title = "出库";
this.showOutInfo = true;
},
//
codeOut(row) {
// this.title = ''
this.openCode = true;
this.resetForm("codeOutForm");
this.resetForm("outQuery");
this.outNum = row.outNum;
this.outQuery.typeId = row.typeId;
this.outObj = row;
this.handleOutQuery();
},
//
reset() {
this.form = {
taskId: "",
remark: "",
};
this.resetForm("form");
},
//
getPrintTable(taskId) {
getAcceptanceForm({ taskId: taskId }).then((response) => {
this.printData = response.data;
this.printTableData = response.data.checkDetailsList;
let supplierList = [];
this.printTableData.forEach((e) => {
if (e.supplier) {
supplierList.push(e.supplier);
}
});
supplierList = [...new Set(supplierList)];
this.supplierStr = supplierList.join(",");
});
},
//
handlePrint(row) {
// this.query.taskId = row.taskId
// this.getPrintTable(row.taskId)
this.openPrint = true;
this.title = "机具设备到货验收单";
},
//
print() {
this.$refs.remarksPrintRef.print();
},
/** 导出按钮操作 */
handleExport() {
this.download(
"/material/purchase_check_info/export",
{ ...this.queryParams },
`领料出库_${new Date().getTime()}.xlsx`
);
},
},
watch: {
$route: {
handler(to) {
if (to.query.keyWord) {
this.queryParams.keyWord = to.query.keyWord;
}
},
deep: true,
immediate: true,
},
},
};
</script>
</script>
<style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini {
width: 70px !important;
margin-bottom: 10px;
}
</style>