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/factoryChange.vue | 98 +++++++++++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 39 deletions(-)
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index 9ee1676..0d75d3f 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -64,21 +64,31 @@
align="center"
label="淇濋櫓鐢熸晥姝㈡湡">
</el-table-column>
- <el-table-column
- prop="insureNum"
- 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="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" ></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"
@@ -93,7 +103,9 @@
<el-button type="danger" @click="deleItem">鍒犻櫎</el-button>
</div>
<div class="btns_item">
- <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
@@ -120,6 +132,7 @@
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
+ v-if="item && item.hasDispatchUnit !== 1"
prop="oldDuName"
label="鍘熸淳閬ｅ崟浣�">
</el-table-column>
@@ -128,6 +141,7 @@
label="鍘熸墍灞炲伐绉�">
</el-table-column>
<el-table-column
+ v-if="item && item.hasDispatchUnit !== 1"
prop="duName"
label="鍙樻洿鍚庢淳閬ｅ崟浣�">
</el-table-column>
@@ -348,35 +362,41 @@
// this.$message.warning('鑷冲皯娣诲姞涓�椤瑰憳宸�')
// return
// }
- for (let i = 0; i < this.form.factory.length; i++) {
- if (!this.form.factory[i].worktypeId || !this.form.factory[i].duId) {
- this.$message.warning('璇峰畬鍠勬淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
- return
+ if (this.item.hasDispatchUnit !== 1) {
+ for (let i = 0; i < this.form.factory.length; i++) {
+ if (!this.form.factory[i].worktypeId || !this.form.factory[i].duId) {
+ this.$message.warning('璇峰畬鍠勬淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
+ return
+ }
+ }
+ } else {
+ for (let i = 0; i < this.form.factory.length; i++) {
+ if (!this.form.factory[i].worktypeId) {
+ this.$message.warning('璇峰畬鍠勫伐绉嶄俊鎭�')
+ return
+ }
}
}
- this.$refs.ApplyChangeUnitDetails1.open('鏇存崲娲鹃仯鍗曚綅璇﹀崟', this.form.factory, { ...this.list[0], applyStartTime: this.form.applyStartTime })
- // this.form.factory.forEach(item => {
- // item.idcardNo = item.idCard
- // })
- // let arr = JSON.parse(JSON.stringify(this.form.factory))
- // arr.forEach(item => {
- // item.idcardNo = item.idCard
- // })
- // this.isWorking = true
- // create({
- // applyId: this.form.id,
- // changeDetailList: this.form.factory,
- // validTime: this.form.applyStartTime,
- // type: 1
- // }).then(() => {
- // this.visible = false
- // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- // this.$emit('success')
- // }).catch(e => {
- // this.$tip.apiFailed(e)
- // }).finally(() => {
- // this.isWorking = false
- // })
+ 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.ApplyChangeUnitDetails1.open('鏇存崲娲鹃仯鍗曚綅璇﹀崟', this.form.factory, { ...this.list[0], applyStartTime: this.form.applyStartTime })
+ }).catch(() => {
+
+ });
+ } else {
+ this.$refs.ApplyChangeUnitDetails1.open('鏇存崲娲鹃仯鍗曚綅璇﹀崟', this.form.factory, { ...this.list[0], applyStartTime: this.form.applyStartTime })
+ }
}
})
},
@@ -435,7 +455,7 @@
this.$refs.multipleTable.clearSelection()
},
// 閫夋嫨鍛樺伐
- sele () {
+ sele (type) {
if (!this.form.solutionId) {
this.$message.warning('璇烽�夋嫨淇濋櫓鏂规')
return
@@ -444,7 +464,7 @@
this.$message.warning('璇烽�夋嫨鍛樺伐')
return
}
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.newVersionSolutionId })
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.newVersionSolutionId, type })
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany () {
--
Gitblit v1.9.3