From 6e68fde534a53dfcb9f9ff2117848693b8ee2db0 Mon Sep 17 00:00:00 2001 From: fan Date: Sat, 28 Jan 2023 09:51:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/trainingDesign/createDraftTraining.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/newMap/display/trainingDesign/createDraftTraining.vue b/src/views/newMap/display/trainingDesign/createDraftTraining.vue index c4375cfb0..13006c96a 100644 --- a/src/views/newMap/display/trainingDesign/createDraftTraining.vue +++ b/src/views/newMap/display/trainingDesign/createDraftTraining.vue @@ -164,7 +164,7 @@ export default { this.$refs.form.validate(valid => { if (valid) { const cpData = Object.assign({}, this.formModel); - cpData.client = this.tagForm.client; + cpData.client = this.formModel.type === 'SINGLE' ? this.tagForm.client : ''; cpData.labelJson = JSON.stringify(this.tagForm.dynamicTags); let api = updateTraining; let mes = '编辑'; From 3c7c4c3dfa4891c6168eaa893aa5034f5a6ca16d Mon Sep 17 00:00:00 2001 From: fan Date: Sat, 28 Jan 2023 10:38:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B7=AF=E7=A5=A8=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E4=BC=A0=E5=80=BC=E9=94=99=E8=AF=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terminals/trainTicket/greenLicence.vue | 36 ++++----- .../terminals/trainTicket/redLicence.vue | 78 +++++++++---------- .../terminals/trainTicket/trainTicket.vue | 20 ++--- 3 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/views/newMap/display/terminals/trainTicket/greenLicence.vue b/src/views/newMap/display/terminals/trainTicket/greenLicence.vue index a608327ab..cbe3aea40 100644 --- a/src/views/newMap/display/terminals/trainTicket/greenLicence.vue +++ b/src/views/newMap/display/terminals/trainTicket/greenLicence.vue @@ -86,66 +86,66 @@ export default { this.memberId = ''; } }, - numberChange(val) { + numberChange() { const operate = { operation: this.ticketInput.number.operation, - val: val + val: this.greenLicenseForm.number }; this.$store.dispatch('trainingNew/next', operate); }, - reasonChange(val) { + reasonChange() { const operate = { operation: this.ticketInput.reason.operation, - val: val + val: this.greenLicenseForm.reason }; this.$store.dispatch('trainingNew/next', operate); }, - tripNumberChange(val) { + tripNumberChange() { const operate = { operation: this.ticketInput.tripNumber.operation, - val: val + val: this.greenLicenseForm.tripNumber }; this.$store.dispatch('trainingNew/next', operate); }, - lineChange(val) { + lineChange() { const operate = { operation: this.ticketInput.line.operation, - val: val + val: this.greenLicenseForm.line }; this.$store.dispatch('trainingNew/next', operate); }, - signatureChange(val) { + signatureChange() { const operate = { operation: this.ticketInput.signature.operation, - val: val + val: this.greenLicenseForm.signature }; this.$store.dispatch('trainingNew/next', operate); }, - yearChange(val) { + yearChange() { const operate = { operation: this.ticketInput.year.operation, - val: val + val: this.greenLicenseForm.year }; this.$store.dispatch('trainingNew/next', operate); }, - moonChange(val) { + moonChange() { const operate = { operation: this.ticketInput.moon.operation, - val: val + val: this.greenLicenseForm.moon }; this.$store.dispatch('trainingNew/next', operate); }, - dayChange(val) { + dayChange() { const operate = { operation: this.ticketInput.day.operation, - val: val + val: this.greenLicenseForm.day }; this.$store.dispatch('trainingNew/next', operate); }, - memberIdChange(val) { + memberIdChange() { const operate = { operation: this.ticketInput.memberId.operation, - val: val + val: this.memberId }; this.$store.dispatch('trainingNew/next', operate); } diff --git a/src/views/newMap/display/terminals/trainTicket/redLicence.vue b/src/views/newMap/display/terminals/trainTicket/redLicence.vue index 3d2947bb8..e3739ea2a 100644 --- a/src/views/newMap/display/terminals/trainTicket/redLicence.vue +++ b/src/views/newMap/display/terminals/trainTicket/redLicence.vue @@ -114,143 +114,143 @@ export default { this.memberId = ''; } }, - numberChange(val) { + numberChange() { const operate = { operation: this.ticketInput.number.operation, - val: val + val: this.redLicenseForm.number }; this.$store.dispatch('trainingNew/next', operate); }, - licenseTripNumberChange(val) { + licenseTripNumberChange() { const operate = { operation: this.ticketInput.licenseTripNumber.operation, - val: val + val: this.redLicenseForm.licenseTripNumber }; this.$store.dispatch('trainingNew/next', operate); }, - licenseStationChange(val) { + licenseStationChange() { const operate = { operation: this.ticketInput.licenseStation.operation, - val: val + val: this.redLicenseForm.licenseStation }; this.$store.dispatch('trainingNew/next', operate); }, - licenseNextStationChange(val) { + licenseNextStationChange() { const operate = { operation: this.ticketInput.licenseNextStation.operation, - val: val + val: this.redLicenseForm.licenseNextStation }; this.$store.dispatch('trainingNew/next', operate); }, - licenseHourChange(val) { + licenseHourChange() { const operate = { operation: this.ticketInput.licenseHour.operation, - val: val + val: this.redLicenseForm.licenseHour }; this.$store.dispatch('trainingNew/next', operate); }, - licenseMinuteChange(val) { + licenseMinuteChange() { const operate = { operation: this.ticketInput.licenseMinute.operation, - val: val + val: this.redLicenseForm.licenseMinute }; this.$store.dispatch('trainingNew/next', operate); }, - licenseTripNumber2Change(val) { + licenseTripNumber2Change() { const operate = { operation: this.ticketInput.licenseTripNumber2.operation, - val: val + val: this.redLicenseForm.licenseTripNumber2 }; this.$store.dispatch('trainingNew/next', operate); }, - licenseReceivedChange(val) { + licenseReceivedChange() { const operate = { operation: this.ticketInput.licenseReceived.operation, - val: val + val: this.redLicenseForm.licenseReceived }; this.$store.dispatch('trainingNew/next', operate); }, - noticeTripNumberChange(val) { + noticeTripNumberChange() { const operate = { operation: this.ticketInput.noticeTripNumber.operation, - val: val + val: this.redLicenseForm.noticeTripNumber }; this.$store.dispatch('trainingNew/next', operate); }, - noticeHour1Change(val) { + noticeHour1Change() { const operate = { operation: this.ticketInput.noticeHour1.operation, - val: val + val: this.redLicenseForm.noticeHour1 }; this.$store.dispatch('trainingNew/next', operate); }, - noticeMinute1Change(val) { + noticeMinute1Change() { const operate = { operation: this.ticketInput.noticeMinute1.operation, - val: val + val: this.redLicenseForm.noticeMinute1 }; this.$store.dispatch('trainingNew/next', operate); }, - noticeTripNumber1Change(val) { + noticeTripNumber1Change() { const operate = { operation: this.ticketInput.noticeTripNumber1.operation, - val: val + val: this.redLicenseForm.noticeTripNumber1 }; this.$store.dispatch('trainingNew/next', operate); }, - noticeHour2Change(val) { + noticeHour2Change() { const operate = { operation: this.ticketInput.noticeHour2.operation, - val: val + val: this.redLicenseForm.noticeHour2 }; this.$store.dispatch('trainingNew/next', operate); }, - noticeMinute2Change(val) { + noticeMinute2Change() { const operate = { operation: this.ticketInput.noticeMinute2.operation, - val: val + val: this.redLicenseForm.noticeMinute2 }; this.$store.dispatch('trainingNew/next', operate); }, noticeTripNumber2Change(val) { const operate = { operation: this.ticketInput.noticeTripNumber2.operation, - val: val + val: this.redLicenseForm.noticeTripNumber2 }; this.$store.dispatch('trainingNew/next', operate); }, - signatureChange(val) { + signatureChange() { const operate = { operation: this.ticketInput.signature.operation, - val: val + val: this.redLicenseForm.signature }; this.$store.dispatch('trainingNew/next', operate); }, - yearChange(val) { + yearChange() { const operate = { operation: this.ticketInput.year.operation, - val: val + val: this.redLicenseForm.year }; this.$store.dispatch('trainingNew/next', operate); }, - moonChange(val) { + moonChange() { const operate = { operation: this.ticketInput.moon.operation, - val: val + val: this.redLicenseForm.moon }; this.$store.dispatch('trainingNew/next', operate); }, - dayChange(val) { + dayChange() { const operate = { operation: this.ticketInput.day.operation, - val: val + val: this.redLicenseForm.day }; this.$store.dispatch('trainingNew/next', operate); }, - memberIdChange(val) { + memberIdChange() { const operate = { operation: this.ticketInput.memberId.operation, - val: val + val: this.memberId }; this.$store.dispatch('trainingNew/next', operate); } diff --git a/src/views/newMap/display/terminals/trainTicket/trainTicket.vue b/src/views/newMap/display/terminals/trainTicket/trainTicket.vue index c68761151..95db76e37 100644 --- a/src/views/newMap/display/terminals/trainTicket/trainTicket.vue +++ b/src/views/newMap/display/terminals/trainTicket/trainTicket.vue @@ -90,38 +90,38 @@ export default { this.memberId = ''; } }, - nextStationChange(val) { + nextStationChange() { const operate = { operation: this.ticketInput.nextStation.operation, - val: val + val: this.ticketForm.nextStation }; this.$store.dispatch('trainingNew/next', operate); }, - numberChange(val) { + numberChange() { const operate = { operation: this.ticketInput.number.operation, - val: val + val: this.ticketForm.number }; this.$store.dispatch('trainingNew/next', operate); }, - tripNumberChange(val) { + tripNumberChange() { const operate = { operation: this.ticketInput.tripNumber.operation, - val: val + val: this.ticketForm.tripNumber }; this.$store.dispatch('trainingNew/next', operate); }, - noChange(val) { + noChange() { const operate = { operation: this.ticketInput.no.operation, - val: val + val: this.ticketForm.no }; this.$store.dispatch('trainingNew/next', operate); }, - memberIdChange(val) { + memberIdChange() { const operate = { operation: this.ticketInput.memberId.operation, - val: val + val: this.memberId }; this.$store.dispatch('trainingNew/next', operate); } From 9c9ccdbfc7b2acd7783b3ab75b302793aaeef04b Mon Sep 17 00:00:00 2001 From: fan Date: Sat, 28 Jan 2023 10:59:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B7=AF=E7=A5=A8=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E5=AD=98=E5=80=BC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/terminals/trainTicket/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/newMap/display/terminals/trainTicket/index.vue b/src/views/newMap/display/terminals/trainTicket/index.vue index 4ebfcdfa4..d4ff7a4af 100644 --- a/src/views/newMap/display/terminals/trainTicket/index.vue +++ b/src/views/newMap/display/terminals/trainTicket/index.vue @@ -213,7 +213,7 @@ export default { }, submit() { let commitFlag = true; - const params = { ticket: { type: this.attachmentType }, stationCode: this.roleDeviceCode }; + const params = { stationCode: this.roleDeviceCode, ticket: { type: this.attachmentType } }; if (this.attachmentType === 'RAIL_TICKET') { if (!this.ticketForm.number || !this.ticketForm.tripNumber || !this.ticketForm.nextStation || !this.ticketForm.no) { commitFlag = false;