From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
index 977e24f..2fab0bc 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
@@ -20,15 +20,17 @@
</a-col>
<a-col :span="12">
<a-form-item label="鎵煩鍊�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="disableSubmit" placeholder="璇疯緭鍏ユ壄鐭╁��"
+ <a-input-number :min="0" :disabled="disableSubmit" placeholder="璇疯緭鍏ユ壄鐭╁��"
v-decorator="['torqueValue', validatorRules.torqueValue]"/>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
+ <a-col :span="24">
<a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-textarea v-decorator="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
+ <a-textarea :maxLength="20" v-decorator="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
</a-form-item>
+ </a-col>
</a-row>
</a-form>
</a-spin>
@@ -106,6 +108,22 @@
{
required:true,
message: "璇烽�夋嫨璁惧"
+ },
+ ],
+ },
+ torqueDate:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鏃堕棿"
+ },
+ ],
+ },
+ torqueValue:{
+ rules:[
+ {
+ required:true,
+ message: "璇疯緭鍏ユ壄鐭╁��"
},
],
},
@@ -244,11 +262,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.success({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(res.message)
that.$emit('ok', res.result)
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false
@@ -301,7 +327,7 @@
}
</script>
-<style scoped>
+<style scoped lang="less">
.ant-btn {
padding: 0 10px;
margin-left: 3px;
@@ -320,4 +346,7 @@
.ant-tabs-content .ant-form-item {
margin-bottom: 0px;
}
+ /deep/ .ant-input-number{
+ width: 100%!important;
+ }
</style>
--
Gitblit v1.9.3