From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
index bcec602..807a942 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
@@ -31,14 +31,16 @@
</a-col>
<a-col :span="12">
<a-form-item label="鏃堕暱锛堝垎閽燂級" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input placeholder="璇疯緭鍏ユ椂闀�" v-decorator="['duration', validatorRules.duration]"></a-input>
+ <a-input-number :min="0" placeholder="璇疯緭鍏ユ椂闀�" v-decorator="['duration', validatorRules.duration]"></a-input-number>
</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="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
+ <a-textarea :maxLength="20" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
</a-form-item>
+ </a-col>
</a-row>
</a-form>
</a-spin>
@@ -116,6 +118,38 @@
{
required:true,
message: "璇烽�夋嫨璁惧"
+ },
+ ],
+ },
+ partsCode:{
+ rules:[
+ {
+ required:true,
+ message: "璇疯緭鍏ラ浂浠跺彿"
+ },
+ ],
+ },
+ batchCode:{
+ rules:[
+ {
+ required:true,
+ message: "璇疯緭鍏ユ壒娆″彿"
+ },
+ ],
+ },
+ sequenceNumber:{
+ rules:[
+ {
+ required:true,
+ message: "璇疯緭鍏ョ▼搴忓彿"
+ },
+ ],
+ },
+ duration:{
+ rules:[
+ {
+ required:true,
+ message: "璇疯緭鍏ユ椂闀�"
},
],
},
@@ -254,11 +288,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
@@ -311,7 +353,7 @@
}
</script>
-<style scoped>
+<style scoped lang="less">
.ant-btn {
padding: 0 10px;
margin-left: 3px;
@@ -330,4 +372,7 @@
.ant-tabs-content .ant-form-item {
margin-bottom: 0px;
}
+ /deep/ .ant-input-number{
+ width: 100%!important;
+ }
</style>
--
Gitblit v1.9.3