From 2f1b2730f8665f5588d7c1c6ebddf8262de181c3 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 24 May 2024 16:21:48 +0800
Subject: [PATCH] add

---
 src/views/contract_ledger/index.vue         |  2 +-
 src/views/oa_plan/index.vue                 | 21 ++++-
 src/views/oa_schedule/index.vue             | 21 ++++-
 src/views/oa_work/components/sendReport.vue |  9 ++-
 src/views/oa_work/detail.vue                | 88 +++++++++++++++++++++
 5 files changed, 132 insertions(+), 9 deletions(-)
 create mode 100644 src/views/oa_work/detail.vue

diff --git a/src/views/contract_ledger/index.vue b/src/views/contract_ledger/index.vue
index 86b30f7..e5e2b47 100644
--- a/src/views/contract_ledger/index.vue
+++ b/src/views/contract_ledger/index.vue
@@ -46,7 +46,7 @@
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="合同未回款金额" prop="notHk" show-overflow-tooltip>
                         <template #default="{ row }">
-                            {{ (+row.signed_amount) - (+row.total_refund_amount) }}
+                            {{ ((+row.signed_amount) - (+row.total_refund_amount)).toFixed(2) }}
                         </template>
                     </el-table-column>
                     <el-table-column :render-header="pager.calcWidth" label="到账比例" prop="refund_rate"
diff --git a/src/views/oa_plan/index.vue b/src/views/oa_plan/index.vue
index 81583be..f871b1e 100644
--- a/src/views/oa_plan/index.vue
+++ b/src/views/oa_plan/index.vue
@@ -40,7 +40,7 @@
                     <el-table-column label="结束时间" prop="end_time" show-overflow-tooltip />
                     <el-table-column label="提醒类型" prop="remind_type_text" show-overflow-tooltip />
                     <el-table-column label="描述" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['works.rcbg.oa_plan/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
@@ -49,6 +49,9 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button type="primary" link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -58,21 +61,27 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false" @close="showDetail = false" />
     </div>
 </template>
 
 <script lang="ts" setup name="oaPlanLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiOaPlanLists, apiOaPlanDelete } from '@/api/oa_plan'
+import { apiOaPlanLists, apiOaPlanDelete, apiOaPlanDetail } from '@/api/oa_plan'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailPopup from './detail.vue'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
 
 // 查询条件
 const queryParams = reactive({
@@ -111,6 +120,14 @@ const handleEdit = async (data: any) => {
     editRef.value?.open('edit')
     editRef.value?.setFormData(data)
 }
+// 详情
+const handleDetail = async (id: number) => {
+    let res = await apiOaPlanDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
diff --git a/src/views/oa_schedule/index.vue b/src/views/oa_schedule/index.vue
index edbac67..69bae20 100644
--- a/src/views/oa_schedule/index.vue
+++ b/src/views/oa_schedule/index.vue
@@ -37,7 +37,7 @@
                     <el-table-column label="工时" prop="labor_time" show-overflow-tooltip />
                     <el-table-column label="工作类型" prop="labor_type_text" show-overflow-tooltip />
                     <el-table-column label="描述" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['works.rcbg.oa_schedule/edit']" type="primary" link
                                 @click="handleEdit(row)">
@@ -47,6 +47,9 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
+                            <el-button type="primary" link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -56,21 +59,27 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false" @close="showDetail = false" />
     </div>
 </template>
 
 <script lang="ts" setup name="oaScheduleLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiOaScheduleLists, apiOaScheduleDelete } from '@/api/oa_schedule'
+import { apiOaScheduleLists, apiOaScheduleDelete, apiOaScheduleDetail } from '@/api/oa_schedule'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import detailPopup from './detail.vue'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
 
 // 查询条件
 const queryParams = reactive({
@@ -109,6 +118,14 @@ const handleEdit = async (data: any) => {
     editRef.value?.open('edit')
     editRef.value?.setFormData(data)
 }
+// 详情
+const handleDetail = async (id: number) => {
+    let res = await apiOaScheduleDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
diff --git a/src/views/oa_work/components/sendReport.vue b/src/views/oa_work/components/sendReport.vue
index aeea874..cd7ec76 100644
--- a/src/views/oa_work/components/sendReport.vue
+++ b/src/views/oa_work/components/sendReport.vue
@@ -15,14 +15,12 @@
     <div class="mt-4">
         <!-- <el-button v-perms="['works.rcbg.oa_work/add']" type="primary" @click="handleAdd"> -->
         <el-button type="primary" @click="handleAdd">
-
             <template #icon>
                 <icon name="el-icon-Plus" />
             </template>
             新增
         </el-button>
-        <el-button v-perms="['works.rcbg.oa_work/delete']" :disabled="!selectData.length"
-            @click="handleDelete(selectData)">
+        <el-button v-perms="['works.rcbg.oa_work/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
             删除
         </el-button>
     </div>
@@ -42,6 +40,9 @@
                     <el-button v-perms="['works.rcbg.oa_work/delete']" type="danger" link @click="handleDelete(row.id)">
                         删除
                     </el-button>
+                    <el-button type="primary" link @click="handleDetail(row.id)">
+                        详情
+                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -50,7 +51,7 @@
         <pagination v-model="pager" @change="getLists" />
     </div>
     <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
-
+    <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false" @close="showDetail = false" />
 </template>
 <script setup lang="ts">
 import { ref, reactive } from 'vue';
diff --git a/src/views/oa_work/detail.vue b/src/views/oa_work/detail.vue
new file mode 100644
index 0000000..aff3182
--- /dev/null
+++ b/src/views/oa_work/detail.vue
@@ -0,0 +1,88 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" title="日程安排详情" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="工作安排主题" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.title }}
+                </el-descriptions-item>
+                <el-descriptions-item label="日程优先级" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.type_text }}
+                </el-descriptions-item>
+                <el-descriptions-item label="日程优先级" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.type_text }}
+                </el-descriptions-item>
+                <el-descriptions-item label="开始时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.start_time }}
+                </el-descriptions-item>
+                <el-descriptions-item label="结束时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.end_time }}
+                </el-descriptions-item>
+                <el-descriptions-item label="提醒类型" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remind_type_text }}
+                </el-descriptions-item>
+                <el-descriptions-item label="描述" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+            </el-descriptions>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import Popup from '@/components/popup/index.vue'
+import type { PropType } from 'vue'
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    title: '',
+    type: '',
+    type_text: '',
+    start_time: '',
+    end_time: '',
+    remind_type: '',
+    remind_type_text: '',
+    remark: '',
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+