From b7968858014ab02aa91e52e63c2a266963d3a8f9 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 24 八月 2023 18:06:22 +0800
Subject: [PATCH] 4807 4812）

---
 src/views/sales/quotation/AddQuotationDialog.vue |  116 +++++++++++++++++++++++++++------------------------------
 1 files changed, 55 insertions(+), 61 deletions(-)

diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 309abba..a191a7b 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -203,6 +203,7 @@
               @addProductClick="addProductClick"
               @emptyProductClick="emptyProductClick"
               @recalculateProductClick="recalculateProductClick"
+              @clearupProduct="clearupProduct"
             />
           </div>
           <!-- 閫夋嫨瀹℃壒娴佺▼ -->
@@ -327,8 +328,8 @@
       showSummary: {
         show: true,
         total: true,
-        sumProp: ["Amount", "Unit", "other3"],
-        mergeNumber: 3
+        sumProp: ["Amount", "total"],
+        mergeNumber: 2
       },
       editSelectClientConfig: {
         editVisible: false,
@@ -350,8 +351,7 @@
       saleChanceId: this.editCommonConfig.infomation.sale_chance_id,
       tableData: [],
       productId: 1,
-      addProductArr: [],
-      isProductName: false
+      isNoProduct: true
     }
   },
   created() {
@@ -380,23 +380,19 @@
         }
       })
     },
-    productNameValidate() {
-      for (let i = 0; i < this.tableData.length; i++) {
-        if (this.tableData[i].Name === "") {
-          this.isProductName = true
-          return
-        } else {
-          this.isProductName = false
-        }
-      }
-    },
     // 淇濆瓨
     saveClick(formName) {
-      this.productNameValidate()
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          console.log(this.isProductName)
-          if (this.isProductName) {
+          for (let i = 0; i < this.tableData.length; i++) {
+            if (this.tableData[i].name.length === 0) {
+              this.isNoProduct = true
+              break
+            } else {
+              this.isNoProduct = false
+            }
+          }
+          if (this.isNoProduct) {
             this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
           } else {
             const params = this.saveParams()
@@ -514,86 +510,84 @@
     // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
     setFormatClick() {},
     setTableForm() {
-      if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products === null) {
+      if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
         this.tableData = [
           {
-            id: 1,
-            Amount: 0,
-            IsSale: true,
-            MaterialMode: "",
-            MinInventory: 0,
-            Name: "",
-            Number: "",
-            PurchaseType: "",
-            SalePrice: 0,
-            Unit: ""
+            productId: this.productId,
+            id: 0,
+            amount: 0,
+            desc: "",
+            name: "",
+            number: "",
+            price: 0,
+            total: 0
           }
         ]
       } else {
         this.tableData = this.editConfig.infomation.products
+        this.tableData.map((item, index) => {
+          item.productId = index + 1
+        })
       }
       this.productTableList = {
         tableData: this.tableData,
         tableColumn: [
-          { label: "#", prop: "id", width: 40 },
-          { label: "浜у搧鍚嶇О", prop: "Name", input: true, isRequird: true },
-          { label: "浜у搧缂栧彿", prop: "Number" },
-          { label: "鏁伴噺", prop: "Amount", input: true, isRequird: true },
-          { label: "閿�鍞崟浠�", prop: "Unit", input: true },
-          { label: "浠风◣鍚堣", prop: "total", input: true },
-          { label: "鎻忚堪", prop: "other8" }
+          { label: "#", prop: "productId", width: 40 },
+          { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+          { label: "浜у搧缂栧彿", prop: "number" },
+          { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+          { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+          { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
         ]
       }
     },
     // 浜у搧鍒楄〃杈撳叆
     inputContent(val, prop, row) {
-      console.log("aaaaaaaa")
-      console.log(val, prop)
-      this.productId = row.id
+      this.productId = row.productId
       this.tableData.map((item) => {
-        if (item.id === row.id) {
+        if (item.productId === row.productId) {
           item[prop] = val
         }
       })
-      console.log(this.tableData)
     },
     // 浜у搧鏂板
     addProductClick() {
       this.productId++
       this.tableData.push({
-        id: this.productId,
-        Amount: 0,
-        IsSale: true,
-        MaterialMode: "",
-        MinInventory: 0,
-        Name: "",
-        Number: "",
-        PurchaseType: "",
-        SalePrice: 0,
-        Unit: ""
+        productId: this.productId,
+        id: 0,
+        amount: 0,
+        desc: "",
+        name: "",
+        number: "",
+        price: 0,
+        total: 0
       })
+      this.showSummary.show = true
     },
     //  浜у搧娓呯┖
     emptyProductClick() {
       this.productId = 1
       this.tableData = [
         {
-          id: 1,
-          Amount: 0,
-          IsSale: true,
-          MaterialMode: "",
-          MinInventory: 0,
-          Name: "",
-          Number: "",
-          PurchaseType: "",
-          SalePrice: 0,
-          Unit: ""
+          productId: this.productId,
+          id: 0,
+          amount: 0,
+          desc: "",
+          name: "",
+          number: "",
+          price: 0,
+          total: 0
         }
       ]
       this.productTableList.tableData = this.tableData
     },
     // 浜у搧閲嶇畻
-    recalculateProductClick() {}
+    recalculateProductClick() {},
+    clearupProduct(data) {
+      this.tableData = data
+      this.productTableList.tableData = this.tableData
+    }
   }
 }
 </script>

--
Gitblit v1.8.0