From ec02682dab89b1ac0c5fce3c8d0cf6f94427e19f Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 27 Mar 2024 18:00:50 +0800
Subject: [PATCH] add

---
 .vscode/settings.json                         |  3 +-
 src/views/build_division/edit.vue             |  2 +-
 src/views/build_process_settings/detail.vue   |  5 +-
 src/views/build_process_settings/index.vue    | 15 +----
 src/views/contract_ledger/edit.vue            |  2 +-
 src/views/contract_ledger/index.vue           | 14 ++---
 src/views/finance_receipt_record/detail.vue   |  5 +-
 .../project_attendance_record/detail.vue      |  2 +-
 src/views/project_attendance_record/index.vue |  1 +
 src/views/project_material_budget/edit.vue    |  1 -
 src/views/project_personnel/detail.vue        |  6 +-
 src/views/project_total_budget/detail.vue     | 10 +---
 src/views/project_total_budget/edit.vue       |  2 +-
 .../project_travel_reimbursement/detail.vue   |  8 ++-
 src/views/quality_detection/detail.vue        |  5 +-
 src/views/quality_detection/edit.vue          | 59 +------------------
 src/views/quality_detection/index.vue         |  5 +-
 src/views/refundbidDeposit/edit.vue           |  6 ++
 18 files changed, 44 insertions(+), 107 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 751f041..9f70850 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,5 +6,6 @@
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "[javascript]": {
     "editor.defaultFormatter": "vscode.typescript-language-features"
-  }
+  },
+  "vue.codeActions.enabled": false
 }
diff --git a/src/views/build_division/edit.vue b/src/views/build_division/edit.vue
index 75ccea8..56f446e 100644
--- a/src/views/build_division/edit.vue
+++ b/src/views/build_division/edit.vue
@@ -33,7 +33,7 @@
 
                     <el-col :span="8">
                         <el-form-item label="分项工程编码" prop="subentry_engineering_code"
-                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" v-type="'code'">
                             <el-input v-model="formData.subentry_engineering_code" clearable placeholder="请输入分项工程编码" />
                         </el-form-item>
                     </el-col>
diff --git a/src/views/build_process_settings/detail.vue b/src/views/build_process_settings/detail.vue
index 61a4148..e31c893 100644
--- a/src/views/build_process_settings/detail.vue
+++ b/src/views/build_process_settings/detail.vue
@@ -47,12 +47,13 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="图例说明">
-                                <div v-if="formData.annex && formData.annex.length > 0">
+                                <!-- <div v-if="formData.annex && formData.annex.length > 0">
                                     <material-picker v-model="formData.annex" />
                                 </div>
                                 <div>
                                     暂无文件
-                                </div>
+                                </div> -->
+                                <annexLink :annex="formData.annex"></annexLink>
 
                             </el-form-item>
                         </el-col>
diff --git a/src/views/build_process_settings/index.vue b/src/views/build_process_settings/index.vue
index 87cd16b..e022c0d 100644
--- a/src/views/build_process_settings/index.vue
+++ b/src/views/build_process_settings/index.vue
@@ -35,20 +35,7 @@
                     <el-table-column label="工序步骤号" prop="process_step_no" show-overflow-tooltip />
                     <el-table-column label="工序步骤" prop="process_step" show-overflow-tooltip />
                     <el-table-column label="质量控制点" prop="quality_control_points" show-overflow-tooltip />
-                    <el-table-column label="图例说明" prop="file" show-overflow-tooltip>
-
-                        <template #default="{ row }">
-                            <div v-if="row.annex && row.annex.length > 0">
-                                <div v-for="(item, i) in row.annex " :key='i'>
-                                    <el-link :href="item.uri" target="_blank">文件{{ i + 1 }}</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-
-                        </template>
-                    </el-table-column>
+                  
                     <el-table-column label="操作" width="150" fixed="right">
 
                         <template #default="{ row }">
diff --git a/src/views/contract_ledger/edit.vue b/src/views/contract_ledger/edit.vue
index 1d3ceb5..7d8902c 100644
--- a/src/views/contract_ledger/edit.vue
+++ b/src/views/contract_ledger/edit.vue
@@ -45,7 +45,7 @@ const mode = ref('add')
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑财务管理--到账台账' : '新增财务管理--到账台账'
+    return mode.value == 'edit' ? '编辑财务管理--合同台账' : '新增财务管理--合同台账'
 })
 
 // 表单数据
