From 3c456949b70671cc2ad95ad5395dfaceda519f17 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 10:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/business/OperaSettleClaimsCheckWindow.vue | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/company/src/components/business/OperaSettleClaimsCheckWindow.vue b/company/src/components/business/OperaSettleClaimsCheckWindow.vue
index affc0a8..3d3921c 100644
--- a/company/src/components/business/OperaSettleClaimsCheckWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsCheckWindow.vue
@@ -25,20 +25,20 @@
<el-form-item label="缁撴鍐呭锛�" prop="doneInfo">
<el-input type="textarea" v-model="form.doneInfo" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="鍖荤枟鐞嗚禂(鍏�)锛�" prop="ylClaimAccount">
+ <el-form-item label="鍖荤枟鐞嗚禂(鍏�)锛�" prop="ylClaimAccount">{{form.ylClaimAccount}}
<el-input type="number" v-model="form.ylClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="璇伐鐞嗚禂(鍏�)锛�" prop="wgClaimAccount">
+ <el-form-item label="璇伐鐞嗚禂(鍏�)锛�" prop="wgClaimAccount">{{form.wgClaimAccount}}
<el-input type="number" v-model="form.wgClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="浼ゆ畫鐞嗚禂(鍏�)锛�" prop="scClaimAccount">
+ <el-form-item label="浼ゆ畫鐞嗚禂(鍏�)锛�" prop="scClaimAccount">{{form.scClaimAccount}}
<el-input type="number" v-model="form.scClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="姝讳骸鐞嗚禂(鍏�)锛�" prop="swClaimAccount">
+ <el-form-item label="姝讳骸鐞嗚禂(鍏�)锛�" prop="swClaimAccount">{{form.swClaimAccount}}
<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,7 +117,19 @@
},
rules4: {
doneInfo: [
- { required: true, message: '璇疯緭鍏�' }
+ { required: true, message: '璇疯緭鍏�', trigger: 'blur' }
+ ],
+ ylClaimAccount: [
+ { required: true, message: '璇疯緭鍏�', trigger: 'blur' }
+ ],
+ wgClaimAccount: [
+ { required: true, message: '璇疯緭鍏�', trigger: 'blur' }
+ ],
+ scClaimAccount: [
+ { required: true, message: '璇疯緭鍏�', trigger: 'blur' }
+ ],
+ swClaimAccount: [
+ { required: true, message: '璇疯緭鍏�', trigger: 'blur' }
]
}
}
@@ -173,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)
@@ -199,7 +219,6 @@
})
} else if (this.type === 4) {
this.$refs.form4.validate((valid) => {
- // debugger
if (!valid) {
return
}
--
Gitblit v1.9.3