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/enterprise/factoryChange.vue | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index f3d2ad3..f2e2196 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -147,7 +147,7 @@
<span v-if="item.ortherInfo">{{item.ortherInfo}}</span>
</div>
<!-- 閫夋嫨鍛樺伐 -->
- <selectEmployees ref="selectEmployees" @result="getValue" />
+ <selectEmployees ref="selectEmployees" @result="getValue1" />
<!-- 娣诲姞鍛樺伐 -->
<addEmployee ref="addEmployee" @result="getValue" />
<!-- 瀵煎叆鍚嶅崟 -->
@@ -208,6 +208,7 @@
this.form.addDetailList = []
this.form.delDetailList = []
this.list = []
+ this.form.factory = []
this.form.id = null
this.item = null
this.form.solutionId = ''
@@ -259,7 +260,7 @@
this.pickerOptions = {
disabledDate(time) {
// - 8.64e7
- return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate ? res.lastChangeDate : res.startTime).getTime()
}
};
this.changeSolution1(res.solutionId)
@@ -321,7 +322,11 @@
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
}
- this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.delDetailList, price: this.price, insuranceApplyId: this.form.id })
+ if (!this.form.applyStartTime) {
+ this.$message.warning('璇峰厛閫夋嫨鎵瑰崟鐢熸晥璧锋湡')
+ return
+ }
+ this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.delDetailList, price: this.price, insuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
},
addUser() {
if (!this.form.solutionId) {
@@ -412,6 +417,33 @@
handleSelectionChange (e) {
this.seleData = e.map(item => item.memberName)
},
+ // 閫夊彇鍛樺伐
+ getValue1 (list) {
+ let arr = JSON.parse(JSON.stringify(list))
+
+ arr.forEach(item => {
+ item.oldDuId = item.duId
+ item.oldDuName = item.duName
+ item.oldWorkTypeName = item.workTypeName
+ item.oldWorktypeId = item.worktypeId
+
+ item.duId = ''
+ item.duName = ''
+ item.workTypeName = ''
+ item.worktypeId = ''
+ })
+
+ for (let a = 0; a < arr.length; a++) {
+ for (let b = 0; b < this.form.factory.length; b++) {
+ if (arr[a].id === this.form.factory[b].id) {
+ this.$message.warning(`${arr[a].companyName}鍛樺伐閲嶅锛乣)
+ return
+ }
+ }
+ }
+
+ this.form.factory.push(...arr)
+ },
getValue(list) {
let arr = JSON.parse(JSON.stringify(list))
--
Gitblit v1.9.3