页面修改

src/components/TravelContractConfirm.vue

@@ -1091,7 +1091,7 @@
                       </el-col>
                     </el-row>
                   </li>
-                  <!-- <li>
+                  <li>
                     <el-row>
                       <el-col :span="24" style="text-align:left;">
                         <p>旅游者委托旅行社提供上述 1
@@ -1140,7 +1140,7 @@
                           </template>
                           5
                           <template
-                            v-if="CtObj.ContractTicketAndHotel && (CtObj.ContractTicketAndHotel.ContractHotels  ||CtObj.ContractTicketAndHotel.ContractTickets)">
+                            v-if="CtObj.ContractTicketAndHotel && ((CtObj.ContractTicketAndHotel.ContractHotels&&CtObj.ContractTicketAndHotel.ContractHotels.length>0)  ||(CtObj.ContractTicketAndHotel.ContractTickets&&CtObj.ContractTicketAndHotel.ContractTickets.length>0))">
                             <img
                               src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
                               style="margin-bottom: -4px;width:3rem;" />
@@ -1156,7 +1156,7 @@
                           等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p>
                       </el-col>
                     </el-row>
-                  </li> -->
+                  </li>
                   <li>
                     <el-row>
                       <el-col :span="24" style="text-align:left;">
@@ -1197,7 +1197,7 @@
                 </ul>
                 <br>
                 <p><b>三、费用计算：</b></p>
-                <!-- <p>旅游者委托旅行社提供上述 1
+                <p>旅游者委托旅行社提供上述 1
                   <template v-if="CtObj.ContractTicketList&&CtObj.ContractTicketList.length>0">
                     <img
                       src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
@@ -1243,7 +1243,7 @@
                   </template>
                   5
                   <template
-                    v-if="CtObj.ContractTicketAndHotel && (CtObj.ContractTicketAndHotel.ContractHotels  ||CtObj.ContractTicketAndHotel.ContractTickets)">
+                    v-if="CtObj.ContractTicketAndHotel && ((CtObj.ContractTicketAndHotel.ContractHotels&&CtObj.ContractTicketAndHotel.ContractHotels.length>0)  ||(CtObj.ContractTicketAndHotel.ContractTickets&&CtObj.ContractTicketAndHotel.ContractTickets.length>0))">
                     <img
                       src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
                       style="margin-bottom: -4px;width:3rem;" />
@@ -1256,7 +1256,7 @@
                   6 <img
                     src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
                     style="margin-bottom: -4px;width:3rem;" />等共计
-                  等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p> -->
+                  等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p>
                 <p>费用总额（小写）人民币<span>{{CtObj.C_TotalPrice}}</span>元&nbsp;&nbsp;（大写）人民币<span>
                     <font>{{number_chinese(CtObj.C_TotalPrice)}}</font>
                   </span></p>
@@ -3720,7 +3720,7 @@
     },
     methods: {
       getCount() {
-        var serviceCount = 1;
+        var serviceCount = 0;
         if (this.CtObj.ContractTicketList != null && this.CtObj.ContractTicketList.length > 0) {
           serviceCount++;
         }

src/components/TravelContractView.vue

@@ -776,7 +776,7 @@
                 </table>
                 <br>
                 <p><b>三、费用计算：</b></p>
-                <!-- <p>旅游者委托旅行社提供上述 1
+                <p>旅游者委托旅行社提供上述 1
                   <template v-if="CtObj.ContractTicketList&&CtObj.ContractTicketList.length>0">
                     <img
                       src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
@@ -822,7 +822,7 @@
                   </template>
                   5
                   <template
-                    v-if="CtObj.ContractTicketAndHotel && (CtObj.ContractTicketAndHotel.ContractHotels  ||CtObj.ContractTicketAndHotel.ContractTickets)">
+                    v-if="CtObj.ContractTicketAndHotel && ((CtObj.ContractTicketAndHotel.ContractHotels&&CtObj.ContractTicketAndHotel.ContractHotels.length>0)  ||(CtObj.ContractTicketAndHotel.ContractTickets&&CtObj.ContractTicketAndHotel.ContractTickets.length>0))">
                     <img
                       src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
                       style="margin-bottom: -4px;width:17px;heigth:17px" />
@@ -832,10 +832,7 @@
                       src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAdVBMVEUAAAAAAACwsLDNzc3Q0ND///+5ubn///+5ubm8vLzz8/Pt7e3r6+vo6Ojv7+/6+vr4+PjS0tKbm5vk5OTf39/b29vCwsKJiYni4uLa2tqsrKx3d3e2trawsLCpqamkpKSSkpLExMSfn5+Li4uEhIR9fX0mJiaMZFtDAAAAB3RSTlMAEh3+/YUS7eKGqgAAAJ1JREFUGNNtzzcWwjAQRVHANkqjnJxt4v6XiMRBiILXza3+HP7UtQSXSNsl0YGhEru0SQigmiBJMJJghZSScisROWdRzoxKKWy0QuSUhfIxLizcjKNFKJ0fZtos/RGxPqOjXxFC4ClOCwjxEdaP983P8epZkWE3lrF1b6o0AwA4reG9h3AEnHvPUwjy5jb0qNQHnX9vcK3pDrljLV0vwMkLmE4T88cAAAAASUVORK5CYII="
                       style="margin-bottom: -4px;width:17px;heigth:17px" />
                   </template>
-                  6 <img
-                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
-                    style="margin-bottom: -4px;width:17px;heigth:17px" />等共计
-                  等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p> -->
+                  等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p>
                 <p>费用总额（小写）人民币<span>{{CtObj.C_TotalPrice}}</span>元&nbsp;&nbsp;（大写）人民币<span>
                     <font>{{number_chinese(CtObj.C_TotalPrice)}}</font>
                   </span></p>
@@ -2186,7 +2183,7 @@
     },
     methods: {
       getCount() {
-        var serviceCount = 1;
+        var serviceCount = 0;
         if (this.CtObj.ContractTicketList != null && this.CtObj.ContractTicketList.length > 0) {
           serviceCount++;
         }