merge

src/components/taskDetail/taskDemand.vue

@@ -66,6 +66,9 @@ const getDemandInfoFun = async () => {
     ]);
     const simTypeList: any = commonStore.getDictData(res.data.demandType);
     tableFormRef.value.setOptionsFun('simType', simTypeList.A);
+    tableFormRef.value.setOptionsFun('workspaceId', [
+      { label: res.data.workspaceName, value: res.data.workspaceId },
+    ]);
   }
 };
 

src/views/simulation/creation/components/approveDialog.vue

@@ -115,9 +115,9 @@ const confirmFun = async () => {
           versionType: approveForm.versionType,
           templateCode: props.flowDetail.templateCode,
         };
-        if (props.updateSimulationPoolInfoList?.length) {
+        // if (props.updateSimulationPoolInfoList?.length) {
-          params.simulationPoolInfoList = props.updateSimulationPoolInfoList;
+        //   params.simulationPoolInfoList = props.updateSimulationPoolInfoList;
-        }
+        // }
         const upgradeRes: any = await upgradeDraftFun(params);
         await submitApproveFun(upgradeRes.data);
       }
@@ -137,11 +137,15 @@ const upgradeDraftFun = async (params: any) => {
 };
 
 const submitApproveFun = async (uuid: string = props.uuid || '') => {
-  const res: any = await releaseFlowTemplateApi({
+  const params: any = {
     uuid: uuid,
     // versionType: props.versionType,
     approveTemplateId: approveForm.approve,
-  });
+  };
+  if (props.updateSimulationPoolInfoList?.length) {
+    params.simulationPoolInfoList = props.updateSimulationPoolInfoList;
+  }
+  const res: any = await releaseFlowTemplateApi(params);
   if (res.code === 200) {
     ElMessage.success('提交成功');
   } else {

src/views/task/simulationTask/allTask/index.vue

@@ -1,17 +1,30 @@
 <template>
   <!-- 所有任务 -->
   <div class="gl-page-content-full">
-    <taskTable
+    <div class="sync-box">
-      showIndex
+      <el-button
-      ref="tableRef"
+        class="sync-btn"
-      :tableName="currentTableName"
+        v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])"
-      :params="taskParams"
+        icon="Refresh"
-      :searchLimitNum="searchLimitNum"
+        type="primary"
-      exportFileName="所有任务列表"
+        @click="syncDemandList"
-      :actionList="canOperate ? actionList : []"
+        title="同步EP系统最近三个月的待办"
-      @show="showTaskDetailFun"
+        >同步</el-button
-    >
+      >
-    </taskTable>
+    </div>
+    <div class="table-box">
+      <taskTable
+        showIndex
+        ref="tableRef"
+        :tableName="currentTableName"
+        :params="taskParams"
+        :searchLimitNum="searchLimitNum"
+        exportFileName="所有任务列表"
+        :actionList="canOperate ? actionList : []"
+        @show="showTaskDetailFun"
+      >
+      </taskTable>
+    </div>
     <Dialog
       v-model="dialogVisible"
       diaTitle="编辑"
@@ -57,7 +70,7 @@ import { ElMessage } from 'element-plus';
 import taskTable from '../components/taskTable.vue';
 import { TASK_ATTENTION_STATUS, TASK_PROCESS_STATUS } from '@/utils/enum/task';
 import { ref } from 'vue';
-import { disposeAttentionParams } from '../taskPage';
+import { disposeAttentionParams, syncDemandList } from '../taskPage';
 import taskDetail from '@/views/task/projectDetail/components/taskDetail.vue';
 import { isNumber } from 'lodash-es';
 import { getMemberListIds } from '@/utils/task';
@@ -65,6 +78,7 @@ import dayjs from 'dayjs';
 import { hasPermission } from '@/utils/permission';
 import Dialog from '@/components/common/dialog/index.vue';
 import TableForm from '@/components/common/table/tableForm.vue';
+import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
 
 // enum TaskType {
 //   /** 待确认任务 */
@@ -242,3 +256,15 @@ const confirmFun = async () => {
   }
 };
 </script>
+<style lang="scss" scoped>
+.sync-box {
+  display: flex;
+  justify-content: flex-end;
+  .sync-btn {
+    margin-bottom: var(--margin-medium);
+  }
+}
+.table-box {
+  height: calc(100% - 44px);
+}
+</style>

src/views/task/simulationTask/attentionTask/index.vue

@@ -1,16 +1,29 @@
 <template>
   <!-- 我关注的 -->
   <div class="gl-page-content-full">
-    <taskTable
+    <div class="sync-box">
-      showIndex
+      <el-button
-      ref="tableRef"
+        class="sync-btn"
-      tableName="SIMULATION_TASK_EXECUTE_LIST"
+        v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])"
-      :params="taskParams"
+        icon="Refresh"
-      exportFileName="我关注的任务列表"
+        type="primary"
-      :actionList="actionList"
+        @click="syncDemandList"
-      @show="showTaskDetailFun"
+        title="同步EP系统最近三个月的待办"
-    >
+        >同步</el-button
-    </taskTable>
+      >
+    </div>
+    <div class="table-box">
+      <taskTable
+        showIndex
+        ref="tableRef"
+        tableName="SIMULATION_TASK_EXECUTE_LIST"
+        :params="taskParams"
+        exportFileName="我关注的任务列表"
+        :actionList="actionList"
+        @show="showTaskDetailFun"
+      >
+      </taskTable>
+    </div>
     <taskDetail
       v-if="showTaskDetailDialog"
       :taskId="currentTaskInfo.id"
