|
@@ -46,7 +46,7 @@
|
|
|
</div>
|
|
|
<div class="label-item">
|
|
|
<div class="text-item">{{ item.groupName }}</div>
|
|
|
- <div class="required-item"></div>
|
|
|
+ <div class="required-item" v-if="item.isRequired == 1"></div>
|
|
|
</div>
|
|
|
<div class="input-item">
|
|
|
<a-form-model-item
|
|
@@ -55,7 +55,7 @@
|
|
|
:ref="value.indicatorCode + valueIndex"
|
|
|
:prop="'ruleList.' + index + '.ruleDetail.' + valueIndex + '.threshold'"
|
|
|
:rules="{
|
|
|
- required: true,
|
|
|
+ required: item.isRequired == 1 ? true : false,
|
|
|
message: `${item.groupName}必填`,
|
|
|
trigger: value.dataType == 'array' ? 'change' : 'blur',
|
|
|
}"
|
|
@@ -75,7 +75,14 @@
|
|
|
v-model="value.threshold"
|
|
|
style="width: 300px; margin-right: 5px"
|
|
|
:code="value.dictId"
|
|
|
- :multiple="value.dataType == 'string' ? false : true"
|
|
|
+ :multiple="
|
|
|
+ value.dataType == 'string' ||
|
|
|
+ value.dataType == 'number' ||
|
|
|
+ value.indicatorCode == 'presentedVideo' ||
|
|
|
+ value.indicatorCode == 'hideIfExists'
|
|
|
+ ? false
|
|
|
+ : true
|
|
|
+ "
|
|
|
v-else-if="value.modelType == 'select'"
|
|
|
/>
|
|
|
<!-- <selectGroup
|
|
@@ -89,7 +96,14 @@
|
|
|
style="width: 100%; margin-right: 5px"
|
|
|
:code="value.dictId"
|
|
|
:allValue="true"
|
|
|
- :radioStyle="value.dataType == 'string' ? true : false"
|
|
|
+ :radioStyle="
|
|
|
+ value.dataType == 'string' ||
|
|
|
+ value.dataType == 'number' ||
|
|
|
+ value.indicatorCode == 'presentedVideo' ||
|
|
|
+ value.indicatorCode == 'hideIfExists'
|
|
|
+ ? true
|
|
|
+ : false
|
|
|
+ "
|
|
|
v-else-if="value.modelType == 'checkBox'"
|
|
|
/>
|
|
|
<a-select
|
|
@@ -118,7 +132,7 @@
|
|
|
</div>
|
|
|
<div class="label-item">
|
|
|
<div class="text-item">{{ item.groupName }}</div>
|
|
|
- <div class="required-item"></div>
|
|
|
+ <div class="required-item" v-if="item.isRequired == 1"></div>
|
|
|
</div>
|
|
|
<div class="input-item">
|
|
|
<div class="toolbox-automate-rules-create-content_rules-and-condition_rules">
|
|
@@ -140,15 +154,17 @@
|
|
|
:ref="value.indicatorCode + valueIndex"
|
|
|
:prop="'ruleList.' + index + '.ruleDetail.' + valueIndex + '.threshold'"
|
|
|
:rules="{
|
|
|
- required: true,
|
|
|
+ required: item.isRequired == 1 ? true : false,
|
|
|
message: `${value.name}必填`,
|
|
|
trigger: 'blur',
|
|
|
}"
|
|
|
v-if="value.modelType == 'numberText'"
|
|
|
>
|
|
|
- <a-input-number style="width: 100px; margin-right: 5px" v-model="value.threshold" :min="0" />{{
|
|
|
- value.dataUnit
|
|
|
- }}
|
|
|
+ <a-input-number
|
|
|
+ style="width: 100px; margin-right: 5px"
|
|
|
+ v-model="value.threshold"
|
|
|
+ :min="0"
|
|
|
+ />{{ value.dataUnit }}
|
|
|
</a-form-model-item>
|
|
|
<a-form-model-item
|
|
|
:label-col="{ span: 6 }"
|
|
@@ -157,7 +173,7 @@
|
|
|
:ref="value.indicatorCode + valueIndex"
|
|
|
:prop="'ruleList.' + index + '.ruleDetail.' + valueIndex + '.threshold'"
|
|
|
:rules="{
|
|
|
- required: true,
|
|
|
+ required: item.isRequired == 1 ? true : false,
|
|
|
message: `${value.name}必填`,
|
|
|
trigger: 'blur',
|
|
|
}"
|
|
@@ -172,7 +188,7 @@
|
|
|
:ref="value.indicatorCode + valueIndex"
|
|
|
:prop="'ruleList.' + index + '.ruleDetail.' + valueIndex + '.threshold'"
|
|
|
:rules="{
|
|
|
- required: true,
|
|
|
+ required: item.isRequired == 1 ? true : false,
|
|
|
message: `${value.name}必选`,
|
|
|
trigger: 'change',
|
|
|
}"
|
|
@@ -181,7 +197,14 @@
|
|
|
<selectGroup
|
|
|
v-model="value.threshold"
|
|
|
:code="value.dictId"
|
|
|
- :multiple="value.dataType == 'string' ? false : true"
|
|
|
+ :multiple="
|
|
|
+ value.dataType == 'string' ||
|
|
|
+ value.dataType == 'number' ||
|
|
|
+ value.indicatorCode == 'presentedVideo' ||
|
|
|
+ value.indicatorCode == 'hideIfExists'
|
|
|
+ ? false
|
|
|
+ : true
|
|
|
+ "
|
|
|
style="width: 95%"
|
|
|
@clearValidate="clearAll"
|
|
|
/>
|
|
@@ -193,7 +216,7 @@
|
|
|
:ref="value.indicatorCode + valueIndex"
|
|
|
:prop="'ruleList.' + index + '.ruleDetail.' + valueIndex + '.threshold'"
|
|
|
:rules="{
|
|
|
- required: true,
|
|
|
+ required: item.isRequired == 1 ? true : false,
|
|
|
message: `${value.name}必选`,
|
|
|
trigger: 'change',
|
|
|
}"
|
|
@@ -206,6 +229,7 @@
|
|
|
v-model="value.threshold"
|
|
|
dropdownClassName="display-none-selset"
|
|
|
:token-separators="[',', ' ', ',']"
|
|
|
+ :maxTagCount="3"
|
|
|
>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
@@ -229,7 +253,7 @@
|
|
|
</div>
|
|
|
<div class="label-item">
|
|
|
<div class="text-item">{{ item.groupName }}</div>
|
|
|
- <div class="required-item"></div>
|
|
|
+ <div class="required-item" v-if="item.isRequired == 1"></div>
|
|
|
</div>
|
|
|
<div class="input-item">
|
|
|
<div class="toolbox-automate-rules-create-content_rules-and-condition_rules">
|
|
@@ -259,15 +283,17 @@
|
|
|
'.threshold'
|
|
|
"
|
|
|
:rules="{
|
|
|
- required: true,
|
|
|
+ required: item.isRequired == 1 ? true : false,
|
|
|
message: `${value.name}必填`,
|
|
|
trigger: 'blur',
|
|
|
}"
|
|
|
v-if="value.modelType == 'numberText'"
|
|
|
>
|
|
|
- <a-input-number style="width:100px; margin-right: 5px" v-model="value.threshold" :min="0" />{{
|
|
|
- value.dataUnit
|
|
|
- }}
|
|
|
+ <a-input-number
|
|
|
+ style="width: 100px; margin-right: 5px"
|
|
|
+ v-model="value.threshold"
|
|
|
+ :min="0"
|
|
|
+ />{{ value.dataUnit }}
|
|
|
</a-form-model-item>
|
|
|
<a-form-model-item
|
|
|
:label-col="{ span: 6 }"
|
|
@@ -284,7 +310,7 @@
|
|
|
'.threshold'
|
|
|
"
|
|
|
:rules="{
|
|
|
- required: true,
|
|
|
+ required: item.isRequired == 1 ? true : false,
|
|
|
message: `${value.name}必填`,
|
|
|
trigger: 'blur',
|
|
|
}"
|
|
@@ -307,7 +333,7 @@
|
|
|
'.threshold'
|
|
|
"
|
|
|
:rules="{
|
|
|
- required: true,
|
|
|
+ required: item.isRequired == 1 ? true : false,
|
|
|
message: `${value.name}必选`,
|
|
|
trigger: 'change',
|
|
|
}"
|
|
@@ -316,7 +342,14 @@
|
|
|
<selectGroup
|
|
|
v-model="value.threshold"
|
|
|
:code="value.dictId"
|
|
|
- :multiple="value.dataType == 'string' ? false : true"
|
|
|
+ :multiple="
|
|
|
+ value.dataType == 'string' ||
|
|
|
+ value.dataType == 'number' ||
|
|
|
+ value.indicatorCode == 'presentedVideo' ||
|
|
|
+ value.indicatorCode == 'hideIfExists'
|
|
|
+ ? false
|
|
|
+ : true
|
|
|
+ "
|
|
|
style="width: 95%"
|
|
|
@clearValidate="clearAll"
|
|
|
/>
|
|
@@ -336,7 +369,7 @@
|
|
|
'.threshold'
|
|
|
"
|
|
|
:rules="{
|
|
|
- required: true,
|
|
|
+ required: item.isRequired == 1 ? true : false,
|
|
|
message: `${value.name}必选`,
|
|
|
trigger: 'change',
|
|
|
}"
|
|
@@ -349,6 +382,7 @@
|
|
|
v-model="value.threshold"
|
|
|
dropdownClassName="display-none-selset"
|
|
|
:token-separators="[',', ' ', ',']"
|
|
|
+ :maxTagCount="3"
|
|
|
>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
@@ -925,6 +959,7 @@ export default {
|
|
|
}
|
|
|
this.saveLoading = true
|
|
|
|
|
|
+ console.log(params)
|
|
|
postAction('/ruleAccountThreshold/fillThreshold', params).then((res) => {
|
|
|
if (res.success) {
|
|
|
this.saveLoading = false
|
|
@@ -933,8 +968,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
} else {
|
|
|
- console.log('error submit!!')
|
|
|
- this.$message.error('请按提示填写必填项目!')
|
|
|
+ this.$message.error('请按提示填写必填项!')
|
|
|
return false
|
|
|
}
|
|
|
})
|
|
@@ -1042,6 +1076,31 @@ export default {
|
|
|
}).then((res) => {
|
|
|
if (res.success) {
|
|
|
this.form = res.result
|
|
|
+
|
|
|
+ var data = this.form.ruleList.map((item) => {
|
|
|
+ return {
|
|
|
+ ...item,
|
|
|
+ ruleDetail: item.ruleDetail.map((end) => {
|
|
|
+ if (isArray(end)) {
|
|
|
+ var data = end.map((c) => {
|
|
|
+ return {
|
|
|
+ ...c,
|
|
|
+ threshold:
|
|
|
+ c.modelType == 'tagBox' ? (c.threshold == null ? undefined : c.threshold) : c.threshold,
|
|
|
+ }
|
|
|
+ })
|
|
|
+ return [...data]
|
|
|
+ } else {
|
|
|
+ return {
|
|
|
+ ...end,
|
|
|
+ threshold:
|
|
|
+ end.modelType == 'tagBox' ? (end.threshold == null ? undefined : end.threshold) : end.threshold,
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }),
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.form.ruleList = data
|
|
|
this.spinLoading = false
|
|
|
} else {
|
|
|
this.spinLoading = false
|
|
@@ -1052,6 +1111,28 @@ export default {
|
|
|
getAction('/ruleTemplate/previewTemplate', { id: data.id }).then((res) => {
|
|
|
if (res.success) {
|
|
|
this.form = res.result
|
|
|
+ var data = this.form.ruleList.map((item) => {
|
|
|
+ return {
|
|
|
+ ...item,
|
|
|
+ ruleDetail: item.ruleDetail.map((end) => {
|
|
|
+ if (isArray(end)) {
|
|
|
+ var data = end.map((c) => {
|
|
|
+ return {
|
|
|
+ ...c,
|
|
|
+ threshold: c.modelType == 'tagBox' ? undefined : end.threshold,
|
|
|
+ }
|
|
|
+ })
|
|
|
+ return [...data]
|
|
|
+ } else {
|
|
|
+ return {
|
|
|
+ ...end,
|
|
|
+ threshold: end.modelType == 'tagBox' ? undefined : end.threshold,
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }),
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.form.ruleList = data
|
|
|
this.spinLoading = false
|
|
|
} else {
|
|
|
this.spinLoading = false
|