Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly

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);
         }

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;

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);
         }

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);
         }

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 = '编辑';