bug修复

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', {

src/views/base/crew/index.vue

@@ -40,7 +40,14 @@
           v-if="data.teamStatus === '正常' && data.peopleCount === 1"
         >解散</el-button
         >
-        <span v-if="data.teamStatus !== '正常'">-</span>
+        <el-button
+          type="danger"
+          size="mini"
+          @click="handleDeleteCrewTwo(data.id, deleteCrewApiTwo)"
+          v-if="data.teamStatus === '已解散'"
+        >删除</el-button
+        >
+        <!-- <span v-if="data.teamStatus !== '正常'">-</span> -->
       </template>
       <template slot="relNamePhone" slot-scope="{ data }">
         {{ 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 === '正常') {

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<this.$refs.tableRef.tableList.length;i++){
+             if(regex.test(this.$refs.tableRef.tableList[i].devName)){
+              isType = false
+              this.$modal.msgError('第'+(i+1)+'行设备名称输入不能包含特殊字符')
+              break;
+            }else if(regex.test(this.$refs.tableRef.tableList[i].devCode)){
+              isType = false
+              this.$modal.msgError('第'+(i+1)+'行设备编码称输入不能包含特殊字符')
+              break;
+            }else if(regex.test(this.$refs.tableRef.tableList[i].unitName)){
+                isType = false
+              this.$modal.msgError('第'+(i+1)+'行所属单位输入不能包含特殊字符')
+              break;
+            }else if(regex.test(this.$refs.tableRef.tableList[i].areaName)){
+              isType = false
+              this.$modal.msgError('第'+(i+1)+'行所属区域输入不能包含特殊字符')
+              break;
+            }else if(regex.test(this.$refs.tableRef.tableList[i].devUser)){
+                isType = false
+              this.$modal.msgError('第'+(i+1)+'行设备负责人输入不能包含特殊字符')
+              break;
+            }else if(!this.phoneReg.test(this.$refs.tableRef.tableList[i].devUserPhone)){
+                isType = false
+              this.$modal.msgError('第'+(i+1)+'行负责人电话格式不正确')
+              break;
+            }
+          }
+          if(isType){
               this.projectParams.recordList = this.$refs.tableRef.tableList;
               if (this.subSort === 1) {
                 let res = await addEdgeDeviceApi(this.projectParams);
@@ -409,6 +440,7 @@ export default {
                   this.$emit("closeDialog", true);
                 }
               }
+          }
           }else {
                this.$modal.msgError('请填写全部字段！！！')
           }