From 2363503d3bf18926a4f4218c88b54db83a56a28b Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 28 Mar 2024 16:27:00 +0800
Subject: [PATCH] add

---
 src/components/project_personnel/index.vue    |  32 +-----
 src/views/customer_demand/edit.vue            |  26 +++--
 src/views/customer_demand_solution/detail.vue |  41 +++----
 src/views/customer_demand_solution/edit.vue   |   7 +-
 .../financial_travel_reimbursement/detail.js  | 103 ++++++++++++++++++
 .../financial_travel_reimbursement/edit.vue   |  90 +++++++--------
 .../financial_travel_reimbursement/index.vue  |  31 ++----
 src/views/project_labor_contract/edit.vue     |   5 +-
 .../components/Overview.vue                   |  14 +--
 9 files changed, 199 insertions(+), 150 deletions(-)
 create mode 100644 src/views/financial_travel_reimbursement/detail.js

diff --git a/src/components/project_personnel/index.vue b/src/components/project_personnel/index.vue
index 3e7c7c6..e27e8a5 100644
--- a/src/components/project_personnel/index.vue
+++ b/src/components/project_personnel/index.vue
@@ -20,41 +20,11 @@
                     <el-table-column label="姓名" property="name" />
                     <el-table-column label="身份证号" property="idcard" />
                     <el-table-column label="手机号" property="mobile" />
-                    <el-table-column label="身份证正面" property="idcard_front">
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.idcard_front.length > 0">
-                                <el-link :href="row.idcard_front" target="_blank">文件{{ i + 1 }}查看</el-link>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="身份证反面" property="idcard_backend">
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.idcard_backend.length > 0">
-                                <el-link :href="row.idcard_backend" target="_blank">文件{{ i + 1 }}查看</el-link>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="银行卡照片" property="bank_card">
-                        <template #default="{ row }">
-                            <div v-if="row.file && row.bank_card.length > 0">
-                                <el-link :href="row.bank_card" target="_blank">文件{{ i + 1 }}查看</el-link>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-                        </template>
-                    </el-table-column>
                     <el-table-column label="银行卡号" property="bank_no" />
                     <el-table-column label="开户银行" property="deposit_bank" />
                     <el-table-column label="工种" property="work_type_text" />
                     <el-table-column label="人工单价" property="deposit_bank" />
-                    <el-table-column label="备注" property="master_name" />
+                    <el-table-column label="备注" property="remark" />
                 </el-table>
 
             </div>
diff --git a/src/views/customer_demand/edit.vue b/src/views/customer_demand/edit.vue
index 2188987..3c2fd90 100644
--- a/src/views/customer_demand/edit.vue
+++ b/src/views/customer_demand/edit.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
                 <el-form-item label="项目名称" prop="project_id" @click="showDialog = true"
                     :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
@@ -9,11 +8,11 @@
                 </el-form-item>
                 <el-form-item label="项目编码" prop="project_id">
                     <el-input v-model="project_code
-            " clearable disabled placeholder="系统自动填写" />
+                        " clearable disabled placeholder="系统自动填写" />
                 </el-form-item>
                 <el-form-item label="客户名称" prop="project_id">
                     <el-input v-model="custom_name
-            " clearable disabled placeholder="系统自动填写" />
+                        " clearable disabled placeholder="系统自动填写" />
                 </el-form-item>
                 <el-form-item label="需求主题" prop="theme">
                     <el-input v-model="formData.theme" clearable placeholder="请输入需求主题" />
@@ -21,14 +20,12 @@
                 <el-form-item label="需求提供人" prop="supplier">
                     <el-input v-model="formData.supplier" clearable placeholder="请输入需求提供人" />
                 </el-form-item>
-                <el-form-item label="提供人联系方式" prop="supplier_contacts"
-                    :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                <el-form-item label="提供人联系方式" prop="supplier_contacts">
                     <el-input v-model="formData.supplier_contacts" clearable placeholder="请输入提供人联系方式" />
                 </el-form-item>
                 <el-form-item label="重要程度" prop="importance">
                     <el-radio-group v-model="formData.importance" placeholder="请选择重要程度">
-                        <el-radio v-for="(item, index) in dictData.importance" :key="index"
-                            :label="parseInt(item.value)">
+                        <el-radio v-for="(item, index) in dictData.importance" :key="index" :label="parseInt(item.value)">
                             {{ item.name }}
                         </el-radio>
                     </el-radio-group>
@@ -59,6 +56,7 @@ import Popup from '@/components/popup/index.vue'
 import projectTable from "@/components/project/index.vue"
 import { apiCustomerDemandAdd, apiCustomerDemandEdit, apiCustomerDemandDetail } from '@/api/customer_demand'
 import { useDictData } from '@/hooks/useDictOptions'
