feat:执行类型说明

src/views/subscribe/frontSubscribe/components/all.vue

@@ -12,12 +12,9 @@ import DemandModifyModal from "./demand-modify-modal.vue";
 import { ElMessage } from "element-plus";
 import apis from "./config/apis";
 import { useUserStore } from "/@/store/modules/user";
+import ExecModal from "./exec-modal.vue";
 
-const showTableData = [
-  {exceType:'立即',startTime:"申请后立即",report:"时间跨度短或数据量少"},
-  {exceType:'延迟',startTime:"申请当天20:00:00",report:"时间跨度长或数据量多"},
-]
-
+const execModalRef = ref<InstanceType<typeof ExecModal> | null>(null);
 const userStore = useUserStore();
 const pageName = "frontSubscribe";
 const { hasPermissionWithCode } = usePermission(pageName);
@@ -62,15 +59,8 @@ const hooks: PageHooks = {
   <page-auth :page-name="pageName">
     <page-container :hooks="hooks" :page-name="pageName" :search-config="searchConfig"
       :get-content-ref="ref => (pageContentRef = ref)" :content-config="contentConfig">
-      <template #search_left>
-          <el-table style="width:330px" size="small" border :data="showTableData">
-            <el-table-column width="70px" label="执行类型" prop="exceType" />
-            <el-table-column width="120px" label="开始执行时间" prop="startTime" />
-            <el-table-column  width="140px"  label="适用报表" prop="report" />
-          </el-table>
-      </template>
-      
       <template #content_header>
+        <el-button type="" size="mini" @click="execModalRef?.onDisplay({})">查看执行类型说明</el-button>
         <el-button type="primary" size="mini" @click="demandModifyModal?.onDisplay({})">添加</el-button>
       </template>
 
@@ -80,7 +70,7 @@ const hooks: PageHooks = {
         </el-link>
 
 
-        <el-popconfirm title="是否确认删除该条记录?" @confirm="deleteItem(row.id)" v-if="hasPermissionWithCode('8') && String(row.status) !== '2'">
+        <el-popconfirm title="是否确认删除该条记录?" @confirm="deleteItem(row.id)" v-if="hasPermissionWithCode('8') && String(row.status) === '3'">
           <template #reference>
             <ElButton link size="small" type="primary" :icon="useRenderIcon('delete')" />
           </template>
@@ -88,5 +78,7 @@ const hooks: PageHooks = {
       </template>
     </page-container>
     <demand-modify-modal ref="demandModifyModal" @refresh="pageContentRef.onSearch()" />
+
+    <ExecModal ref="execModalRef" />
   </page-auth>
 </template>

src/views/subscribe/frontSubscribe/components/business.vue

@@ -10,6 +10,7 @@ import { usePageSearch, type PageHooks } from "/@/hooks/page";
 import DemandModifyModal from "./demand-modify-modal.vue";
 import { usePermission } from "/@/hooks/core";
 import { useBusinessSearch } from "../../_hooks";
+import ExecModal from "./exec-modal.vue";
 import { ElMessage } from "element-plus";
 import apis from "./config/apis";
 
@@ -18,13 +19,10 @@ const { searchConfig } = useBusinessSearch({
   queryField: "companyNo"
 });
 
-const showTableData = [
-  {exceType:'立即',startTime:"申请后立即",report:"时间跨度短或数据量少"},
-  {exceType:'延迟',startTime:"申请当天20:00:00",report:"时间跨度长或数据量多"},
-]
 
 const pageName = "frontSubscribe";
 const pageContentRef = ref<PageContentInstance | null>(null);
+const execModalRef = ref<InstanceType<typeof ExecModal> | null>(null);
 const demandModifyModal = ref<InstanceType<typeof DemandModifyModal> | null>(null);
 
 const { hasPermissionWithCode } = usePermission(pageName);
@@ -59,15 +57,8 @@ function handleCreate() {
       :content-config="contentConfig"
       lockKey="companyNo"
     >
-      <template #search_left>
-          <el-table style="width:330px" size="small" border :data="showTableData">
-            <el-table-column width="70px" label="执行类型" prop="exceType" />
-            <el-table-column width="120px" label="开始执行时间" prop="startTime" />
-            <el-table-column  width="140px"  label="适用报表" prop="report" />
-          </el-table>
-      </template>
-
       <template #content_header>
+        <el-button type="" size="mini" @click="execModalRef?.onDisplay({})">查看执行类型说明</el-button>
         <el-button type="primary" size="mini" @click="handleCreate">添加</el-button>
       </template>
 
@@ -85,7 +76,7 @@ function handleCreate() {
             :icon="useRenderIcon('download-line')"
           />
         </el-link>
-        <el-popconfirm title="是否确认删除该条记录?" @confirm="deleteItem(row.id)" v-if=" hasPermissionWithCode('17') && String(row.status) !== '2'">
+        <el-popconfirm title="是否确认删除该条记录?" @confirm="deleteItem(row.id)" v-if=" hasPermissionWithCode('17') && String(row.status) === '3'">
           <template #reference>
             <ElButton link size="small" type="primary" :icon="useRenderIcon('delete')" />
           </template>
@@ -94,5 +85,6 @@ function handleCreate() {
     </page-container>
 
     <DemandModifyModal :is-business="true" ref="demandModifyModal" @refresh="pageContentRef.onSearch()" />
+        <ExecModal ref="execModalRef" />
   </page-auth>
 </template>

src/views/subscribe/frontSubscribe/components/demand-modify-modal.vue

@@ -162,12 +162,12 @@ defineExpose({
 
       <el-form-item>
         <div class="w-full flex justify-between">
-          <el-alert type="warning" style="width: 500px;margin-right:10px;padding:0px" size="small" :closable="false" v-if="String(formData.exec_type) === '1'">
-            立即执行:文件会在申请后几分钟内生成，适用于时间跨度短或数据量少的报表;
+          <el-alert type="warning" style="width: 260px;margin-right:10px;padding:0px" size="small" :closable="false" v-if="String(formData.exec_type) === '1'">
+            立即执行:文件会在申请后几分钟内生成;
           </el-alert>
             
-          <el-alert type="warning" style="width: 500px;margin-right: 10px;padding:0px" size="small" :closable="false" v-if="String(formData.exec_type) === '2'">
-            延迟执行:文件会在申请当天20:00开始执行,适用于时间跨度长或数据量多的报表;
+          <el-alert type="warning" style="width: 260px;margin-right: 10px;padding:0px" size="small" :closable="false" v-if="String(formData.exec_type) === '2'">
+            延迟执行:文件会在申请当天20:00开始执行;
           </el-alert>
 
           <el-button class="float-right" type="primary" @click="onSubmit">保存</el-button>

src/views/subscribe/frontSubscribe/components/exec-modal.vue

@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { ElForm, ElMessage } from "element-plus"
+import { shallowRef, ref, onMounted, nextTick, watch } from "vue";
+
+const visible = ref(false);
+
+const showTableData = [
+  {exceType:'立即',startTime:"申请后立即",report:"时间跨度短或数据量少"},
+  {exceType:'延迟',startTime:"申请当天20:00:00",report:"时间跨度长或数据量多"},
+]
+
+function handleClose() { 
+  visible.value = false
+}
+
+defineExpose({
+  onDisplay: () => { 
+    visible.value = true;
+  }
+})
+</script>
+
+<template>
+  <el-dialog
+    v-model="visible" 
+    title="执行类型说明" 
+    width="380px"
+    center 
+    @close="handleClose">
+          <el-table style="width:330px" size="small" border :data="showTableData">
+            <el-table-column width="70px" label="执行类型" prop="exceType" />
+            <el-table-column width="120px" label="开始执行时间" prop="startTime" />
+            <el-table-column  width="140px"  label="适用报表" prop="report" />
+          </el-table>
+  </el-dialog>
+</template>