UDI
/
udi-cpt-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
1178634255 2 years ago
parent 4a37115e5e 9aebb2234d
commit 52cf088fd4
2 changed files with 423 additions and 367 deletions
Show Stats Download Patch File Download Diff File

118
src/views/udi/trace/search/index.vue
Unescape Escape View File

@ -135,6 +135,7 @@
</el-col>
</el-row>
</el-form>
<div class="top-right-btn" style="display:flex;">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏
@ -154,8 +155,8 @@
<template slot="title">
<p class="form-title">生产信息</p>
</template>
<el-table v-loading="loading" :data="listOrder"
style="width: 100%;margin-top: 15px"
<el-table v-loading="manuOrderLoading" :data="listOrder"
style="width: 100%"
@row-click="handleSelectionChange"
highlight-current-row border>
<el-table-column label="序号" type="index"></el-table-column>
@ -195,8 +196,7 @@
<el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="120"></el-table-column>
<el-table-column label="包装层级" prop="bzcj" width="180"></el-table-column>
<el-table-column label="包装状态" prop="packState" width="180"
:formatter="formaterPackState"></el-table-column>
<el-table-column label="包装状态" prop="packState" width="180" :formatter="formaterPackState"></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button
@ -461,22 +461,19 @@
<template slot="title">
<p class="form-title">出入库单据信息</p>
</template>
<el-table v-loading="loading" :data="list"
<el-table v-loading="loading" :data="this.list"
style="width: 100%"
border highlight-current-row>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="150"></el-table-column>
<el-table-column label="单据类型" prop="billType" width="100"></el-table-column>
<el-table-column label="单据源头类型" prop="sourceType" width="100"
:formatter="formaterSourceType"></el-table-column>
<el-table-column label="出入库类型" prop="inOutType" width="100"
:formatter="formaterInOutType"></el-table-column>
<el-table-column label="单据源头类型" prop="sourceType" width="100" :formatter="formaterSourceType"></el-table-column>
<el-table-column label="出入库类型" prop="inOutType" width="100" :formatter="formaterInOutType"></el-table-column>
<el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>
<el-table-column label="更新时间" prop="updateTime" width="150"></el-table-column>
<el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
<el-table-column label="收货企业" prop="toCorp" width="220"></el-table-column>
<el-table-column label="所属企业" prop="companyIdFk" width="220"
:formatter="formatCompanyName"></el-table-column>
<el-table-column label="所属企业" prop="companyIdFk" width="220" :formatter="formatCompanyName"></el-table-column>
<!-- <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
@ -715,15 +712,15 @@
<script>
import {
filterylqxzcrbarmc, filterCpmctymc,
filterGgxh, filterNameCode, sourceSearch, filterCompanyName
} from "@/api/udi/udiTrace";
import {filterylqxzcrbarmc,filterCpmctymc,
filterGgxh, filterNameCode, sourceSearch,filterCompanyName,getTraceManuOrderList,
getManuCodeRelList} from "@/api/udi/udiTrace";
export default {
data() {
return {
monitorOrder: "", // 接收定时器id，便于清除定时器
filterQuery: {
udiCode: null,
ylqxzcrbarmc: null,
@ -737,7 +734,11 @@ export default {
},
total: 0,
loading: false,
manuOrderLoading: false,
manuCodeRelLoading: false,
list: [],
listOrder: [],
listCodeRel: [],
open: false,
formView: {},
manuOrderFormView: {},
@ -754,6 +755,60 @@ export default {
}
},
methods: {
getManuCodeRel() {
if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据！")
return;
}
this.manuCodeRelLoading = true;
this.manuCodeRelQuery.manuOrderNo = this.currentRow.billNo;
getManuCodeRelList(this.manuCodeRelQuery).then((res) => {
this.manuCodeRelLoading = false;
if (res.code === 20000) {
this.listCodeRel = res.data.list || [];
this.codeRelTotal = res.data.total || 0;
console.log(this.listCodeRel)
} else {
this.$message.error(res.message);
this.listCodeRel = [];
this.codeRelTotal = 0;
}
}).catch((error) => {
this.manuCodeRelLoading = false;
this.$message.error(error.message);
this.listCodeRel = [];
this.codeRelTotal = 0;
})
},
getManuOrderList() {
//清空校验结果表
this.listCodeRel = null;
this.loading = true;
getTraceManuOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.listOrder = res.data.list || [];
this.total = res.data.total || 0;
console.log(this.listOrder)
} else {
this.$message.error(res.message);
this.listOrder = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.listOrder = [];
this.total = 0;
})
},
orderTimeOut() {
// 执行逻辑代码
this.filterQuery.page = 1;
this.getList()
// 使用递归法定时执行定时器
this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
},
formaterSourceType(row){
if (row.sourceType == 1) {
this.formateSourceType = "起始位置"
@ -776,11 +831,11 @@ export default {
}
},
formatCompanyName(row){
let temp = this.companyNameList.find(item => {
return item.id == row.companyIdFk
this.companyNameList.find(item=>{
if (item.id == row.companyIdFk) {
this.formateCompanyName = item.companyName
}
})
this.formateCompanyName = temp.companyName
return temp && temp.companyName
},
getCompanyName(){
let cQuery = {
@ -896,11 +951,16 @@ export default {
limit: 10,
};
this.list = null
clearTimeout(this.monitorOrder);
this.monitorOrder = null
//this.total = 0
},
onSubmit() {
this.filterQuery.page = 1;
this.getList()
this.orderTimeOut()
if (this.list != null) {
clearTimeout(this.monitorOrder);
this.monitorOrder = null
}
},
getList() {
this.loading = true;
@ -909,7 +969,7 @@ export default {
if (res.code === 20000) {
this.list = res.data || [];
this.total = res.data.total || 0;
console.log(this.list)
console.log(res.data)
} else {
this.$message.error(res.message);
this.list = [];
@ -925,6 +985,11 @@ export default {
},
created() {
this.getCompanyName()
},
beforeDestroy() {
if (this.monitorOrder) {
clearTimeout(this.monitorOrder)
}
}
}
</script>
@ -950,15 +1015,6 @@ div /deep/ .el-table .success-row {
/*transition: all .5s;*/
}
.form-title {
font-size: 16px;
font-family: Noto Sans SC;
font-weight: bold;
color: #303133;
padding-bottom: 17px;
padding-top: 17px;
}
.query-form-item {
display: block !important;
margin-bottom: 5px;

8
src/views/udi/trace/searchLive/index.vue
Unescape Escape View File

@ -482,11 +482,11 @@ export default {
}
},
formatCompanyName(row){
let temp = this.companyNameList.find(item=>{
return item.id == row.companyIdFk
this.companyNameList.find(item=>{
if (item.id == row.companyIdFk) {
this.companyNameDetail = item.companyName
}
})
this.companyNameDetail = temp.companyName
return temp && temp.companyName
},
geCompanyNameList(query) {
let cQuery = {

Write Preview
Loading…
Cancel
Save