diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue
index 866d7bd..6439b58 100644
--- a/src/views/udi/trace/search/index.vue
+++ b/src/views/udi/trace/search/index.vue
@@ -172,7 +172,7 @@
详情
@@ -767,15 +767,6 @@ export default {
}
},
methods: {
- handleViewCoderel(row) {
- this.listCodeRel.forEach(obj => {
- if (this.listCodeRel[0]) {
- this.formViewCodeRel = obj
- }
- })
- console.log(this.formViewCodeRel)
- this.openManuCodeRel = true
- },
handleSelectionChange(val) {
this.currentRow = val;
this.getManuCodeRel();
@@ -951,6 +942,24 @@ export default {
hideSearch() {
this.showSearch = !this.showSearch;
},
+ handleViewCoderel(row) {
+ this.listCodeRel.forEach(obj => {
+ if (row.id == obj.id) {
+ this.manuOrderCodeRelFormView = obj
+ }
+ })
+ console.log(this.formViewCodeRel)
+ this.openManuCodeRel = true
+ },
+ handleViewManuOrder(row) {
+ this.listOrder.forEach(obj => {
+ if (row.id == obj.id) {
+ this.manuOrderFormView = obj
+ }
+ })
+ console.log(this.formView)
+ this.openManuOrder = true
+ },
handleView(row) {
this.list.forEach(obj => {
if (row.id == obj.id) {
@@ -985,6 +994,7 @@ export default {
if (this.list != null) {
clearTimeout(this.monitorOrder);
this.monitorOrder = null
+ this.showCollapses = true
}
},
getList() {
diff --git a/src/views/udi/trace/searchLive/index.vue b/src/views/udi/trace/searchLive/index.vue
index fb0ab3d..5b5b0cb 100644
--- a/src/views/udi/trace/searchLive/index.vue
+++ b/src/views/udi/trace/searchLive/index.vue
@@ -170,63 +170,380 @@
>
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 生产信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+ 生产信息 {{ currentRow == null ? '' : currentRow.billNo }}-关联关系
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 出入库单据信息
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
-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,
@@ -443,11 +762,29 @@ export default {
page: 1,
limit: 10,
},
+ manuOrderQuery: {
+ recordCode: null,
+ page: 1,
+ limit: 10,
+ },
+ manuCodeRelQuery: {
+ manuOrderIdFk: null,
+ page: 1,
+ limit: 10,
+ },
total: 0,
loading: false,
+ manuOrderLoading: false,
+ manuCodeRelLoading: false,
list: [],
+ listOrder: [],
+ listCodeRel: [],
open: false,
+ openManuOrder: false,
+ openManuCodeRel: false,
formView: {},
+ manuOrderFormView: {},
+ manuOrderCodeRelFormView: {},
showSearch: true,
fromOptions: [],
cpmctymcList: [],
@@ -460,6 +797,64 @@ export default {
}
},
methods: {
+ handleSelectionChange(val) {
+ this.currentRow = val;
+ this.getManuCodeRel();
+ },
+ getManuCodeRel() {
+ if (this.currentRow.id == null) {
+ this.$message.error("请先选择需要查询的单据！")
+ return;
+ }
+ this.manuCodeRelLoading = true;
+ this.manuCodeRelQuery.manuOrderIdFk = this.currentRow.id;
+ 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.manuOrderQuery).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 = "起始位置"
@@ -583,6 +978,24 @@ export default {
hideSearch() {
this.showSearch = !this.showSearch;
},
+ handleViewCoderel(row) {
+ this.listCodeRel.forEach(obj => {
+ if (row.id == obj.id) {
+ this.manuOrderCodeRelFormView = obj
+ }
+ })
+ console.log(this.formViewCodeRel)
+ this.openManuCodeRel = true
+ },
+ handleViewManuOrder(row) {
+ this.listOrder.forEach(obj => {
+ if (row.id == obj.id) {
+ this.manuOrderFormView = obj
+ }
+ })
+ console.log(this.formView)
+ this.openManuOrder = true
+ },
handleView(row) {
this.list.forEach(obj => {
if (row.id == obj.id) {
@@ -622,6 +1035,8 @@ export default {
this.list = res.data || [];
this.total = res.data.total || 0;
console.log(this.list)
+ this.manuOrderQuery.recordCode = res.data.recordCode
+ this.getManuOrderList()
} else {
this.$message.error(res.message);
this.list = [];
@@ -637,6 +1052,11 @@ export default {
},
created() {
this.geCompanyNameList()
+ },
+ beforeDestroy() {
+ if (this.monitorOrder) {
+ clearTimeout(this.monitorOrder)
+ }
}
}