From 3dded18dc77b3511ec6008bdc69d6eaa35f8fdc5 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sat, 1 Jun 2024 16:54:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E4=BA=86=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E9=AB=98=E4=BA=86=E6=93=8D=E4=BD=9C=E6=95=88=E7=8E=87=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contract_ledger/index.vue           | 23 ++++++++++++++----
 .../marketing_framework_agreement/index.vue   | 24 ++++++++++++++++---
 src/views/oa_arrival/edit.vue                 | 11 ++++++---
 3 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/views/contract_ledger/index.vue b/src/views/contract_ledger/index.vue
index d04ebfe..7e755db 100644
--- a/src/views/contract_ledger/index.vue
+++ b/src/views/contract_ledger/index.vue
@@ -55,13 +55,16 @@
                         show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['contract.contract_negotiation/delete']" type="primary" link
-                                @click="handleDetail(row)">
+                            <el-button type="primary" link @click="handleDetail(row)">
                                 详情
                             </el-button>
-                            <el-button v-perms="['contract.contract_negotiation/detail']" link @click="handleDown(row.id)">
+                            <el-button link @click="handleDown(row.id)">
                                 下载
                             </el-button>
+                            <el-button v-perms="['contract.contract_negotiation/settlement']" type="primary" link
+                                v-if="row.refund_rate != '100%'" @click="handleSettlement(row)">
+                                结算
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -89,11 +92,15 @@ import {
 import { apiManageProjectDetail } from '@/api/manage_project'
 import { apiConsultProjectDetail } from '@/api/consult_project'
 import { apiCostProjectDetail } from '@/api/cost_project'
+import { useRouter } from "vue-router"
+
+
 
 const targetDetail = ref({})
 const detailRef = shallowRef<InstanceType<typeof EditPopup>>()
 // // 是否显示编辑框
 const showDetail = ref(false)
+const router = useRouter()
 
 // 查询条件
 const queryParams = reactive({
@@ -166,8 +173,8 @@ const getSummaries = (param) => {
                 Number(prev) + Number(curr), 0
             );
 
-            sums[index]=  sums[index].toFixed(2)
-          
+            sums[index] = sums[index].toFixed(2)
+
         }
         else {
             sums[index] = '';
@@ -183,5 +190,11 @@ const handleDown = async (id: number | any[]) => {
     a.href = res.url
     a.click()
 }
+// 结算
+const handleSettlement = (row) => {
+    alert("没有接口")
+    router.push('/financial/invoice_and_receipt/financial_settlement')
+}
+
 getLists()
 </script>
diff --git a/src/views/marketing_framework_agreement/index.vue b/src/views/marketing_framework_agreement/index.vue
index 4dec02f..9fe9b60 100644
--- a/src/views/marketing_framework_agreement/index.vue
+++ b/src/views/marketing_framework_agreement/index.vue
@@ -20,9 +20,6 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <!-- <el-form-item label="甲方签约单位">
-                    <el-input class="w-[280px]" v-model="queryParams.part_a" clearable placeholder="请输入行业性质" />
-                </el-form-item> -->
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -74,6 +71,12 @@
                                 @click="handledetail(row)">
                                 详情
                             </el-button>
+                            <el-button type="primary" link @click="handleContract(row)" v-if="false">
+                                生成合同
+                            </el-button>
+                            <el-button type="primary" link @click="handleGoContract(row)" v-else>
+                                已生成合同
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -98,11 +101,14 @@ import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import { deptLists } from "@/api/org/department"
 import DetailPopup from './detail.vue'
+import { useRouter } from "vue-router"
+
 
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const showEdit = ref(false)
 const showDetail = ref(false)
+const router = useRouter()
 
 // 查询条件
 const queryParams = reactive({
@@ -162,6 +168,18 @@ const handledetail = async (data: any) => {
     detailRef.value?.setFormData(res)
 }
 
+// 生成合同
+const handleContract = (row: any) => {
+    alert("没有接口")
+    console.log(row)
+}
+
+// 已生成合同
+const handleGoContract = (row) => {
+    return alert("没有接口")
+    router.push('/')
+}
+
 const deptList = ref([])
 const getDeptList = async () => {
     let res = await deptLists()
diff --git a/src/views/oa_arrival/edit.vue b/src/views/oa_arrival/edit.vue
index f24a52a..38e2dc1 100644
--- a/src/views/oa_arrival/edit.vue
+++ b/src/views/oa_arrival/edit.vue
@@ -58,7 +58,6 @@
                         {{ (+formData.amount) - (+formData.enter_amount) }}
                     </el-descriptions-item>
                     <el-descriptions-item label="已到账金额(元)" label-align="left" align="left">
-                        <!-- {{ formData.enter_amount }} -->
                         {{ formData.is_cash_text }}
                     </el-descriptions-item>
                 </el-descriptions>
@@ -67,8 +66,9 @@
                         暂无更多到账记录，点击 <el-button @click="handAdd">添加</el-button>
                     </template>
                     <el-table-column label="到账金额">
-                        <template #default="{ row }">
-                            <el-input v-model="row.amount" clearable placeholder="请输入报销金额" />
+                        <template #default="{ row, $index }">
+                            <el-input v-model="row.amount" clearable placeholder="请输入报销金额" type="number"
+                                @change="amountChange($index)" />
                         </template>
                     </el-table-column>
                     <el-table-column label="到账日期">
@@ -221,6 +221,11 @@ const fdz = async () => {
 
 }
 
+
+const amountChange = (index) => {
+    detail.value[index].amount = (+detail.value[index].amount).toFixed(2)
+}
+
 // 显示
 
 defineExpose({