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 | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
index 7e8f53d..2fab0bc 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :span="24">
<a-form-item label="璁惧缁�" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"
+ <a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
@search="deviceSearch" enter-button/>
</a-form-item>
</a-col>
@@ -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-input v-decorator="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�" ></a-input>
+ <a-textarea :maxLength="20" v-decorator="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
</a-form-item>
+ </a-col>
</a-row>
</a-form>
</a-spin>
@@ -101,31 +103,30 @@
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules: {
- equipmentId:{
+ equipmentIds:{
rules:[
{
required:true,
- message: ""
+ message: "璇烽�夋嫨璁惧"
},
],
},
- equipmentName:{
+ torqueDate:{
rules:[
{
required:true,
- message: ""
+ message: "璇烽�夋嫨鏃堕棿"
},
],
},
- mdcRepairType:{
+ torqueValue:{
rules:[
{
required:true,
- message: ""
+ message: "璇疯緭鍏ユ壄鐭╁��"
},
],
- initialValue: 1
- }
+ },
},
url: {
@@ -161,17 +162,17 @@
this.endTime = dateStrings[0];
},
getDeviceRows(val) {
- var equipmentId;
+ var equipmentIds;
for(var i = 0;i<val.length;i++){
if (i == 0) {
- equipmentId = val[i].equipmentId;
+ equipmentIds = val[i].equipmentId;
} else {
- equipmentId = equipmentId + "," + val[i].equipmentId;
+ equipmentIds = equipmentIds + "," + val[i].equipmentId;
}
}
// console.log("========",equipmentIds);
this.form.setFieldsValue({
- equipmentId: equipmentId,
+ equipmentIds: equipmentIds,
})
// this.form.setFieldsValue({
// equipmentId: val.equipmentId,
@@ -261,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
@@ -280,13 +289,13 @@
handleCancel() {
this.close()
},
- loadCascade() {
- getAction(this.url.loadCascadeData).then((res) => {
- if (res.success) {
- this.partCategoryCascade = res.result
- }
- })
- },
+ // loadCascade() {
+ // getAction(this.url.loadCascadeData).then((res) => {
+ // if (res.success) {
+ // this.partCategoryCascade = res.result
+ // }
+ // })
+ // },
onCascadeChange(value, selectedOptions) {
this.cascadeDefaultValue = [...value]
},
@@ -318,7 +327,7 @@
}
</script>
-<style scoped>
+<style scoped lang="less">
.ant-btn {
padding: 0 10px;
margin-left: 3px;
@@ -337,4 +346,7 @@
.ant-tabs-content .ant-form-item {
margin-bottom: 0px;
}
+ /deep/ .ant-input-number{
+ width: 100%!important;
+ }
</style>
--
Gitblit v1.9.3