|
|
@@ -214,10 +214,10 @@
|
|
|
</div>
|
|
|
<div>
|
|
|
<el-row v-for="(sItem, sIndex) of item.condition_content" :key="'tj'+sIndex" :gutter="12" class="mb12">
|
|
|
- <el-col :span="2">
|
|
|
+ <el-col :span="1.5">
|
|
|
<div class="text-right">逻辑{{ sIndex + 1 }}</div>
|
|
|
</el-col>
|
|
|
- <el-col :span="7">
|
|
|
+ <el-col :span="5">
|
|
|
<el-cascader
|
|
|
v-model="sItem.param1"
|
|
|
:options="objects"
|
|
|
@@ -259,7 +259,54 @@
|
|
|
<el-col v-if="sItem.condition == '范围'" :span="3">
|
|
|
<el-input v-model="sItem.fanwei_2" clearable placeholder="请输入" style="width: 100%;" />
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
+ <!-- 时效 -->
|
|
|
+ <el-col v-if="sItem.condition == '时效'" :span="3">
|
|
|
+ <el-cascader
|
|
|
+ v-model="sItem.sx_1"
|
|
|
+ :options="objects"
|
|
|
+ :props="{
|
|
|
+ expandTrigger: 'hover',
|
|
|
+ value: 'field',
|
|
|
+ label: 'field_name',
|
|
|
+ children: 'child'
|
|
|
+ }"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ :show-all-levels="false"
|
|
|
+ placeholder="请选择"
|
|
|
+ style="width: 100%;"
|
|
|
+ />
|
|
|
+ </el-col>
|
|
|
+ <el-col v-if="sItem.condition == '时效'" :span="0.5">
|
|
|
+ <div class="text-right">至</div>
|
|
|
+ </el-col>
|
|
|
+ <el-col v-if="sItem.condition == '时效'" :span="3">
|
|
|
+ <el-cascader
|
|
|
+ v-model="sItem.sx_2"
|
|
|
+ :options="objects"
|
|
|
+ :props="{
|
|
|
+ expandTrigger: 'hover',
|
|
|
+ value: 'field',
|
|
|
+ label: 'field_name',
|
|
|
+ children: 'child'
|
|
|
+ }"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ :show-all-levels="false"
|
|
|
+ placeholder="请选择"
|
|
|
+ style="width: 100%;"
|
|
|
+ />
|
|
|
+ </el-col>
|
|
|
+ <el-col v-if="sItem.condition == '时效' && sItem.sx_2" :span="0.5">
|
|
|
+ <div class="text-right">+</div>
|
|
|
+ </el-col>
|
|
|
+ <el-col v-if="sItem.condition == '时效' && sItem.sx_2" :span="2">
|
|
|
+ <el-input v-model="sItem.sx_3" clearable placeholder="请输入" style="width: 100%;" />
|
|
|
+ </el-col>
|
|
|
+ <el-col v-if="sItem.condition == '时效'" :span="1">
|
|
|
+ <div class="text-right">小时</div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="onAddGZ(index, sIndex)" />
|
|
|
<el-button v-if="item.condition_content.length !== 1" type="primary" size="mini" plain icon="el-icon-minus" @click="onDeleteGZ(index, sIndex)" />
|
|
|
</el-col>
|
|
|
@@ -721,6 +768,12 @@ export default {
|
|
|
if (i.condition === '范围') {
|
|
|
i.param2 = (i.fanwei_1 ? i.fanwei_1 : '') + '-' + (i.fanwei_2 ? i.fanwei_2 : '')
|
|
|
}
|
|
|
+ if (i.condition === '时效') {
|
|
|
+ const sx_1 = i.sx_1 ? i.sx_1.join('.') : ''
|
|
|
+ const sx_2 = i.sx_2 ? i.sx_2.join('.') : ''
|
|
|
+ const sx_3 = i.sx_3
|
|
|
+ i.param2 = sx_1 + '-' + (sx_2 + '+' + sx_3)
|
|
|
+ }
|
|
|
})
|
|
|
})
|
|
|
if (valid) {
|
gaoxizhong