no message

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue

@@ -34,13 +34,21 @@
     <div class="flexOne domesticCommissiondetails">
       <div style="min-height: 70px;">
         <ul class="opUl">
+          <li>
+            <em>订单类型</em>
+            <el-select v-model="msg.OrderType" class="w200 HworkInput"
+            @change="handleCurrentChange(1)">
+              <el-option label="不限" :value="-1"></el-option>
+              <el-option v-for="item in OrderTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
+            </el-select>
+          </li>
             <li>
               <em>订单号</em>
               <el-input maxlength="50" v-model="msg.OrderId" class="permiss-input w200"
                 @keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
             </li>
             <li>
-              <em>类型</em>
+              <em>销售类型</em>
               <el-select v-model="msg.EmpType" size="mini" @change="handleCurrentChange(1)" filterable>
                   <el-option v-for="(item,index) in titleList" :key="item.index" :label="item.name"
                       :value="item.id"></el-option>
@@ -81,6 +89,14 @@
           <th>岗位</th>
           <th>姓名</th>
           <th>订单号</th>
+          <th>订单类型</th>
+          <th width="100">团号</th>
+          <th width="100">出团公司</th>
+          <th width="100">线路</th>
+          <th width="50">人数</th>
+          <th>团利润</th>
+          <th>提成方式</th>
+
           <th>订单利润</th>
           <th>应发</th>
           <th>当期提成</th>
@@ -101,6 +117,16 @@
           <td>{{item.PostName?item.PostName:'-'}}</td>
           <td>{{item.EmName}}</td>
           <td><span class="cursor-p" @click="clickUrl(item,1)">{{item.OrderId}}</span></td>
+          <td>{{item.OrderTypeName}}</td>
+          <td>{{item.TCNUM?item.TCNUM:'-'}}</td>
+          <td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
+          <td>{{item.LineName?item.LineName:'-'}}</td>
+          <td>{{item.PeopleNum?item.PeopleNum:'-'}}<template v-if="item.TCID>0">/{{item.TCGuestNum}}</template></td>
+          <td><template v-if="item.TCID>0">{{item.TCProfit?item.TCProfit:'-'}}</template>
+              <template v-else>-</template>
+          </td>
+          <td>{{item.Way==1?'销售额':'利润比'}}</td>
+          
           <td>{{item.OrderProfit}}</td>
           <td>{{item.YCommission}}</td>
           <td>{{item.Commission}}</td>
@@ -116,7 +142,7 @@
           <td>{{item.Remark?item.Remark:'-'}}</td>
         </tr>
         <tr v-if="dataList.length==0">
-          <td style="text-align:center" colspan="16">暂无数据</td>
+          <td style="text-align:center" colspan="23">暂无数据</td>
         </tr>
       </table>
       <!-- 分页 -->
@@ -143,6 +169,7 @@
       },
       data() {
         return {
+          OrderTypeList:[],
           objNew:{},
           outerVisible:false,
           Month: moment().format("YYYY-MM"),
@@ -152,7 +179,8 @@
             EmpId: -1,
             PeriodsId: -1,
             EmpType: '-1',
-            OrderId:''
+            OrderId:'',
+            OrderType: -1
           },
           loading: false,
           //数据源
@@ -174,7 +202,7 @@
       },
       mounted() {
         let userInfo = this.getLocalStorage();
-        
+        this.GetOrderTypeEnumList()
         this.getEmployee() //人员
         this.GetCommissionPeroidsList()//期数
         let ActionMenuCode = userInfo.ActionMenuCode;
@@ -188,6 +216,15 @@
         }
       },
       methods: {
+        GetOrderTypeEnumList() {
+          this.apipost("CarSingle_post_GetOrderTypeEnumList", {}, (res) => {
+            if (res.data.resultCode == 1) {
+              this.OrderTypeList = res.data.data;
+            } else {
+              this.$message.error(res.data.message);
+            }
+          });
+        },
         clickUrl(item,type){
             if(type==2){//线索
                 

src/components/SalesModule/productQuery2.vue

@@ -672,12 +672,6 @@
       },
     },
     mounted() {
-      // crm自动登陆传过来的参数
-      if (this.$route.query.crmOrderObj) {
-        this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
-        this.addMsg.LureEmpId = this.crmOrderObj.LureEmpId //引流id
-        this.addMsg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
-      }
       this.userInfo = this.getLocalStorage();
       this.CurrentUserInfo = this.userInfo ;
       this.userId = this.userInfo.EmployeeId;

src/components/myOrdersAllType/components/OrderList.vue

 <template>
   <el-table border ref="multipleTable" :data="OrderList" style="width: 100%"
-    :default-sort="{prop: 'Money', order: 'null'}"
+    :default-sort="{prop: 'null', order: 'null'}"
     :sort-by="['Money','Income','PreferTipAmount','PlatformTax','Refund','CostMoney','DueInMoney']">
     <el-table-column width="200" prop="CreateTimeStr" label="订单Id" show-overflow-tooltip>
       <template slot-scope="scope">

src/components/orderCommon/order-form2.vue

@@ -1379,7 +1379,7 @@
       },
       //计算少价金额
       getTypePrice() {
-        if (this.pagesTitle == '当地游产品') {
+        if (this.addMsg.CustomerType<3) {
           this.addMsg.ContactName = ''
           this.addMsg.ContactMobile = ''
         }