多次出库bug修改

pro
郑明梁 2 years ago
parent 73afe6f896
commit fde9342a9c

@ -11,8 +11,8 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="单据号:">
<el-input v-model="filterQuery.orderIdFk" placeholder="请输入单据号" clearable></el-input>
<el-form-item label="产品DI:">
<el-input v-model="filterQuery.relIdFk" placeholder="请输入产品DI" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@ -20,11 +20,6 @@
<el-input v-model="filterQuery.mark" placeholder="请输入标记" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品DI:">
<el-input v-model="filterQuery.relIdFk" placeholder="请输入产品DI" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
@ -64,7 +59,6 @@
<el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail" border highlight-current-row>
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="单据号" prop="orderIdFk"></el-table-column>
<el-table-column label="UDI码" prop="udiCode"></el-table-column>
<el-table-column label="标记" prop="mark"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc"></el-table-column>
@ -77,6 +71,11 @@
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="创建人" prop="createUserName"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="状态" prop="status">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="120px">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="editDialog(scope.row)">编辑</el-button>
@ -164,6 +163,11 @@ export default {
1: "新增使用出库",
2: "编辑使用出库",
},
statusMap: {
0: "草稿",
1: "已提交",
},
orderMutiVisible: false,
actDateRange: [],
detailList: [],
@ -201,6 +205,15 @@ export default {
};
},
methods: {
statusFilterType(status) {
const statusMap = {
0: "warning",
1: "warning",
2: "danger",
3: "success",
};
return statusMap[status];
},
onReset(){
this.filterQuery={
udiCode: null,

@ -305,6 +305,11 @@ export default {
}
},
addFromCorp() {
if(this.$isBlank(this.inputQuery.fromCorp)){
this.$message.error("往来单位不能为空!");
return
}
if (this.inputQuery.fromCorp != 'true' && this.inputQuery.fromCorp != 'false') {
var query = {
mutiIdFk: this.pId,
@ -359,6 +364,19 @@ export default {
this.filterMutiList();
},
saveOrder(status) {
if(this.$isBlank(this.inputQuery.udiCode)){
this.$message.error("UDI不能为空");
return
}
if(this.$isBlank(this.inputQuery.mark)){
this.$message.error("标记位不能为空!");
return
}
if(this.detailList.length<=0 && status == 1){
this.$message.error("标记位不能为空!");
return
}
var query = {
id: this.pId,
mark: this.inputQuery.mark,

@ -79,6 +79,11 @@
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="审核人" prop="auditUserName"></el-table-column>
<el-table-column label="审核时间" prop="auditTime"></el-table-column>
<el-table-column label="状态" prop="status">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="120px">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="datilDialog(scope.row)">详情</el-button>
@ -160,6 +165,10 @@ export default {
loading: false,
list: [],
formName: "审核使用出库",
statusMap: {
0: "草稿",
1: "已提交",
},
orderMutiVisible: false,
actDateRange: [],
detailList: [],
@ -197,6 +206,13 @@ export default {
};
},
methods: {
statusFilterType(status) {
const statusMap = {
0: "warning",
1: "success",
};
return statusMap[status];
},
onReset(){
this.filterQuery={
udiCode: null,

@ -3,7 +3,7 @@
<el-card>
<el-form :model="filterQuery" class="query-form" size="mini" label-width="120px" :inline="true">
<el-form-item label="当前仓库:">
<el-input v-model="filterQuery.curInv" placeholder="请输入配送企业名称" clearable></el-input>
<el-input v-model="filterQuery.curInv" placeholder="请输入当前仓库名称" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
@ -119,6 +119,7 @@ export default {
addOrderMuti(){
this.inputQuery={
curInv: null,
checkUse: null,
fromCorp: null,
targetAction: null,
remark: null,
@ -130,7 +131,6 @@ export default {
editDialog(row){
this.formName=2;
this.inputQuery=row;
console.log(this.inputQuery)
this.orderMutiSetVisible = true;
},
getList() {

@ -24,7 +24,7 @@
<el-row>
<el-col :span="20" >
<el-form-item label="往来单位:">
<el-select v-model="inputQuery.fromCorp" placeholder="请选择往来仓库" clearable style="width: 90%">
<el-select v-model="inputQuery.fromCorp" placeholder="请选择往来单位" clearable style="width: 90%">
<el-option
v-for="item in fromInvOptions"
:key="item.erpId"
@ -141,6 +141,18 @@ export default {
});
},
submitInv(){
if(this.$isBlank(this.inputQuery.curInv)){
this.$message.error("当前仓库不能为空!");
return
}
if(this.$isBlank(this.inputQuery.fromCorp)){
this.$message.error("往来单位不能为空!");
return
}
if(this.$isBlank(this.inputQuery.targetAction)){
this.$message.error("生成单据类型不能为空!");
return
}
if(this.formName==1){
addMuti(this.inputQuery).then((response) => {
if(response.code == 20000){
@ -177,6 +189,7 @@ export default {
this.getBusType();
}else{
this.inputQuery.checkUse=1;
console.log(this.inputQuery)
}
},

Loading…
Cancel
Save