From 41d50b20c975faeaa9e5277bdcff13b5acecb575 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:57:37 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue b/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue
index 8c83625..a9059be 100644
--- a/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue
+++ b/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue
@@ -32,6 +32,13 @@
</a-form-item>
</a-col>
</a-row>
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-item label="棰滆壊" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input type="color" v-decorator="['rateParameterColor',validatorRules.rateParameterColor]"></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
</a-form>
</a-spin>
</a-modal>
@@ -95,7 +102,7 @@
this.model = Object.assign({}, record)
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'rateParameterCategory', 'rateParameterLevel', 'minimumRange', 'maximumRange'))
+ this.form.setFieldsValue(pick(this.model, 'rateParameterCategory', 'rateParameterLevel', 'minimumRange', 'maximumRange', 'rateParameterColor'))
})
},
close() {
@@ -116,16 +123,16 @@
if (res.success) {
// that.$message.success("淇濆瓨鎴愬姛")
that.$notification.success({
- message:'娑堟伅',
- description:"淇濆瓨鎴愬姛"
- });
+ message: '娑堟伅',
+ description: '淇濆瓨鎴愬姛'
+ })
that.$emit('ok', res.result)
} else {
// that.$message.warning(res.message)
that.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
+ message: '娑堟伅',
+ description: res.message
+ })
}
}).finally(() => {
that.confirmLoading = false
--
Gitblit v1.9.3