@@ -31,12 +44,13 @@ import { attentionTaskApi, updateTaskStatusApi } from '@/api/project/task';
 import { ElMessage } from 'element-plus';
 import taskTable from '../components/taskTable.vue';
 import { onMounted, ref } from 'vue';
-import { disposeAttentionParams } from '../taskPage';
+import { disposeAttentionParams, syncDemandList } from '../taskPage';
 import taskDetail from '@/views/task/projectDetail/components/taskDetail.vue';
 import { TASK_PROCESS_STATUS } from '@/utils/enum/task';
 import { isNumber } from 'lodash-es';
 import { getMemberListIds } from '@/utils/task';
 import dayjs from 'dayjs';
+import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
 
 // enum TaskType {
 //   /** 待确认任务 */
@@ -136,3 +150,15 @@ const attentionTaskFun = async (row: any, isAttention: boolean) => {
 };
 onMounted(() => {});
 </script>
+<style lang="scss" scoped>
+.sync-box {
+  display: flex;
+  justify-content: flex-end;
+  .sync-btn {
+    margin-bottom: var(--margin-medium);
+  }
+}
+.table-box {
+  height: calc(100% - 44px);
+}
+</style>

src/views/task/simulationTask/components/demandDetailDialog.vue

@@ -96,6 +96,9 @@ const getDemandInfo = async () => {
     ]);
     const simTypeList: any = commonStore.getDictData(res.data.demandType);
     tableFormRef.value.setOptionsFun('simType', simTypeList.A);
+    tableFormRef.value.setOptionsFun('workspaceId', [
+      { label: res.data.workspaceName, value: res.data.workspaceId },
+    ]);
   }
 };
 

src/views/task/simulationTask/executeTask/index.vue

@@ -1,14 +1,27 @@
 <template>
   <div class="gl-page-content-full">
-    <taskTable
+    <div class="sync-box">
-      showIndex
+      <el-button
-      ref="exeTableRef"
+        class="sync-btn"
-      tableName="SIMULATION_TASK_EXECUTE_LIST"
+        v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])"
-      :params="taskParams"
+        icon="Refresh"
-      :actionList="actionList"
+        type="primary"
-      @show="showTaskDetailFun"
+        @click="syncDemandList"
-    >
+        title="同步EP系统最近三个月的待办"
-    </taskTable>
+        >同步</el-button
+      >
+    </div>
+    <div class="table-box">
+      <taskTable
+        showIndex
+        ref="exeTableRef"
+        tableName="SIMULATION_TASK_EXECUTE_LIST"
+        :params="taskParams"
+        :actionList="actionList"
+        @show="showTaskDetailFun"
+      >
+      </taskTable>
+    </div>
     <Dialog
       v-model="formVisible"
       :loading="loadingInterface"
@@ -70,7 +83,8 @@ import TaskDetail from '@/views/task/projectDetail/components/taskDetail.vue';
 import { isNumber } from 'lodash-es';
 import { getMemberListIds } from '@/utils/task';
 import { jumpPage } from '@/utils/common';
-import { changeTaskStatusCommon } from '../taskPage';
+import { changeTaskStatusCommon, syncDemandList } from '../taskPage';
+import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
 
 const props = defineProps({
   actionList: {
@@ -372,3 +386,15 @@ const updateTaskInfoFun = async (info: any) => {
 
 onMounted(() => {});
 </script>
+<style lang="scss" scoped>
+.sync-box {
+  display: flex;
+  justify-content: flex-end;
+  .sync-btn {
+    margin-bottom: var(--margin-medium);
+  }
+}
+.table-box {
+  height: calc(100% - 44px);
+}
+</style>

src/views/task/simulationTask/mySend/index.vue

@@ -5,6 +5,15 @@
         <el-tab-pane label="未分发任务" :name="false" />
         <el-tab-pane label="已分发任务" :name="true" />
       </el-tabs>
+      <el-button
+        class="sync-btn"
+        v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])"
+        icon="Refresh"
+        type="primary"
+        @click="syncDemandList"
+        title="同步EP系统最近三个月的待办"
+        >同步</el-button
+      >
     </div>
     <div class="task-table-list">
       <taskTable
@@ -85,7 +94,7 @@ import { isNumber } from 'lodash-es';
 import taskDetail from '@/views/task/projectDetail/components/taskDetail.vue';
 import { enableConfigByTenant, TENANT_ENUM } from '@/tenants/tenant';
 import SendTask from './sendTask.vue';
-import { changeTaskStatusCommon } from '../taskPage';
+import { changeTaskStatusCommon, syncDemandList } from '../taskPage';
 
 const props = defineProps({
   actionList: {
@@ -379,4 +388,12 @@ onMounted(() => {});
 .task-table-list {
   height: calc(100% - 55px) !important;
 }
+.tabs {
+  position: relative;
+  .sync-btn {
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+}
 </style>