From f69afc7461e1c2d92a935c0228b77388637de2e4 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 22 十二月 2023 11:25:31 +0800
Subject: [PATCH] 明细单添加编辑接口+编辑产品列表赋值逻辑修改+查看时限制操作的方法逻辑修改+毛利毛利率计算给列表赋值

---
 src/views/sales/quotation/AddQuotationDialog.vue |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index bbe9a7f..268f5f1 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -165,7 +165,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="閿�鍞満浼�" prop="sale_chance_name">
+                <el-form-item label="閿�鍞満浼�" prop="sale_chance_name"
+                :rules="[{ required: autoCodeHeadersObj.xsjh=='yes'?true:false, validator: this.checkChance, trigger: 'change' }]">
                   <div class="custom-name">
                     <el-autocomplete
                       v-model="editConfig.infomation.sale_chance_name"
@@ -248,6 +249,7 @@
           <div class="product-view">
             <CommonFormTableView
               :show-summary="showSummary"
+              pageName="quotation"
               :product-table-list="productTableList"
               @inputContent="inputContent"
               @addProductClick="addProductClick"
@@ -371,7 +373,7 @@
         number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
         quotationName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
         quotation_status_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-        sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
+        // sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
         member_id: [{ required: true, validator: this.validateMemberId, trigger: "change" }]
       },
       memberOptions: [],
@@ -383,7 +385,7 @@
         show: true,
         total: true,
         sumProp: ["Amount", "total"],
-        mergeNumber: 2
+        mergeNumber: 7
       },
       editSelectClientConfig: {
         editVisible: false,
@@ -422,7 +424,7 @@
       if (val) {
         this.formInfo()
       }
-    }
+    },
   },
   methods: {
     formInfo() {
@@ -475,8 +477,16 @@
           if (this.isNoProduct) {
             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(!reg.test(this.tableData[i].cost)){
+                  this.$message.error("鎴愭湰鍗曚环闇�瑕佸～鍐欏ぇ浜�0鐨�2浣嶅皬鏁帮紒")
+                  return true;
+                }
+              }
+            }
             const params = this.saveParams()
-            console.log(params)
             if (this.editConfig.title === "鏂板缓") {
               getAddQuotation(params).then((res) => {
                 console.log(res)
@@ -613,6 +623,9 @@
             name: "",
             number: "",
             price: 0,
+            cost:'',
+            profit:'',
+            margin:'',
             total: 0,
             unit: ""
           }
@@ -627,11 +640,14 @@
         tableData: this.tableData,
         tableColumn: [
           { label: "#", prop: "productId", width: 40 },
-          { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+          { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true,min:110, },
           { label: "浜у搧缂栧彿", prop: "number" },
-          { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
           { label: "鍗曚綅", prop: "unit" },
-          { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+          { label: "閿�鍞崟浠�", prop: "price", inputFloat: true, isRequird: true },
+          { label: "鎴愭湰鍗曚环", prop: "cost",input: true  },
+          { label: "姣涘埄", prop: "profit" },
+          { label: "姣涘埄鐜�(%)", prop: "margin",min:90},
+          { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
           { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
         ]
       }
@@ -656,6 +672,9 @@
         name: "",
         number: "",
         price: 0,
+        cost:'',
+        profit:'',
+        margin:'',
         total: 0,
         unit: ""
       })
@@ -673,6 +692,9 @@
           name: "",
           number: "",
           price: 0,
+          cost:'',
+          profit:'',
+          margin:'',
           total: 0,
           unit: ""
         }
@@ -690,7 +712,11 @@
       if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
         callback()
       } else {
-        callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
+        if(this.autoCodeHeadersObj.xsjh=='yes'){
+          callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
+        }else{
+          callback()
+        }
       }
     },
     // 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�

--
Gitblit v1.8.0