33

commontable/options.vue

@@ -104,6 +104,7 @@
               <!-- 带弹窗 -->
               <div class="popover" v-if="tankuangVisible">
                 <div class="item">
+
                   <el-select
                     v-model="value"
                     placeholder="请选择"
@@ -154,7 +155,24 @@
                         >
                       </div>
                     </div> 
+                    <el-select
+                    v-model="imeisn"
+                    slot="reference"
+                    class="dateselect"
+                    placeholder="请选择"
+                     v-if="selectdata.type=='el-select'"
+                     size="small"
+                    >
+                    <el-option
+                        v-for="item in selectdata.options"
+                        :key="item.label"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                  </el-select>
                     <el-input 
+                    v-if="selectdata.type=='el-input'"
                       slot="reference"
                       v-model="imeisn"
                       size="small"
@@ -416,7 +434,7 @@ export default {
       arr = this.data.filter((item) => {
         return flagarr.includes(item.lable);
       });
-      console.log(arr, "arr-----------");
+      console.log(arr, "hboptionsarr-----------");
       return arr;
     },
     //普通input
@@ -444,7 +462,7 @@ export default {
           ? this.$set(this, "dateval", arr[0].enName)
           : "";
       }
-      console.log(arr, "arr-----------日期");
+      console.log(arr, "dateoptionsarr-----------日期");
       return arr;
     },
     //带弹出框
@@ -453,7 +471,12 @@ export default {
       arr = this.data.filter((item) => {
         return item.ispopover == true;
       });
-      console.log(arr, "arr-----------");
+      if(arr.length>0){
+        this.selectdata=arr[0];
+        this.value=arr[0].enName;
+      }
+    
+      console.log(arr, "popoveroptionsarr-----------");
       return arr;
     },
     // 下拉项不需要合并
@@ -467,7 +490,7 @@ export default {
           !item.ispopover
         );
       });
-      console.log(arr, "arr-----------");
+      console.log(arr, "selectoptionsarr11-----------111");
       return arr;
     },
   },
@@ -481,6 +504,9 @@ export default {
       dateval: "time", //日期下拉项
       packupFlag: false, //收起
       cascaderFrom: [],
+      selectdata:{
+        type:"el-input"
+      },
       cascaderProps: {
         multiple: false,
         checkStrictly: true,
@@ -774,7 +800,7 @@ export default {
     // 查询
     search(val) {
       this.imeipopover = false;
-      this.$emit("search");
+      this.$emit("search",this.value,this.imeisn);
     },
     //重置
     resetfrom() {
@@ -784,7 +810,7 @@ export default {
       this.datevalue = "";
       this.machineval = ""; //机器分类更多弹出框-input回显文本
       this.$emit("resetfrom");
-      this.$emit("search");
+      this.$emit("search",this.value,this.imeisn);
       this.componentKey += 1;
       //  console.log( this.$children," this.$children");
     },
@@ -800,9 +826,12 @@ export default {
     imeiselectchange(e) {
       this.imeisn = "";
       this.textarea = ""; 
+     const find=this.popoveroptions.find((f)=>f.enName==e);
+     this.selectdata=find; 
       this.textarea ? (this.isinput = true) : (this.isinput = false);
       this.$emit("imeichange", this.value, this.imeisn);
-      console.log(e, "imei下拉----------");
+       
+      console.log(e, "imei下拉----------",this.value);
     },
     //日期下拉change
     dateselectchange(e) {

commontable/tablepagination.vue

@@ -64,12 +64,12 @@ export default {
   },
   methods: {
     //选择每页条数
-    handleSizeChange() {
-      this.$emit("handleSizeChange");
+    handleSizeChange(value) {
+      this.$emit("handleSizeChange",value);
     },
     //点击页码
-    handleCurrentChange() {
-      this.$emit("gettbdata");
+    handleCurrentChange(value) {
+      this.$emit("handleCurrentChange",value);
     },
   },
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "erp-element-ui",
-  "version": "1.0.23", 
+  "version": "1.0.24", 
   "description": "",
   "main": "index.js",
   "scripts": {