diff --git a/src/views/contract_ledger/index.vue b/src/views/contract_ledger/index.vue
index 5f0a720..5ba0a81 100644
--- a/src/views/contract_ledger/index.vue
+++ b/src/views/contract_ledger/index.vue
@@ -32,15 +32,15 @@
                 删除
             </el-button>
             <div class="mt-4">
-                <el-table :data="pager.lists">
+                <el-table :data="pager.lists" border >
                     <el-table-column label="合同名称" prop="contract_name" :render-header="pager.calcWidth" />
-                    <el-table-column label="合同编号" prop="contract_num" :render-header="pager.calcWidth" />
-                    <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip>
+                    <el-table-column label="合同编号" prop="contract_num" :render-header="pager.calcWidth"  />
+                    <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip width='90'>
                         <template #default="{ row }">
                             <dict-value :options="dictData.cost_contract_type" :value="row.contract_type" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="业务性质" prop="business_nature" show-overflow-tooltip>
+                    <el-table-column label="业务性质" prop="business_nature" show-overflow-tooltip width='90'>
                         <template #default="{ row }">
                             <dict-value :options="dictData.cost_consultation_business_nature"
                                 :value="row.business_nature" />
@@ -48,17 +48,17 @@
                     </el-table-column>
                     <el-table-column label="合同签订金额" prop="money" show-overflow-tooltip width="120" />
                     <el-table-column label="甲方签约单位" prop="part_a" show-overflow-tooltip width="120" />
-                    <el-table-column label="签订部门" prop="dept" show-overflow-tooltip />
+                    <el-table-column label="签订部门" prop="dept" show-overflow-tooltip width='90' />
                     <el-table-column label="已开票金额" prop="total_invoice_amount" show-overflow-tooltip width="100" />
                     <el-table-column label="已到账金额" prop="total_refund_amount" show-overflow-tooltip width="100" />
                     <el-table-column label="已结算金额" prop="total_settlement_amount" show-overflow-tooltip width="100" />
                     <el-table-column label="合同结算日期" prop="settlement_date" show-overflow-tooltip width="120" />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['financial.financial_refund/edit']" type="primary" link
+                            <!-- <el-button v-perms="['financial.financial_refund/edit']" type="primary" link
                                 @click="handleEdit(row)">
                                 编辑
-                            </el-button>
+                            </el-button> -->
                             <el-button v-perms="['financial.financial_refund/delete']" type="danger" link
                                 @click="handleDelete(row.id)">
                                 删除
diff --git a/src/views/finance_receipt_record/detail.vue b/src/views/finance_receipt_record/detail.vue
index 32c2834..e5ffac3 100644
--- a/src/views/finance_receipt_record/detail.vue
+++ b/src/views/finance_receipt_record/detail.vue
@@ -89,7 +89,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="附件">
-                                <div>
+                                <!-- <div>
                                     <div v-for="(item, index) in formDataannex"
                                         style="margin-left: 5px;display: block;">
                                         <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
@@ -97,7 +97,8 @@
                                         <span style="cursor: pointer;margin-left: 5px;"
                                             @click="delFileFn(index)">x</span>
                                     </div>
-                                </div>
+                                </div> -->
+                                <annexLink :annex='formData.annex'></annexLink>
                             </el-form-item>
                         </el-col>
                     </el-row>
diff --git a/src/views/project_attendance_record/detail.vue b/src/views/project_attendance_record/detail.vue
index 22e4d87..2fa6323 100644
--- a/src/views/project_attendance_record/detail.vue
+++ b/src/views/project_attendance_record/detail.vue
@@ -16,7 +16,7 @@
                         {{ formData.attendance_num }}
                     </el-descriptions-item>
                     <el-descriptions-item label="附件" label-align="left" align="left">
-                        <annexLink :annex="formData.file"></annexLink>
+                        <annexLink :annex="formData.annex"></annexLink>
                     </el-descriptions-item>
                 </el-descriptions>
 
diff --git a/src/views/project_attendance_record/index.vue b/src/views/project_attendance_record/index.vue
index 2feb1d3..af17f1c 100644
--- a/src/views/project_attendance_record/index.vue
+++ b/src/views/project_attendance_record/index.vue
@@ -131,6 +131,7 @@ const handleDelete = async (id: number | any[]) => {
     await attendanceRecordDelete({ id })
     getLists()
 }
