|
|
@ -85,7 +85,7 @@ |
|
|
|
|
|
|
|
<el-date-picker v-else-if="personItem.colType==='datepicker'||personItem.colType==='date'" |
|
|
|
v-model="personItem.colVal" |
|
|
|
class="item_width_1" |
|
|
|
class="item_width_2" |
|
|
|
type="datetime" |
|
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
|
value="yyyy-MM-dd HH:mm:ss" |
|
|
@ -175,7 +175,7 @@ |
|
|
|
label="请输入"></el-input-number> |
|
|
|
<el-date-picker v-else-if="houseItem.colType==='datepicker'||houseItem.colType==='date'" |
|
|
|
v-model="houseItem.colVal" |
|
|
|
class="item_width_1" |
|
|
|
class="item_width_2" |
|
|
|
type="datetime" |
|
|
|
size="mini" |
|
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
@ -270,7 +270,7 @@ |
|
|
|
label="请输入"></el-input-number> |
|
|
|
<el-date-picker v-else-if="staticItem.colType==='datepicker'||staticItem.colType==='date'" |
|
|
|
v-model="staticItem.colVal" |
|
|
|
class="item_width_1" |
|
|
|
class="item_width_2" |
|
|
|
type="datetime" |
|
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
|
value="yyyy-MM-dd HH:mm:ss" |
|
|
@ -932,7 +932,7 @@ export default { |
|
|
|
addPerson () { |
|
|
|
let obj = { |
|
|
|
ruleDesc: '',//规则描述文字,例如:基础信息性别等于女 |
|
|
|
nextLogicalRel: 'and',//与上一条的关系;and、or |
|
|
|
nextLogicalRel: '',//与上一条的关系;and、or |
|
|
|
itemGroupId: '', |
|
|
|
itemId: '', |
|
|
|
queryType: '', |
|
|
@ -960,7 +960,7 @@ export default { |
|
|
|
addHouse () { |
|
|
|
let obj = { |
|
|
|
ruleDesc: '', |
|
|
|
nextLogicalRel: 'and',//与上一条的关系;and、or |
|
|
|
nextLogicalRel: '',//与上一条的关系;and、or |
|
|
|
queryType: '', |
|
|
|
colTable: '', |
|
|
|
colKey: '', |
|
|
@ -986,7 +986,7 @@ export default { |
|
|
|
addStatic () { |
|
|
|
let obj = { |
|
|
|
ruleDesc: '', |
|
|
|
nextLogicalRel: 'and',//与上一条的关系;and、or |
|
|
|
nextLogicalRel: '',//与上一条的关系;and、or |
|
|
|
queryType: '', |
|
|
|
colTable: '', |
|
|
|
colKey: '', |
|
|
@ -1168,6 +1168,10 @@ export default { |
|
|
|
width: 120px; |
|
|
|
margin-right: 10px; |
|
|
|
} |
|
|
|
.item_width_2 { |
|
|
|
width: 200px; |
|
|
|
margin-right: 10px; |
|
|
|
} |
|
|
|
|
|
|
|
/deep/ .el-checkbox { |
|
|
|
margin-right: 10px; |
|
|
|