From 5641321dcc3218512b1954b42380175c3c23bf00 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 24 May 2024 11:13:51 +0800
Subject: [PATCH] add

---
 src/api/oa_work.ts                            |  2 +-
 src/views/contract_ledger/index.vue           |  2 +
 src/views/financial_invoice/index.vue         | 30 +++++---
 src/views/financial_refund/index.vue          |  1 +
 src/views/oa_work/components/reciveReport.vue |  4 +-
 src/views/oa_work/index.vue                   |  2 +-
 src/views/oa_work/report.vue                  | 77 +++++++++++++++----
 src/views/supervision_project/detail.js       |  6 +-
 8 files changed, 92 insertions(+), 32 deletions(-)

diff --git a/src/api/oa_work.ts b/src/api/oa_work.ts
index 3f64d5d..10de5f8 100644
--- a/src/api/oa_work.ts
+++ b/src/api/oa_work.ts
@@ -56,7 +56,7 @@ export function apiOaWorkrcommentAdd(params: any) {
 }
 // 汇报工作表列表
 export function apiOaWorkrcommentDelete(params: any) {
-  return request.get({
+  return request.post({
     url: "/works.rcbg.oa_work_comment/delete",
     params,
   });
diff --git a/src/views/contract_ledger/index.vue b/src/views/contract_ledger/index.vue
index 7f392da..86b30f7 100644
--- a/src/views/contract_ledger/index.vue
+++ b/src/views/contract_ledger/index.vue
@@ -49,6 +49,8 @@
                             {{ (+row.signed_amount) - (+row.total_refund_amount) }}
                         </template>
                     </el-table-column>
+                    <el-table-column :render-header="pager.calcWidth" label="到账比例" prop="refund_rate"
+                        show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="回款日期" prop="refund_date"
                         show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
diff --git a/src/views/financial_invoice/index.vue b/src/views/financial_invoice/index.vue
index 4b8cf51..c4acc24 100644
--- a/src/views/financial_invoice/index.vue
+++ b/src/views/financial_invoice/index.vue
@@ -40,16 +40,26 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="合同名称" prop="contract_name" :render-header="pager.calcWidth" />
                     <el-table-column label="开票编号" prop="invoice_code" :render-header="pager.calcWidth" />
-                    <el-table-column label="开票申请金额" prop="apply_amount" show-overflow-tooltip width="120" />
-                    <el-table-column label="开票单位名称" prop="apply_company" show-overflow-tooltip width="120" />
-                    <el-table-column label="甲方签约单位" prop="part_a" show-overflow-tooltip width="120" />
-                    <el-table-column label="乙方签约单位" prop="part_b" show-overflow-tooltip width="120" />
-                    <el-table-column label="签订金额（元）" prop="sign_money" width="170" />
-                    <el-table-column label="签约时间" prop="sign_time" show-overflow-tooltip width="120" />
-                    <el-table-column label="发票类型" prop="invoice_type_text" show-overflow-tooltip />
-                    <el-table-column label="到账状态" prop="is_refund" show-overflow-tooltip />
-                    <el-table-column label="已到账金额" prop="refund_amount" show-overflow-tooltip />
-                    <el-table-column label="开票时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="开票申请金额" prop="apply_amount" :render-header="pager.calcWidth"
+                        show-overflow-tooltip width="120" />
+                    <el-table-column label="开票单位名称" prop="apply_company" :render-header="pager.calcWidth"
+                        show-overflow-tooltip width="120" />
+                    <el-table-column label="甲方签约单位" prop="part_a" :render-header="pager.calcWidth" show-overflow-tooltip
+                        width="120" />
+                    <el-table-column label="乙方签约单位" prop="part_b" :render-header="pager.calcWidth" show-overflow-tooltip
+                        width="120" />
+                    <el-table-column label="签订金额（元）" :render-header="pager.calcWidth" prop="sign_money" width="170" />
+                    <el-table-column label="签约时间" prop="sign_time" show-overflow-tooltip :render-header="pager.calcWidth"
+                        width="120" />
+                    <el-table-column label="发票类型" :render-header="pager.calcWidth" prop="invoice_type_text"
+                        show-overflow-tooltip />
+                    <el-table-column label="到账状态" :render-header="pager.calcWidth" prop="is_refund" show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="到账比例" prop="refund_rate"
+                        show-overflow-tooltip />
+                    <el-table-column label="已到账金额" :render-header="pager.calcWidth" prop="refund_amount"
+                        show-overflow-tooltip />
+                    <el-table-column label="开票时间" :render-header="pager.calcWidth" prop="create_time"
+                        show-overflow-tooltip />
                     <el-table-column label="到账时间" prop="refund_date" show-overflow-tooltip />
                     <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
diff --git a/src/views/financial_refund/index.vue b/src/views/financial_refund/index.vue
index 98609c8..73b67a2 100644
--- a/src/views/financial_refund/index.vue
+++ b/src/views/financial_refund/index.vue
@@ -36,6 +36,7 @@
                     <el-table-column label="合同名称" prop="contract_name" :render-header="pager.calcWidth" />
                     <el-table-column label="开票编号" prop="invoice_code" :render-header="pager.calcWidth" />
                     <el-table-column label="本次到账金额" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="到账比例" prop="refund_rate" show-overflow-tooltip />
                     <el-table-column label="到账日期" prop="date" show-overflow-tooltip />
                     <el-table-column label="登记人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="开票申请金额" prop="apply_amount" show-overflow-tooltip width="120" />
diff --git a/src/views/oa_work/components/reciveReport.vue b/src/views/oa_work/components/reciveReport.vue
index 8803c16..d9f9ab9 100644
--- a/src/views/oa_work/components/reciveReport.vue
+++ b/src/views/oa_work/components/reciveReport.vue
@@ -13,8 +13,7 @@
         </el-form-item>
     </el-form>
     <div class="mt-4">
-        <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>
@@ -43,7 +42,6 @@
         <pagination v-model="pager" @change="getLists" />
     </div>
     <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
-
 </template>
 <script setup lang="ts">
 import { ref, reactive } from 'vue';
diff --git a/src/views/oa_work/index.vue b/src/views/oa_work/index.vue
index ac7a39d..4426319 100644
--- a/src/views/oa_work/index.vue
+++ b/src/views/oa_work/index.vue
@@ -19,7 +19,7 @@ import sendReport from './components/sendReport.vue'
 import reciveReport from './components/reciveReport.vue'
 
 
-const activeName = ref('first')
+const activeName = ref('second')
 
 
 
diff --git a/src/views/oa_work/report.vue b/src/views/oa_work/report.vue
index b27c2b8..41703ef 100644
--- a/src/views/oa_work/report.vue
+++ b/src/views/oa_work/report.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="detail-popup">
         <popup ref="popupRef" title="汇报详情" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
-            <el-descriptions :column="1" border>
+            <el-descriptions :column="3" border>
                 <el-descriptions-item label="汇报人" label-align="left" align="left" label-class-name="my-label">
                     {{ formData.from_user_name }}
                 </el-descriptions-item>
@@ -14,6 +14,8 @@
                 <el-descriptions-item label="接受人" label-align="left" align="left" label-class-name="my-label">
                     {{ formData.work_info.type_user_names }}
                 </el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="1" border>
                 <el-descriptions-item label="工作内容" label-align="left" align="left" label-class-name="my-label">
                     {{ formData.work_info.works }}
                 </el-descriptions-item>
@@ -27,24 +29,37 @@
                     <annexLink :annex="formData.work_info.annex"></annexLink>
                 </el-descriptions-item>
             </el-descriptions>
+
             <el-card>
                 <template #header>
                     工作点评
                 </template>
-                <div>评论零</div>
-                <div>
-                    <el-input v-model="msg" type='textarea' placeholder='请输入评论内容'></el-input>
-                    <el-button class="mt-2 float-right" type="primary" @click="handleSend">
-                        <template #icon>
-                            <el-icon>
-                                <Position />
-                            </el-icon>
-                        </template>
-                        发送</el-button>
+                <div class="msg-content">
+                    <div v-for="(item, index) in commentList" :key="item.id" class="flex mb-4">
+                        <el-avatar :src="item.admin_avatar" class="avatar" shape="circle"></el-avatar>
+                        <div class="flex justify-between flex-col">
+                            <div>
+                                <strong class="name"> {{ item.admin_name }}</strong>
+                                <span class="time">
+                                    {{ item.create_time || '2024-12-04' }}
+                                </span>
+                                <span class="del" @click="handleDelete(item.id)"
+                                    v-if="userStore.id == item.admin_id">删除</span>
+                            </div>
+                            <div>{{ item.content }}</div>
+                        </div>
+                    </div>
                 </div>
-
+                <el-input v-model="msg" type='textarea' placeholder='请输入评论内容'></el-input>
+                <el-button class="mt-2 float-right" type="primary" @click="handleSend">
+                    <template #icon>
+                        <el-icon>
+                            <Position />
+                        </el-icon>
+                    </template>
+                    发送
+                </el-button>
             </el-card>
-
         </popup>
     </div>
 </template>
@@ -53,8 +68,11 @@
 import annexLink from './../../components/annexLink/index.vue'
 import Popup from '@/components/popup/index.vue'
 import { apiOaWorkrcommentLists, apiOaWorkrcommentAdd, apiOaWorkrcommentDelete } from "@/api/oa_work";
+import useUserStore from "@/stores/modules/user";
+
 const emit = defineEmits(['close'])
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const userStore = useUserStore().userInfo;
 
 // 表单数据
 const formData = reactive({
@@ -82,7 +100,7 @@ const getCommentList = async () => {
     let res = await apiOaWorkrcommentLists({
         work_id: formData.id
     })
-    commentList.value = res.data
+    commentList.value = res.lists
 }
 
 // 发送评论
@@ -142,3 +160,34 @@ defineExpose({
     setFormData,
 })
 </script>
+
+<style lang="scss" scoped>
+.msg-content {
+    overflow-y: auto;
+    max-height: 300px;
+
+    .avatar {
+        width: 50px;
+        height: 50px;
+        margin-right: 5px;
+    }
+
+    .name {
+        font-size: 16px;
+    }
+
+    .time {
+        color: #969696;
+        font-size: 12px;
+        margin: 0 5px
+    }
+
+    .del {
+        cursor: pointer;
+        color: white;
+        font-size: 12px;
+        background-color: red;
+        padding: 2px 5px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/supervision_project/detail.js b/src/views/supervision_project/detail.js
index 4237d9d..57f208a 100644
--- a/src/views/supervision_project/detail.js
+++ b/src/views/supervision_project/detail.js
@@ -76,15 +76,15 @@ const detailConfig = {
         },
         {
             label: "监管部门",
-            value: "supervision_department_text"
+            value: "supervision_department_name"
         },
         {
             label: "实施部门",
-            value: "implementation_department_text"
+            value: "implementation_department_name"
         },
         {
             label: "项目部",
-            value: "project_department_text"
+            value: "project_department_name"
         },
         {
             label: "工程状态",