From 4a476243e0928236472f0a916467630cb5706ee5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 17 五月 2024 11:40:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/TaskPhase-AddOrUpdate.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/web/src/views/modules/taskReliability/TaskPhase-AddOrUpdate.vue b/web/src/views/modules/taskReliability/TaskPhase-AddOrUpdate.vue
index aa4e95c..3916e5b 100644
--- a/web/src/views/modules/taskReliability/TaskPhase-AddOrUpdate.vue
+++ b/web/src/views/modules/taskReliability/TaskPhase-AddOrUpdate.vue
@@ -5,14 +5,14 @@
<el-input v-model="dataForm.phaseName"></el-input>
</zt-form-item>
<zt-form-item label="闃舵鏃堕暱姣�" prop="phaseDuration">
- <el-input v-model="dataForm.phaseDurationRate"></el-input>
+ <el-input v-model="dataForm.phaseDurationRate" @change="check"></el-input>
</zt-form-item>
<zt-form-item label="闃舵鏃堕��" prop="phaseSpeed">
<el-input v-model="dataForm.phaseSpeed"></el-input>
</zt-form-item>
- <zt-form-item label="闃舵椤哄簭" prop="phaseSort">
- <el-input v-model="dataForm.phaseSort"></el-input>
- </zt-form-item>
+ <!-- <zt-form-item label="闃舵椤哄簭" prop="phaseSort">
+ <el-input v-model="dataForm.phaseSort"></el-input>
+ </zt-form-item>-->
<zt-form-item label="澶囨敞" prop="remark">
<el-input v-model="dataForm.remark"></el-input>
</zt-form-item>
@@ -34,6 +34,7 @@
remark: '',
productId: ''
},
+ oldTime: null,
time: null
}
},
@@ -43,6 +44,13 @@
this.dataForm.productId = param.productId
this.time = param.time
},
+ check() {
+ let reg = /^(-?\d+)\.?(\d*)$/;
+ if (this.dataForm.phaseDurationRate.match(reg) == null && this.dataForm.phaseDurationRate !=='') {
+ this.dataForm.phaseDurationRate = '';
+ this.$alert("杈撳叆鐨勬暟鎹牸寮忔湁璇�")
+ }
+ },
// 鑾峰彇淇℃伅
async getInfo() {
let res = await this.$http.get(`/taskReliability/TaskPhase/${this.dataForm.id}`)
@@ -50,14 +58,18 @@
...this.dataForm,
...res.data
}
+ this.oldTime = this.dataForm.phaseDurationRate
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
- console.log(this.time,'dataLoaded')
- if (this.time + Number(this.dataForm.phaseDurationRate > 1)) {
- this.$alert("褰撳墠杩愯鏃堕暱姣斿凡瓒呭嚭锛岃閲嶆柊璁剧疆")
- return
+ /* let flag = true
+ if (this.time + Number(this.dataForm.phaseDurationRate)-Number(this.oldTime) > 1) {
+ this.$alert("璇烽噸鏂拌缃綋鍓嶆椂闀挎瘮鍒嗛厤")
+ flag = false
}
+ if (!flag) {
+ return
+ }*/
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/taskReliability/TaskPhase/', this.dataForm)
if (res.success) {
await this.$tip.success()
@@ -65,6 +77,7 @@
this.$emit('refreshDataList')
}
}
+
}
}
</script>
--
Gitblit v1.9.1