Browse Source

首次提交

LIrui
ruanqi 2 years ago
parent
commit
3ece884906
  1. 1
      src/api/base/normalSearch.js
  2. 4
      src/api/material/poReceive.js
  3. 581
      src/views/modules/material/com_poReceiving_add_or_update.vue
  4. 62
      src/views/modules/material/poReceiving.vue

1
src/api/base/normalSearch.js

@ -0,0 +1 @@
import { createAPI } from "@/utils/httpRequest.js";

4
src/api/material/poReceive.js

@ -9,3 +9,7 @@ export const searchTransDetailSub = data => createAPI(`/poReceive/searchTransDet
export const getWareHouseList = data => createAPI(`/poReceive/getWareHouseList`,'post',data)
export const saveTransHeaderData= data => createAPI(`/poReceive/saveTransHeaderData`,'post',data)
export const searchTransDetailAndSubCach= data => createAPI(`/poReceive/searchTransDetailAndSubCach`,'post',data)
export const createNewCachRoll= data => createAPI(`/poReceive/createNewCachRoll`,'post',data)
export const finalSaveTransHeaderDetail= data => createAPI(`/poReceive/finalSaveTransHeaderDetail`,'post',data)

581
src/views/modules/material/com_poReceiving_add_or_update.vue

@ -0,0 +1,581 @@
<template>
<div class="mod-config">
<el-dialog
width="40%"
title="入库单明细"
:close-on-click-modal="false"
:visible.sync="visible"
@close="closeSaveDialog">
<el-form ref="saveForm" :model="dataForm" label-position="top" label-width="100px" >
<el-row :gutter="25">
<el-col :span="6">
<el-form-item label="入库单号">
<el-input v-model="dataForm.transNo" disabled ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商编码">
<el-input v-model="dataForm.partnerID" disabled ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商名称">
<el-input v-model="dataForm.partnerName" disabled ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" ">
<el-button type="primary" @click="visible = false">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="25">
<el-col :span="6">
<el-form-item label="仓库">
<el-input v-model="dataForm.warehouseID" disabled ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="入库日期">
<el-date-picker
style="width: 120px"
v-model="dataForm.transDate"
type="date"
disabled
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="经手人">
<el-input v-model="dataForm.receiveName" disabled ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="采购单号">
<el-input v-model="dataForm.orderRef1" disabled ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="25">
<el-col :span="6">
<el-form-item label="物料编码">
<el-input v-model="dataForm.partNo" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物料描述">
<el-input v-model="dataForm.partDesc" disabled ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="库位">
<el-input v-model="dataForm.locationId" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" ">
<el-button type="primary" @click="dataFormSubmit()">{{'扫描条码入库'}}</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="25">
<el-col :span="6">
<el-form-item label="批号">
<el-input v-model="dataForm.batchNo" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="W/D/R">
<el-input v-model="dataForm.wdrNo" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产日期">
<el-date-picker
style="width: 120px"
v-model="dataForm.manufactureDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="失效日期">
<el-date-picker
style="width: 120px"
v-model="dataForm.expiredDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="25">
<el-col :span="6">
<el-form-item label="每卷数量">
<el-input v-model="rollData.perQty" type="number" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="卷数">
<el-input v-model="rollData.rollNumber" type="number" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" ">
<el-button type="primary" @click="createNewRoll()">{{'创建分卷'}}</el-button>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" ">
<el-button type="primary" @click="dataFormSubmit()">{{'最终保存'}}</el-button>
<el-button type="primary" @click="visible = false">{{'关闭'}}</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table
:data="dataList"
height="300"
border
v-loading="false"
style="width: 100%; ">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
<script>
import {
searchTransDetailAndSubCach
,createNewCachRoll
,finalSaveTransHeaderDetail
} from "@/api/material/poReceive.js"
import Chooselist from '@/views/modules/common/Chooselist'
import {searchTransDetail} from "../../../api/material/poReceive";
export default {
model:{
prop:'value',
event:'change',
},
props:{
value:{
required:true,
type:String,
}
},
components: {
Chooselist
},
data () {
return {
tagNo:'',
tagNo1:'',
visible: false,
dataForm: {
site:this.$store.state.user.site,
warehouseID:'',
transNo:'',
partnerID:'',
partnerName:'',
transDate:'',
receiveName:'',
orderRef1:'',
partNo:'',
partDesc:'',
locationId:'',
batchNo:'',
wdrNo:'',
manufactureDate:'',
expiredDate:'',
},
rollData:{
perQty:'',
rollNumber:'',
},
dataList:[],
columnList:[
{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table4PartNo',
tableId: "200001Table4",
tableName: "入库单已扫卷",
columnProp: "partNo",
headerAlign: "center",
align: "left",
columnLabel: "物料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table4PartDesc',
tableId: "200001Table4",
tableName: "入库单已扫卷",
columnProp: "partDesc",
headerAlign: "center",
align: "left",
columnLabel: "物料名",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table4RollNo',
tableId: "200001Table4",
tableName: "入库单已扫卷",
columnProp: "rollNo",
headerAlign: "center",
align: "right",
columnLabel: "卷号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table4RollQty',
tableId: "200001Table4",
tableName: "入库单已扫卷",
columnProp: "rollQty",
headerAlign: "center",
align: "left",
columnLabel: "数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table4BatchNo',
tableId: "200001Table4",
tableName: "入库单已扫卷",
columnProp: "batchNo",
headerAlign: "center",
align: "left",
columnLabel: "批号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table4WdrNo',
tableId: "200001Table4",
tableName: "入库单已扫卷",
columnProp: "wdrNo",
headerAlign: "center",
align: "left",
columnLabel: "W/D/R",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table4ManufactureDate',
tableId: "200001Table4",
tableName: "入库单已扫卷",
columnProp: "manufactureDate",
headerAlign: "center",
align: "center",
columnLabel: "生产日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table4ExpiredDate',
tableId: "200001Table4",
tableName: "入库单已扫卷",
columnProp: "expiredDate",
headerAlign: "center",
align: "center",
columnLabel: "失效日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table4LocationID',
tableId: "200001Table4",
tableName: "入库单已扫卷",
columnProp: "locationID",
headerAlign: "center",
align: "center",
columnLabel: "库位",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 70
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table4EnterByName',
tableId: "200001Table4",
tableName: "入库单已扫卷",
columnProp: "enterByName",
headerAlign: "center",
align: "left",
columnLabel: "Created",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table4EnterDate',
tableId: "200001Table4",
tableName: "入库单已扫卷",
columnProp: "enterDate",
headerAlign: "center",
align: "left",
columnLabel: "Created Time",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130
},
],
}
},
created () {
},
methods: {
// S
getBaseList (val, type) {
this.tagNo = val
this.tagNo1 = type
this.$nextTick(() => {
let strVal = ''
// if (val === 1010) {
// if(type==1) {
// strVal = this.dataForm.projectTypeDb
// }
// }
this.$refs.baseList.init(val, strVal)
})
},
/* 列表方法的回调 */
getBaseData (val) {
if (this.tagNo === 1010) {
// if(this.tagNo1==1) {
// this.dataForm.projectTypeDb = val.Base_id
// this.dataForm.projectType = val.Base_desc
// }
}
},
init (row) {
this.rollData={
perQty:'',
rollNumber:'',
}
this.cleanData()
searchTransDetailAndSubCach(row).then(({data})=>{
//
if (data && data.code == 0) {
let row= data.row
this.dataList = data.rows
this.dataForm={
site:row.site,
warehouseID:row.warehouseID,
transNo:row.transNo,
partnerID:row.partnerID,
partnerName:row.partnerName,
transDate:row.transDate,
receiveName:row.receiverName,
orderRef1:row.orderRef1,
partNo:'',
partDesc:'',
locationId:'',
batchNo:'',
wdrNo:'',
manufactureDate:'',
expiredDate:'',
}
} else {
this.$message.error(data.msg)
}
})
this.visible = true
},
createNewRoll(){
if(this.dataForm.partNo===''){
this.$alert('请输入物料!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.dataForm.locationId===''){
this.$alert('请选择库位!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.dataForm.batchNo===''){
this.$alert('请输入批号!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.dataForm.manufactureDate===''){
this.$alert('请选择生产日期!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.dataForm.expiredDate===''){
this.$alert('请选择失效日期!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.rollData.perQty===''){
this.$alert('请输入每卷数量!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.rollData.rollNumber===''){
this.$alert('请输入卷数量!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.rollData.rollNumber>10000){
this.$alert('卷数量超过一万!', '错误', {
confirmButtonText: '确定'
})
return false
}
let inData={
site:this.dataForm.site,
transNo:this.dataForm.transNo,
partNo:this.dataForm.partNo,
rollNo:'',
rollQty:this.rollData.perQty,
batchNo:this.dataForm.batchNo,
wdrNo:this.dataForm.wdrNo,
locationID:this.dataForm.locationId,
manufactureDate:this.dataForm.manufactureDate,
expiredDate:this.dataForm.expiredDate,
rollNumber:this.rollData.rollNumber,
}
createNewCachRoll(inData).then(({data})=>{
//
if (data && data.code == 0) {
this.$message.success( '操作成功')
searchTransDetailAndSubCach(this.dataForm).then(({data})=>{
this.dataList = data.rows
})
} else {
this.$message.error(data.msg)
}
})
},
//
dataFormSubmit () {
finalSaveTransHeaderDetail(this.dataForm).then(({data})=>{
//
if (data && data.code == 0) {
this.$message.success( '操作成功')
this.visible = false
this.$emit('refreshDataList')
} else {
this.$message.error(data.msg)
}
})
},
closeSaveDialog(){
this.cleanData()
},
cleanData(){
for (var prop in this.dataForm) {
if (this.dataForm.hasOwnProperty(prop)) {
this.dataForm[prop] = '';
}
}
},
},
}
</script>
<style >
</style>

62
src/views/modules/material/poReceiving.vue

@ -51,6 +51,8 @@
@row-click="changeData"
:height="height"
border
highlight-current-row
ref="mainTable"
v-loading="dataListLoading"
style="width: 100%; ">
<el-table-column
@ -78,7 +80,7 @@
<template slot-scope="scope">
<a type="text" size="small" @click="updateModel(scope.row)">编辑</a>
<a type="text" size="small" @click="deleteData(scope.row)">删除</a>
<a type="text" size="small" @click="deleteData(scope.row)">扫描</a>
<a type="text" size="small" @click="scanRoll(scope.row)">扫描</a>
</template>
</el-table-column>
</el-table>
@ -91,6 +93,8 @@
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="明细" name="detail">
<el-table
@ -149,7 +153,7 @@
<el-dialog title="采购入库-新增" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="480px" >
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="仓库">
<el-select v-model="modelData.wareHouseId" clearable style="width: 100%;">
<el-select v-model="modelData.warehouseID" clearable style="width: 100%;">
<el-option :value="i.wareHouseId" :label="i.wareHouseName" v-for="i in wareHouseList" :key="i.menuId"></el-option>
</el-select>
</el-form-item>
@ -189,6 +193,9 @@
<el-button type="primary" @click="modelFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="searchTable" v-drag></add-or-update>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
@ -200,11 +207,14 @@
,searchTransDetailSub
,getWareHouseList
,saveTransHeaderData
} from "@/api/material/poReceive.js"
import addOrUpdate from './com_poReceiving_add_or_update'
import Chooselist from '@/views/modules/common/Chooselist'
export default {
components: {
Chooselist
,addOrUpdate
},
data() {
return {
@ -214,6 +224,7 @@
dataList: [],
dataList2: [],
dataList3: [],
addOrUpdateVisible:false,
searchData: {
page: 1,
limit: 100,
@ -230,7 +241,7 @@
addFlag:0,
site:this.$store.state.user.site,
transDate:new Date(),
wareHouseId:'',
warehouseID:'',
receiver:'',
orderRef1:'',
supplierId:'',
@ -299,10 +310,10 @@
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1WareHouseId',
serialNumber: '200001Table1WareHouseID',
tableId: "200001Table1",
tableName: "采购入库主表",
columnProp: "wareHouseId",
columnProp: "warehouseID",
headerAlign: "center",
align: "left",
columnLabel: "仓库编码",
@ -333,10 +344,10 @@
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1Receiver',
serialNumber: '200001Table1ReceiverName',
tableId: "200001Table1",
tableName: "采购入库主表",
columnProp: "receiver",
columnProp: "receiverName",
headerAlign: "center",
align: "left",
columnLabel: "经手人",
@ -455,10 +466,10 @@
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table2LocationId',
serialNumber: '200001Table2LocationID',
tableId: "200001Table2",
tableName: "采购入库明细",
columnProp: "locationId",
columnProp: "locationID",
headerAlign: "center",
align: "left",
columnLabel: "库位",
@ -729,17 +740,17 @@
this.dataList2 = data.rows
} else {
this.dataList = [];
this.dataList2 = [];
}
});
}else {
searchTransDetailSub(this.currentRow).then(({data}) => {
//
if (data && data.code == 0) {
this.dataList2 = data.rows
this.dataList3 = data.rows
} else {
this.dataList = [];
this.dataList3 = [];
}
});
}
@ -772,16 +783,16 @@
addFlag:0,
site:this.$store.state.user.site,
transDate:new Date(),
wareHouseId:this.wareHouseList.length>0?this.wareHouseList[0].wareHouseId:'',
warehouseID:this.wareHouseList.length>0?this.wareHouseList[0].wareHouseId:'',
receiver:this.$store.state.user.name,
orderRef1:'',
supplierId:'',
supplierName:'',
enterBy:this.$store.state.user.name,
};
if(this.wareHouseList.length>0){
this.modelData.wareHouseId=this.wareHouseList[0].wareHouseId
}
// if(this.wareHouseList.length>0){
// this.modelData.wareHouseId=this.wareHouseList[0].wareHouseId
// }
this.modelFlag=true;
},
updateModel(row){
@ -819,25 +830,25 @@
})
},
saveHeaderData(){
if(this.dataForm.wareHouseId===''){
if(this.modelData.warehouseID===''){
this.$alert('请选择仓库!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.dataForm.receiver===''){
if(this.modelData.receiver===''){
this.$alert('请选择经手人!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.dataForm.transDate===''){
if(this.modelData.transDate===''){
this.$alert('请选择入库日期!', '错误', {
confirmButtonText: '确定'
})
return false
}
saveTransHeaderData(this.dataForm).then(({data}) => {
saveTransHeaderData(this.modelData).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')
this.modelFlag = false
@ -845,6 +856,7 @@
if(this.jumpFlag){
this.$nextTick(function () {
setTimeout(() => {
console.log(data.transNo)
// let inData = {
// site: this.$store.state.user.site,
// codeNo: data.row.codeNo,
@ -869,6 +881,16 @@
}
})
},
scanRoll(row){
let data={
site:row.site,
transNo:row.transNo,
}
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(data)
})
},
//excel
//excel
async createExportData() {

Loading…
Cancel
Save