Merge branch 'master' of http://192.168.1.22:3000/frontend/admin-sjzx

src/views/pqs/supervise/harmonicSurvey/components/testManage.vue

@@ -1,54 +1,54 @@
 <template>
-  <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <TableHeader area datePicker nextFlag theCurrentTime ref='TableHeaderRef'>
         <template v-slot:select>
-      <el-form-item label="监督类型">
-        <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择流程状态">
+            <el-form-item label='监督类型'>
+                <el-select v-model='tableStore.table.params.supvType' clearable placeholder='请选择流程状态'>
                     <el-option
-              v-for="item in supvTypeOptionList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
+                        v-for='item in supvTypeOptionList'
+                        :key='item.id'
+                        :label='item.name'
+                        :value='item.id'
                     ></el-option>
                 </el-select>
             </el-form-item>
-      <el-form-item label="流程状态">
-        <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+            <el-form-item label='流程状态'>
+                <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
                     <el-option
-              v-for="item in statusSelect"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
+                        v-for='item in statusSelect'
+                        :key='item.id'
+                        :label='item.name'
+                        :value='item.id'
                     ></el-option>
                 </el-select>
             </el-form-item>
         </template>
         <template #operation>
-      <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+            <el-button icon='el-icon-Delete' type='primary' @click='deleteEven'>删除</el-button>
         </template>
     </TableHeader>
-  <Table ref="tableRef" :checkbox-config="checkboxConfig"/>
+    <Table ref='tableRef' :checkbox-config='checkboxConfig' />
     <!-- 新增 -->
-  <planTest ref="planTestRef" @onsubmit="tableStore.index()"/>
+    <planTest ref='planTestRef' @onsubmit='tableStore.index()' />
 </template>
-<script setup lang="ts">
-import {ref, onMounted, provide, watch, nextTick} from 'vue'
-import {useAdminInfo} from '@/stores/adminInfo'
+<script setup lang='ts'>
+import { ref, onMounted, provide, watch, nextTick } from 'vue'
+import { useAdminInfo } from '@/stores/adminInfo'
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import {ElMessage, ElMessageBox} from 'element-plus'
-import {cancelTest} from '@/api/process-boot/generalTest'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { cancelTest } from '@/api/process-boot/generalTest'
 import planTest from './planTest.vue'
-import {useRouter} from 'vue-router'
-import {deleteSurveyPlanTest} from '@/api/supervision-boot/delete/index'
-import {queryPlan, removeSurvey} from '@/api/process-boot/generalTest'
-import {getUserByRoleType} from '@/api/user-boot/user'
+import { useRouter } from 'vue-router'
+import { deleteSurveyPlanTest } from '@/api/supervision-boot/delete/index'
+import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
+import { getUserByRoleType } from '@/api/user-boot/user'
 
-const {push} = useRouter()
+const { push } = useRouter()
 const tableRef = ref()
-import {useDictData} from '@/stores/dictData'
+import { useDictData } from '@/stores/dictData'
 
 const dictData = useDictData()
 const supvTypeOptionList = dictData.getBasicData('supv_type')
