bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领料申请

This commit is contained in:
jjLv 2024-11-11 16:16:55 +08:00
parent 9f7c29a2d9
commit 56dc6791fc
4 changed files with 166 additions and 545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/api/lease/apply.js Normal file
View File

@ -0,0 +1,66 @@
import request from '@/utils/request'
//领料申请-列表
export function getListLeaseApply(query) {
return request({
url: '/material/lease_apply_info/list',
method: 'get',
params: query,
})
}
//新购到货-二级列表详情
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',
})
}
// 上传报告附件
export function uploadPurchaseFile(data) {
return request({
url: '/material/bm_file_info',
method: 'post',
data: data
})
}
// // 状态信息下拉框-
// export function queryStatusDataApi(query) {
// return request({
// url: '/system/lease_apply_status/listNoPage',
// method: 'get',
// params: query
// })
// }

249
src/views/material/lease/apply/component/addToolsApply.vue
View File

@ -9,20 +9,10 @@
:inline="true"
label-width="120px"
>
<el-form-item label="到货日期" prop="arrivalTime">
<el-date-picker
v-model="maForm.arrivalTime"
style="width: 240px"
value-format="yyyy-MM-dd hh:mm:ss"
:picker-options="pickerOptions"
type="date"
placeholder="请选择到货日期"
></el-date-picker>
</el-form-item>
<el-form-item label="物资厂家" prop="supplierId">
<el-form-item label="租赁单位" prop="arrivalTime">
<el-select
v-model="maForm.supplierId"
placeholder="物资厂家"
placeholder="租赁单位"
clearable
filterable
style="width: 240px"
@ -35,28 +25,44 @@
/>
</el-select>
</el-form-item>
<el-form-item label="出厂日期" prop="productionTime">
<el-date-picker
v-model="maForm.productionTime"
<el-form-item label="租赁工程" prop="supplierId">
<el-select
v-model="maForm.supplierId"
placeholder="租赁工程"
clearable
filterable
style="width: 240px"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
type="date"
placeholder="请选择出厂日期"
@change="productionTimeChange"
></el-date-picker>
>
<el-option
v-for="item in supplierList"
:key="item.supplierId"
:label="item.supplier"
:value="item.supplierId"
/>
</el-select>
</el-form-item>
<el-form-item label="税率" prop="taxRate">
<el-form-item label="领料人" prop="taxRate">
<el-input
v-model="maForm.taxRate"
placeholder="请输入税率"
placeholder="请输入领料人"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
@input="taxRateChange"
/>
</el-form-item>
<el-form-item label="联系电话" prop="taxRate">
<el-input
v-model="maForm.taxRate"
placeholder="请输入联系电话"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
@input="taxRateChange"
/>
<span>%</span>
</el-form-item>
<el-form-item label="类型规格" prop="deviceType">
@ -75,18 +81,6 @@
@change="deviceTypeChange"
></el-cascader>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="maForm.remark"
placeholder="请输入备注"
clearable
maxlength="150"
type="textarea"
style="width: 240px"
rows="1"
/>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -113,7 +107,7 @@
<el-table-column align="center" label="序号" type="index" width="55" />
<el-table-column
align="center"
label="物资名称"
label="类型名称"
prop="maTypeName"
show-overflow-tooltip
></el-table-column>
@ -123,8 +117,9 @@
prop="typeName"
show-overflow-tooltip
/>
<el-table-column align="center" label="单位" prop="unitName" />
<el-table-column label="采购数量" prop="purchaseNum" align="center">
<el-table-column align="center" label="计量单位" prop="unitName" />
<el-table-column align="center" label="当前库存" prop="unitName" />
<el-table-column label="预领数量" prop="purchaseNum" align="center">
<template v-slot="scope">
<el-input-number
v-model="scope.row.purchaseNum"
@ -134,11 +129,9 @@
></el-input-number>
</template>
</el-table-column>
<el-table-column
label="购置单价(元含税)"
prop="purchaseTaxPrice"
align="center"
>
<el-table-column align="center" label="出货数量" prop="unitName" />
<el-table-column label="备注" prop="purchaseTaxPrice" align="center">
<template v-slot="scope">
<el-input-number
v-model="scope.row.purchaseTaxPrice"
@ -149,88 +142,7 @@
></el-input-number>
</template>
</el-table-column>
<el-table-column
label="购置单价(元不含税)"
prop="purchasePrice"
align="center"
>
<template slot-scope="scope">
<el-input-number
v-model="scope.row.purchasePrice"
controls-position="right"
style="width: 100%"
:min="0"
@input="purchasePriceChange(scope.row, scope.$index)"
></el-input-number>
</template>
</el-table-column>
<el-table-column
label="是否为固定资产"
prop="fixCode"
align="center"
width="200"
>
<template slot-scope="scope">
<el-select
v-model="scope.row.fixCode"
placeholder="固定资产"
filterable
clearable
>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
label="出厂日期"
align="center"
prop="productionTime"
width="200"
>
<template slot-scope="scope">
<el-date-picker
v-model="scope.row.productionTime"
style="width: 100%"
value-format="yyyy-MM-dd"
type="date"
placeholder="出厂日期"
clearable
></el-date-picker>
</template>
</el-table-column>
<el-table-column label="相关配套资料" align="center" prop="bmFileInfos">
<template slot-scope="scope">
<div
style="color: rgb(2, 167, 240); cursor: pointer"
@click="openFileDialog(scope.row)"
>
报告管理
</div>
</template>
</el-table-column>
<el-table-column
label="状态"
align="center"
prop="status"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.purchase_task_status"
:value="scope.row.status"
/>
</template>
</el-table-column>
<!-- <el-table-column
align="center"
label="验收结论"
prop="checkResult"
show-overflow-tooltip
></el-table-column> -->
<el-table-column label="操作" align="center">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@ -244,93 +156,6 @@
</template>
</el-table-column>
</el-table>
<el-dialog
title="报告管理"
:visible.sync="open"
width="900px"
append-to-body
>
<el-table :data="fileDataList" width="100%" height="350px">
<el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column
label="报告类型"
align="center"
prop="dictLabel"
:show-overflow-tooltip="true"
/>
<el-table-column
label="文件名称"
align="center"
prop="name"
:show-overflow-tooltip="true"
/>
<el-table-column
label="类型名称"
align="center"
:show-overflow-tooltip="true"
>
<template>
<div>{{ this.rowData.maTypeName }}</div>
</template>
</el-table-column>
<el-table-column
label="规格型号"
align="center"
:show-overflow-tooltip="true"
>
<template>
<div>{{ this.rowData.typeName }}</div>
</template>
</el-table-column>
<!-- <el-table-column label="报告日期" align="center" prop="orgName" :show-overflow-tooltip="true"/>
<el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> -->
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<div
style="
display: flex;
align-items: center;
justify-content: space-between;
"
>
<el-upload
ref="upload"
:limit="1"
:headers="upload.headers"
:action="upload.url"
:show-file-list="false"
accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
:on-success="handleFileSuccess"
:auto-upload="true"
>
<el-button
size="mini"
type="text"
@click="beforeFileUpload(scope.row)"
>
上传
</el-button>
</el-upload>
<el-button
size="mini"
type="text"
@click="picturePreview(scope.row)"
v-if="scope.row.url"
>
查看
</el-button>
</div>
</template>
</el-table-column>
</el-table>
</el-dialog>
<!-- 图片查看弹窗 -->
<el-dialog :visible.sync="dialogVisible" width="500px" height="500px">
<img width="100%" height="500px" :src="dialogImageUrl" />
</el-dialog>
</div>
</template>

