Эх сурвалжийг харах

reactor:修复班长特提默认的问题;修复流程推荐推荐派单的问题;

zhangchong 10 сар өмнө
parent
commit
4d831d0de7

+ 12 - 0
src/api/dataShare/index.ts

@@ -51,6 +51,18 @@ export const getPushTaskDetail = (params: object) => {
     params,
   });
 };
+/**
+ * @description 推送任务列表详情(新)
+ * @param {object}  params
+ */
+export const getPushTaskDetailNew = (params: object) => {
+  return request({
+    baseURL:import.meta.env.VITE_DATASHARE_API_YRL,
+    url: `/api/v1/HotlineWeb/getdssenddetailtaskinfo`,
+    method: 'get',
+    params,
+  });
+};
 /**
  * @description 重新推送
  * @param {object}  params

+ 9 - 0
src/router/route.ts

@@ -365,6 +365,15 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 			isKeepAlive: true,
 			isDynamic:true
 		},
+	},{
+		path: '/dataShare/newTaskDetail/:id/:tagsViewName?',
+		name: 'dataShareNewTaskDetail',
+		component: () => import('@/views/dataShare/newTaskDetail.vue'),
+		meta: {
+			title: '推送任务明细(新)',
+			isKeepAlive: true,
+			isDynamic:true
+		},
 	},{
 		path: '/statistics/order/detailSource',
 		name: 'statisticsOrderDetailSource',

+ 6 - 6
src/views/business/special/components/Special-apply-order.vue

@@ -1,5 +1,5 @@
 <template>
-<!-- 工单详情发起特提 -->
+	<!-- 工单详情发起特提 -->
 	<el-dialog v-model="state.dialogVisible" draggable title="特提申请" width="50%" append-to-body destroy-on-close @close="close">
 		<div class="collapse-container">
 			<el-form label-width="110px" ref="ruleFormRef" :model="state.ruleForm">
@@ -159,13 +159,13 @@ const close = () => {
 // 选择节点确定处理对象
 const stores = useUserInfo();
 const { userInfos } = storeToRefs(stores);
-const selectTrace = (val: any, choose?:boolean) => {
+const selectTrace = (val: any, choose?: boolean) => {
 	const next = steps.value.find((item) => item.key === val);
 	if (choose) state.ruleForm.nextStepCode = val;
 	state.ruleForm.nextStepName = next?.value;
-  state.ruleForm.businessType = next.businessType;
-  state.ruleForm.flowDirection = next.flowDirection;
-  state.ruleForm.handlerType = next.handlerType;
+	state.ruleForm.businessType = next.businessType;
+	state.ruleForm.flowDirection = next.flowDirection;
+	state.ruleForm.handlerType = next.handlerType;
 	ruleFormRef.value?.resetFields('nextHandlers');
 	stepsItems.value = next?.items ?? [];
 	stepsItems.value = stepsItems.value.map((item: any) => {
@@ -176,7 +176,7 @@ const selectTrace = (val: any, choose?:boolean) => {
 			label: item.value,
 		};
 	});
-	if (baseTypeId.value === val) {
+	if (!baseTypeId.value === val) {
 		//如果默认选中节点  判断选择的对象是否有当前用户 如果有 默认选中当前用户
 		const user = stepsItems.value.find((item: any) => item.value.key === userInfos.value?.id);
 		if (user) {

+ 83 - 0
src/views/dataShare/newTaskDetail.vue

@@ -0,0 +1,83 @@
+<template>
+  <div class="dataShare-taskDetail-container layout-pd">
+    <el-card shadow="never">
+      <ProTable
+        ref="proTableRef"
+        :columns="columns"
+        :data="state.tableData"
+        @updateTable="queryList"
+        :loading="state.loading"
+        :total="state.total"
+        v-model:page-index="state.queryParams.PageIndex"
+        v-model:page-size="state.queryParams.PageSize"
+        border
+      >
+      </ProTable>
+    </el-card>
+  </div>
+</template>
+<script setup lang="tsx" name="dataShareNewTaskDetail">
+import { onMounted, reactive, ref } from 'vue';
+import { getPushTaskDetail, getPushTaskDetailNew } from "@/api/dataShare";
+import { useRoute } from "vue-router";
+import { formatDate } from "@/utils/formatTime";
+const proTableRef = ref<RefType>(); // 表格ref
+// 表格配置项
+const columns = ref<any[]>([
+  {
+    prop: 'isSuccess',
+    label: '推送状态',
+    align: 'center',
+    render: (scope) => {
+      return <span>{scope.row.isSuccess ? '成功' : '失败'}</span>;
+    },
+  },
+  { prop: 'result', label: '返回数据', align: 'center' },
+  { prop: 'resultErrorData', label: '错误数据', align: 'center' },
+  { prop: 'processingServices', label: '推送平台', align: 'center' },
+  {
+    prop: 'creationTime',
+    label: '创建时间',
+    align: 'center',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
+  },
+]);
+// 定义变量内容
+const ruleFormRef = ref<RefType>(); // 表单ref
+const state = reactive({
+  queryParams: {
+    // 查询条件
+    PageIndex: 1,
+    PageSize: 10,
+  },
+  tableData: [], //表单
+  loading: false, // 加载
+  total: 0, // 总数
+});
+/** 获取列表 */
+const historyParams = history.state;
+const route = useRoute();
+const queryList = () => {
+  state.loading = true;
+  const request = {
+    PageIndex: state.queryParams.PageIndex,
+    PageSize: state.queryParams.PageSize,
+    Id: route.params.id
+  }
+  getPushTaskDetailNew(request)
+    .then((res: any) => {
+      state.tableData = res.result?.items ?? [];
+      state.total = res.result?.total ?? 0;
+      state.loading = false;
+    })
+    .catch(() => {
+      state.loading = false;
+    });
+};
+onMounted(() => {
+  queryList();
+});
+</script>

+ 1 - 1
src/views/dataShare/pushedTask.vue

@@ -172,7 +172,7 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 const router = useRouter();
 const onDetail = (row: any) => {
 	router.push({
-		name: 'dataShareTaskDetail',
+		name: 'dataShareNewTaskDetail',
 		params: {
 			id: row.id,
 		},