朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 0ce6b4b5af39ce0bcebdb305eb1126a8fb1a308d 1 个父辈 371185cc

update: 

1. 电子运单反向适配SSR数据优化
内嵌 并排对比
正在显示 1 个修改的文件 包含 71 行增加 和 42 行删除
@@ -212,7 +212,7 @@ @@ -212,7 +212,7 @@
212 </el-col> 212 </el-col>
213 <el-col :span="10" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 25px"> 213 <el-col :span="10" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 25px">
214 <span style="font-size: 12px"> 214 <span style="font-size: 12px">
215 - Financial information content 215 + Accounting information content
216 </span> 216 </span>
217 <el-row style="margin-bottom: -5px"> 217 <el-row style="margin-bottom: -5px">
218 <el-col style="width: 90%"> 218 <el-col style="width: 90%">
@@ -252,7 +252,7 @@ @@ -252,7 +252,7 @@
252 252
253 <el-col :span="10" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 25px"> 253 <el-col :span="10" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 25px">
254 <span style="font-size: 12px"> 254 <span style="font-size: 12px">
255 - Financial Information Identification 255 + Accounting Information Identification
256 </span> 256 </span>
257 <el-row style="margin-bottom: -5px"> 257 <el-row style="margin-bottom: -5px">
258 <el-col style="width: 90%"> 258 <el-col style="width: 90%">
@@ -441,9 +441,9 @@ @@ -441,9 +441,9 @@
441 </el-row> 441 </el-row>
442 <el-row style="padding-top: 10px"> 442 <el-row style="padding-top: 10px">
443 <el-col :span="3" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;border-left:1px solid #a5a5a5;padding-left: 5px"> 443 <el-col :span="3" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;border-left:1px solid #a5a5a5;padding-left: 5px">
444 - <span style="font-size: 12px">  
445 - Airport of Destination  
446 - </span> 444 + <span style="font-size: 12px">
  445 + Airport of Destination
  446 + </span>
447 <el-row style="margin-bottom: -5px"> 447 <el-row style="margin-bottom: -5px">
448 <el-col style="width: 95%"> 448 <el-col style="width: 95%">
449 <el-form-item> 449 <el-form-item>
@@ -456,7 +456,7 @@ @@ -456,7 +456,7 @@
456 </el-col> 456 </el-col>
457 </el-row> 457 </el-row>
458 </el-col> 458 </el-col>
459 - <el-col :span="6" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 5px"> 459 + <el-col :span="5" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 5px">
460 <span style="font-size: 12px"> 460 <span style="font-size: 12px">
461 Requested Flight/Date 461 Requested Flight/Date
462 </span> 462 </span>
@@ -481,6 +481,31 @@ @@ -481,6 +481,31 @@
481 </el-col> 481 </el-col>
482 </el-row> 482 </el-row>
483 </el-col> 483 </el-col>
  484 + <el-col :span="4" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 5px">
  485 + <span style="font-size: 12px">
  486 + Requested Flight/Date
  487 + </span>
  488 + <el-row>
  489 + <el-col style="width: 38%">
  490 + <el-form-item>
  491 + <el-input v-model="form.flt.flightNumber" auto-complete="off" placeholder="航班号" size="mini"></el-input>
  492 + </el-form-item>
  493 + </el-col>
  494 + <el-col style="width: 58%;margin-left: 5px">
  495 + <el-form-item>
  496 + <el-date-picker
  497 + v-model="form.flt.day"
  498 + type="date" style="width: auto"
  499 + size="mini"
  500 + format="dd"
  501 + value-format="dd"
  502 + placeholder="选择日期">
  503 + </el-date-picker>
  504 + <!-- <el-input v-model="form.companyName" auto-complete="off" placeholder="航班日期" size="mini"></el-input>-->
  505 + </el-form-item>
  506 + </el-col>
  507 + </el-row>
  508 + </el-col>
484 <el-col :span="3" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 5px"> 509 <el-col :span="3" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 5px">
485 <span style="font-size: 12px"> 510 <span style="font-size: 12px">
486 Amount of Insurance 511 Amount of Insurance
@@ -493,10 +518,10 @@ @@ -493,10 +518,10 @@
493 </el-col> 518 </el-col>
494 </el-row> 519 </el-row>
495 </el-col> 520 </el-col>
496 - <el-col :span="10" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 2px">  
497 - <span style="font-size: 12px">  
498 - INSURANCE —— If carrier offers insurance, and such insurance is requested in accordance with the conditions thereof, indicate amount to be insured in figures in box marked "Amount of Insurance".  
499 - </span> 521 + <el-col :span="7" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 2px">
  522 + <span style="font-size: 12px">
  523 + INSURANCE —— If carrier offers insurance, and such insurance is requested in accordance with the conditions thereof, indicate amount to be insured in figures in box marked "Amount of Insurance".
  524 + </span>
