From f6722e13ba28cd292c162df9292bb3418ba12bec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 25 六月 2025 15:17:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/OpearaCaseEntryWindow.vue | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/company/src/components/business/OpearaCaseEntryWindow.vue b/company/src/components/business/OpearaCaseEntryWindow.vue
index acd53ae..7096b09 100644
--- a/company/src/components/business/OpearaCaseEntryWindow.vue
+++ b/company/src/components/business/OpearaCaseEntryWindow.vue
@@ -11,8 +11,8 @@
<div class="box_item">
<div class="box_item_title">
<span>鍑洪櫓浜轰俊鎭�</span>
- <el-select v-model="ruleForm.status" style="width: 100px;" placeholder="璇烽�夋嫨">
- <el-option label="寰呯珛妗�" :value="2"></el-option>
+ <el-select v-model="ruleForm.status" style="width: 100px;" placeholder="璇烽�夋嫨妗堜欢鐘舵��">
+ <el-option label="宸叉姤妗�" :value="1"></el-option>
<el-option label="宸查��鍥�" :value="4"></el-option>
<el-option label="寰呭彈鐞�" :value="5"></el-option>
<el-option label="宸叉嫆缁�" :value="6"></el-option>
@@ -51,6 +51,7 @@
<el-date-picker
v-model="ruleForm.extData.memberBirthday"
type="date"
+ @change="changeMemberBirthday"
placeholder="閫夋嫨鏃ユ湡"
format="yyyy 骞� MM 鏈� dd 鏃�"
value-format="yyyy-MM-dd">
@@ -185,7 +186,7 @@
<el-form-item label="鎶ユ鏃堕棿" prop="reportDate">
<el-date-picker
v-model="ruleForm.extData.reportDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨鏃ユ湡"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss">
@@ -198,8 +199,8 @@
v-model="ruleForm.happenTime"
type="datetime"
placeholder="閫夋嫨鏃ユ湡"
- format="yyyy-MM-dd hh:mm:ss"
- value-format="yyyy-MM-dd hh:mm:ss">
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</div>
@@ -822,31 +823,10 @@
'extData.memberIdcard': [
{ required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
],
- 'extData.memberSex': [
- { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
- ],
- 'extData.memberPhone': [
- { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
- ],
'extData.bxName': [
{ required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
],
- 'extData.bxCode': [
- { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
- ],
- 'extData.bxDate': [
- { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
- ],
- 'extData.bxTbName': [
- { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
- ],
'extData.bxBbName': [
- { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
- ],
- 'extData.bxOrg': [
- { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
- ],
- informantPhone: [
{ required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
]
},
@@ -982,9 +962,30 @@
}
this.getCompensations()
},
+ changeMemberBirthday(e) {
+ if (!e) {
+ this.ruleForm.extData.memberAge = ''
+ } else {
+ this.ruleForm.extData.memberAge = this.calculateAge(e)
+ }
+ },
+ calculateAge(birthDate) {
+ const today = new Date();
+ const birthDateObject = new Date(birthDate);
+
+ let age = today.getFullYear() - birthDateObject.getFullYear();
+ const monthDiff = today.getMonth() - birthDateObject.getMonth();
+
+ if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birthDateObject.getDate())) {
+ age--;
+ }
+
+ return age;
+ },
confirm () {
this.$refs.ruleForm.validate((valid) => {
if (!valid) return
+ if (!this.ruleForm.status) return this.$message.warning('璇烽�夋嫨妗堜欢鐘舵�侊紒')
this.isWorking = true
const obj = JSON.parse(JSON.stringify(this.ruleForm))
obj.accountList = [...this.list1, ...this.list2, ...this.list3]
--
Gitblit v1.9.3