From 676078300d56bdeb4c56649d6a1f6050cba79219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Tue, 5 Nov 2024 10:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Lowflow/penal/ApprovalAttr.vue            |  20 ++--
 .../TenantAuditStepModal.vue                  |  15 +++
 .../baseinfo/clientflowtemplate/columns.tsx   | 102 +++++++++++++-----
 3 files changed, 103 insertions(+), 34 deletions(-)

diff --git a/src/views/baseinfo/clientflowtemplate/Lowflow/penal/ApprovalAttr.vue b/src/views/baseinfo/clientflowtemplate/Lowflow/penal/ApprovalAttr.vue
index eeedd0a0..a3f1dbe9 100644
--- a/src/views/baseinfo/clientflowtemplate/Lowflow/penal/ApprovalAttr.vue
+++ b/src/views/baseinfo/clientflowtemplate/Lowflow/penal/ApprovalAttr.vue
@@ -149,13 +149,13 @@
       })
     }
   })
-  const AuditTypeList = ref<any>([])
-  GetTaskTypeConstList().then((res) => {
-    AuditTypeList.value.splice(0)
-    res.data.forEach((item) => {
-      AuditTypeList.value.push(item)
-    })
-  })
+  // const AuditTypeList = ref<any>([])
+  // GetTaskTypeConstList().then((res) => {
+  //   AuditTypeList.value.splice(0)
+  //   res.data.forEach((item) => {
+  //     AuditTypeList.value.push(item)
+  //   })
+  // })
   watch(
     () => node.users,
     (newVal, oldVal) => {
@@ -244,12 +244,12 @@
             <el-radio label="single">或签（其中一名审批人通过或驳回即可）</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item prop="method" label="执行人变更回调地址">
+        <!-- <el-form-item prop="method" label="执行人变更回调地址">
           <el-input
             type="textarea"
             :rows="6"
             placeholder="请输入内容"
-            v-model="node.MakerNotifyURL"
+            v-model="node.markerNotifyURL"
           >
           </el-input>
         </el-form-item>
@@ -266,7 +266,7 @@
               :value="item.value"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item prop="nobody" label="审批人为空">
           <el-radio-group v-model="node.nobody">
             <el-radio label="pass">自动通过</el-radio>
diff --git a/src/views/baseinfo/clientflowtemplate/TenantAuditStepModal.vue b/src/views/baseinfo/clientflowtemplate/TenantAuditStepModal.vue
index 635b24ee..83e45e21 100644
--- a/src/views/baseinfo/clientflowtemplate/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/clientflowtemplate/TenantAuditStepModal.vue
@@ -98,6 +98,9 @@
     content: '',
     permissionId: '',
     columnView: '',
+    auditType: '',
+    markerNotifyURL: '',
+    callbackURL: '',
     id: '',
   })
   const state = reactive({
@@ -113,6 +116,9 @@
       // await setFieldsValue(res.data)
       ApiData.name = res.data.name
       ApiData.note = res.data.note
+      ApiData.auditType = res.data.auditType.toString()
+      ApiData.markerNotifyURL = res.data.markerNotifyURL
+      ApiData.callbackURL = res.data.callbackURL
       ApiData.content = res.data.content
       ApiData.permissionId = res.data.permissionId
       ApiData.columnView = res.data.columnView
@@ -215,6 +221,9 @@
 
     ApiData.name = ''
     ApiData.note = ''
+    ApiData.auditType = ''
+    ApiData.markerNotifyURL = ''
+    ApiData.callbackURL = ''
     ApiData.content = ''
     ApiData.permissionId = ''
     ApiData.columnView = ''
@@ -256,6 +265,9 @@
     ApiData.name = step1Values.name
     ApiData.note = step1Values.note
     ApiData.columnView = step1Values.columnView
+    ApiData.auditType = step1Values.auditType
+    ApiData.markerNotifyURL = step1Values.markerNotifyURL
+    ApiData.callbackURL = step1Values.callbackURL
     if (step1Values.id) {
       ApiData.id = step1Values.id
     }
@@ -377,6 +389,9 @@
       notification.success({ message: res.message, duration: 3 })
       ApiData.name = ''
       ApiData.note = ''
+      ApiData.auditType = ''
+      ApiData.markerNotifyURL = ''
+      ApiData.callbackURL = ''
       ApiData.content = ''
       ApiData.permissionId = ''
       ApiData.columnView = ''
diff --git a/src/views/baseinfo/clientflowtemplate/columns.tsx b/src/views/baseinfo/clientflowtemplate/columns.tsx
index 8bc7326b..1dd48665 100644
--- a/src/views/baseinfo/clientflowtemplate/columns.tsx
+++ b/src/views/baseinfo/clientflowtemplate/columns.tsx
@@ -1,6 +1,6 @@
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
-import { GetTablesByClient } from './api'
+import { GetTablesByClient, GetTaskTypeConstList } from './api'
 
 export const columns: BasicColumn[] = [
   // {
@@ -63,12 +63,12 @@ export const searchFormSchema: FormSchema[] = [
   },
 ]
 export const formSchema: FormSchema[] = [
-  {
-    field: 'divider-selects',
-    component: 'Divider',
-    label: '基本信息',
-    colProps: { span: 24 },
-  },
+  // {
+  //   field: 'divider-selects',
+  //   component: 'Divider',
+  //   label: '基本信息',
+  //   colProps: { span: 24 },
+  // },
   {
     label: '',
     field: 'id',
@@ -80,34 +80,21 @@ export const formSchema: FormSchema[] = [
     field: 'name',
     label: '模板名称',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 5 },
   },
   {
     field: 'orderNo',
     label: '排序号',
     component: 'InputNumber',
     defaultValue: 0,
-    colProps: { span: 12 },
-  },
-  {
-    field: 'status',
-    label: '是否启用',
-    component: 'Switch',
-    colProps: { span: 6 },
-    defaultValue: 0,
-    componentProps: {
-      checkedChildren: '启用',
-      checkedValue: 0,
-      unCheckedChildren: '禁用',
-      unCheckedValue: 1,
-    },
+    colProps: { span: 5 },
   },
   {
     field: 'columnView',
     label: '关联表',
     component: 'ApiSelect',
     required: true,
-    colProps: { span: 12 },
+    colProps: { span: 5 },
     componentProps: () => {
       return {
         allowClear: true,
@@ -122,11 +109,78 @@ export const formSchema: FormSchema[] = [
       }
     },
   },
+  {
+    field: 'status',
+    label: '是否启用',
+    component: 'Switch',
+    colProps: { span: 4 },
+    defaultValue: 0,
+    componentProps: {
+      checkedChildren: '启用',
+      checkedValue: 0,
+      unCheckedChildren: '禁用',
+      unCheckedValue: 1,
+    },
+  },
+  {
+    label: '审批类型',
+    field: 'auditType',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
+    colProps: { span: 5 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: GetTaskTypeConstList,
+        labelField: 'key',
+        showName: 'key',
+        valueField: 'value',
+        resultField: 'data',
+      }
+    },
+  },
+  {
+    field: 'markerNotifyURL',
+    label: '执行人变更回调地址',
+    component: 'InputTextArea',
+    colProps: { span: 8 },
+    componentProps: {
+      rows: 3,
+    },
+  },
+  {
+    field: 'callbackURL',
+    label: '回调地址',
+    component: 'InputTextArea',
+    colProps: { span: 8 },
+    componentProps: {
+      rows: 3,
+    },
+  },
   {
     field: 'note',
     label: '备注',
     component: 'InputTextArea',
-    colProps: { span: 20 },
+    colProps: { span: 8 },
+    componentProps: {
+      rows: 3,
+    },
+  },
+  {
+    label: '',
+    field: 'Space1',
+    component: 'Space',
+    colProps: {
+      span: 24,
+    },
+  },
+  {
+    label: '',
+    field: 'Space2',
+    component: 'Space',
+    colProps: {
+      span: 24,
+    },
   },
 ]
 export const permissionFormSchema: FormSchema[] = [