From 30cfb2b836a8a3d609518cc295753b58b17a9bc7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 15 十一月 2024 09:15:29 +0800
Subject: [PATCH] 优化
---
company/src/components/enterprise/additionSubtractionApplication.vue | 162 +++++++++++++++++++++++++++++------------------------
1 files changed, 89 insertions(+), 73 deletions(-)
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index c3e10b6..3a1659a 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -68,25 +68,35 @@
align="center"
label="淇濋櫓鐢熸晥姝㈡湡">
</el-table-column>
- <el-table-column
- prop="insureNum"
- align="center"
- label="鎶曚繚浜烘暟">
- </el-table-column>
- <el-table-column
- prop="guaranteeNum"
- align="center"
- label="鍦ㄤ繚浜烘暟">
+<!-- <el-table-column-->
+<!-- prop="insureNum"-->
+<!-- align="center"-->
+<!-- label="鎶曚繚浜烘暟">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column-->
+<!-- prop="guaranteeNum"-->
+<!-- align="center"-->
+<!-- label="鍦ㄤ繚浜烘暟">-->
+<!-- </el-table-column>-->
+ <el-table-column prop="guaranteeNum" align="center" label="褰撳墠鍦ㄤ繚浜烘暟" width="120">
+ <template slot-scope="{row}">
+ <span>{{(row.guaranteeNum||0)}} 浜�</span>
+ </template>
</el-table-column>
<el-table-column
prop="serviceDays"
align="center"
label="淇濆崟鏃堕暱锛堝ぉ锛�">
</el-table-column>
- <el-table-column
- prop="currentFee"
- align="center"
- label="宸蹭骇鐢熻垂鐢�(鍏�)">
+<!-- <el-table-column-->
+<!-- prop="currentFee"-->
+<!-- align="center"-->
+<!-- label="宸蹭骇鐢熻垂鐢�(鍏�)">-->
+<!-- </el-table-column>-->
+ <el-table-column prop="fee" label="鎵规敼璐圭敤鍚堣" align="center" width="120">
+ <template slot-scope="{row}">
+ <span>{{row.changeMoney+' 鍏�'}}</span>
+ </template>
</el-table-column>
<el-table-column
prop="fee"
@@ -109,7 +119,9 @@
<el-button type="danger" @click="deleItem">鍒犻櫎</el-button>
</div>
<div class="btns_item" v-if="activeName !== '1'">
- <el-button type="primary" @click="sele">閫夊彇娲鹃仯鍗曚綅</el-button>
+<!-- <el-button type="primary" @click="sele">閫夊彇娲鹃仯鍗曚綅</el-button>-->
+ <el-button type="primary" @click="sele(1)" v-if="item && item.hasDispatchUnit !== 1">閫夊彇娲鹃仯鍗曚綅</el-button>
+ <el-button type="primary" @click="sele(2)" v-if="item && item.hasDispatchUnit === 1">閫夊彇宸ョ</el-button>
</div>
</div>
<el-table
@@ -145,6 +157,7 @@
</template>
</el-table-column>
<el-table-column
+ v-if="item && item.hasDispatchUnit !== 1"
prop="duName"
label="娲鹃仯鍗曚綅">
</el-table-column>
@@ -324,14 +337,6 @@
},
// 鑾峰彇鎶曚繚璇︽儏
getDetails () {
- // findList({ applyId: this.form.id })
- // .then(res => {
- // res.forEach(item => {
- // item.idCard = item.idcardNo
- // item.fee = ''
- // })
- // this.tableData = res
- // })
getDetail(this.form.id)
.then(res => {
this.list.push(res)
@@ -450,56 +455,67 @@
// this.$message.warning('鑷冲皯娣诲姞涓�椤瑰憳宸�')
// return
// }
- for (let i = 0; i < this.form.addDetailList.length; i++) {
- if (!this.form.addDetailList[i].worktypeId || !this.form.addDetailList[i].duId) {
- this.$message.warning('璇峰畬鍠勫姞淇濇淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
- return
+ if (this.item.hasDispatchUnit !== 1) {
+ for (let i = 0; i < this.form.addDetailList.length; i++) {
+ if (!this.form.addDetailList[i].worktypeId || !this.form.addDetailList[i].duId) {
+ this.$message.warning('璇峰畬鍠勫姞淇濇淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
+ return
+ }
+ }
+ for (let i = 0; i < this.form.delDetailList.length; i++) {
+ if (!this.form.delDetailList[i].worktypeId || !this.form.delDetailList[i].duId) {
+ this.$message.warning('璇峰畬鍠勫噺淇濇淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
+ return
+ }
+ }
+ } else {
+ for (let i = 0; i < this.form.addDetailList.length; i++) {
+ if (!this.form.addDetailList[i].worktypeId) {
+ this.$message.warning('璇峰畬鍠勫姞淇濆伐绉嶄俊鎭�')
+ return
+ }
+ }
+ for (let i = 0; i < this.form.delDetailList.length; i++) {
+ if (!this.form.delDetailList[i].worktypeId) {
+ this.$message.warning('璇峰畬鍠勫噺淇濆伐绉嶄俊鎭�')
+ return
+ }
}
}
- for (let i = 0; i < this.form.delDetailList.length; i++) {
- if (!this.form.delDetailList[i].worktypeId || !this.form.delDetailList[i].duId) {
- this.$message.warning('璇峰畬鍠勫噺淇濇淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
- return
- }
+ let arr = this.company.filter(item => item.id === this.form.solutionId)
+ const endTime = Number(arr[0].correctWarnTime.split(':')[0] + arr[0].correctWarnTime.split(':')[1])
+ const now = new Date();
+ const hours = now.getHours();
+ const minutes = now.getMinutes();
+ const date = `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
+ const startTime = Number(date.split(':')[0] + date.split(':')[1])
+ if (startTime > endTime) {
+ this.$confirm('鎮ㄥ凡瓒呰繃褰撳ぉ鏈�鏅氭壒鏀规椂闂达紝淇濆崟瀹為檯鐢熸晥鏃堕棿浠ヤ繚闄╁叕鍙稿鏍镐负鍑嗭紒', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.$refs.ApplyChangeDetails1.open('鍔犲噺淇濊鍗�', this.form.addDetailList, this.form.delDetailList, {
+ companyName: this.item.companyName,
+ solutionsName: this.form.solutionsName,
+ code: this.list[0].code,
+ startTime: this.list[0].startTime,
+ endTime: this.list[0].endTime,
+ applyStartTime: this.form.applyStartTime
+ })
+ }).catch(() => {
+
+ });
+ } else {
+ this.$refs.ApplyChangeDetails1.open('鍔犲噺淇濊鍗�', this.form.addDetailList, this.form.delDetailList, {
+ companyName: this.item.companyName,
+ solutionsName: this.form.solutionsName,
+ code: this.list[0].code,
+ startTime: this.list[0].startTime,
+ endTime: this.list[0].endTime,
+ applyStartTime: this.form.applyStartTime
+ })
}
-
- this.$refs.ApplyChangeDetails1.open('鍔犲噺淇濊鍗�', this.form.addDetailList, this.form.delDetailList, {
- companyName: this.userInfo.company.name,
- solutionsName: this.form.solutionsName,
- code: this.list[0].code,
- startTime: this.list[0].startTime,
- endTime: this.list[0].endTime,
- applyStartTime: this.form.applyStartTime
- })
-
- // return
-
- // this.form.addDetailList.forEach(item => {
- // item.idcardNo = item.idCard
- // })
- // this.form.delDetailList.forEach(item => {
- // item.idcardNo = item.idCard
- // })
- // // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
- // // arr.forEach(item => {
- // // item.idcardNo = item.idCard
- // // })
- // this.isWorking = true
- // create({
- // applyId: this.form.id,
- // addDetailList: this.form.addDetailList,
- // delDetailList: this.form.delDetailList,
- // validTime: this.form.applyStartTime,
- // type: 0
- // }).then(() => {
- // this.visible = false
- // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- // this.$emit('success')
- // }).catch(e => {
- // this.$tip.apiFailed(e)
- // }).finally(() => {
- // this.isWorking = false
- // })
}
})
},
@@ -534,9 +550,9 @@
return
}
if (this.activeName === '0') {
- this.$refs.addEmployee.open('娣诲姞鍔犱繚鍛樺伐', { arr: this.form.addDetailList, solutionId: this.item.newVersionSolutionId, price: this.price })
+ this.$refs.addEmployee.open('娣诲姞鍔犱繚鍛樺伐', { arr: this.form.addDetailList, solutionId: this.item.newVersionSolutionId, price: this.price, companyId: this.item.hasDispatchUnit === 1 ? '1' : '' })
} else {
- this.$refs.addEmployee.open('娣诲姞鍑忎繚鍛樺伐', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice })
+ this.$refs.addEmployee.open('娣诲姞鍑忎繚鍛樺伐', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice, companyId: this.item.hasDispatchUnit === 1 ? '1' : '' })
}
},
uploadUser () {
@@ -603,7 +619,7 @@
this.$refs.multipleTable.clearSelection()
},
// 閫夋嫨鍛樺伐
- sele () {
+ sele (type) {
if (this.activeName === '0') {
if (this.addTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
} else {
@@ -617,7 +633,7 @@
this.$message.warning('璇烽�夋嫨鍛樺伐')
return
}
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.item.newVersionSolutionId })
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.item.newVersionSolutionId, type })
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany () {
--
Gitblit v1.9.3