From 0e5fbe824f2cc0991465a74a2838ff2ee4c21d81 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 03 一月 2024 10:29:16 +0800
Subject: [PATCH] 销售明细单待确认状态时 发货信息为空

---
 src/views/sales/quotation/index.vue |   46 +++++++++++++++++-----------------------------
 1 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index 0c98ff6..9ac2a32 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -79,9 +79,6 @@
 import { getQuotationList, getDelQuotation } from "@/api/sales/quotation"
 import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
 import DetailQuotation from "@/views/sales/quotation/DetailQuotation"
-import {
-  getProductInventoryInfo,
-} from "@/api/sales/salesDetails"
 export default {
   name: "QuotationView",
   props: {
@@ -111,11 +108,11 @@
       { label: "浜у搧鍚嶇О", prop: "name" },
       { label: "鏁伴噺", prop: "amount" },
       { label: "鍗曚綅", prop: "unit" },
-      { label: "閿�鍞崟浠�", prop: "salePrice" },
-      { label: "鎴愭湰鍗曚环", prop: "carrier" },
-      { label: "姣涘埄", prop: "waybillNumber" },
-      { label: "姣涘埄鐜�", prop: "salePrice", price: true },
-      { label: "浠风◣鍚堣", prop: "valorem", price: true }
+      { label: "閿�鍞崟浠�", prop: "price" },
+      { label: "鎴愭湰鍗曚环", prop: "cost" },
+      { label: "姣涘埄", prop: "profit" },
+      { label: "姣涘埄鐜�(%)", prop: "margin",},
+      { label: "浠风◣鍚堣", prop: "total", price: true }
     ]
     return {
       tableList: {},
@@ -166,13 +163,11 @@
         { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }, // 閿�鍞礋璐ｄ汉
         { label: "鏈夋晥鏈�", prop: "validity_date", min: 100 }, // 淇敼鏃堕棿
         // { label: "灏忚", prop: "subTotal" }, // 灏忚
-        // { label: "鍚堣", prop: "total" }, // 鍚堣
-        { label: "瀹㈡埗鍚嶇О", prop: "client_name", },
-        { label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
-        { label: "鍚堣", prop: "priceTax", isProductTotal: true },
-        { label: "鐘舵��", prop: "priceTax",}
+        { label: "鍚堣", prop: "amountTotal", price:true}, // 鍚堣
+        { label: "瀹㈡埗鍚嶇О", prop: "client_name",min: 120,},
+        { label: "鐘舵��", prop: "quotationStatus",}
       ],
-      showCol: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�",  "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "瀹㈡埗鍚嶇О", "鏁伴噺", "鍚堣",'鐘舵��'],
+      showCol: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�",  "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "瀹㈡埗鍚嶇О",'鍚堣',"鐘舵��"],
       selectRow: {},
       loading:false,
       // 澧炲姞 浜у搧淇℃伅鍒楄〃
@@ -181,7 +176,7 @@
       showBottomCol: [],
       productTableList: {},
       productColumn: productColumn,
-      showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�", "浠风◣鍚堣"],
+      showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�(%)", "浠风◣鍚堣"],
     }
   },
   created() {
@@ -209,14 +204,7 @@
     },
     // 鑾峰彇浜у搧/搴撳瓨淇℃伅
     async getProductInventoryInfo(row) {
-      if (row.status === 1) {
-        this.productTableList.tableInfomation = row.products || []
-      } else {
-        await getProductInventoryInfo(row.number).then((res) => {
-          console.log(res)
-          this.productTableList.tableInfomation = res.data?.length > 0 ? res.data : []
-        })
-      }
+      this.productTableList.tableInfomation = row.products || []
     },
     // top 琛岀偣鍑�
     tableRowClick(row) {
@@ -300,7 +288,8 @@
                   ...item,
                   client_name: item.client.name,
                   contact_name: item.contact.name,
-                  member_name: item.member.username
+                  member_name: item.member.username,
+                  quotationStatus:item.quotation_status.name,
                 }
               })
               this.tableList.tableInfomation = list || []
@@ -337,12 +326,11 @@
     },
     // 缂栬緫
     handleClick(row) {
-      console.log(row)
-      this.editConfig.visible = true
       this.editConfig.title = "缂栬緫"
-      console.log("dddddddd")
-      console.log(row)
-      this.editConfig.infomation = { ...row, currency: "浜烘皯甯�" }
+      let params = JSON.parse(JSON.stringify(row));
+      this.editConfig.infomation = { ...params, currency: "浜烘皯甯�" }
+      console.log(this.editConfig.infomation.products,'===products')
+      this.editConfig.visible = true
     },
     // 鎵归噺鍒犻櫎
     delClick() {

--
Gitblit v1.8.0