add

src/views/oa_plan/detail.vue

@@ -8,9 +8,6 @@
                 <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>

src/views/oa_schedule/detail.vue

@@ -11,6 +11,9 @@
                 <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.labor_time }}
+                </el-descriptions-item>
                 <el-descriptions-item label="工作类别" label-align="left" align="left" label-class-name="my-label">
                     {{ formData.cid_text }}
                 </el-descriptions-item>
@@ -41,6 +44,7 @@ const formData = reactive({
     cid: '',
     cid_text: '',
     labor_type: '',
+    labor_time: "",
     labor_type_text: '',
     remark: '',
 })

src/views/oa_work/components/sendReport.vue

@@ -32,7 +32,7 @@
             <el-table-column label="汇报工作内容" prop="works" show-overflow-tooltip />
             <el-table-column label="计划工作内容" prop="plans" 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_work/edit']" type="primary" link @click="handleEdit(row)">
                         编辑
@@ -56,14 +56,19 @@
 <script setup lang="ts">
 import { ref, reactive } from 'vue';
 import editPopup from '../edit.vue';
-import { apiOaWorkLists, apiOaWorkDelete } from '@/api/oa_work'
+import { apiOaWorkLists, apiOaWorkDelete, apiOaWorkDetail } from '@/api/oa_work'
 import { usePaging } from '@/hooks/usePaging';
 import feedback from '@/utils/feedback';
+import detailPopup from '../detail.vue'
 
-const editRef = ref(null)
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
 
 // 查询条件
 const queryParams = reactive({
@@ -101,6 +106,15 @@ const handleEdit = async (data: any) => {
     editRef.value?.setFormData(data)
 }
 
+// 详情
+const handleDetail = async (id: number) => {
+    let res = await apiOaWorkDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
 // 删除
 const handleDelete = async (id: number | any[]) => {
     await feedback.confirm('确定要删除？')

src/views/oa_work/detail.vue

@@ -2,33 +2,32 @@
     <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">
+                <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">
+                <el-descriptions-item label="接收人员" label-align="left" align="left" label-class-name="my-label">
-                    {{ formData.type_text }}
+                    {{ formData.type_user_names }}
                 </el-descriptions-item>
-                <el-descriptions-item label="开始时间" label-align="left" align="left" label-class-name="my-label">
+                <el-descriptions-item label="汇报工作内容" label-align="left" align="left" label-class-name="my-label">
-                    {{ formData.start_time }}
+                    {{ formData.works }}
                 </el-descriptions-item>
-                <el-descriptions-item label="结束时间" label-align="left" align="left" label-class-name="my-label">
+                <el-descriptions-item label="计划工作内容" label-align="left" align="left" label-class-name="my-label">
-                    {{ formData.end_time }}
+                    {{ formData.plans }}
                 </el-descriptions-item>
-                <el-descriptions-item label="提醒类型" label-align="left" align="left" label-class-name="my-label">
+                <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-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <!-- {{ formData.remind_type_text }} -->
+                    <annexLink :annex="formData.annex"></annexLink>
+                </el-descriptions-item>
             </el-descriptions>
         </popup>
     </div>
 </template>
 
 <script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
 import Popup from '@/components/popup/index.vue'
 import type { PropType } from 'vue'
 
@@ -37,15 +36,15 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
 
 // 表单数据
 const formData = reactive({
-    id: '',
+    id: "",
-    title: '',
+    type: "",
-    type: '',
+    type_text: "",
-    type_text: '',
+    type_user: "",
-    start_time: '',
+    type_user_names: "",
-    end_time: '',
+    works: "",
-    remind_type: '',
+    plans: "",
-    remind_type_text: '',
+    remark: "",
-    remark: '',
+    annex: [],
 })
 
 // 获取详情

src/views/oa_work/edit.vue

@@ -9,14 +9,14 @@
                         <el-option label="日报" :value="1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="接受人员" prop="type_user">
+                <el-form-item label="接收人员" prop="type_user">
                     <el-input v-model="formData.type_user_names" :disabled="mode == 'edit'" @click="userclick" clearable
                         placeholder="点击选择接受人员" />
                 </el-form-item>
-                <el-form-item label="汇报工作内容" prop="works">
+                <el-form-item :label="labelList[formData.type - 1][0] + '工作内容'" prop="works">
                     <el-input v-model="formData.works" clearable placeholder="请输入汇报工作内容" type="textarea" />
                 </el-form-item>
-                <el-form-item label="计划工作内容" prop="plans">
+                <el-form-item :label="labelList[formData.type - 1][1] + '工作计划'" prop="plans">
                     <el-input v-model="formData.plans" clearable placeholder="请输入计划工作内容" type="textarea" />
                 </el-form-item>
                 <el-form-item label="其他事项" prop="remark">
@@ -61,7 +61,7 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: "",
-    type: "",
+    type: 1,
     type_user: "",
     type_user_names: "",
     works: "",
@@ -70,6 +70,12 @@ const formData = reactive({
     annex: [],
 });
 
+const labelList = [
+    ['今日', '明日'],
+    ['本周', '下周'],
+    ['本月', '下月']
+]
+
 const userclick = async () => {
     showDialog.value = true
     await nextTick()