+import { checkPhone } from "@/utils/validate"
 
 
 
@@ -124,7 +122,17 @@ if (props.project) {
 }
 // 表单验证
 const formRules = reactive<any>({
-
+    supplier_contacts: [
+        {
+            required: true,
+            message: '请输入联系电话',
+            trigger: ['blur']
+        },
+        {
+            validator: checkPhone,
+            trigger: ['blur']
+        }
+    ],
 })
 
 
diff --git a/src/views/customer_demand_solution/detail.vue b/src/views/customer_demand_solution/detail.vue
index a492ce3..c2c557e 100644
--- a/src/views/customer_demand_solution/detail.vue
+++ b/src/views/customer_demand_solution/detail.vue
@@ -5,11 +5,11 @@
 
             <el-descriptions :column="2" border>
                 <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{
-            formData.custom_name }}</el-descriptions-item>
+                    formData.custom_name }}</el-descriptions-item>
                 <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{
-            formData.project_name }}</el-descriptions-item>
+                    formData.project_name }}</el-descriptions-item>
                 <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{
-            formData.project_code }}</el-descriptions-item>
+                    formData.project_code }}</el-descriptions-item>
                 <el-descriptions-item label="需求名称" label-align="left" align="left" label-class-name="my-label">
                     {{ formData.customer_demand_name }}
                 </el-descriptions-item>
@@ -17,35 +17,26 @@
                     {{ formData.theme }}
                 </el-descriptions-item>
                 <el-descriptions-item label="提交时间" label-align="left" align="left" label-class-name="my-label"> {{
-            formData.submission_time
-        }}</el-descriptions-item>
+                    formData.submission_time
+                }}</el-descriptions-item>
                 <el-descriptions-item label="方案内容" label-align="left" align="left" label-class-name="my-label"> {{
-                formData.solution_content
-            }}</el-descriptions-item>
+                    formData.solution_content
+                }}</el-descriptions-item>
                 <el-descriptions-item label="添加人" label-align="left" align="left" label-class-name="my-label"> {{
-                formData.add_user_name
+                    formData.add_user_name
 
-            }}</el-descriptions-item>
+                }}</el-descriptions-item>
                 <el-descriptions-item label="创建日期" label-align="left" align="left" label-class-name="my-label"> {{
-                formData.create_time
-            }}</el-descriptions-item>
+                    formData.create_time
+                }}</el-descriptions-item>
                 <el-descriptions-item label="更新人" label-align="left" align="left" label-class-name="my-label"> {{
-                formData.update_user_name
-            }}</el-descriptions-item>
+                    formData.update_user_name
+                }}</el-descriptions-item>
                 <el-descriptions-item label="更新日期" label-align="left" align="left" label-class-name="my-label"> {{
-                formData.update_time
-            }}</el-descriptions-item>
+                    formData.update_time
+                }}</el-descriptions-item>
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
-                    <div v-if="formData.annex?.length > 0">
-                        <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
-                                target="_blank">文件{{ index + 1 }}查看</el-link>
-
-                        </div>
-                    </div>
-                    <div v-else>
-                        暂无附件
-                    </div>
+                    <annexLink :annex="formData.annex"></annexLink>
                 </el-descriptions-item>
             </el-descriptions>
 
diff --git a/src/views/customer_demand_solution/edit.vue b/src/views/customer_demand_solution/edit.vue
index eaf2373..fbd8661 100644
--- a/src/views/customer_demand_solution/edit.vue
+++ b/src/views/customer_demand_solution/edit.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="650px" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="650px" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
                 <el-form-item label="项目名称" prop="project_id" @click="showDialog = true"
                     :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
@@ -14,8 +13,7 @@
                     <el-input v-model="custom_name" disabled clearable placeholder="系统自动填写" />
                 </el-form-item>
                 <el-form-item label="需求名称" prop="customer_demand_id">
-                    <el-input v-model="customer_demand_name" clearable placeholder="输入需求名称"
-                        @click="showDialog1 = true" />
+                    <el-input v-model="customer_demand_name" clearable placeholder="输入需求名称" @click="showDialog1 = true" />
                 </el-form-item>
                 <el-form-item label="解决方案主题" prop="theme">
                     <el-input v-model="formData.theme" clearable placeholder="请输入解决方案主题" />
@@ -34,7 +32,6 @@
                 </el-form-item>
                 <el-form-item label="附件">
                     <uploadAnnex :formData="formData"></uploadAnnex>
-
                 </el-form-item>
             </el-form>
             <el-dialog v-model="showDialog" title="选择项目" width="70%">
