From 0ff08c1904b5ccce1ea7f6f040e1a45234c97a9a Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 18 七月 2023 15:53:41 +0800
Subject: [PATCH] 合格率管理新增的时候加工数量和不合格数量的校验
---
src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue | 59 ++++++++++++++++-------------
src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue | 11 +++--
2 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue
index 61d6f57..822fc8c 100644
--- a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue
+++ b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue
@@ -12,18 +12,19 @@
</a-col>
<a-col :span="12">
- <a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
- v-decorator="['equipmentName',validatorRules.equipmentName]"/>
+ <a-form-item label="鍔犲伐鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input-number :disabled="disableSubmit" placeholder="璇疯緭鍏ュ姞宸ユ暟閲�" :min="0" v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-item label="鍔犲伐鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input-number :disabled="disableSubmit" placeholder="璇疯緭鍏ュ姞宸ユ暟閲�" :min="0" v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
+ <a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ v-decorator="['equipmentName',validatorRules.equipmentName]"/>
</a-form-item>
</a-col>
+
<a-col :span="12">
<a-form-item label="涓嶅悎鏍兼暟閲�" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number :disabled="disableSubmit" placeholder="璇疯緭鍏ヤ笉鍚堟牸鏁伴噺" :min="0" v-decorator="['unqualifiedQuantity', validatorRules.unqualifiedQuantity]"></a-input-number>
diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue
index b88d705..352001c 100644
--- a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue
+++ b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue
@@ -10,9 +10,10 @@
@search="deviceSearch" enter-button/>
</a-form-item>
</a-col>
+
<a-col :span="12">
- <a-form-item label="涓嶅悎鏍兼暟閲�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input-number :min="0" placeholder="璇疯緭鍏ヤ笉鍚堟牸鏁伴噺" v-decorator="['unqualifiedQuantity', validatorRules.unqualifiedQuantity,]"></a-input-number>
+ <a-form-item label="鍔犲伐鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input-number :min="0" placeholder="璇疯緭鍏ュ姞宸ユ暟閲�" v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
</a-form-item>
</a-col>
</a-row>
@@ -24,12 +25,10 @@
</a-form-item>
</a-col>
<a-col :span="12">
- <a-form-item label="鍔犲伐鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input-number :min="0" placeholder="璇疯緭鍏ュ姞宸ユ暟閲�" v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
+ <a-form-item label="涓嶅悎鏍兼暟閲�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input-number :min="0" placeholder="璇疯緭鍏ヤ笉鍚堟牸鏁伴噺" v-decorator="['unqualifiedQuantity', validatorRules.unqualifiedQuantity,]"></a-input-number>
</a-form-item>
</a-col>
-
-
</a-row>
<a-row :gutter="24">
<a-col :span="24">
@@ -225,6 +224,33 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
+ let stat = formData.processQuantity
+ let end = formData.unqualifiedQuantity
+ if(end>stat){
+ that.$message.warning("涓嶅悎鏍兼暟閲忓繀椤诲皬浜庣瓑浜庡姞宸ユ暟閲�");
+ that.confirmLoading = false
+ }else{
+ let obj
+ if (!this.model.id) {
+ obj = postAction(this.url.add, formData)
+ } else {
+ obj = requestPut(this.url.edit, formData, {
+ id: this.model.id
+ })
+ }
+ obj.then((res) => {
+ if (res.success) {
+ that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success(res.message)
+ that.$emit('ok', res.result)
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.confirmLoading = false
+ that.close()
+ })
+ }
// let start = moment(formData.startTime).format('YYYY-MM-DD HH:mm:ss');
// let end = moment(formData.endTime).format('YYYY-MM-DD HH:mm:ss');
// let startOne = start.replace(/:/g,'');
@@ -242,26 +268,7 @@
// // this.endTime = ''
// that.confirmLoading = false
// }else{
- let obj
- if (!this.model.id) {
- obj = postAction(this.url.add, formData)
- } else {
- obj = requestPut(this.url.edit, formData, {
- id: this.model.id
- })
- }
- obj.then((res) => {
- if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
- // that.$message.success(res.message)
- that.$emit('ok', res.result)
- } else {
- that.$message.warning(res.message)
- }
- }).finally(() => {
- that.confirmLoading = false
- that.close()
- })
+
}
// }
--
Gitblit v1.9.3