|
|
@@ -30,6 +30,114 @@
|
|
|
</el-select>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ <el-row :span="24" v-if="from.type==='date'||from.type==='daterange'">
|
|
|
+ <el-col :span="3.8" style="line-height: 40px">
|
|
|
+ 日期：
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-checkbox-group v-model="checkDateList" style="margin-top: 10px;margin-left: 10px;" size="large">
|
|
|
+ <el-checkbox label="yyyy" >年</el-checkbox>
|
|
|
+ <el-checkbox label="MM" >月</el-checkbox>
|
|
|
+ <el-checkbox label="dd" >日</el-checkbox>
|
|
|
+ </el-checkbox-group>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3.8" style="line-height: 40px">
|
|
|
+ 分隔符:
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8" style="margin-left: 10px;">
|
|
|
+ <el-select
|
|
|
+ style="width:100%;"
|
|
|
+ v-model="from.type"
|
|
|
+ clearable
|
|
|
+ placeholder="请选择"
|
|
|
+
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ label="文本"
|
|
|
+ :value="文本"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ <el-option
|
|
|
+ label="-"
|
|
|
+ value="-"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ <el-option
|
|
|
+ label="/"
|
|
|
+ value="/"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ </el-row>
|
|
|
+ <el-row :span="24" v-if="from.type==='date'||from.type==='daterange'">
|
|
|
+ <el-col :span="3.8" style="line-height: 40px">
|
|
|
+ 时间：
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-checkbox-group v-model="checkDateList" style="margin-top: 10px;margin-left: 10px;" size="large">
|
|
|
+ <el-checkbox label="hh" >时</el-checkbox>
|
|
|
+ <el-checkbox label="mm" >分</el-checkbox>
|
|
|
+ <el-checkbox label="ss" >秒</el-checkbox>
|
|
|
+ </el-checkbox-group>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3.8" style="line-height: 40px">
|
|
|
+ 分隔符:
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8" style="margin-left: 10px;">
|
|
|
+ <el-select
|
|
|
+ style="width:100%;"
|
|
|
+ v-model="from.type"
|
|
|
+ clearable
|
|
|
+ placeholder="请选择"
|
|
|
+
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ label="文本"
|
|
|
+ :value="文本"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ <el-option
|
|
|
+ label=":"
|
|
|
+ value=":"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ <el-option
|
|
|
+ label="/"
|
|
|
+ value="/"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ </el-row>
|
|
|
+ <el-row :span="24" v-if="from.type==='daterange'">
|
|
|
+ <el-col :span="3.3" style="line-height: 40px">
|
|
|
+ 中间分隔符：
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="18" style="margin-left: 10px;">
|
|
|
+ <el-select
|
|
|
+ style="width:100%;"
|
|
|
+ v-model="from.type"
|
|
|
+ clearable
|
|
|
+ placeholder="请选择"
|
|
|
+
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ label="-"
|
|
|
+ value="-"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ <el-option
|
|
|
+ label="~"
|
|
|
+ value="~"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
</div>
|
|
|
<!-- 添加框 -->
|
|
|
<div
|
|
|
@@ -134,6 +242,8 @@ export default {
|
|
|
},
|
|
|
setInputTable: [],//数据体
|
|
|
disabled: false,
|
|
|
+ checkDateList:[],
|
|
|
+ testvalue1: new Date(2000, 0, 0, 0, 22),
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
