From fd5a2a013ef16244e1361f511832938bad7deac8 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 10 Jan 2024 10:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/custom/detail.vue                   | 22 ++---
 src/views/custom/edit.vue                     |  2 +
 src/views/custom_service/detail.vue           |  7 +-
 .../material_purchase_request/detail.vue      | 14 +--
 src/views/project/detail.vue                  |  3 +
 src/views/project_list/detail.vue             | 93 ++++++++++++++-----
 6 files changed, 99 insertions(+), 42 deletions(-)

diff --git a/src/views/custom/detail.vue b/src/views/custom/detail.vue
index bfde519..cca11d9 100644
--- a/src/views/custom/detail.vue
+++ b/src/views/custom/detail.vue
@@ -31,7 +31,7 @@
 
                         </el-descriptions>
 
-                        <el-descriptions title="主要负责人" :column="2" border>
+                        <el-descriptions title="主要负责人" :column="2" border style="margin: 20px 0;">
 
                             <el-descriptions-item label="姓名" label-align="left" align="left" label-class-name="my-label">{{ formData.master_name }}</el-descriptions-item>
                             <el-descriptions-item label="职位" label-align="left" align="left" label-class-name="my-label"> {{ formData.master_position }}</el-descriptions-item>
@@ -49,7 +49,7 @@
 
 
 
-                        <div class="tit">其他联系人</div>
+                        <div class="tit" style="margin: 20px 0;">其他联系人</div>
                         <el-row>
                             <el-table :data="contactsList">
 
@@ -67,7 +67,7 @@
 
                         </el-row>
 
-                        <el-descriptions title="开票信息" :column="2" border>
+                        <el-descriptions title="开票信息" :column="2" border style="margin: 20px 0;">
 
                             <el-descriptions-item label="开票公司名称" label-align="left" align="left" label-class-name="my-label">{{ formData.company_name }}</el-descriptions-item>
                             <el-descriptions-item label="纳税人识别号" label-align="left" align="left" label-class-name="my-label"> {{ formData.company_tin }}</el-descriptions-item>
@@ -128,14 +128,14 @@
                     <el-tab-pane label="售后" name="new_name_8">
                         <div>
                             <el-table :data="tableData3" stripe style="width: 100%">
-                                <el-table-column label="工单编号" prop='code' width="180" />
-                                <el-table-column label="合同编号" prop='create_user' width="180" />
-                                <el-table-column label="投诉主题" prop='quotation_date' />
-                                <el-table-column label="日期" prop='amount_including_tax' />
-                                <el-table-column label="分类" prop='freight' />
-                                <el-table-column label="工时" prop='other_fee' />
-                                <el-table-column label="单价" prop='total_amount' />
-                                <el-table-column label="工时费用" prop='total_amount' />
+                                <el-table-column label="工单编号" prop='custom_service_code' width="180" />
+                                <el-table-column label="合同编号" prop='contract_code' width="180" />
+                                <el-table-column label="投诉主题" prop='name' />
+                                <el-table-column label="日期" prop='date' />
+                                <el-table-column label="分类" prop='classification' />
+                                <el-table-column label="是否解决" prop='is_solve_text' />
+                                <el-table-column label="解决日期" prop='done_date' />
+
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
diff --git a/src/views/custom/edit.vue b/src/views/custom/edit.vue
index 7c12bec..4188f17 100644
--- a/src/views/custom/edit.vue
+++ b/src/views/custom/edit.vue
@@ -484,9 +484,11 @@ const setFormData = async (data: Record<any, any>) => {
         }
 
     }
+
     if (data.dept_id) {
         getlist1(data.org_id)
     }