@@ -74,7 +74,7 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-    {field: 'planName', title: '计划名称', minWidth: 140},
+        { field: 'planName', title: '计划名称', minWidth: 140 },
         {
             field: 'supvType',
             title: '监督类型',
@@ -88,9 +88,9 @@ const tableStore = new TableStore({
             minWidth: 130,
             title: '监督对象名称'
         },
-    {field: 'substationName', title: '变电站', minWidth: 140},
-    {field: 'planStartTime', title: '计划开始时间', minWidth: 140},
-    {field: 'planEndTime', title: '计划结束时间', minWidth: 140},
+        { field: 'substationName', title: '变电站', minWidth: 140 },
+        { field: 'planStartTime', title: '计划开始时间', minWidth: 140 },
+        { field: 'planEndTime', title: '计划结束时间', minWidth: 140 },
         {
             field: 'problemFlag',
             title: '是否存在问题',
@@ -107,9 +107,9 @@ const tableStore = new TableStore({
                 null: '待测试'
             }
         },
-    {field: 'deptName', title: '负责单位', minWidth: 140},
-    {field: 'completeBy', title: '计划负责人', minWidth: 130},
-    {field: 'completeTime', title: '实际完成时间', minWidth: 140},
+        { field: 'deptName', title: '负责单位', minWidth: 140 },
+        { field: 'completeBy', title: '计划负责人', minWidth: 130 },
+        { field: 'completeTime', title: '实际完成时间', minWidth: 140 },
         {
             field: 'status',
             title: '流程状态',
@@ -234,7 +234,7 @@ const add = (id: string) => {
 }
 // 禁止点击
 const checkboxConfig = reactive({
-  checkMethod: ({row}) => {
+    checkMethod: ({ row }) => {
         return adminInfo.roleCode.includes('delete_info')
             ? true
             : row.createBy == adminInfo.$state.id && row.status == 0
@@ -267,7 +267,7 @@ const exportFn = () => {
             type: 'xlsx', //导出文件类型 xlsx 和 csv
             useStyle: true,
             data: res.data.records, // 数据源 // 过滤那个字段导出
-      columnFilterMethod: function (column: any) {
+            columnFilterMethod: function(column: any) {
                 return !(column.$columnIndex === 0)
             }
         })
@@ -277,7 +277,7 @@ const exportFn = () => {
 /**取消流程操作*/
 const cancelLeave = async (row: any) => {
     // 二次确认
-  const {value} = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         inputType: 'textarea',
@@ -315,7 +315,7 @@ onMounted(() => {
     })
 })
 
-const props = defineProps({id: {type: String, default: 'null'}})
+const props = defineProps(['id', 'businessKey'])
 watch(() => props.id, async (newValue, oldValue) => {
     if (newValue === 'null') return // 直接返回，避免后续逻辑执行
     const fullId = newValue.split('@')[0]
@@ -323,9 +323,13 @@ watch(() => props.id, async (newValue, oldValue) => {
     const routeTime = Number(newValue.split('@')[1])
     if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
     nextTick(() => {
+        if (props.businessKey == '3') {
+            planTestRef.value.open('编辑', fullId, false)
+        } else {
             planTestRef.value.open('重新发起计划测试', fullId, false)
+        }
     })
-}, {immediate: true})
+}, { immediate: true })
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang='scss'></style>

src/views/pqs/supervise/harmonicSurvey/index.vue

@@ -2,27 +2,28 @@
     <div class='default-main'>
         <el-tabs v-model='activeName' type='border-card'>
             <el-tab-pane label='技术监督计划管理' name='1'>
-        <plan-manage :id="id" v-if="activeName == '1'"/>
+                <plan-manage :id='id' v-if="activeName == '1'" />
             </el-tab-pane>
             <el-tab-pane label='技术监督测试管理' name='2'>
-        <test-manage :id="id" v-if="activeName == '2'"/>
+                <test-manage :id='id' :businessKey='key' v-if="activeName == '2'" />
             </el-tab-pane>
         </el-tabs>
     </div>
 </template>
 
 <script setup lang='ts'>
-import {ref} from 'vue'
+import { ref } from 'vue'
 import planManage from './components/planManage.vue'
 import testManage from './components/testManage.vue'
-import {mainHeight} from '@/utils/layout'
-import {useDictData} from '@/stores/dictData'
-import {useRoute} from "vue-router";
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import { useRoute } from 'vue-router'
 
 const route = useRoute()
 const dictData = useDictData()
 const statusSelect = dictData.statusSelect()
 const id = ref('')
+const key = ref('')
 defineOptions({
     name: 'supervision/harmonicmanagement'
 })
@@ -40,8 +41,9 @@ watch(() => route.query.t, async (newValue, oldValue) => {
         }
         id.value = (route.query.id as string) || 'null'
         id.value = id.value + '@' + route.query.t
+        key.value = (route.query.key as string) || 'null'
     }
-}, {deep: true, immediate: true})
+}, { deep: true, immediate: true })
 </script>
 
 <style lang='scss' scoped>