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

新购入库

This commit is contained in:
zzyuan 2024-11-16 15:25:23 +08:00
parent 5832a7f9ca
commit 2e009ddc19
5 changed files with 83 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/api/purchase/goodsEntry.js
View File

@ -0,0 +1,20 @@
import request from '@/utils/request'
import { parseStrEmpty } from '@/utils/bonus'
// // 外层批量验收合格API
// export function acceptOuterVerify(data) {
// return request({
// url: '/material/purchase_check_info/outerVerify',
// method: 'put',
// data: data
// })
// }
// 内层批量验收合格API
export function purchaseWarehouse(data) {
return request({
url: '/material/purchase/storage/warehouse',
method: 'post',
data: data
})
}

6
src/views/material/back/component/addReturn.vue
View File

@ -472,16 +472,14 @@ export default {
{
required: true,
message: '请选择退料单位',
trigger: 'blur',
type: 'number',
trigger: 'change',
},
],
proId: [
{
required: true,
message: '请选择退料工程',
trigger: 'blur',
type: 'number',
trigger: 'change',
},
],
backPerson: [

27
src/views/material/back/component/dialogFormByCq.vue
View File

@ -32,7 +32,7 @@
<el-table-column label="编号" align="center" type="index" />
<el-table-column label="物资类型"
align="center"
prop=""
prop="materialType"
:show-overflow-tooltip="true"
/>
<el-table-column
@ -99,9 +99,27 @@
<div class="remarks_box">
<div class="remarks_box_title">退料编码明细</div>
</div>
<div class="order_box">
<div class="order_box_one">
<div>
<span>工程名称：</span><span>{{ rowObj.proName }}</span>
</div>
<div>
<span>退料时间：</span><span>{{ rowObj.createTime }}</span>
</div>
</div>
<div class="order_box_one">
<div>
<span>退料单位：</span><span>{{ rowObj.unitName }}</span>
</div>
<div>
<span>单号：</span><span>{{ rowObj.code }}</span>
</div>
</div>
</div>
<el-table :data="tableSubData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
<el-table-column label="序号" align="center" type="index" />
<el-table-column prop="" label="物资类型" align="center">
<el-table-column prop="materialType" label="物资类型" align="center">
</el-table-column>
<el-table-column prop="materialName" label="物资名称" align="center">
</el-table-column>
@ -110,6 +128,11 @@
<el-table-column prop="maCode" label="设备编号" align="center">
</el-table-column>
</el-table>
<div class="order_footer">
<div>审核人：</div>
<div>退料人：</div>
<div>操作人：</div>
</div>
</vue-easy-print>
</div>
<div style="margin-top: 10px">

17
src/views/material/back/component/home.vue
View File

@ -122,22 +122,17 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain size="mini" @click="handleAdd"
>退料接收</el-button
>
<el-button type="primary" icon="el-icon-plus" plain size="mini" @click="handleAdd">退料接收</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
type="success"
plain icon="el-icon-refresh"
size="mini"
>提交</el-button
>
>提交</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
@ -286,7 +281,7 @@
size="mini"
type="success"
plain
icon="el-icon-edit"
icon="el-icon-refresh"
v-if="scope.row.taskStatus!=2"
@click="handleSubmit(scope.row)"
>提交</el-button
@ -302,7 +297,7 @@
>
<el-button
size="mini"
type="info"
type="info" icon="el-icon-zoom-in"
@click="handlePrint(scope.row)"
>退料单</el-button
>

35
src/views/material/purchase/goodsEntry/detail.vue
View File

@ -48,7 +48,7 @@
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="success"
icon="el-icon-check" v-show="!isView"
@ -62,7 +62,7 @@
icon="el-icon-close" v-show="!isView"
size="mini" :disabled="multiple"
>驳回</el-button>
</el-col>
</el-col> -->
</el-row>
<el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="teamId" @selection-change="handleSelectionChange">
@ -87,12 +87,12 @@
<el-table-column label="验收结论" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button size="mini" type="success">
入库
</el-button>
<el-button size="mini" type="danger">
驳回
<el-button size="mini" type="success" @click="pass(scope.row)">
入库
</el-button>
<!-- <el-button size="mini" type="danger" @click="reject(scope.row)">
驳回
</el-button> -->
</template>
</el-table-column>
</el-table>
@ -158,6 +158,7 @@
import { getDeviceType} from "@/api/ma/device";
import { getManufacturerSelect} from "@/api/ma/supplier";
import { getPurchaseDetailsList,getPurchaseFileList,uploadPurchaseFile } from "@/api/purchase/goodsAccept";
import { purchaseWarehouse } from "@/api/purchase/goodsEntry";
import { downloadFile } from '@/utils/download'
import { getToken } from '@/utils/auth'
export default {
@ -295,6 +296,26 @@ export default {
this.single = selection.length != 1
this.multiple = !selection.length
},
//入库
pass(row) {
let obj = {
// taskId: this.taskId,
purchaseId: row.id
};
console.log(obj)
purchaseWarehouse(obj).then((res)=>{
console.log(res)
if(res.code==200){
this.$modal.msgSuccess('操作成功')
this.getList()
}
})
},
//不合格
reject(row) {
},
//文件管理
openFileDialog(row){
this.rowData=row;