From ea982ec3f7877f648248e16ab8560b47f549c8f6 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 23 一月 2024 15:05:21 +0800
Subject: [PATCH] 添加新删除
---
src/views/license/licenseInfo/index.vue | 7 ++-
src/api/enterprise.js | 10 +++++
src/views/login/register.vue | 14 ++++++
src/utils/validate.js | 6 +++
src/views/enterprise/basic.vue | 37 ++++++++++++++++++
5 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/src/api/enterprise.js b/src/api/enterprise.js
index dd95c2a..b486323 100644
--- a/src/api/enterprise.js
+++ b/src/api/enterprise.js
@@ -289,3 +289,13 @@
data
})
}
+
+export function totalDeleteEnterprise(name) {
+ return request({
+ headers: {
+ 'Authorization': getToken()
+ },
+ url: process.env.BASE_API + '/enterprise/removeEnterprise?name=' + name,
+ method: 'delete',
+ })
+}
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 09e45ef..af3aa08 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -35,6 +35,12 @@
return reg.test(str)
}
+/* 名称不包含中文括号*/
+export function validEnterName(str) {
+ const reg = /^[^（）]*$/
+ return reg.test(str)
+}
+
/**
* validate email
* @param email
diff --git a/src/views/enterprise/basic.vue b/src/views/enterprise/basic.vue
index 7872504..d25b6e1 100644
--- a/src/views/enterprise/basic.vue
+++ b/src/views/enterprise/basic.vue
@@ -196,6 +196,7 @@
<!-- <el-button type="text" @click="showEditHandle(scope.row)">编辑</el-button>-->
<el-button type="text" @click="showEnterPriseDetailForm('修改',scope.row)" >编辑</el-button>
<el-button v-if="isSupervision==='null'" type="text" align="center" @click="deleteById('删除',scope.row)" >删除</el-button>
+ <el-button v-if="isShow" type="text" align="center" @click="deleteByName(scope.row)" >完全删除</el-button>
<el-button v-if="isSupervision==='null'" type="text" align="center" @click="changeStatus('停用',scope.row)" >{{scope.row.enterprisestatus == '停止'?'启用':'停用'}}</el-button>
<!-- <el-button :disabled="scope.row.type==1" type="text" style="color:red;" @click="deleteHandle(scope.row)" v-if="scope.row.infostatus === '待审批' ? false : true ">重置密码</el-button>-->
</template>
@@ -251,7 +252,7 @@
import { dictionaryAllItems } from "../../api/dictionary";
import enterpriseDetailForm from "./enterpriseDetailForm"
import { userList, createUser, deleteUser, updateUser } from '@/api/user'
- import { enterpriseList,addEnterprise ,deleteEnterprise ,exportEnterprise,deactivateEnterprise,activateEnterprise} from '@/api/enterprise'
+ import { enterpriseList,addEnterprise ,deleteEnterprise ,exportEnterprise,deactivateEnterprise,activateEnterprise,totalDeleteEnterprise} from '@/api/enterprise'
import { exportFeed} from '@/api/Feed'
import { roleList } from '@/api/role'
import { parseTime, computePageCount, parseUserType } from '@/utils'
@@ -330,6 +331,7 @@
currentPage: 1,
pageTotal: 0,
tableKey: 0,
+ isShow: false,
enterpriseList: [],
enterpriseFilter:{
enterprisesize:''
@@ -449,6 +451,12 @@
this.getEconomicTypeList()
this.getSafetySuperVisionList()
this.getEconomicIndustryList()
+ const roles = JSON.parse(Cookies.get('roles'))
+ if(roles.find(i=>i.name == '管理员'|| i.name == '超级管理员')){
+ this.isShow = true
+ }else{
+ this.isShow = false
+ }
},
methods: {
getEnterpriseList() {
@@ -708,6 +716,33 @@
})
})
},//删除企业
+
+ async deleteByName(row){
+ console.log(row,'row')
+ this.$confirm('删除此条信息，是否继续','提示',{
+ confirmButtonText:'确定',
+ cancelButtonText:'取消',
+ type:'warning',
+ }).then(()=> {
+ totalDeleteEnterprise(row.enterprisename).then( (res)=>{
+ if(res.data.code === "200"){
+ this.$notify({
+ title:'成功',
+ message:'删除成功',
+ type:'success',
+ duration:2000,
+ })
+ this.getEnterpriseList()
+ }else{
+ this.$message({
+ type:'warning',
+ message:res.data.message
+ })
+ }
+ })
+ })
+ },
+
async changeStatus(title,row){
if (row.enterprisestatus == '停止' ) {
this.$confirm('是否确认启用此企业','提示',{
diff --git a/src/views/license/licenseInfo/index.vue b/src/views/license/licenseInfo/index.vue
index 059d9b6..35b6339 100644
--- a/src/views/license/licenseInfo/index.vue
+++ b/src/views/license/licenseInfo/index.vue
@@ -139,7 +139,7 @@
v-if="isSupervision==='null'?false:true">删除</el-button>
<br><el-button type="text" v-print="printObj1" @click="giveData(scope.row)"
v-if="isSupervision==='null' && scope.row.reviewstatus === 2?true:false">打印正本（新）</el-button>
- <el-button type="text" v-print="printObj2" @click="giveDetail(scope.row)"
+ <el-button type="text" v-print="printObj1" @click="giveDetail(scope.row)"
v-if="isSupervision==='null' && scope.row.reviewstatus === 2?true:false">打印副本（新）</el-button>
<el-button type="text" v-print="printObj3" @click="giveData(scope.row)"
v-if="isSupervision==='null' && scope.row.reviewstatus === 2?true:false">打印正本（旧）</el-button>
@@ -930,7 +930,7 @@
this.area = JSON.parse(val.licenseStorage)[0].area
this.storagearea = JSON.parse(val.licenseStorage)[0].storagearea
this.powder = JSON.parse(val.licenseStorage)[0].powder
- } else if (val.type === 3) {
+ } else if (val.type === 3 || val.type === 4) {
this.area = val.dealingarea
this.powder = val.reservekg
if (val.licensetype === 2) {
@@ -938,7 +938,7 @@
} else {
this.licensetype = '长期零售'
}
- if (val.dealingtype === 2) {
+ if (val.dealingtype === 2 || val.dealingtype === 4) {
this.dealingtype = '专店'
} else {
this.dealingtype = '专柜'
@@ -981,6 +981,7 @@
},
//打印正本
giveData(val) {
+ console.log(val)
this.code = val.code
this.name = val.name
this.mainpersonname = val.mainpersonname
diff --git a/src/views/login/register.vue b/src/views/login/register.vue
index cee0f55..13e8778 100644
--- a/src/views/login/register.vue
+++ b/src/views/login/register.vue
@@ -481,10 +481,22 @@
import {isNameExist, isNumberExist, register} from "../../api/login";
import {getCityListData, getProvinceListData} from "../../api/area";
import {parseError} from "../../utils/messageDialog";
+import {validEnterName} from "../../utils/validate";
export default {
name: "register",
data(){
+ let checkEnterName = (rule, value, callback)=>{
+ if(value === ''){
+ callback(new Error('请填写企业名称'))
+ }else{
+ if(!validEnterName(value)){
+ callback(new Error('名称不能包含中文括号'))
+ }else{
+ callback()
+ }
+ }
+ }
return{
showNumber:false,
showName:false,
@@ -524,7 +536,7 @@
safetyProduction:[],
rules:{
enterprisename:[
- { required: true, message: '请填写企业名称', trigger: 'blur' },
+ { required: true, validator: checkEnterName, trigger: 'blur' },
],
enterprisenumber:[
{ required: true, message: '请填写终端机用户名', trigger: 'blur' },
--
Gitblit v1.9.2