From a01d637e9ff2bf26aa44c65a239413a38bd8b1fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 04 六月 2025 09:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/OperaSettleClaimsCheckWindow.vue | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/company/src/components/business/OperaSettleClaimsCheckWindow.vue b/company/src/components/business/OperaSettleClaimsCheckWindow.vue
index d950969..cb869dc 100644
--- a/company/src/components/business/OperaSettleClaimsCheckWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsCheckWindow.vue
@@ -38,7 +38,7 @@
<el-input type="number" v-model="form.swClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
<el-form-item label="鎬婚噾棰濓細" >
- <el-input type="number" readonly v-model="form.totalAccount" placeholder="璇疯緭鍏�" v-trim/>
+ <el-input type="number" disabled v-model="form.totalAccount" placeholder="" v-trim/>
</el-form-item>
</el-form>
<div v-if="visible5 ==true" class="form">
@@ -117,19 +117,19 @@
},
rules4: {
doneInfo: [
- { required: true, message: '璇疯緭鍏�' }
+ { required: true, message: '璇疯緭鍏�', trigger: 'blur' }
],
ylClaimAccount: [
- { required: true, message: '璇疯緭鍏�' }
+ { required: true, message: '璇疯緭鍏�', trigger: 'blur' }
],
wgClaimAccount: [
- { required: true, message: '璇疯緭鍏�' }
+ { required: true, message: '璇疯緭鍏�', trigger: 'blur' }
],
scClaimAccount: [
- { required: true, message: '璇疯緭鍏�' }
+ { required: true, message: '璇疯緭鍏�', trigger: 'blur' }
],
swClaimAccount: [
- { required: true, message: '璇疯緭鍏�' }
+ { required: true, message: '璇疯緭鍏�', trigger: 'blur' }
]
}
}
@@ -185,10 +185,18 @@
}
},
changeAccount(){
- this.form.swClaimAccount = parseFloat(this.form.swClaimAccount).toFixed(2)
- this.form.scClaimAccount = parseFloat(this.form.scClaimAccount).toFixed(2)
- this.form.wgClaimAccount = parseFloat(this.form.wgClaimAccount).toFixed(2)
- this.form.ylClaimAccount = parseFloat(this.form.ylClaimAccount).toFixed(2)
+ if (this.form.swClaimAccount) {
+ this.form.swClaimAccount = parseFloat(this.form.swClaimAccount).toFixed(2)
+ }
+ if (this.form.scClaimAccount) {
+ this.form.scClaimAccount = parseFloat(this.form.scClaimAccount).toFixed(2)
+ }
+ if (this.form.wgClaimAccount) {
+ this.form.wgClaimAccount = parseFloat(this.form.wgClaimAccount).toFixed(2)
+ }
+ if (this.form.ylClaimAccount) {
+ this.form.ylClaimAccount = parseFloat(this.form.ylClaimAccount).toFixed(2)
+ }
this.form.totalAccount = parseFloat( this.form.scClaimAccount || 0) + parseFloat( this.form.swClaimAccount || 0)
+ parseFloat( this.form.wgClaimAccount|| 0)
+ parseFloat( this.form.ylClaimAccount|| 0)
@@ -211,7 +219,6 @@
})
} else if (this.type === 4) {
this.$refs.form4.validate((valid) => {
- // debugger
if (!valid) {
return
}
@@ -289,7 +296,7 @@
</script>
<style>
.v-modal {
- z-index: 2000 !important;
+ // z-index: 2000 !important;
}
</style>
<style lang="scss" scoped>
--
Gitblit v1.9.3