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

前端新购验收提交

This commit is contained in:
zzyuan 2024-10-23 18:06:13 +08:00
parent ba330e88e4
commit e6ef257459
5 changed files with 432 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/api/newBuy/goodsAccept.js
View File

@ -1,5 +1,5 @@
import request from '@/utils/request'
import { parseStrEmpty } from '@/utils/bonus'
// 查询新购验收任务列表
export function getPurchaseList(query) {
return request({
@ -12,12 +12,46 @@ export function getPurchaseList(query) {
// 查询新购验收任务详细列表
export function getPurchaseDetailsList(query) {
return request({
url: '/material/purchase_check_details/list',
url: '/material/purchase_check_info/getInfo',
method: 'get',
params: query
})
}
// 外层批量验收合格API
export function acceptancePurchase(data) {
return request({
url: '/material/purchase_check_info/acceptance',
method: 'post',
data: data
})
}
//根据任务id查询报告附件
export function getPurchaseFileList(query) {
return request({
url: '/material/purchase_check_details/fileList',
method: 'get',
params: query
})
}
// 上传报告附件 - 异步
export function uploadPurchaseFile(data) {
return request({
url: '/material/purchase_check_details/uploadFile',
method: 'post',
data: data
})
}
// 查询新购验收任务详细列表
export function getPurchaseCheckFormByTaskId(taskId) {
return request({
url: '/material/purchase_check_info/getPurchaseCheckFormByTaskId/'+taskId,
method: 'get'
})
}
@ -27,10 +61,3 @@ export function getPurchaseDetailsList(query) {

152
src/views/material/newBuy/goodsAccept/detail.vue
View File

@ -25,8 +25,8 @@
<el-date-picker
v-model="queryParams.productionTime"
placeholder="请选择出厂日期"
value-format="yyyy-MM-dd"
type="date">
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime">
</el-date-picker>
</el-form-item>
@ -68,9 +68,7 @@
<el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="teamId" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" v-if="!isView"/>
<el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope">
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="物资名称" align="center" prop="maTypeName" />
<el-table-column label="规格型号" align="center" prop="typeName" />
@ -81,7 +79,12 @@
<el-table-column label="供应商" align="center" prop="supplierName" />
<el-table-column label="出厂日期" align="center" prop="productionTime" />
<el-table-column label="相关配套资料" align="center" prop="" />
<el-table-column label="相关配套资料" align="center" prop="">
<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="checkResult" />
<el-table-column label="操作" align="center" width="180">
<template slot-scope="scope">
@ -96,13 +99,59 @@
</el-table-column>
</el-table>
<pagination
<!-- <pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
/> -->
<el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body>
<el-table v-loading="dialogLoading" :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="fileName" :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.fileUrl">
查看
</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>
@ -110,15 +159,18 @@
<script>
import { getDeviceType} from "@/api/baseGround/device";
import { getManufacturerSelect} from "@/api/baseGround/manufacturer";
import { getPurchaseDetailsList } from "@/api/newBuy/goodsAccept";
import { getPurchaseDetailsList,getPurchaseFileList,uploadPurchaseFile } from "@/api/newBuy/goodsAccept";
import { downloadFile } from '@/utils/download'
import { getToken } from '@/utils/auth'
export default {
name: "GoodsAcceptDetail",
data() {
return {
Id:'',
taskId:'',
// 遮罩层
loading: false,
dialogLoading: false,
isView: false,
// 非单个禁用
single: true,
@ -138,21 +190,35 @@
title: "",
// 是否显示弹出层
open: false,
rowData:{},
fileDataList: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
// pageNum: 1,
// pageSize: 10,
typeId:undefined,
supplierId:undefined,
productionTime:undefined,
},
//图片查看弹窗
dialogImageUrl: '',
dialogVisible: false,
//上传
upload: {
// 设置上传的请求头部
headers: { Authorization: 'Bearer ' + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + '/file/upload'
},
};
},
mounted() {
const taskId = this.$route.query && this.$route.query.taskId
const Id = this.$route.query && this.$route.query.Id
const isView = this.$route.query && this.$route.query.isView
this.taskId = taskId;
this.Id = Id;
if(isView=='true'){
this.isView=true;
}else{
@ -160,7 +226,7 @@
}
this.getDeviceType()
this.getSupplierList()
console.log(this.taskId)
console.log(this.isView)
this.getList()
},
@ -195,10 +261,11 @@
/** 查询列表 */
getList() {
this.loading = true;
this.queryParams.id=this.Id
this.queryParams.taskId=this.taskId
getPurchaseDetailsList(this.queryParams).then(response => {
this.tableList = response.rows;
this.total = response.total;
this.tableList = response.data.purchaseCheckDetailsList;
// this.total = response.total;
this.loading = false;
});
},
@ -219,6 +286,63 @@
this.single = selection.length != 1
this.multiple = !selection.length
},
//文件管理
openFileDialog(row){
this.rowData=row;
this.getFileData()
this.open=true
},
getFileData(){
let param = {
typeId:this.rowData.typeId,
taskId:this.rowData.taskId
}
this.dialogLoading=true
getPurchaseFileList(param).then((response) => {
this.fileDataList=response.data
this.dialogLoading = false;
}).catch(() => {this.dialogLoading = false;})
},
beforeFileUpload(row){
this.rowData.dictCode=row.dictCode;
this.rowData.dictLabel=row.dictLabel;
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
if(response.code==200){
let param = {
"id": this.Id,
"taskId": this.taskId,
"fileName": response.data.name,
"fileUrl": response.data.url,
"typeId": this.rowData.typeId,
"dictCode": this.rowData.dictCode,
"dictLabel": this.rowData.dictLabel,
"modelId": this.rowData.typeId,
"createBy": ""
}
console.log(param)
uploadPurchaseFile(param).then((response) => {
this.$modal.msgSuccess('上传成功')
this.getFileData()
}).catch(() => {
this.$modal.msgError('上传失败')
})
}
},
//图片查看
picturePreview(file) {
this.dialogImageUrl = file.fileUrl;
const parts = file.fileName.split('.');
const extension = parts.pop();
if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
const windowName = file.fileName;
window.open(file.fileUrl,windowName)
}else{
this.dialogVisible = true
}
},
}
};

249
src/views/material/newBuy/goodsAccept/index.vue
View File

@ -42,6 +42,7 @@
type="success" plain
size="mini"
:disabled="multiple"
@click="acceptancePurchase"
>
验收合格
</el-button>
@ -76,15 +77,17 @@
<el-table-column label="操作时间" align="center" prop="createTime" />
<el-table-column label="状态" align="center" prop="taskStatus">
<template slot-scope="scope">
<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==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>
<span v-else>/</span>
@ -93,23 +96,28 @@
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" width="180">
<el-table-column label="操作" align="center" width="250">
<template slot-scope="scope">
<el-button
size="mini"
icon="el-icon-zoom-in"
@click="handleView(scope.row)"
>
查看
</el-button>
<el-button
size="mini"
type="success"
icon="el-icon-edit"
type="primary"
@click="handleUpdate(scope.row)"
>
验收
</el-button>
<el-button
size="mini"
type="warning"
@click="handlePrint(scope.row)"
>
验收单
</el-button>
</template>
</el-table-column>
@ -123,11 +131,176 @@
@pagination="getList"
/>
<!-- 验收单弹窗 -->
<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>单据编号：{{printData.code}}</span>
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>生产厂家（供应商）：{{printData.supplierName}}</span>
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>到货日期：{{printData.arrivalDate}}</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="maTypeName"
/>
<el-table-column
label="规格型号"
align="center"
prop="typeName"
/>
<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="checkResult"
/>
<el-table-column label="质保质量" align="center">
<el-table-column
label="实收份数"
align="center"
prop="checkNum"
/>
<el-table-column
label="符合要求"
align="center"
/>
</el-table-column>
</el-table-column>
<el-table-column
label="备注"
align="center"
prop="remark"
/>
<!-- <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>供应科：{{printData.supplyDept}}</span>
</div>
</div>
<div class="item" style="width: 33%">
<div>
<span>生产技术科：{{printData.productionTechDept}}</span>
</div>
</div>
<div class="item" style="width: 33%">
<div>
<span>库管班：{{printData.warehouseTeam}}</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 { getPurchaseList } from "@/api/newBuy/goodsAccept";
import { getPurchaseList,acceptancePurchase,getPurchaseCheckFormByTaskId } from "@/api/newBuy/goodsAccept";
import { downloadFile } from '@/utils/download'
import { getToken } from '@/utils/auth'
export default {
@ -161,6 +334,9 @@
keyWord:undefined,
taskStatus:undefined,
},
openPrint: false,
printData: {},
printTableData: [],
};
},
created() {
@ -204,27 +380,64 @@
},
handleUpdate(row){
console.log(row)
let query = { taskId: row.taskId,isView:"false" }
let query = { Id:row.id,taskId: row.taskId,isView:"false" }
this.$tab.closeOpenPage({
path: '/newBuy/goodsAcceptDetail',
query,
})
},
//查看
handleView(row){
console.log(row)
let query = { taskId: row.taskId,isView:"true" }
let query = { Id:row.id,taskId: row.taskId,isView:"true" }
this.$tab.closeOpenPage({
path: '/newBuy/goodsAcceptDetail',
query,
})
},
//批量合格
acceptancePurchase(){
acceptancePurchase(this.ids).then((response) => {
this.$modal.msgSuccess('操作成功')
this.getList()
}).catch(() => {
this.$modal.msgError('操作失败')
})
},
//查看验收单
handlePrint(row) {
// this.query.taskId = row.taskId
this.getPrintTable(row.taskId)
this.openPrint = true
this.title = '新购工机具验收单'
},
//获取验收单数据
getPrintTable(taskId) {
getPurchaseCheckFormByTaskId(taskId).then((response) => {
this.printData = response.data
this.printTableData = response.data.materialList
// let supplierList = []
// this.printTableData.forEach((e) => {
// if (e.supplier) {
// supplierList.push(e.supplier)
// }
// })
// supplierList = [...new Set(supplierList)]
// this.supplierStr = supplierList.join(',')
})
},
//打印
print() {
this.$refs.remarksPrintRef.print()
},
handleExport() {
// this.download('/material/ma_machine/export', {
// ...this.queryParams
// }, `仓库管理_${new Date().getTime()}.xlsx`)
},
}
};

