From 2ccca80cffbe21d11612f592a74864e192d99f65 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Tue, 5 Nov 2024 15:29:17 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/base/crew.js | 5 +++
src/views/base/crew/index.vue | 24 +++++++++++--
.../edgeInsert/components/form-insert.vue | 36 +++++++++++++++++--
3 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/src/api/base/crew.js b/src/api/base/crew.js
index 0272acc..d12e961 100644
--- a/src/api/base/crew.js
+++ b/src/api/base/crew.js
@@ -40,6 +40,11 @@ export const deleteCrewApi = (id) => {
return request.delete(`/base/tbTeam/${id}`)
}
+/** 删除班组 */
+export const deleteCrewApiTwo = (data) => {
+ return request.post('/base/tbTeam/delete',data)
+}
+
/** 安全帽查询 */
export const queryHatApi = (data) => {
return request.get('/base/tbTeam/devList', {
diff --git a/src/views/base/crew/index.vue b/src/views/base/crew/index.vue
index 5ef192f..646ceee 100644
--- a/src/views/base/crew/index.vue
+++ b/src/views/base/crew/index.vue
@@ -40,7 +40,14 @@
v-if="data.teamStatus === '正常' && data.peopleCount === 1"
>解散
- -
+ 删除
+
{{ data.relNamePhone.split('/')[0] }}/{{ phoneCrypto(data.relNamePhone.split('/')[1]) }}
@@ -100,7 +107,8 @@ import { dialogConfigCrewTab } from './table-crew'
import { commonMixin } from '../mixins/common'
import {
queryCrewListApi,
- deleteCrewApi
+ deleteCrewApi,
+ deleteCrewApiTwo,
} from '@/api/base/crew'
import FormCrew from './components/form-crew.vue'
import TableCrew from './components/table-crew.vue'
@@ -109,6 +117,7 @@ export default {
methods: {
queryCrewListApi,
deleteCrewApi,
+ deleteCrewApiTwo,
getIdList(idList) {
this.exportList = []
idList.forEach(item => {
@@ -119,7 +128,7 @@ export default {
this.dialogConfigCrewTab.outerVisible = false
this.$refs.tableRef.getTableList()
},
- /** 删除 */
+ /** 解散 */
handleDeleteCrew(id, method) {
this.$modal.confirm('是否确定解散').then(() => {
method(id).then(res => {
@@ -127,6 +136,15 @@ export default {
this.$refs.tableRef.getTableList()
}).catch(err => {})
})
+ },
+ /** 删除 */
+ handleDeleteCrewTwo(id, method) {
+ this.$modal.confirm('是否确定删除').then(() => {
+ method({'id':id}).then(res => {
+ this.$modal.msgSuccess('操作成功！')
+ this.$refs.tableRef.getTableList()
+ }).catch(err => {})
+ })
},
handleCrew(v) {
if(v.teamStatus === '正常') {
diff --git a/src/views/base/edgeInsert/components/form-insert.vue b/src/views/base/edgeInsert/components/form-insert.vue
index 576cb7d..b3b9f6d 100644
--- a/src/views/base/edgeInsert/components/form-insert.vue
+++ b/src/views/base/edgeInsert/components/form-insert.vue
@@ -201,14 +201,14 @@ export default {
{
required: true,
message: "请输入项目部名称",
- trigger: "change",
+ trigger: "blur",
},
],
proId: [
{
required: true,
message: "请输入工程名称",
- trigger: "change",
+ trigger: "blur",
},
],
relUser: [
@@ -386,6 +386,7 @@ export default {
this.$refs.projectParamsRef.validate(async (valid) => {
if (valid) {
let isEmpty = true
+ let isType = true
this.$refs.tableRef.tableList.forEach(item=>{
if (item.devName == '' || !item.devName || item.devCode == '' || !item.devCode || item.unitName == '' || !item.unitName
|| item.areaName == '' || !item.areaName ||item.devUser == '' || !item.devUser || item.devUserPhone == '' || !item.devUserPhone
@@ -395,6 +396,36 @@ export default {
}
})
if(isEmpty){
+ isType = true
+ const regex = /[!@#$%^&*()_,.?":{}|<>+\//\\]/g; // 特殊字符
+ for(let i=0;i