This commit is contained in:
ln1778 2024-05-08 18:07:29 +08:00
parent c7e03efeef
commit 8e2ee8e9b9
3 changed files with 46 additions and 17 deletions

View File

@ -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) {

View File

@ -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);
},
},
};

View File

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