27
src/views/material/newBuy/goodsEntry/detail.vue
View File

@ -25,8 +25,8 @@
<el-date-picker
v-model="queryParams.productionTime"
placeholder="请选择出厂日期"
value-format="yyyy-MM-dd"
type="date">
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime">
</el-date-picker>
</el-form-item>
@ -68,9 +68,7 @@
<el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="teamId" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" v-if="!isView"/>
<el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope">
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="物资名称" align="center" prop="maTypeName" />
<el-table-column label="规格型号" align="center" prop="typeName" />
@ -95,13 +93,13 @@
</el-table-column>
</el-table>
<pagination
<!-- <pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
/> -->
</div>
</template>
@ -116,6 +114,8 @@ export default {
name: "GoodsAcceptDetail",
data() {
return {
Id:'',
taskId:'',
// 遮罩层
loading: false,
isView: false,
@ -137,10 +137,11 @@ export default {
title: "",
// 是否显示弹出层
open: false,
rowData:{},
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
// pageNum: 1,
// pageSize: 10,
typeId:undefined,
supplierId:undefined,
productionTime:undefined,
@ -150,8 +151,10 @@ export default {
mounted() {
const taskId = this.$route.query && this.$route.query.taskId
const Id = this.$route.query && this.$route.query.Id
const isView = this.$route.query && this.$route.query.isView
this.taskId = taskId;
this.Id = Id;
if(isView=='true'){
this.isView=true;
}else{
@ -159,7 +162,6 @@ export default {
}
this.getDeviceType()
this.getSupplierList()
console.log(this.taskId)
console.log(this.isView)
this.getList()
},
@ -194,10 +196,11 @@ export default {
/** 查询列表 */
getList() {
this.loading = true;
this.queryParams.id=this.Id
this.queryParams.taskId=this.taskId
getPurchaseDetailsList(this.queryParams).then(response => {
this.tableList = response.rows;
this.total = response.total;
this.tableList = response.data.purchaseCheckDetailsList;
// this.total = response.total;
this.loading = false;
});
},

22
src/views/material/newBuy/goodsEntry/index.vue
View File

@ -85,15 +85,17 @@
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="状态" align="center" prop="taskStatus">
<template slot-scope="scope">
<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==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>
<span v-else>/</span>
</template>
</el-table-column>
@ -207,7 +209,7 @@ export default {
handleView(row){
console.log(row)
let query = { taskId: row.taskId,isView:"true" }
let query = { Id:row.id,taskId: row.taskId,isView:"true" }
this.$tab.closeOpenPage({
path: '/newBuy/goodsEntryDetail',
query,