+
     if (formData.company_name) {
         companyname.value = data.company_name
 
diff --git a/src/views/custom_service/detail.vue b/src/views/custom_service/detail.vue
index df71d4f..fa9c421 100644
--- a/src/views/custom_service/detail.vue
+++ b/src/views/custom_service/detail.vue
@@ -37,9 +37,10 @@
                             <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
 
                         </div>
-                        <div v-else>
-                            暂无文件
-                        </div>
+
+                    </div>
+                    <div v-else>
+                        暂无文件
                     </div>
                 </el-descriptions-item>
 
diff --git a/src/views/material_purchase_request/detail.vue b/src/views/material_purchase_request/detail.vue
index 668e557..fd91dee 100644
--- a/src/views/material_purchase_request/detail.vue
+++ b/src/views/material_purchase_request/detail.vue
@@ -26,8 +26,10 @@
 
             <div>
                 <el-table :data="tableData" stripe style="width: 100%">
-                    <el-table-column label="类型" prop='budget_type' width="180" />
+
                     <el-table-column label="材料大类" prop='material_first_level' width="180" />
+                    <el-table-column label="材料中类" prop='material_second_level' width="180" />
+                    <el-table-column label="材料小类" prop='material_three_level' width="180" />
                     <el-table-column label="材料名称" prop='material_name' />
                     <el-table-column label="材料编码" prop='material_code' />
                     <el-table-column label="规格型号" prop='material_specs' />
@@ -35,9 +37,9 @@
                     <el-table-column label="品牌" prop='material_brand' />
                     <el-table-column label="参数说明" prop='material_parameter_description' width="200px" />
                     <el-table-column label="单位" prop='material_unit' />
-                    <el-table-column label="数量" prop='num' />
-                    <el-table-column label="单价" prop='price' />
-                    <el-table-column label="金额" prop='amount' />
+                    <el-table-column label="申购数量" prop='num' />
+                    <el-table-column label="已采购" prop='has_procure_num' />
+                    <el-table-column label="未采购" prop='not_procure_num' />
                     <el-table-column label="备注" prop='remark' />
                 </el-table>
             </div>
@@ -49,7 +51,7 @@
 </template>
 
 <script lang="ts" setup name="customdetail">
-import { MaterialbudgetDetailLists } from '@/api/project_material_budget_detail'
+import { materialrequestDetailLists } from '@/api/material_purchase_request_detail'
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiCustomDetail } from '@/api/custom'
@@ -99,7 +101,7 @@ const handleCurrentChange1 = (val: number) => {
 
 //获取预算明细列表
 const budgetDetailLists = (id) => {
-    MaterialbudgetDetailLists({ 'page_no': pager1.page_no, 'page_size': pager1.page_size, material_budget_id: id }).then((res) => {
+    materialrequestDetailLists({ 'page_no': pager1.page_no, 'page_size': pager1.page_size, id: id }).then((res) => {
         tableData.value = res.lists
         total.value = res.count
     })
diff --git a/src/views/project/detail.vue b/src/views/project/detail.vue
index b981260..1602597 100644
--- a/src/views/project/detail.vue
+++ b/src/views/project/detail.vue
@@ -64,6 +64,7 @@
                         </el-descriptions>
 
                     </el-tab-pane>
+                    <el-tab-pane label="成员" name="demo-2">Config</el-tab-pane>
                     <el-tab-pane label="商机" name="demo-2">Config</el-tab-pane>
                     <el-tab-pane label="投标" name="demo-3">Role</el-tab-pane>
                     <el-tab-pane label="合同" name="demo-4">Task</el-tab-pane>
@@ -80,6 +81,8 @@
                     <el-tab-pane label="付款" name="demo-15">Task</el-tab-pane>
                     <el-tab-pane label="费用" name="demo-16">Task</el-tab-pane>
                     <el-tab-pane label="文档" name="demo-17">Task</el-tab-pane>
+                    <el-tab-pane label="结算" name="demo-17">Task</el-tab-pane>
+                    <el-tab-pane label="售后" name="demo-17">Task</el-tab-pane>
                     <el-tab-pane label="统计" name="demo-18">Task</el-tab-pane>
                 </el-tabs>
             </el-form>
diff --git a/src/views/project_list/detail.vue b/src/views/project_list/detail.vue
index a5752e2..374e77b 100644
--- a/src/views/project_list/detail.vue
+++ b/src/views/project_list/detail.vue
@@ -445,7 +445,28 @@
                     <el-tab-pane label="付款" name="demo-15">Task</el-tab-pane>
                     <el-tab-pane label="费用" name="demo-16">Task</el-tab-pane>
                     <el-tab-pane label="文档" name="demo-17">Task</el-tab-pane>
-                    <el-tab-pane label="统计" name="demo-18">Task</el-tab-pane>
+                    <el-tab-pane label="结算" name="demo-18">Task</el-tab-pane>
+                    <el-tab-pane label="售后" name="demo-19">
+                        <div>
+                            <el-table :data="tableData18" stripe style="width: 100%">
+                                <el-table-column label="工单编号" prop='custom_service_code' width="180" />
+                                <el-table-column label="合同编号" prop='contract_code' width="180" />
+                                <el-table-column label="投诉主题" prop='name' />
+                                <el-table-column label="日期" prop='date' />
+                                <el-table-column label="分类" prop='classification' />
+                                <el-table-column label="是否解决" prop='is_solve_text' />
+                                <el-table-column label="解决日期" prop='done_date' />
+
+                            </el-table>
+                        </div>
+                        <div style="margin: 10px 0;">
+                            <el-pagination v-model:current-page="pager18.page_no" v-model:page-size="pager18.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total17" @size-change="handleSizeChange18" @current-change="handleCurrentChange18" />
+                        </div>
+
+
+                    </el-tab-pane>
+                    <el-tab-pane label="统计" name="demo-20">Task</el-tab-pane>
+
                 </el-tabs>
             </el-form>
         </popup>
@@ -477,7 +498,7 @@ import { insurancemanagementLists } from '@/api/project_insurance_management'
 import { attendanceRecordLists } from '@/api/project_attendance_record'
 import { attendancedetailLists } from '@/api/project_attendance_detail'
 import { projectsalaryDetailLists } from '@/api/project_salary_detail'
-
+import { apiCustomServiceLists } from '@/api/custom_service'
 const active = ref('first-1')
 const activeName = ref('demo-1')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
@@ -586,7 +607,11 @@ const pager17 = reactive({
     page_no: 1,
     project_id: ""
 })
-
+const pager18 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: ""
+})
 const total = ref(0)
 const total1 = ref(0)
 const total2 = ref(0)
@@ -605,7 +630,7 @@ const total14 = ref(0)
 const total15 = ref(0)
 const total16 = ref(0)
 const total17 = ref(0)
-
+const total18 = ref(0)
 const tableData1 = ref([])
 const tableData2 = ref([])
 const tableData3 = ref([])
@@ -622,9 +647,8 @@ const tableData13 = ref([])
 const tableData14 = ref([])
 const tableData15 = ref([])
 const tableData16 = ref([])
-
 const tableData17 = ref([])
-
+const tableData18 = ref([])
 // 表单数据
 const formData = reactive({
 
@@ -703,32 +727,40 @@ const handleSizeChange13 = (val: number) => {
 
 const handleSizeChange14 = (val: number) => {
 
-    pager11.page_size = val
+    pager14.page_size = val
 
-    refundLists()
+    insurancemanagementlists()
 }
 
 
 const handleSizeChange15 = (val: number) => {
 
-    pager11.page_size = val
+    pager15.page_size = val
 
-    refundLists()
+    attendanceRecord()
 }
 
 const handleSizeChange16 = (val: number) => {
 
-    pager11.page_size = val
+    pager16.page_size = val
+
+    attendancedetail()
 
-    refundLists()
 }
 
 
+const handleSizeChange18 = (val: number) => {
+
+    pager17.page_size = val
+
+    salarypaymentLists()
+
+}
 const handleSizeChange17 = (val: number) => {
 
-    pager11.page_size = val
+    pager18.page_size = val
 
-    refundLists()
+    customServiceLists()
 }
 
 
@@ -804,33 +836,39 @@ const handleCurrentChange13 = (val: number) => {
 }
 
 const handleCurrentChange14 = (val: number) => {
-    pager11.page_no = val
+    pager14.page_no = val
     console.log(`current page: ${val}`)
 
-    refundLists()
+    insurancemanagementlists()
 }
 
 const handleCurrentChange15 = (val: number) => {
-    pager11.page_no = val
+    pager15.page_no = val
     console.log(`current page: ${val}`)
 
-    refundLists()
+    attendanceRecord()
 }
 const handleCurrentChange16 = (val: number) => {
-    pager11.page_no = val
+    pager16.page_no = val
     console.log(`current page: ${val}`)
 
-    refundLists()
+    attendancedetail()
 }
 
 const handleCurrentChange17 = (val: number) => {
-    pager11.page_no = val
+    pager17.page_no = val
     console.log(`current page: ${val}`)
 
-    refundLists()
+    salarypaymentLists()
+
 }
 
+const handleCurrentChange18 = (val: number) => {
+    pager18.page_no = val
+    console.log(`current page: ${val}`)
 
+    customServiceLists()
+}
 //获取客户跟进进路
 const followUpLists = () => {
     apiProjectFollowUpLists(pager5).then((res) => {
@@ -968,6 +1006,15 @@ const salarypaymentLists = () => {
     })
 }
 
+//售后信息
+const customServiceLists = () => {
+    apiCustomServiceLists(pager3).then((res) => {
+        tableData18.value = res.lists
+        total17.value = res.count
+    })
+}
+
+
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     // for (const key in formData) {
@@ -998,6 +1045,7 @@ const setFormData = async (data: Record<any, any>) => {
     pager15.project_id = data.id
     pager16.project_id = data.id
     pager17.project_id = data.id
+    pager18.project_id = data.id
     Object.assign(formData, data)
 
     if (data.annex && data.annex.length > 0) {
@@ -1026,6 +1074,7 @@ const setFormData = async (data: Record<any, any>) => {
     attendanceRecord()
     attendancedetail()
     salarypaymentLists()
+    customServiceLists()
 }
 
 const getDetail = async (row: Record<string, any>) => {