+
 const handledetail = async (data: any) => {
     let res = await attendanceRecordDetail({ id: data.id })
     showDtail.value = true
diff --git a/src/views/project_material_budget/edit.vue b/src/views/project_material_budget/edit.vue
index b7f7a8b..d8997d2 100644
--- a/src/views/project_material_budget/edit.vue
+++ b/src/views/project_material_budget/edit.vue
@@ -99,7 +99,6 @@
 
                                 <el-table-column label="管理" prop="amount_including_tax">
                                     <template #default="{ row }">
-                                        <!-- <el-button @click="handleAdd(row)">+</el-button> -->
                                         <el-button @click="handleDelete(row)">删除</el-button>
                                     </template>
                                 </el-table-column>
diff --git a/src/views/project_personnel/detail.vue b/src/views/project_personnel/detail.vue
index 68113f6..9cd08e9 100644
--- a/src/views/project_personnel/detail.vue
+++ b/src/views/project_personnel/detail.vue
@@ -23,16 +23,16 @@
                         {{ formData.unit_price }}
                     </el-descriptions-item>
                     <el-descriptions-item label="身份证正面" label-align="left" align="left">
-                        <el-link :href="formData.idcard_front" type="primary">身份证正面</el-link>
+                        <el-link :href="formData.idcard_front" type="primary" target="_blank">身份证正面</el-link>
                     </el-descriptions-item>
                     <el-descriptions-item label="身份证反面" label-align="left" align="left">
                         <!-- {{ formData.project_name }} -->
-                        <el-link :href="formData.idcard_backend" type="primary">身份证反面</el-link>
+                        <el-link :href="formData.idcard_backend" type="primary" target="_blank">身份证反面</el-link>
 
                     </el-descriptions-item>
                     <el-descriptions-item label="银行卡照片" label-align="left" align="left">
                         <!-- {{ formData.bank_card }} -->
-                        <el-link :href="formData.bank_card" type="primary">银行卡照片</el-link>
+                        <el-link :href="formData.bank_card" type="primary" target="_blank">银行卡照片</el-link>
 
                     </el-descriptions-item>
                     <el-descriptions-item label="银行卡号" label-align="left" align="left">
diff --git a/src/views/project_total_budget/detail.vue b/src/views/project_total_budget/detail.vue
index e477aa4..0abb8a5 100644
--- a/src/views/project_total_budget/detail.vue
+++ b/src/views/project_total_budget/detail.vue
@@ -23,15 +23,7 @@
                 <el-descriptions-item label="预算日期" label-align="left" align="left" label-class-name="my-label"> {{
             formData.budget_date }}</el-descriptions-item>
                 <el-descriptions-item label="预算清单" label-align="left" align="left" label-class-name="my-label">
-                    <div v-if="formData.budget_list && formData.budget_list.length > 0">
-                        <div v-for="(item, index) in formData.budget_list" 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.budget_list'></annexLink>
                 </el-descriptions-item>
 
             </el-descriptions>
diff --git a/src/views/project_total_budget/edit.vue b/src/views/project_total_budget/edit.vue
index 5c58b7b..9c58fab 100644
--- a/src/views/project_total_budget/edit.vue
+++ b/src/views/project_total_budget/edit.vue
@@ -96,7 +96,7 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="预算清单">
-                            <uploadAnnex :formData="formData"></uploadAnnex>
+                            <uploadAnnex :formData="formData" value='budget_list'></uploadAnnex>
                         </el-form-item>
                     </el-col>
                 </el-row>
diff --git a/src/views/project_travel_reimbursement/detail.vue b/src/views/project_travel_reimbursement/detail.vue
index 69dedda..f978fc6 100644
--- a/src/views/project_travel_reimbursement/detail.vue
+++ b/src/views/project_travel_reimbursement/detail.vue
@@ -10,9 +10,11 @@
                             formData[item.value[0]]
                         }}</span>
                         <span v-else> <el-link class="m-2" v-for="item in formData.annex" :href="item.uri"
-                                target="_blank">{{ item.name }}</el-link>
+                                target="_blank" type='primary'>{{ item.name }}</el-link>
                         </span>
                     </el-descriptions-item>
+
+
                 </el-descriptions>
             </el-card>
             <el-card>
@@ -124,6 +126,10 @@ const descriptionList = reactive([
         lable: "备注",
         value: ['remark']
     },
+    {
+        lable: "附件",
+        value: "annex"
+    },
 ])
 
 const emit = defineEmits(['success', 'close'])
