This commit is contained in:
parent
a07655d939
commit
6595f00a32
|
@ -10,22 +10,6 @@
|
||||||
<div class="myinput">
|
<div class="myinput">
|
||||||
<div class="flex">
|
<div class="flex">
|
||||||
<div class="flex-left">
|
<div class="flex-left">
|
||||||
<!-- 分类,需要合并的 -->
|
|
||||||
<!-- <div class="hbbox" v-show="packupFlag">
|
|
||||||
<div v-for="(item, index) in hboptions" :key="index" class="box">
|
|
||||||
<el-select v-model="model[item.enName]" :placeholder="item.placeholder" class="option"
|
|
||||||
:style="hboptionWidth" @change="change(item.lable)" :clearable="item.clearable"
|
|
||||||
:filterable="item.filterable" :size="item.size">
|
|
||||||
<el-option v-for="item in item.options" :key="item.value" :label="item.label"
|
|
||||||
:value="item.value">
|
|
||||||
</el-option>
|
|
||||||
</el-select>
|
|
||||||
<div class="center" v-show="index != hboptions.length - 1">
|
|
||||||
<el-divider direction="vertical"></el-divider>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div> -->
|
|
||||||
<!-- 机器分类更多弹出框 -->
|
|
||||||
<div class="machinemore" v-if="hboptions.length">
|
<div class="machinemore" v-if="hboptions.length">
|
||||||
<el-popover
|
<el-popover
|
||||||
placement="bottom"
|
placement="bottom"
|
||||||
|
@ -455,9 +439,11 @@ export default {
|
||||||
arr = this.data.filter((item) => {
|
arr = this.data.filter((item) => {
|
||||||
return item.format == "timestamp" && item.show == true;
|
return item.format == "timestamp" && item.show == true;
|
||||||
});
|
});
|
||||||
arr.findIndex((item) => item.enName == this.dateval) == -1
|
if(arr.length>0){
|
||||||
? this.$set(this, "dateval", arr[0].enName)
|
arr.findIndex((item) => item.enName == this.dateval) == -1
|
||||||
: "";
|
? this.$set(this, "dateval", arr[0].enName)
|
||||||
|
: "";
|
||||||
|
}
|
||||||
console.log(arr, "arr-----------日期");
|
console.log(arr, "arr-----------日期");
|
||||||
return arr;
|
return arr;
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue