Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -5486,13 +5486,6 @@
         this.addMsg.CommissionShareMoney = "0";
       },
       saveOrder() {
-        // 判断单团类型
-        if (this.addMsg.GroupType == 2) {
-          // if (this.addMsg.QuotationUrl == "") {
-          //   this.Error(this.$t('objFill.v101.FinancialModule.qingscfj'));
-          //   return;
-          // }
-        }
         // 选择联运，联运备注必填
         if (this.addMsg.IsIntermodal == 1 || this.addMsg.IsReturnIntermodal == 1) {
           if (!this.addMsg.UnionRemark) {

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1252,7 +1252,7 @@
                                     </template>
                                   </table>
                                   <font style="color:red;font-weight:bold;cursor:pointer;" slot="reference">
-                                    {{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}</font>
+                                    {{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}</font>
                                 </el-popover>
                               </template>
                             </td>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -858,7 +858,7 @@
                                     </template>
                                   </table>
                                   <font style="color:red;font-weight:bold;cursor:pointer;" slot="reference">
-                                    {{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}</font>
+                                    {{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}</font>
                                 </el-popover>
                               </template>
                             </td>