From e64a93c253bec4a1de7e7ca7a547395790c58aad Mon Sep 17 00:00:00 2001
From: xiangheng <11675084@qq.com>
Date: Thu, 21 Dec 2023 23:41:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/flow_apply/edit.vue           | 28 +++++++++----------
 admin/src/views/setting/dict/data/index.vue   |  6 +++-
 server/admin/flow_apply/flow_apply_schema.go  |  4 +--
 server/admin/flow_apply/flow_apply_service.go |  2 +-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/admin/src/views/flow_apply/edit.vue b/admin/src/views/flow_apply/edit.vue
index 0813a46..2899e22 100644
--- a/admin/src/views/flow_apply/edit.vue
+++ b/admin/src/views/flow_apply/edit.vue
@@ -30,10 +30,10 @@
                 <el-form-item label="流程名称" prop="flowName">
                     <el-input v-model="formData.flowName" placeholder="请输入流程名称" />
                 </el-form-item>
-                <el-form-item label="流程分类" prop="flowGroup">
+                <!-- <el-form-item label="流程分类" prop="flowGroup">
                     <el-input v-model="formData.flowGroup" placeholder="请输入流程分类" />
-                </el-form-item>
-                <el-form-item label="流程描述" prop="flowRemark">
+                </el-form-item> -->
+                <!-- <el-form-item label="流程描述" prop="flowRemark">
                     <el-input v-model="formData.flowRemark" placeholder="请输入流程描述" />
                 </el-form-item>
 
@@ -44,7 +44,7 @@
                         type="textarea"
                         :autosize="{ minRows: 4, maxRows: 6 }"
                     />
-                </el-form-item>
+                </el-form-item> -->
                 <!-- <el-form-item label="状态：0待提交，1审批中，2审批完成，3审批失败" prop="status">
                     <el-select
                         class="flex-1"
@@ -94,12 +94,12 @@ const formData = reactive({
     // applyUserId: '',
     // applyUserNickname: '',
     flowName: '',
-    flowGroup: '',
-    flowRemark: '',
-    flowFormData: '',
-    flowProcessData: '',
-    status: 0,
-    formValue: ''
+    // flowGroup: '',
+    // flowRemark: '',
+    // flowFormData: '',
+    // flowProcessData: '',
+    status: 0
+    // formValue: ''
 })
 
 const formRules = {
@@ -183,10 +183,10 @@ function handleTemplateChange(id: number) {
     flow_template.value.find((item: any) => {
         if (item.id == id) {
             formData.flowName = item.flowName
-            formData.flowGroup = item.flowGroup
-            formData.flowRemark = item.flowRemark
-            formData.flowFormData = item.flowFormData
-            formData.flowProcessData = item.flowProcessData
+            // formData.flowGroup = item.flowGroup
+            // formData.flowRemark = item.flowRemark
+            // formData.flowFormData = item.flowFormData
+            // formData.flowProcessData = item.flowProcessData
             return true
         }
     })
diff --git a/admin/src/views/setting/dict/data/index.vue b/admin/src/views/setting/dict/data/index.vue
index a348e84..78b5385 100644
--- a/admin/src/views/setting/dict/data/index.vue
+++ b/admin/src/views/setting/dict/data/index.vue
@@ -63,7 +63,11 @@
                     >
                         <el-table-column type="selection" width="55" />
                         <el-table-column label="ID" prop="id" />
-                        <el-table-column label="数据名称" prop="name" min-width="120" />
+                        <el-table-column label="数据名称" prop="name" min-width="120">
+                            <template v-slot="{ row }">
+                                <span :style="{ color: row.color }">{{ row.name }}</span>
+                            </template>
+                        </el-table-column>
                         <el-table-column label="数据值" prop="value" min-width="120" />
                         <el-table-column label="颜色" prop="color" min-width="120" />
                         <el-table-column label="状态">
diff --git a/server/admin/flow_apply/flow_apply_schema.go b/server/admin/flow_apply/flow_apply_schema.go
index e60ebc3..c81b936 100644
--- a/server/admin/flow_apply/flow_apply_schema.go
+++ b/server/admin/flow_apply/flow_apply_schema.go
@@ -27,7 +27,7 @@ type FlowApplyAddReq struct {
 	TemplateId        int    `form:"templateId"`        // 模板
 	ApplyUserId       int    `form:"applyUserId"`       // 申请人id
 	ApplyUserNickname string `form:"applyUserNickname"` // 申请人昵称
-	// FlowName            string `form:"flowName"`            // 流程名称
+	FlowName          string `form:"flowName"`          // 流程名称
 	// FlowGroup           int    `form:"flowGroup"`           // 流程分类
 	// FlowRemark          string `form:"flowRemark"`          // 流程描述
 	// FlowFormData        string `form:"flowFormData"`        // 表单配置
@@ -43,7 +43,7 @@ type FlowApplyEditReq struct {
 	// TemplateId          int    `form:"templateId"`          // 模板
 	// ApplyUserId         int    `form:"applyUserId"`         // 申请人id
 	// ApplyUserNickname   string `form:"applyUserNickname"`   // 申请人昵称
-	// FlowName            string `form:"flowName"`            // 流程名称
+	FlowName string `form:"flowName"` // 流程名称
 	// FlowGroup           int    `form:"flowGroup"`           // 流程分类
 	// FlowRemark          string `form:"flowRemark"`          // 流程描述
 	// FlowFormData        string `form:"flowFormData"`        // 表单配置
diff --git a/server/admin/flow_apply/flow_apply_service.go b/server/admin/flow_apply/flow_apply_service.go
index 22637dd..3078b9a 100644
--- a/server/admin/flow_apply/flow_apply_service.go
+++ b/server/admin/flow_apply/flow_apply_service.go
@@ -109,7 +109,7 @@ func (Service flowApplyService) Add(addReq FlowApplyAddReq) (e error) {
 		return
 	}
 	response.Copy(&obj, addReq)
-	obj.FlowName = flow_template_resp.FlowName
+	// obj.FlowName = flow_template_resp.FlowName
 	obj.FlowGroup = flow_template_resp.FlowGroup
 	obj.FlowRemark = flow_template_resp.FlowRemark
 	obj.FlowFormData = flow_template_resp.FlowFormData