From bf01c50b3f7164fe3a529baa7b723bbc7526366e Mon Sep 17 00:00:00 2001 From: liuyp Date: Mon, 27 May 2024 15:34:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbugs=EF=BC=9A624=E3=80=81634?= =?UTF-8?q?=E3=80=81635=E3=80=81636=E3=80=81638=E3=80=81639=E3=80=81641?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/emisTmsScanRecord/signAndRecord.vue | 4 +- .../signatureRecordQuery.vue | 8 +- .../centralProblemInquiry.vue | 85 ++++++++++++++++--- .../emisWaybillProblemInfo/problemEntry.vue | 24 +++--- .../receivedProblemInquiries.vue | 23 +++-- .../registrationProblemInquiry.vue | 23 ++--- 6 files changed, 118 insertions(+), 49 deletions(-) diff --git a/src/views/emis/emisTmsScanRecord/signAndRecord.vue b/src/views/emis/emisTmsScanRecord/signAndRecord.vue index dcf820af..4fd0a9ef 100644 --- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue +++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue @@ -14,11 +14,11 @@ - + diff --git a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue index 1b185f9a..18de3b53 100644 --- a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue +++ b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue @@ -78,7 +78,11 @@ - + + + /> @@ -137,7 +141,7 @@ import { getDateTimeToString } from '@/utils/payutils' export default { name: "SignatureRecordQuery", components: { EmisUserSimplePicker,elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, CountryPicker }, - dicts: ['emis_scan_type'], + dicts: ['emis_scan_type', 'emis_waybill_status'], data() { return { diff --git a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue index 3e0fddf0..72f83c72 100644 --- a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue +++ b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue @@ -1,7 +1,7 @@ - + {{ parseTime(scope.row.registerDate) }} + @@ -142,13 +183,14 @@ import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePic import DestinationPicker from '@/views/emis/EmisBaseTools/DestinationPicker.vue'; import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue'; +import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'; import { getDateTimeToString } from '@/utils/payutils' export default { name: "CentralProblemInquiry", // components: { elDateSimplePicker,emisElectronicPagApplyView,emisElectronicPagApplyForm }, - components: { EmisUserSimplePicker, CountryPicker, elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, DestinationPicker }, - dicts: ['emis_scan_type'], + components: { ProblemTypePicker, EmisUserSimplePicker, CountryPicker, elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, DestinationPicker }, + dicts: ['emis_scan_type', 'emis_processing_status'], data() { return { @@ -325,6 +367,18 @@ export default { // this.queryParams.scanSite=item && item.siteName; this.queryParams.registerSiteCode=item && item.siteCode; }, + onSendSiteSelect(item){ + this.queryParams.sendSiteCode=item && item.siteCode; + }, + onproblemTypeSelect(item){ + if(!item){ + this.form.problemType = null; + this.form.problemId = null; + return; + } + this.queryParams.problemType = item.typeName; + this.queryParams.problemId=item.id; + }, onPreOrNextSiteSelect(item){ this.queryParams.preOrNextStation=item && item.siteName; this.queryParams.preOrNextStationCode=item && item.siteCode; @@ -338,9 +392,12 @@ export default { this.queryParams.dateTimeRange=value; // scanDate }, - onStaffSelect(item){ - // this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName; - this.form.dispatchManCode=item && item.empCode || null; + // onStaffSelect(item){ + // // this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName; + // this.form.dispatchManCode=item && item.empCode || null; + // }, + onRegStaffSelect(item){ + this.queryParams.registerManCode = item && item.empCode || null; }, onModifyScanSiteSelect(item){ this.modifyParams.scanSite=item.siteName; diff --git a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue index b60510c4..83214b9b 100644 --- a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue +++ b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue @@ -9,7 +9,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -349,11 +349,11 @@ export default { return; } - if(this.dataMap[this.form.billCode]){ - this.$message.error("重复登记"); - this.playNoticeTone(1); - return; - } + // if(this.dataMap[this.form.billCode]){ + // this.$message.error("重复登记"); + // this.playNoticeTone(1); + // return; + // } this.getWaybill(this.form.billCode) }, getWaybill(billCode){ @@ -489,11 +489,11 @@ export default { } let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[]; bcList.forEach(code => { - if(this.dataMap[code]){ - this.$message.error("重复登记："+code); - this.playNoticeTone(1); - return; - } + // if(this.dataMap[code]){ + // this.$message.error("重复登记："+code); + // this.playNoticeTone(1); + // return; + // } this.getWaybill(code) }); this.openBatch=false; diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue index 26b5be76..b94ab6a4 100644 --- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue +++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue @@ -172,7 +172,7 @@ 处理结果： - + @@ -271,7 +271,7 @@ export default { moreInputVisible: false, reversion:{ - status:"1", + status:"", content:'' }, showProblemDetail: false, @@ -356,7 +356,7 @@ export default { // this.getList(); this.$nextTick(function() { let queryFormEl = this.$refs.queryForm.$el; - let tableH = queryFormEl.offsetHeight+190; + let tableH = queryFormEl.offsetHeight+260; this.tableHeight = window.innerHeight - tableH; }); }, @@ -408,13 +408,15 @@ export default { this.currentRow = {}; this.showProblemDetail = false; this.reversion = { - status:1, + status:"", content:'' } }); }, - cellClass () { - return 'selectAllbtnDis' + cellClass({ row, column, rowIndex, columnIndex }) { + if (columnIndex === 0) { + return "seltAllbtnDis"; + } }, // 取消按钮 cancel() { @@ -569,7 +571,7 @@ export default { } this.reversion = { - status:1, + status:'', content:'' } // this.ids = selection.map(item => item.id) @@ -601,7 +603,7 @@ export default { if(response && response.code == 200){ commentList.getList(); this.reversion = { - status:1, + status:'', content:'' } }else{ @@ -613,7 +615,7 @@ export default { this.currentRow = {}; this.showProblemDetail = false; this.reversion = { - status:1, + status:'', content:'' } @@ -816,6 +818,9 @@ export default {