From 7b75d9c1c715632a0d9894ed853410c6bb1cbc40 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 31 Mar 2025 16:35:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/processDrawer/index.vue              | 13 +++++++------
 .../purchaseManagement/smErpCgPlan/index.vue        |  9 ++++++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/processDrawer/index.vue b/src/components/processDrawer/index.vue
index e9728a3..58a5bab 100644
--- a/src/components/processDrawer/index.vue
+++ b/src/components/processDrawer/index.vue
@@ -6,7 +6,7 @@
 		</template>
 		<template #default>
 			<div class="w-full h-full" v-loading="loading">
-				<el-card class="box-card" v-if="curAssignTask.taskId">
+				<el-card class="box-card">
 					<form-render ref="formRenderRef" :form-list="currentOpenFlowForm" />
 				</el-card>
 				<flow-node-format
@@ -64,12 +64,13 @@ const openProcessDrawer = async (row: any) => {
 
 	loading.value = true
 	try {
-		const assignTask = await queryAssignTaskOne({ processInstanceId: row.processId })
-		if (assignTask.code === 0) {
-			curAssignTask.value = assignTask.data
+		if (row.processId) {
+			const assignTask = await queryAssignTaskOne({ processInstanceId: row.processId })
+			if (assignTask.code === 0) {
+				curAssignTask.value = assignTask.data
+			}
 		}
-
-		const res = await queryTask(curAssignTask.value.taskId, false).finally(() => (loading.value = false))
+		const res = await queryTask(curAssignTask.value.taskId || row.taskId, false).finally(() => (loading.value = false))
 		if (res.code === 0) {
 			currentOpenFlowForm.value = res.data.formItems
 		}
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue
index 8ab78f9..fe84f42 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue
@@ -79,7 +79,14 @@
 						<el-button icon="delete" text type="primary" v-auth="'supermarket_smErpCgPlan_del'" @click="handleDelete([scope.row.id])">
 							删除
 						</el-button>
-						<el-button type="primary" size="small" v-if="scope.row.checkStatus != '2'" link icon="VideoPlay" @click="deal(scope.row)">
+						<el-button
+							type="primary"
+							size="small"
+							v-if="scope.row.checkStatus != '2' && scope.row.taskId"
+							link
+							icon="VideoPlay"
+							@click="deal(scope.row)"
+						>
 							开始处理
 						</el-button>
 					</template>

From 4f81f8bdc3611d5d68e151023a9e4e06f2a9f137 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 31 Mar 2025 17:14:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/processDrawer/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/processDrawer/index.vue b/src/components/processDrawer/index.vue
index 58a5bab..bcc4033 100644
--- a/src/components/processDrawer/index.vue
+++ b/src/components/processDrawer/index.vue
@@ -69,8 +69,10 @@ const openProcessDrawer = async (row: any) => {
 			if (assignTask.code === 0) {
 				curAssignTask.value = assignTask.data
 			}
+		} else {
+			curAssignTask.value = row
 		}
-		const res = await queryTask(curAssignTask.value.taskId || row.taskId, false).finally(() => (loading.value = false))
+		const res = await queryTask(curAssignTask.value.taskId, false).finally(() => (loading.value = false))
 		if (res.code === 0) {
 			currentOpenFlowForm.value = res.data.formItems
 		}

From e25aadb429ddf82574f8972815b96b68dd2aa6b0 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 31 Mar 2025 18:19:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=95=E7=82=B9=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/thirdparty/thirdPartyLog.ts          |  41 ++++++
 src/views/canteen/canteenSpu/index.vue       |   2 +-
 src/views/thirdparty/thirdPartyLog/form.vue  | 139 +++++++++++++++++++
 src/views/thirdparty/thirdPartyLog/index.vue | 117 ++++++++++++++++
 4 files changed, 298 insertions(+), 1 deletion(-)
 create mode 100644 src/api/thirdparty/thirdPartyLog.ts
 create mode 100644 src/views/thirdparty/thirdPartyLog/form.vue
 create mode 100644 src/views/thirdparty/thirdPartyLog/index.vue

diff --git a/src/api/thirdparty/thirdPartyLog.ts b/src/api/thirdparty/thirdPartyLog.ts
new file mode 100644
index 0000000..6640294
--- /dev/null
+++ b/src/api/thirdparty/thirdPartyLog.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/thirdparty/thirdPartyLog/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/thirdparty/thirdPartyLog',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/thirdparty/thirdPartyLog/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/thirdparty/thirdPartyLog',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/thirdparty/thirdPartyLog',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/views/canteen/canteenSpu/index.vue b/src/views/canteen/canteenSpu/index.vue
index 7ea1719..d65384f 100644
--- a/src/views/canteen/canteenSpu/index.vue
+++ b/src/views/canteen/canteenSpu/index.vue
@@ -69,7 +69,7 @@
 						<dict-tag :options="spu_status" :value="scope.row.status" />
 					</template>
 				</el-table-column>
-        <el-table-column prop="isShow" label="是否在移动端显示 " show-overflow-tooltip>
+        <el-table-column prop="isShow" label="是否在移动端显示" show-overflow-tooltip>
           <template #default="scope">
             <dict-tag :options="is_show" :value="scope.row.isShow"></dict-tag>
           </template>
diff --git a/src/views/thirdparty/thirdPartyLog/form.vue b/src/views/thirdparty/thirdPartyLog/form.vue
new file mode 100644
index 0000000..8a58a62
--- /dev/null
+++ b/src/views/thirdparty/thirdPartyLog/form.vue
@@ -0,0 +1,139 @@
+<template>
+    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
+      :close-on-click-modal="false" draggable>
+      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+       <el-row :gutter="24">
+    <el-col :span="12" class="mb20">
+      <el-form-item label="接口名称" prop="apiName">
+        <el-input v-model="form.apiName" placeholder="请输入接口名称"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="是否删除" prop="deleted">
+        <el-input v-model="form.deleted" placeholder="请输入是否删除"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="请求路径" prop="requestUrl">
+        <el-input v-model="form.requestUrl" placeholder="请输入请求路径"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="状态码" prop="httpStatus">
+        <el-input v-model="form.httpStatus" placeholder="请输入状态码"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+  <el-form-item label="原始响应" prop="responseBody">
+    <editor v-if="visible" v-model:get-html="form.responseBody" placeholder="请输入原始响应"></editor>
+  </el-form-item>
+  </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="错误码（如-1）" prop="errorCode">
+        <el-input v-model="form.errorCode" placeholder="请输入错误码（如-1）"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="错误描述" prop="errorMsg">
+        <el-input type="textarea" v-model="form.errorMsg" placeholder="请输入错误描述"/>
+      </el-form-item>
+      </el-col>
+
+			</el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="ThirdPartyLogDialog">
+import { useDict } from '/src/hooks/dict';
+import { useMessage } from "/src/hooks/message";
+import { getObj, addObj, putObj } from '/src/api/thirdparty/thirdPartyLog'
+import { rule } from '/src/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  apiName: '',
+	  deleted: '',
+	  requestUrl: '',
+	  httpStatus: '',
+	  responseBody: '',
+	  errorCode: '',
+	  errorMsg: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取thirdPartyLog信息
+  if (id) {
+    form.id = id
+    getthirdPartyLogData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {});
+	if (!valid) return false;
+
+	try {
+    loading.value = true;
+		form.id ? await putObj(form) : await addObj(form);
+		useMessage().success(form.id ? '修改成功' : '添加成功');
+		visible.value = false;
+		emit('refresh');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getthirdPartyLogData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
diff --git a/src/views/thirdparty/thirdPartyLog/index.vue b/src/views/thirdparty/thirdPartyLog/index.vue
new file mode 100644
index 0000000..b049f96
--- /dev/null
+++ b/src/views/thirdparty/thirdPartyLog/index.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'thirdparty_thirdPartyLog_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'thirdparty_thirdPartyLog_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'thirdparty_thirdPartyLog_export'"
+                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border
+        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+          <el-table-column prop="apiName" label="接口名称"  show-overflow-tooltip/>
+          <el-table-column prop="deleted" label="是否删除"  show-overflow-tooltip/>
+          <el-table-column prop="requestUrl" label="请求路径"  show-overflow-tooltip/>
+          <el-table-column prop="httpStatus" label="状态码"  show-overflow-tooltip/>
+          <el-table-column prop="errorCode" label="错误码（如-1）"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'thirdparty_thirdPartyLog_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'thirdparty_thirdPartyLog_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemThirdPartyLog">
+import { BasicTableProps, useTable } from "/src/hooks/table";
+import { fetchList, delObjs } from "/src/api/thirdparty/thirdPartyLog";
+import { useMessage, useMessageBox } from "/src/hooks/message";
+import { useDict } from '/src/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/thirdparty/thirdPartyLog/export', Object.assign(state.queryForm, { ids: selectObjs }), 'thirdPartyLog.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>