修改流程状态

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 },

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: {
+                    // popconfirm: {
-                        confirmButtonText: '确认',
+                    //     confirmButtonText: '确认',
+                    //     cancelButtonText: '取消',
+                    //     confirmButtonType: 'primary',
+                    //     title: '请确认发起告警单!'
+                    // },
+                    click: async row => {
+                        const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+                            confirmButtonText: '确定',
                             cancelButtonText: '取消',
-                        confirmButtonType: 'primary',
+
-                        title: '请确认发起告警单!'
+                            inputType: 'textarea',
-                    },
+                            inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-                    click: row => {
+                            inputErrorMessage: '取消原因不能为空'
-                        sureInitiateWarningLeaflet({ id: row.id })
+                        })
-                        ElMessage.success('发起告警单成功！')
+                        // sureInitiateWarningLeaflet({ id: row.id })
-                        tableStore.index()
+                        // ElMessage.success('发起告警单成功！')
+                        // tableStore.index()
                     }
                 },
                 {

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 },

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: '取消原因不能为空'
     })

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 (
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                            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: '取消原因不能为空'
     })

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)
@@ -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: '取消原因不能为空'
     })

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: '取消原因不能为空'
     })

src/views/pqs/supervise/retire/monitor.vue

@@ -15,17 +15,17 @@
                 </el-form-item>
             </template>
             <template #operation>
-        <el-button icon='el-icon-Plus' type='primary' @click='add'>新增</el-button>
+                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
             </template>
         </TableHeader>
         <!--表格-->
-    <Table ref='tableRef'></Table>
+        <Table ref="tableRef"></Table>
         <!--弹框-->
-    <monitor-quit-popup ref='deviceQuitPopup' />
+        <monitor-quit-popup ref="deviceQuitPopup" />
     </div>
 </template>
 
-<script setup lang='ts'>
+<script setup lang="ts">
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
@@ -67,7 +67,9 @@ const tableStore = new TableStore({
         { title: '监测点', field: 'deviceName', minWidth: 200 },
         { title: '退运原因', field: 'propertyNo', minWidth: 160 },
         {
-      title: '变更前状态', field: 'devOriginalStatus', minWidth: 130,
+            title: '变更前状态',
+            field: 'devOriginalStatus',
+            minWidth: 130,
             render: 'tag',
             custom: {
                 0: 'success',
@@ -85,7 +87,9 @@ const tableStore = new TableStore({
             }
         },
         {
-      field: 'status', title: '流程状态', minWidth: 100,
+            field: 'status',
+            title: '流程状态',
+            minWidth: 100,
             render: 'tag',
             custom: {
                 1: 'primary',
@@ -191,6 +195,7 @@ const cancelLeave = async (row: any) => {
     const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        inputType: 'textarea',
         inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
         inputErrorMessage: '取消原因不能为空'
     })
@@ -222,5 +227,4 @@ watch(
         deep: true
     }
 )
-
 </script>

src/views/pqs/supervise/retire/terminal.vue

@@ -214,6 +214,7 @@ const cancelLeave = async (row: any) => {
     const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        inputType: 'textarea',
         inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
         inputErrorMessage: '取消原因不能为空'
     })

src/views/pqs/supervise/technology/components/alarm.vue

@@ -204,6 +204,7 @@ const cancelLeave = async (row: any) => {
     const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        inputType: 'textarea',
         inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
         inputErrorMessage: '取消原因不能为空'
     })

src/views/pqs/supervise/technology/components/earlyWarn.vue

@@ -1,15 +1,15 @@
 <template>
-    <TableHeader datePicker nextFlag ref='TableHeaderRef'>
+    <TableHeader datePicker nextFlag ref="TableHeaderRef">
         <!--        <template #operation>-->
         <!--            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>-->
         <!--            <el-button icon="el-icon-Delete" type="primary">删除</el-button>-->
         <!--        </template>-->
     </TableHeader>
-    <Table ref='tableRef' />
+    <Table ref="tableRef" />
     <!--弹框-->
-    <feedback-popup ref='feedbackPopup' />
+    <feedback-popup ref="feedbackPopup" />
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -43,7 +43,9 @@ const tableStore = new TableStore({
         },
 
         {
-            field: 'problemType', title: '预警单问题来源', minWidth: '150',
+            field: 'problemType',
+            title: '预警单问题来源',
+            minWidth: '150',
             render: 'tag',
             custom: {
                 1: 'warning',
@@ -61,7 +63,9 @@ const tableStore = new TableStore({
         { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
         { field: 'leafletName', title: '单据名称', minWidth: '150' },
         {
-            field: 'status', title: '流程状态', minWidth: '150',
+            field: 'status',
+            title: '流程状态',
+            minWidth: '150',
             render: 'tag',
             custom: {
                 1: 'primary',
@@ -103,7 +107,7 @@ const tableStore = new TableStore({
                     render: 'basicButton',
                     click: row => {
                         // handleAudit(row.processInstanceId)
-                        ElMessage.warning("待打通生成管理系统接口！")
+                        ElMessage.warning('待打通生成管理系统接口！')
                     }
                 },
                 {
@@ -116,7 +120,6 @@ const tableStore = new TableStore({
                         return row.status !== 5
                     },
                     click: row => {
-
                         feedbackPopup.value.open('填报反馈单', row.id, row.status, row.issueDetail, row.problemPath)
                     }
                 },
@@ -144,7 +147,15 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         // deviceQuitPopup.value.open('重新发起', row)
-                        feedbackPopup.value.open('重新发起预警单', row.id, row.status, row.issueDetail,row.problemPath,row.takeStep,row.reportPath)
+                        feedbackPopup.value.open(
+                            '重新发起预警单',
+                            row.id,
+                            row.status,
+                            row.issueDetail,
+                            row.problemPath,
+                            row.takeStep,
+                            row.reportPath
+                        )
                     }
                 },
                 {
@@ -180,6 +191,7 @@ const cancelLeave = async (row: any) => {
     const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        inputType: 'textarea',
         inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
         inputErrorMessage: '取消原因不能为空'
     })
@@ -206,4 +218,4 @@ const handleAudit = (instanceId: any,historyInstanceId:any) => {
 }
 </script>
 
-<style scoped lang='scss'></style>
+<style scoped lang="scss"></style>

src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue

@@ -19,7 +19,6 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-           
         </template>
     </TableHeader>
     <Table ref="tableRef" />
@@ -153,6 +152,7 @@ const tableStore = new TableStore({
                         const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
                             confirmButtonText: '确定',
                             cancelButtonText: '取消',
+                            inputType: 'textarea',
                             inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
                             inputErrorMessage: '取消原因不能为空'
                         })

src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue

@@ -52,7 +52,6 @@ const TableHeaderRef = ref()
 const tableRef = ref()
 const statusSelect = dictData.statusSelect()
 
-
 const tableStore = new TableStore({
     url: '/supervision-boot/tempLinedebug/list',
     publicHeight: 65,
@@ -253,6 +252,7 @@ const cancelLeave = async (row: any) => {
     const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        inputType: 'textarea',
         inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
         inputErrorMessage: '取消原因不能为空'
     })

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue

@@ -178,6 +178,7 @@ const cancelLeave = async (row: any) => {
     const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        inputType: 'textarea',
         inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
         inputErrorMessage: '取消原因不能为空'
     })

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue

@@ -222,6 +222,7 @@ const cancelLeave = async (row: any) => {
     const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        inputType: 'textarea',
         inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
         inputErrorMessage: '取消原因不能为空'
     })