diff --git a/src/views/financial_travel_reimbursement/detail.js b/src/views/financial_travel_reimbursement/detail.js
new file mode 100644
index 0000000..7329c41
--- /dev/null
+++ b/src/views/financial_travel_reimbursement/detail.js
@@ -0,0 +1,103 @@
+import { apiFinancialExpenseReimbursementDetailLists } from '@/api/financial_expense_reimbursement'
+
+
+const detailConfig = {
+    title: "财务管理--费用报销单",
+    config: [
+        {
+            label: "合同名称",
+            value: "contract_name"
+        },
+        {
+            label: "合同类型",
+            value: "contract_type_text"
+        },
+        {
+            label: "费用申请单",
+            value: "fee_application_theme"
+        },
+        {
+            label: "单据主题",
+            value: "theme"
+        },
+        {
+            label: "单据编号",
+            value: "code"
+        },
+        {
+            label: "单据张数",
+            value: "bill_num"
+        },
+        {
+            label: "单据编号",
+            value: "code"
+        },
+        {
+            label: "支付方式",
+            value: "pay_type_text"
+        },
+        {
+            label: "事由",
+            value: "content",
+            column: 1
+        },
+        {
+            label: "单据编号",
+            value: "code"
+        },
+
+        {
+            label: "报销总金额",
+            value: "total_amount"
+        },
+
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+        },
+        {
+            label: "申请人",
+            value: "create_user"
+        },
+        {
+            label: "申请时间",
+            value: "create_time"
+        },
+
+
+    ],
+    table: {
+        title: "报销明细",
+        tableConfig: [
+            {
+                label: "部门",
+                value: 'dept_name',
+
+
+            },
+            {
+                label: "发生日期",
+                value: 'date'
+            },
+            {
+                label: "科目名称",
+                value: 'subject_name_text',
+            },
+            {
+                label: "金额",
+                value: 'amount',
+            },
+            {
+                label: "摘要",
+                value: 'abstract',
+            },
+
+
+        ],
+        query: 'expense_reimbursement_id',
+        fetchFun: apiFinancialExpenseReimbursementDetailLists,
+    }
+
+}
+export default detailConfig;
\ No newline at end of file
diff --git a/src/views/financial_travel_reimbursement/edit.vue b/src/views/financial_travel_reimbursement/edit.vue
index 136f0d6..f965acf 100644
--- a/src/views/financial_travel_reimbursement/edit.vue
+++ b/src/views/financial_travel_reimbursement/edit.vue
@@ -1,44 +1,48 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="单据编号" prop="code">
-                    <el-input v-model="formData.code" clearable placeholder="请输入单据编号" />
-                </el-form-item>
-                <el-form-item label="审批部门" prop="approve_dept">
-                    <el-input v-model="formData.approve_dept" clearable placeholder="请输入审批部门" />
-                </el-form-item>
-                <el-form-item label="费用类别" prop="cost_type">
-                    <el-input v-model="formData.cost_type" clearable placeholder="请输入费用类别" />
-                </el-form-item>
-                <el-form-item label="支付方式" prop="pay_type">
-                    <el-input v-model="formData.pay_type" clearable placeholder="请输入支付方式" />
-                </el-form-item>
-                <el-form-item label="可抵扣税额" prop="tax_deductible_amount">
-                    <el-input v-model="formData.tax_deductible_amount" clearable placeholder="请输入可抵扣税额" />
-                </el-form-item>
-                <el-form-item label="附单据张数" prop="bill_num">
-                    <el-input v-model="formData.bill_num" clearable placeholder="请输入附单据张数" />
-                </el-form-item>
-                <el-form-item label="关联费用申请" prop="fee_application_id">
-                    <el-input v-model="formData.fee_application_id" clearable placeholder="请输入关联费用申请" />
-                </el-form-item>
-                <el-form-item label="事由" prop="content">
-                    <el-input v-model="formData.content" clearable placeholder="请输入事由" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="create_user">
-                    <el-input v-model="formData.create_user" clearable placeholder="请输入申请人" />
-                </el-form-item>
-                <el-form-item label="申请日期" prop="create_time">
-                    <el-input v-model="formData.create_time" clearable placeholder="请输入申请日期" />
-                </el-form-item>
+
+                <el-row>
+
+                    <el-col :span="8">
+
+                        <el-form-item label="单据编号" prop="code">
+                            <el-input v-model="formData.code" clearable placeholder="请输入单据编号" />
+                        </el-form-item>
+                        <el-form-item label="审批部门" prop="approve_dept">
+                            <el-input v-model="formData.approve_dept" clearable placeholder="请输入审批部门" />
+                        </el-form-item>
+                        <el-form-item label="费用类别" prop="cost_type">
+                            <el-input v-model="formData.cost_type" clearable placeholder="请输入费用类别" />
+                        </el-form-item>
+                        <el-form-item label="支付方式" prop="pay_type">
+                            <el-input v-model="formData.pay_type" clearable placeholder="请输入支付方式" />
+                        </el-form-item>
+                        <el-form-item label="可抵扣税额" prop="tax_deductible_amount">
+                            <el-input v-model="formData.tax_deductible_amount" clearable placeholder="请输入可抵扣税额" />
+                        </el-form-item>
+                        <el-form-item label="附单据张数" prop="bill_num">
+                            <el-input v-model="formData.bill_num" clearable placeholder="请输入附单据张数" />
+                        </el-form-item>
+                        <el-form-item label="关联费用申请" prop="fee_application_id">
+                            <el-input v-model="formData.fee_application_id" clearable placeholder="请输入关联费用申请" />
+                        </el-form-item>
+                        <el-form-item label="事由" prop="content">
+                            <el-input v-model="formData.content" clearable placeholder="请输入事由" />
+                        </el-form-item>
+                        <!-- <el-form-item label="申请人" prop="create_user">
+                            <el-input v-model="formData.create_user" clearable placeholder="请输入申请人" />
+                        </el-form-item>
+                        <el-form-item label="申请日期" prop="create_time">
+                            <el-input v-model="formData.create_time" clearable placeholder="请输入申请日期" />
+                        </el-form-item> -->
+                        <createUserLable></createUserLable>
+
+                    </el-col>
+
+                </el-row>
+
             </el-form>
         </popup>
     </div>
