From 979d725972cf15470422039eff86206398562d93 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 21 十二月 2023 15:38:36 +0800
Subject: [PATCH] 报价单 销售机会的必填和非必填从自动获取编码接口的header获取，对应的需要修改拦截器里方法

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

diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 44cf433..d272c43 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"
@@ -237,17 +238,18 @@
           <!-- 浜у搧绠＄悊 -->
           <div class="basic-info-title" style="display: flex">
             浜у搧绠＄悊
-            <div style="margin-left: 400px">
+            <!-- <div style="margin-left: 400px">
               甯佺
               <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
                 <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
-            </div>
+            </div> -->
           </div>
           <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() {
@@ -436,15 +438,17 @@
       getAllData()
         .then((res) => {
           this.memberOptions = res.data.member
+          this.quotationStatusOptions = res.data.quotationStatus?res.data.quotationStatus:[]
           if (this.editConfig.title === "鏂板缓") {
             let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
             this.memberOptions.map((item) => {
               if (item.username == username) {
-                this.editConfig.infomation.member_id = item.id
+                this.$set(this.editConfig.infomation, "member_id", item.id)
               }
             })
+            this.$set(this.editConfig.infomation,'quotation_status_id',this.quotationStatusOptions.length>0?this.quotationStatusOptions[0].id:'')
           }
-          this.quotationStatusOptions = res.data.quotationStatus
+          
           this.dataProcess()
         })
         .catch((err) => {
@@ -625,11 +629,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",inputFloat: true  },
+          { label: "姣涘埄", prop: "profit" },
+          { label: "姣涘埄鐜�", prop: "margin",min:90},
+          { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
           { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
         ]
       }
@@ -688,7 +695,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