diff --git a/src/stores/dictData.ts b/src/stores/dictData.ts index d901201f..4061fc39 100644 --- a/src/stores/dictData.ts +++ b/src/stores/dictData.ts @@ -29,6 +29,7 @@ export const useDictData = defineStore( const statusSelect = () => { return [ + { name: '待提交审批', id: 0 }, { name: '审批中', id: 1 }, { name: '审批通过', id: 2 }, { name: '审批不通过', id: 3 }, diff --git a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue index b31f038a..22de1f55 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue +++ b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue @@ -45,7 +45,9 @@ const tableStore = new TableStore({ }, { field: 'userName', title: '用户名称' }, { field: 'userNumber', title: '用户编号' }, + { field: 'dutyOrgName', title: '负责单位', minWidth: '150' }, // { field: 'userCategory', title: '用户类别' }, + { field: 'complaintText', title: '投诉内容' }, { field: 'steadyIndicator', title: '稳态指标' }, { field: 'transientIndicators', title: '暂态指标' }, @@ -89,20 +91,28 @@ const tableStore = new TableStore({ title: '发起告警单', type: 'warning', icon: 'el-icon-Open', - render: 'confirmButton', + render: 'basicButton', disabled: row => { return row.initiateWarningFlag == 1 }, - popconfirm: { - confirmButtonText: '确认', - cancelButtonText: '取消', - confirmButtonType: 'primary', - title: '请确认发起告警单!' - }, - click: row => { - sureInitiateWarningLeaflet({ id: row.id }) - ElMessage.success('发起告警单成功!') - tableStore.index() + // popconfirm: { + // confirmButtonText: '确认', + // cancelButtonText: '取消', + // confirmButtonType: 'primary', + // title: '请确认发起告警单!' + // }, + click: async row => { + const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', { + confirmButtonText: '确定', + cancelButtonText: '取消', + + inputType: 'textarea', + inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格 + inputErrorMessage: '取消原因不能为空' + }) + // sureInitiateWarningLeaflet({ id: row.id }) + // ElMessage.success('发起告警单成功!') + // tableStore.index() } }, { @@ -117,8 +127,8 @@ const tableStore = new TableStore({ click: row => { router.push({ name: 'supervision/supervision/manage', - state:{ - type:1 + state: { + type: 1 } }) } diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue index 4d0cb56e..95ec562f 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue +++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue @@ -53,6 +53,7 @@ const tableStore = new TableStore({ }, { field: 'sustationName', title: '变电站名称', width: 170 }, { field: 'barName', title: '母线名称', width: 170 }, + { field: 'dutyOrgName', title: '负责单位', minWidth: '150' }, { field: 'measurementPointName', title: '监测点名称', width: 170 }, { field: 'voltageLevel', title: '电压等级', width: 170 }, { field: 'loadType', title: '监测点对象类型', width: 170 }, diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue index 4a19dfa4..792a503a 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue @@ -206,6 +206,7 @@ const cancelLeave = async (row: any) => { const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', { confirmButtonText: '确定', cancelButtonText: '取消', + inputType: 'textarea', inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格 inputErrorMessage: '取消原因不能为空' }) diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue index 32fbf610..dc36af38 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue @@ -165,10 +165,7 @@ const tableStore = new TableStore({ icon: 'el-icon-Open', render: 'basicButton', disabled: row => { - return ( - row.createBy != adminInfo.$state.id || - !(row.status == 3 || row.status == 4 ) - ) + return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4) }, click: row => { planTestRef.value.open('重新发起计划测试', row.id, false) @@ -228,6 +225,7 @@ const cancelLeave = async (row: any) => { const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', { confirmButtonText: '确定', cancelButtonText: '取消', + inputType: 'textarea', inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格 inputErrorMessage: '取消原因不能为空' }) diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue index 53f4b9da..5a9ba49e 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue @@ -61,7 +61,9 @@ const dictData = useDictData() const { push, options, currentRoute } = useRouter() const TableHeaderRef = ref() const tableRef = ref() -const areaOptionList = dictData.getBasicData('jibei_area').filter(item => !(item.name == '超高压' || item.name == '风光储')) +const areaOptionList = dictData + .getBasicData('jibei_area') + .filter(item => !(item.name == '超高压' || item.name == '风光储')) const statusSelect = dictData.statusSelect() const addRef = ref() const AuditRef = ref() @@ -155,6 +157,9 @@ const tableStore = new TableStore({ type: 'primary', icon: 'el-icon-EditPen', render: 'basicButton', + disabled: row => { + return row.processInstanceId == null + }, click: row => { flag.value = true handleAudit(row.processInstanceId, row.historyInstanceId) @@ -167,7 +172,7 @@ const tableStore = new TableStore({ icon: 'el-icon-Open', render: 'basicButton', disabled: row => { - return row.createBy != adminInfo.$state.id || !(row.status == 0 ) + return row.createBy != adminInfo.$state.id || !(row.status == 0) }, click: row => { addForms.value.open({ @@ -219,7 +224,7 @@ tableStore.table.params.projectName = '' tableStore.table.params.loadType = '' tableStore.table.params.userName = '' tableStore.table.params.fileUploadflag = '' -tableStore.table.params.status='' +tableStore.table.params.status = '' provide('tableStore', tableStore) // 新增 @@ -261,6 +266,7 @@ const cancelLeave = async (row: any) => { const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', { confirmButtonText: '确定', cancelButtonText: '取消', + inputType: 'textarea', inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格 inputErrorMessage: '取消原因不能为空' }) diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue index 85153d03..72a1ad10 100644 --- a/src/views/pqs/supervise/plan/index.vue +++ b/src/views/pqs/supervise/plan/index.vue @@ -346,6 +346,7 @@ const cancelLeave = async (row: any) => { const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', { confirmButtonText: '确定', cancelButtonText: '取消', + inputType: 'textarea', inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格 inputErrorMessage: '取消原因不能为空' }) diff --git a/src/views/pqs/supervise/retire/monitor.vue b/src/views/pqs/supervise/retire/monitor.vue index 0fcb3862..25dd219f 100644 --- a/src/views/pqs/supervise/retire/monitor.vue +++ b/src/views/pqs/supervise/retire/monitor.vue @@ -1,35 +1,35 @@ - diff --git a/src/views/pqs/supervise/retire/terminal.vue b/src/views/pqs/supervise/retire/terminal.vue index 836f0918..63346a68 100644 --- a/src/views/pqs/supervise/retire/terminal.vue +++ b/src/views/pqs/supervise/retire/terminal.vue @@ -1,6 +1,6 @@