Merge branch 'bigdata' of gitlab.gongsibao.com:jiangyong/zhichan into bigdata

bigdata/app/front/vues/base/selectentjd.vue

 var tmpl=`
 var tmpl=`
 /**说明：添加了获取焦点时显示历史客户的功能 目前应用于agencytmreg页面 */
 /**说明：添加了获取焦点时显示历史客户的功能 目前应用于agencytmreg页面 */
  <div>
  <div>
-     <el-select style="width:353px" size="small" :value="value" @change="onchange"  v-model="sels" clearable
+     <el-select style="width:353px" size="small" :value="value" @change="onchange" @blur="blur"  v-model="sels" clearable
      @focus="focus"
      @focus="focus"
        :placeholder="placeHolder"
        :placeholder="placeHolder"
        :default-first-option="isFirstDefault"
        :default-first-option="isFirstDefault"
@@ -58,7 +58,7 @@ module.exports=
 
 
    },
    },
    watch:{
    watch:{
-     value:function(v){
+       value:function(v,old){
         if(v && this.autoComplete){
         if(v && this.autoComplete){
             var k=this.valueField?this.valueField:"id";
             var k=this.valueField?this.valueField:"id";
             this.refwhere={};
             this.refwhere={};
@@ -89,6 +89,9 @@ module.exports=
           this.fetchHistoryData();
           this.fetchHistoryData();
        }
        }
      },
      },
+     blur(e){
+       this.$emit("input",this.sels,e);
+     },
      fetchHistoryData(){
      fetchHistoryData(){
        console.log("this.frombrowser");
        console.log("this.frombrowser");
        console.log(this.frombrowser);
        console.log(this.frombrowser);
@@ -174,6 +177,7 @@ module.exports=
        
        
      },
      },
      onchange:function(curval){
      onchange:function(curval){
+       console.log(this.sels,curval,"bbbbbbbbbbbbbbbbbb");
        if(this.fetchtype=="history" && this.showhistory){
        if(this.fetchtype=="history" && this.showhistory){
          if(this.dataSouce && this.dataSouce.length>0){
          if(this.dataSouce && this.dataSouce.length>0){
            for(var i=0;i<this.dataSouce.length;i++){
            for(var i=0;i<this.dataSouce.length;i++){