390
src/views/material/lease/apply/component/homeApply.vue
View File

@ -21,23 +21,6 @@
</el-date-picker>
</el-form-item>
<el-form-item label="设备状态" prop="typeId">
<el-select
v-model="queryParams.typeId"
placeholder="请选择设备状态"
clearable
filterable
style="width: 240px"
>
<el-option
v-for="typeItem in typesList"
:key="typeItem.typeId"
:label="typeItem.typeName"
:value="typeItem.typeId"
/>
</el-select>
</el-form-item>
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -49,6 +32,23 @@
/>
</el-form-item>
<el-form-item label="状态" prop="typeId">
<el-select
v-model="queryParams.typeId"
placeholder="请选择状态"
clearable
filterable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.lease_apply_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@ -134,7 +134,7 @@
label="领料物资类型"
align="center"
prop="purchaseTaxPrice"
width="120px"
width="110px"
:show-overflow-tooltip="true"
/>
<el-table-column
@ -147,7 +147,7 @@
label="租赁申请单号"
align="center"
prop="taxRate"
width="120px"
width="110px"
:show-overflow-tooltip="true"
>
</el-table-column>
@ -177,28 +177,15 @@
<el-table-column
label="状态"
align="center"
prop="taskStatus"
prop="status"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.purchase_task_status"
:value="scope.row.taskStatus"
:value="scope.row.status"
/>
</template>
<!-- <template slot-scope="scope">
<span v-if="scope.row.taskStatus==0">待提交</span>
<span v-if="scope.row.taskStatus==1">待通知</span>
<span v-if="scope.row.taskStatus==2">待验收</span>
<span v-if="scope.row.taskStatus==3">待绑定</span>
<span v-if="scope.row.taskStatus==4">待入库</span>
<span v-if="scope.row.taskStatus==5">已完成</span>
<span v-if="scope.row.taskStatus==6">驳回待验收</span>
<span v-if="scope.row.taskStatus==7">驳回待绑定</span>
<span v-if="scope.row.taskStatus==8">驳回待入库</span>
<span v-if="scope.row.taskStatus==9">入库进行中</span>
<span v-if="scope.row.taskStatus==10">未完成</span>
</template> -->
</el-table-column>
<el-table-column
label="备注"
@ -208,14 +195,13 @@
:show-overflow-tooltip="true"
/>
<el-table-column label="操作" align="center" width="250">
<el-table-column label="操作" align="center" width="300">
<template slot-scope="scope">
<el-button
size="mini"
style="margin-bottom: 10px"
type="normal"
@click="handleView(scope.row)"
v-if="scope.row.taskStatus != 24"
>查看</el-button
>
<el-button
@ -223,6 +209,7 @@
style="margin-bottom: 10px"
type="primary"
@click="handleUpdate(scope.row)"
v-if="scope.row.status != '2'"
v-hasPermi="['purchase:info:edit']"
>编辑</el-button
>
@ -232,17 +219,30 @@
style="margin-bottom: 10px"
type="success"
@click="handleNotice(scope.row)"
v-if="scope.row.status == '0'"
v-hasPermi="['purchase:person:notice']"
>通知</el-button
>发布</el-button
>
<el-button size="mini" type="warning" @click="handlePrint(scope.row)"
>验收单</el-button
<el-button
size="mini"
type="warning"
@click="handlePrint(scope.row)"
v-if="scope.row.status == '2'"
>领料单</el-button
>
<el-button
size="mini"
type="warning"
@click="handlePrint(scope.row)"
v-if="scope.row.status == '2'"
>出库检验单</el-button
>
<el-button
size="mini"
type="danger"
@click="handleDeletePurchase(scope.row)"
v-if="scope.row.status == '0'"
v-hasPermi="['purchase:info:remove']"
>删除</el-button
>
@ -399,196 +399,21 @@
<el-button @click="openPrint = false">关 闭</el-button>
</div>
</el-dialog>
<!-- 通知弹窗 -->
<el-dialog
:title="title"
:visible.sync="showPeople"
width="800px"
append-to-body
@close="cancel"
>
<el-row :gutter="24">
<el-col :span="20">
<el-form
:model="form"
ref="form"
size="small"
:inline="true"
:rules="rules"
>
<el-form-item label="通知内容:" prop="remark" label-width="100px">
<el-input
v-model="form.remark"
type="textarea"
maxlength="100"
:autosize="{ minRows: 3, maxRows: 6 }"
placeholder="请输入通知内容"
style="width: 450px"
/>
</el-form-item>
</el-form>
</el-col>
</el-row>
<el-table
:data="getListPeople"
width="600px"
height="450"
@selection-change="handleSelectionUser"
>
<el-table-column
type="selection"
width="55"
align="center"
:reserve-selection="true"
/>
<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"
type="danger"
@click="handleDeletePeople(scope.row)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="addUserOpen">人员添加</el-button>
<el-button type="primary" @click="configNotice">发起验收</el-button>
</div>
</el-dialog>
<!-- 人员添加 -->
<el-dialog
title="人员添加"
:visible.sync="peopleOpen"
v-if="peopleOpen"
width="1000px"
append-to-body
>
<el-table
v-loading="loading"
:data="userList"
@selection-change="handleSelectionAddUser"
height="450"
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column
label="人员账号"
align="center"
key="userName"
prop="userName"
width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
label="人员名称"
align="center"
key="nickName"
prop="nickName"
width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
label="所属机构"
align="center"
key="deptName"
prop="deptName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="角色"
align="center"
key="roleName"
prop="roleName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="联系电话"
align="center"
key="telphone"
prop="telphone"
/>
<!-- <el-table-column
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="addUser(scope.row)"
>添加</el-button>
</template>
</el-table-column>-->
</el-table>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="addUser">添加</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
getListNewBuy,
getListLeaseApply,
getPurchaseCheckInfo,
getAcceptanceForm,
purchaseCheckInfoRemove,
getNoticePeople,
getListUnSelected,
addNoticeUser,
bmNoticeInfo,
delPeople,
} from "@/api/purchase/goodsArrived";
// import {
// getRepairedList,
// getRepairedDetailList,
// inputByType,
// getTypeList,
// } from '@/api/store/warehousing'
// import vueEasyPrint from 'vue-easy-print'
// import { getLeaseAuditListAll } from '@/api/claimAndRefund/receive'
queryStatusDataApi,
} from "@/api/lease/apply";
export default {
name: "Home",
dicts: ["purchase_task_status"],
dicts: ["lease_apply_status"],
// components: { vueEasyPrint },
data() {
return {
@ -624,6 +449,7 @@ export default {
title: "",
// 日期范围
dateRange: [],
statusDataRange: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -650,6 +476,7 @@ export default {
};
},
created() {
// this.getStatusList();
this.getList();
// this.getTypeList()
},
@ -663,6 +490,20 @@ export default {
// })
// },
// /** 查询状态类型 */
// getStatusList(data) {
// let statusdataRes = queryStatusDataApi({
// // typeId:data.keeperData
// });
// this.statusDataRange = statusdataRes.data.map((item) => {
// return {
// label: item.dictLabel,
// value: item.dictValue,
// };
// });
// this.queryForm.statusDataRange = this.statusDataRange.value;
// },
getList() {
this.loading = true;
const params = {
@ -673,7 +514,7 @@ export default {
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
};
getListNewBuy(this.addDateRange(params)).then((response) => {
getListLeaseApply(this.addDateRange(params)).then((response) => {
this.typeList = response.rows;
this.total = response.total;
this.loading = false;
@ -713,117 +554,6 @@ export default {
return year + "-" + month + "-" + day;
},
handleNotice(row) {
this.reset();
this.form.taskId = row.taskId;
this.$set(
this.form,
"remark",
"各位同事您好，请于" +
this.getNowTime() +
"在宏源工业园，进行机具验收。"
);
this.getNoticeList();
this.showPeople = true;
},
getNoticeList() {
const taskId = this.form.taskId;
getNoticePeople({ taskId: taskId }).then((response) => {
this.getListPeople = response.rows;
this.showPeople = true;
this.loadingTwo = false;
this.title = "通知";
});
},
addUserOpen() {
this.getAllUserList();
this.peopleOpen = true;
},
/** 查询所有用户列表--可添加人员 */
getAllUserList() {
getListUnSelected().then((response) => {
this.userList = response.rows;
});
},
// 多选框选中-添加人员
handleSelectionAddUser(selection) {
// console.log(selection)
this.chosenUserList = selection;
},
//添加人员
addUser() {
if (this.chosenUserList.length < 1) {
this.$message.error("请选择人员！");
return;
}
// console.log(this.chosenUserList,"chosenUserList")
addNoticeUser(this.chosenUserList).then((response) => {
if (response.code == 200) {
this.getNoticeList();
this.peopleOpen = false;
}
});
},
handleDeletePeople(row) {
const ids = row.id;
this.$modal
.confirm("是否删除所选择的通知人员？")
.then(function () {
return delPeople(ids);
})
.then(() => {
this.getNoticeList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
},
// 多选框选中-通知人员
handleSelectionUser(selection) {
// console.log(selection)
this.configUserList = selection;
},
//确认消息通知
configNotice() {
this.$refs["form"].validate((valid) => {
if (valid) {
this.configUserList.forEach((item, index) => {
console.log(item);
// item.telphone = item.telphone
// item.remark = this.form.remark
this.phoneNumbers.push(item.telphone);
});
let param = {
taskId: this.form.taskId,
phoneNumbers: this.phoneNumbers,
content: this.form.remark,
};
if (this.configUserList.length > 0) {
bmNoticeInfo(param).then((response) => {
console.log(response);
if (response.code == 200) {
this.$message({
message: "操作成功",
type: "success",
});
this.noticeOpen = false;
this.getTaskInfo();
}
});
} else {
this.$message({
message: "请选择通知人员！",
type: "error",
});
}
}
});
},
// 人员取消按钮
cancel() {
this.showPeople = false;
this.reset();
},
// 表单重置
reset() {
this.form = {

6
src/views/material/lease/apply/index.vue
View File

@ -38,7 +38,7 @@ export default {
data() {
return {
isShowComponent: "Home",
pageContent: "新增机具",
pageContent: "领料申请",
isEdit: false,
editTaskId: "",
editId: "",
@ -55,7 +55,7 @@ export default {
this.isEdit = false;
this.editTaskId = "";
this.queryTaskId = "";
this.pageContent = "新增机具";
this.pageContent = "领料申请";
this.isShowComponent = "AddTools";
},
/* 新增成功 */
@ -65,7 +65,7 @@ export default {
/* 编辑工机具 */
editTools(taskId, id) {
this.isEdit = true;
this.pageContent = "编辑机具";
this.pageContent = "领料编辑";
this.editTaskId = taskId;
this.editId = id;
this.isShowComponent = "AddTools";