From 20eb4a0058e35ac3cf5a6545a1848228d8b8dfc8 Mon Sep 17 00:00:00 2001
From: xiangheng <11675084@qq.com>
Date: Thu, 28 Dec 2023 21:00:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/flow/BasicSetting/index.vue    | 15 +++++---
 .../flow/flow_apply/components/ViewForm.vue   | 16 ++++----
 .../flow_apply/components/apply_submit.vue    |  3 +-
 admin/src/views/flow/flow_apply/edit.vue      | 37 ++-----------------
 .../flow/flow_history/components/Back.vue     | 10 +++--
 .../flow/flow_history/components/ViewForm.vue |  1 -
 server/admin/setting/dict_data/service.go     |  6 +--
 7 files changed, 32 insertions(+), 56 deletions(-)

diff --git a/admin/src/components/flow/BasicSetting/index.vue b/admin/src/components/flow/BasicSetting/index.vue
index f01cabf..29d6efc 100644
--- a/admin/src/components/flow/BasicSetting/index.vue
+++ b/admin/src/components/flow/BasicSetting/index.vue
@@ -24,11 +24,10 @@
                     :style="{ width: '100%' }"
                 >
                     <el-option
-                        v-for="(item, index) in flowGroupOptions"
-                        :key="index"
-                        :label="item.label"
+                        v-for="item in dictData.flow_group"
+                        :key="item.id"
+                        :label="item.name"
                         :value="item.value"
-                        :disabled="item.disabled"
                     ></el-option>
                 </el-select>
             </el-form-item>
@@ -52,6 +51,7 @@
 </template>
 
 <script>
