no message

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -946,6 +946,24 @@ Vue.component("TCStatusport", {
     }
   }
 });
+Vue.component("clumpingStatus", {
+  template: `<span>
+          <span v-if="rowData.TravelStatus==1" style="color: red;">未结团</span>
+          <span v-if="rowData.TravelStatus==2" style="color: #47BF8C;">已结团</span>
+          <span v-if="rowData.TravelStatus==5">待结团审核</span>
+          </span>`,
+  props: {
+    rowData: {
+      type: Object
+    },
+    field: {
+      type: String
+    },
+    index: {
+      type: Number
+    }
+  }
+});
 Vue.component("Transport", {
   //  是否联运团
   template: `<span><span v-if="rowData.Is_Transport==='是'" style="color: red;">{{rowData.Is_Transport}}</span><span v-else>{{rowData.Is_Transport}}</span></span>`,
@@ -1139,6 +1157,16 @@ export default {
           isFrozen: true,
           componentName: "TCStatusport"
         },
+        {
+          field: "TravelStatus",
+          title: "结团状态",
+          width: 80,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true,
+          isFrozen: true,
+          componentName: "clumpingStatus"
+        },
         {
           field: "LeaderName",
           title: "领队",

src/components/TravelManager/TravelTeam/priceGroup.vue

@@ -976,6 +976,42 @@
     components: {
       orderForm: orderForm
     },
+    filters: {
+      priceFormat(value) {
+        if (value == null) {
+          return 0.0;
+        }
+        let nStr = value.toFixed(2);
+        nStr += "";
+        let x = nStr.split(".");
+        let x1 = x[0];
+        let x2 = x.length > 1 ? "." + x[1] : "";
+        var rgx = /(\d+)(\d{3})/;
+        while (rgx.test(x1)) {
+          x1 = x1.replace(rgx, "$1" + "," + "$2");
+        }
+        return x1 + x2;
+      },
+      priceFormat2(value) {
+        if (value == null) {
+          return "已包含";
+        }
+        let nStr = value.toFixed(2);
+        nStr += "";
+        let x = nStr.split(".");
+        let x1 = x[0];
+        let x2 = x.length > 1 ? "." + x[1] : "";
+        var rgx = /(\d+)(\d{3})/;
+        while (rgx.test(x1)) {
+          x1 = x1.replace(rgx, "$1" + "," + "$2");
+        }
+        let result = x1 + x2;
+        if (result === "0.00") {
+          result = "已包含";
+        }
+        return result;
+      },
+    },
     methods: {
       //刷新页面
       reSearchPage() {

src/components/orderCommon/order-form.vue

 <style scoped>
-  .commonOrderForm { overflow: auto;
+  .commonOrderForm { 
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 2;
+    overflow: auto;
     height: 600px;
     border-top: 3px solid #38425d;
     background-color: #ffffff;
@@ -1618,6 +1624,9 @@
           (res) => {
             if (res.data.resultCode == 1) {
               this.joinTypeList = res.data.data;
+              this.joinTypeList.splice(-1)
+              this.joinTypeList.splice(-1)
+              this.joinTypeList.splice(-1)
             }
           },
         );