From dd69265d324f20528f2c4bc8379f7338183dd630 Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Wed, 31 May 2023 15:20:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/udi/udiTrace.js | 2 +- src/views/udi/trace/history/index.vue | 38 ++++++-- src/views/udi/trace/task/index.vue | 133 +++++++++++++++++++++++++- 3 files changed, 159 insertions(+), 14 deletions(-) diff --git a/src/api/udi/udiTrace.js b/src/api/udi/udiTrace.js index 4f72005..dba6131 100644 --- a/src/api/udi/udiTrace.js +++ b/src/api/udi/udiTrace.js @@ -7,7 +7,7 @@ export function getTraceOrderList(query) { params: query }) } - +//查询记录 export function getTraceRecordList(query) { return axios({ url: '/udi/trace/record/filter', diff --git a/src/views/udi/trace/history/index.vue b/src/views/udi/trace/history/index.vue index bda49ea..caea9de 100644 --- a/src/views/udi/trace/history/index.vue +++ b/src/views/udi/trace/history/index.vue @@ -1,9 +1,9 @@ @@ -211,9 +313,22 @@ export default { manuCodeRelLoading: false, taskList: [], listCodeRel: [], - openManuOrder: false, + open: false, openManuCodeRel: false, - formView: {}, + formView: { + taskType:null, + status: null, + }, + taskTypes: [ + { value: 1, label: '关联关系' }, + { value: 2, label: '入库' }, + { value: 3, label: '出库' }, + ], + taskStatus: [ + { value: 1, label: '未处理' }, + { value: 2, label: '正在处理' }, + { value: 3, label: '已处理' }, + ], formViewCodeRel: {}, showSearch: true, actDateRange: [], @@ -252,6 +367,16 @@ export default { } }, + computed: { + taskTypeText() { + const taskType = this.taskTypes.find(item => item.value === this.formView.taskType); + return taskType ? taskType.label : ''; + }, + statusText() { + const status = this.taskStatus.find(item => item.value === this.formView.status); + return status ? status.label : ''; + }, + }, methods: { //隐藏搜索 hideSearch() { @@ -313,13 +438,13 @@ export default { // }, //详情 handleView(row){ - this.taskOrder.forEach(obj => { + this.taskList.forEach(obj => { if (row.id == obj.id) { this.formView = obj } }) console.log(this.formView) - this.openManuOrder = true + this.open = true }, handleViewCoderel(row){ this.listCodeRel.forEach(obj => { From 25731d637682e97255fefc7c2a4cc1e1f2f4a60a Mon Sep 17 00:00:00 2001 From: schry <2433098676@qq.com> Date: Wed, 31 May 2023 15:30:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?UDI=E6=9F=A5=E8=AF=A2=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/udi/trace/search/index.vue | 37 +++++++++++++++++++++--- src/views/udi/trace/searchLive/index.vue | 21 ++++++++++++-- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue index 4f6b32f..56be1bc 100644 --- a/src/views/udi/trace/search/index.vue +++ b/src/views/udi/trace/search/index.vue @@ -150,9 +150,10 @@ + - + @@ -343,7 +344,7 @@ diff --git a/src/views/udi/trace/searchLive/index.vue b/src/views/udi/trace/searchLive/index.vue index e272a1a..8889a35 100644 --- a/src/views/udi/trace/searchLive/index.vue +++ b/src/views/udi/trace/searchLive/index.vue @@ -175,7 +175,7 @@ - + @@ -397,6 +397,13 @@ export default { } }, methods: { + formatCompanyName(row){ + let temp = this.companyNameList.find(item=>{ + return item.id == row.companyIdFk + }) + + return temp && temp.companyName + }, geCompanyNameList(query) { let cQuery = { companyName: query, @@ -414,6 +421,8 @@ export default { }); }, ggxhChange() { + this.filterQuery.nameCode = null + this.filterQuery.batchNo = null this.getNameCodeList() }, getNameCodeList(query) { @@ -431,6 +440,9 @@ export default { }) }, cpmctymcChange() { + this.filterQuery.ggxh = null + this.filterQuery.nameCode = null + this.filterQuery.batchNo = null this.getGgxhList() }, getGgxhList(query) { @@ -447,6 +459,10 @@ export default { }) }, ylqxzcrbarmcChange() { + this.filterQuery.cpmctymc = null + this.filterQuery.ggxh = null + this.filterQuery.nameCode = null + this.filterQuery.batchNo = null this.getCpmctymcList() }, getCpmctymcList(query) { @@ -504,7 +520,7 @@ export default { page: 1, limit: 10, }; - //this.list = null + this.list = null //this.total = 0 }, onSubmit() { @@ -533,6 +549,7 @@ export default { }, }, created() { + this.geCompanyNameList() } }