添加干扰源用户台账流程

This commit is contained in:
GGJ
2024-09-12 11:23:41 +08:00
parent 28d9af0cb4
commit 33d7304c54
2 changed files with 123 additions and 13 deletions

View File

@@ -46,10 +46,7 @@
</el-form-item>
<el-form-item for="-" label="用户性质:" prop="userType">
<!-- :disabled="resendId != '' && title != '编辑'" -->
<el-select
v-model="form.userType"
placeholder="请选择用户性质"
>
<el-select v-model="form.userType" placeholder="请选择用户性质">
<el-option
v-for="(item, index) in userTypeList"
:label="item.label"
@@ -619,6 +616,7 @@ const acceptType = ''
const form: any = ref({})
const addUploadRef: any = ref()
const control: any = ref(true)
const controFlag: any = ref(false)
const ruleFormRef: any = ref(null)
//字典获取所在地市
const areaOptionList = dictData
@@ -1303,6 +1301,7 @@ const confirmForm = (flag: boolean) => {
confirmFormData.saveOrCheckflag = '1'
if (title.value != '用户档案录入') confirmFormData.id = resendId.value
if (!control.value) confirmFormData.dataType = 1
if (controFlag.value) confirmFormData.dataType = 1
if (props.normalizedControl) {
addEditor(confirmFormData).then(res => {
ElMessage({
@@ -1454,6 +1453,7 @@ const confirmForm = (flag: boolean) => {
}
}
confirmFormData.saveOrCheckflag = '2'
if (controFlag.value) confirmFormData.dataType = 1
if (title.value == '用户档案录入') {
submitFormData(confirmFormData).then(res => {
ElMessage({
@@ -1467,7 +1467,9 @@ const confirmForm = (flag: boolean) => {
})
} else {
confirmFormData.id = resendId.value
if (controFlag.value) confirmFormData.dataType = 1
console.log("🚀 ~ ruleFormRef.value.validate ~ controFlag.value:", controFlag.value)
console.log(123123)
if (props.normalizedControl) {
if (title.value == '编辑') {
if (status.value != '') confirmFormData.status = status.value
@@ -1493,6 +1495,7 @@ const confirmForm = (flag: boolean) => {
})
}
} else {
updateFormData(confirmFormData).then(res => {
ElMessage({
message: '重新发起成功',
@@ -1515,11 +1518,16 @@ const confirmForm = (flag: boolean) => {
// 过滤用户
const filterUsers = (arr: any) => {
control.value = false
controFlag.value = true
userStateList.value.map(item => (item.disabled = false))
userTypeList.value = userTypeList.value.filter(item => !arr.includes(item.value))
}
defineExpose({ open, filterUsers })
const setcontroFlag = () => {
console.log(12333)
controFlag.value = true
}
defineExpose({ open, filterUsers,setcontroFlag })
</script>
<style lang="scss" scoped>
.el-form {

View File

@@ -48,13 +48,16 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import addForm from '@/views/pqs/supervise/interfere/components/undocumented/addForm.vue'
import SensitiveUserPopup from './sensitiveUserPopup.vue'
import { useDictData } from '@/stores/dictData'
import { useRouter } from 'vue-router'
import { downloadSensitiveReportTemplate } from '@/api/supervision-boot/userReport/form'
import DetailInfo from '../../interfere/components/undocumented/detail.vue'
import { cancelFormData } from '@/api/supervision-boot/interfere/index'
const addForms = ref()
const dictData = useDictData()
const sensitiveUserPopup = ref()
const TableHeaderRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area')
const { push, options, currentRoute } = useRouter()
import { useAdminInfo } from '@/stores/adminInfo'
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
@@ -96,6 +99,26 @@ const tableStore = new TableStore({
3: '退运'
}
},
{
field: 'status',
title: '流程状态',
minWidth: 100,
render: 'tag',
custom: {
0: 'warning',
1: 'primary',
2: 'success',
3: 'danger',
4: 'warning'
},
replaceValue: {
0: '待提交审批',
1: '审批中',
2: '审批通过',
3: '审批不通过',
4: '已取消'
}
},
{
field: 'createBy',
title: '填报人',
@@ -121,26 +144,73 @@ const tableStore = new TableStore({
lookInfo(row.id)
}
},
{
name: 'productSetting',
title: '流程详情',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
disabled: row => {
return !row.processInstanceId
},
click: row => {
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
{
name: 'edit',
title: '编辑',
type: 'primary',
icon: 'el-icon-Open',
render: 'basicButton',
showDisabled: row => {
return (
(row.city != adminInfo.$state.deptName && row.createBy != adminInfo.$state.id) ||
!(row.dataType == 1)
)
// showDisabled: row => {
// return (
// (row.city != adminInfo.$state.deptName && row.createBy != adminInfo.$state.id) ||
// !(row.dataType == 1)
// )
// },
disabled: row => {
return !(row.status == 0)
},
click: row => {
addForms.value.filterUsers([6])
addForms.value.open({
title: '编辑',
row: row
})
}
},
{
name: 'edit',
title: '重新发起',
type: 'warning',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
},
click: row => {
addForms.value.setcontroFlag()
addForms.value.open({
title: '重新发起',
row: row
})
}
},
{
name: 'cancel',
title: '取消',
type: 'danger',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || row.status != 1
},
click: row => {
cancelLeave(row)
}
}
]
}
@@ -170,6 +240,38 @@ provide('tableStore', tableStore)
onMounted(() => {
tableStore.index()
})
/**取消流程操作*/
const cancelLeave = async (row: any) => {
// 二次确认
const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputType: 'textarea',
inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格
inputErrorMessage: '取消原因不能为空'
})
// 发起取消
let data = {
id: row.id,
processInstanceId: row.processInstanceId,
dataType: 1,
reason: value
}
await cancelFormData(data)
ElMessage.success('取消成功')
// 加载数据
tableStore.index()
}
/** 处理审批按钮 */
const handleAudit = (instanceId: any, historyInstanceId: any) => {
push({
name: 'BpmProcessInstanceDetail',
state: {
id: instanceId,
historyInstanceId
}
})
}
// 新增
const addFormModel = () => {
addForms.value.filterUsers([6])