+import { useDictData } from '@/hooks/useDictOptions'
 export default {
     name: 'BasicSetting',
     components: {},
@@ -110,7 +110,10 @@ export default {
                     label: '其他',
                     value: 7
                 }
-            ]
+            ],
+            dictData: {
+                flow_group: []
+            }
         }
     },
     computed: {
@@ -123,6 +126,8 @@ export default {
         if (typeof this.conf === 'object' && this.conf !== null) {
             Object.assign(this.formData, this.conf)
         }
+        const { dictData } = useDictData(['flow_group'])
+        this.dictData = dictData
     },
     methods: {
         // 给父级页面提供得获取本页数据得方法
diff --git a/admin/src/views/flow/flow_apply/components/ViewForm.vue b/admin/src/views/flow/flow_apply/components/ViewForm.vue
index 035c1e3..722b9a4 100644
--- a/admin/src/views/flow/flow_apply/components/ViewForm.vue
+++ b/admin/src/views/flow/flow_apply/components/ViewForm.vue
@@ -1,7 +1,6 @@
 <template>
     <el-dialog
         v-model="dialogVisible"
-        :show-close="false"
         :fullscreen="false"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -16,11 +15,13 @@
         >
         </v-form-render>
 
-        审批历史
-        <div v-for="history of historyList" :key="history.id">
-            {{ history.applyId }}{{ history.approverNickname || '无名' }} {{ history.passStatus }}
-            {{ history.passRemark }}
-        </div>
+        <el-table size="large" :data="historyList" v-if="historyList.length">
+            <el-table-column label="审批人" prop="approverNickname" />
+            <el-table-column label="节点" prop="nodeLabel" />
+            <el-table-column label="状态" prop="passStatus" />
+            <el-table-column label="备注" prop="passRemark" />
+        </el-table>
+
         <!-- {{ historyList }} -->
         <template #footer>
             <el-button @click="dialogVisible = false">关闭</el-button>
@@ -45,7 +46,7 @@ const vFormRef = ref(null)
 const dialogVisible = ref(false)
 const applyDetail = ref({})
 
-const historyList = ref({})
+const historyList = ref([])
 
 const props = defineProps({
     save: {
@@ -75,6 +76,7 @@ function closeFn() {
     applyDetail.value = {}
     formData.value = {}
     formJson.value = {}
+    historyList.value = []
 }
 function onSubmit() {
     vFormRef.value.getFormData().then((formData) => {
diff --git a/admin/src/views/flow/flow_apply/components/apply_submit.vue b/admin/src/views/flow/flow_apply/components/apply_submit.vue
index 63fb857..43958a9 100644
--- a/admin/src/views/flow/flow_apply/components/apply_submit.vue
+++ b/admin/src/views/flow/flow_apply/components/apply_submit.vue
@@ -1,7 +1,6 @@
 <template>
     <el-dialog
         v-model="dialogVisible"
-        :show-close="true"
         :fullscreen="false"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -19,7 +18,7 @@
             <!-- {{ userTask }} -->
             <el-form-item v-if="userTask" :label="`${userTask?.label}节点审批人`" prop="templateId">
                 <el-select
-                    class="flex-1"
+                    style="width: 100%"
                     v-if="approverUserList.length"
                     v-model="formData.applyUserId"
                     placeholder="请选择审批人"
diff --git a/admin/src/views/flow/flow_apply/edit.vue b/admin/src/views/flow/flow_apply/edit.vue
index be41d39..b4792b5 100644
--- a/admin/src/views/flow/flow_apply/edit.vue
+++ b/admin/src/views/flow/flow_apply/edit.vue
@@ -10,11 +10,11 @@
             @close="handleClose"
         >
             <el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
-                <el-form-item label="模板" prop="templateId">
+                <el-form-item label="审批流" prop="templateId">
                     <el-select
-                        class="flex-1"
                         v-model="formData.templateId"
-                        placeholder="请输入模板"
+                        placeholder="请选择审批流"
+                        style="width: 100%"
                         @change="handleTemplateChange"
                     >
                         <el-option
@@ -30,37 +30,6 @@
                 <el-form-item label="流程名称" prop="flowName">
                     <el-input v-model="formData.flowName" placeholder="请输入流程名称" />
                 </el-form-item>
-                <!-- <el-form-item label="流程分类" prop="flowGroup">
-                    <el-input v-model="formData.flowGroup" placeholder="请输入流程分类" />
-                </el-form-item> -->
-                <!-- <el-form-item label="流程描述" prop="flowRemark">
-                    <el-input v-model="formData.flowRemark" placeholder="请输入流程描述" />
-                </el-form-item>
-
-                <el-form-item label="formValue" prop="formValue">
-                    <el-input
-                        v-model="formData.formValue"
-                        placeholder="请输入流程配置"
-                        type="textarea"
-                        :autosize="{ minRows: 4, maxRows: 6 }"
-                    />
-                </el-form-item> -->
-                <!-- <el-form-item label="状态：0待提交，1审批中，2审批完成，3审批失败" prop="status">
-                    <el-select
-                        class="flex-1"
-                        v-model.number="formData.status"
-                        placeholder="请选择状态：0待提交，1审批中，2审批完成，3审批失败"
-                    >
-                        <el-option
-                            v-for="(item, index) in dictData.flow_apply_status"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.value"
-                            clearable
-                            :disabled="!item.status"
-                        />
-                    </el-select>
-                </el-form-item> -->
             </el-form>
         </popup>
     </div>
diff --git a/admin/src/views/flow/flow_history/components/Back.vue b/admin/src/views/flow/flow_history/components/Back.vue
index 86bbfaf..1fb298b 100644
--- a/admin/src/views/flow/flow_history/components/Back.vue
+++ b/admin/src/views/flow/flow_history/components/Back.vue
@@ -16,9 +16,12 @@
             label-width="110px"
             :rules="formRules"
         >
-            {{ back_nodes }}
             <el-form-item :label="`驳回到`" prop="templateId">
-                <el-select class="flex-1" v-model="formData.historyId" placeholder="请选择驳回节点">
+                <el-select
+                    style="width: 100%"
+                    v-model="formData.historyId"
+                    placeholder="请选择驳回节点"
+                >
                     <el-option label="发起人" :value="0" clearable />
                     <el-option
                         v-for="item in back_nodes"
@@ -48,8 +51,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
-import feedback from '@/utils/feedback'
+import { ref, reactive } from 'vue'
 import { flow_history_back, flow_history_list_all } from '@/api/flow/flow_history'
 const props = defineProps({
     title: {
diff --git a/admin/src/views/flow/flow_history/components/ViewForm.vue b/admin/src/views/flow/flow_history/components/ViewForm.vue
index 6a7fd49..7253335 100644
--- a/admin/src/views/flow/flow_history/components/ViewForm.vue
+++ b/admin/src/views/flow/flow_history/components/ViewForm.vue
@@ -1,7 +1,6 @@
 <template>
     <el-dialog
         v-model="dialogVisible"
-        :show-close="false"
         :fullscreen="false"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
diff --git a/server/admin/setting/dict_data/service.go b/server/admin/setting/dict_data/service.go
index 108861f..f33eeca 100644
--- a/server/admin/setting/dict_data/service.go
+++ b/server/admin/setting/dict_data/service.go
@@ -53,7 +53,7 @@ func (ddSrv settingDictDataService) All(allReq SettingDictDataListReq) (res []Se
 		ddModel = ddModel.Where("status = ?", allReq.Status)
 	}
 	var dictDatas []setting_model.DictData
-	err = ddModel.Order("id desc").Find(&dictDatas).Error
+	err = ddModel.Order("id asc").Find(&dictDatas).Error
 	if e = response.CheckErr(err, "All Find err"); e != nil {
 		return
 	}
@@ -86,11 +86,11 @@ func (ddSrv settingDictDataService) List(page request.PageReq, listReq SettingDi
 	}
 	var count int64
 	e = ddModel.Count(&count).Error
-	if e = response.CheckErr(err, "List Count err"); e != nil {
+	if e = response.CheckErr(e, "List Count err"); e != nil {
 		return
 	}
 	var dds []setting_model.DictData
-	err = ddModel.Limit(limit).Offset(offset).Order("id desc").Find(&dds).Error
+	err = ddModel.Limit(limit).Offset(offset).Order("id asc").Find(&dds).Error
 	if e = response.CheckErr(err, "List Find err"); e != nil {
 		return
 	}