|
@@ -228,7 +228,7 @@
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="规则具体内容" min-width="800px" prop="">
|
|
|
+ <el-table-column label="规则具体内容" min-width="900px" prop="">
|
|
|
<template slot-scope="scope">
|
|
|
<div class="type_content">
|
|
|
<el-form-item
|
|
@@ -252,69 +252,71 @@
|
|
|
<!-- v-if="klRuleByIdSub[scope.$index].dataType === '1'" -->
|
|
|
<el-form-item
|
|
|
class="type_content_item"
|
|
|
- style="flex: 2"
|
|
|
+ style="flex: 2;margin:0 10px"
|
|
|
label="最大值:"
|
|
|
v-if="scope.row.dataType === '1'"
|
|
|
>
|
|
|
<div>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item
|
|
|
- :prop="`klRuleByIdSub[${scope.$index}].subMaxOperator`"
|
|
|
- :rules="[
|
|
|
- {
|
|
|
- validator: (rule, value, callback) => {
|
|
|
- subMaxOperator(scope, rule, value, callback);
|
|
|
- },
|
|
|
- trigger: 'blur'
|
|
|
- }
|
|
|
- ]"
|
|
|
- >
|
|
|
- <el-select
|
|
|
- v-model="scope.row.subMaxOperator"
|
|
|
- placeholder="请选择"
|
|
|
- clearable
|
|
|
+ <el-row :gutter="10">
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item
|
|
|
+ :prop="`klRuleByIdSub[${scope.$index}].subMaxOperator`"
|
|
|
+ :rules="[
|
|
|
+ {
|
|
|
+ validator: (rule, value, callback) => {
|
|
|
+ subMaxOperator(scope, rule, value, callback);
|
|
|
+ },
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
+ ]"
|
|
|
>
|
|
|
- <el-option
|
|
|
- v-for="item in operMaxList"
|
|
|
- :key="item.key"
|
|
|
- :label="item.name"
|
|
|
- :value="item.key"
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.subMaxOperator"
|
|
|
+ placeholder="请选择"
|
|
|
+ clearable
|
|
|
>
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item
|
|
|
- :prop="`klRuleByIdSub[${scope.$index}].subMaxValue`"
|
|
|
- :rules="[
|
|
|
- {
|
|
|
- validator: (rule, value, callback) => {
|
|
|
- subMaxValue(scope, rule, value, callback);
|
|
|
- },
|
|
|
- trigger: 'blur'
|
|
|
- }
|
|
|
- ]"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- type="text"
|
|
|
- v-model="scope.row.subMaxValue"
|
|
|
- placeholder="填写数值"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item
|
|
|
- :prop="`klRuleByIdSub[${scope.$index}].subMaxUnit`"
|
|
|
- :rules="rules.subMaxUnit"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- type="text"
|
|
|
- v-model.trim="scope.row.subMaxUnit"
|
|
|
- placeholder="填写单位"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
+ <el-option
|
|
|
+ v-for="item in operMaxList"
|
|
|
+ :key="item.key"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.key"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item
|
|
|
+ :prop="`klRuleByIdSub[${scope.$index}].subMaxValue`"
|
|
|
+ :rules="[
|
|
|
+ {
|
|
|
+ validator: (rule, value, callback) => {
|
|
|
+ subMaxValue(scope, rule, value, callback);
|
|
|
+ },
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
+ ]"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ type="text"
|
|
|
+ v-model="scope.row.subMaxValue"
|
|
|
+ placeholder="填写数值"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item
|
|
|
+ :prop="`klRuleByIdSub[${scope.$index}].subMaxUnit`"
|
|
|
+ :rules="rules.subMaxUnit"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ type="text"
|
|
|
+ v-model.trim="scope.row.subMaxUnit"
|
|
|
+ placeholder="填写单位"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -324,64 +326,66 @@
|
|
|
v-if="scope.row.dataType === '1'"
|
|
|
>
|
|
|
<div class="select-item clearfix">
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item
|
|
|
- :prop="`klRuleByIdSub[${scope.$index}].subMinOperator`"
|
|
|
- :rules="[
|
|
|
- {
|
|
|
- validator: (rule, value, callback) => {
|
|
|
- subMinOperatorRule(scope, rule, value, callback);
|
|
|
- },
|
|
|
- trigger: 'blur'
|
|
|
- }
|
|
|
- ]"
|
|
|
- >
|
|
|
- <el-select
|
|
|
- v-model="scope.row.subMinOperator"
|
|
|
- placeholder="请选择"
|
|
|
- clearable
|
|
|
+ <el-row :gutter="10">
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item
|
|
|
+ :prop="`klRuleByIdSub[${scope.$index}].subMinOperator`"
|
|
|
+ :rules="[
|
|
|
+ {
|
|
|
+ validator: (rule, value, callback) => {
|
|
|
+ subMinOperatorRule(scope, rule, value, callback);
|
|
|
+ },
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
+ ]"
|
|
|
>
|
|
|
- <el-option
|
|
|
- v-for="item in operMinList"
|
|
|
- :key="item.name"
|
|
|
- :label="item.name"
|
|
|
- :value="item.name"
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.subMinOperator"
|
|
|
+ placeholder="请选择"
|
|
|
+ clearable
|
|
|
>
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item
|
|
|
- :prop="`klRuleByIdSub[${scope.$index}].subMinValue`"
|
|
|
- :rules="[
|
|
|
- {
|
|
|
- validator: (rule, value, callback) => {
|
|
|
- subMinValueRule(scope, rule, value, callback);
|
|
|
- },
|
|
|
- trigger: 'blur'
|
|
|
- }
|
|
|
- ]"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- type="text"
|
|
|
- v-model="scope.row.subMinValue"
|
|
|
- placeholder="填写数值"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item
|
|
|
- :prop="`klRuleByIdSub[${scope.$index}].subMinUnit`"
|
|
|
- :rules="rules.subMinUnit"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- type="text"
|
|
|
- v-model.trim="scope.row.subMinUnit"
|
|
|
- placeholder="填写单位"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
+ <el-option
|
|
|
+ v-for="item in operMinList"
|
|
|
+ :key="item.name"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.name"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item
|
|
|
+ :prop="`klRuleByIdSub[${scope.$index}].subMinValue`"
|
|
|
+ :rules="[
|
|
|
+ {
|
|
|
+ validator: (rule, value, callback) => {
|
|
|
+ subMinValueRule(scope, rule, value, callback);
|
|
|
+ },
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
+ ]"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ type="text"
|
|
|
+ v-model="scope.row.subMinValue"
|
|
|
+ placeholder="填写数值"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item
|
|
|
+ :prop="`klRuleByIdSub[${scope.$index}].subMinUnit`"
|
|
|
+ :rules="rules.subMinUnit"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ type="text"
|
|
|
+ v-model.trim="scope.row.subMinUnit"
|
|
|
+ placeholder="填写单位"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<!-- v-if="klRuleByIdSub[scope.$index].subType !== 6 && klRuleByIdSub[scope.$index].dataType === '2'" -->
|