no message

src/components/customerManage/rankConfig.vue

@@ -34,6 +34,7 @@
         display: flex;
         flex-wrap: wrap;
         padding: 10px 0;
+        align-items: center;
     }
 
     .dataText_text {
@@ -45,6 +46,13 @@
         display: flex;
         align-items: center;
     }
+    .moreText{
+        display: block;
+        color: #409EFF;
+        font-size: 14px;
+        cursor: pointer;
+        margin-top: 10px;
+    }
 </style>
 <template>
     <div class="customerManage">
@@ -61,8 +69,21 @@
                 <div><span>已选择：{{msg.FlowList.length}}人</span></div>
             </div>
             <div class="dataText">
+                <template v-if="moreSalesShow">
                     <el-tag v-for="(item,index) in msg.FlowList" :key="index" class="dataText_text">{{item.EmName}}
                     </el-tag>
+                </template>
+                <template v-else>
+                    <el-tag v-for="(item,index) in FlowList" :key="index" class="dataText_text">{{item.EmName}}
+                    </el-tag>
+                </template>
+                <div>
+                   <i class="icon moreText"
+                :class="!moreSalesShow?'el-icon-arrow-down':'el-icon-arrow-up'" 
+                @click="moreSalesShow=!moreSalesShow">
+                {{!moreSalesShow?'更多':'收起'}}</i> 
+                </div>
+                
             </div>
             <div class="distributionRules_text">
                 <span>销售排行配置</span>
@@ -75,8 +96,21 @@
                 <div><span>已选择：{{msg.SaleList.length}}人</span></div>
             </div>
             <div class="dataText">
+                <!-- <el-tag v-for="(item,index) in msg.SaleList" :key="index" class="dataText_text">{{item.EmName}}
+                </el-tag> -->
+                <template v-if="moreDrainageShow">
                     <el-tag v-for="(item,index) in msg.SaleList" :key="index" class="dataText_text">{{item.EmName}}
                     </el-tag>
+                </template>
+                <template v-else>
+                    <el-tag v-for="(item,index) in SaleList" :key="index" class="dataText_text">{{item.EmName}}
+                    </el-tag>
+                </template>
+                <div>
+                   <i class="icon moreText"
+                :class="!moreDrainageShow?'el-icon-arrow-down':'el-icon-arrow-up'" 
+                @click="moreDrainageShow=!moreDrainageShow">{{!moreDrainageShow?'更多':'收起'}}</i> 
+                </div>
             </div>
             <br /><br />
             <el-button class="add-box-btn add-box-cancel" @click="saveRankRule" :disabled="disabledOff">立即保存</el-button>
@@ -95,8 +129,12 @@
         },
         data() {
             return {
+                moreDrainageShow:false,
+                moreSalesShow:false,
                 disabledOff: false,
                 isShowRuleForm: false,
+                SaleList:[],
+                FlowList:[],
                 msg: {
                     ID: 0,
                     SNO: 1,
@@ -165,7 +203,17 @@
                         this.msg.Content = tempData.Content;
                         this.msg.Mask = tempData.Mask;
                         this.msg.FlowList = tempData.FlowList;
+                        tempData.FlowList.forEach((item,x)=>{
+                            if(x<15){
+                                this.FlowList.push(item)
+                            }
+                        })
                         this.msg.SaleList = tempData.SaleList;
+                        tempData.FlowList.forEach((item,x)=>{
+                            if(x<15){
+                                this.SaleList.push(item)
+                            }
+                        })
                     }
                 })
             },

src/components/dialogModel/inAccordanceWithDialog.vue

@@ -259,7 +259,7 @@
                     'rgba(153, 199, 235,.2)',
                     'rgba(34,184,221,.2)',
                     'rgba(221,72,34,.2)',
-                    'rgba(204,51,204,.23)',
+                    'rgba(204,51,204,.2)',
                     'rgba(255,204,0,.2)',
                     'rgba(77,179,179,.2)',
                     'rgba(196,60,141,.2)',

src/components/planeTicketOrder/index.vue

@@ -208,6 +208,38 @@
             >
             </el-date-picker>
           </el-col>
+          <el-col :xs="8" :sm="7" :md="6" :lg="4" :xl="3">
+            <span class="font-size-12" style="padding-right: 10px"
+              >出发开始</span
+            >
+            <el-date-picker
+              v-model="msg.DepartSTime"
+              @change="getList"
+              size="mini"
+              style="width: 100%"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="出发开始"
+            >
+            </el-date-picker>
+          </el-col>
+          <el-col :xs="8" :sm="7" :md="6" :lg="4" :xl="3">
+            <span class="font-size-12" style="padding-right: 10px"
+              >出发结束</span
+            >
+            <el-date-picker
+              v-model="msg.DepartETime"
+              @change="getList"
+              size="mini"
+              style="width: 100%"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="出发结束"
+            >
+            </el-date-picker>
+          </el-col>
         </el-row>
       </div>
     </div>
@@ -542,10 +574,16 @@ export default {
       let data = JSON.parse(this.$route.query.erpOrderObj);
       this.msg.OrderId = data.OrderId;
       if(data.PeriodsId){//erp跳转的当月利润
+        if(data.EmpType==1){
           this.msg.EnterID = data.EmpId
+        }if(data.EmpType==2){
+          this.msg.CreateBy = data.EmpId
+        }
         var MonthDayNum = new Date(data.PeriodsId.slice(0,4), data.PeriodsId.slice(4,7), 0).getDate(); //计算当月的天数
-        this.msg.StartTime = data.PeriodsId + '-01'
-        this.msg.EndTime = data.PeriodsId + '-' + MonthDayNum
+        // this.msg.StartTime = data.PeriodsId + '-01'
+        // this.msg.EndTime = data.PeriodsId + '-' + MonthDayNum
+        this.msg.FinishSTime  = data.PeriodsId + '-01'
+        this.msg.FinishETime = data.PeriodsId + '-' + MonthDayNum
       }
     }
     this.Employee(); //业务员
@@ -585,6 +623,8 @@ export default {
         EndTime: "",
         FinishSTime: "",//完结开始时间 
         FinishETime: "",//完结结束时间
+        DepartSTime: "",//出发开始
+        DepartETime: "",//出发结束
       },
       VisaList:[
         { Name: "不限", Id: "0" },