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

接口查询修改

Browse Source
master
anthonywj 2 years ago
parent 5a49f41ae1
commit 2ce75d99d5
3 changed files with 372 additions and 376 deletions
Show Stats Download Patch File Download Diff File

2
.env.development
Unescape Escape View File

@ -4,7 +4,7 @@ VUE_APP_TITLE = UDI监管平台
# 开发环境配置
ENV = 'development'
VUE_APP_BASE_API = 'http://127.0.0.1:9998'
VUE_APP_BASE_API = 'http://192.168.0.166:9998'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/'

10
src/api/udi/udiTrace.js
Unescape Escape View File

@ -7,6 +7,7 @@ export function getTraceOrderList(query) {
params: query
})
}
//查询记录
export function getTraceRecordList(query) {
return axios({
@ -15,6 +16,7 @@ export function getTraceRecordList(query) {
params: query
})
}
//生产信息
export function getTraceManuOrderList(query) {
return axios({
@ -80,6 +82,14 @@ export function filterylqxzcrbarmc(query) {
});
}
export function getRecordResult(query) {
return axios({
url: '/udi/trace/record/result',
method: 'get',
params: query
})
}
//任务列表
export function getTraceTaskList(query) {

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

@ -141,7 +141,7 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏
</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" size="mini"
<el-button type="primary" icon="el-icon-search" @click="getList" size="mini"
>查询
</el-button
>
@ -196,7 +196,8 @@
<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
@ -467,13 +468,16 @@
<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>-->
@ -507,13 +511,13 @@
</el-collapse>
</el-card>
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :limit.sync="filterQuery.limit"-->
<!-- :page.sync="filterQuery.page"-->
<!-- @pagination="getList"-->
<!-- ></pagination>-->
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :limit.sync="filterQuery.limit"-->
<!-- :page.sync="filterQuery.page"-->
<!-- @pagination="getList"-->
<!-- ></pagination>-->
<el-dialog
title="单据-详情"
@ -712,9 +716,11 @@
<script>
import {isBlank} from "@/utils/strUtil";
import {filterylqxzcrbarmc,filterCpmctymc,
filterGgxh, filterNameCode, sourceSearch,filterCompanyName,getTraceManuOrderList,
getManuCodeRelList} from "@/api/udi/udiTrace";
import {
filterylqxzcrbarmc, filterCpmctymc,
filterGgxh, filterNameCode, sourceSearch, filterCompanyName, getTraceManuOrderList,
getManuCodeRelList, getRecordResult
} from "@/api/udi/udiTrace";
export default {
@ -797,13 +803,14 @@ export default {
this.codeRelTotal = 0;
})
},
getManuOrderList() {
getRecordResult() {
//清空校验结果表
this.listCodeRel = null;
this.loading = true;
this.manuOrderQuery.recordCode = this.list.recordCode
console.log(this.manuOrderQuery.recordCode);
getTraceManuOrderList(this.manuOrderQuery).then((res) => {
let query = {
recordCode: this.recordCode,
}
getRecordResult(query).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.listOrder = res.data.list || [];
@ -825,46 +832,43 @@ export default {
// 执行逻辑代码
this.filterQuery.page = 1;
if((this.list == undefined || this.list.length <= 0)){
this.getList()
if (this.manuOrderQuery.recordCode != null || this.manuOrderQuery.recordCode != "") {
this.getManuOrderList()
}
if ((this.list == undefined || this.list.length <= 0)) {
this.getRecordResult()
}
// 使用递归法定时执行定时器
if(this.list == undefined || this.list.length <= 0){
if (this.list == undefined || this.list.length <= 0) {
this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
}
},
formaterSourceType(row){
formaterSourceType(row) {
if (row.sourceType == 1) {
this.formateSourceType = "起始位置"
return "起始位置"
}else if (row.sourceType == 2){
} else if (row.sourceType == 2) {
this.formateSourceType = "中间位置"
return "中间位置"
}else {
} else {
this.formateSourceType = "结束位置"
return "结束位置"
}
},
formaterInOutType(row){
formaterInOutType(row) {
if (row.inOutType == 1) {
this.formateInOutType = "入库"
return "入库"
}else {
} else {
this.formateInOutType = "出库"
return "出库"
}
},
formatCompanyName(row){
this.companyNameList.find(item=>{
formatCompanyName(row) {
this.companyNameList.find(item => {
if (item.id == row.companyIdFk) {
this.formateCompanyName = item.companyName
}
})
},
getCompanyName(){
getCompanyName() {
let cQuery = {
page: 1,
limit: 10,
@ -874,7 +878,7 @@ export default {
console.log(this.companyNameList)
})
},
nameCodeChange(){
nameCodeChange() {
this.filterQuery.batchNo = null
},
ggxhChange() {
@ -977,7 +981,6 @@ export default {
this.formView = obj
}
})
console.log(this.formView)
this.open = true
},
onReset() {
@ -995,36 +998,19 @@ export default {
page: 1,
limit: 10,
};
this.manuOrderQuery = {
recordCode: null,
page: 1,
limit: 10,
},
this.list = "",
this.listOrder = null,
this.listCodeRel = null,
clearTimeout(this.monitorOrder);
this.monitorOrder = ""
//this.total = 0
},
onSubmit() {
// if(this.list != undefined || this.list.length > 0){
// clearTimeout(this.monitorOrder);
// this.monitorOrder = ""
// }else {
// this.orderTimeOut()
// }
this.orderTimeOut()
},
getList() {
this.loading = true;
sourceSearch(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data || [];
this.total = res.data.total || 0;
this.recordCode = res.data.recordCode
console.log(this.recordCode)
this.recordCode = res.data;
this.orderTimeOut();
} else {
this.$message.error(res.message);
this.list = [];

Write Preview
Loading…
Cancel
Save