From 78f45615949b2689dc92227f54387796fe0ea2ee Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 22 十二月 2023 15:03:45 +0800
Subject: [PATCH] 保存系统设置的接口调整入参增加各个设置对应的模块,联调接口

---
 src/views/sales/salesDetails/AddSalesDetailsDialog.vue |   41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 0477013..c729843 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -405,6 +405,8 @@
             <!-- :detail-enter="true" -->
             <CommonFormTableView
               ref="commonFormTableView"
+              :detail-enter="isView?true:false"
+              :selectBox="false"
               :show-summary="showSummary"
               pageName="quotation"
               :isOperate="((autoCodeHeadersObj.bjd=='yes'&&editConfig.infomation.quotation_number)||autoCodeHeadersObj.bjd!='yes')?true:false"
@@ -597,7 +599,6 @@
       quotationId: this.editCommonConfig.infomation.quotationId,
       tableData: [],
       isView: this.editCommonConfig.title === "鏌ョ湅",
-      selectBox: this.editCommonConfig.title !== "鏌ョ湅",
       thatMember: {}
     }
   },
@@ -675,8 +676,9 @@
             this.$message.error("璇烽�夋嫨浜у搧")
           } else {
             for (let i = 0; i < this.tableData.length; i++) {
-              if (this.tableData[i].cost||Number(this.tableData[i].cost)==0) {
-                let reg = /^\+?[1-9]\d*$/;
+              if (this.tableData[i].cost) {
+                let reg =
+            /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
                 if(!reg.test(this.tableData[i].cost)){
                   this.$message.error("鎴愭湰鍗曚环闇�瑕佸~鍐欏ぇ浜�0鐨�2浣嶅皬鏁帮紒")
                   return true;
@@ -771,21 +773,21 @@
           console.log(res)
           this.quotationList = res.data.list
           if (value === "鍏ㄩ儴浜у搧") {
-            this.quotationList.map((item) => {
-              if (item.id === this.editConfig.infomation.quotationId) {
-                this.tableData = item.products
-                this.tableData.map((item, index) => {
-                  item.productId = index + 1
-                  this.tableData.forEach((key) => {
-                    if (item.number === key.number) {
-                      item.amount = key.amount
-                      item.id = key.id
-                    }
-                  })
-                })
-                this.productTableList.tableData = this.tableData
-              }
-            })
+            // this.quotationList.map((item) => {
+              // if (item.id === this.editConfig.infomation.quotationId) {
+             
+              //   this.tableData.map((item, index) => {
+              //     item.productId = index + 1
+              //     this.tableData.forEach((key) => {
+              //       if (item.number === key.number) {
+              //         item.amount = key.amount
+              //         item.id = key.id
+              //       }
+              //     })
+              //   })
+               
+              // }
+            // })
           }
         }
       })
@@ -955,6 +957,9 @@
         ]
       } else {
         this.tableData = this.editConfig.infomation.products
+        this.tableData.map((item, index) => {
+          item.productId = index + 1
+        })
         this.getQuotation(this.editConfig.infomation.saleChanceId, "鍏ㄩ儴浜у搧")
       }
       // let productData = this.quotationList.products

--
Gitblit v1.8.0