From 487754376a1eb675d430a64b7a4aa9e7ffeb405b Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期五, 25 八月 2023 09:54:15 +0800 Subject: [PATCH] 调整 --- src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue | 73 +++++++++++++++++++++++------------- 1 files changed, 46 insertions(+), 27 deletions(-) diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue index b88d705..09d01ed 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,17 +25,15 @@ </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"> <a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong"> - <a-textarea v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea> + <a-textarea v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" :maxLength ="20" ></a-textarea> </a-form-item> </a-col> </a-row> @@ -225,6 +224,45 @@ 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.$notification.warning({ + message:'娑堟伅', + description:"涓嶅悎鏍兼暟閲忓繀椤诲皬浜庣瓑浜庡姞宸ユ暟閲�" + }); + 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.$notification.success({ + message:'娑堟伅', + description:"娣诲姞鎴愬姛" + }); + // that.$message.success(res.message) + that.$emit('ok', res.result) + } else { + // that.$message.warning(res.message) + that.$notification.warning({ + message:'娑堟伅', + description: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 +280,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