修改技术监督 重新发起 逻辑问题

src/views/pqs/qualityInspeection/panorama/components/mapL.vue

@@ -13,12 +13,12 @@
                     <div v-for="(item, i) in list" class="cardBox" :style="i == 1 ? 'flex:1.3' : ''">
                         <div class="card">
                             <span style="cursor: pointer" @click="GridDiagram(i)">{{ item.title }}：</span>
-                            <!-- <span
+                            <span
                                 :style="`color: ${item.color[0]}; cursor:pointer`"
                                 @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)"
                             >
                                 {{ item.list[4].numOne }}
-                            </span> -->
+                            </span>
                         </div>
                     </div>
                 </div>

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

@@ -159,8 +159,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return (row.createBy =
+                        return row.createBy != adminInfo.$state.id || row.status != 1
-                            adminInfo.$state.id || row.status == 3 || row.status == 2 || row.status == 4)
                     },
                     click: row => {
                         cancelLeave(row)

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

@@ -1,13 +1,14 @@
+6T
 <template>
-  <TableHeader area datePicker nextFlag ref='TableHeaderRef'>
+    <TableHeader area datePicker nextFlag ref="TableHeaderRef">
         <template v-slot:select>
-      <el-form-item label='流程状态'>
+            <el-form-item label="流程状态">
-        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                     <el-option
-              v-for='item in statusSelect'
+                        v-for="item in statusSelect"
-              :key='item.id'
+                        :key="item.id"
-              :label='item.name'
+                        :label="item.name"
-              :value='item.id'
+                        :value="item.id"
                     ></el-option>
                 </el-select>
             </el-form-item>
@@ -16,11 +17,11 @@
             <!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> -->
         </template>
     </TableHeader>
-  <Table ref='tableRef' />
+    <Table ref="tableRef" />
     <!-- 新增 -->
-  <planTest ref='planTestRef' @onsubmit='tableStore.index()' />
+    <planTest ref="planTestRef" @onsubmit="tableStore.index()" />
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
 import { useAdminInfo } from '@/stores/adminInfo'
 //获取登陆用户姓名和部门
@@ -78,7 +79,9 @@ const tableStore = new TableStore({
         { field: 'planStartTime', title: '计划开始时间', minWidth: 140 },
         { field: 'planEndTime', title: '计划结束时间', minWidth: 140 },
         {
-      field: 'problemFlag', title: '是否存在问题', minWidth: 120,
+            field: 'problemFlag',
+            title: '是否存在问题',
+            minWidth: 120,
             render: 'tag',
             custom: {
                 0: 'success',
@@ -162,7 +165,10 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-            return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4|| row.status == 6)
+                        return (
+                            row.createBy != adminInfo.$state.id ||
+                            !(row.status == 3 || row.status == 4 )
+                        )
                     },
                     click: row => {
                         planTestRef.value.open('重新发起计划测试', row.id, false)
@@ -175,7 +181,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-            return !(row.createBy == adminInfo.$state.id|| row.status == 1 )
+                        return row.createBy != adminInfo.$state.id || row.status != 1
                     },
                     click: row => {
                         cancelLeave(row)
@@ -198,7 +204,6 @@ const add = (id: string) => {
     planTestRef.value.open('计划测试填报', id, true)
 }
 
-
 const exportFn = () => {
     let form = JSON.parse(JSON.stringify(tableStore.table.params))
     form.pageNum = 1
@@ -210,7 +215,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)
             }
         })
@@ -238,7 +243,6 @@ const cancelLeave = async (row: any) => {
     tableStore.index()
 }
 
-
 /** 处理审批按钮 */
 const handleAudit = (instanceId: any, historyInstanceId: any) => {
     push({
@@ -259,4 +263,4 @@ onMounted(() => {
 })
 </script>
 
-<style scoped lang='scss'></style>
+<style scoped lang="scss"></style>

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

@@ -237,7 +237,8 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1 || !row.processInstanceId
+                        // return row.createBy != adminInfo.$state.id || row.status != 1 || !row.processInstanceId
+                        return row.createBy != adminInfo.$state.id || row.status != 1
                     },
                     click: row => {
                         cancelLeave(row)

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

@@ -146,7 +146,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.status != 1
+                        return row.createBy != adminInfo.$state.id || row.status != 1
                     },
                     click: async row => {
                         // cancelLeave(row)