diff --git a/src/views/quality_detection/detail.vue b/src/views/quality_detection/detail.vue
index 38dc9ae..ffa6bda 100644
--- a/src/views/quality_detection/detail.vue
+++ b/src/views/quality_detection/detail.vue
@@ -46,7 +46,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="规范附件">
-                                <div>
+                                <!-- <div>
                                     <div v-for="( item, index ) in  formDataannex "
                                         style="margin-left: 5px;display: block;">
                                         <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
@@ -54,7 +54,8 @@
                                         <span style="cursor: pointer;margin-left: 5px;"
                                             @click="delFileFn(index)">x</span>
                                     </div>
-                                </div>
+                                </div> -->
+                                <annexLink :annex='formData.file'></annexLink>
 
                             </el-form-item>
                         </el-col>
diff --git a/src/views/quality_detection/edit.vue b/src/views/quality_detection/edit.vue
index f4b3d31..1a91a09 100644
--- a/src/views/quality_detection/edit.vue
+++ b/src/views/quality_detection/edit.vue
@@ -89,12 +89,9 @@
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
-
-
-
                     <el-col :span="8">
                         <el-form-item label="资料编号" prop="document_number">
-                            <el-input v-model="formData.document_number" clearable placeholder="请输入资料编号" />
+                            <el-input v-model="formData.document_number" clearable placeholder="请输入资料编号" v-type="'code'" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -136,24 +133,7 @@
                     <el-col :span="24">
 
                         <el-form-item label="附件">
-                            <el-upload
-                                accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
-                                class="upload-demo" :show-file-list="false" aria-hidden="true"
-                                :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
-                                :on-success="handleAvatarSuccess_four" ref="upload">
-                                <el-button type="primary">
-                                    上传
-                                </el-button>
-                            </el-upload>
-
-                            <div>
-                                <div v-for="( item, index ) in  formDataannex "
-                                    style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
-                                        :href="item.uri" target="_blank">{{ item.name }}</a>
-                                    <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                                </div>
-                            </div>
+                            <uploadAnnex :formData='formData' value='file'></uploadAnnex>
 
                         </el-form-item>
                     </el-col>
@@ -196,26 +176,7 @@ import feedback from '@/utils/feedback'
 import { deptAll } from '@/api/org/department'
 import { getAll } from '@/api/org/organization'
 const userInfo = userStore.userInfo
-// 上传文件
-const handleAvatarSuccess_four = (
-    response,
-    uploadFile
-) => {
-    if (response.code == 0) {
-        ElMessage.error(response.msg);
-        return;
-    }
-    formDataannex.push(
-        { uri: response.data.uri, name: response.data.name }
 
-
-    );
-};
-
-// 删除上传的文件
-const delFileFn = (index: number) => {
-    formDataannex.splice(index, 1)
-}
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -293,18 +254,6 @@ const formRules = reactive<any>({
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    if (data.file && data.file.length > 0) {
-
-        const arry1 = data.file.map((item: any, index: any) => {
-            return {
-                name: `文件${index + 1}`,
-                uri: item
-            };
-        });
-        Object.assign(formDataannex, arry1)
-
-    }
-
 
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
@@ -331,10 +280,6 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    formData.file = formDataannex.map((item) => item.uri)
-
-
-
     const startTime = new Date(formData.actual_start_time)
     const endTime = new Date(formData.actual_end_time)
     if (endTime < startTime) {
diff --git a/src/views/quality_detection/index.vue b/src/views/quality_detection/index.vue
index 2ec5ab6..0791e3b 100644
--- a/src/views/quality_detection/index.vue
+++ b/src/views/quality_detection/index.vue
@@ -40,7 +40,7 @@
             </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="序号" type="index" width="55" />
                     <el-table-column label="组织名称" prop="org_name" show-overflow-tooltip />
@@ -60,11 +60,8 @@
                     <el-table-column label="是否归档" prop="archiving" show-overflow-tooltip />
                     <el-table-column label="资料内容要求" prop="data_content_requirements" show-overflow-tooltip />
                     <el-table-column label="检测情况" prop="detection_situation" show-overflow-tooltip />
-
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
 
-
-                    <el-table-column label="附件" prop="file" show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
 
                         <template #default="{ row }">
diff --git a/src/views/refundbidDeposit/edit.vue b/src/views/refundbidDeposit/edit.vue
index 4b81806..39f82e6 100644
--- a/src/views/refundbidDeposit/edit.vue
+++ b/src/views/refundbidDeposit/edit.vue
@@ -215,6 +215,12 @@ const formRules = reactive<any>({
 
 // 获取详情
 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]
+        }
+    }
     project_name.value = data.project_name
     project_code.value = data.project_code
     custom_name.value = data.custom_name