From f417dc0a44d225d4ed19bcb5207250eb1b669455 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 25 八月 2023 12:45:09 +0800
Subject: [PATCH] bug修复

---
 src/views/sales/salesDetails/index.vue |   61 +++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 560a58d..2a551be 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -37,11 +37,17 @@
       </template>
     </TableCommonView>
     <!-- 鏂板缓/缂栬緫 -->
-    <AddSalesDetailsDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+    <AddSalesDetailsDialog
+      v-if="editConfig.visible"
+      :edit-common-config="editConfig"
+      @addCollectionPlanClick="addCollectionPlanClick"
+    />
     <!-- 閿�鍞槑缁嗚鎯� -->
     <DetailSpecification v-if="specificationDetail.visible" :specification-detail="specificationDetail" />
     <!-- 瀹㈡埛璇︽儏 -->
     <DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
+    <!-- 鏂板缓 鏀舵璁″垝 -->
+    <AddCollectionPlan v-if="addCollectionConfig.visible" :edit-common-config="addCollectionConfig" />
   </div>
 </template>
 
@@ -50,6 +56,7 @@
 import { getSalesDetailsList, getDelSalesDetails } from "@/api/sales/salesDetails"
 import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
 import DetailSpecification from "@/views/sales/salesDetails/DetailSpecification"
+import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
 
 export default {
   name: "SalesDetails",
@@ -69,7 +76,8 @@
   components: {
     AddSalesDetailsDialog,
     DetailSpecification,
-    DetailClientManage: () => import("@/views/client/client/DetailClientManage")
+    DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
+    AddCollectionPlan
   },
   computed: {
     searchCommonHeight() {
@@ -112,6 +120,7 @@
           "uninvoicedAmount",
           "number",
           "unOutoundNo",
+          "taxUnitPrice",
           "priceTax"
         ],
         mergeNumber: 6
@@ -131,7 +140,12 @@
         label: "璁㈠崟缂栧彿"
       },
       keyword: "",
-      keywordType: ""
+      keywordType: "",
+      addCollectionConfig: {
+        visible: false,
+        title: "鏂板缓",
+        infomation: {}
+      }
     }
   },
   created() {
@@ -154,17 +168,16 @@
           { label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true },
           { label: "绛剧害鏃ユ湡", prop: "signTime", width: 150 },
           { label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
-          { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
+          // { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
           { label: "宸叉敹鎬婚", prop: "receiveTotalAmount", price: true },
           { label: "鍚堣", prop: "total", price: true },
           { label: "搴旀敹浣欓", prop: "amountReceivable", price: true },
           { label: "宸插紑绁ㄩ噾棰�", prop: "invoicedAmount", price: true },
           { label: "鏈紑绁ㄩ噾棰�", prop: "uninvoicedAmount", price: true },
-          { label: "浜у搧鍚嶇О", prop: "productName" },
-          { label: "鏁伴噺", prop: "number1" },
-          { label: "鍚◣鍗曚环", prop: "taxUnitPrice", price: true },
-          { label: "鏈嚭搴撴暟閲�", prop: "unOutoundNo" },
-          { label: "浠风◣鍚堣", prop: "priceTax", price: true }
+          { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true },
+          { label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
+          { label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductPrice: true },
+          { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
         ]
       }
       this.searchOptions = []
@@ -225,14 +238,14 @@
     addBtnClick() {
       this.editConfig.visible = true
       this.editConfig.title = "鏂板缓"
-      this.editConfig.infomation = { ...this.addConfig }
+      this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
     },
     // 缂栬緫
     handleClick(row) {
       console.log(row)
       this.editConfig.visible = true
       this.editConfig.title = "缂栬緫"
-      this.editConfig.infomation = { ...row, sale_chance_name: "" }
+      this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "浜烘皯甯�" }
     },
     // 鍒犻櫎
     delClick() {
@@ -269,13 +282,25 @@
     selClientClick(row) {
       console.log(row)
       this.clientDeail.visible = true
-      this.clientDeail.infomation = { ...row, client_name: row.name }
+      this.clientDeail.infomation = {
+        ...row.client,
+        member: row.Member,
+        client_name: row.client.name,
+        client_level: row.client.client_level.name,
+        client_status: row.client.client_status.name
+      }
     },
     // 鑱旂郴浜鸿鎯�
     selCommonClick(row) {
       console.log(row)
       this.specificationDetail.visible = true
       this.specificationDetail.infomation = { ...row }
+    },
+    addCollectionPlanClick(row) {
+      this.addCollectionConfig.visible = true
+      this.addCollectionConfig.title = "鏂板缓"
+      this.addCollectionConfig.sourceType = 1
+      this.addCollectionConfig.infomation = { ...row }
     }
   }
 }
@@ -301,9 +326,15 @@
   }
 }
 ::v-deep {
-  .el-table .cell,
-  .el-table th.el-table__cell > .cell {
-    padding: 0 2px;
+  .el-table .el-table__cell {
+    padding: 0;
+  }
+  .el-table__header tr,
+  .el-table__header th {
+    height: 48px;
+  }
+  .el-table__footer-wrapper tbody td.el-table__cell {
+    height: 48px;
   }
 }
 </style>

--
Gitblit v1.8.0