500 </el-col> 525 </el-col>
501 </el-row> 526 </el-row>
502 <!-- 处理信息--> 527 <!-- 处理信息-->
@@ -1151,7 +1176,7 @@ Handling Information @@ -1151,7 +1176,7 @@ Handling Information
1151 </el-col> 1176 </el-col>
1152 <el-col :span="10" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 25px"> 1177 <el-col :span="10" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 25px">
1153 <span style="font-size: 12px"> 1178 <span style="font-size: 12px">
1154 - Financial information content 1179 + Accounting information content
1155 </span> 1180 </span>
1156 <el-row style="margin-bottom: -5px"> 1181 <el-row style="margin-bottom: -5px">
1157 <el-col style="width: 90%"> 1182 <el-col style="width: 90%">
@@ -1190,7 +1215,7 @@ Handling Information @@ -1190,7 +1215,7 @@ Handling Information
1190 1215
1191 <el-col :span="10" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 25px"> 1216 <el-col :span="10" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;padding-left: 25px">
1192 <span style="font-size: 12px"> 1217 <span style="font-size: 12px">
1193 - Financial Information Identification 1218 + Accounting Information Identification
1194 </span> 1219 </span>
1195 <el-row style="margin-bottom: -5px"> 1220 <el-row style="margin-bottom: -5px">
1196 <el-col style="width: 90%"> 1221 <el-col style="width: 90%">
@@ -2589,6 +2614,10 @@ Handling Information @@ -2589,6 +2614,10 @@ Handling Information
2589 for (const i of res.data.acc) { 2614 for (const i of res.data.acc) {
2590 _this.acc_info=i 2615 _this.acc_info=i
2591 } 2616 }
  2617 +
  2618 + // ssr 适配 使用 join 方法并传入换行符 \n 作为分隔符
  2619 + _this.ssr_content = _this.form.ssr.ssr_request_content.join("\n");
  2620 +
2592 //获取dmi数组 2621 //获取dmi数组
2593 let dim = _this.form.rtd.dimensions 2622 let dim = _this.form.rtd.dimensions
2594 if (dim){ 2623 if (dim){
@@ -2744,42 +2773,42 @@ Handling Information @@ -2744,42 +2773,42 @@ Handling Information
2744 } 2773 }
2745 } 2774 }
2746 }, 2775 },
2747 - computed:{  
2748 - formattedSsrContent: {  
2749 - get() {  
2750 - return this.ssr_content;  
2751 - },  
2752 - set(value) {  
2753 - // 过滤掉所有非字母数字和中文字符以及换行符  
2754 - const filteredValue = value.replace(/[^A-Z1-9\n ]/g, '');  
2755 -  
2756 - const lines = value.split('\n');  
2757 - if (lines.length > 3) {  
2758 - this.$message.error('最多只能输入三行文本！');  
2759 - return;  
2760 - } 2776 + computed:{
  2777 + formattedSsrContent: {
  2778 + get() {
  2779 + return this.ssr_content;
  2780 + },
  2781 + set(value) {
  2782 + // 过滤掉所有非字母数字和中文字符以及换行符
  2783 + const filteredValue = value.replace(/[^A-Z1-9\n ]/g, '');
2761 2784
2762 - for (let line of lines) {  
2763 - if (line.length > 65) {  
2764 - this.$message.error('每行不能超过65个字符！'); 2785 + const lines = value.split('\n');
  2786 + if (lines.length > 3) {
  2787 + this.$message.error('最多只能输入三行文本！');
2765 return; 2788 return;
2766 } 2789 }
2767 - }  
2768 2790
2769 - // 如果所有校验都通过了，更新 form.ssr.ssr_request_content  
2770 - this.form.ssr.ssr_request_content = lines;  
2771 - this.ssr_content = value; // 更新视图中的数据 2791 + for (let line of lines) {
  2792 + if (line.length > 65) {
  2793 + this.$message.error('每行不能超过65个字符！');
  2794 + return;
  2795 + }
  2796 + }
  2797 +
  2798 + // 如果所有校验都通过了，更新 form.ssr.ssr_request_content
  2799 + this.form.ssr.ssr_request_content = lines;
  2800 + this.ssr_content = value; // 更新视图中的数据
  2801 + }
  2802 + }
  2803 + },
  2804 + watch:{
  2805 + ssr_content: {
  2806 + handler(newVal) {
  2807 + this.formattedSsrContent = newVal; // 触发计算属性的setter
  2808 + },
  2809 + immediate: true // 立即执行监听器
2772 } 2810 }
2773 } 2811 }
2774 - },  
2775 - watch:{  
2776 - ssr_content: {  
2777 - handler(newVal) {  
2778 - this.formattedSsrContent = newVal; // 触发计算属性的setter  
2779 - },  
2780 - immediate: true // 立即执行监听器  
2781 - }  
2782 - }  
2783 } 2812 }
2784 </script> 2813 </script>
2785 2814