Showing
8 changed files
with
41 additions
and
17 deletions
| @@ -685,17 +685,20 @@ Page({ | @@ -685,17 +685,20 @@ Page({ | ||
| 685 | let that = this; | 685 | let that = this; |
| 686 | let data = this.data; | 686 | let data = this.data; |
| 687 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; | 687 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; |
| 688 | + let charArray = data.seller.deskStr.split(''); | ||
| 689 | + let modifiedArray = charArray.map(char => char + ' '); | ||
| 690 | + let resultString = modifiedArray.join('').slice(0, -1); | ||
| 688 | const replacements = { | 691 | const replacements = { |
| 689 | "{年月日}": data.seller.yearMonthDay, | 692 | "{年月日}": data.seller.yearMonthDay, |
| 690 | "{月日}": data.seller.yearMonth, | 693 | "{月日}": data.seller.yearMonth, |
| 691 | "{餐段}": data.seller.soltName, | 694 | "{餐段}": data.seller.soltName, |
| 692 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, | 695 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, |
| 693 | - "{包间名}": data.seller.deskStr, | 696 | + "{包间名}": resultString, |
| 694 | "{区域名+包间名}": data.seller.tablesText, | 697 | "{区域名+包间名}": data.seller.tablesText, |
| 695 | "{经理名字}": data.staffinfo.name, | 698 | "{经理名字}": data.staffinfo.name, |
| 696 | "{客人姓名}": data.detail.rname + str, | 699 | "{客人姓名}": data.detail.rname + str, |
| 697 | "{预订日期}": data.seller.yearMonthDay, | 700 | "{预订日期}": data.seller.yearMonthDay, |
| 698 | - "{桌位}": data.seller.deskStr, | 701 | + "{桌位}": resultString, |
| 699 | }; | 702 | }; |
| 700 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { | 703 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { |
| 701 | return replacements[matched]; | 704 | return replacements[matched]; |
| @@ -640,17 +640,20 @@ Page({ | @@ -640,17 +640,20 @@ Page({ | ||
| 640 | let that = this; | 640 | let that = this; |
| 641 | let data = this.data; | 641 | let data = this.data; |
| 642 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; | 642 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; |
| 643 | + let charArray = data.seller.deskStr.split(''); | ||
| 644 | + let modifiedArray = charArray.map(char => char + ' '); | ||
| 645 | + let resultString = modifiedArray.join('').slice(0, -1); | ||
| 643 | const replacements = { | 646 | const replacements = { |
| 644 | "{年月日}": data.seller.yearMonthDay, | 647 | "{年月日}": data.seller.yearMonthDay, |
| 645 | "{月日}": data.seller.yearMonth, | 648 | "{月日}": data.seller.yearMonth, |
| 646 | "{餐段}": data.seller.soltName, | 649 | "{餐段}": data.seller.soltName, |
| 647 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, | 650 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, |
| 648 | - "{包间名}": data.seller.deskStr, | 651 | + "{包间名}": resultString, |
| 649 | "{区域名+包间名}": data.seller.tablesText, | 652 | "{区域名+包间名}": data.seller.tablesText, |
| 650 | "{经理名字}": data.staffinfo.name, | 653 | "{经理名字}": data.staffinfo.name, |
| 651 | "{客人姓名}": data.detail.rname + str, | 654 | "{客人姓名}": data.detail.rname + str, |
| 652 | "{预订日期}": data.seller.yearMonthDay, | 655 | "{预订日期}": data.seller.yearMonthDay, |
| 653 | - "{桌位}": data.seller.deskStr, | 656 | + "{桌位}": resultString, |
| 654 | }; | 657 | }; |
| 655 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { | 658 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { |
| 656 | return replacements[matched]; | 659 | return replacements[matched]; |
| @@ -640,17 +640,20 @@ Page({ | @@ -640,17 +640,20 @@ Page({ | ||
| 640 | let that = this; | 640 | let that = this; |
| 641 | let data = this.data; | 641 | let data = this.data; |
| 642 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; | 642 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; |
| 643 | + let charArray = data.seller.deskStr.split(''); | ||
| 644 | + let modifiedArray = charArray.map(char => char + ' '); | ||
| 645 | + let resultString = modifiedArray.join('').slice(0, -1); | ||
| 643 | const replacements = { | 646 | const replacements = { |
| 644 | "{年月日}": data.seller.yearMonthDay, | 647 | "{年月日}": data.seller.yearMonthDay, |
| 645 | "{月日}": data.seller.yearMonth, | 648 | "{月日}": data.seller.yearMonth, |
| 646 | "{餐段}": data.seller.soltName, | 649 | "{餐段}": data.seller.soltName, |
| 647 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, | 650 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, |
| 648 | - "{包间名}": data.seller.deskStr, | 651 | + "{包间名}": resultString, |
| 649 | "{区域名+包间名}": data.seller.tablesText, | 652 | "{区域名+包间名}": data.seller.tablesText, |
| 650 | "{经理名字}": data.staffinfo.name, | 653 | "{经理名字}": data.staffinfo.name, |
| 651 | "{客人姓名}": data.detail.rname + str, | 654 | "{客人姓名}": data.detail.rname + str, |
| 652 | "{预订日期}": data.seller.yearMonthDay, | 655 | "{预订日期}": data.seller.yearMonthDay, |
| 653 | - "{桌位}": data.seller.deskStr, | 656 | + "{桌位}": resultString, |
| 654 | }; | 657 | }; |
| 655 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { | 658 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { |
| 656 | return replacements[matched]; | 659 | return replacements[matched]; |
| @@ -639,17 +639,20 @@ Page({ | @@ -639,17 +639,20 @@ Page({ | ||
| 639 | let that = this; | 639 | let that = this; |
| 640 | let data = this.data; | 640 | let data = this.data; |
| 641 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; | 641 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; |
| 642 | + let charArray = data.seller.deskStr.split(''); | ||
| 643 | + let modifiedArray = charArray.map(char => char + ' '); | ||
| 644 | + let resultString = modifiedArray.join('').slice(0, -1); | ||
| 642 | const replacements = { | 645 | const replacements = { |
| 643 | "{年月日}": data.seller.yearMonthDay, | 646 | "{年月日}": data.seller.yearMonthDay, |
| 644 | "{月日}": data.seller.yearMonth, | 647 | "{月日}": data.seller.yearMonth, |
| 645 | "{餐段}": data.seller.soltName, | 648 | "{餐段}": data.seller.soltName, |
| 646 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, | 649 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, |
| 647 | - "{包间名}": data.seller.deskStr, | 650 | + "{包间名}": resultString, |
| 648 | "{区域名+包间名}": data.seller.tablesText, | 651 | "{区域名+包间名}": data.seller.tablesText, |
| 649 | "{经理名字}": data.staffinfo.name, | 652 | "{经理名字}": data.staffinfo.name, |
| 650 | "{客人姓名}": data.detail.rname + str, | 653 | "{客人姓名}": data.detail.rname + str, |
| 651 | "{预订日期}": data.seller.yearMonthDay, | 654 | "{预订日期}": data.seller.yearMonthDay, |
| 652 | - "{桌位}": data.seller.deskStr, | 655 | + "{桌位}": resultString, |
| 653 | }; | 656 | }; |
| 654 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { | 657 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { |
| 655 | return replacements[matched]; | 658 | return replacements[matched]; |
| @@ -591,17 +591,20 @@ Page({ | @@ -591,17 +591,20 @@ Page({ | ||
| 591 | let that = this; | 591 | let that = this; |
| 592 | let data = this.data; | 592 | let data = this.data; |
| 593 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; | 593 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; |
| 594 | - const replacements = { | 594 | + let charArray = data.seller.deskStr.split(''); |
| 595 | + let modifiedArray = charArray.map(char => char + ' '); | ||
| 596 | + let resultString = modifiedArray.join('').slice(0, -1); | ||
| 597 | + const replacements = { | ||
| 595 | "{年月日}": data.seller.yearMonthDay, | 598 | "{年月日}": data.seller.yearMonthDay, |
| 596 | "{月日}": data.seller.yearMonth, | 599 | "{月日}": data.seller.yearMonth, |
| 597 | "{餐段}": data.seller.soltName, | 600 | "{餐段}": data.seller.soltName, |
| 598 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, | 601 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, |
| 599 | - "{包间名}": data.seller.deskStr, | 602 | + "{包间名}": resultString, |
| 600 | "{区域名+包间名}": data.seller.tablesText, | 603 | "{区域名+包间名}": data.seller.tablesText, |
| 601 | "{经理名字}": data.staffinfo.name, | 604 | "{经理名字}": data.staffinfo.name, |
| 602 | "{客人姓名}": data.detail.rname + str, | 605 | "{客人姓名}": data.detail.rname + str, |
| 603 | "{预订日期}": data.seller.yearMonthDay, | 606 | "{预订日期}": data.seller.yearMonthDay, |
| 604 | - "{桌位}": data.seller.deskStr, | 607 | + "{桌位}": resultString, |
| 605 | }; | 608 | }; |
| 606 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { | 609 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { |
| 607 | return replacements[matched]; | 610 | return replacements[matched]; |
| @@ -640,17 +640,20 @@ Page({ | @@ -640,17 +640,20 @@ Page({ | ||
| 640 | let that = this; | 640 | let that = this; |
| 641 | let data = this.data; | 641 | let data = this.data; |
| 642 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; | 642 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; |
| 643 | + let charArray = data.seller.deskStr.split(''); | ||
| 644 | + let modifiedArray = charArray.map(char => char + ' '); | ||
| 645 | + let resultString = modifiedArray.join('').slice(0, -1); | ||
| 643 | const replacements = { | 646 | const replacements = { |
| 644 | "{年月日}": data.seller.yearMonthDay, | 647 | "{年月日}": data.seller.yearMonthDay, |
| 645 | "{月日}": data.seller.yearMonth, | 648 | "{月日}": data.seller.yearMonth, |
| 646 | "{餐段}": data.seller.soltName, | 649 | "{餐段}": data.seller.soltName, |
| 647 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, | 650 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, |
| 648 | - "{包间名}": data.seller.deskStr, | 651 | + "{包间名}": resultString, |
| 649 | "{区域名+包间名}": data.seller.tablesText, | 652 | "{区域名+包间名}": data.seller.tablesText, |
| 650 | "{经理名字}": data.staffinfo.name, | 653 | "{经理名字}": data.staffinfo.name, |
| 651 | "{客人姓名}": data.detail.rname + str, | 654 | "{客人姓名}": data.detail.rname + str, |
| 652 | "{预订日期}": data.seller.yearMonthDay, | 655 | "{预订日期}": data.seller.yearMonthDay, |
| 653 | - "{桌位}": data.seller.deskStr, | 656 | + "{桌位}": resultString, |
| 654 | }; | 657 | }; |
| 655 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { | 658 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { |
| 656 | return replacements[matched]; | 659 | return replacements[matched]; |
| @@ -639,17 +639,20 @@ Page({ | @@ -639,17 +639,20 @@ Page({ | ||
| 639 | let that = this; | 639 | let that = this; |
| 640 | let data = this.data; | 640 | let data = this.data; |
| 641 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; | 641 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; |
| 642 | + let charArray = data.seller.deskStr.split(''); | ||
| 643 | + let modifiedArray = charArray.map(char => char + ' '); | ||
| 644 | + let resultString = modifiedArray.join('').slice(0, -1); | ||
| 642 | const replacements = { | 645 | const replacements = { |
| 643 | "{年月日}": data.seller.yearMonthDay, | 646 | "{年月日}": data.seller.yearMonthDay, |
| 644 | "{月日}": data.seller.yearMonth, | 647 | "{月日}": data.seller.yearMonth, |
| 645 | "{餐段}": data.seller.soltName, | 648 | "{餐段}": data.seller.soltName, |
| 646 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, | 649 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, |
| 647 | - "{包间名}": data.seller.deskStr, | 650 | + "{包间名}": resultString, |
| 648 | "{区域名+包间名}": data.seller.tablesText, | 651 | "{区域名+包间名}": data.seller.tablesText, |
| 649 | "{经理名字}": data.staffinfo.name, | 652 | "{经理名字}": data.staffinfo.name, |
| 650 | "{客人姓名}": data.detail.rname + str, | 653 | "{客人姓名}": data.detail.rname + str, |
| 651 | "{预订日期}": data.seller.yearMonthDay, | 654 | "{预订日期}": data.seller.yearMonthDay, |
| 652 | - "{桌位}": data.seller.deskStr, | 655 | + "{桌位}": resultString, |
| 653 | }; | 656 | }; |
| 654 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { | 657 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { |
| 655 | return replacements[matched]; | 658 | return replacements[matched]; |
| @@ -676,17 +676,20 @@ Page({ | @@ -676,17 +676,20 @@ Page({ | ||
| 676 | let that = this; | 676 | let that = this; |
| 677 | let data = this.data; | 677 | let data = this.data; |
| 678 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; | 678 | let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; |
| 679 | + let charArray = data.seller.deskStr.split(''); | ||
| 680 | + let modifiedArray = charArray.map(char => char + ' '); | ||
| 681 | + let resultString = modifiedArray.join('').slice(0, -1); | ||
| 679 | const replacements = { | 682 | const replacements = { |
| 680 | "{年月日}": data.seller.yearMonthDay, | 683 | "{年月日}": data.seller.yearMonthDay, |
| 681 | "{月日}": data.seller.yearMonth, | 684 | "{月日}": data.seller.yearMonth, |
| 682 | "{餐段}": data.seller.soltName, | 685 | "{餐段}": data.seller.soltName, |
| 683 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, | 686 | "{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide, |
| 684 | - "{包间名}": data.seller.deskStr, | 687 | + "{包间名}": resultString, |
| 685 | "{区域名+包间名}": data.seller.tablesText, | 688 | "{区域名+包间名}": data.seller.tablesText, |
| 686 | "{经理名字}": data.staffinfo.name, | 689 | "{经理名字}": data.staffinfo.name, |
| 687 | "{客人姓名}": data.detail.rname + str, | 690 | "{客人姓名}": data.detail.rname + str, |
| 688 | "{预订日期}": data.seller.yearMonthDay, | 691 | "{预订日期}": data.seller.yearMonthDay, |
| 689 | - "{桌位}": data.seller.deskStr, | 692 | + "{桌位}": resultString, |
| 690 | }; | 693 | }; |
| 691 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { | 694 | let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) { |
| 692 | return replacements[matched]; | 695 | return replacements[matched]; |
-
Please register or login to post a comment