Merge branch 'zcwy-zsx0223' into dev0223

This commit is contained in:
zhangsir
2024-04-17 17:27:31 +08:00

View File

@@ -878,6 +878,7 @@ import {downLoadZip} from "@/utils/zipdownload";
bg_remarks: false, bg_remarks: false,
checkclick: [], checkclick: [],
permissionId:'', permissionId:'',
perWorkNum: '',
filesList:[], filesList:[],
tableData:[], tableData:[],
tableData1:[], tableData1:[],
@@ -1289,6 +1290,7 @@ import {downLoadZip} from "@/utils/zipdownload";
listData() listData()
} }
}) })
getByUserIds(record.workNum)
} }
const textDelete = (record) => { const textDelete = (record) => {
dialog({ dialog({
@@ -1301,12 +1303,14 @@ import {downLoadZip} from "@/utils/zipdownload";
listData() listData()
} }
}) })
getByUserIds(record.workNum)
} }
}) })
} }
const updateAuthority = (record) => { const updateAuthority = (record) => {
state.bg_power = true state.bg_power = true
state.permissionId = record.id state.permissionId = record.id
state.perWorkNum = record.workNum
if(record.permission){ if(record.permission){
state.checkclick = record.permission.split(',') state.checkclick = record.permission.split(',')
} }
@@ -1725,11 +1729,14 @@ import {downLoadZip} from "@/utils/zipdownload";
state.bg_power2 = false state.bg_power2 = false
state.powerStatus = {} state.powerStatus = {}
state.permissionId = '' state.permissionId = ''
state.perWorkNum = ''
state.checkclick = [] state.checkclick = []
} }
const getByUserId = async () => { const getByUserIds = async (workNum) => {
await getByUserId().then(res=>{ await getByUserId({workNum,}).then(res=>{
// if(res.code == 200){
// console.log(res.data,'workUnum')
// }
}) })
} }
const powerTrue = async () => { const powerTrue = async () => {
@@ -1737,6 +1744,7 @@ import {downLoadZip} from "@/utils/zipdownload";
if(state.permissionId){ if(state.permissionId){
await updateStatus({id:state.permissionId,permission:state.checkclick.join(",")}).then((res)=>{ await updateStatus({id:state.permissionId,permission:state.checkclick.join(",")}).then((res)=>{
saveListItem() saveListItem()
getByUserIds(state.perWorkNum)
}) })
} }
listData() listData()
@@ -1750,6 +1758,7 @@ import {downLoadZip} from "@/utils/zipdownload";
saveListItem() saveListItem()
} }
}) })
getByUserIds(record.workNum)
} }
const textEnableAdd = async (record) => { const textEnableAdd = async (record) => {
record.statusList = 0 record.statusList = 0
@@ -1785,7 +1794,7 @@ import {downLoadZip} from "@/utils/zipdownload";
powerSetting, powerSetting,
of_power, of_power,
powerTrue, powerTrue,
getByUserId, getByUserIds,
textDeleteAdd, textDeleteAdd,
searchStatusVal2, searchStatusVal2,
serchList, serchList,