@@ -146,8 +150,8 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+
+
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -161,9 +165,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiFinancialTravelReimbursementEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiFinancialTravelReimbursementEdit(data)
         : await apiFinancialTravelReimbursementAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/financial_travel_reimbursement/index.vue b/src/views/financial_travel_reimbursement/index.vue
index 7a9e3eb..bb5c825 100644
--- a/src/views/financial_travel_reimbursement/index.vue
+++ b/src/views/financial_travel_reimbursement/index.vue
@@ -1,11 +1,7 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="单据编号" prop="code">
                     <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入单据编号" />
                 </el-form-item>
@@ -34,15 +30,12 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['financial.financial_travel_reimbursement/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['financial.financial_travel_reimbursement/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange" border>
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="单据编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="审批部门" prop="approve_dept" show-overflow-tooltip />
@@ -56,20 +49,12 @@
                     <el-table-column label="申请日期" prop="create_time" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                             <el-button
-                                v-perms="['financial.financial_travel_reimbursement/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['financial.financial_travel_reimbursement/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                v-perms="['financial.financial_travel_reimbursement/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['financial.financial_travel_reimbursement/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
diff --git a/src/views/project_labor_contract/edit.vue b/src/views/project_labor_contract/edit.vue
index d1c0ade..7a464ab 100644
--- a/src/views/project_labor_contract/edit.vue
+++ b/src/views/project_labor_contract/edit.vue
@@ -14,13 +14,12 @@
                             <el-input class="w-[220px]" v-model="project_code" clearable placeholder="请输入项目编码" disabled />
                         </el-form-item> </el-col>
                     <el-col :span="8">
-                        <el-form-item label="姓名" prop="project_person_id" @click="showDialog1 = true"
+                        <el-form-item label="姓名" @click="showDialog1 = true"
                             :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input class="w-[220px]" v-model="person_name" clearable placeholder="请选择项目人员" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
-                        <el-form-item label="身份证号" prop="project_person_id"
-                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="身份证号" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input class="w-[220px]" v-model="idcard" clearable placeholder="系统自动填写" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
diff --git a/src/views/project_list_detail/components/Overview.vue b/src/views/project_list_detail/components/Overview.vue
index b57a2ed..f94114b 100644
--- a/src/views/project_list_detail/components/Overview.vue
+++ b/src/views/project_list_detail/components/Overview.vue
@@ -1,7 +1,5 @@
 <template>
     <el-descriptions :column="3" title="基本信息" border>
-
-
         <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.name
         }}</el-descriptions-item>
         <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">
@@ -67,16 +65,10 @@
         <el-descriptions-item label="我方对建设单位认可度" label-align="left" align="left" label-class-name="my-label"> {{
             formData.my_construction_recognition_text
         }}</el-descriptions-item>
+    </el-descriptions>
+    <el-descriptions :column="1" border>
         <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
-            <div v-if="formData.annex && formData.annex.length > 0">
-                <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
-                        target="_blank">文件{{ index + 1 }} 查看</a>
-                </div>
-            </div>
-            <div v-else>
-                暂无文件
-            </div>
+            <annexLink :annex="formData.annex" v-if="formData.annex && formData.annex.length > 0"></annexLink>
         </el-descriptions-item>
     </el-descriptions>
 </template>