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/mdcPassRateEdit.vue | 89 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 24 deletions(-)
diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue
index 61d6f57..8828b41 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>
@@ -32,7 +33,7 @@
</a-row>
<a-row :gutter="24">
<a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-textarea :disabled="disableSubmit" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
+ <a-textarea :maxLength="20" :disabled="disableSubmit" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
</a-form-item>
</a-row>
</a-form>
@@ -241,27 +242,67 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
- let obj
- if (!this.model.id) {
- obj = postAction(this.url.add, formData)
- } else {
- obj = requestPut(this.url.edit, formData, {
- id: this.model.id
+ 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()
})
}
- 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,'');
+ // let endOne = end.replace(/:/g,'');
+ // var data = new Date();
+ // let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
+ // let dataStart = stertDate.replace(/:/g,'');
+ // if(startOne < dataStart){
+ // that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ // that.confirmLoading = false
+ // }else{
+ // if(startOne>=endOne){
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // // console.log(this.model)
+ // // this.endTime = ''
+ // that.confirmLoading = false
+ // }else{
+
}
+ // }
+
+ // }
})
},
handleCancel() {
--
Gitblit v1.9.3