Merge branch 'blueBranch' into allTestUrgent

src/views/salesData/components/boxLine.vue

@@ -355,6 +355,13 @@
               </el-option>
             </el-select>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">{{$t('状态')}}:</p>
+            <el-select v-model="paramDetail.content.where.isleave" clearable style="margin-right:10px" size="small" :placeholder="$t('请选择状态')" disabled >
+              <el-option :label="$t('在职')" value="1"></el-option>
+              <el-option :label="$t('离职')" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="mt-10 inline-16">
             <span class="search__label" >{{$t('订单类型')}}:</span>
             <el-select class="inline-16" v-model="orderType" filterable :placeholder="$t('请选择')" size="small" clearable   @change="selectOrderType" >
@@ -512,7 +519,8 @@ export default {
           "where": {
             "condition": "",
             "type": "",
-            "tradefield": ""
+            "tradefield": "",
+            "isleave": "",
           }
         }
       },
@@ -681,6 +689,7 @@ export default {
       this.paramDetail.content.dateType = this.param.content.dateType
       this.paramDetail.content.where.type = this.orderType
       this.paramDetail.content.where.tradefield = this.tradefield
+      this.paramDetail.content.where.isleave = this.param.content.where.isleave
       const res = await this.$api.requested(this.paramDetail)
       this.listInfo = res.data
       this.total = res.total